|
- [[ line.partner_id and line.partner_id.name or '' ]]
+ [[line.partner_id and line.partner_id.name or '-' ]]
|
- [[ line.bank_id and line.bank_id.name ]]
+ [[ line.bank_id and line.bank_id.name or '-' ]]
|
- [[ line.name ]]
+ [[ get_invoice_name(line.ml_inv_ref.id) or '-' ]]
|
- [[ line.date ]]
+ [[line.date=='False' and '-' or line.date ]]
+ |
+
+ [[formatLang(line.amount) or '-' ]]
|
[[ formatLang(line.amount_currency) ]] [[ line.currency.name ]]
@@ -154,7 +243,36 @@
-
+
+
+
+
+
+ |
+
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+ Total:
+ |
+
+ [[ formatLang(get_amount_total(o)) or '' ]]
+ |
+
+ [[ formatLang(get_amount_total_in_currency(o)) or '' ]] [[ get_amount_total_in_currency(o) and line.currency.name ]]
+ |
+
+
+
diff --git a/addons/account_payment/report/payment_order.py b/addons/account_payment/report/payment_order.py
index 9bbf32afc26..a3c102b6897 100644
--- a/addons/account_payment/report/payment_order.py
+++ b/addons/account_payment/report/payment_order.py
@@ -21,15 +21,55 @@
import time
import datetime
+import pooler
from report import report_sxw
class payment_order(report_sxw.rml_parse):
+
def __init__(self, cr, uid, name, context):
super(payment_order, self).__init__(cr, uid, name, context=context)
self.localcontext.update( {
'time': time,
+ 'get_invoice_name': self._get_invoice_name,
+ 'get_company_currency' : self._get_company_currency,
+ 'get_amount_total_in_currency' : self._get_amount_total_in_currency,
+ 'get_amount_total' : self._get_amount_total,
})
+ def _get_invoice_name(self,invoice_id):
+ if invoice_id:
+ pool = pooler.get_pool(self.cr.dbname)
+ value_name = pool.get('account.invoice').name_get(self.cr, self.uid, [invoice_id])
+ if value_name:
+ return value_name[0][1]
+ return False
+
+ def _get_amount_total_in_currency(self,payment):
+ total = 0.0
+ if payment.line_ids:
+ currency_cmp = payment.line_ids[0].currency.id
+ else:
+ return False
+ for line in payment.line_ids:
+ if currency_cmp == line.currency.id:
+ total += line.amount_currency
+ else:
+ return False
+ return total
+
+ def _get_amount_total(self,payment):
+ total = 0.0
+ if not payment.line_ids:
+ return False
+ for line in payment.line_ids:
+ total += line.amount
+ return total
+
+ def _get_company_currency(self):
+ pool = pooler.get_pool(self.cr.dbname)
+ user = pool.get('res.users').browse(self.cr, self.uid, self.uid)
+ return user.company_id and user.company_id.currency_id and user.company_id.currency_id.name or False
+
report_sxw.report_sxw('report.payment.order', 'payment.order', 'addons/account_payment/report/payment_order.rml', parser=payment_order,header=False)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_payment/security/account_payment_security.xml b/addons/account_payment/security/account_payment_security.xml
index dd6b117d184..6561373bafb 100644
--- a/addons/account_payment/security/account_payment_security.xml
+++ b/addons/account_payment/security/account_payment_security.xml
@@ -6,5 +6,12 @@
Accounting / Payments
+
+ Payment Mode company rule
+
+
+ [('company_id','=',user.company_id.id)]
+
+
diff --git a/addons/account_payment/wizard/account_payment_pay.py b/addons/account_payment/wizard/account_payment_pay.py
index 3b99a2600e0..5be2574943d 100644
--- a/addons/account_payment/wizard/account_payment_pay.py
+++ b/addons/account_payment/wizard/account_payment_pay.py
@@ -47,8 +47,6 @@ class account_payment_make_payment(osv.osv_memory):
result = obj_model._get_id(cr, uid, module, wizard)
id = obj_model.read(cr, uid, [result], ['res_id'])[0]['res_id']
return obj_act.read(cr, uid, [id])[0]
- #result['context'] = str({'fiscalyear': data['form']['fiscalyear']})
-
account_payment_make_payment()
diff --git a/addons/account_report/account.py b/addons/account_report/account.py
index 784d95daa79..5dffc0c6a78 100644
--- a/addons/account_report/account.py
+++ b/addons/account_report/account.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 .
#
##############################################################################
@@ -33,25 +33,6 @@ from mx.DateTime import RelativeDateTime, now, DateTime, localtime
class account_report(osv.osv):
_name = "account.report.report"
_description = "Account Reporting"
-# _color = [
-# ('', ''),
-# ('green','Green'),
-# ('red','Red'),
-# ('pink','Pink'),
-# ('blue','Blue'),
-# ('yellow','Yellow'),
-# ('cyan','Cyan'),
-# ('lightblue','Light Blue'),
-# ('orange','Orange'),
-# ]
-# _style = [
-# ('1','Header 1'),
-# ('2','Header 2'),
-# ('3','Header 3'),
-# ('4','Header 4'),
-# ('5','Normal'),
-# ('6', 'Small'),
-# ]
def _amount_get(self, cr, uid, ids, field_name, arg, context={}):
obj_fy=self.pool.get('account.fiscalyear')
@@ -118,10 +99,6 @@ class account_report(osv.osv):
'report': _calc_report,
'tax_code': _calc_tax_code,
}
-# if field_name=='status':
-# fld_name = 'expression_status'
-# else:
-# fld_name = 'expression'
try:
val = eval(getattr(rep,'expression'), objdict)
except:
@@ -147,8 +124,6 @@ class account_report(osv.osv):
if parent_id:
acc=self.pool.get('account.report.report').browse(cr, uid, parent_id)
v['type']=acc.type
-# if int(acc.style) < 6:
-# v['style'] = str(int(acc.style)+1)
return {'value': v}
_columns = {
@@ -182,12 +157,8 @@ class account_report(osv.osv):
string='Status'),
'disp_tree':fields.boolean('Display Tree', help='When the indicators are printed, if one indicator is set with this field to True, then it will display one more graphs with all its children in tree'),
'disp_graph':fields.boolean('Display As Graph', help='If the field is set to True, information will be printed as a Graph, otherwise as an array.'),
-# 'style': fields.selection(_style, 'Style', required=True),
-# 'color_font' : fields.selection(_color, 'Font Color', help="Font Color for the report"),
-# 'color_back' : fields.selection(_color, 'Back Color')
}
_defaults = {
-# 'style': lambda *args: '5',
'active': lambda *args: True,
'type': lambda *args: 'indicator',
}
@@ -207,7 +178,7 @@ class account_report(osv.osv):
return self.name_get(cr, user, ids, context=context)
_constraints = [
- #TODO Put an expression to valid expression
+ #TODO Put an expression to valid expression
]
account_report()
diff --git a/addons/account_report/account_view.xml b/addons/account_report/account_view.xml
index 4b25851e37f..e61ae8beb35 100644
--- a/addons/account_report/account_view.xml
+++ b/addons/account_report/account_view.xml
@@ -17,7 +17,6 @@
-
@@ -25,7 +24,6 @@
-
@@ -50,8 +48,6 @@
-
diff --git a/addons/account_report/account_wizard.xml b/addons/account_report/account_wizard.xml
index 1e07a8fc248..c731b89a34b 100644
--- a/addons/account_report/account_wizard.xml
+++ b/addons/account_report/account_wizard.xml
@@ -1,10 +1,5 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/addons/account_report/i18n/lt.po b/addons/account_report/i18n/lt.po
index 43443d10bf9..b17097644d7 100644
--- a/addons/account_report/i18n/lt.po
+++ b/addons/account_report/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:50+0000\n"
+"PO-Revision-Date: 2010-08-22 06:02+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 03:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/tr.po b/addons/account_report/i18n/tr.po
index 1e6843c2e6f..a633b78dffb 100644
--- a/addons/account_report/i18n/tr.po
+++ b/addons/account_report/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:52+0000\n"
+"PO-Revision-Date: 2010-08-22 06:04+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 03:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/report/accounting_report.py b/addons/account_report/report/accounting_report.py
index 1bb6e7bbab8..f38f09d1e7f 100644
--- a/addons/account_report/report/accounting_report.py
+++ b/addons/account_report/report/accounting_report.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 .
#
##############################################################################
@@ -42,8 +42,6 @@ class accounting_report(report_sxw.rml_parse):
'amount':res[0]['amount'],
'note':res[0]['note'],
'level': level,
-# 'color_font':res[0]['color_font'],
-# 'color_back':res[0]['color_back'],
}
self.ret_list.append(ret_dict)
diff --git a/addons/account_report/report/print_indicator.py b/addons/account_report/report/print_indicator.py
index 4245bf40415..55596764dc6 100644
--- a/addons/account_report/report/print_indicator.py
+++ b/addons/account_report/report/print_indicator.py
@@ -23,15 +23,6 @@ import pooler
import time
from report import report_sxw
-#from report.interface import report_int
-#from reportlab.graphics.shapes import Drawing
-#from reportlab.graphics.charts.barcharts import VerticalBarChart
-#import reportlab.lib.colors as colors
-#from reportlab.graphics.widgetbase import Widget, TypedPropertyCollection
-#from reportlab.graphics.charts.textlabels import BarChartLabel
-#from reportlab.graphics import renderPM
-#from report.render import render
-#from report.interface import report_int
from pychart import *
import StringIO
theme.use_color = 1
@@ -70,14 +61,6 @@ class accounting_report_indicator(report_sxw.rml_parse):
ind_ids=self.pool.get('account.report.report').search(self.cr,self.uid,[])
obj_inds=self.pool.get('account.report.report').browse(self.cr,self.uid,ind_ids)
-# def find_child(obj):
-# self.list.append(obj)
-# if obj.child_ids:
-# for child in obj.child_ids:
-# find_child(child)
-# return True
-#
-# find_child(obj_inds)
for obj_ind in obj_inds:
level = 0
@@ -245,39 +228,6 @@ class accounting_report_indicator(report_sxw.rml_parse):
if intercall:
return True
self.count +=1
-# drawing = Drawing(400, 300)
-# data = [
-# tuple(data_val),
-# ]
-# value_min=0.0
-# vmin=min(data_val)
-# vmax=max(data_val)
-#
-# val_min=((vmin < 0.00 and vmin-2.00) or 0.00)
-# # calculating maximum
-# val_max=(vmax/(pow(10,len(str(int(vmax)))-2))+1)*pow(10,len(str(int(vmax)))-2)
-# bc = VerticalBarChart()
-# bc.x = 50
-# bc.y = 50
-# bc.height = 245
-# bc.width = 300
-# bc.data = data
-# value_step=(abs(val_max)-abs(val_min))/5
-#
-# bc.strokeColor = colors.black
-# bc.valueAxis.valueMin = val_min
-# bc.valueAxis.valueMax = val_max
-# bc.valueAxis.valueStep = value_step
-#
-# bc.categoryAxis.labels.boxAnchor = 'ne'
-# bc.categoryAxis.labels.dx = 8
-#
-# bc.categoryAxis.labels.dy = -2
-# bc.categoryAxis.labels.angle = 30
-# bc.categoryAxis.categoryNames = data_period
-# drawing.add(bc)
-# drawing.save(formats=['png'],fnRoot=path+str(self.count),title="helo")
-# renderPM.drawToFile(drawing1, 'example1.jpg','jpg')
import os
path=tools.config['addons_path']+"/account_report/tmp_images/image"
@@ -286,7 +236,6 @@ class accounting_report_indicator(report_sxw.rml_parse):
os.mkdir(dirname)
can = canvas.init('image'+str(self.count)+".png")
-# can.clip(0,0,600,400)
data=zip(self.header_name,self.header_val)
@@ -300,7 +249,6 @@ class accounting_report_indicator(report_sxw.rml_parse):
can.close()
os.system('cp '+'image'+str(self.count)+'.png ' +path+str(self.count)+'.png')
os.system('rm '+'image'+str(self.count)+'.png')
-# can.endclip()
return path+str(self.count)+'.png'
report_sxw.report_sxw('report.print.indicators', 'account.report.history',
diff --git a/addons/account_reporting/account.py b/addons/account_reporting/account.py
index c8b3273491a..c1c68f04d9b 100644
--- a/addons/account_reporting/account.py
+++ b/addons/account_reporting/account.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 .
#
##############################################################################
import time
@@ -88,7 +88,6 @@ class account_report_bs(osv.osv):
'code': fields.char('Code', size=64, required=True),
'account_id': fields.many2many('account.account', 'account_report_rel', 'report_id', 'account_id', 'Accounts'),
'note': fields.text('Note'),
-# 'style': fields.selection(_style, 'Style'),
'color_font' : fields.many2one('color.rml','Font Color'),
'color_back' : fields.many2one('color.rml','Back Color'),
'font_style' : fields.selection(_font, 'Font'),
diff --git a/addons/account_reporting/account_report.xml b/addons/account_reporting/account_report.xml
index 7603aaf5c45..ebfe70e4c50 100644
--- a/addons/account_reporting/account_report.xml
+++ b/addons/account_reporting/account_report.xml
@@ -1,18 +1,6 @@
-
-
-
-
-
-
-
diff --git a/addons/account_reporting/i18n/lt.po b/addons/account_reporting/i18n/lt.po
index 1b4f2e593ac..019fc285ac7 100644
--- a/addons/account_reporting/i18n/lt.po
+++ b/addons/account_reporting/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:45+0000\n"
+"PO-Revision-Date: 2010-08-22 05:55+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/tr.po b/addons/account_reporting/i18n/tr.po
index e894d1e3d8c..8dd2d26a744 100644
--- a/addons/account_reporting/i18n/tr.po
+++ b/addons/account_reporting/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:53+0000\n"
+"PO-Revision-Date: 2010-08-22 06:04+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/report/account_report_bs.py b/addons/account_reporting/report/account_report_bs.py
index 89ad84d1065..22628224306 100644
--- a/addons/account_reporting/report/account_report_bs.py
+++ b/addons/account_reporting/report/account_report_bs.py
@@ -24,7 +24,6 @@ import pooler
import locale
from report import report_sxw
-#from addons.account.wizard import wizard_account_balance_report
parents = {
'tr':1,
@@ -124,8 +123,6 @@ class account_report_bs(report_sxw.rml_parse):
res1['level'] = r['level'] + 1
break
result.append(res1)
- #res1 = self.check_child_id(account_id,level,ctx,report_type)
- #result += res1
if report_obj.child_id:
ids2 = [(x.code,x.id) for x in report_obj.child_id]
ids2.sort()
@@ -133,33 +130,6 @@ class account_report_bs(report_sxw.rml_parse):
return result
-# def check_child_id(self,account_id,level,ctx,report_type):
-# account = self.pool.get('account.account').browse(self.cr,self.uid,[account_id],ctx)[0]
-# result = []
-# res = {
-# 'code': account.code,
-# 'name': account.name,
-# 'level': level+1,
-# 'balance': account.balance,
-# 'color_font' : 'black',
-# 'color_back' :'white',
-# 'font_style' : 'Helvetica',
-# }
-# result.append(res)
-# if report_type != 'with_account':
-# acc_child_id = self.pool.get('account.account').search(self.cr,self.uid,[('parent_id','=',[account_id]),('type','=','view')])
-# for child_id in acc_child_id :
-# result += self.check_child_id(child_id,level+1,ctx,report_type)
-# return result
-#
-#
-#
-# def _sum_credit(self):
-# return self.sum_credit
-#
-# def _sum_debit(self):
-# return self.sum_debit
-
report_sxw.report_sxw('report.account.report.bs', 'account.report.bs', 'addons/account_reporting/report/account_report_bs.rml', parser=account_report_bs)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_tax_include/account_tax_include.py b/addons/account_tax_include/account_tax_include.py
index 20adc9bcfcc..afd1ef36ae7 100644
--- a/addons/account_tax_include/account_tax_include.py
+++ b/addons/account_tax_include/account_tax_include.py
@@ -161,8 +161,6 @@ class account_invoice_line(osv.osv):
# note: will call product_id_change_unit_price_inv with context...
# Temporary trap, for bad context that came from koo:
- # if isinstance(context, str):
- # print "str context:", context
ctx = (context and context.copy()) or {}
ctx.update({'price_type': ctx.get('price_type', 'tax_excluded')})
diff --git a/addons/account_tax_include/i18n/tr.po b/addons/account_tax_include/i18n/tr.po
index 97a384c4ba7..8c95673af36 100644
--- a/addons/account_tax_include/i18n/tr.po
+++ b/addons/account_tax_include/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:51+0000\n"
+"PO-Revision-Date: 2010-08-22 06:02+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:37+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index d76f1881d71..d02011de47e 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -42,10 +42,11 @@
"voucher_workflow.xml",
"voucher_report.xml",
"wizard/account_voucher_open_view.xml",
+ "wizard/account_voucher_unreconcile_view.xml",
"voucher_view.xml",
"voucher_sales_purchase_view.xml",
"voucher_payment_receipt_view.xml",
- "voucher_wizard.xml"
+ "voucher_wizard.xml",
],
"test" : [
# "test/account_voucher.yml",
diff --git a/addons/account_voucher/i18n/lt.po b/addons/account_voucher/i18n/lt.po
index 419215d661f..42da33a1fc2 100644
--- a/addons/account_voucher/i18n/lt.po
+++ b/addons/account_voucher/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:51+0000\n"
+"PO-Revision-Date: 2010-08-22 06:02+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/tr.po b/addons/account_voucher/i18n/tr.po
index 84688fefa25..0ed895173f1 100644
--- a/addons/account_voucher/i18n/tr.po
+++ b/addons/account_voucher/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:51+0000\n"
+"PO-Revision-Date: 2010-08-22 06:02+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/report/report_voucher.py b/addons/account_voucher/report/report_voucher.py
index 1524f972e6a..a3f3bb0380d 100644
--- a/addons/account_voucher/report/report_voucher.py
+++ b/addons/account_voucher/report/report_voucher.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 .
#
##############################################################################
@@ -37,19 +37,19 @@ class report_voucher(report_sxw.rml_parse):
def convert(self, amount, cur):
amt_en = amount_to_text_en.amount_to_text(amount, 'en', cur);
return amt_en
-
+
def debit(self, move_ids):
debit = 0.0
- for move in move_ids:#self.pool.get('account.move.line').browse(self.cr, self.uid, move_ids):
+ for move in move_ids:
debit +=move.debit
return debit
-
+
def credit(self, move_ids):
credit = 0.0
- for move in move_ids:#self.pool.get('account.move.line').browse(self.cr, self.uid, move_ids):
+ for move in move_ids:
credit +=move.credit
return credit
-
+
def _get_ref(self, voucher_id, move_ids):
voucher_line = self.pool.get('account.voucher.line').search(self.cr, self.uid, [('partner_id','=',move_ids.partner_id.id), ('voucher_id','=',voucher_id)])
if voucher_line:
diff --git a/addons/account_voucher/report/rml_parse.py b/addons/account_voucher/report/rml_parse.py
index 721c87fbcf5..e23d8c52947 100644
--- a/addons/account_voucher/report/rml_parse.py
+++ b/addons/account_voucher/report/rml_parse.py
@@ -107,7 +107,6 @@ class rml_parse(report_sxw.rml_parse):
return Stringer
def explode_this(self,chaine,length):
- #chaine = self.repair_string(chaine)
chaine = rstrip(chaine)
ast = list(chaine)
i = length
diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index 23fe8ae7493..efc6ac1dca2 100644
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -40,6 +40,17 @@ class account_journal(osv.osv):
}
account_journal()
+class account_account(osv.osv):
+ """
+ account_account
+ """
+
+ _inherit = 'account.account'
+ _columns = {
+ 'user_type_type': fields.related('user_type','report_type', type='char', size=64, relation='account.account.type', string='User Type Code', readonly=True, store=True)
+ }
+account_account()
+
class account_move(osv.osv):
_inherit = 'account.move'
@@ -150,33 +161,6 @@ class account_voucher(osv.osv):
else:
return self.pool.get('res.currency').search(cr, uid, [('rate','=',1.0)])[0]
- def _compute_total(self, cr, uid, ids, name, args, context=None):
- position_pool = self.pool.get('account.fiscal.position')
- voucher_pool = self.pool.get('account.voucher')
- voucher_line_pool = self.pool.get('account.voucher.line')
- partner_pool = self.pool.get('res.partner')
- tax_pool = self.pool.get('account.tax')
-
- res = {}
- for voucher in self.browse(cr, uid, ids):
- total = 0.0
- for line in voucher.payment_ids:
- total += line.amount
-
-# tax = tax_pool.browse(cr, uid, voucher.tax_id.id)
-# total_tax = total * (voucher.tax_amount/100)
-
-# tax_id = voucher.tax_id.id
-# partner = voucher.partner_id and partner_pool.browse(cr, uid, voucher.partner_id.id) or False
-# taxes = position_pool.map_tax(cr, uid, partner and partner.property_account_position or False, [voucher.tax_id])
-# taxes = tax_pool.browse(cr, uid, taxes)
-# for tax in tax_pool.compute_all(cr, uid, taxes, res[voucher.id], 1).get('taxes'):
-# total_tax += tax.get('amount')
-
- res[voucher.id] = total + voucher.tax_amount
-
- return res
-
_name = 'account.voucher'
_description = 'Accounting Voucher'
_order = "id desc"
@@ -189,7 +173,7 @@ class account_voucher(osv.osv):
('sale','Sale'),
('purchase','Purchase'),
],'Type', select=True, readonly=True),
- 'name':fields.char('Memo', size=256, required=False, readonly=True, states={'draft':[('readonly',False)]}),
+ 'name':fields.char('Memo', size=256, readonly=True, states={'draft':[('readonly',False)]}),
'date':fields.date('Date', readonly=True, states={'draft':[('readonly',False)]}, help="Effective date for accounting entries"),
'journal_id':fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
'account_id':fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft':[('readonly',False)]}),
@@ -210,8 +194,9 @@ class account_voucher(osv.osv):
\n* The \'Pro-forma\' when voucher is in Pro-forma state,voucher does not have an voucher number. \
\n* The \'Posted\' state is used when user create voucher,a voucher number is generated and voucher entries are created in account \
\n* The \'Cancelled\' state is used when user cancel voucher.'),
- 'amount': fields.function(_compute_total, method=True, type='float', digits=(14,2), string='Total', store=True),
- 'tax_amount':fields.float('Tax Amount', digits=(14,2), readonly=True, states={'draft':[('readonly',False)]}),
+ #'amount': fields.function(_compute_total, method=True, type='float', digits=(14,2), string='Total', store=True),
+ 'amount': fields.float('Total', digits=(16, 2), readonly=True, states={'draft':[('readonly',False)]}),
+ 'tax_amount':fields.float('Tax Amount', digits=(14,4), readonly=True, states={'draft':[('readonly',False)]}),
'reference': fields.char('Ref #', size=64, readonly=True, states={'draft':[('readonly',False)]}, help="Payment or Receipt transaction number, i.e. Bank cheque number or payorder number or Wire transfer number or Acknowledge number."),
'number': fields.related('move_id', 'name', type="char", readonly=True, string='Number'),
'move_id':fields.many2one('account.move', 'Account Entry'),
@@ -232,32 +217,39 @@ class account_voucher(osv.osv):
'currency_id': _get_currency,
'state': lambda *a: 'draft',
'pay_now':lambda *a: 'pay_later',
- 'name': lambda *a: '/',
+ 'name': lambda *a: '',
'date' : lambda *a: time.strftime('%Y-%m-%d'),
'audit': lambda *a: False,
'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.voucher',context=c),
}
- def onchange_tax_id(self, cr, uid, ids, amount, tax_id, context={}):
+ def onchange_price(self, cr, uid, ids, payment_ids, tax_amount, tax_id, context={}):
res = {
- 'tax_amount':False
+ 'tax_amount':False,
+ 'amount':False
}
tax_pool = self.pool.get('account.tax')
+ total = 0.0
+
+ for line in payment_ids:
+ total += line[2].get('amount')
+
if tax_id:
tax = tax_pool.browse(cr, uid, tax_id)
if tax.type == 'percent':
- res.update({
- 'tax_amount':amount * tax.amount
- })
+ tax_amount = total * tax_amount and tax_amount or tax.amount
if tax.type == 'fixed':
- res.update({
- 'tax_amount':amount + tax.amount
- })
+ tax_amount = tax_amount and tax_amount or tax.amount
+
+ res.update({
+ 'amount':total + tax_amount,
+ 'tax_amount':tax_amount
+ })
return {
'value':res
}
-
+
def create(self, cr, uid, vals, context={}):
"""
Create a new record for a model account_voucher
@@ -273,9 +265,10 @@ class account_voucher(osv.osv):
new_lines = []
payment_ids = vals.get('payment_ids')
+
if not payment_ids:
payment_ids = []
-
+
vals.update({
'payment_ids':False
})
@@ -292,6 +285,7 @@ class account_voucher(osv.osv):
vals.update({
'payment_ids':new_lines
})
+
res_id = super(account_voucher, self).create(cr, uid, vals, context)
if old_line:
@@ -300,15 +294,16 @@ class account_voucher(osv.osv):
id1 = line[0]
id2 = line[1]
res = line[2]
- res.update({
- 'voucher_id':res_id
- })
- new_payment_ids += [(id1, id2, res)]
+ if res:
+ res.update({
+ 'voucher_id':res_id
+ })
+ new_payment_ids += [(id1, id2, res)]
self.write(cr, uid, [res_id], {'payment_ids':new_payment_ids})
return res_id
- def onchange_partner_id(self, cr, uid, ids, partner_id, ttype, context={}):
+ def onchange_partner_id(self, cr, uid, ids, partner_id, ttype, journal_id=False, context={}):
"""
Returns a dict that contains new values and context
@@ -322,7 +317,9 @@ class account_voucher(osv.osv):
"""
move_pool = self.pool.get('account.move')
line_pool = self.pool.get('account.voucher.line')
+ move_line_pool = self.pool.get('account.move.line')
partner_pool = self.pool.get('res.partner')
+ journal_pool = self.pool.get('account.journal')
res = []
context.update({
@@ -330,6 +327,10 @@ class account_voucher(osv.osv):
'partner_id':partner_id,
'voucher':True,
})
+ if journal_id:
+ context.update({
+ 'journal_id':journal_id,
+ })
default = {
'value':{},
@@ -341,45 +342,70 @@ class account_voucher(osv.osv):
if line_ids:
line_pool.unlink(cr, uid, line_ids)
return default
-
+
account_id = False
partner = partner_pool.browse(cr, uid, partner_id)
- if ttype in ('sale', 'receipt'):
+ if ttype in ('sale'):
account_id = partner.property_account_receivable.id
- elif ttype in ('purchase', 'payment'):
+ elif ttype in ('purchase'):
account_id = partner.property_account_payable.id
-
+ elif ttype in ('payment', 'receipt'):
+ journal = journal_pool.browse(cr, uid, journal_id)
+ if ttype == 'payment':
+ account_id = journal.default_credit_account_id.id
+ elif ttype == 'receipt':
+ account_id = journal.default_debit_account_id.id
+
default['value'].update({
'account_id':account_id
})
-
if ttype not in ('payment', 'receipt'):
return default
voucher_id = ids and ids[0] or False
- ids = move_pool.search(cr, uid, [('reconcile_id','=', False), ('state','=','posted'), ('partner_id','=',partner_id)], context=context)
- for move in move_pool.browse(cr, uid, ids):
- rs = {
- 'ref':move.ref or '/',
- 'move_id':move.id,
+ search_type = 'credit'
+ account_type = False
+ if ttype == 'receipt':
+ search_type = 'debit'
+ account_type = 'receivable'
+ elif ttype == 'payment':
+ search_type = 'credit'
+ account_type = 'payable'
+
+ ids = move_line_pool.search(cr, uid, [('account_id.type','=', account_type), ('reconcile_id','=', False), ('partner_id','=',partner_id), (search_type,'>',0)], context=context)
+ total = 0.0
+ for line in move_line_pool.browse(cr, uid, ids):
+ rs = move_line_pool.default_get(cr, uid, move_line_pool._columns.keys(), context=context)
+ rs.update({
+ 'name':line.move_id.name,
+ 'ref':line.ref or '/',
+ 'move_id':line.move_id.id,
+ 'move_line_id':line.id,
'voucher_id':voucher_id,
- }
+ })
+ amount = 0.0
if ttype == 'payment':
rs.update({
- 'account_id':move.partner_id.property_account_payable.id,
- 'type':'dr',
- 'amount':move.amount
+ 'account_id':line.move_id.partner_id.property_account_payable.id,
+ 'amount':line.credit
})
+ amount = line.credit
elif ttype == 'receipt':
rs.update({
- 'account_id':move.partner_id.property_account_receivable.id,
- 'type':'cr',
- 'amount':move.amount
+ 'account_id':line.move_id.partner_id.property_account_receivable.id,
+ 'amount':line.debit
})
- line_id = line_pool.create(cr, uid, rs)
+ amount = line.debit
+
+ total += amount
+ line_id = line_pool.create(cr, uid, rs, context=context)
res += [line_id]
- res = {'payment_ids':res, 'account_id':account_id}
+ res = {
+ 'payment_ids':res,
+ 'account_id':account_id,
+ 'amount':total
+ }
return {
'value':res,
'context':context,
@@ -548,7 +574,7 @@ class account_voucher(osv.osv):
'name':inv.name,
'debit':False,
'credit':False,
- 'account_id':False,
+ 'account_id':inv.account_id.id,
'move_id':move_id ,
'journal_id':inv.journal_id.id,
'period_id':inv.period_id.id,
@@ -565,16 +591,14 @@ class account_voucher(osv.osv):
'currency_id':inv.currency_id.id
})
- if inv.type == 'sale':
+ if inv.type in ('sale', 'receipt'):
move_line.update({
- 'account_id':inv.account_id.id,
'debit':inv.amount
})
elif inv.type == 'purchase':
move_line.update({
- 'account_id':inv.account_id.id,
'credit':inv.amount
- })
+ })
line_ids = []
line_ids += [move_line_pool.create(cr, uid, move_line)]
@@ -614,7 +638,7 @@ class account_voucher(osv.osv):
'analytic_account_id':line.account_analytic_id.id
})
- if inv.type in ('sale'):
+ if inv.type in ('sale', 'receipt'):
move_line.update({
'credit': line.amount or False
})
@@ -724,10 +748,10 @@ class account_voucher(osv.osv):
#Restrict the list of journal view in search view
if view_type == 'search':
journal_list = journal_pool.name_search(cr, uid, '', [], context=context)
- res['fields']['journal_id']['selection'] = journal_list
+ res['fields']['journal_id']['selection'] = journal_list
return res
-
+
account_voucher()
class account_voucher_line(osv.osv):
@@ -736,24 +760,114 @@ class account_voucher_line(osv.osv):
_columns = {
'voucher_id':fields.many2one('account.voucher', 'Voucher'),
- 'name':fields.related('voucher_id', 'name', size=256, type='char', string='Description'),
+ 'name':fields.char('Description', size=256, required=True),
'account_id':fields.many2one('account.account','Account', required=True, domain=[('type','<>','view')]),
'partner_id':fields.related('voucher_id', 'partner_id', type='many2one', relation='res.partner', string='Partner'),
'amount':fields.float('Amount'),
- 'type':fields.selection([('dr','Debit'),('cr','Credit')], 'Cr/Dr'),
+# 'type':fields.selection([('dr','Debit'),('cr','Credit')], 'Cr/Dr'),
'ref':fields.char('Reference', size=32),
'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account'),
- 'is_tax':fields.boolean('Tax ?', required=False),
'stype':fields.selection([('service','Service'),('other','Other')], 'Product Type'),
'move_line_id': fields.many2one('account.move.line', 'Journal Item'),
- 'date_original': fields.date('Date', readonly="1"), #fields.related account.move.line
- 'date_due': fields.date('Due Date', readonly="1"), #fields.related account.move.line
+ 'date_original': fields.related('move_line_id','date', type='date', relation='account.move.line', string='Date', readonly="1"),
+# 'date_original': fields.date('Date', readonly="1"), #fields.related account.move.line
+ 'date_due': fields.related('move_line_id','date_maturity', type='date', relation='account.move.line', string='Due Date', readonly="1"),
+# 'date_due': fields.date('Due Date', readonly="1"), #fields.related account.move.line
'amount_original': fields.float('Originial Amount', readonly="1"), #fields.related account.move.line
- 'amount_unreconciled': fields.float('Open Balance', readonly="1"), #fields.related account.move.line
+ 'amount_unreconciled': fields.related('move_line_id','balance', type='float', relation='account.move.line', string='Open Balance', readonly="1"),
+# 'amount_unreconciled': fields.float('Open Balance', readonly="1"), #fields.related account.move.line
'move_id' : fields.many2one('account.move','Bill / Invoice'),
}
_defaults = {
- 'type': lambda *a: 'cr'
+ 'name': lambda *a: '/'
}
+# def create(self, cr, user, vals, context={}):
+# """
+# Create a new record for a model account_voucher_line
+# @param cr: A database cursor
+# @param user: ID of the user currently logged in
+# @param vals: provides data for new record
+# @param context: context arguments, like lang, time zone
+#
+# @return: Returns an id of the new record
+# """
+# if vals.get('account_id')
+# res_id = super(account_voucher_line, self).create(cr, user, vals, context)
+# return res_id
+
+ def onchange_move_line_id(self, cr, user, ids, move_line_id, context={}):
+ """
+ Returns a dict that contains new values and context
+
+ @param cr: A database cursor
+ @param user: ID of the user currently logged in
+ @param move_line_id: latest value from user input for field move_line_id
+ @param args: other arguments
+ @param context: context arguments, like lang, time zone
+
+ @return: Returns a dict which contains new values, and context
+ """
+ res = {}
+ move_line_pool = self.pool.get('account.move.line')
+ if move_line_id:
+ move_line = move_line_pool.browse(cr, user, move_line_id)
+
+ move_id = move_line.move_id.id
+ amount = move_line.credit and move_line.credit or move_line.debit
+ account_id = move_line.account_id.id
+
+ res.update({
+ 'move_id':move_id,
+ 'amount':amount,
+ 'account_id':account_id
+ })
+ context.update({
+ 'journal_id':move_line.journal_id.id,
+ 'partner_id':move_line.partner_id.id,
+ 'account_id':account_id
+ })
+ return {
+ 'value':res,
+ 'context':context,
+ }
+
+ def default_get(self, cr, user, fields_list, context=None):
+ """
+ Returns default values for fields
+ @param cr: A database cursor
+ @param user: ID of the user currently logged in
+ @param fields_list: list of fields, for which default values are required to be read
+ @param context: context arguments, like lang, time zone
+
+ @return: Returns a dict that contains default values for fields
+ """
+ journal_pool = self.pool.get('account.journal')
+ partner_pool = self.pool.get('res.partner')
+ account_id = False
+
+ values = super(account_voucher_line, self).default_get(cr, user, fields_list, context=context)
+ journal_id = context.get('journal_id', False)
+ ttype = context.get('type', False)
+ partner_id = context.get('partner_id', False)
+
+ if ttype and journal_id and ttype in ('sale', 'purchase'):
+ journal = journal_pool.browse(cr, user, journal_id)
+ if ttype == 'sale' and journal:
+ account_id = journal.default_credit_account_id and journal.default_credit_account_id.id or False
+ elif ttype == 'purchase' and journal:
+ account_id = journal.default_credit_account_id and journal.default_debit_account_id.id or False
+ elif ttype and partner_id and ttype in ('payment', 'receipt'):
+ partner = partner_pool.browse(cr, user, partner_id)
+ if ttype == 'receipt' and partner:
+ account_id = partner.property_account_receivable and partner.property_account_receivable.id or False
+ elif ttype == 'payment' and partner:
+ account_id = partner.property_account_receivable and partner.property_account_payable.id or False
+
+ if not account_id:
+ raise osv.except_osv(_('Invalid Error !'), _('Please change partner and try again !'))
+ values.update({
+ 'account_id':account_id
+ })
+ return values
account_voucher_line()
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index e2c66b890e2..02c7d7dee57 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -8,7 +8,7 @@
@@ -77,30 +78,27 @@
diff --git a/addons/account_voucher/voucher_report.xml b/addons/account_voucher/voucher_report.xml
index f6f721b93ef..57134d3cdec 100644
--- a/addons/account_voucher/voucher_report.xml
+++ b/addons/account_voucher/voucher_report.xml
@@ -10,13 +10,13 @@
header = "False"
menu="True"/>
-
+
+
+
+
+
+
+
+
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index ad5e742b3e0..8a7e9a61f0f 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -8,19 +8,18 @@
@@ -91,7 +91,7 @@
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index f692654c73b..fd9ecc6c806 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -81,10 +81,8 @@
-
-
@@ -187,48 +185,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Journal Vouchers
@@ -241,51 +197,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
account.journal.form.inherit
account.journal
@@ -317,10 +228,5 @@
-
-
-
-
-
-
+
diff --git a/addons/account_voucher/voucher_wizard.xml b/addons/account_voucher/voucher_wizard.xml
index b8851b51afe..86c8221f417 100644
--- a/addons/account_voucher/voucher_wizard.xml
+++ b/addons/account_voucher/voucher_wizard.xml
@@ -1,18 +1,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/account_voucher/wizard/__init__.py b/addons/account_voucher/wizard/__init__.py
index bd436ecd135..a5c9a5e4f59 100644
--- a/addons/account_voucher/wizard/__init__.py
+++ b/addons/account_voucher/wizard/__init__.py
@@ -20,3 +20,4 @@
##############################################################################
import account_voucher_open
+import account_voucher_unreconcile
diff --git a/addons/account_voucher_payment/wizard/account_voucher_unreconcile.py b/addons/account_voucher/wizard/account_voucher_unreconcile.py
similarity index 100%
rename from addons/account_voucher_payment/wizard/account_voucher_unreconcile.py
rename to addons/account_voucher/wizard/account_voucher_unreconcile.py
diff --git a/addons/account_voucher_payment/wizard/account_voucher_unreconcile_view.xml b/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
similarity index 100%
rename from addons/account_voucher_payment/wizard/account_voucher_unreconcile_view.xml
rename to addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
diff --git a/addons/account_voucher_payment/__init__.py b/addons/account_voucher_payment/__init__.py
deleted file mode 100755
index ad7558e11ee..00000000000
--- a/addons/account_voucher_payment/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- 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 .
-#
-##############################################################################
-import account_voucher_payment
-import wizard
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_voucher_payment/__openerp__.py b/addons/account_voucher_payment/__openerp__.py
deleted file mode 100755
index 04dc4f08945..00000000000
--- a/addons/account_voucher_payment/__openerp__.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- 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 .
-#
-##############################################################################
-{
- "name" : "Invoice Payment/Receipt by Vouchers.",
- "version" : "1.0",
- "author" : 'OpenERP SA & Axelor',
- "description": """Extension Account Voucher module includes allows to link payment / receipt
- entries with voucher, also automatically reconcile during the payment and receipt entries
- """,
- "category" : "Generic Modules/Accounting",
- "website" : "http://www.openerp.com",
- "depends" : [
- "base",
- "account",
- "account_voucher",
- ],
- "init_xml" : [
- ],
-
- "demo_xml" : [],
- "update_xml" : [
- "security/ir.model.access.csv",
- "wizard/account_voucher_unreconcile_view.xml",
- "account_voucher_payment_view.xml",
-
- ],
- "test" : [
- "test/account_voucher_payment.yml",
- ],
-
- "active": False,
- "installable": True,
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_voucher_payment/account_voucher_payment.py b/addons/account_voucher_payment/account_voucher_payment.py
deleted file mode 100755
index 6e57e0efc12..00000000000
--- a/addons/account_voucher_payment/account_voucher_payment.py
+++ /dev/null
@@ -1,280 +0,0 @@
-# -*- 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
-from tools.translate import _
-
-#class account_move_line(osv.osv):
-# _inherit = "account.move.line"
-# _columns = {
-# 'voucher_invoice': fields.many2one('account.invoice', 'Invoice', readonly=True),
-# }
-#account_move_line()
-
-class account_voucher(osv.osv):
- _inherit = 'account.voucher'
-
- _columns = {
- 'payment_ids':fields.one2many('account.voucher.line', 'voucher_id', 'Voucher Lines', readonly=True, states={'draft':[('readonly',False)]}),
- }
-
- def action_move_line_create(self, cr, uid, ids, *args):
-
- journal_pool = self.pool.get('account.journal')
- sequence_pool = self.pool.get('ir.sequence')
- move_pool = self.pool.get('account.move')
- move_line_pool = self.pool.get('account.move.line')
- analytic_pool = self.pool.get('account.analytic.line')
- currency_pool = self.pool.get('res.currency')
- invoice_pool = self.pool.get('account.invoice')
- invoice_pool = self.pool.get('account.invoice')
-
- for inv in self.browse(cr, uid, ids):
-
- if inv.move_id:
- continue
-
- if not inv.payment_ids:
- raise osv.except_osv(_('Error !'), _('Please define lines on voucher !'))
-
- journal = journal_pool.browse(cr, uid, inv.journal_id.id)
- if journal.sequence_id:
- name = sequence_pool.get_id(cr, uid, journal.sequence_id.id)
- else:
- raise osv.except_osv(_('Error !'), _('Please define sequence on journal !'))
-
- ref = False
- if inv.type in ('purchase', 'receipt'):
- ref = inv.reference
- else:
- ref = invoice_pool._convert_ref(cr, uid, name)
-
- company_currency = inv.company_id.currency_id.id
- diff_currency_p = inv.currency_id.id <> company_currency
-
- move = {
- 'name' : name,
- 'journal_id': journal.id,
- 'type' : inv.type,
- 'narration' : inv.narration and inv.narration or inv.name,
- 'date':inv.date,
- 'ref':ref
- }
-
- if inv.period_id:
- move.update({
- 'period_id': inv.period_id.id
- })
-
- move_id = move_pool.create(cr, uid, move)
-
- #create the first line manually
- move_line = {
- 'name':inv.name,
- 'debit':False,
- 'credit':False,
- 'account_id':inv.account_id.id or False,
- 'move_id':move_id ,
- 'journal_id':inv.journal_id.id,
- 'period_id':inv.period_id.id,
- 'partner_id':inv.partner_id.id,
- 'ref':ref,
- 'date':inv.date
- }
- if diff_currency_p:
- amount_currency = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, inv.amount)
- inv.amount = amount_currency
- move_line.update({
- 'amount_currency':amount_currency,
- 'currency_id':inv.currency_id.id
- })
-
- if inv.type in ('receipt', 'purchase'):
- move_line['debit'] = inv.amount
- else:
- move_line['credit'] = inv.amount
-
- line_ids = []
- line_ids += [move_line_pool.create(cr, uid, move_line)]
- rec_ids = []
-
- if inv.type == 'sale' and inv.pay_now == 'pay_now':
- #create the payment line manually
- move_line = {
- 'name':inv.name,
- 'debit':inv.pay_amount,
- 'credit':False,
- 'account_id':inv.pay_account_id.id or False,
- 'move_id':move_id ,
- 'journal_id':inv.pay_journal_id.id,
- 'period_id':inv.period_id.id,
- 'partner_id':inv.partner_id.id,
- 'ref':ref,
- 'date':inv.date
- }
- line_ids += [move_line_pool.create(cr, uid, move_line)]
- else:
- for line in inv.payment_ids:
-
- amount=0.0
-
- if inv.type in ('payment'):
- ref = line.ref
-
- move_line = {
- 'name':line.name,
- 'debit':False,
- 'credit':False,
- 'account_id':line.account_id.id or False,
- 'move_id':move_id ,
- 'journal_id':inv.journal_id.id,
- 'period_id':inv.period_id.id,
- 'partner_id':line.partner_id.id or False,
- 'ref':ref,
- 'date':inv.date,
- 'analytic_account_id':False
- }
-
- if diff_currency_p:
- amount_currency = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, line.amount)
- line.amount = amount_currency
- move_line.update({
- 'amount_currency':amount_currency,
- 'currency_id':inv.currency_id.id
- })
-
- if line.account_analytic_id:
- move_line.update({
- 'analytic_account_id':line.account_analytic_id.id
- })
-
- if line.type == 'dr':
- move_line.update({
- 'debit': line.amount or False
- })
-
- elif line.type == 'cr':
- move_line.update({
- 'credit': line.amount or False
- })
-
- move_line_id = move_line_pool.create(cr, uid, move_line)
- line_ids += [move_line_id]
-
- if line.move_id and inv.type in ('payment', 'receipt'):
- rec_ids += [move_line_id]
- for move_line in line.move_id.line_id:
- if line.account_id.id == move_line.account_id.id:
- rec_ids += [move_line.id]
-
- if rec_ids:
- move_line_pool.reconcile_partial(cr, uid, rec_ids)
-
- rec = {
- 'move_id': move_id
- }
-
- message = _('Voucher ') + " '" + inv.name + "' "+ _("is confirm")
- self.log(cr, uid, inv.id, message)
-
- self.write(cr, uid, [inv.id], rec)
- move_pool.post(cr, uid, [move_id], context={})
-
- return True
-
-account_voucher()
-
-class account_voucher_line(osv.osv):
- _inherit = 'account.voucher.line'
-
- def default_get(self, cr, uid, fields, context={}):
- data = super(account_voucher_line, self).default_get(cr, uid, fields, context)
- self.voucher_context = context
- return data
-
- _columns = {
- 'move_id' : fields.many2one('account.move','Bill / Invoice'),
- }
-
- def move_line_get_item(self, cr, uid, line, context={}):
- res = super(account_voucher_line, self).move_line_get_item(cr, uid, line, context)
- res['invoice'] = line.invoice_id or False
- return res
-
- def onchange_invoice_id(self, cr, uid, ids, invoice_id, currency_id):
- currency_pool = self.pool.get('res.currency')
- invoice_pool = self.pool.get('account.move')
- res = {
-
- }
- if not invoice_id:
- return {
- 'value':res
- }
- else:
- invoice = invoice_pool.browse(cr, uid, invoice_id)
- residual = invoice.amount
-
- company_currency = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id
- currency_diff = company_currency != currency_id
-
- if currency_diff:
- residual = currency_pool.compute(cr, uid, company_currency, currency_id, residual)
-
- if residual > 0:
- res.update({
- 'amount': residual,
- 'ref':invoice.name
- })
-
- return {
- 'value':res
- }
-
- def onchange_line_account(self, cr, uid, ids, account_id, type, type1):
- if not account_id:
- return {'value' : {'account_id' : False, 'type' : False ,'amount':False}}
- obj = self.pool.get('account.account')
- acc_id = False
-
- if type1 in ('receipt'):
- acc_id = obj.browse(cr, uid, account_id)
- balance = acc_id.credit
- type = 'cr'
- elif type1 in ('payment') :
- acc_id = obj.browse(cr, uid, account_id)
- balance = acc_id.debit
- type = 'dr'
- elif type1 in ('sale') :
- acc_id = obj.browse(cr, uid, account_id)
- balance = acc_id.credit
- type = 'dr'
- elif type1 in ('purchase') :
- acc_id = obj.browse(cr, uid, account_id)
- balance = acc_id.debit
- type = 'cr'
-
- return {
- 'value' : {'type' : type, 'amount':balance}
- }
-account_voucher_line()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_voucher_payment/account_voucher_payment_view.xml b/addons/account_voucher_payment/account_voucher_payment_view.xml
deleted file mode 100755
index 894229f26e7..00000000000
--- a/addons/account_voucher_payment/account_voucher_payment_view.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-
-
-
-
- account.voucher.form.payment.unreconcile
- account.voucher
- form
-
-
-
-
-
-
-
- account.voucher.form.receipt.unreconcile
- account.voucher
- form
-
-
-
-
-
-
-
diff --git a/addons/account_voucher_payment/i18n/account_voucher_payment.pot b/addons/account_voucher_payment/i18n/account_voucher_payment.pot
deleted file mode 100644
index 0a6e050af91..00000000000
--- a/addons/account_voucher_payment/i18n/account_voucher_payment.pot
+++ /dev/null
@@ -1,82 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_voucher_payment
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-13 20:11:36+0000\n"
-"PO-Revision-Date: 2009-05-13 20:11:36+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_voucher_payment
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation transactions"
-msgstr ""
-
-#. module: account_voucher_payment
-#: model:ir.module.module,description:account_voucher_payment.module_name_translation
-msgid "This module includes :\n"
-" * It reconcile the invoice (supplier, customer) while paying through \n"
-" Accounting Vouchers\n"
-" "
-msgstr ""
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"
-msgstr ""
-
-#. module: account_voucher_payment
-#: view:account.voucher:0
-#: field:account.voucher,voucher_line_ids:0
-msgid "Voucher Lines"
-msgstr ""
-
-#. module: account_voucher_payment
-#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation
-msgid "Invoice Payment/Receipt by Vouchers."
-msgstr ""
-
-#. module: account_voucher_payment
-#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
-msgid "Unreconcile entries"
-msgstr ""
-
-#. module: account_voucher_payment
-#: field:account.move.line,voucher_invoice:0
-#: field:account.voucher.line,invoice_id:0
-msgid "Invoice"
-msgstr ""
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: account_voucher_payment
-#: field:account.voucher,partner_id:0
-msgid "Partner"
-msgstr ""
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,unrec:0
-msgid "Unreconcile"
-msgstr ""
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation"
-msgstr ""
-
diff --git a/addons/account_voucher_payment/i18n/ca.po b/addons/account_voucher_payment/i18n/ca.po
deleted file mode 100644
index 225da8f9e95..00000000000
--- a/addons/account_voucher_payment/i18n/ca.po
+++ /dev/null
@@ -1,95 +0,0 @@
-# Catalan 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-05-13 20:11+0000\n"
-"PO-Revision-Date: 2010-08-10 15:03+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"\n"
-"Language-Team: Catalan \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-12 04:08+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_voucher_payment
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invàlid per a la definició de la vista!"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation transactions"
-msgstr "Trenca conciliació de transaccions"
-
-#. module: account_voucher_payment
-#: model:ir.module.module,description:account_voucher_payment.module_name_translation
-msgid ""
-"This module includes :\n"
-" * It reconcile the invoice (supplier, customer) while paying through \n"
-" Accounting Vouchers\n"
-" "
-msgstr ""
-"Aquest mòdul inclou:\n"
-" * Concilia factures de proveïdors i clients mentre són pagades "
-"mitjançant \n"
-" comprovants comptables\n"
-" "
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Si trenqueu conciliació de transaccions, també heu de comprovar totes les "
-"accions que estan relacionades amb aquestes transaccions ja que no seran "
-"eliminades"
-
-#. module: account_voucher_payment
-#: view:account.voucher:0
-#: field:account.voucher,voucher_line_ids:0
-msgid "Voucher Lines"
-msgstr "Línies de comprovant"
-
-#. module: account_voucher_payment
-#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation
-msgid "Invoice Payment/Receipt by Vouchers."
-msgstr "Pagaments i rebuts de factures per comprovant."
-
-#. module: account_voucher_payment
-#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
-msgid "Unreconcile entries"
-msgstr "Trenca conciliació entrades"
-
-#. module: account_voucher_payment
-#: field:account.move.line,voucher_invoice:0
-#: field:account.voucher.line,invoice_id:0
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,end:0
-msgid "Cancel"
-msgstr "Cancel·la"
-
-#. module: account_voucher_payment
-#: field:account.voucher,partner_id:0
-msgid "Partner"
-msgstr ""
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,unrec:0
-msgid "Unreconcile"
-msgstr "Trenca conciliació"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation"
-msgstr "Trenca conciliació"
diff --git a/addons/account_voucher_payment/i18n/ca_ES.po b/addons/account_voucher_payment/i18n/ca_ES.po
deleted file mode 100644
index 6bafc34d136..00000000000
--- a/addons/account_voucher_payment/i18n/ca_ES.po
+++ /dev/null
@@ -1,81 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_voucher_payment
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-13 19:47:47+0000\n"
-"PO-Revision-Date: 2009-05-16 18:57+0100\n"
-"Last-Translator: Jordi Esteve \n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: \n"
-
-#. module: account_voucher_payment
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invàlid per a la definició de la vista!"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation transactions"
-msgstr "Trenca conciliació de transaccions"
-
-#. module: account_voucher_payment
-#: field:account.move.line,voucher_invoice:0
-#: field:account.voucher.line,invoice_id:0
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"
-msgstr "Si trenqueu conciliació de transaccions, també heu de comprovar totes les accions que estan relacionades amb aquestes transaccions ja que no seran eliminades"
-
-#. module: account_voucher_payment
-#: view:account.voucher:0
-#: field:account.voucher,voucher_line_ids:0
-msgid "Voucher Lines"
-msgstr "Línies de comprovant"
-
-#. module: account_voucher_payment
-#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation
-msgid "Invoice Payment/Receipt by Vouchers."
-msgstr "Pagaments i rebuts de factures per comprovant."
-
-#. module: account_voucher_payment
-#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
-msgid "Unreconcile entries"
-msgstr "Trenca conciliació entrades"
-
-#. module: account_voucher_payment
-#: model:ir.module.module,description:account_voucher_payment.module_name_translation
-msgid ""
-"This module includes :\n"
-" * It reconcile the invoice (supplier, customer) while paying through \n"
-" Accounting Vouchers\n"
-" "
-msgstr ""
-"Aquest mòdul inclou:\n"
-" * Concilia factures de proveïdors i clients mentre són pagades mitjançant \n"
-" comprovants comptables\n"
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,end:0
-msgid "Cancel"
-msgstr "Cancel·la"
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,unrec:0
-msgid "Unreconcile"
-msgstr "Trenca conciliació"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation"
-msgstr "Trenca conciliació"
-
diff --git a/addons/account_voucher_payment/i18n/et.po b/addons/account_voucher_payment/i18n/de.po
similarity index 75%
rename from addons/account_voucher_payment/i18n/et.po
rename to addons/account_voucher_payment/i18n/de.po
index ff959abf935..23544eb98dc 100644
--- a/addons/account_voucher_payment/i18n/et.po
+++ b/addons/account_voucher_payment/i18n/de.po
@@ -1,4 +1,4 @@
-# Estonian translation for openobject-addons
+# German 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.
@@ -8,24 +8,24 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-05-13 20:11+0000\n"
-"PO-Revision-Date: 2010-06-08 17:42+0000\n"
-"Last-Translator: lyyser \n"
-"Language-Team: Estonian \n"
+"PO-Revision-Date: 2010-08-22 06:34+0000\n"
+"Last-Translator: Ferdinand @ ChriCar \n"
+"Language-Team: German \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-12 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher_payment
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
+msgstr "Fehlerhafter XML-Code für diese Ansicht!"
#. module: account_voucher_payment
#: wizard_view:account.voucher.unreconcile,init:0
msgid "Unreconciliation transactions"
-msgstr "Mittesobivad tehingud"
+msgstr "Auszugleichende Transaktionen"
#. module: account_voucher_payment
#: model:ir.module.module,description:account_voucher_payment.module_name_translation
@@ -35,6 +35,9 @@ msgid ""
" Accounting Vouchers\n"
" "
msgstr ""
+"Dieses Modul unterstützt :\n"
+" * OP-Ausgleich im Rahmen von Belegen\n"
+" "
#. module: account_voucher_payment
#: wizard_view:account.voucher.unreconcile,init:0
@@ -42,33 +45,35 @@ msgid ""
"If you unreconciliate transactions, you must also verify all the actions "
"that are linked to those transactions because they will not be disable"
msgstr ""
+"Falls Sie einen Offene Posten Ausgleich stornieren müssen prüfen Sie auch "
+"alle vorgelagerten Vorgänge, da diese nicht automatisch zurückgesetzt werden."
#. module: account_voucher_payment
#: view:account.voucher:0
#: field:account.voucher,voucher_line_ids:0
msgid "Voucher Lines"
-msgstr "Tähiku read"
+msgstr "Auszugspositionen"
#. module: account_voucher_payment
#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation
msgid "Invoice Payment/Receipt by Vouchers."
-msgstr ""
+msgstr "Zahlungen für Rechnungen je Beleg"
#. module: account_voucher_payment
#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
msgid "Unreconcile entries"
-msgstr "Kooskõlastamatta kirjed"
+msgstr "Storno Ausgleich"
#. module: account_voucher_payment
#: field:account.move.line,voucher_invoice:0
#: field:account.voucher.line,invoice_id:0
msgid "Invoice"
-msgstr "Arve"
+msgstr "Rechnung"
#. module: account_voucher_payment
#: wizard_button:account.voucher.unreconcile,init,end:0
msgid "Cancel"
-msgstr "Katkesta"
+msgstr "Abbrechen"
#. module: account_voucher_payment
#: field:account.voucher,partner_id:0
@@ -78,9 +83,9 @@ msgstr "Partner"
#. module: account_voucher_payment
#: wizard_button:account.voucher.unreconcile,init,unrec:0
msgid "Unreconcile"
-msgstr ""
+msgstr "Storno Ausgleich"
#. module: account_voucher_payment
#: wizard_view:account.voucher.unreconcile,init:0
msgid "Unreconciliation"
-msgstr ""
+msgstr "Ausgleich OP zurücksetzen"
diff --git a/addons/account_voucher_payment/i18n/el.po b/addons/account_voucher_payment/i18n/el.po
deleted file mode 100644
index 5531e87022f..00000000000
--- a/addons/account_voucher_payment/i18n/el.po
+++ /dev/null
@@ -1,93 +0,0 @@
-# Greek 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-05-13 20:11+0000\n"
-"PO-Revision-Date: 2010-06-22 05:05+0000\n"
-"Last-Translator: Panayiotis Konstantinidis \n"
-"Language-Team: Greek \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-12 04:08+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_voucher_payment
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Λανθασμένο XML για αρχιτεκτονική όψης!"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation transactions"
-msgstr "Ασυμβίβαστες συναλλαγές"
-
-#. module: account_voucher_payment
-#: model:ir.module.module,description:account_voucher_payment.module_name_translation
-msgid ""
-"This module includes :\n"
-" * It reconcile the invoice (supplier, customer) while paying through \n"
-" Accounting Vouchers\n"
-" "
-msgstr ""
-"Αυτή η μονάδα περιλαμβάνει :\n"
-" * Εναρμονίζει το τιμολόγιο ( προμηθευτή, πελάτη ) καθώς πληρώνει απο τον "
-"\n"
-" Λογαριασμό Παραστατικών\n"
-" "
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Αν ακυρώσετε συμφωνημένες συναλλαγές θα πρέπει να ελέγξετε όλες τις "
-"ενέργειες που συνδέονται με αυτές διότι δεν θα διαγραφούν."
-
-#. module: account_voucher_payment
-#: view:account.voucher:0
-#: field:account.voucher,voucher_line_ids:0
-msgid "Voucher Lines"
-msgstr "Γραμμές Παραστατικού"
-
-#. module: account_voucher_payment
-#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation
-msgid "Invoice Payment/Receipt by Vouchers."
-msgstr "Πληρωμή Τιμολογίου/ Απόδειξη απο Παραστατικό"
-
-#. module: account_voucher_payment
-#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
-msgid "Unreconcile entries"
-msgstr "Ασυμβίβαστες εγγραφές"
-
-#. module: account_voucher_payment
-#: field:account.move.line,voucher_invoice:0
-#: field:account.voucher.line,invoice_id:0
-msgid "Invoice"
-msgstr "Τιμολόγιο"
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,end:0
-msgid "Cancel"
-msgstr "Ακύρωση"
-
-#. module: account_voucher_payment
-#: field:account.voucher,partner_id:0
-msgid "Partner"
-msgstr "Συνεργάτης"
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,unrec:0
-msgid "Unreconcile"
-msgstr "Ακυρώνω"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation"
-msgstr "Ακύρωση"
diff --git a/addons/account_voucher_payment/i18n/es.po b/addons/account_voucher_payment/i18n/es.po
deleted file mode 100644
index 134c11751e9..00000000000
--- a/addons/account_voucher_payment/i18n/es.po
+++ /dev/null
@@ -1,94 +0,0 @@
-# Spanish 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-05-13 20:11+0000\n"
-"PO-Revision-Date: 2010-08-11 05:38+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"\n"
-"Language-Team: Spanish \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-12 04:08+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_voucher_payment
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation transactions"
-msgstr "Romper conciliación de transacciones"
-
-#. module: account_voucher_payment
-#: model:ir.module.module,description:account_voucher_payment.module_name_translation
-msgid ""
-"This module includes :\n"
-" * It reconcile the invoice (supplier, customer) while paying through \n"
-" Accounting Vouchers\n"
-" "
-msgstr ""
-"Este módulo incluye :\n"
-" * Concilia facturas de proveedores y clientes mientras son pagadas "
-"mediante \n"
-" comprobantes contables\n"
-" "
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Si rompe conciliación de transacciones, también debe verificar todas las "
-"acciones que están enlazadas a estas transacciones porque no serán eliminadas"
-
-#. module: account_voucher_payment
-#: view:account.voucher:0
-#: field:account.voucher,voucher_line_ids:0
-msgid "Voucher Lines"
-msgstr "Líneas de comprobante"
-
-#. module: account_voucher_payment
-#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation
-msgid "Invoice Payment/Receipt by Vouchers."
-msgstr "Pagos y recibos de facturas por comprobantes."
-
-#. module: account_voucher_payment
-#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
-msgid "Unreconcile entries"
-msgstr "Romper concilación entradas"
-
-#. module: account_voucher_payment
-#: field:account.move.line,voucher_invoice:0
-#: field:account.voucher.line,invoice_id:0
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,end:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: account_voucher_payment
-#: field:account.voucher,partner_id:0
-msgid "Partner"
-msgstr "Compañero"
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,unrec:0
-msgid "Unreconcile"
-msgstr "Romper conciliación"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation"
-msgstr "Romper conciliación"
diff --git a/addons/account_voucher_payment/i18n/es_ES.po b/addons/account_voucher_payment/i18n/es_ES.po
deleted file mode 100644
index 28765ce533a..00000000000
--- a/addons/account_voucher_payment/i18n/es_ES.po
+++ /dev/null
@@ -1,81 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_voucher_payment
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-13 19:47:47+0000\n"
-"PO-Revision-Date: 2009-05-16 18:57+0100\n"
-"Last-Translator: Jordi Esteve \n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: \n"
-
-#. module: account_voucher_payment
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation transactions"
-msgstr "Romper conciliación de transacciones"
-
-#. module: account_voucher_payment
-#: field:account.move.line,voucher_invoice:0
-#: field:account.voucher.line,invoice_id:0
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"
-msgstr "Si rompe conciliación de transacciones, también debe verificar todas las acciones que están enlazadas a estas transacciones porque no serán eliminadas"
-
-#. module: account_voucher_payment
-#: view:account.voucher:0
-#: field:account.voucher,voucher_line_ids:0
-msgid "Voucher Lines"
-msgstr "Líneas de comprobante"
-
-#. module: account_voucher_payment
-#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation
-msgid "Invoice Payment/Receipt by Vouchers."
-msgstr "Pagos y recibos de facturas por comprobantes."
-
-#. module: account_voucher_payment
-#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
-msgid "Unreconcile entries"
-msgstr "Romper concilación entradas"
-
-#. module: account_voucher_payment
-#: model:ir.module.module,description:account_voucher_payment.module_name_translation
-msgid ""
-"This module includes :\n"
-" * It reconcile the invoice (supplier, customer) while paying through \n"
-" Accounting Vouchers\n"
-" "
-msgstr ""
-"Este módulo incluye :\n"
-" * Concilia facturas de proveedores y clientes mientras son pagadas mediante \n"
-" comprobantes contables\n"
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,end:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,unrec:0
-msgid "Unreconcile"
-msgstr "Romper conciliación"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation"
-msgstr "Romper conciliación"
-
diff --git a/addons/account_voucher_payment/i18n/fr_BE.po b/addons/account_voucher_payment/i18n/fr_BE.po
deleted file mode 100644
index 07044b31a84..00000000000
--- a/addons/account_voucher_payment/i18n/fr_BE.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_voucher_payment
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-11-26 06:54:11+0000\n"
-"PO-Revision-Date: 2009-11-26 06:54:11+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_voucher_payment
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation transactions"
-msgstr ""
-
-#. module: account_voucher_payment
-#: field:account.move.line,voucher_invoice:0
-#: field:account.voucher.line,invoice_id:0
-msgid "Invoice"
-msgstr ""
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"
-msgstr ""
-
-#. module: account_voucher_payment
-#: view:account.voucher:0
-#: field:account.voucher,voucher_line_ids:0
-msgid "Voucher Lines"
-msgstr ""
-
-#. module: account_voucher_payment
-#: model:ir.module.module,shortdesc:account_voucher_payment.module_meta_information
-msgid "Invoice Payment/Receipt by Vouchers."
-msgstr ""
-
-#. module: account_voucher_payment
-#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
-msgid "Unreconcile entries"
-msgstr ""
-
-#. module: account_voucher_payment
-#: model:ir.module.module,description:account_voucher_payment.module_meta_information
-msgid "This module includes :\n"
-" * It reconcile the invoice (supplier, customer) while paying through \n"
-" Accounting Vouchers\n"
-" "
-msgstr ""
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,unrec:0
-msgid "Unreconcile"
-msgstr ""
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation"
-msgstr ""
-
diff --git a/addons/account_voucher_payment/i18n/pt_BR.po b/addons/account_voucher_payment/i18n/pt_BR.po
deleted file mode 100644
index 65d8341d436..00000000000
--- a/addons/account_voucher_payment/i18n/pt_BR.po
+++ /dev/null
@@ -1,89 +0,0 @@
-# Brazilian Portuguese 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-05-13 20:11+0000\n"
-"PO-Revision-Date: 2010-07-28 14:21+0000\n"
-"Last-Translator: Leandro Chaves \n"
-"Language-Team: Brazilian Portuguese \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-12 04:08+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_voucher_payment
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para a arquitetura de exibição"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation transactions"
-msgstr "Transações não conciliadas"
-
-#. module: account_voucher_payment
-#: model:ir.module.module,description:account_voucher_payment.module_name_translation
-msgid ""
-"This module includes :\n"
-" * It reconcile the invoice (supplier, customer) while paying through \n"
-" Accounting Vouchers\n"
-" "
-msgstr ""
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Se você desfazer a reconciliação de transações, você deve também verificar "
-"todas as ações que estão ligadas a essas operações, porque elas não serão "
-"desfeitas pelo sistema"
-
-#. module: account_voucher_payment
-#: view:account.voucher:0
-#: field:account.voucher,voucher_line_ids:0
-msgid "Voucher Lines"
-msgstr "Linhas de Comprovantes"
-
-#. module: account_voucher_payment
-#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation
-msgid "Invoice Payment/Receipt by Vouchers."
-msgstr ""
-
-#. module: account_voucher_payment
-#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
-msgid "Unreconcile entries"
-msgstr "Anular reconciliação de lançamentos"
-
-#. module: account_voucher_payment
-#: field:account.move.line,voucher_invoice:0
-#: field:account.voucher.line,invoice_id:0
-msgid "Invoice"
-msgstr "Fatura"
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,end:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: account_voucher_payment
-#: field:account.voucher,partner_id:0
-msgid "Partner"
-msgstr "Parceiro"
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,unrec:0
-msgid "Unreconcile"
-msgstr "Não concilidado"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation"
-msgstr "Desconciliação"
diff --git a/addons/account_voucher_payment/i18n/sl.po b/addons/account_voucher_payment/i18n/sl.po
deleted file mode 100644
index f090b7071f9..00000000000
--- a/addons/account_voucher_payment/i18n/sl.po
+++ /dev/null
@@ -1,88 +0,0 @@
-# Slovenian 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-05-13 20:11+0000\n"
-"PO-Revision-Date: 2010-07-28 12:23+0000\n"
-"Last-Translator: Simon Vidmar \n"
-"Language-Team: Slovenian \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-12 04:08+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_voucher_payment
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neveljaven XML za arhitekturo pogleda!"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation transactions"
-msgstr "Preklic uskladitve transakcij"
-
-#. module: account_voucher_payment
-#: model:ir.module.module,description:account_voucher_payment.module_name_translation
-msgid ""
-"This module includes :\n"
-" * It reconcile the invoice (supplier, customer) while paying through \n"
-" Accounting Vouchers\n"
-" "
-msgstr ""
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Če prekličete uskladitev transakcij, morate tudi preveriti vse akcije, ki so "
-"povezane s temi transakcijami, kajti le te ne bodo onemogočene."
-
-#. module: account_voucher_payment
-#: view:account.voucher:0
-#: field:account.voucher,voucher_line_ids:0
-msgid "Voucher Lines"
-msgstr ""
-
-#. module: account_voucher_payment
-#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation
-msgid "Invoice Payment/Receipt by Vouchers."
-msgstr ""
-
-#. module: account_voucher_payment
-#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
-msgid "Unreconcile entries"
-msgstr "Prekliči uskladitev vknjižb"
-
-#. module: account_voucher_payment
-#: field:account.move.line,voucher_invoice:0
-#: field:account.voucher.line,invoice_id:0
-msgid "Invoice"
-msgstr "Račun"
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,end:0
-msgid "Cancel"
-msgstr "Prekliči"
-
-#. module: account_voucher_payment
-#: field:account.voucher,partner_id:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,unrec:0
-msgid "Unreconcile"
-msgstr "Prekliči uskladitev"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation"
-msgstr "Preklic uskladitve"
diff --git a/addons/account_voucher_payment/i18n/zh_CN.po b/addons/account_voucher_payment/i18n/zh_CN.po
deleted file mode 100644
index 00ccf4661a2..00000000000
--- a/addons/account_voucher_payment/i18n/zh_CN.po
+++ /dev/null
@@ -1,90 +0,0 @@
-# Chinese (Simplified) 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-05-13 20:11+0000\n"
-"PO-Revision-Date: 2010-07-14 03:27+0000\n"
-"Last-Translator: Black Jack \n"
-"Language-Team: Chinese (Simplified) \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-12 04:08+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_voucher_payment
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation transactions"
-msgstr "取消对账"
-
-#. module: account_voucher_payment
-#: model:ir.module.module,description:account_voucher_payment.module_name_translation
-msgid ""
-"This module includes :\n"
-" * It reconcile the invoice (supplier, customer) while paying through \n"
-" Accounting Vouchers\n"
-" "
-msgstr ""
-"这模块包括:\n"
-" *在支付时核销发票(供应商, 客户) \n"
-" 原始凭证\n"
-" "
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr "如果取消交易的核销, 你必须检验链接该交易的所有操作. 因为他们不会被禁止."
-
-#. module: account_voucher_payment
-#: view:account.voucher:0
-#: field:account.voucher,voucher_line_ids:0
-msgid "Voucher Lines"
-msgstr "原始凭证明细"
-
-#. module: account_voucher_payment
-#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation
-msgid "Invoice Payment/Receipt by Vouchers."
-msgstr "发票付款/ 收入的原始凭证"
-
-#. module: account_voucher_payment
-#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
-msgid "Unreconcile entries"
-msgstr "取消核销"
-
-#. module: account_voucher_payment
-#: field:account.move.line,voucher_invoice:0
-#: field:account.voucher.line,invoice_id:0
-msgid "Invoice"
-msgstr "发票"
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,end:0
-msgid "Cancel"
-msgstr "取消"
-
-#. module: account_voucher_payment
-#: field:account.voucher,partner_id:0
-msgid "Partner"
-msgstr "业务伙伴"
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,unrec:0
-msgid "Unreconcile"
-msgstr "取消核销"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation"
-msgstr "取消对账"
diff --git a/addons/account_voucher_payment/security/ir.model.access.csv b/addons/account_voucher_payment/security/ir.model.access.csv
deleted file mode 100644
index 0343f29f43a..00000000000
--- a/addons/account_voucher_payment/security/ir.model.access.csv
+++ /dev/null
@@ -1 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
diff --git a/addons/account_voucher_payment/test/account_voucher_payment.yml b/addons/account_voucher_payment/test/account_voucher_payment.yml
deleted file mode 100644
index 8bcea6a23a4..00000000000
--- a/addons/account_voucher_payment/test/account_voucher_payment.yml
+++ /dev/null
@@ -1,118 +0,0 @@
--
- In order to test account_voucher_payment module in OpenERP I create an invoice and paid it through voucher
--
- I create a customer invoice record
--
- !record {model: account.invoice, id: account_invoice_voucher_payment}:
- account_id: account.a_recv
- address_contact_id: base.res_partner_address_3000
- address_invoice_id: base.res_partner_address_3000
- company_id: base.main_company
- currency_id: base.EUR
- invoice_line:
- - account_id: account.a_sale
- name: '[PC1] Basic PC'
- price_unit: 450.0
- quantity: 1.0
- product_id: product.product_product_pc1
- uos_id: product.product_uom_unit
- journal_id: account.sales_journal
- partner_id: base.res_partner_desertic_hispafuentes
- reference_type: none
-
--
- I check that Initially customer invoice is in the "Draft" state
--
- !assert {model: account.invoice, id: account_invoice_voucher_payment}:
- - state == 'draft'
--
- I change the state of invoice to "Proforma2" by clicking PRO-FORMA button
--
- !workflow {model: account.invoice, action: invoice_proforma2, ref: account_invoice_voucher_payment}
--
- I check that the invoice state is now "Proforma2"
--
- !assert {model: account.invoice, id: account_invoice_voucher_payment}:
- - state == 'proforma2'
--
- I create invoice by clicking on Create button
--
- !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_voucher_payment}
--
- I check that the invoice state is "Open"
--
- !assert {model: account.invoice, id: account_invoice_voucher_payment}:
- - state == 'open'
-
--
- I create a voucher record for above invoice
--
- !record {model: account.voucher, id: account_voucher_voucherforaxelor1}:
- account_id: account.cash
- company_id: base.main_company
- currency_id: base.EUR
- journal_id: account.bank_journal
- name: Voucher for Axelor
- narration: Basic Pc
- payment_ids:
- - account_id: account.a_recv
- amount: 450.0
- name: Voucher for Axelor
- partner_id: base.res_partner_desertic_hispafuentes
- invoice_id: account_invoice_voucher_payment
- type: cr
- period_id: account.period_6
- reference_type: none
-
--
- I check that Initially customer voucher is in the "Draft" state
--
- !assert {model: account.voucher, id: account_voucher_voucherforaxelor1}:
- - state == 'draft'
--
- I change the state of voucher to "proforma" by clicking PRO-FORMA button
--
- !workflow {model: account.voucher, action: open_voucher, ref: account_voucher_voucherforaxelor1}
--
- I check that the voucher state is now "proforma"
--
- !assert {model: account.voucher, id: account_voucher_voucherforaxelor1}:
- - state == 'proforma'
--
- I create voucher by clicking on Create button
--
- !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_voucherforaxelor1}
--
- I check that the voucher state is "Waiting for re-checking"
--
- !assert {model: account.voucher, id: account_voucher_voucherforaxelor1}:
- - state == 'recheck'
--
- I clicked on Validate Button
--
- !workflow {model: account.voucher, action: recheck_voucher, ref: account_voucher_voucherforaxelor1}
--
- I check that the voucher state is "posted"
--
- !assert {model: account.voucher, id: account_voucher_voucherforaxelor1}:
- - state == 'posted'
-
--
- I check that Moves get created for this voucher
--
- !python {model: account.voucher}: |
- acc_id=self.browse(cr, uid, ref("account_voucher_voucherforaxelor1"))
- assert(acc_id.move_id)
-
--
- I check that the invoice state is now Done
--
- !assert {model: account.invoice, id: account_invoice_voucher_payment}:
- - state == 'paid'
-
-
-
-
-
-
-
diff --git a/addons/account_voucher_payment/wizard/__init__.py b/addons/account_voucher_payment/wizard/__init__.py
deleted file mode 100644
index 32ab938c5a6..00000000000
--- a/addons/account_voucher_payment/wizard/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- 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 .
-#
-##############################################################################
-
-import account_voucher_unreconcile
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic/__openerp__.py b/addons/analytic/__openerp__.py
index 80585ee39da..1f21fb3fce3 100644
--- a/addons/analytic/__openerp__.py
+++ b/addons/analytic/__openerp__.py
@@ -29,7 +29,8 @@
"description": """Module for defining analytic accounting object.
""",
"init_xml" : [],
- "update_xml": ["security/ir.model.access.csv",
+ "update_xml": ['security/analytic_security.xml',
+ "security/ir.model.access.csv",
],
'demo_xml': [
],
diff --git a/addons/analytic/i18n/de.po b/addons/analytic/i18n/de.po
new file mode 100644
index 00000000000..e9214e63984
--- /dev/null
+++ b/addons/analytic/i18n/de.po
@@ -0,0 +1,269 @@
+# German 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: 2010-06-18 10:59+0000\n"
+"PO-Revision-Date: 2010-08-22 06:43+0000\n"
+"Last-Translator: Ferdinand @ ChriCar \n"
+"Language-Team: German \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 04:02+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: analytic
+#: field:account.analytic.account,child_ids:0
+msgid "Child Accounts"
+msgstr "untergeordnete Konten"
+
+#. module: analytic
+#: help:account.analytic.line,amount_currency:0
+msgid ""
+"The amount expressed in the related account currency if not equal to the "
+"company one."
+msgstr "Der Betrag in Fremdwährung, wenn diese von der Hauptwährung abweicht"
+
+#. module: analytic
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Der Objektname muss mit \"x_\" beginnen und darf keine Sonderzeichen "
+"beinhalten!"
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account Name"
+msgstr "Kontenbezeichnung"
+
+#. module: analytic
+#: help:account.analytic.line,unit_amount:0
+msgid "Specifies the amount of quantity to count."
+msgstr "Definiert die zu zählende Menge"
+
+#. module: analytic
+#: help:account.analytic.line,currency_id:0
+msgid "The related account currency if not equal to the company one."
+msgstr ""
+
+#. module: analytic
+#: model:ir.module.module,description:analytic.module_meta_information
+msgid ""
+"Module for defining analytic accounting object.\n"
+" "
+msgstr ""
+"Diese Module definiert analytische Kostenrechnung\n"
+" "
+
+#. module: analytic
+#: field:account.analytic.account,state:0
+msgid "State"
+msgstr "Status"
+
+#. module: analytic
+#: field:account.analytic.account,user_id:0
+msgid "Account Manager"
+msgstr "Konto Manager"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Draft"
+msgstr "Entwurf"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Closed"
+msgstr "Abgeschlossen"
+
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Soll"
+
+#. module: analytic
+#: help:account.analytic.account,state:0
+msgid ""
+"* When an account is created its in 'Draft' state. "
+" \n"
+"* If any associated partner is there, it can be in 'Open' state. "
+" \n"
+"* If any pending balance is there it can be in 'Pending'. "
+" \n"
+"* And finally when all the transactions are over, it can be in 'Close' "
+"state. \n"
+"* The project can be in either if the states 'Template' and 'Running'.\n"
+" If it is template then we can make projects based on the template projects. "
+"If its in 'Running' state it is a normal project. "
+" \n"
+" If it is to be reviewed then the state is 'Pending'.\n"
+" When the project is completed the state is set to 'Done'."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,type:0
+msgid "Account Type"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Template"
+msgstr "Vorlage"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Pending"
+msgstr "Unerledigt"
+
+#. module: analytic
+#: model:ir.model,name:analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Analyse Zeile"
+
+#. module: analytic
+#: field:account.analytic.account,description:0
+#: field:account.analytic.line,name:0
+msgid "Description"
+msgstr "Beschreibung"
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price."
+msgstr "Ergebnis aus Menge * Produkt Einstandspreis"
+
+#. module: analytic
+#: field:account.analytic.account,company_id:0
+#: field:account.analytic.line,company_id:0
+msgid "Company"
+msgstr "Mandant"
+
+#. module: analytic
+#: field:account.analytic.account,quantity_max:0
+msgid "Maximum Quantity"
+msgstr "Max. Menge"
+
+#. module: analytic
+#: field:account.analytic.line,user_id:0
+msgid "User"
+msgstr "Benutzer"
+
+#. module: analytic
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Übergeordnetes Analyse Konto"
+
+#. module: analytic
+#: field:account.analytic.line,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: analytic
+#: field:account.analytic.account,currency_id:0
+#: field:account.analytic.line,currency_id:0
+msgid "Account currency"
+msgstr "Währung des Kontos"
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "View"
+msgstr "Ansicht"
+
+#. module: analytic
+#: help:account.analytic.account,quantity_max:0
+msgid "Sets the higher limit of quantity of hours."
+msgstr "Obergrenze der Stunden"
+
+#. module: analytic
+#: field:account.analytic.account,credit:0
+msgid "Credit"
+msgstr "Haben"
+
+#. module: analytic
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Betrag"
+
+#. module: analytic
+#: field:account.analytic.account,contact_id:0
+msgid "Contact"
+msgstr "Ansprechpartner"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Cancelled"
+msgstr "Abgebrochen"
+
+#. module: analytic
+#: field:account.analytic.account,balance:0
+msgid "Balance"
+msgstr "Saldo"
+
+#. module: analytic
+#: field:account.analytic.account,date_start:0
+msgid "Date Start"
+msgstr "Startdatum"
+
+#. module: analytic
+#: field:account.analytic.account,quantity:0
+#: field:account.analytic.line,unit_amount:0
+msgid "Quantity"
+msgstr "Menge"
+
+#. module: analytic
+#: field:account.analytic.account,date:0
+msgid "Date End"
+msgstr "Enddatum"
+
+#. module: analytic
+#: field:account.analytic.account,code:0
+msgid "Account Code"
+msgstr "Kontonummer"
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: analytic
+#: field:account.analytic.account,complete_name:0
+msgid "Full Account Name"
+msgstr "vollständiger Kontoname"
+
+#. module: analytic
+#: field:account.analytic.line,account_id:0
+#: model:ir.model,name:analytic.model_account_analytic_account
+#: model:ir.module.module,shortdesc:analytic.module_meta_information
+msgid "Analytic Account"
+msgstr "Analytisches Konto"
+
+#. module: analytic
+#: field:account.analytic.account,company_currency_id:0
+msgid "Currency"
+msgstr "Währung"
+
+#. module: analytic
+#: field:account.analytic.line,amount_currency:0
+msgid "Amount currency"
+msgstr "Betrag in Währung"
+
+#. module: analytic
+#: field:account.analytic.account,partner_id:0
+msgid "Associated Partner"
+msgstr "Zugehöriger Partner"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Open"
+msgstr "Offen"
+
+#. module: analytic
+#: field:account.analytic.account,line_ids:0
+msgid "Analytic Entries"
+msgstr "Analytische Buchungen"
diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml
new file mode 100644
index 00000000000..a382380d962
--- /dev/null
+++ b/addons/analytic/security/analytic_security.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ analytic company rule
+
+
+ [('company_id','=',user.company_id.id)]
+
+
+
diff --git a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml b/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml
index 3288ca9daf8..39be4c76a23 100644
--- a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml
+++ b/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml
@@ -35,7 +35,6 @@
-
diff --git a/addons/analytic_journal_billing_rate/i18n/tr.po b/addons/analytic_journal_billing_rate/i18n/tr.po
index 698bc1f3bbe..328a8d33cad 100644
--- a/addons/analytic_journal_billing_rate/i18n/tr.po
+++ b/addons/analytic_journal_billing_rate/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:41+0000\n"
+"PO-Revision-Date: 2010-08-22 05:49+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py
index 2f5152faea6..0bb9afc3386 100644
--- a/addons/analytic_user_function/analytic_user_function.py
+++ b/addons/analytic_user_function/analytic_user_function.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 .
#
##############################################################################
@@ -54,7 +54,7 @@ class hr_analytic_timesheet(osv.osv):
# Look in account, if no value for the user => look in parent until there is no more parent to look
# Take the first found... if nothing found => return False
def _get_related_user_account_recursiv(self, cr, uid, user_id, account_id):
-
+
temp=self.pool.get('analytic_user_funct_grid').search(cr, uid, [('user_id', '=', user_id),('account_id', '=', account_id) ])
account=self.pool.get('account.analytic.account').browse(cr, uid, account_id)
if temp:
@@ -64,21 +64,19 @@ class hr_analytic_timesheet(osv.osv):
return self._get_related_user_account_recursiv(cr, uid, user_id, account.parent_id.id)
else:
return False
-
-
+
+
def on_change_account_id(self, cr, uid, ids, account_id, user_id=False, unit_amount=0):
- #{'value': {'to_invoice': False, 'amount': (-162.0,), 'product_id': 7, 'general_account_id': (5,)}}
res = {}
if not (account_id):
#avoid a useless call to super
- return res
+ return res
if not (user_id):
return super(hr_analytic_timesheet, self).on_change_account_id(cr, uid, ids, account_id)
#get the browse record related to user_id and account_id
temp = self._get_related_user_account_recursiv(cr, uid, user_id, account_id)
- # temp = self.pool.get('analytic_user_funct_grid').search(cr, uid, [('user_id', '=', user_id),('account_id', '=', account_id) ])
if not temp:
#if there isn't any record for this user_id and account_id
return super(hr_analytic_timesheet, self).on_change_account_id(cr, uid, ids, account_id)
@@ -100,9 +98,9 @@ class hr_analytic_timesheet(osv.osv):
'for this product: "%s" (id:%d)') % \
(r.product_id.name, r.product_id.id,))
# Compute based on pricetype
- amount_unit = self.on_change_unit_amount(cr, uid, ids,
+ amount_unit = self.on_change_unit_amount(cr, uid, ids,
r.product_id.id, unit_amount, r.product_id.uom_id.id)['value']['amount']
-
+
amount = unit_amount * amount_unit
res ['value']['amount']= - round(amount, 2)
res ['value']['general_account_id']= a
@@ -112,19 +110,18 @@ class hr_analytic_timesheet(osv.osv):
res = {}
if not (user_id):
#avoid a useless call to super
- return res
+ return res
#get the old values from super
res = super(hr_analytic_timesheet, self).on_change_user_id(cr, uid, ids, user_id)
if account_id:
#get the browse record related to user_id and account_id
- # temp = self.pool.get('analytic_user_funct_grid').search(cr, uid, [('user_id', '=', user_id),('account_id', '=', account_id) ])
temp = self._get_related_user_account_recursiv(cr, uid, user_id, account_id)
if temp:
#add the value from the new relation analytic_user_funct_grid
r = self.pool.get('analytic_user_funct_grid').browse(cr, uid, temp)[0]
- res['value']['product_id'] = r.product_id.id
+ res['value']['product_id'] = r.product_id.id
#the change of product has to impact the amount, uom and general_account_id
a = r.product_id.product_tmpl_id.property_account_expense.id
@@ -136,9 +133,9 @@ class hr_analytic_timesheet(osv.osv):
'for this product: "%s" (id:%d)') % \
(r.product_id.name, r.product_id.id,))
# Compute based on pricetype
- amount_unit = self.on_change_unit_amount(cr, uid, ids,
+ amount_unit = self.on_change_unit_amount(cr, uid, ids,
r.product_id.id, unit_amount, r.product_id.uom_id.id)['value']['amount']
-
+
amount = unit_amount * amount_unit
res ['value']['amount']= - round(amount, 2)
res ['value']['general_account_id']= a
diff --git a/addons/analytic_user_function/i18n/tr.po b/addons/analytic_user_function/i18n/tr.po
index 5e9d2a2f653..62b28891d45 100644
--- a/addons/analytic_user_function/i18n/tr.po
+++ b/addons/analytic_user_function/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:45+0000\n"
+"PO-Revision-Date: 2010-08-22 05:55+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/auction/__openerp__.py b/addons/auction/__openerp__.py
index 75b50113028..69fef0748c4 100644
--- a/addons/auction/__openerp__.py
+++ b/addons/auction/__openerp__.py
@@ -43,14 +43,11 @@
'init_xml': ['auction_sequence.xml', 'auction_data.xml'],
'update_xml': [
'security/ir.model.access.csv',
- # 'wizard/auction_lots_able_view.xml',
- # 'wizard/auction_lots_enable_view.xml',
'wizard/auction_lots_make_invoice_buyer_view.xml',
'wizard/auction_lots_make_invoice_view.xml',
'wizard/auction_taken_view.xml',
'wizard/auction_lots_auction_move_view.xml',
'wizard/auction_pay_buy_view.xml',
- #'wizard/auction_payer_sel_view.xml',
'wizard/auction_lots_sms_send_view.xml',
'wizard/auction_catalog_flagey_view.xml',
'wizard/auction_lots_buyer_map_view.xml',
@@ -59,12 +56,11 @@
'report/report_auction_view.xml',
'auction_wizard.xml',
'board_auction_view.xml',
- # 'board_auction_manager_view.xml',
],
'demo_xml': ['auction_demo.xml','board_auction_demo.xml'],
'test': ['test/auction.yml'],
-
+
'installable': True,
'active': False,
'certificate': '0039333102717',
diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index 0014edada56..5ea2441e6fd 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -35,10 +35,10 @@ import tools
class auction_artists(osv.osv):
_name = "auction.artists"
_columns = {
- 'name': fields.char('Artist/Author Name', size=64, required=True),
- 'pseudo': fields.char('Pseudo', size=64),
- 'birth_death_dates':fields.char('Birth / Death dates', size=64),
- 'biography': fields.text('Biography'),
+ 'name': fields.char('Artist/Author Name', size=64, required=True),
+ 'pseudo': fields.char('Pseudo', size=64),
+ 'birth_death_dates':fields.char('Birth / Death dates', size=64),
+ 'biography': fields.text('Biography'),
}
auction_artists()
@@ -49,10 +49,10 @@ class auction_dates(osv.osv):
"""Auction Dates"""
_name = "auction.dates"
_description=__doc__
-
+
def _adjudication_get(self, cr, uid, ids, prop, unknow_none, unknow_dict):
res={}
- total = 0.0
+ total = 0.0
lots_obj = self.pool.get('auction.lots')
for auction in self.browse(cr, uid, ids):
lots_ids = lots_obj.search(cr, uid, [('auction_id', '=', auction.id)])
@@ -71,27 +71,27 @@ class auction_dates(osv.osv):
return name
_columns = {
- 'name': fields.char('Auction Name', size=64, required=True),
- 'expo1': fields.date('First Exposition Day', required=True, help="Beginning Exposition Date For Auction"),
- 'expo2': fields.date('Last Exposition Day', required=True, help="Last Exposition Date For Auction"),
- 'auction1': fields.date('First Auction Day', required=True, help="Start Date Of Auction"),
- 'auction2': fields.date('Last Auction Day', required=True, help="End Date Of Auction"),
- 'journal_id': fields.many2one('account.journal', 'Buyer Journal', required=True, help="Account Journal For Buyer"),
- 'journal_seller_id': fields.many2one('account.journal', 'Seller Journal', required=True, help="Account Journal For Seller"),
- 'buyer_costs': fields.many2many('account.tax', 'auction_buyer_taxes_rel', 'auction_id', 'tax_id', 'Buyer Costs', help="Account Tax For Buyer"),
- 'seller_costs': fields.many2many('account.tax', 'auction_seller_taxes_rel', 'auction_id', 'tax_id', 'Seller Costs', help="Account Tax For Seller"),
- 'acc_income': fields.many2one('account.account', 'Income Account', required=True),
- 'acc_expense': fields.many2one('account.account', 'Expense Account', required=True),
- 'adj_total': fields.function(_adjudication_get, method=True, string='Total Adjudication', store=True),
- 'state': fields.selection((('draft', 'Draft'), ('closed', 'Closed')), 'State', select=1, readonly=True,
- help='When auction starts the state is \'Draft\'.\n At the end of auction, the state becomes \'Closed\'.'),
- 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True),
+ 'name': fields.char('Auction Name', size=64, required=True),
+ 'expo1': fields.date('First Exposition Day', required=True, help="Beginning Exposition Date For Auction"),
+ 'expo2': fields.date('Last Exposition Day', required=True, help="Last Exposition Date For Auction"),
+ 'auction1': fields.date('First Auction Day', required=True, help="Start Date Of Auction"),
+ 'auction2': fields.date('Last Auction Day', required=True, help="End Date Of Auction"),
+ 'journal_id': fields.many2one('account.journal', 'Buyer Journal', required=True, help="Account Journal For Buyer"),
+ 'journal_seller_id': fields.many2one('account.journal', 'Seller Journal', required=True, help="Account Journal For Seller"),
+ 'buyer_costs': fields.many2many('account.tax', 'auction_buyer_taxes_rel', 'auction_id', 'tax_id', 'Buyer Costs', help="Account Tax For Buyer"),
+ 'seller_costs': fields.many2many('account.tax', 'auction_seller_taxes_rel', 'auction_id', 'tax_id', 'Seller Costs', help="Account Tax For Seller"),
+ 'acc_income': fields.many2one('account.account', 'Income Account', required=True),
+ 'acc_expense': fields.many2one('account.account', 'Expense Account', required=True),
+ 'adj_total': fields.function(_adjudication_get, method=True, string='Total Adjudication', store=True),
+ 'state': fields.selection((('draft', 'Draft'), ('closed', 'Closed')), 'State', select=1, readonly=True,
+ help='When auction starts the state is \'Draft\'.\n At the end of auction, the state becomes \'Closed\'.'),
+ 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True),
}
-
+
_defaults = {
- 'state': lambda *a: 'draft',
+ 'state': lambda *a: 'draft',
}
-
+
_order = "auction1 desc"
def close(self, cr, uid, ids, context=None):
@@ -112,7 +112,7 @@ class auction_dates(osv.osv):
new_seller_invoice = lots_obj.seller_trans_create(cr, uid, lots_ids2, {})
self.write(cr, uid, ids, {'state': 'closed'}) #close the auction
return True
-
+
auction_dates()
#----------------------------------------------------------
@@ -120,27 +120,27 @@ auction_dates()
#----------------------------------------------------------
class auction_deposit(osv.osv):
"""Auction Deposit Border"""
-
+
_name = "auction.deposit"
_description=__doc__
_order = "id desc"
_columns = {
- 'transfer' : fields.boolean('Transfer'),
- 'name': fields.char('Depositer Inventory', size=64, required=True),
- 'partner_id': fields.many2one('res.partner', 'Seller', required=True, change_default=True),
- 'date_dep': fields.date('Deposit date', required=True),
- 'method': fields.selection((('keep', 'Keep until sold'), ('decease', 'Decrease limit of 10%'), ('contact', 'Contact the Seller')), 'Withdrawned method', required=True),
- 'tax_id': fields.many2one('account.tax', 'Expenses'),
- 'create_uid': fields.many2one('res.users', 'Created by', readonly=True),
- 'info': fields.char('Description', size=64),
- 'lot_id': fields.one2many('auction.lots', 'bord_vnd_id', 'Objects'),
- 'specific_cost_ids': fields.one2many('auction.deposit.cost', 'deposit_id', 'Specific Costs'),
- 'total_neg': fields.boolean('Allow Negative Amount'),
+ 'transfer' : fields.boolean('Transfer'),
+ 'name': fields.char('Depositer Inventory', size=64, required=True),
+ 'partner_id': fields.many2one('res.partner', 'Seller', required=True, change_default=True),
+ 'date_dep': fields.date('Deposit date', required=True),
+ 'method': fields.selection((('keep', 'Keep until sold'), ('decease', 'Decrease limit of 10%'), ('contact', 'Contact the Seller')), 'Withdrawned method', required=True),
+ 'tax_id': fields.many2one('account.tax', 'Expenses'),
+ 'create_uid': fields.many2one('res.users', 'Created by', readonly=True),
+ 'info': fields.char('Description', size=64),
+ 'lot_id': fields.one2many('auction.lots', 'bord_vnd_id', 'Objects'),
+ 'specific_cost_ids': fields.one2many('auction.deposit.cost', 'deposit_id', 'Specific Costs'),
+ 'total_neg': fields.boolean('Allow Negative Amount'),
}
_defaults = {
- 'method': lambda *a: 'keep',
- 'total_neg': lambda *a: False,
- 'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'auction.deposit'),
+ 'method': lambda *a: 'keep',
+ 'total_neg': lambda *a: False,
+ 'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'auction.deposit'),
}
auction_deposit()
@@ -149,16 +149,16 @@ auction_deposit()
# (Specific) Deposit Costs
#----------------------------------------------------------
class auction_deposit_cost(osv.osv):
-
+
"""Auction Deposit Cost"""
-
+
_name = 'auction.deposit.cost'
_description=__doc__
_columns = {
- 'name': fields.char('Cost Name', required=True, size=64),
- 'amount': fields.float('Amount'),
- 'account': fields.many2one('account.account', 'Destination Account', required=True),
- 'deposit_id': fields.many2one('auction.deposit', 'Deposit'),
+ 'name': fields.char('Cost Name', required=True, size=64),
+ 'amount': fields.float('Amount'),
+ 'account': fields.many2one('account.account', 'Destination Account', required=True),
+ 'deposit_id': fields.many2one('auction.deposit', 'Deposit'),
}
auction_deposit_cost()
@@ -166,16 +166,16 @@ auction_deposit_cost()
# Lots Categories
#----------------------------------------------------------
class aie_category(osv.osv):
-
+
_name="aie.category"
_order = "name"
_columns={
- 'name': fields.char('Name', size=64, required=True),
- 'code':fields.char('Code', size=64),
- 'parent_id': fields.many2one('aie.category', 'Parent aie Category', ondelete='cascade'),
- 'child_ids': fields.one2many('aie.category', 'parent_id', help="Childs aie category")
+ 'name': fields.char('Name', size=64, required=True),
+ 'code':fields.char('Code', size=64),
+ 'parent_id': fields.many2one('aie.category', 'Parent aie Category', ondelete='cascade'),
+ 'child_ids': fields.one2many('aie.category', 'parent_id', help="Childs aie category")
}
-
+
def name_get(self, cr, uid, ids, context=None):
if not context:
context = {}
@@ -189,22 +189,22 @@ class aie_category(osv.osv):
name = record['parent_id'][1] + ' / ' + name
res.append((record['id'], name))
return res
-
-aie_category()
-
+
+aie_category()
+
class auction_lot_category(osv.osv):
"""Auction Lots Category"""
-
+
_name = 'auction.lot.category'
_description=__doc__
_columns = {
- 'name': fields.char('Category Name', required=True, size=64),
- 'priority': fields.float('Priority'),
- 'active' : fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the auction lot category without removing it."),
- 'aie_categ': fields.many2one('aie.category', 'Category', ondelete='cascade'),
+ 'name': fields.char('Category Name', required=True, size=64),
+ 'priority': fields.float('Priority'),
+ 'active' : fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the auction lot category without removing it."),
+ 'aie_categ': fields.many2one('aie.category', 'Category', ondelete='cascade'),
}
_defaults = {
- 'active' : lambda *a: 1,
+ 'active' : lambda *a: 1,
}
auction_lot_category()
@@ -217,11 +217,11 @@ def _type_get(self, cr, uid, context=None):
obj = self.pool.get('auction.lot.category')
ids = obj.search(cr, uid, [])
res = obj.read(cr, uid, ids, ['name'], context)
- res = [(r['name'], r['name']) for r in res]
- return res
+ res = [(r['name'], r['name']) for r in res]
+ return res
class auction_lots(osv.osv):
-
+
"""Auction Object"""
_name = "auction.lots"
_order = "obj_num,lot_num,id"
@@ -231,7 +231,7 @@ class auction_lots(osv.osv):
if not context:
context={}
return self.write(cr, uid, ids, {'state':'unsold'})
-
+
def button_taken_away(self, cr, uid, ids, context=None):
if not context:
context={}
@@ -256,7 +256,7 @@ class auction_lots(osv.osv):
"""
if not context:
context = {}
-
+
res = {}
account_analytic_line_obj = self.pool.get('account.analytic.line')
lots = self.browse(cr, uid, ids, context)
@@ -289,24 +289,24 @@ class auction_lots(osv.osv):
elif name == "gross_revenue":
if lot.auction_id:
result = lot.buyer_price - lot.seller_price
-
+
elif name == "net_revenue":
if lot.auction_id:
result = lot.buyer_price - lot.seller_price - lot.costs
-
+
elif name == "gross_margin":
if ((lot.obj_price==0) and (lot.state=='draft')):
amount = lot.lot_est1
- else:
+ else:
amount = lot.obj_price
if amount > 0:
result = (lot.gross_revenue * 100) / amount
result = round(result,2)
-
+
elif name == "net_margin":
if ((lot.obj_price==0) and (lot.state=='draft')):
amount = lot.lot_est1
- else:
+ else:
amount = lot.obj_price
if amount > 0:
result = (lot.net_revenue * 100) / amount
@@ -320,8 +320,8 @@ class auction_lots(osv.osv):
auct_id = lot.auction_id.id
lot_count = self.search(cr, uid, [('auction_id', '=', auct_id)], count=True)
line_ids = account_analytic_line_obj.search(cr, uid, [
- ('account_id', '=', lot.auction_id.account_analytic_id.id),
- ('journal_id', '<>', lot.auction_id.journal_id.id),
+ ('account_id', '=', lot.auction_id.account_analytic_id.id),
+ ('journal_id', '<>', lot.auction_id.journal_id.id),
('journal_id', '<>', lot.auction_id.journal_seller_id.id)])
indir_cost = lot.bord_vnd_id.specific_cost_ids
for r in lot.bord_vnd_id.specific_cost_ids:
@@ -330,20 +330,20 @@ class auction_lots(osv.osv):
if line.amount:
som -= line.amount
result = som/lot_count
-
+
elif name=="paid_ach":
result = False
if lot.ach_inv_id and lot.ach_inv_id.state == 'paid':
result = True
-
+
elif name=="paid_vnd":
result = False
if lot.sel_inv_id and lot.sel_inv_id.state == 'paid':
- result = True
-
+ result = True
+
res[lot.id][name] = result
-
-
+
+
return res
def onchange_obj_ret(self, cr, uid, ids, obj_ret, context=None):
@@ -354,66 +354,66 @@ class auction_lots(osv.osv):
return {}
_columns = {
- 'bid_lines':fields.one2many('auction.bid_line', 'lot_id', 'Bids'),
- 'auction_id': fields.many2one('auction.dates', 'Auction', select=1, help="Auction For Object"),
- 'bord_vnd_id': fields.many2one('auction.deposit', 'Depositer Inventory', required=True, help="Provide Deposit Information: seller, Withdrawned Method, Object, Deposit Costs"),
- 'name': fields.char('Title', size=64, required=True, help='Auction Object Name'),
- 'name2': fields.char('Short Description (2)', size=64),
- 'lot_type': fields.selection(_type_get, 'Object category', size=64),
- 'author_right': fields.many2one('account.tax', 'Author rights', help="Account Tax For Author Commission"),
- 'lot_est1': fields.float('Minimum Estimation', help="Minimum Estimate Price"),
- 'lot_est2': fields.float('Maximum Estimation', help="Maximum Estimate Price"),
- 'lot_num': fields.integer('List Number', required=True, select=1, help="List Number In Depositer Inventory"),
- 'create_uid': fields.many2one('res.users', 'Created by', readonly=True),
- 'history_ids':fields.one2many('auction.lot.history', 'lot_id', 'Auction history'),
- 'lot_local':fields.char('Location', size=64, help="Auction Location"),
- 'artist_id':fields.many2one('auction.artists', 'Artist/Author'),
- 'artist2_id':fields.many2one('auction.artists', 'Artist/Author2'),
- 'important':fields.boolean('To be Emphatized'),
- 'product_id':fields.many2one('product.product', 'Product', required=True),
- 'obj_desc': fields.text('Object Description'),
- 'obj_num': fields.integer('Catalog Number'),
- 'obj_ret': fields.float('Price retired', help="Object Ret"),
- 'obj_comm': fields.boolean('Commission'),
- 'obj_price': fields.float('Adjudication price', help="Object Price"),
- 'ach_avance': fields.float('Buyer Advance'),
- 'ach_login': fields.char('Buyer Username', size=64),
+ 'bid_lines':fields.one2many('auction.bid_line', 'lot_id', 'Bids'),
+ 'auction_id': fields.many2one('auction.dates', 'Auction', select=1, help="Auction For Object"),
+ 'bord_vnd_id': fields.many2one('auction.deposit', 'Depositer Inventory', required=True, help="Provide Deposit Information: seller, Withdrawned Method, Object, Deposit Costs"),
+ 'name': fields.char('Title', size=64, required=True, help='Auction Object Name'),
+ 'name2': fields.char('Short Description (2)', size=64),
+ 'lot_type': fields.selection(_type_get, 'Object category', size=64),
+ 'author_right': fields.many2one('account.tax', 'Author rights', help="Account Tax For Author Commission"),
+ 'lot_est1': fields.float('Minimum Estimation', help="Minimum Estimate Price"),
+ 'lot_est2': fields.float('Maximum Estimation', help="Maximum Estimate Price"),
+ 'lot_num': fields.integer('List Number', required=True, select=1, help="List Number In Depositer Inventory"),
+ 'create_uid': fields.many2one('res.users', 'Created by', readonly=True),
+ 'history_ids':fields.one2many('auction.lot.history', 'lot_id', 'Auction history'),
+ 'lot_local':fields.char('Location', size=64, help="Auction Location"),
+ 'artist_id':fields.many2one('auction.artists', 'Artist/Author'),
+ 'artist2_id':fields.many2one('auction.artists', 'Artist/Author2'),
+ 'important':fields.boolean('To be Emphatized'),
+ 'product_id':fields.many2one('product.product', 'Product', required=True),
+ 'obj_desc': fields.text('Object Description'),
+ 'obj_num': fields.integer('Catalog Number'),
+ 'obj_ret': fields.float('Price retired', help="Object Ret"),
+ 'obj_comm': fields.boolean('Commission'),
+ 'obj_price': fields.float('Adjudication price', help="Object Price"),
+ 'ach_avance': fields.float('Buyer Advance'),
+ 'ach_login': fields.char('Buyer Username', size=64),
'ach_uid': fields.many2one('res.partner', 'Buyer'),
- 'seller_id': fields.related('bord_vnd_id','partner_id', type='many2one', relation='res.partner', string='Seller', readonly=True),
- 'ach_emp': fields.boolean('Taken Away', readonly=True, help="When state is Taken Away, This field is Marked as True"),
- 'is_ok': fields.boolean('Buyer\'s payment', help="When Buyer Pay For Bank statement', This field is Marked"),
- 'ach_inv_id': fields.many2one('account.invoice', 'Buyer Invoice', readonly=True, states={'draft':[('readonly', False)]}),
- 'sel_inv_id': fields.many2one('account.invoice', 'Seller Invoice', readonly=True, states={'draft':[('readonly', False)]}),
- 'vnd_lim': fields.float('Seller limit'),
- 'vnd_lim_net': fields.boolean('Net limit ?', readonly=True),
- 'image': fields.binary('Image', help="Object Image"),
- 'paid_vnd':fields.function(_getprice, string='Seller Paid', method=True, type='boolean', store=True, multi="paid_vnd", help="When state of Seller Invoice is 'Paid', This field is selected as True."),
- 'paid_ach':fields.function(_getprice, string='Buyer Invoice Reconciled', method=True, type='boolean', store=True, multi="paid_ach", help="When state of Buyer Invoice is 'Paid', This field is selected as True."),
+ 'seller_id': fields.related('bord_vnd_id','partner_id', type='many2one', relation='res.partner', string='Seller', readonly=True),
+ 'ach_emp': fields.boolean('Taken Away', readonly=True, help="When state is Taken Away, This field is Marked as True"),
+ 'is_ok': fields.boolean('Buyer\'s payment', help="When Buyer Pay For Bank statement', This field is Marked"),
+ 'ach_inv_id': fields.many2one('account.invoice', 'Buyer Invoice', readonly=True, states={'draft':[('readonly', False)]}),
+ 'sel_inv_id': fields.many2one('account.invoice', 'Seller Invoice', readonly=True, states={'draft':[('readonly', False)]}),
+ 'vnd_lim': fields.float('Seller limit'),
+ 'vnd_lim_net': fields.boolean('Net limit ?', readonly=True),
+ 'image': fields.binary('Image', help="Object Image"),
+ 'paid_vnd':fields.function(_getprice, string='Seller Paid', method=True, type='boolean', store=True, multi="paid_vnd", help="When state of Seller Invoice is 'Paid', This field is selected as True."),
+ 'paid_ach':fields.function(_getprice, string='Buyer Invoice Reconciled', method=True, type='boolean', store=True, multi="paid_ach", help="When state of Buyer Invoice is 'Paid', This field is selected as True."),
'state': fields.selection((
- ('draft', 'Draft'),
- ('unsold', 'Unsold'),
- ('paid', 'Paid'),
- ('sold', 'Sold'),
- ('taken_away', 'Taken away')), 'State', required=True, readonly=True,
+ ('draft', 'Draft'),
+ ('unsold', 'Unsold'),
+ ('paid', 'Paid'),
+ ('sold', 'Sold'),
+ ('taken_away', 'Taken away')), 'State', required=True, readonly=True,
help=' * The \'Draft\' state is used when a object is encoding as a new object. \
\n* The \'Unsold\' state is used when object does not sold for long time, user can also set it as draft state after unsold. \
\n* The \'Paid\' state is used when user pay for the object \
- \n* The \'Sold\' state is used when user buy the object.'),
- 'buyer_price': fields.function(_getprice, method=True, string='Buyer price', store=True, multi="buyer_price", help="Buyer Price"),
- 'seller_price': fields.function(_getprice, method=True, string='Seller price', store=True, multi="seller_price", help="Seller Price"),
- 'gross_revenue':fields.function(_getprice, method=True, string='Gross revenue', store=True, multi="gross_revenue", help="Buyer Price - Seller Price"),
- 'gross_margin':fields.function(_getprice, method=True, string='Gross Margin (%)', store=True, multi="gross_margin", help="(Gross Revenue*100.0)/ Object Price"),
- 'costs':fields.function(_getprice, method=True, string='Indirect costs', store=True, multi="costs", help="Deposit cost"),
- 'statement_id': fields.many2many('account.bank.statement.line', 'auction_statement_line_rel', 'auction_id', 'statement', 'Payment', help="Bank statement Line For Given Buyer"),
- 'net_revenue':fields.function(_getprice, method=True, string='Net revenue', store=True, multi="net_revenue", help="Buyer Price - Seller Price - Indirect Cost"),
- 'net_margin':fields.function(_getprice, method=True, string='Net Margin (%)', store=True, multi="net_margin", help="(Net Revenue * 100)/ Object Price"),
+ \n* The \'Sold\' state is used when user buy the object.'),
+ 'buyer_price': fields.function(_getprice, method=True, string='Buyer price', store=True, multi="buyer_price", help="Buyer Price"),
+ 'seller_price': fields.function(_getprice, method=True, string='Seller price', store=True, multi="seller_price", help="Seller Price"),
+ 'gross_revenue':fields.function(_getprice, method=True, string='Gross revenue', store=True, multi="gross_revenue", help="Buyer Price - Seller Price"),
+ 'gross_margin':fields.function(_getprice, method=True, string='Gross Margin (%)', store=True, multi="gross_margin", help="(Gross Revenue*100.0)/ Object Price"),
+ 'costs':fields.function(_getprice, method=True, string='Indirect costs', store=True, multi="costs", help="Deposit cost"),
+ 'statement_id': fields.many2many('account.bank.statement.line', 'auction_statement_line_rel', 'auction_id', 'statement', 'Payment', help="Bank statement Line For Given Buyer"),
+ 'net_revenue':fields.function(_getprice, method=True, string='Net revenue', store=True, multi="net_revenue", help="Buyer Price - Seller Price - Indirect Cost"),
+ 'net_margin':fields.function(_getprice, method=True, string='Net Margin (%)', store=True, multi="net_margin", help="(Net Revenue * 100)/ Object Price"),
}
_defaults = {
- 'state':lambda *a: 'draft',
- 'lot_num':lambda *a:1,
- 'is_ok': lambda *a: False,
+ 'state':lambda *a: 'draft',
+ 'lot_num':lambda *a:1,
+ 'is_ok': lambda *a: False,
}
-
+
def name_get(self, cr, user, ids, context=None):
if not context:
context={}
@@ -467,7 +467,7 @@ class auction_lots(osv.osv):
amount+=t['amount']
amount_total['value']= amount
amount_total['amount']= amount
-
+
return amount_total
@@ -481,7 +481,7 @@ class auction_lots(osv.osv):
tax_cost_ids.append(border_id.tax_id)
elif lot.auction_id and lot.auction_id.seller_costs:
tax_cost_ids += lot.auction_id.seller_costs
-
+
tax_costs = self.pool.get('account.tax').compute_all(cr, uid, tax_cost_ids, lot.obj_price, 1)['taxes']
# delete useless keys from the costs computed by the tax object... this is useless but cleaner...
for cost in tax_costs:
@@ -497,13 +497,13 @@ class auction_lots(osv.osv):
#FIXME:the string passes have lot 'should go through the system translations.
obj_price_wh_costs = reduce(lambda x, y: x + y['amount'], tax_costs, lot.obj_price)
if obj_price_wh_costs < lot.vnd_lim:
- costs.append({ 'type': 1,
- 'id': lot.obj_num,
- 'name': 'Remise lot '+ str(lot.obj_num),
+ costs.append({ 'type': 1,
+ 'id': lot.obj_num,
+ 'name': 'Remise lot '+ str(lot.obj_num),
'amount': lot.vnd_lim - obj_price_wh_costs}
)
return costs
-
+
def compute_seller_costs(self, cr, uid, ids, manual_only=False):
lots = self.browse(cr, uid, ids)
costs = []
@@ -543,9 +543,9 @@ class auction_lots(osv.osv):
# sum remise limite net and ristourne
def compute_seller_costs_summed(self, cr, uid, ids): #ach_pay_id
-
+
"""This Fuction sum Net remittance limit and refund"""
-
+
taxes = self.compute_seller_costs(cr, uid, ids)
taxes_summed = {}
for tax in taxes:
@@ -567,7 +567,7 @@ class auction_lots(osv.osv):
return taxes_summed.values()
def buyer_proforma(self, cr, uid, ids, context=None):
-
+
if not context:
context={}
invoices = {}
@@ -589,11 +589,10 @@ class auction_lots(osv.osv):
if not invoice_addr_id:
raise orm.except_orm(_('No Invoice Address'), _('The Buyer "%s" has no Invoice Address.') % (contact_addr_id,))
inv = {
- 'name': 'Auction proforma:' +lot.name,
- 'journal_id': lot.auction_id.journal_id.id,
- 'partner_id': partner_ref,
- 'type': 'out_invoice',
- # 'state':'proforma',
+ 'name': 'Auction proforma:' +lot.name,
+ 'journal_id': lot.auction_id.journal_id.id,
+ 'partner_id': partner_ref,
+ 'type': 'out_invoice',
}
inv.update(inv_ref.onchange_partner_id(cr, uid, [], 'out_invoice', partner_ref)['value'])
inv['account_id'] = inv['account_id'] and inv['account_id'][0]
@@ -648,10 +647,10 @@ class auction_lots(osv.osv):
contact_addr_id = res['contact']
invoice_addr_id = res['invoice']
inv = {
- 'name': 'Auction:' +lot.name,
- 'journal_id': lot.auction_id.journal_seller_id.id,
- 'partner_id': lot.bord_vnd_id.partner_id.id,
- 'type': 'in_invoice',
+ 'name': 'Auction:' +lot.name,
+ 'journal_id': lot.auction_id.journal_seller_id.id,
+ 'partner_id': lot.bord_vnd_id.partner_id.id,
+ 'type': 'in_invoice',
}
inv.update(inv_ref.onchange_partner_id(cr, uid, [], 'in_invoice', lot.bord_vnd_id.partner_id.id)['value'])
inv_id = inv_ref.create(cr, uid, inv, context)
@@ -666,14 +665,14 @@ class auction_lots(osv.osv):
taxes += map(lambda x: x.id, lot.auction_id.seller_costs)
inv_line= {
- 'invoice_id': inv_id,
- 'quantity': 1,
- 'product_id': lot.product_id.id,
- 'name': '['+str(lot.obj_num)+'] '+lot.auction_id.name,
- 'invoice_line_tax_id': [(6, 0, taxes)],
- 'account_analytic_id': lot.auction_id.account_analytic_id.id,
- 'account_id': lot.auction_id.acc_expense.id,
- 'price_unit': lot.obj_price,
+ 'invoice_id': inv_id,
+ 'quantity': 1,
+ 'product_id': lot.product_id.id,
+ 'name': '['+str(lot.obj_num)+'] '+lot.auction_id.name,
+ 'invoice_line_tax_id': [(6, 0, taxes)],
+ 'account_analytic_id': lot.auction_id.account_analytic_id.id,
+ 'account_id': lot.auction_id.acc_expense.id,
+ 'price_unit': lot.obj_price,
}
inv_line_obj.create(cr, uid, inv_line, context)
inv_ref.button_compute(cr, uid, invoices.values())
@@ -715,11 +714,11 @@ class auction_lots(osv.osv):
price = lot.obj_price or 0.0
lot_name =lot.obj_num
inv = {
- 'name':lot.auction_id.name or '',
- 'reference': lot.ach_login,
- 'journal_id': lot.auction_id.journal_id.id,
- 'partner_id': lot.ach_uid.id,
- 'type': 'out_invoice',
+ 'name':lot.auction_id.name or '',
+ 'reference': lot.ach_login,
+ 'journal_id': lot.auction_id.journal_id.id,
+ 'partner_id': lot.ach_uid.id,
+ 'type': 'out_invoice',
}
if invoice_number:
inv['number'] = invoice_number
@@ -734,14 +733,14 @@ class auction_lots(osv.osv):
taxes.append(lot.author_right.id)
inv_line= {
- 'invoice_id': inv_id,
- 'quantity': 1,
- 'product_id': lot.product_id.id,
- 'name': '['+str(lot.obj_num)+'] '+ lot.name,
- 'invoice_line_tax_id': [(6, 0, taxes)],
- 'account_analytic_id': lot.auction_id.account_analytic_id.id,
- 'account_id': lot.auction_id.acc_income.id,
- 'price_unit': lot.obj_price,
+ 'invoice_id': inv_id,
+ 'quantity': 1,
+ 'product_id': lot.product_id.id,
+ 'name': '['+str(lot.obj_num)+'] '+ lot.name,
+ 'invoice_line_tax_id': [(6, 0, taxes)],
+ 'account_analytic_id': lot.auction_id.account_analytic_id.id,
+ 'account_id': lot.auction_id.acc_income.id,
+ 'price_unit': lot.obj_price,
}
inv_line_obj.create(cr, uid, inv_line, context)
inv_ref.button_compute(cr, uid, [inv_id])
@@ -756,21 +755,21 @@ auction_lots()
#----------------------------------------------------------
class auction_bid(osv.osv):
"""Bid Auctions"""
-
+
_name = "auction.bid"
_description=__doc__
_order = 'id desc'
_columns = {
- 'partner_id': fields.many2one('res.partner', 'Buyer Name', required=True),
- 'contact_tel':fields.char('Contact', size=64),
- 'name': fields.char('Bid ID', size=64, required=True),
- 'auction_id': fields.many2one('auction.dates', 'Auction Date', required=True),
- 'bid_lines': fields.one2many('auction.bid_line', 'bid_id', 'Bid'),
+ 'partner_id': fields.many2one('res.partner', 'Buyer Name', required=True),
+ 'contact_tel':fields.char('Contact', size=64),
+ 'name': fields.char('Bid ID', size=64, required=True),
+ 'auction_id': fields.many2one('auction.dates', 'Auction Date', required=True),
+ 'bid_lines': fields.one2many('auction.bid_line', 'bid_id', 'Bid'),
}
_defaults = {
- 'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'auction.bid'),
+ 'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'auction.bid'),
}
-
+
def onchange_contact(self, cr, uid, ids, partner_id):
if not partner_id:
return {'value': {'contact_tel':False}}
@@ -785,13 +784,13 @@ auction_bid()
class auction_lot_history(osv.osv):
"""Lot History"""
-
+
_name = "auction.lot.history"
_description=__doc__
_columns = {
- 'name': fields.date('Date', size=64),
- 'lot_id': fields.many2one('auction.lots', 'Object', required=True, ondelete='cascade'),
- 'auction_id': fields.many2one('auction.dates', 'Auction date', required=True, ondelete='cascade'),
+ 'name': fields.date('Date', size=64),
+ 'lot_id': fields.many2one('auction.lots', 'Object', required=True, ondelete='cascade'),
+ 'auction_id': fields.many2one('auction.dates', 'Auction date', required=True, ondelete='cascade'),
'price': fields.float('Withdrawn price', digits=(16, 2))
}
_defaults = {
@@ -804,11 +803,11 @@ class auction_bid_lines(osv.osv):
_description="Bid"
_columns = {
- 'name': fields.char('Bid date', size=64),
- 'bid_id': fields.many2one('auction.bid', 'Bid ID', required=True, ondelete='cascade'),
- 'lot_id': fields.many2one('auction.lots', 'Object', required=True, ondelete='cascade'),
- 'call': fields.boolean('To be Called'),
- 'price': fields.float('Maximum Price'),
+ 'name': fields.char('Bid date', size=64),
+ 'bid_id': fields.many2one('auction.bid', 'Bid ID', required=True, ondelete='cascade'),
+ 'lot_id': fields.many2one('auction.lots', 'Object', required=True, ondelete='cascade'),
+ 'call': fields.boolean('To be Called'),
+ 'price': fields.float('Maximum Price'),
'auction': fields.char(string='Auction Name', size=64)
}
_defaults = {
diff --git a/addons/auction/auction_demo.xml b/addons/auction/auction_demo.xml
index 0103d4c3f8e..51d9c166178 100644
--- a/addons/auction/auction_demo.xml
+++ b/addons/auction/auction_demo.xml
@@ -34,12 +34,12 @@
Auction Adjudications
A7x*
-
+
receivable
-
+
Auction Adjudication Expenses
A6x*
@@ -128,7 +128,7 @@
default
-
+
Louvain-la-Neuve
Thomas Passot
@@ -141,12 +141,12 @@
-
+
Philippe Lavilier
1345-1450
-
+
POREAU OSWALD
1877-1955
@@ -195,7 +195,7 @@
-
+
TVA
0.12
@@ -211,7 +211,7 @@
-
+
Buyer Costs
0.21
@@ -219,7 +219,7 @@
-
+
Seller Costs1
-0.10
@@ -227,7 +227,7 @@
-
+
Seller Costs
-0.10
@@ -253,7 +253,7 @@
-
+
Oeuvres a 21%
@@ -267,7 +267,7 @@
1
-
+
Furniture
2
@@ -279,7 +279,7 @@
2
-
+
Sculpture
10
@@ -389,7 +389,6 @@
-
@@ -403,10 +402,8 @@
4
0.00
-
-
@@ -420,17 +417,14 @@
4
375
-
-
Plastic glass
5
-
300
500
show pices
@@ -462,7 +456,6 @@
bresslet
7
-
150
400
show pices
@@ -478,7 +471,6 @@
gold chain
11
-
400
700
show pices
@@ -494,7 +486,6 @@
fiber glass
8
-
300
500
show pices
@@ -510,7 +501,6 @@
lake photos
9
-
100
200
show pices
@@ -526,7 +516,6 @@
mobile photos
10
-
4500
4700
show models
@@ -542,7 +531,6 @@
Antique photos
11
-
1600
2200
show map Items
@@ -558,7 +546,6 @@
Hardware photos
12
-
2600
2800
show map Items
@@ -590,7 +577,6 @@
mobile accesories photos
13
-
1600
2200
show map Items
@@ -606,7 +592,6 @@
pikes-candles
14
-
30
50
show map Items
@@ -622,7 +607,6 @@
Coffee Service
15
-
10
20
show map Items
@@ -823,9 +807,7 @@
Demo
-
-
@@ -836,43 +818,43 @@
sign_in
-
+
sign_out
-
+
sign_in
-
+
sign_out
-
+
sign_in
-
+
sign_out
-
+
sign_in
-
+
sign_out
@@ -886,43 +868,43 @@
sign_in
-
+
sign_out
-
+
sign_in
-
+
sign_out
-
+
sign_in
-
+
sign_out
-
+
sign_in
-
+
sign_out
diff --git a/addons/auction/auction_report.xml b/addons/auction/auction_report.xml
index 885c08582ee..4df44c9c96a 100644
--- a/addons/auction/auction_report.xml
+++ b/addons/auction/auction_report.xml
@@ -1,7 +1,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/auction/auction_wizard.xml b/addons/auction/auction_wizard.xml
index ab1b051add5..70caa14cd3b 100644
--- a/addons/auction/auction_wizard.xml
+++ b/addons/auction/auction_wizard.xml
@@ -1,45 +1,6 @@
-
-
diff --git a/addons/auction/board_auction_demo.xml b/addons/auction/board_auction_demo.xml
index f260f8bb1fc..1727d6a3522 100644
--- a/addons/auction/board_auction_demo.xml
+++ b/addons/auction/board_auction_demo.xml
@@ -2,13 +2,6 @@
-
-
-
-
-
-
-
diff --git a/addons/auction/board_auction_view.xml b/addons/auction/board_auction_view.xml
index 8a183c267d8..8865550949e 100644
--- a/addons/auction/board_auction_view.xml
+++ b/addons/auction/board_auction_view.xml
@@ -10,20 +10,19 @@
form
tree,form
-
+
auction.deposit
form
tree,form
-
-
+
+
report.auction.estimation.adj.category.tree
auction.lots
tree
-
@@ -47,13 +46,13 @@
-
+
Min est/Adj/Max est
auction.lots
form
graph,tree
-
+
board.auction.form
@@ -103,9 +102,9 @@
menu
-
+
-
+
"),
]
for key,val in regex:
diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py
index fbee18b9476..236a62c9eb4 100644
--- a/addons/base_setup/__openerp__.py
+++ b/addons/base_setup/__openerp__.py
@@ -44,7 +44,6 @@
'update_xml': ['security/ir.model.access.csv',
'base_setup_installer.xml',
'base_setup_todo.xml',
-# 'gtk_contact_form.xml'
],
'demo_xml': ['base_setup_demo.xml'],
'installable': True,
diff --git a/addons/base_setup/base_setup_demo.xml b/addons/base_setup/base_setup_demo.xml
index ce0b4a7bbb6..39f923a895b 100644
--- a/addons/base_setup/base_setup_demo.xml
+++ b/addons/base_setup/base_setup_demo.xml
@@ -1,10 +1,6 @@
-
-
-
-
-
+
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index ceb915e1212..a4b4b2bda23 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -37,7 +37,6 @@
-
diff --git a/addons/base_setup/i18n/tr.po b/addons/base_setup/i18n/tr.po
index a568d349d6b..3cc74c5859f 100644
--- a/addons/base_setup/i18n/tr.po
+++ b/addons/base_setup/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:50+0000\n"
+"PO-Revision-Date: 2010-08-22 06:02+0000\n"
"Last-Translator: OpenERP Administrators \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-20 03:37+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_setup
diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py
index 04a20a6f32b..5f293257a91 100644
--- a/addons/base_setup/todo.py
+++ b/addons/base_setup/todo.py
@@ -160,8 +160,6 @@ class res_currency(osv.osv):
context = {}
# We can use the following line,if we want to restrict this name_get for company setup only
# But, its better to show currencies as name(Code).
-# if not (context.get('active_model','') == 'ir.actions.todo'):
-# return super(res_currency,self).name_get(cr, uid, ids, context=context)
if not len(ids):
return []
if isinstance(ids, (int, long)):
diff --git a/addons/base_vat/base_vat.py b/addons/base_vat/base_vat.py
index 5cba9ea7053..8480b05eae9 100644
--- a/addons/base_vat/base_vat.py
+++ b/addons/base_vat/base_vat.py
@@ -151,10 +151,6 @@ class res_partner(osv.osv):
check = 11 - (sum % 11)
if check == 11:
check = 0
-# if check == 10:
-# return False
-# if check != int(vat[9]):
-# return False
return True
def check_vat_cy(self, vat):
@@ -413,8 +409,6 @@ class res_partner(osv.osv):
check = 10 - (sum % 10)
if check == 10:
check = 0
-# if check != int(vat[8]):
-# return False
return True
#Legal persons with non-profit aim
elif vat[0] in ('N', 'P', 'Q', 'R', 'S', 'W'):
@@ -924,8 +918,6 @@ class res_partner(osv.osv):
check = 11 - (sum % 11)
if check == 10 or check == 11:
check = 0
-# if check != int(vat[8]):
-# return False
return True
def check_vat_ro(self, vat):
@@ -992,9 +984,6 @@ class res_partner(osv.osv):
if int(vat[9:11]) < 0:
return False
-# if int(vat[-2:]) != 1:
-# return False
-
sum = mult_add(2, int(vat[0])) + int(vat[1]) + \
mult_add(2, int(vat[2])) + int(vat[3]) + \
mult_add(2, int(vat[4])) + int(vat[5]) + \
diff --git a/addons/base_vat/i18n/tr.po b/addons/base_vat/i18n/tr.po
index d9bbd9cecc5..dcf66fbe23f 100644
--- a/addons/base_vat/i18n/tr.po
+++ b/addons/base_vat/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:51+0000\n"
+"PO-Revision-Date: 2010-08-22 06:02+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:37+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_vat
diff --git a/addons/board/i18n/tr.po b/addons/board/i18n/tr.po
index 7490b1b5016..ebd435301fc 100644
--- a/addons/board/i18n/tr.po
+++ b/addons/board/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:50+0000\n"
+"PO-Revision-Date: 2010-08-22 06:02+0000\n"
"Last-Translator: OpenERP Administrators \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: board
diff --git a/addons/caldav/caldav_node.py b/addons/caldav/caldav_node.py
index c6e21c46e77..63e683bafb7 100644
--- a/addons/caldav/caldav_node.py
+++ b/addons/caldav/caldav_node.py
@@ -143,11 +143,6 @@ class node_calendar(nodes.node_class):
def get_domain(self, cr, filters):
# TODO: doc.
res = []
- # dirobj = self.context._dirobj
- #uid = self.context.uid
- #ctx = self.context.context.copy()
- #ctx.update(self.dctx)
- # calendar_obj = dirobj.pool.get('basic.calendar')
if not filters:
return res
if filters.localName == 'calendar-query':
@@ -217,9 +212,6 @@ class node_calendar(nodes.node_class):
if not domain:
domain = []
- #for opr1, opt, opr2 in domain:
- # if opr1 == 'type' and opr2 != self.cal_type:
- # return []
fil_obj = dirobj.pool.get('basic.calendar')
ids = fil_obj.search(cr, uid, domain)
@@ -245,7 +237,7 @@ class node_calendar(nodes.node_class):
# that have been imported. ICS may have had more elements,
# but only one node can be returned here.
assert isinstance(res[0], (int, long))
- fnodes = fil_obj.get_calendar_objects(cr, uid, [self.calendar_id], self,
+ fnodes = fil_obj.get_calendar_objects(cr, uid, [self.calendar_id], self,
domain=[('id','=',res[0])], context=ctx)
return fnodes[0]
return None
diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py
index 073be9c226b..10c283213bd 100644
--- a/addons/caldav/calendar.py
+++ b/addons/caldav/calendar.py
@@ -91,7 +91,7 @@ def mailto2str(arg):
args = [arg,]
else:
args = arg
-
+
for ard in args:
rstr = ard.get('name','')
if ard.get('company',False):
@@ -108,12 +108,12 @@ def str2mailto(emailstr, multi=False):
"""
# TODO: move to tools or sth.
mege = re.compile(r'([^\(\<]+) *(\((.*?)\))? *(\< ?(.*?) ?\>)? ?(\((.*?)\))? *$')
-
+
mailz= [emailstr,]
retz = []
if multi:
mailz = emailstr.split(',')
-
+
for mas in mailz:
m = mege.match(mas.strip())
if not m:
@@ -121,17 +121,17 @@ def str2mailto(emailstr, multi=False):
# retz.append({ 'name': mas.strip() })
# continue
raise ValueError("Invalid email address %r" % mas)
- rd = { 'name': m.group(1).strip(),
+ rd = { 'name': m.group(1).strip(),
'email': m.group(5), }
if m.group(2):
rd['company'] = m.group(3).strip()
elif m.group(6):
rd['company'] = m.group(7).strip()
-
+
if rd['name'].startswith('"') and rd['name'].endswith('"'):
rd['name'] = rd['name'][1:-1]
retz.append(rd)
-
+
if multi:
return retz
else:
@@ -230,8 +230,6 @@ def map_data(cr, uid, obj, context=None):
class CalDAV(object):
__attribute__ = {}
-
-
def ical_set(self, name, value, type):
""" set calendar Attribute
@param self: The object pointer,
@@ -294,13 +292,13 @@ class CalDAV(object):
att_data = []
exdates = []
_server_tzinfo = pytz.timezone(tools.get_server_timezone())
-
+
for cal_data in child.getChildren():
if cal_data.name.lower() == 'organizer':
dmail = { 'name': cal_data.params.get('CN', ['',])[0],
'email': cal_data.value.lower().replace('mailto:',''),
# TODO: company?
- }
+ }
self.ical_set(cal_data.name.lower(), mailto2str(dmail), 'value')
continue
if cal_data.name.lower() == 'attendee':
diff --git a/addons/crm/board_crm_demo.xml b/addons/crm/board_crm_demo.xml
index 76caab9208c..9151d787af9 100644
--- a/addons/crm/board_crm_demo.xml
+++ b/addons/crm/board_crm_demo.xml
@@ -6,13 +6,6 @@
Administrator shortcut
Demo user startup menu
-->
-
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 331dd790ab3..cf3b89c1681 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -2,8 +2,6 @@
-
-
-
-
-
diff --git a/addons/crm/i18n/fi.po b/addons/crm/i18n/fi.po
index 484b0cae327..da3d4536e14 100644
--- a/addons/crm/i18n/fi.po
+++ b/addons/crm/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-19 05:45+0000\n"
+"PO-Revision-Date: 2010-08-22 05:55+0000\n"
"Last-Translator: OpenERP Administrators \n"
"Language-Team: Finnish \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-20 03:37+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 03:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
diff --git a/addons/crm/i18n/hr.po b/addons/crm/i18n/hr.po
index 5ccb24fcb02..f0dfe75f0c7 100644
--- a/addons/crm/i18n/hr.po
+++ b/addons/crm/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-19 05:46+0000\n"
+"PO-Revision-Date: 2010-08-22 05:57+0000\n"
"Last-Translator: OpenERP Administrators \n"
"Language-Team: Vinteh\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-20 03:37+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
diff --git a/addons/crm/i18n/lt.po b/addons/crm/i18n/lt.po
index 6ad0e157d2a..2aab37145a5 100644
--- a/addons/crm/i18n/lt.po
+++ b/addons/crm/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-19 05:43+0000\n"
+"PO-Revision-Date: 2010-08-22 05:53+0000\n"
"Last-Translator: Giedrius Slavinskas \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-20 03:37+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 03:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: lt\n"
diff --git a/addons/crm/i18n/pl.po b/addons/crm/i18n/pl.po
index 726f96b3a94..1ee1384bc2a 100644
--- a/addons/crm/i18n/pl.po
+++ b/addons/crm/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-19 05:47+0000\n"
+"PO-Revision-Date: 2010-08-22 05:58+0000\n"
"Last-Translator: OpenERP Administrators \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-20 03:37+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
diff --git a/addons/crm/i18n/pt.po b/addons/crm/i18n/pt.po
index 2b2cdad6aa2..85cfb4b9c7f 100644
--- a/addons/crm/i18n/pt.po
+++ b/addons/crm/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-19 05:43+0000\n"
+"PO-Revision-Date: 2010-08-22 05:53+0000\n"
"Last-Translator: OpenERP Administrators \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-20 03:37+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
diff --git a/addons/crm/i18n/sk.po b/addons/crm/i18n/sk.po
index 16a837df509..a8d48ce0c0e 100644
--- a/addons/crm/i18n/sk.po
+++ b/addons/crm/i18n/sk.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-19 05:46+0000\n"
+"PO-Revision-Date: 2010-08-22 05:56+0000\n"
"Last-Translator: Radoslav Sloboda \n"
"Language-Team: Slovak \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-20 03:37+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
diff --git a/addons/crm/i18n/tr.po b/addons/crm/i18n/tr.po
index f25a15fd991..a5cc66f3938 100644
--- a/addons/crm/i18n/tr.po
+++ b/addons/crm/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-19 05:42+0000\n"
+"PO-Revision-Date: 2010-08-22 05:52+0000\n"
"Last-Translator: OpenERP Administrators \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-20 03:37+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 120bc9f859d..69402603d17 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -75,13 +75,9 @@
-
-
diff --git a/addons/crm/report/report_businessopp.py b/addons/crm/report/report_businessopp.py
index 5bce5fc6ef0..7cadb41359a 100644
--- a/addons/crm/report/report_businessopp.py
+++ b/addons/crm/report/report_businessopp.py
@@ -34,7 +34,6 @@ from report.interface import report_int
from pychart import *
theme.use_color = 1
-#theme.scale = 2
random.seed(0)
class external_pdf(render):
diff --git a/addons/crm/wizard/crm_merge_opportunities_view.xml b/addons/crm/wizard/crm_merge_opportunities_view.xml
index 5ee0eda5375..b6af1f27e8e 100644
--- a/addons/crm/wizard/crm_merge_opportunities_view.xml
+++ b/addons/crm/wizard/crm_merge_opportunities_view.xml
@@ -34,16 +34,5 @@
new
-
-
-
\ No newline at end of file
diff --git a/addons/crm/wizard/crm_partner_to_opportunity.py b/addons/crm/wizard/crm_partner_to_opportunity.py
index f234f9caa92..0df19df8eb7 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity.py
+++ b/addons/crm/wizard/crm_partner_to_opportunity.py
@@ -47,7 +47,6 @@ class crm_partner2opportunity(osv.osv_memory):
@return : default values of fields.
"""
partner_obj = self.pool.get('res.partner')
- #data = context and context.get('active_id', False) or False
data = context and context.get('active_ids', []) or []
res = super(crm_partner2opportunity, self).default_get(cr, uid, fields, context=context)
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 37fd3ec015a..3a1e8f45f26 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -75,13 +75,9 @@
-
-
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index a0fd2e35583..8e9f1611af6 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -74,13 +74,9 @@
-
-
diff --git a/addons/crm_profiling/crm_profiling_demo.xml b/addons/crm_profiling/crm_profiling_demo.xml
index 9295f009dcc..1789e8bace8 100644
--- a/addons/crm_profiling/crm_profiling_demo.xml
+++ b/addons/crm_profiling/crm_profiling_demo.xml
@@ -53,7 +53,7 @@
51 to 100
-
+
more than 100
@@ -107,16 +107,16 @@
True
-
+
Bronze partners
True
-
+
- Silver partners
+ Silver partners
@@ -147,71 +147,11 @@
True
-
-
+
@@ -227,43 +167,43 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/addons/crm_profiling/crm_profiling_wizard.xml b/addons/crm_profiling/crm_profiling_wizard.xml
index 089e3604d35..39d436a6bd9 100644
--- a/addons/crm_profiling/crm_profiling_wizard.xml
+++ b/addons/crm_profiling/crm_profiling_wizard.xml
@@ -1,12 +1,5 @@
-
-
-
+
diff --git a/addons/crm_profiling/i18n/tr.po b/addons/crm_profiling/i18n/tr.po
index 100626f18da..46739b0c77a 100644
--- a/addons/crm_profiling/i18n/tr.po
+++ b/addons/crm_profiling/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:54+0000\n"
+"PO-Revision-Date: 2010-08-22 06:06+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm_profiling
diff --git a/addons/delivery/__init__.py b/addons/delivery/__init__.py
index 1a504ed97c3..cfe7327dded 100644
--- a/addons/delivery/__init__.py
+++ b/addons/delivery/__init__.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 .
#
##############################################################################
@@ -26,7 +26,5 @@ import report
import sale
import stock
-#import report
-
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/delivery/i18n/ru.po b/addons/delivery/i18n/ru.po
index 7331e1252f3..413f5923fdc 100644
--- a/addons/delivery/i18n/ru.po
+++ b/addons/delivery/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:39+0000\n"
+"PO-Revision-Date: 2010-08-22 05:48+0000\n"
"Last-Translator: OpenERP Administrators \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-20 03:37+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 03:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
diff --git a/addons/delivery/i18n/tr.po b/addons/delivery/i18n/tr.po
index 446c3d44aa6..ee6757dca03 100644
--- a/addons/delivery/i18n/tr.po
+++ b/addons/delivery/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:49+0000\n"
+"PO-Revision-Date: 2010-08-22 06:02+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:37+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 03:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py
index 3a18406f607..16bbcd41c83 100644
--- a/addons/document/__openerp__.py
+++ b/addons/document/__openerp__.py
@@ -22,7 +22,7 @@
{
'name': 'Integrated Document Management System',
- 'version': '1.99',
+ 'version': '1.1',
'category': 'Generic Modules/Others',
'description': """This is a complete document management system:
* User Authentication
@@ -57,7 +57,7 @@
],
'installable': True,
'active': False,
- 'certificate': None,
+ 'certificate': '0070515416461',
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index 18544b54eac..8fdbac0a5db 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -154,7 +154,6 @@ class document_directory(osv.osv):
def __init__(self, *args, **kwargs):
super(document_directory, self).__init__(*args, **kwargs)
- #self._cache = {}
def onchange_content_id(self, cr, uid, ids, ressource_type_id):
return {}
diff --git a/addons/document/i18n/mn.po b/addons/document/i18n/mn.po
index 47f601e6745..4f179cee64f 100644
--- a/addons/document/i18n/mn.po
+++ b/addons/document/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:43+0000\n"
+"PO-Revision-Date: 2010-08-22 05:54+0000\n"
"Last-Translator: ub121 \n"
"Language-Team: Mongolian \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: document
diff --git a/addons/document/i18n/ru.po b/addons/document/i18n/ru.po
index 8d90f0a5b86..f757433c0ad 100644
--- a/addons/document/i18n/ru.po
+++ b/addons/document/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:55+0000\n"
+"PO-Revision-Date: 2010-08-22 06:06+0000\n"
"Last-Translator: devcode \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: document
diff --git a/addons/document/i18n/tr.po b/addons/document/i18n/tr.po
index 640ca77198c..2a6cc7503c1 100644
--- a/addons/document/i18n/tr.po
+++ b/addons/document/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:54+0000\n"
+"PO-Revision-Date: 2010-08-22 06:05+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: document
diff --git a/addons/document/i18n/zh_CN.po b/addons/document/i18n/zh_CN.po
index 7bd3d0af319..e2d86bb8355 100644
--- a/addons/document/i18n/zh_CN.po
+++ b/addons/document/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:51+0000\n"
+"PO-Revision-Date: 2010-08-22 06:02+0000\n"
"Last-Translator: Black Jack \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: document
diff --git a/addons/document_ftp/__openerp__.py b/addons/document_ftp/__openerp__.py
index 9be245e36a0..09c1ca6a66b 100644
--- a/addons/document_ftp/__openerp__.py
+++ b/addons/document_ftp/__openerp__.py
@@ -41,7 +41,6 @@
'demo_xml': [],
'test': [
'test/document_ftp_test2.yml',
- # 'test/document_ftp_test2.yml',
'test/document_ftp_test4.yml',
],
'installable': True,
diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py
index 952b75d49e1..00f308ff022 100644
--- a/addons/document_ftp/ftpserver/abstracted_fs.py
+++ b/addons/document_ftp/ftpserver/abstracted_fs.py
@@ -14,7 +14,6 @@ import netsvc
from service import security
from osv import osv
-#from document.nodes import node_res_dir, node_res_obj
from document.nodes import get_node_context
def _get_month_name(month):
@@ -74,7 +73,7 @@ class abstracted_fs(object):
cr.execute("SELECT 1 FROM pg_class WHERE relkind = 'r' AND relname = 'ir_module_module'")
if not cr.fetchone():
continue
-
+
cr.execute("SELECT id FROM ir_module_module WHERE name = 'document_ftp' AND state IN ('installed', 'to upgrade') ")
res = cr.fetchone()
if res and len(res):
@@ -85,8 +84,6 @@ class abstracted_fs(object):
finally:
if cr is not None:
cr.close()
- #if db is not None:
- # pooler.close_db(db_name)
return self.db_name_list
def ftpnorm(self, ftppath):
@@ -115,7 +112,7 @@ class abstracted_fs(object):
def ftp2fs(self, path_orig, data):
raise DeprecationWarning()
- def fs2ftp(self, node):
+ def fs2ftp(self, node):
""" Return the string path of a node, in ftp form
"""
res='/'
@@ -123,7 +120,7 @@ class abstracted_fs(object):
paths = node.full_path()
res = '/' + node.context.dbname + '/' + \
_to_decode(os.path.join(*paths))
-
+
return res
def validpath(self, path):
@@ -139,7 +136,7 @@ class abstracted_fs(object):
""" Create a children file-node under node, open it
@return open node_descriptor of the created node
"""
- objname = _to_unicode(objname)
+ objname = _to_unicode(objname)
cr , node, rem = datacr
try:
child = node.child(cr, objname)
@@ -200,7 +197,6 @@ class abstracted_fs(object):
if len(res):
pre = prefix.split('.')
prefix=pre[0] + '.v'+str(len(res))+'.'+pre[1]
- #prefix = prefix + '.'
return self.create(dir,suffix+prefix,text)
@@ -210,7 +206,7 @@ class abstracted_fs(object):
if (not datacr) or datacr == (None, None, None):
self.cwd = '/'
self.cwd_node = None
- return None
+ return None
if not datacr[1]:
raise OSError(1, 'Operation not permitted')
if datacr[1].type not in ('collection','database'):
@@ -225,7 +221,7 @@ class abstracted_fs(object):
cr, node, rem = datacr or (None, None, None)
if not node:
raise OSError(1, 'Operation not permited.')
-
+
try:
basename =_to_unicode(basename)
cdir = node.create_child_collection(cr, basename)
@@ -242,15 +238,15 @@ class abstracted_fs(object):
def get_cr(self, pathname):
raise DeprecationWarning()
-
+
def get_crdata(self, line, mode='file'):
""" Get database cursor, node and remainder data, for commands
-
+
This is the helper function that will prepare the arguments for
any of the subsequent commands.
It returns a tuple in the form of:
@code ( cr, node, rem_path=None )
-
+
@param line An absolute or relative ftp path, as passed to the cmd.
@param mode A word describing the mode of operation, so that this
function behaves properly in the different commands.
@@ -307,7 +303,6 @@ class abstracted_fs(object):
raise OSError(2, 'Authentification Required.')
n = get_node_context(cr, uid, {})
node = n.get_uri(cr, p_parts[1:])
- # self._log.debug("get_crdata(abs): %r" % ( (cr, node, rem_path),))
return (cr, node, rem_path)
else:
# we never reach here if cwd_node is not set
@@ -321,7 +316,6 @@ class abstracted_fs(object):
if node is False and mode not in ('???'):
cr.close()
raise IOError(errno.ENOENT, 'Path does not exist')
- # self._log.debug("get_crdata(rel): %r" % ( (cr, node, rem_path),))
return (cr, node, rem_path)
def get_node_cr_uid(self, node):
@@ -330,15 +324,15 @@ class abstracted_fs(object):
assert node
db = pooler.get_db(node.context.dbname)
return db.cursor(), node.context.uid
-
+
def get_node_cr(self, node):
""" Get the cursor for the database of a node
-
- The cursor is the only thing that a node will not store
+
+ The cursor is the only thing that a node will not store
persistenly, so we have to obtain a new one for each call.
"""
return self.get_node_cr_uid(node)[0]
-
+
def listdir(self, datacr):
"""List the content of a directory."""
class false_node(object):
@@ -349,7 +343,7 @@ class abstracted_fs(object):
uuser = 'root'
ugroup = 'root'
type = 'database'
-
+
def __init__(self, db):
self.path = db
@@ -442,7 +436,7 @@ class abstracted_fs(object):
def getmtime(self, datacr):
"""Return the last modified time as a number of seconds since
the epoch."""
-
+
node = datacr[1]
if node.write_date or node.create_date:
dt = (node.write_date or node.create_date)[:19]
@@ -488,12 +482,11 @@ class abstracted_fs(object):
def get_list_dir(self, datacr):
""""Return an iterator object that yields a directory listing
in a form suitable for LIST command.
- """
+ """
if not datacr:
return None
elif self.isdir(datacr[1]):
listing = self.listdir(datacr)
- #listing.sort()
return self.format_list(datacr[0], datacr[1], listing)
# if path is a file or a symlink we return information about it
elif self.isfile(datacr[1]):
@@ -561,11 +554,11 @@ class abstracted_fs(object):
mtime = mname+' '+time.strftime("%d %H:%M", st_mtime)
except ValueError:
mname=_get_month_name(time.strftime("%m"))
- mtime = mname+' '+time.strftime("%d %H:%M")
+ mtime = mname+' '+time.strftime("%d %H:%M")
fpath = node.path
if isinstance(fpath, (list, tuple)):
fpath = fpath[-1]
- # formatting is matched with proftpd ls output
+ # formatting is matched with proftpd ls output
path=_to_decode(fpath)
yield "%s %3s %-8s %-8s %8s %s %s\r\n" %(perms, nlinks, uname, gname,
size, mtime, path)
@@ -608,7 +601,7 @@ class abstracted_fs(object):
# type + perm
if self.isdir(node):
if 'type' in facts:
- type = 'type=dir;'
+ type = 'type=dir;'
if 'perm' in facts:
perm = 'perm=%s;' %permdir
else:
diff --git a/addons/document_ftp/ftpserver/ftpserver.py b/addons/document_ftp/ftpserver/ftpserver.py
index 0ca322fca12..710494bb9db 100644
--- a/addons/document_ftp/ftpserver/ftpserver.py
+++ b/addons/document_ftp/ftpserver/ftpserver.py
@@ -547,7 +547,6 @@ class ActiveDTP(asyncore.dispatcher):
handler = self.cmd_channel.dtp_handler(self.socket, self.cmd_channel)
self.cmd_channel.data_channel = handler
self.cmd_channel.on_dtp_connection()
- #self.close() # <-- (done automatically)
def handle_expt(self):
self.cmd_channel.respond("425 Can't connect to specified address.")
@@ -1195,7 +1194,7 @@ class AbstractedFS:
size = st.st_size # file size
uname = st.st_uid or "owner"
gname = st.st_gid or "group"
-
+
# stat.st_mtime could fail (-1) if last mtime is too old
# in which case we return the local time as last mtime
try:
@@ -1412,7 +1411,7 @@ class FTPHandler(asynchat.async_chat):
self._epsvall = False
self.__in_dtp_queue = None
self.__out_dtp_queue = None
-
+
self.__errno_responses = {
errno.EPERM: 553,
errno.EINVAL: 504,
@@ -1574,7 +1573,7 @@ class FTPHandler(asynchat.async_chat):
def __check_path(self, cmd, line):
"""Check whether a path is valid."""
-
+
# Always true, we will only check later, once we have a cursor
return True
@@ -1738,7 +1737,7 @@ class FTPHandler(asynchat.async_chat):
self.__out_dtp_queue = (data, isproducer, file)
def log(self, msg):
- """Log a message, including additional identifying session data."""
+ """Log a message, including additional identifying session data."""
log("[%s]@%s:%s %s" %(self.username, self.remote_ip,
self.remote_port, msg))
@@ -1815,7 +1814,7 @@ class FTPHandler(asynchat.async_chat):
why = (err.strerror) or 'Error in command'
self.log('FAIL %s() %s errno=%s: %s.' %(cmdname, uline, err.errno, why))
self.respond('%s %s.' % (str(ret_code), why))
-
+
raise FTPExceptionSent(why)
except Exception, err:
cmdname = function.__name__
@@ -2058,7 +2057,7 @@ class FTPHandler(asynchat.async_chat):
except FTPExceptionSent:
self.fs.close_cr(datacr)
return
-
+
try:
self.log('OK LIST "%s". Transfer starting.' % line)
producer = BufferedIteratorProducer(iterator)
@@ -2084,7 +2083,7 @@ class FTPHandler(asynchat.async_chat):
else:
# if path is a file we just list its name
nodelist = [datacr[1],]
-
+
listing = []
for nl in nodelist:
if isinstance(nl.path, (list, tuple)):
@@ -2094,7 +2093,7 @@ class FTPHandler(asynchat.async_chat):
except FTPExceptionSent:
self.fs.close_cr(datacr)
return
-
+
self.fs.close_cr(datacr)
data = ''
if listing:
@@ -2145,7 +2144,7 @@ class FTPHandler(asynchat.async_chat):
# if no argument, fall back on cwd as default
if not line:
line = ''
-
+
datacr = None
try:
datacr = self.get_crdata2(line, mode='list')
@@ -2532,12 +2531,6 @@ class FTPHandler(asynchat.async_chat):
datacr = None
try:
datacr = self.get_crdata2(line, mode='file')
- #if self.fs.isdir(datacr[1]):
- # why = "%s is not retrievable" %line
- # self.log('FAIL SIZE "%s". %s.' %(line, why))
- # self.respond("550 %s." %why)
- # self.fs.close_cr(datacr)
- # return
size = self.try_as_current_user(self.fs.getsize,(datacr,), line=line)
except FTPExceptionSent:
self.fs.close_cr(datacr)
@@ -2552,7 +2545,7 @@ class FTPHandler(asynchat.async_chat):
3307 style timestamp (YYYYMMDDHHMMSS) as defined in RFC-3659.
"""
datacr = None
-
+
try:
if line.find('/', 1) < 0:
# root or db, just return local
@@ -2561,9 +2554,7 @@ class FTPHandler(asynchat.async_chat):
datacr = self.get_crdata2(line)
if not datacr:
raise IOError(errno.ENOENT, "%s is not retrievable" %line)
- #if not self.fs.isfile(datacr[1]):
- # raise IOError(errno.EPERM, "%s is not a regular file" % line)
-
+
lmt = self.try_as_current_user(self.fs.getmtime, (datacr,), line=line)
lmt = time.strftime("%Y%m%d%H%M%S", time.localtime(lmt))
self.respond("213 %s" %lmt)
diff --git a/addons/document_ftp/wizard/ftp_browse.py b/addons/document_ftp/wizard/ftp_browse.py
index 37aba5158f1..42081c98fd0 100644
--- a/addons/document_ftp/wizard/ftp_browse.py
+++ b/addons/document_ftp/wizard/ftp_browse.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 .
#
##############################################################################
@@ -36,7 +36,6 @@ class document_ftp_browse(osv.osv_memory):
if 'url' in fields:
user_pool = self.pool.get('res.users')
current_user = user_pool.browse(cr, uid, uid, context=context)
- # dir_pool = self.pool.get('document.directory')
data_pool = self.pool.get('ir.model.data')
aid = data_pool._get_id(cr, uid, 'document_ftp', 'action_document_browse')
aid = data_pool.browse(cr, uid, aid, context=context).res_id
@@ -45,7 +44,7 @@ class document_ftp_browse(osv.osv_memory):
if url:
url = url[1]
else:
- url = '%s:%s' %(ftpserver.HOST, ftpserver.PORT)
+ url = '%s:%s' %(ftpserver.HOST, ftpserver.PORT)
res['url'] = 'ftp://%s@%s'%(current_user.login, url)
return res
diff --git a/addons/document_ics/document_ics.py b/addons/document_ics/document_ics.py
index fdcf9d90e30..9133a525afa 100644
--- a/addons/document_ics/document_ics.py
+++ b/addons/document_ics/document_ics.py
@@ -166,7 +166,6 @@ class document_directory_content(osv.osv):
ctx = (context or {})
ctx.update(node.context.context.copy())
ctx.update(node.dctx)
- # print "ICS domain: ", type(content.ics_domain), content.ics_domain
if content.ics_domain:
for d in safe_eval(content.ics_domain,ctx):
# TODO: operator?
@@ -195,7 +194,6 @@ class document_directory_content(osv.osv):
elif ICS_TAGS[enl]=='date':
result[fields[enl]] = event.value.strftime('%Y-%m-%d %H:%M:%S')
- # print "Field ",enl, result[fields[enl]]
elif fields[enl] and funcs[enl] == 'hours':
ntag = fexprs[enl] or 'dtstart'
ts_start = child.getChildValue(ntag, default=False)
@@ -238,9 +236,6 @@ class document_directory_content(osv.osv):
wexpr = [ ( 'id', '=', wematch.group(2) ) ]
- # print "Looking at ", cmodel, " for ", wexpr
- # print "domain=", idomain
-
fobj = self.pool.get(content.object_id.model)
if not wexpr:
@@ -354,7 +349,7 @@ class crm_meeting(osv.osv):
if not default: default = {}
if not context: context = {}
default.update({'code': self.pool.get('ir.sequence').get(cr, uid, 'crm.meeting'), 'id': False})
- return super(crm_meeting, self).copy(cr, uid, id, default, context)
+ return super(crm_meeting, self).copy(cr, uid, id, default, context)
crm_meeting()
diff --git a/addons/document_ics/i18n/tr.po b/addons/document_ics/i18n/tr.po
index 4865c6f187a..aeffa9a1f3a 100644
--- a/addons/document_ics/i18n/tr.po
+++ b/addons/document_ics/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:43+0000\n"
+"PO-Revision-Date: 2010-08-22 05:53+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: document_ics
diff --git a/addons/document_ics/i18n/zh_CN.po b/addons/document_ics/i18n/zh_CN.po
index 5408fe717e7..6973ace526b 100644
--- a/addons/document_ics/i18n/zh_CN.po
+++ b/addons/document_ics/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:41+0000\n"
+"PO-Revision-Date: 2010-08-22 05:49+0000\n"
"Last-Translator: Black Jack \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: document_ics
diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index 798f277580b..f3c8201bafc 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -80,14 +80,14 @@ class openerp_dav_handler(dav_interface):
M_NS={ "DAV:" : dav_interface.M_NS['DAV:'],}
- def __init__(self, parent, verbose=False):
+ def __init__(self, parent, verbose=False):
self.db_name_list=[]
self.parent = parent
self.baseuri = parent.baseuri
self.verbose = verbose
def get_propnames(self, uri):
- props = self.PROPS
+ props = self.PROPS
self.parent.log_message('get propnames: %s' % uri)
cr, uid, pool, dbname, uri2 = self.get_cr(uri)
if not dbname:
@@ -98,7 +98,7 @@ class openerp_dav_handler(dav_interface):
if node:
props = props.copy()
props.update(node.get_dav_props(cr))
- cr.close()
+ cr.close()
return props
def _try_function(self, funct, args, opname='run function', cr=None,
@@ -140,20 +140,20 @@ class openerp_dav_handler(dav_interface):
def _get_dav_supportedlock(self, uri):
raise DAV_NotFound
- def match_prop(self, uri, match, ns, propname):
+ def match_prop(self, uri, match, ns, propname):
if self.M_NS.has_key(ns):
return match == dav_interface.get_prop(self, uri, ns, propname)
cr, uid, pool, dbname, uri2 = self.get_cr(uri)
if not dbname:
if cr: cr.close()
raise DAV_NotFound
- node = self.uri2object(cr, uid, pool, uri2)
+ node = self.uri2object(cr, uid, pool, uri2)
if not node:
cr.close()
raise DAV_NotFound
- res = node.match_dav_eprop(cr, match, ns, propname)
- cr.close()
- return res
+ res = node.match_dav_eprop(cr, match, ns, propname)
+ cr.close()
+ return res
def prep_http_options(self, uri, opts):
"""see HttpOptions._prep_OPTIONS """
@@ -192,7 +192,7 @@ class openerp_dav_handler(dav_interface):
uri -- uri of the object to get the property of
ns -- namespace of the property
pname -- name of the property
- """
+ """
if self.M_NS.has_key(ns):
return dav_interface.get_prop(self, uri, ns, propname)
cr, uid, pool, dbname, uri2 = self.get_cr(uri)
@@ -204,8 +204,8 @@ class openerp_dav_handler(dav_interface):
cr.close()
raise DAV_NotFound
res = node.get_dav_eprop(cr, ns, propname)
- cr.close()
- return res
+ cr.close()
+ return res
def get_db(self, uri, rest_ret=False, allow_last=False):
"""Parse the uri and get the dbname and the rest.
@@ -272,17 +272,17 @@ class openerp_dav_handler(dav_interface):
return self.db_name_list
def get_childs(self, uri, filters=None):
- """ return the child objects as self.baseuris for the given URI """
+ """ return the child objects as self.baseuris for the given URI """
self.parent.log_message('get childs: %s' % uri)
cr, uid, pool, dbname, uri2 = self.get_cr(uri, allow_last=True)
-
- if not dbname:
+
+ if not dbname:
if cr: cr.close()
- res = map(lambda x: self.urijoin(x), self.db_list())
+ res = map(lambda x: self.urijoin(x), self.db_list())
return res
result = []
node = self.uri2object(cr, uid, pool, uri2[:])
-
+
if not node:
if cr: cr.close()
raise DAV_NotFound2(uri2)
@@ -297,12 +297,12 @@ class openerp_dav_handler(dav_interface):
if filters:
domain = node.get_domain(cr, filters)
for d in node.children(cr, domain):
- self.parent.log_message('child: %s' % d.path)
+ self.parent.log_message('child: %s' % d.path)
if fp:
result.append( self.urijoin(dbname,fp,d.path) )
else:
result.append( self.urijoin(dbname,d.path) )
- if cr: cr.close()
+ if cr: cr.close()
return result
def uri2local(self, uri):
@@ -368,11 +368,11 @@ class openerp_dav_handler(dav_interface):
raise DAV_Error, 409
return str(datas) # FIXME!
finally:
- if cr: cr.close()
+ if cr: cr.close()
@memoize(CACHE_SIZE)
def _get_dav_resourcetype(self, uri):
- """ return type of object """
+ """ return type of object """
self.parent.log_message('get RT: %s' % uri)
cr, uid, pool, dbname, uri2 = self.get_cr(uri)
try:
diff --git a/addons/document_webdav/webdav.py b/addons/document_webdav/webdav.py
index 10a7f9db4e6..3b6cf582067 100644
--- a/addons/document_webdav/webdav.py
+++ b/addons/document_webdav/webdav.py
@@ -57,10 +57,10 @@ def mk_prop_response(self, uri, good_props, bad_props, doc):
def _prop_child(xnode, ns, prop, value):
"""Append a property xml node to xnode, with value
-
+
And a little smarter than that, it will consider namespace and
also allow nested properties etc.
-
+
:param ns the namespace of the node
:param prop the name of the property
:param value the value. Can be:
@@ -89,7 +89,7 @@ def mk_prop_response(self, uri, good_props, bad_props, doc):
xnode.appendChild(pe)
def _prop_elem_child(pnode, pns, v, pns_prefix):
-
+
if isinstance(v, list):
for vit in v:
_prop_elem_child(pnode, pns, vit, pns_prefix)
@@ -102,8 +102,6 @@ def mk_prop_response(self, uri, good_props, bad_props, doc):
elif v[1] in namespaces:
ns_prefix="ns"+str(namespaces.index(v[1]))+":"
else:
- # namespaces.append(v[1])
- # nsnum += 1
ns_prefix="ns"+str(nsnum)+":"
need_ns = True
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index 8a83e25456d..44592243480 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -44,7 +44,7 @@ def OpenDAVConfig(**kw):
class OpenDAV:
def __init__(self, **kw):
self.__dict__.update(**kw)
-
+
def getboolean(self, word):
return self.__dict__.get(word, False)
@@ -58,7 +58,7 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler):
verbose = False
protocol_version = 'HTTP/1.1'
_HTTP_OPTIONS= { 'DAV' : ['1',],
- 'Allow' : [ 'GET', 'HEAD', 'COPY', 'MOVE', 'POST', 'PUT',
+ 'Allow' : [ 'GET', 'HEAD', 'COPY', 'MOVE', 'POST', 'PUT',
'PROPFIND', 'PROPPATCH', 'OPTIONS', 'MKCOL',
'DELETE', 'TRACE', 'REPORT', ]
}
@@ -67,7 +67,7 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler):
return False
def _log(self, message):
netsvc.Logger().notifyChannel("webdav",netsvc.LOG_DEBUG,message)
-
+
def handle(self):
self._init_buffer()
@@ -83,7 +83,7 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler):
self.davpath = '/'+config.get_misc('webdav','vdir','webdav')
self.baseuri = "http://%s:%d/"% (self.server.server_name, self.server.server_port)
self.IFACE_CLASS = openerp_dav_handler(self, self.verbose)
-
+
def copymove(self, CLASS):
""" Our uri scheme removes the /webdav/ component from there, so we
need to mangle the header, too.
@@ -98,7 +98,7 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler):
def get_davpath(self):
return self.davpath
-
+
def log_message(self, format, *args):
netsvc.Logger().notifyChannel('webdav', netsvc.LOG_DEBUG_RPC, format % args)
@@ -111,7 +111,6 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler):
uri=urlparse.urljoin(self.get_baseuri(dc), self.path)
uri=urllib.unquote(uri)
try:
- #location = dc.put(uri,body,ct)
ret = dc.prep_http_options(uri, opts)
except DAV_Error, (ec,dd):
pass
@@ -119,7 +118,7 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler):
self.log_error("Error at options: %s", str(e))
raise
return ret
-
+
def send_response(self, code, message=None):
# the BufferingHttpServer will send Connection: close , while
# the BaseHTTPRequestHandler will only accept int code.
@@ -148,15 +147,15 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler):
ctype=ctype, headers=headers)
def do_PUT(self):
- dc=self.IFACE_CLASS
+ dc=self.IFACE_CLASS
uri=urlparse.urljoin(self.get_baseuri(dc), self.path)
uri=urllib.unquote(uri)
# Handle If-Match
if self.headers.has_key('If-Match'):
test = False
etag = None
-
- for match in self.headers['If-Match'].split(','):
+
+ for match in self.headers['If-Match'].split(','):
if match.startswith('"') and match.endswith('"'):
match = match[1:-1]
if match == '*':
@@ -175,7 +174,7 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler):
# Handle If-None-Match
if self.headers.has_key('If-None-Match'):
test = True
- etag = None
+ etag = None
for match in self.headers['If-None-Match'].split(','):
if match == '*':
if dc.exists(uri):
@@ -259,14 +258,14 @@ class DAVAuthProvider(OpenERPAuthProvider):
try:
if (config.get_misc('webdav','enable',True)):
- directory = '/'+config.get_misc('webdav','vdir','webdav')
+ directory = '/'+config.get_misc('webdav','vdir','webdav')
handler = DAVHandler
verbose = config.get_misc('webdav','verbose',True)
handler.debug = config.get_misc('webdav','debug',True)
_dc = { 'verbose' : verbose,
'directory' : directory,
'lockemulation' : False,
-
+
}
conf = OpenDAVConfig(**_dc)
diff --git a/addons/email_template/email_template_account.py b/addons/email_template/email_template_account.py
index 62f49646cc6..b54d0fac4c5 100644
--- a/addons/email_template/email_template_account.py
+++ b/addons/email_template/email_template_account.py
@@ -34,6 +34,36 @@ import netsvc
import datetime
from tools.translate import _
import tools
+import logging
+
+EMAIL_PATTERN = re.compile(r'([^()\[\] ,<:\\>@";]+@[^()\[\] ,<:\\>@";]+)') # See RFC822
+def extract_emails(emails_str):
+ """
+ Returns a list of email addresses recognized in a string, ignoring the rest of the string.
+ extract_emails('a@b.com,c@bcom, "John Doe" , e@b.com') -> ['a@b.com','c@bcom', 'd@b.com', 'e@b.com']"
+ """
+ return EMAIL_PATTERN.findall(emails_str)
+
+
+def extract_emails_from_dict(addresses={}):
+ """
+ Extracts email addresses from a dictionary with comma-separated address string values, handling
+ separately the To, CC, BCC and Reply-To addresses.
+
+ :param addresses: a dictionary of addresses in the form {'To': 'a@b.com,c@bcom; d@b.com;e@b.com' , 'CC': 'e@b.com;f@b.com', ... }
+ :return: a dictionary with a list of separate addresses for each header (To, CC, BCC), with an additional key 'all-recipients'
+ containing all addresses for the 'To', 'CC', 'BCC' entries.
+ """
+ result = {'all-recipients':[]}
+ keys = ['To', 'CC', 'BCC', 'Reply-To']
+ for each in keys:
+ emails = extract_emails(addresses.get(each, u''))
+ while u'' in emails:
+ emails.remove(u'')
+ result[each] = emails
+ if each != 'Reply-To':
+ result['all-recipients'].extend(emails)
+ return result
class email_template_account(osv.osv):
"""
@@ -264,32 +294,9 @@ class email_template_account(osv.osv):
return False
#**************************** MAIL SENDING FEATURES ***********************#
- def split_to_ids(self, ids_as_str):
- """
- Identifies email IDs separated by separators
- and returns a list
- TODO: Doc this
- "a@b.com,c@bcom; d@b.com;e@b.com->['a@b.com',...]"
- """
- email_sep_by_commas = ids_as_str \
- .replace('; ', ',') \
- .replace(';', ',') \
- .replace(', ', ',')
- return email_sep_by_commas.split(',')
-
- def get_ids_from_dict(self, addresses={}):
- """
- TODO: Doc this
- """
- result = {'all':[]}
- keys = ['To', 'CC', 'BCC', 'Reply-To']
- for each in keys:
- ids_as_list = self.split_to_ids(addresses.get(each, u''))
- while u'' in ids_as_list:
- ids_as_list.remove(u'')
- result[each] = ids_as_list
- result['all'].extend(ids_as_list)
- return result
+
+
+
def send_mail(self, cr, uid, ids, addresses, subject='', body=None, payload=None, message_id=None, context=None):
#TODO: Replace all this with a single email object
@@ -328,7 +335,7 @@ class email_template_account(osv.osv):
payload_part['From'] = sender_name + " <" + core_obj.email_id + ">"
payload_part['Organization'] = tools.ustr(core_obj.user.company_id.name)
payload_part['Date'] = formatdate()
- addresses_l = self.get_ids_from_dict(addresses)
+ addresses_l = extract_emails_from_dict(addresses)
if addresses_l['To']:
payload_part['To'] = u','.join(addresses_l['To'])
if addresses_l['CC']:
@@ -368,9 +375,9 @@ class email_template_account(osv.osv):
logger.notifyChannel(_("Email Template"), netsvc.LOG_ERROR, _("Mail from Account %s failed. Probable Reason:MIME Error\nDescription: %s") % (id, error))
return {'error_msg': "Server Send Error\nDescription: %s"%error}
try:
- serv.sendmail(payload_part['From'], addresses_l['all'], payload_part.as_string())
+ serv.sendmail(payload_part['From'], addresses_l['all-recipients'], payload_part.as_string())
except Exception, error:
- logger.notifyChannel(_("Email Template"), netsvc.LOG_ERROR, _("Mail from Account %s failed. Probable Reason:Server Send Error\nDescription: %s") % (id, error))
+ logging.getLogger('email_template').error("Mail from Account %s failed. Probable Reason: Server Send Error\n Description: %s", id, error, exc_info=True)
return {'error_msg': "Server Send Error\nDescription: %s"%error}
#The mail sending is complete
serv.close()
diff --git a/addons/email_template/email_template_mailbox_view.xml b/addons/email_template/email_template_mailbox_view.xml
index ce1b5ee6059..018b1800ccc 100644
--- a/addons/email_template/email_template_mailbox_view.xml
+++ b/addons/email_template/email_template_mailbox_view.xml
@@ -26,13 +26,10 @@
-
-
+
-
diff --git a/addons/email_template/wizard/email_template_send_wizard_view.xml b/addons/email_template/wizard/email_template_send_wizard_view.xml
index 5f2f1641e31..80cce83dbfd 100755
--- a/addons/email_template/wizard/email_template_send_wizard_view.xml
+++ b/addons/email_template/wizard/email_template_send_wizard_view.xml
@@ -31,8 +31,7 @@
-
+
diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml
index 2c483a0f9ae..6b223b2c4d0 100644
--- a/addons/event/board_association_view.xml
+++ b/addons/event/board_association_view.xml
@@ -2,17 +2,6 @@
-
Registration Event report
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 233f3a0e005..e82da17e0f0 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -1,8 +1,6 @@
-
@@ -56,7 +54,7 @@
-
+
@@ -151,7 +149,7 @@
-
+
@@ -330,12 +328,12 @@
-
+
-
+
@@ -359,7 +357,7 @@
-
+
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index d62332af156..8212c9070a4 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -38,9 +38,9 @@
-
-
-
+
+
+
.search
report.event.registration
@@ -60,7 +60,7 @@
separator="1"
domain="[('date','<=', time.strftime('%%Y-%%m-%%d')), ('date','>',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
help="Tasks during last 7 days"/>
-
+
-
+
@@ -87,7 +87,6 @@
-
@@ -108,7 +107,7 @@
{"search_default_user":1,"search_default_month":1,'group_by_no_leaf':1,'group_by':[]}
-
+
tree
@@ -123,9 +122,8 @@
-
-
+
-
+
diff --git a/addons/event/wizard/event_make_invoice.py b/addons/event/wizard/event_make_invoice.py
index 9d2fbe7db50..8540c267ddb 100644
--- a/addons/event/wizard/event_make_invoice.py
+++ b/addons/event/wizard/event_make_invoice.py
@@ -31,7 +31,6 @@ class event_make_invoice(osv.osv_memory):
'grouped': fields.boolean('Group the invoices'),
'invoice_date':fields.date('Invoice Date'),
-# 'invoice_ids': fields.char('Invoice Ids', size=128), # Improve me
}
def view_init(self, cr, uid, fields, context=None):
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 947434052ae..e9dc2b95767 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -38,36 +38,36 @@ class email_server(osv.osv):
_description = "POP/IMAP Server"
_columns = {
- 'name':fields.char('Name', size=256, required=True, readonly=False),
- 'active':fields.boolean('Active', required=False),
+ 'name':fields.char('Name', size=256, required=True, readonly=False),
+ 'active':fields.boolean('Active', required=False),
'state':fields.selection([
- ('draft', 'Not Confirmed'),
- ('wating', 'Waiting for Verification'),
- ('done', 'Confirmed'),
- ], 'State', select=True, readonly=True),
- 'server' : fields.char('Server', size=256, required=True, readonly=True, states={'draft':[('readonly', False)]}),
- 'port' : fields.integer('Port', required=True, readonly=True, states={'draft':[('readonly', False)]}),
+ ('draft', 'Not Confirmed'),
+ ('wating', 'Waiting for Verification'),
+ ('done', 'Confirmed'),
+ ], 'State', select=True, readonly=True),
+ 'server' : fields.char('Server', size=256, required=True, readonly=True, states={'draft':[('readonly', False)]}),
+ 'port' : fields.integer('Port', required=True, readonly=True, states={'draft':[('readonly', False)]}),
'type':fields.selection([
- ('pop', 'POP Server'),
- ('imap', 'IMAP Server'),
- ], 'Server Type', select=True, readonly=False),
- 'is_ssl':fields.boolean('SSL ?', required=False),
- 'attach':fields.boolean('Add Attachments ?', required=False),
- 'date': fields.date('Date', readonly=True, states={'draft':[('readonly', False)]}),
- 'user' : fields.char('User Name', size=256, required=True, readonly=True, states={'draft':[('readonly', False)]}),
- 'password' : fields.char('Password', size=1024, invisible=True, required=True, readonly=True, states={'draft':[('readonly', False)]}),
- 'note': fields.text('Description'),
- 'action_id':fields.many2one('ir.actions.server', 'Reply Email', required=False, domain="[('state','=','email')]"),
- 'object_id': fields.many2one('ir.model', "Model", required=True),
- 'priority': fields.integer('Server Priority', readonly=True, states={'draft':[('readonly', False)]}, help="Priority between 0 to 10, select define the order of Processing"),
- 'user_id':fields.many2one('res.users', 'User', required=False),
+ ('pop', 'POP Server'),
+ ('imap', 'IMAP Server'),
+ ], 'Server Type', select=True, readonly=False),
+ 'is_ssl':fields.boolean('SSL ?', required=False),
+ 'attach':fields.boolean('Add Attachments ?', required=False),
+ 'date': fields.date('Date', readonly=True, states={'draft':[('readonly', False)]}),
+ 'user' : fields.char('User Name', size=256, required=True, readonly=True, states={'draft':[('readonly', False)]}),
+ 'password' : fields.char('Password', size=1024, invisible=True, required=True, readonly=True, states={'draft':[('readonly', False)]}),
+ 'note': fields.text('Description'),
+ 'action_id':fields.many2one('ir.actions.server', 'Reply Email', required=False, domain="[('state','=','email')]"),
+ 'object_id': fields.many2one('ir.model', "Model", required=True),
+ 'priority': fields.integer('Server Priority', readonly=True, states={'draft':[('readonly', False)]}, help="Priority between 0 to 10, select define the order of Processing"),
+ 'user_id':fields.many2one('res.users', 'User', required=False),
}
_defaults = {
- 'state': lambda *a: "draft",
- 'active': lambda *a: True,
- 'priority': lambda *a: 5,
- 'date': lambda *a: time.strftime('%Y-%m-%d'),
- 'user_id': lambda self, cr, uid, ctx: uid,
+ 'state': lambda *a: "draft",
+ 'active': lambda *a: True,
+ 'priority': lambda *a: 5,
+ 'date': lambda *a: time.strftime('%Y-%m-%d'),
+ 'user_id': lambda self, cr, uid, ctx: uid,
}
def check_duplicate(self, cr, uid, ids):
@@ -98,8 +98,6 @@ class email_server(osv.osv):
def button_fetch_mail(self, cr, uid, ids, context={}):
self.fetch_mail(cr, uid, ids)
-# sendmail_thread = threading.Thread(target=self.fetch_mail, args=(cr, uid, ids))
-# sendmail_thread.start()
return True
def _fetch_mails(self, cr, uid, ids=False, context={}):
@@ -125,7 +123,7 @@ class email_server(osv.osv):
imap_server.login(server.user, server.password)
imap_server.select()
- result, data = imap_server.search(None, '(UNSEEN)')
+ result, data = imap_server.search(None, '(UNSEEN)')
for num in data[0].split():
result, data = imap_server.fetch(num, '(RFC822)')
res_id = email_tool.process_email(cr, uid, server.object_id.model, data[0][1], attach=server.attach, context=context)
@@ -180,11 +178,11 @@ class mailgate_message(osv.osv):
_inherit = "mailgate.message"
_columns = {
- 'server_id': fields.many2one('email.server', "Mail Server", readonly=True, select=True),
+ 'server_id': fields.many2one('email.server', "Mail Server", readonly=True, select=True),
'type':fields.selection([
- ('pop', 'POP Server'),
- ('imap', 'IMAP Server'),
- ], 'Server Type', select=True, readonly=True),
+ ('pop', 'POP Server'),
+ ('imap', 'IMAP Server'),
+ ], 'Server Type', select=True, readonly=True),
}
_order = 'id desc'
diff --git a/addons/google_map/google_map.py b/addons/google_map/google_map.py
index 2e4b37653ea..e8e22516db2 100644
--- a/addons/google_map/google_map.py
+++ b/addons/google_map/google_map.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 .
#
##############################################################################
@@ -26,8 +26,6 @@ class res_partner_address(osv.osv):
_name = 'res.partner.address'
_inherit = 'res.partner.address'
_columns = {
-# 'google_map': fields.function(_get_url, method=True,
-# string='Google Map', type='char',),
}
res_partner_address()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/hr_department.py b/addons/hr/hr_department.py
index fb9dcb4966b..596bb80032e 100644
--- a/addons/hr/hr_department.py
+++ b/addons/hr/hr_department.py
@@ -125,7 +125,6 @@ class res_users(osv.osv):
JOIN hr_department as dept ON dept.id = emp.department_id \
WHERE res.user_id = %s AND emp.department_id IS NOT NULL AND dept.manager_id IS NOT NULL', (user_id,))
ids_dept = [x[0] for x in cr.fetchall()]
-# ids_dept = obj_dept.search(cr, uid, [('member_ids', 'in', [user_id])], context=context)
parent_ids = []
if ids_dept:
data_dept = obj_dept.read(cr, uid, ids_dept, ['manager_id'], context=context)
@@ -162,7 +161,6 @@ class res_users(osv.osv):
(SELECT emp.id FROM hr_employee \
JOIN resource_resource r ON r.id = emp.resource_id WHERE r.user_id=' + str(user_id) + ') ')
mgnt_dept_ids = [x[0] for x in cr.fetchall()]
-# mgnt_dept_ids = obj_dept.search(cr, uid, [('manager_id', '=', user_id)], context=context)
ids_dept = obj_dept.search(cr, uid, [('id', 'child_of', mgnt_dept_ids)], context=context)
if ids_dept:
data_dept = obj_dept.read(cr, uid, ids_dept, ['member_ids'], context=context)
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 29e3b04f2c9..c2bb6ac7390 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -72,10 +72,11 @@
hr.department
form
+ Your Company's Departments Structure is used to manage all documents related to employees by departments: expenses and timesheet validation, leaves management, recruitements, etc.
-
+
res.users.form
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index d8ce599c071..659ddfa36e9 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -145,6 +145,7 @@
[]
+ The employee directory contains all data related to your employees: from their photo up to their hourly estimated costs for the timesheets. Employees are managed by departments and can be linked to users to manage their access rights.
@@ -297,8 +298,6 @@
hr.employee
form
tree,form
-
-
@@ -396,6 +395,7 @@
tree,form
{'search_default_Current':1}
+ Job Positions are used to define the jobs, the requirements. You can attach a survey to a job position. This survey will be used in the recruitement process to evaluate the applicants for this job position.
diff --git a/addons/hr/i18n/lt.po b/addons/hr/i18n/lt.po
index f169ea95771..e62435d3e94 100644
--- a/addons/hr/i18n/lt.po
+++ b/addons/hr/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:46+0000\n"
+"PO-Revision-Date: 2010-08-22 05:56+0000\n"
"Last-Translator: Giedrius Slavinskas \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr
diff --git a/addons/hr/i18n/pt_BR.po b/addons/hr/i18n/pt_BR.po
index aa94743ad97..393cf5688f5 100644
--- a/addons/hr/i18n/pt_BR.po
+++ b/addons/hr/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:41+0000\n"
+"PO-Revision-Date: 2010-08-22 05:49+0000\n"
"Last-Translator: OpenERP Administrators \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr
diff --git a/addons/hr/i18n/tr.po b/addons/hr/i18n/tr.po
index d703327eea3..edf64ef2b97 100644
--- a/addons/hr/i18n/tr.po
+++ b/addons/hr/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:45+0000\n"
+"PO-Revision-Date: 2010-08-22 05:56+0000\n"
"Last-Translator: adsiz_1029@hotmail.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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr
diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po
index 221dcc799ba..ccd327f2547 100644
--- a/addons/hr/i18n/zh_CN.po
+++ b/addons/hr/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:41+0000\n"
+"PO-Revision-Date: 2010-08-22 05:49+0000\n"
"Last-Translator: Black Jack \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index fb6911a6656..da3218d9c6c 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -72,6 +72,7 @@
tree,form
{"search_default_employee":1}
+ Time Tracking functionality aims to manage employee's attendances on the basis of the actions (Sign in/Sign out) performed by them. You can also link this to an attendance machine using OpenERP's webservices features.
diff --git a/addons/hr_attendance/i18n/fi.po b/addons/hr_attendance/i18n/fi.po
index d4da9961fee..ed32ffcf103 100644
--- a/addons/hr_attendance/i18n/fi.po
+++ b/addons/hr_attendance/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:37+0000\n"
+"PO-Revision-Date: 2010-08-22 05:37+0000\n"
"Last-Translator: OpenERP Administrators \n"
"Language-Team: Finnish \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/pt_BR.po b/addons/hr_attendance/i18n/pt_BR.po
index 4a2eaeb5eff..c43e87addef 100644
--- a/addons/hr_attendance/i18n/pt_BR.po
+++ b/addons/hr_attendance/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:46+0000\n"
+"PO-Revision-Date: 2010-08-22 05:56+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/tr.po b/addons/hr_attendance/i18n/tr.po
index 24d35b0df14..972de745e7d 100644
--- a/addons/hr_attendance/i18n/tr.po
+++ b/addons/hr_attendance/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:55+0000\n"
+"PO-Revision-Date: 2010-08-22 06:06+0000\n"
"Last-Translator: Angel Spy \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_attendance
diff --git a/addons/hr_attendance/report/attendance_errors.py b/addons/hr_attendance/report/attendance_errors.py
index 2c0455e10d8..b0113aa88d4 100644
--- a/addons/hr_attendance/report/attendance_errors.py
+++ b/addons/hr_attendance/report/attendance_errors.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 .
#
##############################################################################
@@ -37,17 +37,8 @@ class attendance_print(report_sxw.rml_parse):
def _get_employees(self, emp_ids):
emp_obj_list = self.pool.get('hr.employee').browse(self.cr, self.uid, emp_ids)
- return emp_obj_list
-
-# def _sign(self, dt):
-# if abs(dt.days) > 1:
-# format = '%d day'+(((abs(dt.days)>=2) and 's') or '')+' %H:%M:%S'
-# else:
-# format = '%H:%M:%S'
-# if dt.seconds<0:
-# return dt.strftime('- '+format)
-# else:
-# return dt.strftime(format)
+ return emp_obj_list
+
def _lst(self, employee_id, dt_from, dt_to, max, *args):
self.cr.execute("select name as date, create_date, action, create_date-name as delay from hr_attendance where employee_id=%s and to_char(name,'YYYY-mm-dd')<=%s and to_char(name,'YYYY-mm-dd')>=%s and action IN (%s,%s) order by name", (employee_id, dt_to, dt_from, 'sign_in', 'sign_out'))
@@ -57,7 +48,6 @@ class attendance_print(report_sxw.rml_parse):
r['delay'] = -r['delay']
temp = r['delay'].seconds
-# r['delay'] = self._sign(r['delay'])
r['delay'] = str(r['delay']).split('.')[0]
if abs(temp) < max*60:
r['delay2'] = r['delay']
@@ -78,14 +68,13 @@ class attendance_print(report_sxw.rml_parse):
total += r['delay']
if abs(r['delay'].seconds) < max*60:
total2 += r['delay']
-
+
result_dict = {
'total': total and str(total).split('.')[0],
'total2': total2 and str(total2).split('.')[0]
}
-# return (self._sign(total),total2 and self._sign(total2))
return [result_dict]
-
+
report_sxw.report_sxw('report.hr.attendance.error', 'hr.employee', 'addons/hr_attendance/report/attendance_errors.rml', parser=attendance_print, header=2)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
index 8d3aa343b15..e9b5fecf330 100644
--- a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
@@ -19,7 +19,7 @@
- Attendances by month
+ Attendances By Month
ir.actions.act_window
hr.attendance.month
form
@@ -30,7 +30,7 @@
- Attendances by month
+ Attendances By Month
client_print_multi
action
diff --git a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
index ed7ff7a8bc7..b87a3903a80 100644
--- a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
@@ -2,45 +2,5 @@
-
-
diff --git a/addons/hr_contract/i18n/es_EC.po b/addons/hr_contract/i18n/es_EC.po
index 853c4a13f66..570fbe8f22a 100644
--- a/addons/hr_contract/i18n/es_EC.po
+++ b/addons/hr_contract/i18n/es_EC.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-03-23 02:53+0000\n"
+"PO-Revision-Date: 2010-08-20 18:12+0000\n"
"Last-Translator: Cristian Salamea (GnuThink) \n"
"Language-Team: Spanish (Ecuador) \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-12 04:01+0000\n"
+"X-Launchpad-Export-Date: 2010-08-21 03:58+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_contract
@@ -59,7 +59,7 @@ msgstr "Tipos de salario"
#. module: hr_contract
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nombre de modelo inválido en definición de acción"
#. module: hr_contract
#: field:hr.contract,employee_id:0
@@ -74,7 +74,7 @@ msgstr "Neto"
#. module: hr_contract
#: model:ir.module.module,shortdesc:hr_contract.module_meta_information
msgid "Human Resources Contracts"
-msgstr ""
+msgstr "Contratos laborales para recursos humanos"
#. module: hr_contract
#: field:hr.contract.wage.type.period,factor_days:0
@@ -190,7 +190,7 @@ msgstr "Período de salario"
#. module: hr_contract
#: field:hr.employee,audiens_num:0
msgid "AUDIENS Number"
-msgstr ""
+msgstr "Número de AUDIENS"
#. module: hr_contract
#: view:hr.contract:0
diff --git a/addons/hr_contract/i18n/tr.po b/addons/hr_contract/i18n/tr.po
index b12c3462768..683efda8ed4 100644
--- a/addons/hr_contract/i18n/tr.po
+++ b/addons/hr_contract/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:45+0000\n"
+"PO-Revision-Date: 2010-08-22 05:56+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_contract
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index b4743a7ffdc..0b497c461e0 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -36,11 +36,11 @@ class hr_evaluation_plan(osv.osv):
'month_first': fields.integer('First Evaluation After'),
'month_next': fields.integer('Next Evaluation After'),
'active': fields.boolean('Active')
- }
+ }
_defaults = {
'active': True,
'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'account.account', context=c),
- }
+ }
hr_evaluation_plan()
class hr_evaluation_plan_phase(osv.osv):
@@ -131,7 +131,7 @@ class hr_employee(osv.osv):
evaluation_date=(dt.ISO.ParseAny(evaluation_date)+ dt.RelativeDateTime(months=+evaluation_plan.month_next)).strftime('%Y-%m-%d')
flag = True
if ids and flag:
- self.pool.get("hr_evaluation.evaluation").create(cr, uid, {'employee_id': ids[0], 'plan_id': evaluation_plan_id}, context=context)
+ obj_evaluation.create(cr, uid, {'employee_id': ids[0], 'plan_id': evaluation_plan_id}, context=context)
return {'value': {'evaluation_date': evaluation_date}}
def create(self, cr, uid, vals, context=None):
@@ -139,7 +139,7 @@ class hr_employee(osv.osv):
context = {}
id = super(hr_employee, self).create(cr, uid, vals, context=context)
if vals.get('evaluation_plan_id', False):
- obj_evaluation.create(cr, uid, {'employee_id' : id, 'plan_id': vals['evaluation_plan_id']}, context=context)
+ self.pool.get('hr_evaluation.evaluation').create(cr, uid, {'employee_id' : id, 'plan_id': vals['evaluation_plan_id']}, context=context)
return id
hr_employee()
@@ -289,10 +289,10 @@ class hr_evaluation_interview(osv.osv):
'request_id': fields.many2one('survey.request','Request_id', ondelete='cascade', required=True),
'user_to_review_id': fields.many2one('hr.employee', 'Employee to Interview'),
'evaluation_id': fields.many2one('hr_evaluation.evaluation', 'Evaluation Type'),
- }
+ }
_defaults = {
'is_evaluation': True,
- }
+ }
def survey_req_waiting_answer(self, cr, uid, ids, context=None):
if context is None:
diff --git a/addons/hr_evaluation/hr_evaluation_demo.xml b/addons/hr_evaluation/hr_evaluation_demo.xml
index 2c5b290b20a..eaad7d3865d 100644
--- a/addons/hr_evaluation/hr_evaluation_demo.xml
+++ b/addons/hr_evaluation/hr_evaluation_demo.xml
@@ -210,28 +210,6 @@
-
@@ -587,49 +565,6 @@ Once the form had been filled, the employee send it to his supervisor.
-
@@ -1589,16 +1524,6 @@ Once the form had been filled, the employee send it to his supervisor.
-
-
-
-
-
-
-
-
-
-
@@ -1673,28 +1598,6 @@ Once the form had been filled, the employee send it to his supervisor.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Run Employee Evaluation
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 440b1eff322..55bc22ac505 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -201,7 +201,6 @@
tree
-
@@ -261,6 +260,7 @@
form
tree,form,graph
+ Each employee can be assigned to an evaluation plan. These plans define the frequency and the way you manage your periodic personnal evalautions. You will be able to define steps and attach interview forms to each step. OpenERP manages all kind of evaluations: bottom-up, top-down, self evaluation and final evaluation by the manager.
-
@@ -348,6 +344,7 @@
[('is_evaluation' ,'=', True)]
{"search_default_todo":1,"search_default_user_id":uid}
+ Interview Requests are generated automatically by OpenERP according to employees evaluation plan. Each user receives automatic emails and requests to perform evaluation of their collegues periodically.
-
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py b/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
index 4d3917178d7..99d064a67e8 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
+++ b/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
@@ -68,7 +68,6 @@ class job2phonecall(osv.osv_memory):
if context is None:
context = {}
form = self.read(cr, uid, ids, [], context=context)[0]
-# form = data['form']
result = mod_obj._get_id(cr, uid, 'crm', 'view_crm_case_phonecalls_filter')
res = mod_obj.read(cr, uid, result, ['res_id'], context=context)
# Select the view
@@ -88,7 +87,6 @@ class job2phonecall(osv.osv_memory):
'categ_id' : form['category_id'],
'description' : form['note'],
'date' : form['deadline'],
-# 'section_id' : form['section_id'],
'description':job.description,
'partner_id':job.partner_id.id,
'partner_address_id':job.partner_address_id.id,
@@ -99,8 +97,6 @@ class job2phonecall(osv.osv_memory):
}, context=context)
new_phonecall = phonecall_case_obj.browse(cr, uid, new_phonecall_id, context=context)
vals = {}
-# if not job.case_id:
-# vals.update({'phonecall_id' : new_phonecall.id})
job_case_obj.write(cr, uid, [job.id], vals, context=context)
job_case_obj.case_cancel(cr, uid, [job.id])
phonecall_case_obj.case_open(cr, uid, [new_phonecall_id])
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml b/addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml
index f7c162594d2..95fe9c83018 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml
+++ b/addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml
@@ -36,15 +36,5 @@
new
-
-
\ No newline at end of file
diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index ff865d99d9f..ea0826678ec 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -44,7 +44,7 @@ class hr_analytic_timesheet(osv.osv):
_order = "id desc"
_columns = {
'line_id' : fields.many2one('account.analytic.line', 'Analytic line', ondelete='cascade', required=True),
- 'partner_id': fields.related('account_id', 'partner_id', type='many2one', string='Partner Id', relation='account.analytic.account', store=True),
+ 'partner_id': fields.related('account_id', 'partner_id', type='many2one', string='Partner Id', relation='res.partner', store=True),
}
def unlink(self, cr, uid, ids, context=None):
diff --git a/addons/hr_timesheet/hr_timesheet_report.xml b/addons/hr_timesheet/hr_timesheet_report.xml
index 081972582b0..3e5f6c26619 100644
--- a/addons/hr_timesheet/hr_timesheet_report.xml
+++ b/addons/hr_timesheet/hr_timesheet_report.xml
@@ -13,32 +13,8 @@
sequence="5" />
-
-
-
-
-
-
-
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 97e6c4ed1ae..d40d1b8733e 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -68,8 +68,6 @@
-
-
My Working Hours
ir.actions.act_window
@@ -90,6 +88,7 @@
tree,form
{"search_default_user_id":uid}
+ This functionality gives you a list of work done by user, product and analytic account (or project). A search tool allows you to make fine-grained analysis.
diff --git a/addons/hr_timesheet/hr_timesheet_wizard.xml b/addons/hr_timesheet/hr_timesheet_wizard.xml
index fa36c03ae10..ebc084668b7 100644
--- a/addons/hr_timesheet/hr_timesheet_wizard.xml
+++ b/addons/hr_timesheet/hr_timesheet_wizard.xml
@@ -1,8 +1,5 @@
-
+
diff --git a/addons/hr_timesheet/i18n/tr.po b/addons/hr_timesheet/i18n/tr.po
index 1f3676e4cfb..950401cb8dc 100644
--- a/addons/hr_timesheet/i18n/tr.po
+++ b/addons/hr_timesheet/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:39+0000\n"
+"PO-Revision-Date: 2010-08-22 05:48+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_timesheet
diff --git a/addons/hr_timesheet/process/hr_timesheet_process.xml b/addons/hr_timesheet/process/hr_timesheet_process.xml
index 1bb7aeeea60..9b9efa3d19e 100644
--- a/addons/hr_timesheet/process/hr_timesheet_process.xml
+++ b/addons/hr_timesheet/process/hr_timesheet_process.xml
@@ -1,10 +1,6 @@
-
-
-
+
\ No newline at end of file
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
index 98c48e3e124..3b110b52f1d 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -69,10 +69,5 @@
new
-
-
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
index eed0e97ecf7..3463dc92bd8 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
@@ -6,15 +6,8 @@
name="Reporting"
parent="hr.menu_hr_root"
sequence="10" />
-
-
-
-
-
-
-
-
-
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_wizard.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_wizard.xml
index 50ca292d39d..30816750035 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_wizard.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_wizard.xml
@@ -1,8 +1,6 @@
-
-
diff --git a/addons/hr_timesheet_invoice/i18n/tr.po b/addons/hr_timesheet_invoice/i18n/tr.po
index 95f561aede0..624e356824d 100644
--- a/addons/hr_timesheet_invoice/i18n/tr.po
+++ b/addons/hr_timesheet_invoice/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:39+0000\n"
+"PO-Revision-Date: 2010-08-22 05:48+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index d4e25e07a20..163e641582c 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -98,7 +98,6 @@
{'search_default_month':1,'search_default_User':1,'search_default_user_id':uid,'group_by_no_leaf':1,'group_by':[]}
-
@@ -184,7 +183,6 @@
{"search_default_user_id":uid}
-
@@ -250,7 +248,6 @@
{"search_default_user_id":uid}
-
@@ -324,7 +321,6 @@
{"search_default_user_id":uid}
-
@@ -398,7 +394,6 @@
graph,tree
-
@@ -489,29 +484,5 @@
-
-
-
diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
index de46463bb12..32129287470 100644
--- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml
+++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
@@ -57,7 +57,6 @@
tree,graph
[('state','=','open')]
-
report.account.analytic.line.to.invoice
@@ -134,7 +133,6 @@
tree,graph
-
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml
index cf23ae129cd..71706d9cdfe 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml
@@ -30,15 +30,5 @@
new
-
-
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 57a1e4aaaa2..4e1926fe069 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -182,8 +182,6 @@ class hr_timesheet_invoice_create(osv.osv_memory):
details.append("%s" % (line['unit_amount'], ))
if data['name']:
details.append(line['name'])
- #if data['price']:
- # details.append(abs(line['amount']))
note.append(u' - '.join(map(lambda x: unicode(x) or '',details)))
curr_line['note'] = "\n".join(map(lambda x: unicode(x) or '',note))
@@ -202,18 +200,6 @@ class hr_timesheet_invoice_create(osv.osv_memory):
act_win['name'] = _('Invoices')
return act_win
-# return {
-# 'domain': "[('id','in', ["+','.join(map(str,invoices))+"])]",
-# 'name': _('Invoices'),
-# 'view_type': 'form',
-# 'view_mode': 'tree,form',
-# 'res_model': 'account.invoice',
-# 'view_id': False,
-# 'context': "{'type':'out_invoice'}",
-# 'type': 'ir.actions.act_window',
-# 'search_view_id': res['res_id']
-# }
-
hr_timesheet_invoice_create()
diff --git a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
index 0c69af2616b..70d36184980 100644
--- a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
+++ b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
@@ -48,24 +48,5 @@
-
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
index c0e0d1db620..250120c5a45 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
@@ -8,73 +8,12 @@
-
+
Sheet 1
-
-
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 377e1dfafdb..e4c4fde9cc9 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -59,37 +59,7 @@
-
hr.timesheet.sheet.form
hr_timesheet_sheet.sheet
@@ -227,13 +197,12 @@
-
-
-
@@ -322,8 +291,6 @@
-
-
diff --git a/addons/hr_timesheet_sheet/i18n/lt.po b/addons/hr_timesheet_sheet/i18n/lt.po
index 566be19f790..163ccfc76f5 100644
--- a/addons/hr_timesheet_sheet/i18n/lt.po
+++ b/addons/hr_timesheet_sheet/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:47+0000\n"
+"PO-Revision-Date: 2010-08-22 05:58+0000\n"
"Last-Translator: OpenERP Administrators \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/tr.po b/addons/hr_timesheet_sheet/i18n/tr.po
index 8a8e98c2b6c..142f9cb144f 100644
--- a/addons/hr_timesheet_sheet/i18n/tr.po
+++ b/addons/hr_timesheet_sheet/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:47+0000\n"
+"PO-Revision-Date: 2010-08-22 05:57+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
index 1486d7f9bb4..d75968f5f16 100644
--- a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
+++ b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
@@ -9,6 +9,15 @@
partner_id: base.res_partner_desertic_hispafuentes
timesheet_max_difference: 1.0
+-
+ I assign this company to Admin user
+-
+ !record {model: res.users, id: base.user_root}:
+ company_id: res_company_openERP
+ company_ids:
+ - base.main_company
+ - res_company_openERP
+
-
I create a new employee “Mark Johnson”.
-
@@ -81,7 +90,7 @@
I create Timesheet Entry for time spend on today work.
-
- !record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet.sheet1}:
+ !record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_deddk0}:
timesheet_ids:
- account_id: account.analytic_sednacom
date: '05/26/2010'
@@ -98,20 +107,21 @@
if the difference between timesheet hour and attendance hour is more than 1 hour it will give message.
-
!python {model: hr_timesheet_sheet.sheet}: |
- uid = ref('base.user_root')
- import netsvc
- for sheet in self.browse(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')]):
- di = sheet.user_id.company_id.timesheet_max_difference
- if (abs(sheet.total_difference) < di) or not di:
- wf_service = netsvc.LocalService("workflow")
- wf_service.trg_validate(uid, 'hr_timesheet_sheet.sheet', sheet.id, 'confirm', cr)
- else:
- print "Please verify that the total difference of the sheet is lower than %.2f" %di
+ uid = ref('base.user_root')
+ import netsvc
+ try:
+ self.button_confirm(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], {"lang": 'en_US', "active_ids":
+ [ref("hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form")], "tz": False, "active_model":
+ "ir.ui.menu", "department_id": False, "section_id": False, "search_default_my_timesheet":
+ 1, "search_default_user_id": 1, "project_id": False, "active_id": ref("hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form"),
+ })
+ except:
+ pass
-
- I Modified the timesheet record.
+ I Modified the timesheet record and make the difference less than 1 hour.
-
- !record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet.sheet1}:
+ !record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_deddk0}:
timesheet_ids:
- account_id: account.analytic_sednacom
date: '05/26/2010'
diff --git a/addons/idea/i18n/lt.po b/addons/idea/i18n/lt.po
index 072100485c8..51b454cd4b0 100644
--- a/addons/idea/i18n/lt.po
+++ b/addons/idea/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:39+0000\n"
+"PO-Revision-Date: 2010-08-22 05:48+0000\n"
"Last-Translator: OpenERP Administrators \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-20 03:38+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: idea
diff --git a/addons/idea/i18n/zh_CN.po b/addons/idea/i18n/zh_CN.po
index ef1cbfe3c18..2bc71890e13 100644
--- a/addons/idea/i18n/zh_CN.po
+++ b/addons/idea/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:43+0000\n"
+"PO-Revision-Date: 2010-08-22 05:54+0000\n"
"Last-Translator: Black Jack \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-20 03:38+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: idea
diff --git a/addons/idea/security/idea_security.xml b/addons/idea/security/idea_security.xml
index 2bdad417c2f..ef377c799c9 100644
--- a/addons/idea/security/idea_security.xml
+++ b/addons/idea/security/idea_security.xml
@@ -1,13 +1,6 @@
-
-
-
-
-
-
-
Sales / User
diff --git a/addons/l10n_be/account_pcmn_belgium.xml b/addons/l10n_be/account_pcmn_belgium.xml
index f4d7cdd97f2..dc6c86fc9fa 100644
--- a/addons/l10n_be/account_pcmn_belgium.xml
+++ b/addons/l10n_be/account_pcmn_belgium.xml
@@ -29,7 +29,6 @@
Tiers
tiers
-
balance
@@ -47,13 +46,11 @@
Tax
tax
-
unreconciled
Financier
financier
-
balance
diff --git a/addons/l10n_be/i18n/tr.po b/addons/l10n_be/i18n/tr.po
index 2a08a7415bc..c373d34e7da 100644
--- a/addons/l10n_be/i18n/tr.po
+++ b/addons/l10n_be/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:46+0000\n"
+"PO-Revision-Date: 2010-08-22 05:56+0000\n"
"Last-Translator: OpenERP Administrators \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_be
diff --git a/addons/l10n_be/wizard/l10_be_partner_vat_listing.py b/addons/l10n_be/wizard/l10_be_partner_vat_listing.py
index 415db0ba067..bc92086975a 100644
--- a/addons/l10n_be/wizard/l10_be_partner_vat_listing.py
+++ b/addons/l10n_be/wizard/l10_be_partner_vat_listing.py
@@ -90,20 +90,6 @@ class partner_vat(osv.osv_memory):
#it seems that this listing is only for belgian customers
record['country'] = 'BE'
- #...deprecated...
- #~addr = pool.get('res.partner').address_get(cr, uid, [obj_partner.id], ['invoice'])
-
- #~ if addr.get('invoice',False):
- #~ads=pool.get('res.partner.address').browse(cr, uid, [addr['invoice']])[0]
-
- #~ if ads.country_id:
- #~ record.append(ads.country_id.code)
- #~ else:
- #~ error_message.append('Data Insufficient! : '+ 'The Partner "'+obj_partner.name + '"'' has no country associated with its Invoice address!')
-
- #~ if len(record)<2:
- #~ record.append('')
- #~ error_message.append('Data Insufficient! : '+ 'The Partner "'+obj_partner.name + '"'' has no Invoice address!')
record['amount'] = 0
record['turnover'] = 0
@@ -120,7 +106,6 @@ class partner_vat(osv.osv_memory):
model_data_ids = obj_model_data.search(cursor, user, [('model','=','ir.ui.view'), ('name','=','view_vat_listing')])
resource_id = obj_model_data.read(cursor, user, model_data_ids, fields=['res_id'])[0]['res_id']
return {
-# 'domain': "[('id','in', ["+','.join(map(str,data['form']['invoice_ids']))+"])]",
'name': 'Vat Listing',
'view_type': 'form',
'view_mode': 'form',
diff --git a/addons/l10n_ch/i18n/it.po b/addons/l10n_ch/i18n/it.po
index e01d6abb57f..046988c5109 100644
--- a/addons/l10n_ch/i18n/it.po
+++ b/addons/l10n_ch/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:45+0000\n"
+"PO-Revision-Date: 2010-08-22 05:55+0000\n"
"Last-Translator: OpenERP Administrators \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-20 03:40+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/tr.po b/addons/l10n_ch/i18n/tr.po
index 06c83d0cec6..faa4c9ab6cc 100644
--- a/addons/l10n_ch/i18n/tr.po
+++ b/addons/l10n_ch/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:39+0000\n"
+"PO-Revision-Date: 2010-08-22 05:48+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:40+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_ch
diff --git a/addons/l10n_ch/partner.py b/addons/l10n_ch/partner.py
index 256047a1791..1e90ac68e46 100644
--- a/addons/l10n_ch/partner.py
+++ b/addons/l10n_ch/partner.py
@@ -52,24 +52,6 @@ class res_partner_bank(osv.osv):
'dta_code': fields.char('DTA code', size=5),
}
-# def _default_value(self, cursor, user, field, context=None):
-# if field in ('country_id', 'state_id'):
-# value = False
-# else:
-# value = ''
-# if not context.get('address', False):
-# return value
-# for ham, spam, address in context['address']:
-# if 'type' in address.keys() :
-# if address['type'] == 'default':
-# return address[field]
-# elif not address['type']:
-# value = address[field]
-# else :
-# value = False
-# return value
-
-
def name_get(self, cr, uid, ids, context=None):
if not len(ids):
return []
diff --git a/addons/l10n_ch/wizard/create_dta.py b/addons/l10n_ch/wizard/create_dta.py
index e792fe14b07..b9f4078def7 100644
--- a/addons/l10n_ch/wizard/create_dta.py
+++ b/addons/l10n_ch/wizard/create_dta.py
@@ -102,7 +102,6 @@ class record:
value = self.post[field[0]]
else :
pass
- #raise Exception(field[0]+' not found !')
try:
res = res + c_ljust(value, field[1])
except :
diff --git a/addons/l10n_ch_chart_c2c_pcg/account.xml b/addons/l10n_ch_chart_c2c_pcg/account.xml
index fad81d6ab11..c79e189793a 100644
--- a/addons/l10n_ch_chart_c2c_pcg/account.xml
+++ b/addons/l10n_ch_chart_c2c_pcg/account.xml
@@ -46,19 +46,16 @@
Autre : Cloture
closing
-
none
PP : Amortissement
depreciation
-
none
PP : Resultat financier
financial_result
-
none
@@ -92,7 +89,6 @@
Bilan : Dettes hors exploitation
non_ope_debts
-
balance
@@ -123,7 +119,6 @@
PP : Resultat activites annexes
non_oper_result
-
none
@@ -150,20 +145,17 @@
Bilan : Provisions et reserves
provision_reserve
-
balance
PP : Achat de marchandise
purchase
-
none
Bilan : Resultat reporte
report_result
-
balance
@@ -184,21 +176,18 @@
Autre : Consolidation
consolidation
-
none
Autre : Other
other
-
none
Autre : Closed
closed
-
none
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po b/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po
index dcccd81b72b..393fb59d30d 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:46+0000\n"
+"PO-Revision-Date: 2010-08-22 05:56+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:40+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_chart_uk_minimal/i18n/tr.po b/addons/l10n_chart_uk_minimal/i18n/tr.po
index 5d2aab024a7..c317ca11e27 100644
--- a/addons/l10n_chart_uk_minimal/i18n/tr.po
+++ b/addons/l10n_chart_uk_minimal/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:44+0000\n"
+"PO-Revision-Date: 2010-08-22 05:54+0000\n"
"Last-Translator: OpenERP Administrators \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_chart_uk_minimal/l10n_uk_chart.xml b/addons/l10n_chart_uk_minimal/l10n_uk_chart.xml
index 6bb42c6aa14..75f0cd89d2e 100644
--- a/addons/l10n_chart_uk_minimal/l10n_uk_chart.xml
+++ b/addons/l10n_chart_uk_minimal/l10n_uk_chart.xml
@@ -63,10 +63,6 @@
-
-
Assets
10
@@ -125,10 +121,6 @@
-
-
11003
Output VAT
@@ -207,10 +199,6 @@
-
-
210
Cost of Sales
@@ -260,8 +248,5 @@
-
diff --git a/addons/l10n_fr/i18n/tr.po b/addons/l10n_fr/i18n/tr.po
index b922562e8b4..9d84ef50ef6 100644
--- a/addons/l10n_fr/i18n/tr.po
+++ b/addons/l10n_fr/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:47+0000\n"
+"PO-Revision-Date: 2010-08-22 05:57+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:37+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_fr
diff --git a/addons/l10n_lu/i18n/tr.po b/addons/l10n_lu/i18n/tr.po
index cd00420e285..ae7ef7ea4e9 100644
--- a/addons/l10n_lu/i18n/tr.po
+++ b/addons/l10n_lu/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:46+0000\n"
+"PO-Revision-Date: 2010-08-22 05:56+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_lu
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index c1674f85cc3..d9b87e91347 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -203,6 +203,10 @@ Normal - the campaign runs normally and automatically sends all emails and repor
return record
return None
+ # prevent duplication until the server properly duplicates several levels of nested o2m
+ def copy(self, cr, uid, id, default=None, context=None):
+ raise osv.except_osv("Operation not supported", "Sorry, campaign duplication is not supported at the moment.")
+
marketing_campaign()
class marketing_campaign_segment(osv.osv):
diff --git a/addons/membership/i18n/tr.po b/addons/membership/i18n/tr.po
index 7c2ec8fb466..8f8de2e746a 100644
--- a/addons/membership/i18n/tr.po
+++ b/addons/membership/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:46+0000\n"
+"PO-Revision-Date: 2010-08-22 05:56+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:37+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 03:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: membership
diff --git a/addons/mrp/i18n/de.po b/addons/mrp/i18n/de.po
index b74b5f450c6..8a095e7b9dd 100644
--- a/addons/mrp/i18n/de.po
+++ b/addons/mrp/i18n/de.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 07:31+0000\n"
-"Last-Translator: Ferdinand-chricar \n"
+"PO-Revision-Date: 2010-08-22 06:46+0000\n"
+"Last-Translator: Ferdinand @ ChriCar \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-12 03:43+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 03:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp
@@ -2063,4 +2063,4 @@ msgstr "Lagerwert Veränderungen"
#. module: mrp
#: view:board.board:0
msgid "Next production orders"
-msgstr ""
+msgstr "Nächste Produktionsaufträge"
diff --git a/addons/mrp/i18n/pt_BR.po b/addons/mrp/i18n/pt_BR.po
index 288f2ee6558..6f9ace7276b 100644
--- a/addons/mrp/i18n/pt_BR.po
+++ b/addons/mrp/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:44+0000\n"
+"PO-Revision-Date: 2010-08-22 05:54+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:37+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 03:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp
diff --git a/addons/mrp/i18n/tr.po b/addons/mrp/i18n/tr.po
index b065a3fba69..28b114074a4 100644
--- a/addons/mrp/i18n/tr.po
+++ b/addons/mrp/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:55+0000\n"
+"PO-Revision-Date: 2010-08-22 06:06+0000\n"
"Last-Translator: OpenERP Administrators \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-20 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 03:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp
diff --git a/addons/mrp/i18n/zh_TW.po b/addons/mrp/i18n/zh_TW.po
index aebd50b896a..c7c773df0f9 100644
--- a/addons/mrp/i18n/zh_TW.po
+++ b/addons/mrp/i18n/zh_TW.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:52+0000\n"
+"PO-Revision-Date: 2010-08-22 06:04+0000\n"
"Last-Translator: OpenERP Administrators \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-20 03:37+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 03:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 0e69dd3b4e8..fd9f8335987 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -686,29 +686,42 @@ class mrp_production(osv.osv):
final_product_todo = []
produced_qty = 0
+ if production_mode == 'consume_produce':
+ produced_qty = production_qty
+
for produced_product in production.move_created_ids2:
if (produced_product.scraped) or (produced_product.product_id.id<>production.product_id.id):
continue
produced_qty += produced_product.product_qty
-
if production_mode in ['consume','consume_produce']:
consumed_products = {}
+ check = {}
+ scraped = map(lambda x:x.scraped,production.move_lines2).count(True)
+
for consumed_product in production.move_lines2:
+ consumed = consumed_product.product_qty
if consumed_product.scraped:
continue
if not consumed_products.get(consumed_product.product_id.id, False):
- consumed_products[consumed_product.product_id.id] = 0
- consumed_products[consumed_product.product_id.id] -= consumed_product.product_qty
-
+ consumed_products[consumed_product.product_id.id] = consumed_product.product_qty
+ check[consumed_product.product_id.id] = 0
+ for f in production.product_lines:
+ if f.product_id.id == consumed_product.product_id.id:
+ if (len(production.move_lines2) - scraped) > len(production.product_lines):
+ check[consumed_product.product_id.id] += consumed_product.product_qty
+ consumed = check[consumed_product.product_id.id]
+ rest_consumed = produced_qty * f.product_qty / production.product_qty - consumed
+ consumed_products[consumed_product.product_id.id] = rest_consumed
+
for raw_product in production.move_lines:
for f in production.product_lines:
- if f.product_id.id==raw_product.product_id.id:
+ if f.product_id.id == raw_product.product_id.id:
consumed_qty = consumed_products.get(raw_product.product_id.id, 0)
- rest_qty = production_qty * f.product_qty / production.product_qty - consumed_qty
-
- if rest_qty > 0:
- stock_mov_obj.action_consume(cr, uid, [raw_product.id], rest_qty, production.location_src_id.id, context=context)
+ if consumed_qty == 0:
+ consumed_qty = production_qty * f.product_qty / production.product_qty
+ if consumed_qty > 0:
+ stock_mov_obj.action_consume(cr, uid, [raw_product.id], consumed_qty, production.location_src_id.id, context=context)
if production_mode == 'consume_produce':
# To produce remaining qty of final product
diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py
index 5474646c004..8890ed533d7 100644
--- a/addons/mrp/report/price.py
+++ b/addons/mrp/report/price.py
@@ -69,10 +69,10 @@ class report_custom(report_rml):
xml += "" + prod_name + ''
xml += "" + main_sp_name + sellers + ''
- xml += "" + str(prod_qtty) + ''
- xml += "" + product_uom.name + ''
- xml += "" + main_strd_price + ''
- xml += "" + main_sp_price + sellers_price + ''
+ xml += "" + str(prod_qtty) + ''
+ xml += "" + product_uom.name + ''
+ xml += "" + main_strd_price + ''
+ xml += "" + main_sp_price + sellers_price + ''
xml += ''
@@ -87,9 +87,9 @@ class report_custom(report_rml):
xml += "" + workcenter.name + ''
xml += ""
xml += ""
- xml += "" + str(cost_cycle) + ''
- xml += "" + str(cost_hour) + ''
- xml += "" + str(cost_hour + cost_cycle) + ''
+ xml += "" + str(cost_cycle) + ''
+ xml += "" + str(cost_hour) + ''
+ xml += "" + str(cost_hour + cost_cycle) + ''
xml += ''
return xml, total
@@ -102,7 +102,7 @@ class report_custom(report_rml):
210.00mm,297.00mm
595.27
841.88
- 60.00mm,60.00mm, 20.00mm, 20.00mm, 20.00mm, 20.00mm
+ 55.00mm,55.00mm, 20.00mm, 22.00mm, 22.00mm, 25.00mm
"""
config_stop = """
Generated by OpenERP
@@ -114,30 +114,30 @@ class report_custom(report_rml):
%s
-
- %s
- %s
- %s
+
+ %s
+ %s
+ %s
""" % (_('Work Center name'), _('Cycles Cost'), _('Hourly Cost'),_('Work Cost'))
prod_header = """
- %s
- %s
- %s
- %s
- %s
- %s
+ %s
+ %s
+ %s
+ %s
+ %s
+ %s
- """ % (_('Componet'), _('Componet suppliers'), _('Quantity'), _('Uom'), _('Cost Unit Price per Uom'), _('Supplier Unit Price per Uom'))
+ """ % (_('Componet'), _('Componet suppliers'), _('Quantity'), _('Uom'), _('Cost Price per Uom'), _('Supplier Price per Uom'))
company_currency = user_pool.browse(cr, uid, uid).company_id.currency_id.id
for product in product_pool.browse(cr, uid, ids, context=context):
bom_id = bom_pool._bom_find(cr, uid, product.id, product.uom_id.id)
title = "%s" %(_("Cost Structure"))
title += "%s" %product.name
- xml += "" + title + prod_header + ""
+ xml += "" + title + prod_header + ""
if not bom_id:
total_strd = number * product.standard_price
total = number * product_pool.price_get(cr, uid, [product.id], 'standard_price')[product.id]
@@ -153,9 +153,9 @@ class report_custom(report_rml):
%s %s %s %s :
-
- %s
- %s
+
+ %s
+ %s
'"""%(_('Total Cost'), _('of'), str(number), product.uom_id.name, str(total_strd), str(total))
else:
bom = bom_pool.browse(cr, uid, bom_id, context=context)
@@ -164,9 +164,9 @@ class report_custom(report_rml):
total = 0
total_strd = 0
parent_bom = {
- 'product_qty': bom.product_qty,
- 'name': bom.product_id.name,
- 'product_uom': bom.product_uom.id,
+ 'product_qty': bom.product_qty,
+ 'name': bom.product_id.name,
+ 'product_uom': bom.product_uom.id,
'product_id': bom.product_id.id
}
xml_tmp = ''
@@ -175,15 +175,15 @@ class report_custom(report_rml):
xml_tmp += txt
total += sum
total_strd += sum_strd
-
+
xml += "" + xml_tmp + ''
xml += """
%s %s %s %s :
-
- %s
- %s
+
+ %s
+ %s
'"""%(_('Cost'), _('of'), str(number), product.uom_id.name, str(total_strd), str(total))
total2 = 0
@@ -201,18 +201,19 @@ class report_custom(report_rml):
- %s
+ %s
'"""%(_('Work Cost'), _('of'), str(number), product.uom_id.name, str(total2))
xml += """
%s %s %s %s :
-
- %s
- %s
+
+ %s
+ %s
'"""%(_('Total Cost'), _('of'), str(number), product.uom_id.name, str(total_strd+total2), str(total+total2))
xml = '' + config_start + config_stop + xml + ''
+
return xml
report_custom('report.product.price', 'product.product', '', 'addons/mrp/report/price.xsl')
diff --git a/addons/mrp/report/price.xsl b/addons/mrp/report/price.xsl
index 10e088629e0..dc43c3d6f7d 100644
--- a/addons/mrp/report/price.xsl
+++ b/addons/mrp/report/price.xsl
@@ -3,7 +3,7 @@
-
+
@@ -12,35 +12,37 @@
-
+
+
+
+
+
-
+
-
-
+
-
+
-
+
@@ -66,7 +68,7 @@
|
-
+
|
@@ -75,22 +77,28 @@
+
+
+
+
+
+
@@ -105,22 +113,32 @@
-
+
-
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/mrp_operations/i18n/tr.po b/addons/mrp_operations/i18n/tr.po
index 68f47a573f6..ad533c8e570 100644
--- a/addons/mrp_operations/i18n/tr.po
+++ b/addons/mrp_operations/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:43+0000\n"
+"PO-Revision-Date: 2010-08-22 05:53+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp_operations
diff --git a/addons/mrp_repair/i18n/tr.po b/addons/mrp_repair/i18n/tr.po
index fae0f4a3492..580e4749fbe 100644
--- a/addons/mrp_repair/i18n/tr.po
+++ b/addons/mrp_repair/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:39+0000\n"
+"PO-Revision-Date: 2010-08-22 05:47+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp_repair
diff --git a/addons/mrp_subproduct/i18n/tr.po b/addons/mrp_subproduct/i18n/tr.po
index ceebd2904b7..5efccc0762a 100644
--- a/addons/mrp_subproduct/i18n/tr.po
+++ b/addons/mrp_subproduct/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:46+0000\n"
+"PO-Revision-Date: 2010-08-22 05:56+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp_subproduct
diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index b9faba1db3f..cab0fb40dc0 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -67,14 +67,12 @@ Main features :
'report/report_pos_order_view.xml',
'report/report_cash_register_view.xml',
'pos_sequence.xml',
- 'posrule_data.xml',
'pos_data.xml',
'pos_workflow.xml',
'statement_view.xml',
'statement_report.xml',
- 'statement_data.xml',
],
- 'demo_xml': ['pos_demo.xml','singer_statement_demo.xml','multi_company_stock_data.xml'],
+ 'demo_xml': ['pos_demo.xml','singer_statement_demo.xml','multi_company_stock_data.xml',],
'test':['test/pos_test.yml',],
'installable': True,
}
diff --git a/addons/point_of_sale/i18n/lt.po b/addons/point_of_sale/i18n/lt.po
index 3c951d1b83b..0c07442dfcc 100644
--- a/addons/point_of_sale/i18n/lt.po
+++ b/addons/point_of_sale/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:41+0000\n"
+"PO-Revision-Date: 2010-08-22 05:52+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:37+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 03:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/tr.po b/addons/point_of_sale/i18n/tr.po
index a7a82b5b10c..1d0eeacf82f 100644
--- a/addons/point_of_sale/i18n/tr.po
+++ b/addons/point_of_sale/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:43+0000\n"
+"PO-Revision-Date: 2010-08-22 05:54+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:37+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 03:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: point_of_sale
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index c5cdccfc914..23b2339d9e9 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -64,15 +64,14 @@ class pos_order(osv.osv):
_order = "date_order desc"
- def unlink(self, cr, uid, ids, context={}):
-
+ def unlink(self, cr, uid, ids, context=None):
for rec in self.browse(cr, uid, ids, context=context):
for rec_statement in rec.statement_ids:
if (rec_statement.statement_id and rec_statement.statement_id.state=='confirm') or rec.state=='done':
raise osv.except_osv(_('Invalid action !'), _('Cannot delete a point of sale which is closed or contains confirmed cashboxes!'))
return super(pos_order, self).unlink(cr, uid, ids, context=context)
- def onchange_partner_pricelist(self, cr, uid, ids, part, context={}):
+ def onchange_partner_pricelist(self, cr, uid, ids, part, context=None):
""" Changed price list on_change of partner_id"""
@@ -81,7 +80,7 @@ class pos_order(osv.osv):
pricelist = self.pool.get('res.partner').browse(cr, uid, part).property_product_pricelist.id
return {'value':{'pricelist_id': pricelist}}
- def _amount_total(self, cr, uid, ids, field_name, arg, context):
+ def _amount_total(self, cr, uid, ids, field_name, arg, context=None):
""" Calculates amount_tax of order line
@param field_names: Names of fields.
@@ -226,8 +225,7 @@ class pos_order(osv.osv):
return res[0]
else:
return False
- def copy(self, cr, uid, id, default=None, context={}):
-
+ def copy(self, cr, uid, id, default=None, context=None):
if not default:
default = {}
default.update({
@@ -334,8 +332,7 @@ class pos_order(osv.osv):
else:
return False
- def _journal_default(self, cr, uid, context={}):
-
+ def _journal_default(self, cr, uid, context=None):
""" To get default pricelist for the order"
@param name: Names of fields.
@return: journal ID
@@ -364,9 +361,8 @@ class pos_order(osv.osv):
}
- def test_order_lines(self, cr, uid, order, context={}):
-
- """ Test order line is created or not for the order "
+ def test_order_lines(self, cr, uid, order, context=None):
+ """ Test order line is created or not for the order "
@param name: Names of fields.
@return: True
"""
@@ -377,7 +373,7 @@ class pos_order(osv.osv):
wf_service.trg_validate(uid, 'pos.order', order.id, 'paid', cr)
return True
- def dummy_button(self, cr, uid, order, context={}):
+ def dummy_button(self, cr, uid, order, context=None):
return True
def test_paid(self, cr, uid, ids, context=None):
@@ -457,11 +453,12 @@ class pos_order(osv.osv):
# delete it in the new picking:
line.unlink(context=context)
- def create_picking(self, cr, uid, ids, context={}):
-
+ def create_picking(self, cr, uid, ids, context=None):
"""Create a picking for each order and validate it."""
picking_obj = self.pool.get('stock.picking')
+ property_obj=self.pool.get("ir.property")
+ move_obj=self.pool.get('stock.move')
pick_name=self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.out')
orders = self.browse(cr, uid, ids, context)
for order in orders:
@@ -494,8 +491,8 @@ class pos_order(osv.osv):
for line in order.lines:
if line.product_id and line.product_id.type=='service':
continue
- prop_ids = self.pool.get("ir.property").search(cr, uid, [('name', '=', 'property_stock_customer')])
- val = self.pool.get("ir.property").browse(cr, uid, prop_ids[0]).value_reference
+ prop_ids = property_obj.search(cr, uid, [('name', '=', 'property_stock_customer')])
+ val = property_obj.browse(cr, uid, prop_ids[0]).value_reference
cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order.shop_id.warehouse_id.id))
res=cr.fetchone()
location_id=res and res[0] or None
@@ -503,7 +500,7 @@ class pos_order(osv.osv):
if line.qty < 0:
location_id, stock_dest_id = stock_dest_id, location_id
- self.pool.get('stock.move').create(cr, uid, {
+ move_obj.create(cr, uid, {
'name': 'Stock move (POS %d)' % (order.id, ),
'product_uom': line.product_id.uom_id.id,
'product_uos': line.product_id.uom_id.id,
@@ -559,7 +556,7 @@ class pos_order(osv.osv):
@return: True
"""
self.write(cr, uid, ids, {'state': 'cancel'})
- self.cancel_picking(cr, uid, ids, context={})
+ self.cancel_picking(cr, uid, ids, context=context)
return True
def add_payment(self, cr, uid, order_id, data, context=None):
@@ -567,8 +564,10 @@ class pos_order(osv.osv):
"""Create a new payment for the order"""
res_obj = self.pool.get('res.company')
+ statement_obj= self.pool.get('account.bank.statement')
statementl_obj = self.pool.get('account.bank.statement.line')
prod_obj = self.pool.get('product.product')
+ property_obj=self.pool.get('ir.property')
flag=''
curr_c=self.pool.get('res.users').browse(cr, uid, uid).company_id
curr_company=curr_c.id
@@ -583,7 +582,7 @@ class pos_order(osv.osv):
args['date'] = data['payment_date']
if 'payment_name' in data.keys():
args['name'] = data['payment_name'] + ' ' +order.name
- account_def = self.pool.get('ir.property').get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
+ account_def = property_obj.get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
args['account_id'] = order.partner_id and order.partner_id.property_account_receivable and order.partner_id.property_account_receivable.id or account_def.id or curr_c.account_receivable.id
if data.get('is_acc',False):
args['is_acc']=data['is_acc']
@@ -593,7 +592,6 @@ class pos_order(osv.osv):
args['partner_id'] = order.partner_id and order.partner_id.id or None
args['ref'] = order.contract_number or None
- statement_obj= self.pool.get('account.bank.statement')
statement_id = statement_obj.search(cr,uid, [
('journal_id', '=', data['journal']),
('company_id', '=', curr_company),
@@ -639,10 +637,8 @@ class pos_order(osv.osv):
return order_line_id
- def refund(self, cr, uid, ids, context={}):
-
- """Create a copy of order for refund order"""
-
+ def refund(self, cr, uid, ids, context=None):
+ """Create a copy of order for refund order"""
clone_list = []
line_obj = self.pool.get('pos.order.line')
@@ -666,8 +662,7 @@ class pos_order(osv.osv):
})
return clone_list
- def action_invoice(self, cr, uid, ids, context={}):
-
+ def action_invoice(self, cr, uid, ids, context=None):
"""Create a invoice of order """
res_obj = self.pool.get('res.company')
@@ -965,7 +960,7 @@ class pos_order(osv.osv):
if not context:
context = {}
if context.get('flag',False):
- self.create_picking(cr, uid, ids, context={})
+ self.create_picking(cr, uid, ids, context=None)
self.write(cr, uid, ids, {'state': 'paid'})
else:
context['flag']=True
@@ -978,7 +973,7 @@ class pos_order(osv.osv):
def action_done(self, cr, uid, ids, context=None):
for order in self.browse(cr, uid, ids, context=context):
if not order.journal_entry:
- self.create_account_move(cr, uid, ids, context={})
+ self.create_account_move(cr, uid, ids, context=None)
return True
def compute_state(self, cr, uid, id):
@@ -1162,30 +1157,31 @@ class pos_order_line(osv.osv):
'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
}
- def create(self, cr, user, vals, context={}):
+ def create(self, cr, user, vals, context=None):
if vals.get('product_id'):
return super(pos_order_line, self).create(cr, user, vals, context)
return False
- def write(self, cr, user, ids, values, context={}):
+ def write(self, cr, user, ids, values, context=None):
if 'product_id' in values and not values['product_id']:
return False
return super(pos_order_line, self).write(cr, user, ids, values, context)
def _scan_product(self, cr, uid, ean, qty, order):
# search pricelist_id
+ product_obj=self.pool.get('product.product')
pricelist_id = self.pool.get('pos.order').read(cr, uid, [order], ['pricelist_id'] )
if not pricelist_id:
return False
new_line = True
- product_id = self.pool.get('product.product').search(cr, uid, [('ean13','=', ean)])
+ product_id = product_obj.search(cr, uid, [('ean13','=', ean)])
if not product_id:
return False
# search price product
- product = self.pool.get('product.product').read(cr, uid, product_id)
+ product =product_obj.read(cr, uid, product_id)
product_name = product[0]['name']
price = self.price_by_product(cr, uid, 0, pricelist_id[0]['pricelist_id'][0], product_id[0], 1)
@@ -1231,14 +1227,14 @@ class pos_payment(osv.osv):
_name = 'pos.payment'
_description = 'Pos Payment'
- def _journal_get(self, cr, uid, context={}):
+ def _journal_get(self, cr, uid, context=None):
obj = self.pool.get('account.journal')
ids = obj.search(cr, uid, [('type', '=', 'cash')])
res = obj.read(cr, uid, ids, ['id', 'name'], context)
res = [(r['id'], r['name']) for r in res]
return res
- def _journal_default(self, cr, uid, context={}):
+ def _journal_default(self, cr, uid, context=None):
journal_list = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash')])
if journal_list:
return journal_list[0]
@@ -1261,12 +1257,12 @@ class pos_payment(osv.osv):
'payment_date': lambda *a: time.strftime('%Y-%m-%d'),
}
- def create(self, cr, user, vals, context={}):
+ def create(self, cr, user, vals, context=None):
if vals.get('journal_id') and vals.get('amount'):
return super(pos_payment, self).create(cr, user, vals, context)
return False
- def write(self, cr, user, ids, values, context={}):
+ def write(self, cr, user, ids, values, context=None):
if 'amount' in values and not values['amount']:
return False
if 'journal_id' in values and not values['journal_id']:
@@ -1278,7 +1274,7 @@ pos_payment()
class account_move_line(osv.osv):
_inherit = 'account.move.line'
- def create(self, cr, user, vals, context={}):
+ def create(self, cr, user, vals, context=None):
pos_obj = self.pool.get('pos.order')
val_name = vals.get('name', '')
val_ref = vals.get('ref', '')
@@ -1298,8 +1294,7 @@ account_move_line()
class account_move(osv.osv):
_inherit = 'account.move'
-
- def create(self, cr, user, vals, context={}):
+ def create(self, cr, user, vals, context=None):
pos_obj = self.pool.get('pos.order')
val_name = vals.get('name', '')
val_ref = vals.get('ref', '')
diff --git a/addons/point_of_sale/posrule_data.xml b/addons/point_of_sale/posrule_data.xml
index f2ac2d664af..7f165742f03 100644
--- a/addons/point_of_sale/posrule_data.xml
+++ b/addons/point_of_sale/posrule_data.xml
@@ -1,7 +1,6 @@
-
diff --git a/addons/point_of_sale/statement_data.xml b/addons/point_of_sale/statement_data.xml
index 3ba8df59b13..2780cd0f8d0 100644
--- a/addons/point_of_sale/statement_data.xml
+++ b/addons/point_of_sale/statement_data.xml
@@ -1,6 +1,5 @@
-
diff --git a/addons/point_of_sale/test/pos_test.yml b/addons/point_of_sale/test/pos_test.yml
index 10c691e86c3..09b7fa3a90a 100644
--- a/addons/point_of_sale/test/pos_test.yml
+++ b/addons/point_of_sale/test/pos_test.yml
@@ -119,7 +119,7 @@
I create Sales Account.
-
!record {model: account.account, id: account_account_sales0}:
- code: S
+ code: Sale
company_id: base.main_company
currency_mode: current
name: Sales
@@ -477,4 +477,9 @@
self.action_confirm(cr, uid, [ref("pos_confirm_0")], {"lang": "en_US", "active_model":
"pos.order", "active_ids": [ref("pos_order_pos0")], "tz": False, "active_id": ref("pos_order_pos0"),
})
-
+-
+ I check order state is done.
+-
+ !python {model: pos.order}: |
+ order=self.browse(cr,uid,ref("pos_order_pos0"))
+ assert(order.state=='done'), "Order is not done"
diff --git a/addons/process/i18n/tr.po b/addons/process/i18n/tr.po
index b7cc3067661..34b92f857b1 100644
--- a/addons/process/i18n/tr.po
+++ b/addons/process/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:47+0000\n"
+"PO-Revision-Date: 2010-08-22 05:58+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:37+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: process
diff --git a/addons/product/i18n/es_EC.po b/addons/product/i18n/es_EC.po
new file mode 100644
index 00000000000..59b777403b8
--- /dev/null
+++ b/addons/product/i18n/es_EC.po
@@ -0,0 +1,1782 @@
+# Spanish (Argentina) translation for openobject-addons
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-08-20 20:03+0000\n"
+"Last-Translator: Silvana Herrera \n"
+"Language-Team: Spanish (Argentina) \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-21 03:58+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Max. Margin"
+msgstr "Margen máximo"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Base Price"
+msgstr "Precio base"
+
+#. module: product
+#: help:product.template,standard_price:0
+msgid ""
+"The cost of the product for accounting stock valuation. It can serves as a "
+"base price for supplier price."
+msgstr ""
+"El costo del producto para la valuación contable del stock. Puede servir "
+"como precio base para el precio de proveedor."
+
+#. module: product
+#: selection:product.template,type:0
+msgid "Service"
+msgstr "Servicio"
+
+#. module: product
+#: help:product.template,purchase_ok:0
+msgid ""
+"Determine if the product is visible in the list of products within a "
+"selection from a purchase order line."
+msgstr ""
+"Determina si el producto es visible en la lista de productos dentro de una "
+"selección desde una línea de un pedido de compra."
+
+#. module: product
+#: help:product.supplierinfo,name:0
+msgid "Supplier of this product"
+msgstr "Provedor de este producto"
+
+#. module: product
+#: model:product.template,name:product.product_product_ram512_product_template
+msgid "DDR 512MB PC400"
+msgstr "DDR 512MB PC400"
+
+#. module: product
+#: model:product.template,name:product.product_product_0_product_template
+msgid "Onsite Senior Intervention"
+msgstr "Intervención en el mismo lugar consultor senior"
+
+#. module: product
+#: help:product.supplierinfo,qty:0
+msgid ""
+"The minimal quantity to purchase for this supplier, expressed in the default "
+"unit of measure."
+msgstr ""
+"La cantidad mínima a comprar a este proveedor, expresada en la unidad de "
+"medida por defecto."
+
+#. module: product
+#: field:product.template,weight_net:0
+msgid "Net weight"
+msgstr "Peso neto"
+
+#. module: product
+#: help:product.product,incoming_qty:0
+msgid ""
+"Quantities of products that are planned to arrive in selected locations or "
+"all internal if none have been selected."
+msgstr ""
+"Cantidades de productos que está previsto que lleguen en las ubicaciones "
+"seleccionadas o en todas las ubicaciones internas si ninguna ha sido "
+"seleccionada."
+
+#. module: product
+#: help:product.product,virtual_available:0
+msgid ""
+"Futur stock for this product according to the selected location or all "
+"internal if none have been selected. Computed as: Real Stock - Outgoing + "
+"Incoming."
+msgstr ""
+"Stock futuro para este producto según la ubicación seleccionada o todas las "
+"internas si no se ha seleccionado ninguna. Calculado como: Stock real - "
+"Saliente + Entrante."
+
+#. module: product
+#: field:product.packaging,width:0
+msgid "Width"
+msgstr "Ancho"
+
+#. module: product
+#: help:product.pricelist.item,product_tmpl_id:0
+msgid ""
+"Set a template if this rule only apply to a template of product. Keep empty "
+"for all products"
+msgstr ""
+"Indicar una plantilla si esta regla sólo se aplica a una plantilla de "
+"producto. Dejarlo vacío para todos los productos"
+
+#. module: product
+#: field:product.template,procure_method:0
+msgid "Procure Method"
+msgstr "Método de adquisición"
+
+#. module: product
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: product
+#: model:process.process,name:product.process_process_productprocess0
+msgid "Product Process"
+msgstr "Proceso de producto"
+
+#. module: product
+#: help:product.price.type,field:0
+msgid "Associated field in the product form."
+msgstr "Campo asociado en el formulario de producto."
+
+#. module: product
+#: selection:product.template,cost_method:0
+msgid "Standard Price"
+msgstr "Precio estándar"
+
+#. module: product
+#: help:product.packaging,height:0
+msgid "The height of the package"
+msgstr "La altura del paquete"
+
+#. module: product
+#: view:product.pricelist:0
+msgid "Products Price List"
+msgstr "Precio producto"
+
+#. module: product
+#: model:product.category,name:product.cat1
+msgid "Sellable"
+msgstr "Vendible"
+
+#. module: product
+#: model:product.template,name:product.product_product_26_product_template
+msgid "Kit Keyboard + Mouse"
+msgstr "Kit Teclado + Ratón"
+
+#. module: product
+#: field:product.price.type,name:0
+msgid "Price Name"
+msgstr "Nombre precio"
+
+#. module: product
+#: field:product.product,price:0
+msgid "Customer Price"
+msgstr "Precio cliente"
+
+#. module: product
+#: field:product.template,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: product
+#: field:product.template,rental:0
+msgid "Rentable Product"
+msgstr "Producto Rentable"
+
+#. module: product
+#: field:product.product,lst_price:0
+msgid "List Price"
+msgstr "Precio lista"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_price_type_action
+#: model:ir.ui.menu,name:product.menu_product_price_type_action
+msgid "Prices Types"
+msgstr "Tipos de precios"
+
+#. module: product
+#: selection:product.template,type:0
+msgid "Stockable Product"
+msgstr "Producto almacenable"
+
+#. module: product
+#: model:product.category,name:product.product_category_services
+msgid "Services"
+msgstr "Servicios"
+
+#. module: product
+#: help:product.template,list_price:0
+msgid ""
+"Base price for computing the customer price. Sometimes called the catalog "
+"price."
+msgstr ""
+"Precio base para calcular el precio de cliente. También llamado el precio de "
+"catálogo."
+
+#. module: product
+#: field:pricelist.partnerinfo,min_quantity:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: product
+#: model:product.template,name:product.product_product_cpu3_product_template
+msgid "Processor AMD Athlon XP 2200+"
+msgstr "Procesador AMD Athlon XP 2200+"
+
+#. module: product
+#: help:product.price.type,name:0
+msgid "Name of this kind of price."
+msgstr "Nombre de este tipo de precio."
+
+#. module: product
+#: help:product.pricelist.version,date_start:0
+msgid "Starting date for this pricelist version to be valid."
+msgstr "Fecha inicial de esta versión de tarifa para ser válida."
+
+#. module: product
+#: field:product.product,incoming_qty:0
+msgid "Incoming"
+msgstr "Proximo"
+
+#. module: product
+#: selection:product.template,procure_method:0
+msgid "Make to Stock"
+msgstr "Obtener para existencia"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Weigths"
+msgstr "Pesos"
+
+#. module: product
+#: model:product.template,name:product.product_product_fan2_product_template
+msgid "Silent fan"
+msgstr "Ventilador silencioso"
+
+#. module: product
+#: help:product.template,supply_method:0
+msgid ""
+"Produce will generate production order or tasks, according to the product "
+"type. Purchase will trigger purchase orders when requested."
+msgstr ""
+"Producir generará órdenes de producción o tareas, de acuerdo al tipo de "
+"producto. Comprar disparará pedidos de compras cuando sea necesario."
+
+#. module: product
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid "You can see the list of suppliers for that product."
+msgstr "Puede ver la lista de proveedores de dicho producto."
+
+#. module: product
+#: help:product.packaging,rows:0
+msgid "The number of layer on a palet or box"
+msgstr "El número de piso en un palet o caja"
+
+#. module: product
+#: model:product.pricelist.type,name:product.pricelist_type_sale
+#: field:res.partner,property_product_pricelist:0
+msgid "Sale Pricelist"
+msgstr "Tarifa de venta"
+
+#. module: product
+#: field:product.pricelist.item,base_pricelist_id:0
+msgid "If Other Pricelist"
+msgstr "Otro precio de lista"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_normal_action
+#: model:ir.actions.act_window,name:product.product_normal_action_tree
+#: model:ir.ui.menu,name:product.menu_main_product
+#: model:ir.ui.menu,name:product.menu_products
+#: view:product.product:0
+msgid "Products"
+msgstr "Productos"
+
+#. module: product
+#: help:product.pricelist.item,price_round:0
+msgid ""
+"Sets the price so that it is a multiple of this value.\n"
+"Rounding is applied after the discount and before the surcharge.\n"
+"To have prices that end in 9.99, set rounding 10, surcharge -0.01"
+msgstr ""
+"Calcula el precio de modo que sea un múltiplo de este valor.\n"
+"El redondeo se aplica después del descuento y antes del incremento.\n"
+"Para que los precios terminen en 9,99, redondeo 10, incremento -0,01."
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "New Price ="
+msgstr "Nuevo Precio ="
+
+#. module: product
+#: field:product.product,virtual_available:0
+msgid "Virtual Stock"
+msgstr "Existencia virtual"
+
+#. module: product
+#: selection:product.template,mes_type:0
+msgid "Fixed"
+msgstr "Fijo"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_uom_categ_form_action
+#: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action
+msgid "Units of Measure Categories"
+msgstr "Categorías de unidades de medida"
+
+#. module: product
+#: help:product.pricelist.item,product_id:0
+msgid ""
+"Set a product if this rule only apply to one product. Keep empty for all "
+"products"
+msgstr ""
+"Indicar un producto si esta regla sólo se aplica a un producto. Dejarlo "
+"vacío para todos los productos"
+
+#. module: product
+#: model:ir.model,name:product.model_product_pricelist_type
+#: field:product.pricelist,type:0
+#: view:product.pricelist.type:0
+msgid "Pricelist Type"
+msgstr "Tipo de precio"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Base Prices"
+msgstr "Precios base"
+
+#. module: product
+#: model:ir.ui.menu,name:product.menu_price
+msgid "Prices Computations"
+msgstr "Cálculos de precios"
+
+#. module: product
+#: field:product.pricelist.item,name:0
+msgid "Rule Name"
+msgstr "Nombre de regla"
+
+#. module: product
+#: model:ir.ui.menu,name:product.menu_config_product
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: product
+#: field:product.packaging,rows:0
+msgid "Number of Layer"
+msgstr "Número de piso"
+
+#. module: product
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr "¡Error! No puede crear categorías recursivas."
+
+#. module: product
+#: field:product.template,uom_id:0
+msgid "Default UoM"
+msgstr "UdM por defecto"
+
+#. module: product
+#: field:product.template,produce_delay:0
+msgid "Manufacturing Lead Time"
+msgstr "Plazo de entrega de fabricación"
+
+#. module: product
+#: field:product.supplierinfo,pricelist_ids:0
+msgid "Supplier Pricelist"
+msgstr "Precio provedor"
+
+#. module: product
+#: view:product.packaging:0
+#: view:product.product:0
+msgid "Pallet Dimension"
+msgstr "Dimensión del palet"
+
+#. module: product
+#: field:product.pricelist.item,base:0
+msgid "Based on"
+msgstr "Basado en"
+
+#. module: product
+#: model:product.template,name:product.product_product_24_product_template
+msgid "Keyboard"
+msgstr "Teclado"
+
+#. module: product
+#: field:product.supplierinfo,name:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: product
+#: field:product.template,sale_delay:0
+msgid "Customer Lead Time"
+msgstr "Plazo de entrega del cliente"
+
+#. module: product
+#: model:product.template,name:product.product_product_25_product_template
+msgid "Mouse"
+msgstr "Ratón"
+
+#. module: product
+#: help:product.template,cost_method:0
+msgid ""
+"Standard Price: the cost price is fixed and recomputed periodically (usually "
+"at the end of the year), Average Price: the cost price is recomputed at each "
+"reception of products."
+msgstr ""
+"Precio estándar: El precio de coste es fijo y se recalcula periódicamente "
+"(normalmente al finalizar el año), Precio medio: El precio de coste se "
+"recalcula en cada recepción de productos."
+
+#. module: product
+#: field:product.pricelist,name:0
+msgid "Pricelist Name"
+msgstr "Nombre tarifa"
+
+#. module: product
+#: field:product.template,seller_ids:0
+msgid "Partners"
+msgstr "Empresas"
+
+#. module: product
+#: selection:product.template,cost_method:0
+msgid "Average Price"
+msgstr "Precio medio"
+
+#. module: product
+#: model:process.node,note:product.process_node_product0
+msgid "Create new Product"
+msgstr "Crear nuevo producto"
+
+#. module: product
+#: help:product.pricelist.item,name:0
+msgid "Explicit rule name for this pricelist line."
+msgstr "Nombre de regla explícita para esta línea de tarifa."
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Min. Margin"
+msgstr "Margen mín."
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "* ( 1 + "
+msgstr "* ( 1 + "
+
+#. module: product
+#: model:product.template,name:product.product_product_cpu1_product_template
+msgid "Processor AMD Athlon XP 1800+"
+msgstr "Procesador AMD Athlon XP 1800+"
+
+#. module: product
+#: selection:product.template,state:0
+msgid "In Production"
+msgstr "En producción"
+
+#. module: product
+#: field:product.category,child_id:0
+msgid "Child Categories"
+msgstr "Categorías hijas"
+
+#. module: product
+#: model:product.category,name:product.product_category_accessories
+msgid "Accessories"
+msgstr "Accesorios"
+
+#. module: product
+#: field:product.supplierinfo,sequence:0
+msgid "Priority"
+msgstr "Prioridad"
+
+#. module: product
+#: model:product.template,name:product.product_product_20_product_template
+msgid "HDD on demand"
+msgstr "HDD bajo pedido"
+
+#. module: product
+#: field:product.uom,factor_inv:0
+#: field:product.uom,factor_inv_data:0
+msgid "Factor"
+msgstr "Factor"
+
+#. module: product
+#: wizard_button:product.price_list,init,price:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: product
+#: model:process.node,name:product.process_node_supplier0
+msgid "Supplier Info"
+msgstr "Info. proveedor"
+
+#. module: product
+#: field:product.ul,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: product
+#: wizard_field:product.price_list,init,price_list:0
+msgid "PriceList"
+msgstr "Precio"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "UOM"
+msgstr "UOM"
+
+#. module: product
+#: model:product.uom,name:product.product_uom_unit
+msgid "PCE"
+msgstr "Unidad"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_pricelist_action2
+#: model:ir.ui.menu,name:product.menu_product_pricelist_action2
+#: model:ir.ui.menu,name:product.menu_product_pricelist_main
+msgid "Pricelists"
+msgstr "Precio"
+
+#. module: product
+#: field:product.supplierinfo,product_name:0
+msgid "Partner Product Name"
+msgstr "Nombre producto empresa"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Miscelleanous"
+msgstr "Miscelleanous"
+
+#. module: product
+#: help:product.pricelist.item,base:0
+msgid "The mode for computing the price for this rule."
+msgstr "El modo de calcular el precio para esta regla."
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_uom_form_action
+#: model:ir.ui.menu,name:product.menu_product_uom_form_action
+#: model:ir.ui.menu,name:product.next_id_16
+#: view:product.uom:0
+msgid "Units of Measure"
+msgstr "Unidades de medida"
+
+#. module: product
+#: field:product.product,partner_ref:0
+msgid "Customer ref"
+msgstr "Ref. cliente"
+
+#. module: product
+#: field:product.supplierinfo,qty:0
+msgid "Minimal Quantity"
+msgstr "Cantidad mínima"
+
+#. module: product
+#: model:product.category,name:product.product_category_pc
+msgid "PC"
+msgstr "PC"
+
+#. module: product
+#: help:product.template,seller_delay:0
+msgid ""
+"This is the average delay in days between the purchase order confirmation "
+"and the reception of goods for this product and for the default supplier. It "
+"is used by the scheduler to order requests based on reordering delays."
+msgstr ""
+"Éste es el plazo promedio en días entre la confirmación del pedido de compra "
+"y la recepción de la mercancía para este producto y para el proveedor por "
+"defecto. El planificador lo utiliza para generar solicitudes basado en los "
+"plazos de los pedidos."
+
+#. module: product
+#: field:product.template,seller_delay:0
+msgid "Supplier Lead Time"
+msgstr "Plazo de entrega del proveedor"
+
+#. module: product
+#: model:product.pricelist.version,name:product.ver0
+msgid "Default Public Pricelist Version"
+msgstr "Verción predeterminada de la lista de precios publica"
+
+#. module: product
+#: field:product.pricelist.type,key:0
+msgid "Key"
+msgstr "Código"
+
+#. module: product
+#: field:product.pricelist.item,price_version_id:0
+msgid "Price List Version"
+msgstr "Versión de tarifa"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Rules Test Match"
+msgstr "Reglas test de concordancia"
+
+#. module: product
+#: help:res.partner,property_product_pricelist:0
+msgid ""
+"This pricelist will be used, instead of the default one, "
+"for sales to the current partner"
+msgstr ""
+"Esta tarifa será usada en lugar de la tarifa por defecto para las ventas a "
+"la empresa actual."
+
+#. module: product
+#: model:ir.model,name:product.model_product_pricelist
+#: view:product.supplierinfo:0
+msgid "Pricelist"
+msgstr "Precio"
+
+#. module: product
+#: selection:product.template,type:0
+msgid "Consumable"
+msgstr "Consumible"
+
+#. module: product
+#: help:product.price.type,currency_id:0
+msgid "The currency the field is expressed in."
+msgstr "La moneda en que se expresa el campo."
+
+#. module: product
+#: help:product.template,weight:0
+msgid "The gross weight in Kg."
+msgstr "El peso bruto en Kg."
+
+#. module: product
+#: selection:product.ul,type:0
+msgid "Box"
+msgstr "Caja"
+
+#. module: product
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "¡XML inválido para la definición de la vista!"
+
+#. module: product
+#: help:product.template,sale_ok:0
+msgid ""
+"Determine if the product can be visible in the list of product within a "
+"selection from a sale order line."
+msgstr ""
+"Indica si el producto es visible en la lista de productos dentro de una "
+"selección desde una línea de un pedido de venta."
+
+#. module: product
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr "Error: La UdV debe estar en una categoría diferente que la UdM"
+
+#. module: product
+#: field:product.category,parent_id:0
+msgid "Parent Category"
+msgstr "Categoría padre"
+
+#. module: product
+#: selection:product.template,state:0
+msgid "In Development"
+msgstr "En desarrollo"
+
+#. module: product
+#: help:product.pricelist.type,key:0
+msgid ""
+"Used in the code to select specific prices based on the context. Keep "
+"unchanged."
+msgstr ""
+"Utilizado en el código para seleccionar precios específicos basados en el "
+"contexto. Dejarlo tal como está."
+
+#. module: product
+#: help:product.product,outgoing_qty:0
+msgid ""
+"Quantities of products that are planned to leave in selected locations or "
+"all internal if none have been selected."
+msgstr ""
+"Cantidades de productos que están previstos dejar en las ubicaciones "
+"seleccionadas o todas las internas si no se ha seleccionado ninguna."
+
+#. module: product
+#: field:product.packaging,weight:0
+msgid "Total Package Weight"
+msgstr "Total peso paquete"
+
+#. module: product
+#: help:product.template,procure_method:0
+msgid ""
+"'Make to Stock': When needed, take from the stock or wait until re-"
+"supplying. 'Make to Order': When needed, purchase or produce for the "
+"procurement request."
+msgstr ""
+"'Obtener para stock': Cuando sea necesario, tomar del stock o esperar hasta "
+"que sea reabastecido. 'Obtener bajo pedido': Cuando sea necesario, comprar o "
+"producir para la solicitud de abastecimiento."
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Procurement"
+msgstr "Adquisición"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_category_action
+#: model:ir.ui.menu,name:product.menu_product_category_action
+msgid "Products by Category"
+msgstr "Productos por categoría"
+
+#. module: product
+#: model:product.template,name:product.product_product_hdd1_product_template
+msgid "HDD Seagate 7200.8 80GB"
+msgstr "HDD Seagate 7200.8 80GB"
+
+#. module: product
+#: help:product.pricelist.version,active:0
+msgid ""
+"When a version is duplicated it is set to non active, so that the dates do "
+"not overlaps with original version. You should change the dates and "
+"reactivate the pricelist"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_hdd3_product_template
+msgid "HDD Seagate 7200.8 160GB"
+msgstr "HDD Seagate 7200.8 160GB"
+
+#. module: product
+#: view:product.product:0
+msgid "Product Variant"
+msgstr "Variantes de producto"
+
+#. module: product
+#: field:product.packaging,ul:0
+msgid "Type of Package"
+msgstr "Tipo de empaquetado"
+
+#. module: product
+#: field:product.template,loc_rack:0
+msgid "Rack"
+msgstr "Estante"
+
+#. module: product
+#: field:product.uom,category_id:0
+msgid "UoM Category"
+msgstr "Categoria UoM"
+
+#. module: product
+#: selection:product.ul,type:0
+msgid "Pack"
+msgstr "Paquete"
+
+#. module: product
+#: field:product.product,ean13:0
+msgid "EAN13"
+msgstr "EAN13"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+#: field:product.template,description_sale:0
+msgid "Sale Description"
+msgstr "Descripción de venta"
+
+#. module: product
+#: field:product.template,uos_id:0
+msgid "Unit of Sale"
+msgstr "Unidad de venta"
+
+#. module: product
+#: field:product.template,mes_type:0
+msgid "Measure Type"
+msgstr "Tipo de medida"
+
+#. module: product
+#: model:product.uom.categ,name:product.product_uom_categ_kgm
+msgid "Weight"
+msgstr "Peso"
+
+#. module: product
+#: model:product.template,name:product.product_product_22_product_template
+msgid "Processor on demand"
+msgstr "Procesador bajo pedido"
+
+#. module: product
+#: help:product.supplierinfo,product_name:0
+msgid ""
+"Name of the product for this partner, will be used when printing a request "
+"for quotation. Keep empty to use the internal one."
+msgstr ""
+"Nombre del producto para esta empresa, se utilizará al imprimir una petición "
+"de presupuesto. Dejarlo vacío para utilizar el nombre interno."
+
+#. module: product
+#: field:product.template,supply_method:0
+msgid "Supply method"
+msgstr "Método suministro"
+
+#. module: product
+#: model:product.category,name:product.product_category_11
+msgid "IT components kits"
+msgstr "Kits de componentes TI"
+
+#. module: product
+#: view:product.uom.categ:0
+msgid "Units of Measure categories"
+msgstr "Categorías de unidades de medida"
+
+#. module: product
+#: field:product.category,sequence:0
+#: field:product.packaging,sequence:0
+#: field:product.pricelist.item,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: product
+#: view:product.supplierinfo:0
+msgid "Supplier Information"
+msgstr "Información del proveedor"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_ul_form_action
+#: model:ir.model,name:product.model_product_packaging
+#: model:ir.ui.menu,name:product.menu_product_ul_form_action
+#: view:product.packaging:0
+#: view:product.product:0
+#: view:product.ul:0
+msgid "Packaging"
+msgstr "Empaquetado"
+
+#. module: product
+#: field:product.price.type,currency_id:0
+#: field:product.pricelist,currency_id:0
+msgid "Currency"
+msgstr "Moneda"
+
+#. module: product
+#: model:product.template,name:product.product_product_cpu_gen_product_template
+msgid "Regular processor config"
+msgstr "Config. procesador normal"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Descriptions"
+msgstr "Descripciones"
+
+#. module: product
+#: model:process.transition,name:product.process_transition_supplierofproduct0
+msgid "Suppliers of Product"
+msgstr "Proveedores del producto"
+
+#. module: product
+#: field:product.pricelist.version,date_start:0
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+#. module: product
+#: view:res.partner:0
+msgid "Sales Properties"
+msgstr "Propiedades de venta"
+
+#. module: product
+#: help:product.product,qty_available:0
+msgid ""
+"Current quantities of products in selected locations or all internal if none "
+"have been selected."
+msgstr ""
+"Cantidades actuales de productos en las ubicaciones seleccionadas o todas "
+"las internas si no se ha seleccionado ninguna."
+
+#. module: product
+#: model:product.template,name:product.product_product_pc1_product_template
+msgid "Basic PC"
+msgstr "PC Básica"
+
+#. module: product
+#: field:product.template,loc_row:0
+msgid "Row"
+msgstr "Fila"
+
+#. module: product
+#: field:product.template,categ_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: product
+#: help:product.pricelist.item,min_quantity:0
+msgid ""
+"The rule only applies if the partner buys/sells more than this quantity."
+msgstr ""
+"La regla sólo se aplica si la empresa compra/vende más que esta cantidad."
+
+#. module: product
+#: model:product.template,name:product.product_product_ram_product_template
+msgid "DDR 256MB PC400"
+msgstr "DDR 256MB PC400"
+
+#. module: product
+#: field:product.product,qty_available:0
+msgid "Real Stock"
+msgstr "Inventario real"
+
+#. module: product
+#: view:product.category:0
+msgid "Product Categories"
+msgstr "Categorías de producto"
+
+#. module: product
+#: help:product.uom,category_id:0
+msgid ""
+"Unit of Measure of a category can be converted between each others in the "
+"same category."
+msgstr ""
+"La unidad de medida de una categoría puede ser convertida a otras de la "
+"misma categoría."
+
+#. module: product
+#: model:ir.model,name:product.model_product_uom
+msgid "Product Unit of Measure"
+msgstr "Unidad de medida del producto"
+
+#. module: product
+#: field:product.template,sale_ok:0
+msgid "Can be sold"
+msgstr "Puede ser vendido"
+
+#. module: product
+#: model:product.template,name:product.product_product_23_product_template
+msgid "Complete PC With Peripherals"
+msgstr "PC completo con periféricos"
+
+#. module: product
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+"Error: La UdM por defecto y la UdM de compra deben estar en la misma "
+"categoría."
+
+#. module: product
+#: model:product.template,name:product.product_product_mb2_product_template
+msgid "Mainboard ASUStek A7V8X-X"
+msgstr "Placa madre ASUStek A7V8X-X"
+
+#. module: product
+#: field:product.uom,factor:0
+msgid "Rate"
+msgstr "Velocidad"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Products Listprices Items"
+msgstr "Elementos de las tarifas de productos"
+
+#. module: product
+#: field:product.uom,rounding:0
+msgid "Rounding Precision"
+msgstr "Precisión de redondeo"
+
+#. module: product
+#: help:product.packaging,width:0
+msgid "The width of the package"
+msgstr "La anchura del paquete"
+
+#. module: product
+#: field:product.packaging,qty:0
+msgid "Quantity by Package"
+msgstr "Cantidad por paquete"
+
+#. module: product
+#: help:product.template,uos_id:0
+msgid ""
+"Used by companies that manages two unit of measure: invoicing and inventory "
+"management. For example, in food industries, you will manage a stock of ham "
+"but invoice in Kg. Keep empty to use the default UOM."
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Procurement & Locations"
+msgstr "Abastecimiento & Ubicaciones"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+#: field:product.template,state:0
+msgid "Status"
+msgstr "Estado:"
+
+#. module: product
+#: field:product.product,outgoing_qty:0
+msgid "Outgoing"
+msgstr "Salida"
+
+#. module: product
+#: selection:product.template,supply_method:0
+msgid "Buy"
+msgstr "Comprar"
+
+#. module: product
+#: model:ir.model,name:product.model_product_pricelist_version
+#: view:product.pricelist:0
+#: view:product.pricelist.version:0
+msgid "Pricelist Version"
+msgstr "versio nde precio"
+
+#. module: product
+#: field:product.pricelist.item,price_round:0
+msgid "Price Rounding"
+msgstr "Redondeo precio"
+
+#. module: product
+#: model:product.price.type,name:product.list_price
+msgid "Public Price"
+msgstr "Precio publico"
+
+#. module: product
+#: field:product.pricelist.item,price_max_margin:0
+msgid "Max. Price Margin"
+msgstr "Margen precio máx."
+
+#. module: product
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "Ventas & Compras"
+
+#. module: product
+#: model:product.category,name:product.product_category_10
+msgid "IT components"
+msgstr "Componentes TI"
+
+#. module: product
+#: help:product.packaging,weight_ul:0
+msgid "The weight of the empty UL"
+msgstr "El peso del UL vacío"
+
+#. module: product
+#: help:product.packaging,code:0
+msgid "The code of the transport unit."
+msgstr "El código de la unidad de transporte."
+
+#. module: product
+#: field:product.template,uom_po_id:0
+msgid "Purchase UoM"
+msgstr "UdM de compra"
+
+#. module: product
+#: view:product.price.type:0
+msgid "Products Price Type"
+msgstr "Tipo de precios de productos"
+
+#. module: product
+#: field:product.template,product_manager:0
+msgid "Product Manager"
+msgstr "Responsable de producto"
+
+#. module: product
+#: field:product.product,price_extra:0
+msgid "Variant Price Extra"
+msgstr "Precio extra variante"
+
+#. module: product
+#: model:product.template,name:product.product_product_fan_product_template
+msgid "Regular case fan 80mm"
+msgstr "Ventilador normal 80mm"
+
+#. module: product
+#: model:ir.model,name:product.model_product_supplierinfo
+msgid "Information about a product supplier"
+msgstr "Información de un proveedor de producto"
+
+#. module: product
+#: field:product.price.type,active:0
+#: field:product.pricelist,active:0
+#: field:product.pricelist.version,active:0
+#: field:product.product,active:0
+#: field:product.uom,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: product
+#: field:product.product,price_margin:0
+msgid "Variant Price Margin"
+msgstr "Margen de precio variante"
+
+#. module: product
+#: wizard_view:product.price_list,init:0
+msgid "Price list"
+msgstr "Precio"
+
+#. module: product
+#: model:product.template,name:product.product_product_pc3_product_template
+msgid "Medium PC"
+msgstr "PC Medio"
+
+#. module: product
+#: model:ir.model,name:product.model_pricelist_partnerinfo
+msgid "pricelist.partnerinfo"
+msgstr "pricelist.partnerinfo"
+
+#. module: product
+#: model:product.price.type,name:product.standard_price
+#: field:product.template,standard_price:0
+msgid "Cost Price"
+msgstr "Precio de costo"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+#: field:product.template,description_purchase:0
+msgid "Purchase Description"
+msgstr "Descripción de compra"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Second UoM"
+msgstr "UdM secundaria"
+
+#. module: product
+#: model:product.category,name:product.product_category_4
+msgid "Dello Computer"
+msgstr "Ordenador Dello"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Storage Localisation"
+msgstr "Ubicación en el almacén"
+
+#. module: product
+#: help:product.packaging,length:0
+msgid "The length of the package"
+msgstr "La longitud del paquete"
+
+#. module: product
+#: field:product.pricelist.item,price_min_margin:0
+msgid "Min. Price Margin"
+msgstr "Margen precio mín."
+
+#. module: product
+#: help:product.packaging,ean:0
+msgid "The EAN code of the package unit."
+msgstr "El código EAN de la unidad del paquete."
+
+#. module: product
+#: field:product.template,weight:0
+msgid "Gross weight"
+msgstr "Peso bruto"
+
+#. module: product
+#: help:product.product,packaging:0
+msgid ""
+"Gives the different ways to package the same product. This has no impact on "
+"the packing order and is mainly used if you use the EDI module."
+msgstr ""
+"Indica diferente maneras de empaquetar el mismo producto. No influye en el "
+"albarán y es utilizado si se usa el módulo EDI."
+
+#. module: product
+#: model:ir.model,name:product.model_product_category
+#: field:product.pricelist.item,categ_id:0
+msgid "Product Category"
+msgstr "Categoría de producto"
+
+#. module: product
+#: field:product.price.type,field:0
+msgid "Product Field"
+msgstr "Campo de producto"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_pricelist_type_action
+#: model:ir.ui.menu,name:product.menu_product_pricelist_type_action
+msgid "Pricelists Types"
+msgstr "Tipo de precio"
+
+#. module: product
+#: help:product.template,state:0
+msgid "Tells the user if he can use the product or not."
+msgstr "Informa al usuario si puede usar el producto o no."
+
+#. module: product
+#: field:product.supplierinfo,product_code:0
+msgid "Partner Product Code"
+msgstr "Código producto proveedor"
+
+#. module: product
+#: model:product.category,name:product.product_category_3
+msgid "Computer Stuff"
+msgstr "Complementos de ordenador"
+
+#. module: product
+#: field:product.packaging,code:0
+#: field:product.product,code:0
+#: field:product.product,default_code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: product
+#: help:product.uom,factor_inv:0
+msgid ""
+"The coefficient for the formula:\n"
+"coeff (base unit) = 1 (this unit). Factor = 1 / Rate."
+msgstr ""
+"El coeficiente para la fórmula:\n"
+"coef. (unidad base) = 1 (esta unidad). Factor = 1 / Ratio."
+
+#. module: product
+#: view:product.supplierinfo:0
+msgid "Seq"
+msgstr "Seq"
+
+#. module: product
+#: model:product.category,name:product.product_category_8
+msgid "Phone Help"
+msgstr "Ayuda telefónica"
+
+#. module: product
+#: selection:product.template,mes_type:0
+msgid "Variable"
+msgstr "Variable"
+
+#. module: product
+#: help:product.template,uom_id:0
+msgid "Default Unit of Measure used for all stock operation."
+msgstr ""
+"Unidad de medida por defecto utilizada para todas las operaciones de "
+"inventario."
+
+#. module: product
+#: model:ir.model,name:product.model_product_template
+#: field:product.pricelist.item,product_tmpl_id:0
+#: field:product.product,product_tmpl_id:0
+#: view:product.template:0
+msgid "Product Template"
+msgstr "Plantilla de producto"
+
+#. module: product
+#: model:ir.model,name:product.model_product_ul
+msgid "Shipping Unit"
+msgstr "Unidad de transporte"
+
+#. module: product
+#: help:product.uom,rounding:0
+msgid ""
+"The computed quantity will be a multiple of this value. Use 1.0 for products "
+"that can not be split."
+msgstr ""
+"La cantidad calculada será un múltiplo de este valor. Use 1.0 para los "
+"productos que no se puedan dividir."
+
+#. module: product
+#: field:product.packaging,height:0
+msgid "Height"
+msgstr "Altura"
+
+#. module: product
+#: model:product.template,name:product.product_product_pc4_product_template
+msgid "Customizable PC"
+msgstr "PC personalizable"
+
+#. module: product
+#: help:product.pricelist.version,date_end:0
+msgid "Ending date for this pricelist version to be valid."
+msgstr "Fecha final de esta versión de tarifa para ser válida."
+
+#. module: product
+#: field:pricelist.partnerinfo,suppinfo_id:0
+msgid "Partner Information"
+msgstr "Información de empresa"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+#: field:product.template,type:0
+msgid "Product Type"
+msgstr "Tipo de producto"
+
+#. module: product
+#: model:product.category,name:product.product_category_7
+#: model:product.template,name:product.product_product_1_product_template
+msgid "Onsite Intervention"
+msgstr "Sitio de intervención"
+
+#. module: product
+#: model:product.category,name:product.cat0
+msgid "All products"
+msgstr "Todos los productos"
+
+#. module: product
+#: wizard_button:product.price_list,init,end:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: product
+#: help:product.packaging,qty:0
+msgid "The total number of products you can put by palet or box."
+msgstr "El número total de productos que puede poner por paleta o caja."
+
+#. module: product
+#: model:ir.model,name:product.model_product_pricelist_item
+msgid "Pricelist item"
+msgstr "Elemento de la tarifa"
+
+#. module: product
+#: model:ir.actions.wizard,name:product.report_wizard_price
+#: field:product.pricelist.version,pricelist_id:0
+msgid "Price List"
+msgstr "Lista de precios"
+
+#. module: product
+#: model:product.pricelist,name:product.list0
+msgid "Public Pricelist"
+msgstr "Precio publico"
+
+#. module: product
+#: model:product.template,name:product.product_product_21_product_template
+msgid "RAM on demand"
+msgstr "RAM bajo pedido"
+
+#. module: product
+#: selection:product.ul,type:0
+#: model:product.uom.categ,name:product.product_uom_categ_unit
+msgid "Unit"
+msgstr "Unidad"
+
+#. module: product
+#: model:product.template,name:product.product_product_hdd2_product_template
+msgid "HDD Seagate 7200.8 120GB"
+msgstr "HDD Seagate 7200.8 120GB"
+
+#. module: product
+#: wizard_field:product.price_list,init,qty2:0
+msgid "Quantity-2"
+msgstr "Cantidad-2"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Information"
+msgstr "Información"
+
+#. module: product
+#: view:product.product:0
+msgid "Codes"
+msgstr "Códigos"
+
+#. module: product
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+"especial!"
+
+#. module: product
+#: wizard_field:product.price_list,init,qty4:0
+msgid "Quantity-4"
+msgstr "Cantidad-4"
+
+#. module: product
+#: wizard_field:product.price_list,init,qty5:0
+msgid "Quantity-5"
+msgstr "Cantidad-5"
+
+#. module: product
+#: view:product.packaging:0
+#: view:product.product:0
+msgid "Other Info"
+msgstr "Otra información"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Delays"
+msgstr "Plazos"
+
+#. module: product
+#: field:product.pricelist.version,items_id:0
+msgid "Price List Items"
+msgstr "Elementos de la tarifa"
+
+#. module: product
+#: help:product.supplierinfo,product_code:0
+msgid ""
+"Code of the product for this partner, will be used when printing a request "
+"for quotation. Keep empty to use the internal one."
+msgstr ""
+"Código del producto para esta empresa, se utilizará al imprimir una "
+"petición de presupuesto. Dejarlo vacío para utilizar el código interno."
+
+#. module: product
+#: selection:product.template,state:0
+msgid "Obsolete"
+msgstr "Obsoleto"
+
+#. module: product
+#: selection:product.ul,type:0
+msgid "Pallet"
+msgstr "Palet"
+
+#. module: product
+#: field:pricelist.partnerinfo,price:0
+msgid "Unit Price"
+msgstr "Precio Unitario"
+
+#. module: product
+#: field:product.template,warranty:0
+msgid "Warranty (months)"
+msgstr "Garantía (meses)"
+
+#. module: product
+#: field:product.packaging,ul_qty:0
+msgid "Package by layer"
+msgstr "Paquetes por piso"
+
+#. module: product
+#: help:product.template,type:0
+msgid ""
+"Will change the way procurements are processed. Consumables are stockable "
+"products with infinite stock, or for use when you have no inventory "
+"management in the system."
+msgstr ""
+
+#. module: product
+#: model:process.node,note:product.process_node_supplier0
+msgid "Product suppliers, with their product name, price, etc."
+msgstr "Proveedores del producto, con su nombre de producto, precio, etc."
+
+#. module: product
+#: model:ir.model,name:product.model_product_price_type
+msgid "Price type"
+msgstr "Tipo de precio"
+
+#. module: product
+#: model:ir.model,name:product.model_product_product
+#: model:process.node,name:product.process_node_product0
+#: field:product.packaging,product_id:0
+#: field:product.pricelist.item,product_id:0
+#: view:product.product:0
+#: field:product.supplierinfo,product_id:0
+#: model:res.request.link,name:product.req_link_product
+msgid "Product"
+msgstr "Producto"
+
+#. module: product
+#: field:product.template,volume:0
+msgid "Volume"
+msgstr "Volumen"
+
+#. module: product
+#: field:pricelist.partnerinfo,name:0
+#: field:product.packaging,name:0
+#: view:product.product:0
+#: view:product.template:0
+#: field:product.template,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: product
+#: field:product.packaging,ean:0
+msgid "EAN"
+msgstr "EAN"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Product Description"
+msgstr "Descripción del producto"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid " ) + "
+msgstr " ) + "
+
+#. module: product
+#: help:product.template,sale_delay:0
+msgid ""
+"This is the average time between the confirmation of the customer order and "
+"the delivery of the finished products. It's the time you promise to your "
+"customers."
+msgstr ""
+"Este es el tiempo promedio entre la confirmación del pedido del cliente y la "
+"entrega de los productos terminados. Es el tiempo que promete a sus clientes."
+
+#. module: product
+#: model:ir.model,name:product.model_product_uom_categ
+msgid "Product uom categ"
+msgstr "Categ. UdM de producto"
+
+#. module: product
+#: wizard_field:product.price_list,init,qty3:0
+msgid "Quantity-3"
+msgstr "Cantidad-3"
+
+#. module: product
+#: model:product.ul,name:product.product_ul_box
+msgid "Box 20x20x40"
+msgstr "Caja 20x20x40"
+
+#. module: product
+#: selection:product.template,supply_method:0
+msgid "Produce"
+msgstr "Producir"
+
+#. module: product
+#: selection:product.template,procure_method:0
+msgid "Make to Order"
+msgstr "Obtener bajo pedido"
+
+#. module: product
+#: field:product.pricelist.item,price_surcharge:0
+msgid "Price Surcharge"
+msgstr "Sobrecarga precio"
+
+#. module: product
+#: constraint:product.pricelist.version:0
+msgid "You cannot have 2 pricelist versions that overlap!"
+msgstr ""
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Rounding Method"
+msgstr "Método redondeo"
+
+#. module: product
+#: field:product.product,variants:0
+msgid "Variants"
+msgstr "Variantes"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Price Computation"
+msgstr "Cálculo del precio"
+
+#. module: product
+#: model:product.template,name:product.product_product_mb1_product_template
+msgid "Mainboard ASUStek A7N8X"
+msgstr "Placa madre ASUStek A7N8X"
+
+#. module: product
+#: field:product.template,loc_case:0
+msgid "Case"
+msgstr "Caso"
+
+#. module: product
+#: field:product.pricelist.version,date_end:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_category_action_form
+#: model:ir.ui.menu,name:product.menu_product_category_action_form
+msgid "Products Categories"
+msgstr "Categorías de productos"
+
+#. module: product
+#: field:product.product,packaging:0
+msgid "Logistical Units"
+msgstr "Unidades de logística"
+
+#. module: product
+#: field:product.category,complete_name:0
+#: field:product.category,name:0
+#: field:product.pricelist.type,name:0
+#: field:product.pricelist.version,name:0
+#: field:product.template,name:0
+#: field:product.ul,name:0
+#: field:product.uom,name:0
+#: field:product.uom.categ,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: product
+#: help:product.template,uos_coeff:0
+msgid ""
+"Coefficient to convert UOM to UOS\n"
+" uom = uos * coeff"
+msgstr ""
+"Coeficiente para convertir UdM a UdV\n"
+" udm = udv * coef"
+
+#. module: product
+#: field:product.template,purchase_ok:0
+msgid "Can be Purchased"
+msgstr "Puede ser comprado"
+
+#. module: product
+#: field:product.template,uos_coeff:0
+msgid "UOM -> UOS Coeff"
+msgstr "Coef. UdM -> UdV"
+
+#. module: product
+#: model:product.template,name:product.product_product_cpu2_product_template
+msgid "High speed processor config"
+msgstr "Config. Procesador alta velocidad"
+
+#. module: product
+#: model:product.template,name:product.product_product_pc2_product_template
+msgid "Basic+ PC (assembly on order)"
+msgstr "PC Básico+ (ensamblado bajo pedido)"
+
+#. module: product
+#: field:product.template,cost_method:0
+msgid "Costing Method"
+msgstr "Método costo"
+
+#. module: product
+#: view:product.packaging:0
+#: view:product.product:0
+msgid "Palletization"
+msgstr "Paletización"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Prices & Suppliers"
+msgstr "Precios & Proveedores"
+
+#. module: product
+#: help:product.packaging,weight:0
+msgid "The weight of a full of products palet or box."
+msgstr "El peso de un palet o caja llena de productos."
+
+#. module: product
+#: selection:product.template,state:0
+msgid "End of Lifecycle"
+msgstr "Fin del ciclo de vida"
+
+#. module: product
+#: model:ir.module.module,shortdesc:product.module_meta_information
+msgid "Products & Pricelists"
+msgstr "Productos y tarifas"
+
+#. module: product
+#: help:product.uom,factor:0
+msgid ""
+"The coefficient for the formula:\n"
+"1 (base unit) = coeff (this unit). Rate = 1 / Factor."
+msgstr ""
+"El coeficiente para la fórmula:\n"
+"1 (unidad base) = coef. (esta unidad). Ratio = 1 / Factor."
+
+#. module: product
+#: help:product.template,weight_net:0
+msgid "The net weight in Kg."
+msgstr "El peso neto en Kg."
+
+#. module: product
+#: model:product.template,name:product.product_product_tow1_product_template
+msgid "ATX Mid-size Tower"
+msgstr "Torre de tamaño medio ATX"
+
+#. module: product
+#: field:product.supplierinfo,delay:0
+msgid "Delivery Delay"
+msgstr "Plazo de entrega"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_pricelist_action
+#: model:ir.ui.menu,name:product.menu_product_pricelist_action
+#: field:product.pricelist,version_id:0
+msgid "Pricelist Versions"
+msgstr "Versiones de tarifa"
+
+#. module: product
+#: field:product.packaging,weight_ul:0
+msgid "Empty Package Weight"
+msgstr "Peso paquete vacío"
+
+#. module: product
+#: field:product.template,list_price:0
+msgid "Sale Price"
+msgstr "Precio de venta"
+
+#. module: product
+#: help:product.template,produce_delay:0
+msgid ""
+"Average time to produce this product. This is only for the production order "
+"and, if it is a multi-level bill of material, it's only for the level of "
+"this product. Different delays will be summed for all levels and purchase "
+"orders."
+msgstr ""
+"Tiempo promedio para producir este producto. Sólo se utiliza para la orden "
+"de producción y, si es contiene una lista de materiales multi-nivel, sólo "
+"para el nivel de este producto. Diferentes plazos serán sumados para todos "
+"los niveles y pedidos de compra."
+
+#. module: product
+#: wizard_field:product.price_list,init,qty1:0
+msgid "Quantity-1"
+msgstr "Cantidad-1"
+
+#. module: product
+#: field:product.packaging,length:0
+msgid "Length"
+msgstr "Longitud"
+
+#. module: product
+#: model:product.category,name:product.cat2
+msgid "Private"
+msgstr "Privado"
+
+#. module: product
+#: help:product.supplierinfo,delay:0
+msgid ""
+"Delay in days between the confirmation of the purchase order and the "
+"reception of the products in your warehouse. Used by the scheduler for "
+"automatic computation of the purchase order planning."
+msgstr ""
+"Plazo en días entre la confirmación de la orden de compra y la recepción de "
+"los productos en su almacén. Utilizado por el planificador para el cálculo "
+"automático de la orden de compra."
+
+#. module: product
+#: help:product.template,uom_po_id:0
+msgid ""
+"Default Unit of Measure used for purchase orders. It must in the same "
+"category than the default unit of measure."
+msgstr ""
+"Unidad de medida por defecto utilizada en las órdenes de compra. Debe "
+"estar en la misma categoría que la unidad de medida por defecto."
+
+#. module: product
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN erróneo"
+
+#. module: product
+#: field:product.pricelist.item,min_quantity:0
+msgid "Min. Quantity"
+msgstr "Cantidad mín."
+
+#. module: product
+#: help:product.pricelist.item,categ_id:0
+msgid ""
+"Set a category of product if this rule only apply to products of a category "
+"and his childs. Keep empty for all products"
+msgstr ""
+"Indicar una categoría de producto si esta regla sólo se aplica a productos "
+"de una categoría y a sus descendientes. Dejarlo vacío para todos los "
+"productos"
+
+#. module: product
+#: model:ir.actions.report.xml,name:product.report_product_label
+msgid "Products Labels"
+msgstr "Etiquetas de productos"
+
+#. module: product
+#: help:product.template,volume:0
+msgid "The volume in m3."
+msgstr "El volumen en m3."
+
+#. module: product
+#: model:product.ul,name:product.product_ul_big_box
+msgid "Box 30x40x60"
+msgstr "Caja 30x40x60"
+
+#. module: product
+#: model:product.uom,name:product.product_uom_kgm
+msgid "KGM"
+msgstr "Kg."
+
+#. module: product
+#: field:product.pricelist.item,price_discount:0
+msgid "Price Discount"
+msgstr "Descuento precio"
diff --git a/addons/product/i18n/lt.po b/addons/product/i18n/lt.po
index 8a7bf28a707..8c4543de67b 100644
--- a/addons/product/i18n/lt.po
+++ b/addons/product/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:43+0000\n"
+"PO-Revision-Date: 2010-08-22 05:54+0000\n"
"Last-Translator: Giedrius Slavinskas \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: lt\n"
diff --git a/addons/product/i18n/mn.po b/addons/product/i18n/mn.po
index 8d72fe7f38a..b5ed087da8d 100644
--- a/addons/product/i18n/mn.po
+++ b/addons/product/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:43+0000\n"
+"PO-Revision-Date: 2010-08-22 05:54+0000\n"
"Last-Translator: ub121 \n"
"Language-Team: Mongolian \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product
diff --git a/addons/product/i18n/pt_BR.po b/addons/product/i18n/pt_BR.po
index b6dabf65204..fd4350206c6 100644
--- a/addons/product/i18n/pt_BR.po
+++ b/addons/product/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:43+0000\n"
+"PO-Revision-Date: 2010-08-22 05:54+0000\n"
"Last-Translator: OpenERP Administrators \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product
diff --git a/addons/product/i18n/sr.po b/addons/product/i18n/sr.po
index 103e1e5ad21..d0ce0ba2031 100644
--- a/addons/product/i18n/sr.po
+++ b/addons/product/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:55+0000\n"
+"PO-Revision-Date: 2010-08-22 06:06+0000\n"
"Last-Translator: Sonja Sardelić \n"
"Language-Team: Serbian \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product
diff --git a/addons/product/i18n/tr.po b/addons/product/i18n/tr.po
index 2d3a7d5e0a2..43d50f4238d 100644
--- a/addons/product/i18n/tr.po
+++ b/addons/product/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:47+0000\n"
+"PO-Revision-Date: 2010-08-22 05:58+0000\n"
"Last-Translator: Angel Spy \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product
diff --git a/addons/product/i18n/zh_CN.po b/addons/product/i18n/zh_CN.po
index d3214b6f45f..9c35d9f5edc 100644
--- a/addons/product/i18n/zh_CN.po
+++ b/addons/product/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:47+0000\n"
+"PO-Revision-Date: 2010-08-22 05:57+0000\n"
"Last-Translator: Black Jack \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product
diff --git a/addons/product_expiry/i18n/de.po b/addons/product_expiry/i18n/de.po
new file mode 100644
index 00000000000..a13d2185960
--- /dev/null
+++ b/addons/product_expiry/i18n/de.po
@@ -0,0 +1,171 @@
+# German 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-06-30 15:09+0000\n"
+"PO-Revision-Date: 2010-08-22 07:39+0000\n"
+"Last-Translator: Ferdinand @ ChriCar \n"
+"Language-Team: German \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 04:02+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: product_expiry
+#: field:product.product,life_time:0
+msgid "Product lifetime"
+msgstr "Produktlebensdauer"
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_from_product_template
+msgid "Ham"
+msgstr "Schinken"
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_lait_product_template
+msgid "Cow milk"
+msgstr "Kuhmilch"
+
+#. module: product_expiry
+#: model:ir.module.module,shortdesc:product_expiry.module_meta_information
+msgid "Products date of expiry"
+msgstr "Produkt Ablaufdatum"
+
+#. module: product_expiry
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+"Fehler: Die Standard Mengeneinheit sowie die Beschaffungs Mengeneinheit muss "
+"in derselben Kategorie sein."
+
+#. module: product_expiry
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Fehlerhafter XML-Code für diese Ansicht!"
+
+#. module: product_expiry
+#: help:stock.production.lot,life_date:0
+msgid "The date the lot may become dangerous and should not be consumed."
+msgstr ""
+"Das Ablaufdatum des Loses könnte gefährlich werde und sollte nicht "
+"konsumiert werden"
+
+#. module: product_expiry
+#: field:stock.production.lot,removal_date:0
+msgid "Removal Date"
+msgstr "Entnahmedatum"
+
+#. module: product_expiry
+#: model:ir.module.module,description:product_expiry.module_meta_information
+msgid ""
+"Track different dates on products and production lots:\n"
+" - end of life\n"
+" - best before date\n"
+" - removal date\n"
+" - alert date\n"
+"Used, for example, in food industries."
+msgstr ""
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_pain_product_template
+msgid "Bread"
+msgstr "Brot"
+
+#. module: product_expiry
+#: model:product.uom,name:product_expiry.product_uom_ltr
+#: model:product.uom.categ,name:product_expiry.product_uom_categ_vol
+msgid "LTR"
+msgstr ""
+
+#. module: product_expiry
+#: view:product.product:0
+#: view:stock.production.lot:0
+msgid "Dates"
+msgstr "Zeitpunkte"
+
+#. module: product_expiry
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr "Fehler: UOS sollte in einer anderen Kategorie sein als UOM"
+
+#. module: product_expiry
+#: field:stock.production.lot,life_date:0
+msgid "End of Life Date"
+msgstr "Ende der Lebensdauer"
+
+#. module: product_expiry
+#: field:stock.production.lot,use_date:0
+msgid "Best before Date"
+msgstr "Mindesthaltbarkeitsdatum"
+
+#. module: product_expiry
+#: help:stock.production.lot,use_date:0
+msgid "The date the lot starts deteriorating without becoming dangerous."
+msgstr ""
+"Das Datum, ab dem das Produkt schlechter wird ohne gefährlich zu werden."
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_jambon_product_template
+msgid "French cheese Camenbert"
+msgstr "französicher Camembert"
+
+#. module: product_expiry
+#: help:product.product,removal_time:0
+msgid "The number of days before a production lot should be removed."
+msgstr "Tage bevor ein Produktionslos entfernt werden soll"
+
+#. module: product_expiry
+#: field:product.product,use_time:0
+#: field:stock.production.lot,dlc:0
+msgid "Product usetime"
+msgstr "Produkt Verwendungsdauer"
+
+#. module: product_expiry
+#: field:stock.production.lot,alert_date:0
+msgid "Alert Date"
+msgstr "Alarmzeitpunkt"
+
+#. module: product_expiry
+#: field:product.product,removal_time:0
+msgid "Product removal time"
+msgstr "Produkt Entfernungszeitpunkt"
+
+#. module: product_expiry
+#: help:product.product,use_time:0
+msgid ""
+"The number of days before a production lot starts deteriorating without "
+"becoming dangerous."
+msgstr ""
+"Die Anzahl der Tage bevor ein Produktionslos schlechter wird ohne gefährlich "
+"zu werden"
+
+#. module: product_expiry
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Fehler: Falscher EAN code"
+
+#. module: product_expiry
+#: help:product.product,life_time:0
+msgid ""
+"The number of days before a production lot may become dangerous and should "
+"not be consumed."
+msgstr ""
+"Die Anzahl der Tage bevor ein Produkt gefährlich wird und nicht konsumiert "
+"werden soll"
+
+#. module: product_expiry
+#: help:stock.production.lot,removal_date:0
+msgid "The date the lot should be removed."
+msgstr "Datum an dem das Los entfernt werden soll"
+
+#. module: product_expiry
+#: field:product.product,alert_time:0
+msgid "Product alert time"
+msgstr "Produkt Alarmzeitpunkt"
diff --git a/addons/product_manufacturer/i18n/de.po b/addons/product_manufacturer/i18n/de.po
new file mode 100644
index 00000000000..530434654b3
--- /dev/null
+++ b/addons/product_manufacturer/i18n/de.po
@@ -0,0 +1,95 @@
+# German 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: 2010-08-12 12:35+0000\n"
+"PO-Revision-Date: 2010-08-22 07:28+0000\n"
+"Last-Translator: Ferdinand @ ChriCar \n"
+"Language-Team: German \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 04:02+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: product_manufacturer
+#: model:ir.module.module,description:product_manufacturer.module_meta_information
+msgid "A module that add manufacturers and attributes on the product form"
+msgstr "Dieses Modul fügt Hersteller und Merkmale zum Produkt hinzu"
+
+#. module: product_manufacturer
+#: field:product.product,manufacturer_pref:0
+msgid "Manufacturer Product Code"
+msgstr "Hersteller Produkt Nummer"
+
+#. module: product_manufacturer
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Fehlerhafter XML-Code für diese Ansicht!"
+
+#. module: product_manufacturer
+#: view:product.manufacturer.attribute:0
+msgid "Product Template Name"
+msgstr "Produkt Vorlage NAme"
+
+#. module: product_manufacturer
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Der Objektname muss mit \"x_\" beginnen und darf keine Sonderzeichen "
+"beinhalten!"
+
+#. module: product_manufacturer
+#: model:ir.model,name:product_manufacturer.model_product_manufacturer_attribute
+msgid "Product attributes"
+msgstr "Produkt Merkmale"
+
+#. module: product_manufacturer
+#: view:product.manufacturer.attribute:0
+#: view:product.product:0
+msgid "Product Attributes"
+msgstr "Produkt Merkmale"
+
+#. module: product_manufacturer
+#: field:product.manufacturer.attribute,name:0
+msgid "Attribute"
+msgstr "Merkmale"
+
+#. module: product_manufacturer
+#: model:ir.model,name:product_manufacturer.model_product_product
+#: field:product.manufacturer.attribute,product_id:0
+msgid "Product"
+msgstr "Produkt"
+
+#. module: product_manufacturer
+#: field:product.manufacturer.attribute,value:0
+msgid "Value"
+msgstr "Wert"
+
+#. module: product_manufacturer
+#: view:product.product:0
+#: field:product.product,attribute_ids:0
+msgid "Attributes"
+msgstr "Eigenschaften"
+
+#. module: product_manufacturer
+#: model:ir.module.module,shortdesc:product_manufacturer.module_meta_information
+msgid "Products Attributes & Manufacturers"
+msgstr "Produkt Merkmale & Hersteller"
+
+#. module: product_manufacturer
+#: field:product.product,manufacturer_pname:0
+msgid "Manufacturer Product Name"
+msgstr "Produktename des Herstellers"
+
+#. module: product_manufacturer
+#: view:product.product:0
+#: field:product.product,manufacturer:0
+msgid "Manufacturer"
+msgstr "Hersteller"
diff --git a/addons/product_margin/i18n/pt_BR.po b/addons/product_margin/i18n/pt_BR.po
index a035609206a..5f8c8f9b172 100644
--- a/addons/product_margin/i18n/pt_BR.po
+++ b/addons/product_margin/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:39+0000\n"
+"PO-Revision-Date: 2010-08-22 05:48+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product_margin
diff --git a/addons/product_margin/i18n/tr.po b/addons/product_margin/i18n/tr.po
index d521bf17121..b8af5169e1d 100644
--- a/addons/product_margin/i18n/tr.po
+++ b/addons/product_margin/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:55+0000\n"
+"PO-Revision-Date: 2010-08-22 06:06+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product_margin
diff --git a/addons/product_visible_discount/i18n/de.po b/addons/product_visible_discount/i18n/de.po
new file mode 100644
index 00000000000..4ff1753119b
--- /dev/null
+++ b/addons/product_visible_discount/i18n/de.po
@@ -0,0 +1,46 @@
+# German 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-03-25 12:11+0000\n"
+"PO-Revision-Date: 2010-08-22 06:49+0000\n"
+"Last-Translator: Ferdinand @ ChriCar \n"
+"Language-Team: German \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 04:02+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: product_visible_discount
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Fehlerhafter XML-Code für diese Ansicht!"
+
+#. module: product_visible_discount
+#: model:ir.module.module,description:product_visible_discount.module_name_translation
+msgid ""
+"\n"
+" This module lets you calculate discounts on Sale Order lines and Invoice "
+"lines base on the partner's pricelist.\n"
+" To this end, a new check box named \"Visible Discount\" is added to the "
+"pricelist form.\n"
+" Example:\n"
+" For the product PC1 and the partner \"Asustek\": if listprice=450, "
+"and the price calculated using Asustek's pricelist is 225\n"
+" If the check box is checked, we will have on the sale order line: "
+"Unit price=450, Discount=50,00, Net price=225\n"
+" If the check box is unchecked, we will have on Sale Order and "
+"Invoice lines: Unit price=225, Discount=0,00, Net price=225\n"
+" "
+msgstr ""
+
+#. module: product_visible_discount
+#: field:product.pricelist,visible_discount:0
+msgid "Visible Discount"
+msgstr "sichtbarer Nachlass"
diff --git a/addons/profile_accounting/i18n/ar.po b/addons/profile_accounting/i18n/ar.po
deleted file mode 100644
index 19259841475..00000000000
--- a/addons/profile_accounting/i18n/ar.po
+++ /dev/null
@@ -1,140 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * profile_accounting
-#
-msgid ""
-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-02-03 06:26+0000\n"
-"Last-Translator: <>\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-12 03:41+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_accounting
-#: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid ""
-"Install more modules. A few modules are proposed according to the Account "
-"Profile you selected. You will be able to install them based on our "
-"requirements."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Services Management"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_asset:0
-msgid "Asset Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
-msgid "Accounting Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "Invoice on Analytic Entries"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,description:profile_accounting.module_meta_information
-msgid "Profile for Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Helps you to manage financial and analytic budgets."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,name:0
-msgid "Name"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Budgets"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
-msgid "Accounting only profile"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
-msgid "Analytic Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
-msgid "profile.accounting.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
diff --git a/addons/profile_accounting/i18n/bg.po b/addons/profile_accounting/i18n/bg.po
deleted file mode 100644
index 47d1099e578..00000000000
--- a/addons/profile_accounting/i18n/bg.po
+++ /dev/null
@@ -1,142 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * profile_accounting
-#
-msgid ""
-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-02-04 05:51+0000\n"
-"Last-Translator: Fabien (Open ERP) \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-12 03:41+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_accounting
-#: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid ""
-"Install more modules. A few modules are proposed according to the Account "
-"Profile you selected. You will be able to install them based on our "
-"requirements."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
-"символи!"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Services Management"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_asset:0
-msgid "Asset Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
-msgid "Accounting Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "Invoice on Analytic Entries"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,description:profile_accounting.module_meta_information
-msgid "Profile for Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Helps you to manage financial and analytic budgets."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Невалиден XML за преглед на архитектурата"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,name:0
-msgid "Name"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Budgets"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
-msgid "Accounting only profile"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
-msgid "Analytic Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
-msgid "profile.accounting.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
diff --git a/addons/profile_accounting/i18n/bs.po b/addons/profile_accounting/i18n/bs.po
deleted file mode 100644
index 8f62b604215..00000000000
--- a/addons/profile_accounting/i18n/bs.po
+++ /dev/null
@@ -1,140 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * profile_accounting
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-24 18:24+0000\n"
-"Last-Translator: Miro Glavić \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-12 03:41+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_accounting
-#: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid ""
-"Install more modules. A few modules are proposed according to the Account "
-"Profile you selected. You will be able to install them based on our "
-"requirements."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Services Management"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_asset:0
-msgid "Asset Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
-msgid "Accounting Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "Invoice on Analytic Entries"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,description:profile_accounting.module_meta_information
-msgid "Profile for Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Helps you to manage financial and analytic budgets."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neodgovarajući XML za arhitekturu prikaza!"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,name:0
-msgid "Name"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Budgets"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
-msgid "Accounting only profile"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
-msgid "Analytic Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
-msgid "profile.accounting.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
diff --git a/addons/profile_accounting/i18n/ca.po b/addons/profile_accounting/i18n/ca.po
deleted file mode 100644
index ea7ba6ea4ff..00000000000
--- a/addons/profile_accounting/i18n/ca.po
+++ /dev/null
@@ -1,150 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * profile_accounting
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 09:10+0000\n"
-"Last-Translator: Raimon Esteve (Zikzakmedia) \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-12 03:41+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_accounting
-#: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid ""
-"Install more modules. A few modules are proposed according to the Account "
-"Profile you selected. You will be able to install them based on our "
-"requirements."
-msgstr ""
-"Instal·leu més mòduls. Es proposen uns quants mòduls relacionats amb el "
-"perfil de comptabilitat que heu seleccionat. Els podreu instal·lar a partir "
-"dels nostres requisits."
-
-#. module: profile_accounting
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
-"especial!"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Services Management"
-msgstr "Gestió de serveis"
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-"El sistema de gestió de documentació d'OpenERP us permet emmagatzemar, "
-"navegar, classificar automàticament, buscar i visualitzar tot tipus de "
-"documents (documents interns, informes impresos, sistema de calendari). Obre "
-"un accés de FTP per a que els usuaris naveguin fàcilment pels documents "
-"associats."
-
-#. module: profile_accounting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nom de model no vàlid en la definició de l'acció."
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr "Gestió de recursos"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr "Gestió dels pagaments a proveïdors"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_asset:0
-msgid "Asset Management"
-msgstr "Gestió d'actius"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr "Plans analítics múltiples"
-
-#. module: profile_accounting
-#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
-msgid "Accounting Profile : Install Extra Modules"
-msgstr "Perfil comptabilitat : Instal·la mòduls extra"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "Invoice on Analytic Entries"
-msgstr "Factura sobre entrades analítiques"
-
-#. module: profile_accounting
-#: model:ir.module.module,description:profile_accounting.module_meta_information
-msgid "Profile for Accounting"
-msgstr "Perfil per a comptabilitat"
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Helps you to manage financial and analytic budgets."
-msgstr "Ajuda a gestionar els pressupostos financers i analítics."
-
-#. module: profile_accounting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invàlid per a la definició de la vista!"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,name:0
-msgid "Name"
-msgstr "Nom"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Budgets"
-msgstr "Pressupostos"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Instal·la"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr "Instal·la mòdul extra"
-
-#. module: profile_accounting
-#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
-msgid "Accounting only profile"
-msgstr "Perfil per utilitzar només la comptabilitat"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
-msgid "Analytic Accounting"
-msgstr "Comptabilitat analítica"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Gestió de documents"
-
-#. module: profile_accounting
-#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
-msgid "profile.accounting.config.install_modules_wizard"
-msgstr "perfil.comptabilitat.config.assistent_instal_mòduls"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Cancel·la"
diff --git a/addons/profile_accounting/i18n/cs.po b/addons/profile_accounting/i18n/cs.po
deleted file mode 100644
index 19259841475..00000000000
--- a/addons/profile_accounting/i18n/cs.po
+++ /dev/null
@@ -1,140 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * profile_accounting
-#
-msgid ""
-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-02-03 06:26+0000\n"
-"Last-Translator: <>\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-12 03:41+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_accounting
-#: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid ""
-"Install more modules. A few modules are proposed according to the Account "
-"Profile you selected. You will be able to install them based on our "
-"requirements."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Services Management"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_asset:0
-msgid "Asset Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
-msgid "Accounting Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "Invoice on Analytic Entries"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,description:profile_accounting.module_meta_information
-msgid "Profile for Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Helps you to manage financial and analytic budgets."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,name:0
-msgid "Name"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Budgets"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
-msgid "Accounting only profile"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
-msgid "Analytic Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
-msgid "profile.accounting.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
diff --git a/addons/profile_accounting/i18n/de.po b/addons/profile_accounting/i18n/de.po
deleted file mode 100644
index 5f36d65453d..00000000000
--- a/addons/profile_accounting/i18n/de.po
+++ /dev/null
@@ -1,148 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * profile_accounting
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 09:10+0000\n"
-"Last-Translator: Ferdinand-chricar \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-12 03:41+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_accounting
-#: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid ""
-"Install more modules. A few modules are proposed according to the Account "
-"Profile you selected. You will be able to install them based on our "
-"requirements."
-msgstr ""
-"Installiere weitere Module. Einige werden vorgeschlagen zum ausgewählten "
-"Profil Finanzen. Sie können diese nach Bedarf sukzessiv installieren."
-
-#. module: profile_accounting
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-"beinhalten"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Services Management"
-msgstr "Abrechnung von Services"
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-"Das Dokumentenmanagement erlaubt Ihnen das Speichern, Browsen, Indexieren, "
-"Suchen und die Ansicht aller Arten von Dokumente (interne Dokumente, Bilder, "
-"Reports, Kalender). Es erlaubt einen FTP Zugang für die Benutzer um einfach "
-"im Dokumentenpool zu surfen."
-
-#. module: profile_accounting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modellname in der Aktionsdefinition."
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr "Ressourcenmanagement"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr "Zahlungen Lieferanten"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_asset:0
-msgid "Asset Management"
-msgstr "Vermögensverwaltung"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr "Multiple Planung"
-
-#. module: profile_accounting
-#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
-msgid "Accounting Profile : Install Extra Modules"
-msgstr "Rechungswesen Profil : Installiert Extra Module"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "Invoice on Analytic Entries"
-msgstr "Rechnungsstellung Analytische Konten"
-
-#. module: profile_accounting
-#: model:ir.module.module,description:profile_accounting.module_meta_information
-msgid "Profile for Accounting"
-msgstr "Profile für Rechnungswesen"
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Helps you to manage financial and analytic budgets."
-msgstr "Hilft bei der Auswahl der Budgets für Finanzkonten und Analysekonten"
-
-#. module: profile_accounting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,name:0
-msgid "Name"
-msgstr "Bezeichnung"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Budgets"
-msgstr "Budgets"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Installieren"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr "Installiere Extra Module"
-
-#. module: profile_accounting
-#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
-msgid "Accounting only profile"
-msgstr "Profile für Rechnungswesen alleine"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
-msgid "Analytic Accounting"
-msgstr "Analytische Konten"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Dokumenten Management"
-
-#. module: profile_accounting
-#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
-msgid "profile.accounting.config.install_modules_wizard"
-msgstr "profile.accounting.config.install_modules_wizard"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Abbrechen"
diff --git a/addons/profile_accounting/i18n/el.po b/addons/profile_accounting/i18n/el.po
deleted file mode 100644
index fef51fc2655..00000000000
--- a/addons/profile_accounting/i18n/el.po
+++ /dev/null
@@ -1,151 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * profile_accounting
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-06-15 07:21+0000\n"
-"Last-Translator: Panagiotis Kranidiotis \n"
-"Language-Team: nls@hellug.gr \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-12 03:41+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-"X-Poedit-Country: GREECE\n"
-"X-Poedit-Language: Greek\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#. module: profile_accounting
-#: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid ""
-"Install more modules. A few modules are proposed according to the Account "
-"Profile you selected. You will be able to install them based on our "
-"requirements."
-msgstr ""
-"Εγκαταστήστε περισσότερα Αρθρώματα. Κάποια σας προτείνονται ανάλογα με το "
-"Προφίλ Λογιστικής που επιλέξατε. Μπορείτε να τα εγκαταστήσετε ανάλογα με τις "
-"ανάγκες σας."
-
-#. module: profile_accounting
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Το όνομα πρέπει να ξεκινάει με x_ και να μην περιέχει ειδικούς χαρακτήρες!"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Services Management"
-msgstr "Διαχείριση Υπηρεσιών"
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-"Το Σύστημα Διαχείρισης Εγγράφων του Open ERP σας επιτρέπει να ανοίγετε, να "
-"αποθηκεύετε, να εντοπίζετε και να ευρετηροποιείτε κάθε είδος εγγράφου "
-"(εσωτερικά έγγραφα, εκτυπωμένες αναφορές, ημερολόγια). Ανοίγει μια πρόσβαση "
-"FTP ώστε οι χρήστες να πλοηγούνται εύκολα στα σχετικά έγγραφα."
-
-#. module: profile_accounting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr "Διαχείριση Πόρων"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr "Διαχείριση Πληρωμών Προμηθευτών"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_asset:0
-msgid "Asset Management"
-msgstr "Διαχείριση Παγείων"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
-msgid "Accounting Profile : Install Extra Modules"
-msgstr "Προφίλ Λογιστικής: Εγκατάσταση Επιπλέον Αρθρωμάτων"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "Invoice on Analytic Entries"
-msgstr "Τιμολόγηση στις Αναλυτικές Εγγραφές"
-
-#. module: profile_accounting
-#: model:ir.module.module,description:profile_accounting.module_meta_information
-msgid "Profile for Accounting"
-msgstr "Προφίλ Λογιστικής"
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Helps you to manage financial and analytic budgets."
-msgstr "Σας βοηθά να διαχειριστείτε οικονομικούς προϋπολογισμούς."
-
-#. module: profile_accounting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Άκυρο XML για Αρχιτεκτονική Όψης!"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,name:0
-msgid "Name"
-msgstr "Όνομα"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Budgets"
-msgstr "Προϋπολογισμοί"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Εγκατάσταση"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr "Εγκατάσταση Επιπλέον Αρθρώματος"
-
-#. module: profile_accounting
-#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
-msgid "Accounting only profile"
-msgstr "Προφίλ Λογιστικής μόνο"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
-msgid "Analytic Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Διαχείριση Εγγράφων"
-
-#. module: profile_accounting
-#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
-msgid "profile.accounting.config.install_modules_wizard"
-msgstr "profile.accounting.config.install_modules_wizard"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Ακύρωση"
diff --git a/addons/profile_accounting/i18n/es.po b/addons/profile_accounting/i18n/es.po
deleted file mode 100644
index d6061e7f4b5..00000000000
--- a/addons/profile_accounting/i18n/es.po
+++ /dev/null
@@ -1,151 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * profile_accounting
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\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 10:59+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.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-12 03:41+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_accounting
-#: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid ""
-"Install more modules. A few modules are proposed according to the Account "
-"Profile you selected. You will be able to install them based on our "
-"requirements."
-msgstr ""
-"Instale más módulos. Se proponen unos cuantos módulos relacionados con el "
-"perfil de contabilidad que ha seleccionado. Los podrá instalar a partir de "
-"nuestros requisitos."
-
-#. module: profile_accounting
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Services Management"
-msgstr "Gestión de servicios"
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-"El sistema de gestión de la documentación de OpenERP le permite almacenar, "
-"navegar, clasificar automáticamente, buscar y visualizar todo tipo de "
-"documentos (documentos internos, informes impresos, sistema de calendario). "
-"Abre un acceso de FTP para que los usuarios naveguen fácilmente en los "
-"documentos asociados."
-
-#. module: profile_accounting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo no válido en la definición de acción."
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr "Gestión de recursos"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr "Gestión de los pagos a proveedores"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_asset:0
-msgid "Asset Management"
-msgstr "Gestión de activos"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr "Planes analíticos múltiples"
-
-#. module: profile_accounting
-#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
-msgid "Accounting Profile : Install Extra Modules"
-msgstr "Perfil contabilidad : Instalar módulos extra"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "Invoice on Analytic Entries"
-msgstr "Facturar sobre entradas analíticas"
-
-#. module: profile_accounting
-#: model:ir.module.module,description:profile_accounting.module_meta_information
-msgid "Profile for Accounting"
-msgstr "Perfil para contabilidad"
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Helps you to manage financial and analytic budgets."
-msgstr "Ayuda a gestionar los presupuestos financieros y analíticos."
-
-#. module: profile_accounting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Budgets"
-msgstr "Presupuestos"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Instalar"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr "Instalar módulo extra"
-
-#. module: profile_accounting
-#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
-msgid "Accounting only profile"
-msgstr "Perfil para usar sólo la contabilidad"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
-msgid "Analytic Accounting"
-msgstr "Contabilidad analítica"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Gestión de documentos"
-
-#. module: profile_accounting
-#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
-msgid "profile.accounting.config.install_modules_wizard"
-msgstr "perfil.contabilidad.config.asistente_instal_modulos"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Cancelar"
diff --git a/addons/profile_accounting/i18n/es_AR.po b/addons/profile_accounting/i18n/es_AR.po
deleted file mode 100644
index a11670bdea6..00000000000
--- a/addons/profile_accounting/i18n/es_AR.po
+++ /dev/null
@@ -1,150 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * profile_accounting
-#
-msgid ""
-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-09-23 15:24+0000\n"
-"Last-Translator: Julieta Catalano \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-12 03:41+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_accounting
-#: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid ""
-"Install more modules. A few modules are proposed according to the Account "
-"Profile you selected. You will be able to install them based on our "
-"requirements."
-msgstr ""
-"Instalar más módulos. Algunos módulos son propuestos de acuerdo a el Perfil "
-"de cuentas que ha seleccionado. Podrá instalarlos de acuerdo a sus "
-"requerimientos."
-
-#. module: profile_accounting
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Services Management"
-msgstr "Gestión de servicios"
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-"El sistema de gestión de la documentación de OpenERP le permite almacenar, "
-"navegar, indexar automáticamente, buscar y previsualizar todo tipo de "
-"documentos (documentos internos, informes impresos, sistema de calendario). "
-"Abre un acceso de FTP para que los usuarios naveguen fácilmente en los "
-"documentos de asociación."
-
-#. module: profile_accounting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr "Gestión de recursos"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr "Gestión de los pagos a proveedores"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_asset:0
-msgid "Asset Management"
-msgstr "Gestión de activos"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr "Planes analíticos múltiples"
-
-#. module: profile_accounting
-#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
-msgid "Accounting Profile : Install Extra Modules"
-msgstr "Perfil contabilidad : Instalar módulos extra"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "Invoice on Analytic Entries"
-msgstr "Facturar sobre entradas analíticas"
-
-#. module: profile_accounting
-#: model:ir.module.module,description:profile_accounting.module_meta_information
-msgid "Profile for Accounting"
-msgstr "Perfil para Contabilidad"
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Helps you to manage financial and analytic budgets."
-msgstr "Ayuda a gestionar los presupuestos financieros y analíticos."
-
-#. module: profile_accounting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para la definición de la vista!"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Budgets"
-msgstr "Presupuestos"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Instalar"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr "Instalar módulo extra"
-
-#. module: profile_accounting
-#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
-msgid "Accounting only profile"
-msgstr "Perfil de contabilidad solamente"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
-msgid "Analytic Accounting"
-msgstr "Contabilidad analítica"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Gestión de documentos"
-
-#. module: profile_accounting
-#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
-msgid "profile.accounting.config.install_modules_wizard"
-msgstr "perfil.contabilidad.config.asistente_instal_modulos"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Cambios"
diff --git a/addons/profile_accounting/i18n/et.po b/addons/profile_accounting/i18n/et.po
deleted file mode 100644
index 85e9ae2a164..00000000000
--- a/addons/profile_accounting/i18n/et.po
+++ /dev/null
@@ -1,145 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * profile_accounting
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\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 19:14+0000\n"
-"Last-Translator: Fabien (Open ERP) \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-12 03:41+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_accounting
-#: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid ""
-"Install more modules. A few modules are proposed according to the Account "
-"Profile you selected. You will be able to install them based on our "
-"requirements."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Services Management"
-msgstr "Teenuste haldus"
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-"Open ERP dokumendihaldussüsteem võimaldab sul säilitada, sirvida, "
-"automaatselt indekseerida, otsida ja eelvaadata kõiki dokumendiliike "
-"(sisemised dokumendid, prinditud aruandeid, kalendrisüsteemi). See avab "
-"kasutajatele FTP ligipääsu, et lihtsalt sirvida ühingu dokumente."
-
-#. module: profile_accounting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Vigane mudeli nimi toimingu definitsioonis."
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr "Vahendite haldus"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr "Tarnijate maksehaldus"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_asset:0
-msgid "Asset Management"
-msgstr "Varahaldus"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr "Mitmekordsed analüütilised plaanid"
-
-#. module: profile_accounting
-#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
-msgid "Accounting Profile : Install Extra Modules"
-msgstr "Raamatupidamisprofiil: Paigalda lisamooduleid"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "Invoice on Analytic Entries"
-msgstr "Arve analüütiliste kirjete põhjal"
-
-#. module: profile_accounting
-#: model:ir.module.module,description:profile_accounting.module_meta_information
-msgid "Profile for Accounting"
-msgstr "Profiil raamatupidamiseks"
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Helps you to manage financial and analytic budgets."
-msgstr "Aitab sul hallata finants ja analüütilisi eelarveid"
-
-#. module: profile_accounting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,name:0
-msgid "Name"
-msgstr "Nimi"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Budgets"
-msgstr "Eelarved"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Paigalda"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr "Paigalda lisamoodul"
-
-#. module: profile_accounting
-#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
-msgid "Accounting only profile"
-msgstr "Ainult raamatupidamise profiil"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
-msgid "Analytic Accounting"
-msgstr "Analüütiline raamatupidamine"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Dokumendihaldus"
-
-#. module: profile_accounting
-#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
-msgid "profile.accounting.config.install_modules_wizard"
-msgstr "profile.accounting.config.install_modules_wizard"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Loobu"
diff --git a/addons/profile_accounting/i18n/fr.po b/addons/profile_accounting/i18n/fr.po
deleted file mode 100644
index 1cb5918374b..00000000000
--- a/addons/profile_accounting/i18n/fr.po
+++ /dev/null
@@ -1,142 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * profile_accounting
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 16:01+0000\n"
-"Last-Translator: Christian Draux - reseaucerta.org \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-12 03:41+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_accounting
-#: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid ""
-"Install more modules. A few modules are proposed according to the Account "
-"Profile you selected. You will be able to install them based on our "
-"requirements."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
-"spéciaux !"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Services Management"
-msgstr "Gestion des Services"
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr "Gestion des Ressources"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_asset:0
-msgid "Asset Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
-msgid "Accounting Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "Invoice on Analytic Entries"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,description:profile_accounting.module_meta_information
-msgid "Profile for Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Helps you to manage financial and analytic budgets."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valide pour l'architecture de la vue"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,name:0
-msgid "Name"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Budgets"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Installer"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr "Installer Module Supplémentaire"
-
-#. module: profile_accounting
-#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
-msgid "Accounting only profile"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
-msgid "Analytic Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
-msgid "profile.accounting.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Annuler"
diff --git a/addons/profile_accounting/i18n/hr.po b/addons/profile_accounting/i18n/hr.po
deleted file mode 100644
index 19259841475..00000000000
--- a/addons/profile_accounting/i18n/hr.po
+++ /dev/null
@@ -1,140 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * profile_accounting
-#
-msgid ""
-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-02-03 06:26+0000\n"
-"Last-Translator: <>\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-12 03:41+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_accounting
-#: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid ""
-"Install more modules. A few modules are proposed according to the Account "
-"Profile you selected. You will be able to install them based on our "
-"requirements."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Services Management"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_asset:0
-msgid "Asset Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
-msgid "Accounting Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "Invoice on Analytic Entries"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,description:profile_accounting.module_meta_information
-msgid "Profile for Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Helps you to manage financial and analytic budgets."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,name:0
-msgid "Name"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Budgets"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
-msgid "Accounting only profile"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
-msgid "Analytic Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
-msgid "profile.accounting.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
diff --git a/addons/profile_accounting/i18n/hu.po b/addons/profile_accounting/i18n/hu.po
deleted file mode 100644
index 19259841475..00000000000
--- a/addons/profile_accounting/i18n/hu.po
+++ /dev/null
@@ -1,140 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * profile_accounting
-#
-msgid ""
-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-02-03 06:26+0000\n"
-"Last-Translator: <>\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-12 03:41+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_accounting
-#: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid ""
-"Install more modules. A few modules are proposed according to the Account "
-"Profile you selected. You will be able to install them based on our "
-"requirements."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Services Management"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_asset:0
-msgid "Asset Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
-msgid "Accounting Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "Invoice on Analytic Entries"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,description:profile_accounting.module_meta_information
-msgid "Profile for Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Helps you to manage financial and analytic budgets."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,name:0
-msgid "Name"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Budgets"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
-msgid "Accounting only profile"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
-msgid "Analytic Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
-msgid "profile.accounting.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
diff --git a/addons/profile_accounting/i18n/id.po b/addons/profile_accounting/i18n/id.po
deleted file mode 100644
index 74b228a059a..00000000000
--- a/addons/profile_accounting/i18n/id.po
+++ /dev/null
@@ -1,140 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * profile_accounting
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\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 13:53+0000\n"
-"Last-Translator: <>\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-12 03:41+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_accounting
-#: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid ""
-"Install more modules. A few modules are proposed according to the Account "
-"Profile you selected. You will be able to install them based on our "
-"requirements."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Services Management"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_asset:0
-msgid "Asset Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
-msgid "Accounting Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "Invoice on Analytic Entries"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,description:profile_accounting.module_meta_information
-msgid "Profile for Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Helps you to manage financial and analytic budgets."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,name:0
-msgid "Name"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Budgets"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
-msgid "Accounting only profile"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
-msgid "Analytic Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
-msgid "profile.accounting.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
diff --git a/addons/profile_accounting/i18n/it.po b/addons/profile_accounting/i18n/it.po
deleted file mode 100644
index 72ae57e18ba..00000000000
--- a/addons/profile_accounting/i18n/it.po
+++ /dev/null
@@ -1,142 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * profile_accounting
-#
-msgid ""
-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-02-04 05:52+0000\n"
-"Last-Translator: Fabien (Open ERP) \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-12 03:41+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_accounting
-#: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid ""
-"Install more modules. A few modules are proposed according to the Account "
-"Profile you selected. You will be able to install them based on our "
-"requirements."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-"speciali!"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Services Management"
-msgstr "Gestione Servizi"
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr "Gestione Risorse"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_asset:0
-msgid "Asset Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
-msgid "Accounting Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "Invoice on Analytic Entries"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,description:profile_accounting.module_meta_information
-msgid "Profile for Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Helps you to manage financial and analytic budgets."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per Visualizzazione Architettura!"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,name:0
-msgid "Name"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Budgets"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Installa"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr "Installa Modulo Aggiuntivo"
-
-#. module: profile_accounting
-#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
-msgid "Accounting only profile"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
-msgid "Analytic Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
-msgid "profile.accounting.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Annulla"
diff --git a/addons/profile_accounting/i18n/ko.po b/addons/profile_accounting/i18n/ko.po
deleted file mode 100644
index b99e421f39e..00000000000
--- a/addons/profile_accounting/i18n/ko.po
+++ /dev/null
@@ -1,143 +0,0 @@
-# Korean translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 16:01+0000\n"
-"Last-Translator: ekodaq \n"
-"Language-Team: Korean \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-12 03:41+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_accounting
-#: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid ""
-"Install more modules. A few modules are proposed according to the Account "
-"Profile you selected. You will be able to install them based on our "
-"requirements."
-msgstr "추가 모듈들을 설치하십시오. 귀하가 선택한 계정 프로파일에 따라 몇몇 모듈들이 구성됩니다."
-
-#. module: profile_accounting
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자가 포함되면 안됩니다."
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Services Management"
-msgstr "서비스 관리"
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-"문서 관리 시스템을 통해, 모든 종류의 문서를 인덱스, 검색 및 미;리보기할 수 있습니다 (내부 문서, 인쇄된 리포트, 카렌더). 협력 "
-"업체들의 문서를 쉽게 둘러볼 수 있도록 FTP 접속을 지원합니다."
-
-#. module: profile_accounting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr "리소스 관리"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr "공급자 결제 관리"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_asset:0
-msgid "Asset Management"
-msgstr "자산 관리"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr "다중 분석 플랜"
-
-#. module: profile_accounting
-#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
-msgid "Accounting Profile : Install Extra Modules"
-msgstr "회계 프로파일: 추가 모듈 설치"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "Invoice on Analytic Entries"
-msgstr "분석 엔트리에 따라 인보이스"
-
-#. module: profile_accounting
-#: model:ir.module.module,description:profile_accounting.module_meta_information
-msgid "Profile for Accounting"
-msgstr "회계 프로파일"
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Helps you to manage financial and analytic budgets."
-msgstr "재무 및 분석 예산 관리를 도와드립니다."
-
-#. module: profile_accounting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "유효하지 않은 뷰 아키텍처를 위한 XML !"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,name:0
-msgid "Name"
-msgstr "이름"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Budgets"
-msgstr "예산"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install"
-msgstr "설치"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr "추가 모듈 설치"
-
-#. module: profile_accounting
-#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
-msgid "Accounting only profile"
-msgstr "회계 전용 프로파일"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
-msgid "Analytic Accounting"
-msgstr "분석 회계"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "문서 관리"
-
-#. module: profile_accounting
-#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
-msgid "profile.accounting.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "취소"
diff --git a/addons/profile_accounting/i18n/lt.po b/addons/profile_accounting/i18n/lt.po
deleted file mode 100644
index 19259841475..00000000000
--- a/addons/profile_accounting/i18n/lt.po
+++ /dev/null
@@ -1,140 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * profile_accounting
-#
-msgid ""
-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-02-03 06:26+0000\n"
-"Last-Translator: <>\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-12 03:41+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_accounting
-#: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid ""
-"Install more modules. A few modules are proposed according to the Account "
-"Profile you selected. You will be able to install them based on our "
-"requirements."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Services Management"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_asset:0
-msgid "Asset Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
-msgid "Accounting Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "Invoice on Analytic Entries"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,description:profile_accounting.module_meta_information
-msgid "Profile for Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Helps you to manage financial and analytic budgets."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,name:0
-msgid "Name"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Budgets"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
-msgid "Accounting only profile"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
-msgid "Analytic Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
-msgid "profile.accounting.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
diff --git a/addons/profile_accounting/i18n/nl.po b/addons/profile_accounting/i18n/nl.po
deleted file mode 100644
index 9bf538d5372..00000000000
--- a/addons/profile_accounting/i18n/nl.po
+++ /dev/null
@@ -1,149 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * profile_accounting
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 09:12+0000\n"
-"Last-Translator: mga (Open ERP) \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-12 03:41+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_accounting
-#: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid ""
-"Install more modules. A few modules are proposed according to the Account "
-"Profile you selected. You will be able to install them based on our "
-"requirements."
-msgstr ""
-"Installeer extra modules. Een aantal modules zijn voorgesteld op basis van "
-"het door u gekozen 'Alleen boekhouden' profiel. U kunt ze installeren op "
-"basis van uw behoeften."
-
-#. module: profile_accounting
-#: constraint:ir.model:0
-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 tekens bevatten !"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Services Management"
-msgstr "Servicebeheer"
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-"Met het documentbeheersysteem van OpenERP kunt u allerlei documenten "
-"(interne documenten, afgedrukte overzichten, agenda's) opslaan, "
-"doorbladeren, automatisch indexeren, zoeken en inzien.\r\n"
-"Het systeem maakt gebruik van FTP toegang zodat gebruikers eenvoudig bij de "
-"documenten kunnen komen."
-
-#. module: profile_accounting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ongeldige modelnaam in de actie-definitie."
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr "Resourcebeheer"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr "Crediteurenbeheer"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_asset:0
-msgid "Asset Management"
-msgstr "Eigendommenbeheer"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr "Meerdere kostenplaats-schema's"
-
-#. module: profile_accounting
-#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
-msgid "Accounting Profile : Install Extra Modules"
-msgstr "'Accounting' profiel: Installeer extra modules"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "Invoice on Analytic Entries"
-msgstr "Factureren vanaf kostenplaatsen"
-
-#. module: profile_accounting
-#: model:ir.module.module,description:profile_accounting.module_meta_information
-msgid "Profile for Accounting"
-msgstr "Profiel voor 'Accounting'"
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Helps you to manage financial and analytic budgets."
-msgstr "Helpt u met beheer van financiële- en kostenplaats-budgetten"
-
-#. module: profile_accounting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor weergave!"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,name:0
-msgid "Name"
-msgstr "Naam"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Budgets"
-msgstr "Budgetten"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Installeren"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr "Installeer extra module"
-
-#. module: profile_accounting
-#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
-msgid "Accounting only profile"
-msgstr "'Alleen accounting' profiel"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
-msgid "Analytic Accounting"
-msgstr "Kostenplaatsen"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Documentbeheer"
-
-#. module: profile_accounting
-#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
-msgid "profile.accounting.config.install_modules_wizard"
-msgstr "profile.accounting.config.install_modules_wizard"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Annuleren"
diff --git a/addons/profile_accounting/i18n/nl_BE.po b/addons/profile_accounting/i18n/nl_BE.po
deleted file mode 100644
index a00d58ac2a0..00000000000
--- a/addons/profile_accounting/i18n/nl_BE.po
+++ /dev/null
@@ -1,141 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * profile_accounting
-#
-msgid ""
-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-04-20 09:54+0000\n"
-"Last-Translator: Fabien (Open ERP) \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-12 03:41+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_accounting
-#: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid ""
-"Install more modules. A few modules are proposed according to the Account "
-"Profile you selected. You will be able to install them based on our "
-"requirements."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.model:0
-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 !"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Services Management"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_asset:0
-msgid "Asset Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
-msgid "Accounting Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "Invoice on Analytic Entries"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,description:profile_accounting.module_meta_information
-msgid "Profile for Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Helps you to manage financial and analytic budgets."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,name:0
-msgid "Name"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Budgets"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
-msgid "Accounting only profile"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
-msgid "Analytic Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
-msgid "profile.accounting.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
diff --git a/addons/profile_accounting/i18n/pl.po b/addons/profile_accounting/i18n/pl.po
deleted file mode 100644
index 07696950ea9..00000000000
--- a/addons/profile_accounting/i18n/pl.po
+++ /dev/null
@@ -1,148 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * profile_accounting
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 09:12+0000\n"
-"Last-Translator: mga (Open ERP) \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-12 03:41+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_accounting
-#: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid ""
-"Install more modules. A few modules are proposed according to the Account "
-"Profile you selected. You will be able to install them based on our "
-"requirements."
-msgstr ""
-"Instaluj więcej modułów. Proponujemy moduły zalecane do profilu księgowego, "
-"który wybrałeś. Będziesz mógł je instalować według naszych wskazań."
-
-#. module: profile_accounting
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-"specjalnych !"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Services Management"
-msgstr "Zarządzanie usługami"
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-"System zarządzania dokumentami w OpenERP pozwala przechowywać, przeglądać, "
-"automatycznie indeksować, przeszukiwać i podglądać wszystkie rodzaje "
-"dokumentów (dokumenty wewnętrzne, drukowane raporty, kalendarze). Otwiera on "
-"dla użytkowników dostęp FTP do łatwego przeglądania powiązanych dokumentów."
-
-#. module: profile_accounting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr "Zarządzanie zasobami"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr "Zarządzanie płatnościami dla dostawców"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_asset:0
-msgid "Asset Management"
-msgstr "Środki trwałe"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr "Planowanie analityczne"
-
-#. module: profile_accounting
-#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
-msgid "Accounting Profile : Install Extra Modules"
-msgstr "Profil księgowy: Instaluj dodatkowe moduły"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "Invoice on Analytic Entries"
-msgstr "Faktura z zapisów analitycznych"
-
-#. module: profile_accounting
-#: model:ir.module.module,description:profile_accounting.module_meta_information
-msgid "Profile for Accounting"
-msgstr "Profil dla księgowości"
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Helps you to manage financial and analytic budgets."
-msgstr "Pomaga zarządzać budżetami finansowymi i analitycznymi."
-
-#. module: profile_accounting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,name:0
-msgid "Name"
-msgstr "Nazwa"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Budgets"
-msgstr "Budżety"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Instaluj"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr "Instaluj dodatkowe moduły"
-
-#. module: profile_accounting
-#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
-msgid "Accounting only profile"
-msgstr "Profil tylko księgowy"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
-msgid "Analytic Accounting"
-msgstr "Księgowość analityczna"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Zarządzanie dokumentami"
-
-#. module: profile_accounting
-#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
-msgid "profile.accounting.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Anuluj"
diff --git a/addons/profile_accounting/i18n/profile_accounting.pot b/addons/profile_accounting/i18n/profile_accounting.pot
deleted file mode 100644
index 1fe7ca5eb6f..00000000000
--- a/addons/profile_accounting/i18n/profile_accounting.pot
+++ /dev/null
@@ -1,132 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * profile_accounting
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01:51+0000\n"
-"PO-Revision-Date: 2009-08-28 16:01:51+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: profile_accounting
-#: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid "Install more modules. A few modules are proposed according to the Account Profile you selected. You will be able to install them based on our requirements."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Services Management"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "The Document Management System of Open ERP allows you to store, browse, automatically index, search and preview all kind of documents (internal documents, printed reports, calendar system). It opens an FTP access for the users to easily browse association's document."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_asset:0
-msgid "Asset Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
-msgid "Accounting Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "Invoice on Analytic Entries"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,description:profile_accounting.module_meta_information
-msgid "Profile for Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Helps you to manage financial and analytic budgets."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,name:0
-msgid "Name"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Budgets"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
-msgid "Accounting only profile"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
-msgid "Analytic Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
-msgid "profile.accounting.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
-
diff --git a/addons/profile_accounting/i18n/pt.po b/addons/profile_accounting/i18n/pt.po
deleted file mode 100644
index da22f9366ae..00000000000
--- a/addons/profile_accounting/i18n/pt.po
+++ /dev/null
@@ -1,141 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * profile_accounting
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 16:33+0000\n"
-"Last-Translator: Madalena_prime \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-12 03:41+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_accounting
-#: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid ""
-"Install more modules. A few modules are proposed according to the Account "
-"Profile you selected. You will be able to install them based on our "
-"requirements."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do objecto deve começar com x_ e não pode conter um carácter especial!"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Services Management"
-msgstr "Gestão de serviços"
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr "Gestão de recursos"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_asset:0
-msgid "Asset Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
-msgid "Accounting Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "Invoice on Analytic Entries"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,description:profile_accounting.module_meta_information
-msgid "Profile for Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Helps you to manage financial and analytic budgets."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para a arquitectura de vista"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,name:0
-msgid "Name"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Budgets"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Instalar"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr "Instalar módulos extras"
-
-#. module: profile_accounting
-#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
-msgid "Accounting only profile"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
-msgid "Analytic Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
-msgid "profile.accounting.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Cancelar"
diff --git a/addons/profile_accounting/i18n/pt_BR.po b/addons/profile_accounting/i18n/pt_BR.po
deleted file mode 100644
index 8bc607900e6..00000000000
--- a/addons/profile_accounting/i18n/pt_BR.po
+++ /dev/null
@@ -1,142 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * profile_accounting
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 09:12+0000\n"
-"Last-Translator: pedrobom \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-12 03:41+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_accounting
-#: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid ""
-"Install more modules. A few modules are proposed according to the Account "
-"Profile you selected. You will be able to install them based on our "
-"requirements."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
-"especial!"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Services Management"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_asset:0
-msgid "Asset Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
-msgid "Accounting Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "Invoice on Analytic Entries"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,description:profile_accounting.module_meta_information
-msgid "Profile for Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Helps you to manage financial and analytic budgets."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalido XML para Arquitetura da View"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,name:0
-msgid "Name"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Budgets"
-msgstr "Orçamentos"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
-msgid "Accounting only profile"
-msgstr "Perfil apenas contábil"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
-msgid "Analytic Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Gestão de Documentos"
-
-#. module: profile_accounting
-#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
-msgid "profile.accounting.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
diff --git a/addons/profile_accounting/i18n/ro.po b/addons/profile_accounting/i18n/ro.po
deleted file mode 100644
index 72c896084d7..00000000000
--- a/addons/profile_accounting/i18n/ro.po
+++ /dev/null
@@ -1,142 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * profile_accounting
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\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 10:59+0000\n"
-"Last-Translator: Cristi Nistor \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-12 03:41+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_accounting
-#: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid ""
-"Install more modules. A few modules are proposed according to the Account "
-"Profile you selected. You will be able to install them based on our "
-"requirements."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Numele obiectului trebuie să înceapă cu x_ și nu trebuie să conțină nici un "
-"caracter special !"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Services Management"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr "Administrare Resurse"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr "Administrare Plată Furnizori"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_asset:0
-msgid "Asset Management"
-msgstr "Administrare Mijloc Fix"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr "Planuri Multiple Analitice"
-
-#. module: profile_accounting
-#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
-msgid "Accounting Profile : Install Extra Modules"
-msgstr "Profil Contabilitate: Instalează Module Suplimentare"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "Invoice on Analytic Entries"
-msgstr "Factură pentru Intrăro Analitice"
-
-#. module: profile_accounting
-#: model:ir.module.module,description:profile_accounting.module_meta_information
-msgid "Profile for Accounting"
-msgstr "Profil pentru Contabilitate"
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Helps you to manage financial and analytic budgets."
-msgstr "Te ajută să administrezi bugete financiare şi analitice."
-
-#. module: profile_accounting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Structură XML invalidă pentru Vizualizare Arhitectură"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,name:0
-msgid "Name"
-msgstr "Nume"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Budgets"
-msgstr "Bugete"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Instalează"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr "Instalează Module Suplimentare"
-
-#. module: profile_accounting
-#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
-msgid "Accounting only profile"
-msgstr "Profil doar contabilitate"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
-msgid "Analytic Accounting"
-msgstr "Contabilitate analitică"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Administrare Document"
-
-#. module: profile_accounting
-#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
-msgid "profile.accounting.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Anulează"
diff --git a/addons/profile_accounting/i18n/ru.po b/addons/profile_accounting/i18n/ru.po
deleted file mode 100644
index cbd39f7f2af..00000000000
--- a/addons/profile_accounting/i18n/ru.po
+++ /dev/null
@@ -1,142 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * profile_accounting
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 09:12+0000\n"
-"Last-Translator: mga (Open ERP) \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-12 03:41+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_accounting
-#: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid ""
-"Install more modules. A few modules are proposed according to the Account "
-"Profile you selected. You will be able to install them based on our "
-"requirements."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Название объекта должно начинаться с x_ и не должно содержать специальных "
-"символов !"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Services Management"
-msgstr "Управление услугами"
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Недопустимое имя модели в определении действия."
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr "Управление ресурсами"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_asset:0
-msgid "Asset Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
-msgid "Accounting Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "Invoice on Analytic Entries"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,description:profile_accounting.module_meta_information
-msgid "Profile for Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Helps you to manage financial and analytic budgets."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра архитектуры!"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,name:0
-msgid "Name"
-msgstr "Название"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Budgets"
-msgstr "Бюджеты"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Установить"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr "Установить дополнительные модули"
-
-#. module: profile_accounting
-#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
-msgid "Accounting only profile"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
-msgid "Analytic Accounting"
-msgstr "Бухг. аналитика"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Управление документами"
-
-#. module: profile_accounting
-#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
-msgid "profile.accounting.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Отмена"
diff --git a/addons/profile_accounting/i18n/sl.po b/addons/profile_accounting/i18n/sl.po
deleted file mode 100644
index e13c0c121bb..00000000000
--- a/addons/profile_accounting/i18n/sl.po
+++ /dev/null
@@ -1,141 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * profile_accounting
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 09:12+0000\n"
-"Last-Translator: mga (Open ERP) \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-12 03:41+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_accounting
-#: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid ""
-"Install more modules. A few modules are proposed according to the Account "
-"Profile you selected. You will be able to install them based on our "
-"requirements."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Services Management"
-msgstr "Upravljanje storitev"
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Napačno ime modela v definiciji dejanja."
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr "Upravljanje virov"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_asset:0
-msgid "Asset Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
-msgid "Accounting Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "Invoice on Analytic Entries"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,description:profile_accounting.module_meta_information
-msgid "Profile for Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Helps you to manage financial and analytic budgets."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neveljaven XML za arhitekturo pogleda."
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,name:0
-msgid "Name"
-msgstr "Ime"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Budgets"
-msgstr "Proračuni"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Namesti"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
-msgid "Accounting only profile"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
-msgid "Analytic Accounting"
-msgstr "Analitično knjigovodstvo"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Upravljanje dokumentov"
-
-#. module: profile_accounting
-#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
-msgid "profile.accounting.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Prekliči"
diff --git a/addons/profile_accounting/i18n/sq.po b/addons/profile_accounting/i18n/sq.po
deleted file mode 100644
index 53cdaaf48be..00000000000
--- a/addons/profile_accounting/i18n/sq.po
+++ /dev/null
@@ -1,141 +0,0 @@
-# Albanian 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-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 15:05+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Albanian \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-12 03:41+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_accounting
-#: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid ""
-"Install more modules. A few modules are proposed according to the Account "
-"Profile you selected. You will be able to install them based on our "
-"requirements."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Services Management"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_asset:0
-msgid "Asset Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
-msgid "Accounting Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "Invoice on Analytic Entries"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,description:profile_accounting.module_meta_information
-msgid "Profile for Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Helps you to manage financial and analytic budgets."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,name:0
-msgid "Name"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Budgets"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
-msgid "Accounting only profile"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
-msgid "Analytic Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
-msgid "profile.accounting.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
diff --git a/addons/profile_accounting/i18n/sv.po b/addons/profile_accounting/i18n/sv.po
deleted file mode 100644
index 088d8c6f515..00000000000
--- a/addons/profile_accounting/i18n/sv.po
+++ /dev/null
@@ -1,141 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * profile_accounting
-#
-msgid ""
-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-04-10 08:37+0000\n"
-"Last-Translator: Fabien (Open ERP) \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-12 03:41+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_accounting
-#: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid ""
-"Install more modules. A few modules are proposed according to the Account "
-"Profile you selected. You will be able to install them based on our "
-"requirements."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Services Management"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_asset:0
-msgid "Asset Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
-msgid "Accounting Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "Invoice on Analytic Entries"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,description:profile_accounting.module_meta_information
-msgid "Profile for Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Helps you to manage financial and analytic budgets."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,name:0
-msgid "Name"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Budgets"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
-msgid "Accounting only profile"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
-msgid "Analytic Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
-msgid "profile.accounting.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
diff --git a/addons/profile_accounting/i18n/tlh.po b/addons/profile_accounting/i18n/tlh.po
deleted file mode 100644
index 226d20c4445..00000000000
--- a/addons/profile_accounting/i18n/tlh.po
+++ /dev/null
@@ -1,140 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * profile_accounting
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:26+0000\n"
-"Last-Translator: <>\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-12 03:41+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_accounting
-#: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid ""
-"Install more modules. A few modules are proposed according to the Account "
-"Profile you selected. You will be able to install them based on our "
-"requirements."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Services Management"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_asset:0
-msgid "Asset Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
-msgid "Accounting Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "Invoice on Analytic Entries"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,description:profile_accounting.module_meta_information
-msgid "Profile for Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Helps you to manage financial and analytic budgets."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,name:0
-msgid "Name"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Budgets"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
-msgid "Accounting only profile"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
-msgid "Analytic Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
-msgid "profile.accounting.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
diff --git a/addons/profile_accounting/i18n/tr.po b/addons/profile_accounting/i18n/tr.po
deleted file mode 100644
index 604446b7423..00000000000
--- a/addons/profile_accounting/i18n/tr.po
+++ /dev/null
@@ -1,140 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * profile_accounting
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:41+0000\n"
-"Last-Translator: Fabien (Open ERP) \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-20 03:36+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_accounting
-#: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid ""
-"Install more modules. A few modules are proposed according to the Account "
-"Profile you selected. You will be able to install them based on our "
-"requirements."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Services Management"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr "Tedarikçi Ödeme Yönetimi"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_asset:0
-msgid "Asset Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
-msgid "Accounting Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "Invoice on Analytic Entries"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,description:profile_accounting.module_meta_information
-msgid "Profile for Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Helps you to manage financial and analytic budgets."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Görüntüleme mimarisi için Geçersiz XML"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,name:0
-msgid "Name"
-msgstr "Adı"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Budgets"
-msgstr "Bütçeler"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
-msgid "Accounting only profile"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
-msgid "Analytic Accounting"
-msgstr "Muhasebe Analizi"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Döküman Yönetimi"
-
-#. module: profile_accounting
-#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
-msgid "profile.accounting.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "İptal"
diff --git a/addons/profile_accounting/i18n/uk.po b/addons/profile_accounting/i18n/uk.po
deleted file mode 100644
index 65a98229dfa..00000000000
--- a/addons/profile_accounting/i18n/uk.po
+++ /dev/null
@@ -1,141 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * profile_accounting
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 15:27+0000\n"
-"Last-Translator: Eugene Babiy \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-12 03:41+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_accounting
-#: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid ""
-"Install more modules. A few modules are proposed according to the Account "
-"Profile you selected. You will be able to install them based on our "
-"requirements."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Services Management"
-msgstr "Управління послугами"
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr "Управління ресурсами"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_asset:0
-msgid "Asset Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
-msgid "Accounting Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "Invoice on Analytic Entries"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,description:profile_accounting.module_meta_information
-msgid "Profile for Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Helps you to manage financial and analytic budgets."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильний XML для Архітектури Вигляду!"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,name:0
-msgid "Name"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Budgets"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Встановити"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr "Встановити додатковий модуль"
-
-#. module: profile_accounting
-#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
-msgid "Accounting only profile"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
-msgid "Analytic Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
-msgid "profile.accounting.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Скасувати"
diff --git a/addons/profile_accounting/i18n/vi.po b/addons/profile_accounting/i18n/vi.po
deleted file mode 100644
index 0826da82828..00000000000
--- a/addons/profile_accounting/i18n/vi.po
+++ /dev/null
@@ -1,141 +0,0 @@
-# Vietnamese 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-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 15:06+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Vietnamese \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-12 03:41+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_accounting
-#: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid ""
-"Install more modules. A few modules are proposed according to the Account "
-"Profile you selected. You will be able to install them based on our "
-"requirements."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Services Management"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_asset:0
-msgid "Asset Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
-msgid "Accounting Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "Invoice on Analytic Entries"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,description:profile_accounting.module_meta_information
-msgid "Profile for Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Helps you to manage financial and analytic budgets."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,name:0
-msgid "Name"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Budgets"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
-msgid "Accounting only profile"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
-msgid "Analytic Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
-msgid "profile.accounting.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
diff --git a/addons/profile_accounting/i18n/zh_CN.po b/addons/profile_accounting/i18n/zh_CN.po
deleted file mode 100644
index 428447acb86..00000000000
--- a/addons/profile_accounting/i18n/zh_CN.po
+++ /dev/null
@@ -1,143 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * profile_accounting
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 09:13+0000\n"
-"Last-Translator: Black Jack \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-12 03:41+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_accounting
-#: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid ""
-"Install more modules. A few modules are proposed according to the Account "
-"Profile you selected. You will be able to install them based on our "
-"requirements."
-msgstr "根据你选择的会计配置.有几个模块是被推荐的根据这你将完成安装."
-
-#. module: profile_accounting
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Services Management"
-msgstr "服务管理"
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr "系统文档管理允许你储存,浏览,自动建立索引,查找和预览各种文档."
-
-#. module: profile_accounting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "在这动作定义中有无效的模块名"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr "资源管理"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr "供应商付款管理"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_asset:0
-msgid "Asset Management"
-msgstr "资产管理"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr "多个辅助核算方案"
-
-#. module: profile_accounting
-#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
-msgid "Accounting Profile : Install Extra Modules"
-msgstr "会计配置:安装额外的模块"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "Invoice on Analytic Entries"
-msgstr "辅助核算凭证的发票"
-
-#. module: profile_accounting
-#: model:ir.module.module,description:profile_accounting.module_meta_information
-msgid "Profile for Accounting"
-msgstr "会计配置"
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Helps you to manage financial and analytic budgets."
-msgstr "帮助你管理财务和核算预算"
-
-#. module: profile_accounting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,name:0
-msgid "Name"
-msgstr "名称"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Budgets"
-msgstr "预算"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install"
-msgstr "安装"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr "安装额外的模块"
-
-#. module: profile_accounting
-#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
-msgid "Accounting only profile"
-msgstr "会计配置"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
-msgid "Analytic Accounting"
-msgstr "核算会计"
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "文档管理"
-
-#. module: profile_accounting
-#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
-msgid "profile.accounting.config.install_modules_wizard"
-msgstr "profile.accounting.config.install_modules_wizard"
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "取消"
-
-#~ msgid "Accounting Management"
-#~ msgstr "会计管理"
diff --git a/addons/profile_accounting/i18n/zh_TW.po b/addons/profile_accounting/i18n/zh_TW.po
deleted file mode 100644
index 1fa7ba9131e..00000000000
--- a/addons/profile_accounting/i18n/zh_TW.po
+++ /dev/null
@@ -1,140 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * profile_accounting
-#
-msgid ""
-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-01-30 13:19+0000\n"
-"Last-Translator: <>\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-12 03:41+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: profile_accounting
-#: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid ""
-"Install more modules. A few modules are proposed according to the Account "
-"Profile you selected. You will be able to install them based on our "
-"requirements."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Services Management"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_asset:0
-msgid "Asset Management"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.actions.act_window,name:profile_accounting.action_config_install_module
-msgid "Accounting Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "Invoice on Analytic Entries"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,description:profile_accounting.module_meta_information
-msgid "Profile for Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: help:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Helps you to manage financial and analytic budgets."
-msgstr ""
-
-#. module: profile_accounting
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,name:0
-msgid "Name"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_budget:0
-msgid "Budgets"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.module.module,shortdesc:profile_accounting.module_meta_information
-msgid "Accounting only profile"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0
-msgid "Analytic Accounting"
-msgstr ""
-
-#. module: profile_accounting
-#: field:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_accounting
-#: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard
-msgid "profile.accounting.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_accounting
-#: view:profile.accounting.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
diff --git a/addons/profile_accounting/profile_accounting.py b/addons/profile_accounting/profile_accounting.py
deleted file mode 100644
index d130deb41b4..00000000000
--- a/addons/profile_accounting/profile_accounting.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 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
-import pooler
-
-class profile_accounting_config_install_modules_wizard(osv.osv_memory):
- _name='profile.accounting.config.install_modules_wizard'
- _inherit = 'res.config.installer'
-
- _columns = {
- 'account_analytic_analysis':fields.boolean('Analytic Accounting'),
- 'account_analytic_plans':fields.boolean('Multiple Analytic Plans'),
- 'account_payment':fields.boolean('Suppliers Payment Management'),
- 'account_asset':fields.boolean('Asset Management'),
- 'hr_timesheet_invoice':fields.boolean('Invoice on Analytic Entries'),
- 'account_budget':fields.boolean('Budgets', help="Helps you to manage financial and analytic budgets."),
- 'board_document':fields.boolean('Document Management',help= "The Document Management System of OpenERP allows you to store, browse, automatically index, search and preview all kind of documents (internal documents, printed reports, calendar system). It opens an FTP access for the users to easily browse association's document."),
- }
-profile_accounting_config_install_modules_wizard()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/profile_accounting/profile_accounting.xml b/addons/profile_accounting/profile_accounting.xml
deleted file mode 100644
index f9b143e10f4..00000000000
--- a/addons/profile_accounting/profile_accounting.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
- Accounting Profile : Install extra modules
- profile.accounting.config.install_modules_wizard
- form
-
-
-
-
-
-
-
-
- Install more modules. A few modules are proposed according to the Account Profile you selected. You will be able to install them based on our requirements.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Accounting Profile : Install Extra Modules
- ir.actions.act_window
- profile.accounting.config.install_modules_wizard
-
- form
- form
- new
-
-
-
-
- 3
-
-
- ir.actions.todo
- accounting_installer_action_replace
- tree
-
-
-
-
-
-
-
-
-
diff --git a/addons/profile_accounting/security/ir.model.access.csv b/addons/profile_accounting/security/ir.model.access.csv
deleted file mode 100644
index d60aaef3dc2..00000000000
--- a/addons/profile_accounting/security/ir.model.access.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_profile_accounting_wizard_install","profile accounting wizard install","model_profile_accounting_config_install_modules_wizard","base.group_system",1,1,1,1
diff --git a/addons/project/__init__.py b/addons/project/__init__.py
index 3f65abca376..142cd98e485 100644
--- a/addons/project/__init__.py
+++ b/addons/project/__init__.py
@@ -22,7 +22,6 @@
import project
import company
import installer
-import project_mailgate
import report
import wizard
import res_partner
diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index f071f25cb6e..b0e3880c243 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -26,7 +26,7 @@
"author": "OpenERP SA",
"website": "http://www.openerp.com",
"category": "Generic Modules/Projects & Services",
- "depends": ["product", "analytic", "mail_gateway", "board"],
+ "depends": ["product", "analytic", "board"],
"description": """Project management module tracks multi-level projects, tasks,
work done on tasks, eso. It is able to render planning, order tasks, eso.
Dashboard for project members that includes:
diff --git a/addons/project/i18n/lt.po b/addons/project/i18n/lt.po
index 1dfde4cdf44..044ee3eea3d 100644
--- a/addons/project/i18n/lt.po
+++ b/addons/project/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:46+0000\n"
+"PO-Revision-Date: 2010-08-22 05:56+0000\n"
"Last-Translator: OpenERP Administrators \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-20 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 03:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project
diff --git a/addons/project/i18n/ru.po b/addons/project/i18n/ru.po
index 528427ca61b..d8dd3488a50 100644
--- a/addons/project/i18n/ru.po
+++ b/addons/project/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:44+0000\n"
+"PO-Revision-Date: 2010-08-22 05:54+0000\n"
"Last-Translator: OpenERP Administrators \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-20 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 03:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project
diff --git a/addons/project/i18n/tr.po b/addons/project/i18n/tr.po
index abfd51442d5..95c8ddca855 100644
--- a/addons/project/i18n/tr.po
+++ b/addons/project/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:45+0000\n"
+"PO-Revision-Date: 2010-08-22 05:55+0000\n"
"Last-Translator: OpenERP Administrators \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-20 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 03:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project
diff --git a/addons/project/project_mailgate.py b/addons/project/project_mailgate.py
deleted file mode 100644
index 8c1004b52fa..00000000000
--- a/addons/project/project_mailgate.py
+++ /dev/null
@@ -1,86 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 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 project_tasks(osv.osv):
- _name = "project.task"
- _inherit = "project.task"
-
- def msg_new(self, cr, uid, msg):
- mailgate_obj = self.pool.get('mail.gateway')
- msg_body = mailgate_obj.msg_body_get(msg)
- data = {
- 'name': msg['Subject'],
- 'description': msg_body['body'],
- 'planned_hours' : 0.0,
- 'project_id': 1, #TODO : get project id from message
- }
- res = mailgate_obj.partner_get(cr, uid, msg['From'])
- if res:
- data.update(res)
- res = self.create(cr, uid, data)
- return res
-
- def msg_update(self, cr, uid, id, msg, data={}, default_act='pending'):
- mailgate_obj = self.pool.get('mail.gateway')
- msg_actions, body_data = mailgate_obj.msg_act_get(msg)
- data.update({
- 'description': body_data,
- })
- act = 'do_'+default_act
- if 'state' in msg_actions:
- if msg_actions['state'] in ['draft','close','cancel','open','pending']:
- act = 'do_' + msg_actions['state']
-
- for k1,k2 in [('cost','planned_hours')]:
- try:
- data[k2] = float(msg_actions[k1])
- except:
- pass
-
- if 'priority' in msg_actions:
- if msg_actions['priority'] in ('1','2','3','4','5'):
- data['priority'] = msg_actions['priority']
-
- self.write(cr, uid, [id], data)
- getattr(self,act)(cr, uid, [id])
- return True
-
- def message_followers(self, cr, uid, ids, context=None):
- res = []
- if isinstance(ids, (str, int, long)):
- select = [ids]
- else:
- select = ids
- for task in self.browse(cr, uid, select):
- user_email = (task.user_id and task.user_id.address_id and task.user_id.address_id.email) or False
- res += [(user_email, False, False, task.priority)]
- if isinstance(ids, (str, int, long)):
- return len(res) and res[0] or False
- return res
-
- def msg_send(self, cr, uid, id, *args, **argv):
- return True
-
-project_tasks()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index 2041eda3651..1a1a3f09daa 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -29,6 +29,5 @@
"access_project_vs_hours_manager","project.vs.hours.manager","model_project_vs_hours","project.group_project_manager",1,1,1,1
"access_account_analytic_account_system","account.analytic.account system","analytic.model_account_analytic_account","base.group_system",1,0,0,0
"access_project_vs_hours_system","project.vs.hours.system","model_project_vs_hours","base.group_system",1,0,0,0
-"mail_gateway_mailgate_message_project_user","mail_gateway.mailgate.message user","mail_gateway.model_mailgate_message","project.group_project_user",1,1,1,0
"access_project_task_sale_user","project.task salesman","model_project_task","base.group_sale_salesman",1,0,0,0
"access_project_project_sale_user","project.project salesman","model_project_project","base.group_sale_salesman",1,0,0,0
diff --git a/addons/project/wizard/project_close_task.py b/addons/project/wizard/project_close_task.py
index 609735500f9..eb5589f2e3a 100644
--- a/addons/project/wizard/project_close_task.py
+++ b/addons/project/wizard/project_close_task.py
@@ -119,7 +119,9 @@ class project_close_task(osv.osv_memory):
body = u'%s\n%s\n%s\n\n-- \n%s' % (header, description, footer, signature)
to_adr.append(context.get('send_manager', '') and close_task.get('manager_email', '') or '')
to_adr.append(context.get('send_partner', '') and close_task.get('partner_email', '') or '')
- email(from_adr, to_adr, subject, body.encode('utf-8'), email_bcc=[from_adr])
+ mail_id = email(from_adr, to_adr, subject, body.encode('utf-8'), email_bcc=[from_adr])
+ if not mail_id:
+ raise osv.except_osv(_('Error'), _("Couldn't send mail! Check the email ids and smtp configuration settings"))
task_obj.write(cr, uid, [task.id], {'state': 'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S'), 'remaining_hours': 0.0})
message = _('Task ') + " '" + task.name + "' "+ _("is Done.")
self.log(cr, uid, task.id, message)
diff --git a/addons/project_gtd/i18n/tr.po b/addons/project_gtd/i18n/tr.po
index cc85de8b0aa..34ce3fb59c1 100644
--- a/addons/project_gtd/i18n/tr.po
+++ b/addons/project_gtd/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:45+0000\n"
+"PO-Revision-Date: 2010-08-22 05:56+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_gtd
diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml
index 5e8bd116724..9c074ed2fd3 100644
--- a/addons/project_issue/project_issue_menu.xml
+++ b/addons/project_issue/project_issue_menu.xml
@@ -15,6 +15,7 @@
{"search_default_user_id": uid, "search_default_current":1, "search_default_project_id":project_id}
+ Issues like bugs in a system, client complain, materials breakdown are collected here.A list view allows the manager to quickly check for them, assign them, make their status evolved.
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 386020f3020..c80ccc86e28 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -158,6 +158,7 @@
{'search_default_This Month':1,'search_default_project':1,'group_by_no_leaf':1,'group_by':[]}
+ Track your projects issues and fixing delay with a high accuracy. A multicriteria search tool allows fine-grained analysis.
diff --git a/addons/profile_accounting/__init__.py b/addons/project_mailgate/__init__.py
similarity index 95%
rename from addons/profile_accounting/__init__.py
rename to addons/project_mailgate/__init__.py
index f653bffec7b..0f82ebd1b41 100644
--- a/addons/profile_accounting/__init__.py
+++ b/addons/project_mailgate/__init__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,10 +15,10 @@
# 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 .
#
##############################################################################
-import profile_accounting
+
+import project_mailgate
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/profile_accounting/__openerp__.py b/addons/project_mailgate/__openerp__.py
similarity index 63%
rename from addons/profile_accounting/__openerp__.py
rename to addons/project_mailgate/__openerp__.py
index b438db8e7b2..cd3d0caeaf8 100644
--- a/addons/profile_accounting/__openerp__.py
+++ b/addons/project_mailgate/__openerp__.py
@@ -21,16 +21,26 @@
{
- 'name': 'Accounting only profile',
- 'version': '1.0',
- 'category': 'Profile',
- 'description': """Profile for Accounting""",
- 'author': 'OpenERP SA',
- 'depends': ['account', 'board_account', 'account_followup'],
- 'update_xml': ['security/ir.model.access.csv', 'profile_accounting.xml'],
- 'demo_xml': [],
+ "name": "Project MailGateWay",
+ "version": "1.1",
+ "author": "OpenERP SA",
+ "website": "http://www.openerp.com",
+ "category": "Generic Modules/Projects & Services",
+ "depends": ["project", "mail_gateway"],
+ "description": """This module is an interface that synchronises mails with OpenERP Project Task.
+
+It allows creating tasks as soon as a new mail arrives in our configured mail server.
+Moreover, it keeps track of all further communications and task states.
+ """,
+ "init_xml": [],
+ "update_xml": [
+ "project_mailgate_view.xml",
+ ],
+ 'demo_xml': [
+ ],
'installable': True,
'active': False,
- 'certificate': '0038455352045',
+ 'certificate': '',
}
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_mailgate/project_mailgate.py b/addons/project_mailgate/project_mailgate.py
new file mode 100644
index 00000000000..bc7bc43df03
--- /dev/null
+++ b/addons/project_mailgate/project_mailgate.py
@@ -0,0 +1,207 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 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
+from tools.translate import _
+import binascii
+
+class project_tasks(osv.osv):
+ _name = "project.task"
+ _inherit = ['mailgate.thread','project.task']
+
+ _columns={
+ 'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)], readonly=True),
+ }
+ def message_new(self, cr, uid, msg, context=None):
+# """
+# Automatically calls when new email message arrives
+#
+# @param self: The object pointer
+# @param cr: the current row, from the database cursor,
+# @param uid: the current user’s ID for security checks
+# """
+ mailgate_obj = self.pool.get('email.server.tools')
+ subject = msg.get('subject')
+ body = msg.get('body')
+ msg_from = msg.get('from')
+ priority = msg.get('priority')
+
+ data = {
+ 'name': subject,
+ 'description': body,
+ 'planned_hours' : 0.0,
+ }
+ res = mailgate_obj.get_partner(cr, uid, msg_from)
+ if res:
+ data.update(res)
+ res = self.create(cr, uid, data)
+
+ message = _('A task created') + " '" + subject + "' " + _("from Mailgate.")
+ self.log(cr, uid, res, message)
+
+ attachments = msg.get('attachments', [])
+ for attachment in attachments or []:
+ data_attach = {
+ 'name': attachment,
+ 'datas':binascii.b2a_base64(str(attachments.get(attachment))),
+ 'datas_fname': attachment,
+ 'description': 'Mail attachment',
+ 'res_model': self._name,
+ 'res_id': res,
+ }
+ self.pool.get('ir.attachment').create(cr, uid, data_attach)
+
+ return res
+
+ def message_update(self, cr, uid, id, msg, data={}, default_act='pending'):
+ mailgate_obj = self.pool.get('email.server.tools')
+ msg_actions, body_data = mailgate_obj.msg_act_get(msg)
+ data.update({
+ 'description': body_data,
+ })
+ act = 'do_'+default_act
+ if 'state' in msg_actions:
+ if msg_actions['state'] in ['draft','close','cancel','open','pending']:
+ act = 'do_' + msg_actions['state']
+
+ for k1,k2 in [('cost','planned_hours')]:
+ try:
+ data[k2] = float(msg_actions[k1])
+ except:
+ pass
+
+ if 'priority' in msg_actions:
+ if msg_actions['priority'] in ('1','2','3','4','5'):
+ data['priority'] = msg_actions['priority']
+
+ self.write(cr, uid, [id], data)
+ getattr(self,act)(cr, uid, [id])
+ return True
+
+ def message_followers(self, cr, uid, ids, context=None):
+ res = []
+ if isinstance(ids, (str, int, long)):
+ select = [ids]
+ else:
+ select = ids
+ for task in self.browse(cr, uid, select):
+ user_email = (task.user_id and task.user_id.address_id and task.user_id.address_id.email) or False
+ res += [(user_email, False, False, task.priority)]
+ if isinstance(ids, (str, int, long)):
+ return len(res) and res[0] or False
+ return res
+
+ def msg_send(self, cr, uid, id, *args, **argv):
+ return True
+
+ def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=[], context={}):
+ mailgate_pool = self.pool.get('mailgate.thread')
+ return mailgate_pool.history(cr, uid, cases, keyword, history=history,\
+ subject=subject, email=email, \
+ details=details, email_from=email_from,\
+ message_id=message_id, attach=attach, \
+ context=context)
+
+ def do_draft(self, cr, uid, ids, *args):
+ res = super(project_tasks, self).do_draft(cr, uid, ids, *args)
+ tasks = self.browse(cr, uid, ids)
+ self._history(cr, uid, tasks, _('Draft'))
+ return res
+
+ def do_open(self, cr, uid, ids, *args):
+ res = super(project_tasks, self).do_open(cr, uid, ids, *args)
+ tasks = self.browse(cr, uid, ids)
+ self._history(cr, uid, tasks, _('Open'))
+ return res
+
+ def do_pending(self, cr, uid, ids, *args):
+ res = super(project_tasks, self).do_pending(cr, uid, ids, *args)
+ tasks = self.browse(cr, uid, ids)
+ self._history(cr, uid, tasks, _('Pending'))
+ return res
+
+ def do_close(self, cr, uid, ids, *args):
+ res = super(project_tasks, self).do_close(cr, uid, ids, *args)
+ tasks = self.browse(cr, uid, ids)
+ for task in tasks:
+ if task.state == 'done':
+ self._history(cr, uid, tasks, _('Done'))
+ return res
+
+ def do_cancel(self, cr, uid, ids, *args):
+ res = super(project_tasks, self).do_cancel(cr, uid, ids, *args)
+ tasks = self.browse(cr, uid, ids)
+ self._history(cr, uid, tasks, _('Cancel'))
+ return res
+
+project_tasks()
+
+class config_compute_remaining(osv.osv_memory):
+ _inherit = "config.compute.remaining"
+ _name='config.compute.remaining'
+
+ def compute_hours(self, cr, uid, ids, context=None):
+ res = super(config_compute_remaining, self).compute_hours(cr, uid, ids, context=context)
+ task_obj = self.pool.get('project.task')
+ if 'active_id' in context:
+ task = task_obj.browse(cr, uid, context['active_id'])
+ if task.state == 'open':
+ task_obj._history(cr, uid, [task], _('Open'))
+ return res
+config_compute_remaining()
+
+class project_close_task(osv.osv_memory):
+ _inherit = "close.task"
+ _name = "close.task"
+
+ def close(self, cr, uid, ids, context=None):
+ res = super(project_close_task, self).close(cr, uid, ids, context=context)
+ if not context:
+ context={}
+ task_obj = self.pool.get('project.task')
+
+ if 'task_id' in context:
+ task = task_obj.browse(cr, uid, context['task_id'], context=context)
+ task_obj._history(cr, uid, [task], _('Done'))
+ return res
+
+ def confirm(self, cr, uid, ids, context=None):
+ res=super(project_close_task, self).confirm(cr, uid, ids, context=context)
+ task_obj = self.pool.get('project.task')
+
+ if 'task_id' in context:
+ close_wizard = self.read(cr, uid, ids[0], [])
+ to_adr = []
+ to_adr.append(context.get('send_manager', '') and close_wizard.get('manager_email', '') or '')
+ to_adr.append(context.get('send_partner', '') and close_wizard.get('partner_email', '') or '')
+ description = close_wizard['description']
+
+ task = task_obj.browse(cr, uid, context['task_id'], context=context)
+ subject = "Task '%s' closed" % task.name
+ from_adr = task.user_id.address_id.email
+ task_obj._history(cr, uid, [task], _('Send'), history=True, subject=subject, email=to_adr, details=description, email_from=from_adr)
+ if task.state == 'done':
+ task_obj._history(cr, uid, [task], _('Done'))
+ return res
+
+project_close_task()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/project_mailgate/project_mailgate_view.xml b/addons/project_mailgate/project_mailgate_view.xml
new file mode 100644
index 00000000000..b31eb85328e
--- /dev/null
+++ b/addons/project_mailgate/project_mailgate_view.xml
@@ -0,0 +1,45 @@
+
+
+
+
+ task.mailgate.form
+ project.task
+ form
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/project_mrp/i18n/tr.po b/addons/project_mrp/i18n/tr.po
index e41b0688de2..94efa0165fe 100644
--- a/addons/project_mrp/i18n/tr.po
+++ b/addons/project_mrp/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:37+0000\n"
+"PO-Revision-Date: 2010-08-22 05:32+0000\n"
"Last-Translator: OpenERP Administrators \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_mrp
diff --git a/addons/project_retro_planning/i18n/tr.po b/addons/project_retro_planning/i18n/tr.po
index 6a6ac248d23..e77fa8b2561 100644
--- a/addons/project_retro_planning/i18n/tr.po
+++ b/addons/project_retro_planning/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:39+0000\n"
+"PO-Revision-Date: 2010-08-22 05:48+0000\n"
"Last-Translator: OpenERP Administrators \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_retro_planning
diff --git a/addons/project_scrum/i18n/de.po b/addons/project_scrum/i18n/de.po
index 4e3738af13f..9eba96c0b47 100644
--- a/addons/project_scrum/i18n/de.po
+++ b/addons/project_scrum/i18n/de.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 19:01+0000\n"
-"Last-Translator: Ferdinand-chricar \n"
+"PO-Revision-Date: 2010-08-22 08:14+0000\n"
+"Last-Translator: Ferdinand @ ChriCar \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-12 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 03:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_scrum
@@ -34,7 +34,7 @@ msgstr "Erzeuge Aufgabe aus Backlog"
#. module: project_scrum
#: field:project.scrum.product.backlog,user_id:0
msgid "Author"
-msgstr ""
+msgstr "Verfasser"
#. module: project_scrum
#: model:ir.actions.act_window,name:project_scrum.action_view_task4
@@ -51,14 +51,14 @@ msgstr "Meine offenen Sprints (Product Owner)"
#. module: project_scrum
#: view:project.scrum.meeting:0
msgid "What did you do since the last meeting?"
-msgstr ""
+msgstr "Was erledigten Sie seit dem letzten Treffen"
#. module: project_scrum
#: view:project.scrum.meeting:0
#: view:project.scrum.product.backlog:0
#: view:project.scrum.sprint:0
msgid "Group By..."
-msgstr ""
+msgstr "Gruppiert je..."
#. module: project_scrum
#: model:process.node,note:project_scrum.process_node_productbacklog0
@@ -78,7 +78,7 @@ msgstr "Scrum, agile Entwicklungsmethode"
#. module: project_scrum
#: view:project.scrum.backlog.merge:0
msgid "Are you sure you want to merge these Backlogs?"
-msgstr ""
+msgstr "Sollen diese Rückstände wirklich zusammengelegt werden"
#. module: project_scrum
#: field:project.scrum.project,progress_rate:0
@@ -107,7 +107,7 @@ msgstr "Was haben Sie seit gestern erledigt?"
#. module: project_scrum
#: constraint:project.project:0
msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
+msgstr "Fehler! Der Projektstart mus vor dem Projektende liegen"
#. module: project_scrum
#: view:project.scrum.meeting:0
@@ -152,22 +152,22 @@ msgstr "Scrum Aufgabe"
#: view:project.scrum.product.backlog:0
#: view:project.scrum.sprint:0
msgid "Set to Draft"
-msgstr ""
+msgstr "Setze auf Entwurf"
#. module: project_scrum
#: field:project.scrum.product.backlog,create_date:0
msgid "Creation Date"
-msgstr ""
+msgstr "Erzeugt am"
#. module: project_scrum
#: view:project.scrum.meeting:0
msgid "Are there anything blocking you?"
-msgstr ""
+msgstr "Gibt es etwas was Sie blockiert?"
#. module: project_scrum
#: view:project.scrum.product.backlog:0
msgid "Editable"
-msgstr ""
+msgstr "Bearbeitbar"
#. module: project_scrum
#: model:ir.model,name:project_scrum.model_project_scrum_backlog_assign_sprint
@@ -183,17 +183,17 @@ msgstr ""
#. module: project_scrum
#: help:project.scrum.sprint,expected_hours:0
msgid "Estimated time to do the task."
-msgstr ""
+msgstr "Geschätzte Zeit für die Erledigung der Aufgabe"
#. module: project_scrum
#: field:project.scrum.product.backlog,task_hours:0
msgid "Task Hours"
-msgstr ""
+msgstr "Aufgabe Stunden"
#. module: project_scrum
#: view:project.scrum.sprint:0
msgid "Dates"
-msgstr ""
+msgstr "Daten"
#. module: project_scrum
#: view:project.scrum.meeting:0
@@ -203,7 +203,7 @@ msgstr ""
#. module: project_scrum
#: view:project.scrum.meeting:0
msgid "Daily"
-msgstr ""
+msgstr "Täglich"
#. module: project_scrum
#: field:project.scrum.sprint,backlog_ids:0
@@ -213,12 +213,12 @@ msgstr "Erfasse die benötigte Zeit für Ihre Aufgaben"
#. module: project_scrum
#: view:project.scrum.product.backlog:0
msgid "Delegate"
-msgstr ""
+msgstr "Delegieren"
#. module: project_scrum
#: view:board.board:0
msgid "My Board"
-msgstr ""
+msgstr "Mein Dashboard"
#. module: project_scrum
#: field:project.scrum.meeting,date:0
@@ -228,25 +228,25 @@ msgstr "Datum Meeting"
#. module: project_scrum
#: model:ir.model,name:project_scrum.model_project_scrum_backlog_merge
msgid "Merge Product Backlogs"
-msgstr ""
+msgstr "Zusammenlegung von Produkt Rückständen"
#. module: project_scrum
#: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
#: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
#: view:project.scrum.product.backlog:0
msgid "Product Backlogs"
-msgstr ""
+msgstr "Produkt Rückstände"
#. module: project_scrum
#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_merge
#: view:project.scrum.backlog.merge:0
msgid "Merge Backlogs"
-msgstr ""
+msgstr "Rückstände zusammenführen"
#. module: project_scrum
#: view:project.scrum.product.backlog:0
msgid "Change Stage"
-msgstr ""
+msgstr "Stauts verändern"
#. module: project_scrum
#: constraint:project.project:0
@@ -256,17 +256,17 @@ msgstr ""
#. module: project_scrum
#: view:project.scrum.sprint:0
msgid "Owners"
-msgstr ""
+msgstr "Eigentümer"
#. module: project_scrum
#: model:ir.model,name:project_scrum.model_project_task
msgid "Task"
-msgstr ""
+msgstr "Aufgabe"
#. module: project_scrum
#: constraint:project.task:0
msgid "Error! task start-date must be lower then task end-date."
-msgstr ""
+msgstr "Fehler! Das Anfangsdatum muss kleiner als das Enddatum sein."
#. module: project_scrum
#: model:ir.actions.act_window,name:project_scrum.dblc_proj
@@ -342,7 +342,7 @@ msgstr "Abgebrochen"
#. module: project_scrum
#: view:project.scrum.product.backlog:0
msgid "Convert to Task"
-msgstr ""
+msgstr "In Aufgabe umwandeln"
#. module: project_scrum
#: field:scrum.team,name:0
@@ -357,7 +357,7 @@ msgstr "Mail Header"
#. module: project_scrum
#: view:project.scrum.sprint:0
msgid "Expected hours"
-msgstr ""
+msgstr "Erwartete Stunden"
#. module: project_scrum
#: field:project.scrum.project,sprint_size:0
@@ -505,22 +505,22 @@ msgstr "Anfangsdatum"
#. module: project_scrum
#: view:project.scrum.product.backlog:0
msgid "Extended Options..."
-msgstr ""
+msgstr "Erweiterte Optionen.."
#. module: project_scrum
#: view:project.scrum.sprint:0
msgid "Planning"
-msgstr ""
+msgstr "Planung"
#. module: project_scrum
#: constraint:account.analytic.account:0
msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Fehler! Es können keine rekursive Kontenhierarchien erstellt werden."
#. module: project_scrum
#: help:project.scrum.sprint,scrum_master_id:0
msgid "The person who is maintains the processes for the product"
-msgstr ""
+msgstr "Der Produktionsverwantortliche"
#. module: project_scrum
#: model:ir.actions.act_window,name:project_scrum.action_scrum_project_tree
@@ -587,7 +587,7 @@ msgstr "Berechnet als: Investierte Zeit / Gesamtzeit"
#. module: project_scrum
#: help:project.scrum.backlog.assign.sprint,convert_to_task:0
msgid "Create Task for Product Backlog"
-msgstr ""
+msgstr "Erzeuge Aufgabe für den Produkt Rückstand"
#. module: project_scrum
#: field:project.scrum.project,scrum:0
@@ -616,17 +616,19 @@ msgstr "Hindernissliste"
#: help:project.scrum.backlog.assign.sprint,state_open:0
msgid "Change the state of product backlogs to open if its in draft state"
msgstr ""
+"Verändere den Status des Produkt Rückstandes auf offen, wenn dieser Entwurf "
+"ist"
#. module: project_scrum
#: help:project.project,product_owner_id:0
#: help:project.scrum.sprint,product_owner_id:0
msgid "The person who is responsible for the product"
-msgstr ""
+msgstr "Der Produktverantwortlich"
#. module: project_scrum
#: view:project.scrum.meeting:0
msgid "What do you plan to do till the next meeting?"
-msgstr ""
+msgstr "Was wollen Sie bis zum nächsten Treffen erledigen"
#. module: project_scrum
#: help:project.task,product_backlog_id:0
@@ -729,7 +731,7 @@ msgstr "Projekt Bezeichnung"
#. module: project_scrum
#: view:project.scrum.meeting:0
msgid "Optional Info"
-msgstr ""
+msgstr "Optionale Info"
#. module: project_scrum
#: field:project.scrum.project,product_owner_id:0
@@ -751,27 +753,27 @@ msgstr ""
#. module: project_scrum
#: help:project.scrum.product.backlog,expected_hours:0
msgid "Estimated total time to do the Backlog"
-msgstr ""
+msgstr "Geschätze Zeit um den Rückstand aufzuarbeiten"
#. module: project_scrum
#: help:project.scrum.backlog.merge,project_id:0
msgid "Select project for the new product backlog"
-msgstr ""
+msgstr "Wähle Projekt für den neuen Produkt Rückstand"
#. module: project_scrum
#: model:ir.model,name:project_scrum.model_project_scrum_backlog_create_task
msgid "Create Tasks from Product Backlogs"
-msgstr ""
+msgstr "Erzeuge Aufgabe vom Produkt Rückstand"
#. module: project_scrum
#: help:project.project,sprint_size:0
msgid "Number of days allocated for sprint"
-msgstr ""
+msgstr "Anzahl der für sprint zugeordneten Tage"
#. module: project_scrum
#: help:project.scrum.product.backlog,sequence:0
msgid "Gives the sequence order when displaying a list of product backlog."
-msgstr ""
+msgstr "Sortierung für den Produkt Rückstand"
#. module: project_scrum
#: model:ir.actions.act_window,name:project_scrum.action_sprint_open_tree5
@@ -837,7 +839,7 @@ msgstr "Arbeit erledigt"
#. module: project_scrum
#: view:project.scrum.backlog.merge:0
msgid "Merge"
-msgstr ""
+msgstr "Zusammenführen"
#. module: project_scrum
#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
@@ -877,23 +879,23 @@ msgstr ""
#. module: project_scrum
#: view:project.scrum.product.backlog:0
msgid "Feature Description"
-msgstr ""
+msgstr "Beschreibung der Merkmale"
#. module: project_scrum
#: field:project.scrum.product.backlog,effective_hours:0
msgid "Spent Hours"
-msgstr ""
+msgstr "verbrauchte Stunden"
#. module: project_scrum
#: help:project.scrum.product.backlog,effective_hours:0
msgid "Computed using the sum of the time spent on every related tasks"
-msgstr ""
+msgstr "berechnet aufgrund der verbrauchten Zeit der verbundenen Aufgaben"
#. module: project_scrum
#: model:ir.actions.act_window,name:project_scrum.open_board_project_scrum
#: model:ir.ui.menu,name:project_scrum.menu_deshboard_scurm
msgid "Scrum Dashboard"
-msgstr ""
+msgstr "Scrum Anzeigetafel"
#. module: project_scrum
#: help:project.scrum.task,project_id:0
@@ -1040,7 +1042,7 @@ msgstr "Editiere Projekte"
#. module: project_scrum
#: field:project.scrum.backlog.assign.sprint,state_open:0
msgid "Set Open"
-msgstr ""
+msgstr "Setze auf Offen"
#. module: project_scrum
#: model:ir.actions.act_window,name:project_scrum.action_meeting_form
@@ -1129,7 +1131,7 @@ msgstr "Scrum Master"
#. module: project_scrum
#: field:project.project,scrum:0
msgid "Is a Scrum Project"
-msgstr ""
+msgstr "Das ist ein Scrum Projekt"
#. module: project_scrum
#: view:project.scrum.backlog.merge:0
@@ -1141,7 +1143,7 @@ msgstr ""
#. module: project_scrum
#: view:project.scrum.backlog.merge:0
msgid "Select the project for merged backlogs"
-msgstr ""
+msgstr "Wähle das Projekt für zusammengeführte Rückstände"
#. module: project_scrum
#: field:project.scrum.product.backlog,tasks_id:0
@@ -1178,7 +1180,7 @@ msgstr "Sequenz"
#. module: project_scrum
#: view:project.scrum.meeting:0
msgid "Send to Product Owner"
-msgstr ""
+msgstr "Send an Produktverantwortlichen"
#. module: project_scrum
#: help:project.scrum.project,warn_footer:0
@@ -1225,7 +1227,7 @@ msgstr "Erwartetes Ende"
#. module: project_scrum
msgid "Hello"
-msgstr ""
+msgstr "Hallo"
#. module: project_scrum
msgid "I am sending you Daily Meeting Details of date"
@@ -1237,7 +1239,7 @@ msgstr ""
#. module: project_scrum
msgid "Task for Today"
-msgstr ""
+msgstr "heutige Aufgaben"
#. module: project_scrum
msgid "No Blocks"
@@ -1245,7 +1247,7 @@ msgstr ""
#. module: project_scrum
msgid "Thank you"
-msgstr ""
+msgstr "Vielen Dank"
#. module: project_scrum
msgid "Scrum Meeting of"
diff --git a/addons/project_scrum/i18n/tr.po b/addons/project_scrum/i18n/tr.po
index 8303129c044..ca775b2abc1 100644
--- a/addons/project_scrum/i18n/tr.po
+++ b/addons/project_scrum/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:49+0000\n"
+"PO-Revision-Date: 2010-08-22 06:01+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:37+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 03:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_scrum
diff --git a/addons/project_timesheet/i18n/tr.po b/addons/project_timesheet/i18n/tr.po
index bbb3da79b08..c450b91af68 100644
--- a/addons/project_timesheet/i18n/tr.po
+++ b/addons/project_timesheet/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:46+0000\n"
+"PO-Revision-Date: 2010-08-22 05:57+0000\n"
"Last-Translator: OpenERP Administrators \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_timesheet
diff --git a/addons/purchase/i18n/de.po b/addons/purchase/i18n/de.po
index 30ae713c294..4a9892d025f 100644
--- a/addons/purchase/i18n/de.po
+++ b/addons/purchase/i18n/de.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 10:10+0000\n"
-"Last-Translator: Ferdinand-chricar \n"
+"PO-Revision-Date: 2010-08-22 06:54+0000\n"
+"Last-Translator: Ferdinand @ ChriCar \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-12 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 03:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: purchase
@@ -912,28 +912,28 @@ msgstr "Lagerbuchungen"
#: selection:report.purchase.order.category,state:0
#: selection:report.purchase.order.product,state:0
msgid "Waiting Schedule"
-msgstr ""
+msgstr "Warteliste"
#. module: purchase
#: field:report.purchase.order.category,price_total:0
#: field:report.purchase.order.product,price_total:0
msgid "Total Price"
-msgstr ""
+msgstr "Gesamtpreis"
#. module: purchase
#: selection:report.purchase.order.category,state:0
#: selection:report.purchase.order.product,state:0
msgid "Quotation"
-msgstr ""
+msgstr "Angebot"
#. module: purchase
#: selection:report.purchase.order.category,state:0
#: selection:report.purchase.order.product,state:0
msgid "Manual in progress"
-msgstr ""
+msgstr "Auftrag in manueller Bearbeitung"
#. module: purchase
#: selection:report.purchase.order.category,state:0
#: selection:report.purchase.order.product,state:0
msgid "In progress"
-msgstr ""
+msgstr "In Bearbeitung"
diff --git a/addons/purchase/i18n/es_EC.po b/addons/purchase/i18n/es_EC.po
new file mode 100644
index 00000000000..2341d99155d
--- /dev/null
+++ b/addons/purchase/i18n/es_EC.po
@@ -0,0 +1,934 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# * purchase
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-08-20 20:08+0000\n"
+"Last-Translator: Borja López Soilán (Pexego) \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-21 03:56+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: purchase
+#: field:purchase.order,invoiced:0
+msgid "Invoiced & Paid"
+msgstr "Facturada & Pagada (conciliada)"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoiceafterpacking0
+msgid "Supplier Invoice pre-generated on receptions for control"
+msgstr "Factura de proveedor pre-generada en la recepción para control"
+
+#. module: purchase
+#: field:purchase.order,location_id:0
+msgid "Destination"
+msgstr "Destino"
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Picking"
+msgstr "Desde albarán"
+
+#. module: purchase
+#: rml:purchase.order:0
+msgid "Validated By"
+msgstr "Validado por"
+
+#. module: purchase
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nombre de modelo no válido en la definición de acción."
+
+#. module: purchase
+#: field:purchase.order,partner_id:0
+msgid "Supplier"
+msgstr "Proveedor"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery"
+msgstr "Entrega"
+
+#. module: purchase
+#: field:purchase.order.line,product_qty:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "From Order"
+msgstr "Desde pedido"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_confirmpurchaseorder0
+msgid "Confirmed Purchase"
+msgstr "Compra confirmada"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+msgid "Invoice Exception"
+msgstr "Excepción de factura"
+
+#. module: purchase
+#: model:product.pricelist,name:purchase.list0
+msgid "Default Purchase Pricelist"
+msgstr "Tarifa de compra por defecto"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
+msgid "Create invoice"
+msgstr "Crear factura"
+
+#. module: purchase
+#: help:res.partner,property_product_pricelist_purchase:0
+msgid ""
+"This pricelist will be used, instead of the default one, for purchases from "
+"the current partner"
+msgstr ""
+"Esta tarifa será utilizada en lugar de la por defecto para las compras de la "
+"empresa actual"
+
+#. module: purchase
+#: rml:purchase.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_productrecept0
+msgid "Create invoice from product recept"
+msgstr "Crear factura desde recepción producto"
+
+#. module: purchase
+#: help:purchase.order,pricelist_id:0
+msgid ""
+"The pricelist sets the currency used for this purchase order. It also "
+"computes the supplier price for the selected products/quantities."
+msgstr ""
+"La tarifa fija la moneda utilizada en este pedido de compra. También calcula "
+"el precio del proveedor para los productos/cantidades seleccionados."
+
+#. module: purchase
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase Process"
+msgstr "Proceso de compra"
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
+msgid "Invoice from Packing list"
+msgstr "Facturar desde albarán"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approve Purchase"
+msgstr "Aprovar compra"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+msgid "Approved"
+msgstr "Aprobado"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_form_action4
+#: model:ir.ui.menu,name:purchase.menu_purchase_form_action4
+msgid "Purchase Orders in Progress"
+msgstr "Pedidos de compra en proceso"
+
+#. module: purchase
+#: field:purchase.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Base imponible"
+
+#. module: purchase
+#: view:purchase.order:0
+#: field:purchase.order,notes:0
+#: view:purchase.order.line:0
+#: field:purchase.order.line,notes:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: purchase
+#: rml:purchase.order:0
+#: field:purchase.order,amount_tax:0
+#: field:purchase.order.line,taxes_id:0
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: purchase
+#: model:ir.actions.report.xml,name:purchase.report_purchase_order
+#: model:process.node,name:purchase.process_node_purchaseorder0
+#: view:purchase.order:0
+#: model:res.request.link,name:purchase.req_link_purchase_order
+#: field:stock.picking,purchase_id:0
+msgid "Purchase Order"
+msgstr "Pedido de compra"
+
+#. module: purchase
+#: rml:purchase.quotation:0
+msgid "Regards,"
+msgstr "Recuerdos,"
+
+#. module: purchase
+#: rml:purchase.order:0
+msgid "Net Total :"
+msgstr "Total neto :"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: purchase
+#: help:purchase.order,state:0
+msgid ""
+"The state of the purchase order or the quotation request. A quotation is a "
+"purchase order in a 'Draft' state. Then the order has to be confirmed by the "
+"user, the state switch to 'Confirmed'. Then the supplier must confirm the "
+"order to change the state to 'Approved'. When the purchase order is paid and "
+"received, the state becomes 'Done'. If a cancel action occurs in the invoice "
+"or in the reception of goods, the state becomes in exception."
+msgstr ""
+"El estado del pedido de compra o de la solicitud de presupuesto. Un "
+"presupuesto es un pedido de compra en estado 'Borrador'. Entonces, si el "
+"pedido es confirmado por el usuario, el estado cambiará a 'Confirmado'. "
+"Entonces el proveedor debe confirmar el pedido para cambiar el estado a "
+"'Aprobado'. Cuando el pedido de compra está pagado y recibido, el estado se "
+"convierte en 'Relizado'. Si una acción de cancelación ocurre en la factura o "
+"en la recepción de mercancías, el estado se convierte en 'Excepción'."
+
+#. module: purchase
+#: field:purchase.order,origin:0
+msgid "Origin"
+msgstr "Origen"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinglist0
+msgid "Incoming Products"
+msgstr "Productos entrantes"
+
+#. module: purchase
+#: rml:purchase.order:0
+#: rml:purchase.quotation:0
+msgid "Qty"
+msgstr "Ctdad"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Manually Corrected"
+msgstr "Corregido manualmente"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: purchase
+#: rml:purchase.order:0
+msgid "TVA :"
+msgstr "CIF/NIF:"
+
+#. module: purchase
+#: rml:purchase.quotation:0
+msgid "Tel.:"
+msgstr "Tel.:"
+
+#. module: purchase
+#: field:purchase.order.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order_line
+msgid "Purchase Order lines"
+msgstr "Línieas del pedido de compra"
+
+#. module: purchase
+#: field:purchase.order,validator:0
+msgid "Validated by"
+msgstr "Validada por"
+
+#. module: purchase
+#: help:purchase.order,invoice_method:0
+msgid ""
+"From Order: a draft invoice will be pre-generated based on the purchase "
+"order. The accountant will just have to validate this invoice for control.\n"
+"From Picking: a draft invoice will be pre-genearted based on validated "
+"receptions.\n"
+"Manual: no invoice will be pre-generated. The accountant will have to encode "
+"manually."
+msgstr ""
+"Desde pedido: Una factura borrador se pre-generará basada en el pedido de "
+"compra. El contable sólo deberá validar esta factura para control.\n"
+"Desde albarán: Una factura borrador será pre-generará basada en las "
+"recepciones validadas.\n"
+"Manual: Ninguna factura se pre-generará. El contable deberá codificarla "
+"manualmente."
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Invoice based on deliveries"
+msgstr "Facturar desde albaranes"
+
+#. module: purchase
+#: rml:purchase.order:0
+msgid "Net Price"
+msgstr "Precio neto"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Order Line"
+msgstr "Línea del pedido"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Product Receipt"
+msgstr "Recepción producto"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Invoice Control"
+msgstr "Control factura"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_draftpurchaseorder0
+#: model:process.node,name:purchase.process_node_draftpurchaseorder1
+msgid "RFQ"
+msgstr "Petición presupuesto"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+msgid "Waiting"
+msgstr "En espera"
+
+#. module: purchase
+#: field:purchase.order,picking_ids:0
+msgid "Picking List"
+msgstr "Albarán"
+
+#. module: purchase
+#: field:purchase.order,warehouse_id:0
+msgid "Warehouse"
+msgstr "Almacén"
+
+#. module: purchase
+#: field:purchase.order,order_line:0
+msgid "Order Lines"
+msgstr "Líneas del pedido"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirm Purchase order from Request for quotation without origin"
+msgstr "Confirmar pedido de compra desde solicitud de presupuesto sin origen"
+
+#. module: purchase
+#: rml:purchase.quotation:0
+msgid "Fax:"
+msgstr "Fax:"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Untaxed amount"
+msgstr "Base imponible"
+
+#. module: purchase
+#: rml:purchase.quotation:0
+msgid "Expected Date"
+msgstr "Fecha prevista"
+
+#. module: purchase
+#: rml:purchase.order:0
+msgid "Shipping address :"
+msgstr "Dirección de envío :"
+
+#. module: purchase
+#: model:product.pricelist.type,name:purchase.pricelist_type_purchase
+#: field:res.partner,property_product_pricelist_purchase:0
+msgid "Purchase Pricelist"
+msgstr "Tarifa de compra"
+
+#. module: purchase
+#: field:purchase.order,minimum_planned_date:0
+msgid "Planned Date"
+msgstr "Fecha prevista"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Approved by Supplier"
+msgstr "Aprobado por proveedor"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
+msgid "Packing"
+msgstr "Empaquetado/Albarán"
+
+#. module: purchase
+#: model:ir.actions.wizard,name:purchase.purchase_order_merge
+msgid "Merge purchases"
+msgstr "Fusionar compras"
+
+#. module: purchase
+#: field:purchase.order.line,move_dest_id:0
+msgid "Reservation Destination"
+msgstr "Destinación de la reserva"
+
+#. module: purchase
+#: field:purchase.order,name:0
+msgid "Order Reference"
+msgstr "Referencia del pedido"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: purchase
+#: field:purchase.order,pricelist_id:0
+msgid "Pricelist"
+msgstr "Tarifa"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "When controlling invoice from orders"
+msgstr "Cuando se controla factura desde pedidos"
+
+#. module: purchase
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "¡XML inválido para la definición de la vista!"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_invoicecontrol0
+msgid "Pre-generated supplier invoice to control based on order"
+msgstr "Factura de proveedor pre-generada para control basada en pedido"
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
+msgid "Invoice from Purchase"
+msgstr "Factura desde compra"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinglist0
+msgid "Packing is created for the products reception control."
+msgstr "Albarán es creado para el control de recepción de productos."
+
+#. module: purchase
+#: selection:purchase.order,invoice_method:0
+msgid "Manual"
+msgstr "Manual"
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1
+msgid "Confirming Purchase"
+msgstr "Confirmación compra"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
+msgid "Approve Purchase order after Confirming"
+msgstr "Aprobar pedido de compra después de confirmación"
+
+#. module: purchase
+#: selection:purchase.order,state:0
+msgid "Shipping Exception"
+msgstr "Excepción de envío"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder1
+msgid "Encoded manually by the user."
+msgstr "Codificación manual del usuario."
+
+#. module: purchase
+#: help:purchase.order,minimum_planned_date:0
+msgid ""
+"This is computed as the minimum scheduled date of all purchase order lines' "
+"products."
+msgstr ""
+"Ésto se calcula como la mínima fecha planificada para todos los productos de "
+"las líneas del pedido de compra."
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr "Pedidos de compra"
+
+#. module: purchase
+#: help:purchase.order,dest_address_id:0
+msgid ""
+"Put an address if you want to deliver directly from the supplier to the "
+"customer.In this case, it will remove the warehouse link and set the "
+"customer location."
+msgstr ""
+"Introduzca una dirección si quiere enviar directamente desde el proveedor al "
+"cliente. En este caso, se eliminará el enlace al almacén y pondrá la "
+"ubicación del cliente."
+
+#. module: purchase
+#: rml:purchase.quotation:0
+msgid "Request for Quotation :"
+msgstr "Presupuesto solicitado:"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
+msgid "Confirm Purchase order from Request for quotation"
+msgstr "Confirmar pedido de compra desde solicitud de presupuesto"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Confirm Purchase Order"
+msgstr "Confirmar pedido de compra"
+
+#. module: purchase
+#: help:purchase.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this purchase"
+msgstr "Ésta es la lista de albaranes generados por esta compra"
+
+#. module: purchase
+#: model:ir.module.module,shortdesc:purchase.module_meta_information
+#: model:ir.ui.menu,name:purchase.menu_purchase_root
+msgid "Purchase Management"
+msgstr "Compras"
+
+#. module: purchase
+#: field:purchase.order,partner_ref:0
+msgid "Partner Ref."
+msgstr "Ref. empresa"
+
+#. module: purchase
+#: rml:purchase.order:0
+msgid "Taxes :"
+msgstr "Impuestos :"
+
+#. module: purchase
+#: field:purchase.order,invoiced_rate:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: purchase
+#: field:purchase.order,dest_address_id:0
+msgid "Destination Address"
+msgstr "Dirección destinatario"
+
+#. module: purchase
+#: view:purchase.order.line:0
+#: field:stock.move,purchase_line_id:0
+msgid "Purchase Order Line"
+msgstr "Línea pedido de compra"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Calendar View"
+msgstr "Vista calendario"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_approvepurchaseorder0
+msgid "Purchase order is approved by supplier."
+msgstr "Pedido de compra es aprobado por el proveedor."
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_invoiceafterpacking0
+#: model:process.node,name:purchase.process_node_invoicecontrol0
+msgid "Draft Invoice"
+msgstr "Factura borrador"
+
+#. module: purchase
+#: model:ir.model,name:purchase.model_purchase_order
+msgid "Purchase order"
+msgstr "Pedido de compra"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_draftpurchaseorder0
+msgid "Request for quotation is proposed by the system."
+msgstr "La solicitud de presupuesto es propuesta por el sistema."
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_packinginvoice0
+msgid "Packing Invoice"
+msgstr "Facturar paquete"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
+msgid "Creates invoice from packin list"
+msgstr "Crear factura desde albarán"
+
+#. module: purchase
+#: help:purchase.order,date_order:0
+msgid "Date on which this document has been created."
+msgstr "Fecha de la creación de este documento."
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Delivery & Invoices"
+msgstr "Albaranes & Facturas"
+
+#. module: purchase
+#: field:purchase.order,date_order:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request."
+msgstr ""
+"Referencia al documento que ha generado esta solicitud de pedido de compra."
+
+#. module: purchase
+#: rml:purchase.order:0
+msgid "Tél. :"
+msgstr "Tel. :"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
+msgid "After Purchase order , Create invoice."
+msgstr "Después de pedido de compra, crear factura."
+
+#. module: purchase
+#: field:purchase.order.line,date_planned:0
+msgid "Scheduled date"
+msgstr "Fecha planificada"
+
+#. module: purchase
+#: rml:purchase.order:0
+msgid "Our Order Reference"
+msgstr "Nuestra referencia"
+
+#. module: purchase
+#: rml:purchase.quotation:0
+msgid "TVA:"
+msgstr "IVA:"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Compute"
+msgstr "Calcular"
+
+#. module: purchase
+#: constraint:product.pricelist.version:0
+msgid "You cannot have 2 pricelist versions that overlap!"
+msgstr "¡No puede tener 2 versiones de tarifa que se solapen!"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Cancel Purchase Order"
+msgstr "Cancelar pedido de compra"
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_createpackinglist0
+msgid "Create Packing list"
+msgstr "Crear albarán"
+
+#. module: purchase
+#: rml:purchase.order:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_createpackinglist0
+msgid "When purchase order is approved , it creates its packing list."
+msgstr "Cuando el pedido de compra es aprobado, crea su albarán."
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "History"
+msgstr "Historia"
+
+#. module: purchase
+#: field:purchase.order,state:0
+msgid "Order Status"
+msgstr "Estado del pedido"
+
+#. module: purchase
+#: field:purchase.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: purchase
+#: model:product.pricelist.version,name:purchase.ver0
+msgid "Default Purchase Pricelist Version"
+msgstr "Versión tarifa de compra por defecto"
+
+#. module: purchase
+#: rml:purchase.order:0
+#: field:purchase.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Precio unidad"
+
+#. module: purchase
+#: field:purchase.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Posición fiscal"
+
+#. module: purchase
+#: rml:purchase.order:0
+msgid "Request for Quotation N°"
+msgstr "Petición de presupuesto Nº"
+
+#. module: purchase
+#: field:purchase.order,invoice_id:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
+#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
+#: wizard_button:purchase.order.merge,init,end:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: purchase
+#: view:res.partner:0
+msgid "Purchases Properties"
+msgstr "Propiedades de compra"
+
+#. module: purchase
+#: field:purchase.order.line,order_id:0
+msgid "Order Ref"
+msgstr "Ref. pedido"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_form_action
+#: model:ir.ui.menu,name:purchase.menu_purchase_form_action
+msgid "Purchase Orders"
+msgstr "Pedidos de compra"
+
+#. module: purchase
+#: wizard_view:purchase.order.merge,init:0
+#: wizard_button:purchase.order.merge,init,merge:0
+msgid "Merge orders"
+msgstr "Fusionar pedidos"
+
+#. module: purchase
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+"especial!"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_form_action_new
+#: model:ir.ui.menu,name:purchase.menu_purchase_form_action_new
+msgid "New Purchase Order"
+msgstr "Nuevo pedido de compra"
+
+#. module: purchase
+#: field:purchase.order,shipped:0
+#: field:purchase.order,shipped_rate:0
+msgid "Received"
+msgstr "Recibido"
+
+#. module: purchase
+#: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
+#: selection:purchase.order,state:0
+msgid "Request for Quotation"
+msgstr "Solicitud de presupuesto"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_packinginvoice0
+msgid "Out Packing"
+msgstr "Paquete saliente"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_productrecept0
+msgid "Control invoices on receptions"
+msgstr "Controlar facturas en la recepción"
+
+#. module: purchase
+#: rml:purchase.order:0
+msgid "Date Req."
+msgstr "Fecha solicitud"
+
+#. module: purchase
+#: field:purchase.order,date_approve:0
+msgid "Date Approved"
+msgstr "Fecha aprobación"
+
+#. module: purchase
+#: model:ir.module.module,description:purchase.module_meta_information
+msgid ""
+"Module for purchase management\n"
+" Request for quotation, Create Supplier Invoice, Print Order..."
+msgstr ""
+"Módulo para la gestión de compras\n"
+" Solicitud de presupuesto, crear pedido de compra, crear factura de "
+"proveedor, imprimir pedido de compra..."
+
+#. module: purchase
+#: field:purchase.order.line,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: purchase
+#: rml:purchase.order:0
+#: field:purchase.order.line,name:0
+#: rml:purchase.quotation:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_productrecept0
+msgid "Product recept invoice"
+msgstr "Factura recepción producto"
+
+#. module: purchase
+#: rml:purchase.quotation:0
+msgid "Expected Delivery address:"
+msgstr "Dirección de entrega prevista:"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_form_action3
+#: model:ir.ui.menu,name:purchase.menu_purchase_form_action3
+msgid "Purchase Order Waiting Approval"
+msgstr "Pedido de compra esperando aprobación"
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
+msgid "Confirming Purchase Order"
+msgstr "Confirmación pedido de compra"
+
+#. module: purchase
+#: field:purchase.order.line,product_uom:0
+msgid "Product UOM"
+msgstr "UdM del producto"
+
+#. module: purchase
+#: field:purchase.order.line,move_ids:0
+msgid "Reservation"
+msgstr "Reserva"
+
+#. module: purchase
+#: model:process.node,note:purchase.process_node_confirmpurchaseorder0
+msgid "Purchase order is confirmed by the user."
+msgstr "Pedido de compra es confirmado por el usuario."
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_purchaseinvoice0
+msgid "Purchase Invoice"
+msgstr "Factura de compra"
+
+#. module: purchase
+#: rml:purchase.order:0
+msgid "Your Order Reference"
+msgstr "Su referencia"
+
+#. module: purchase
+#: rml:purchase.order:0
+msgid "Purchase Order Confirmation N°"
+msgstr "Confirmación de orden de compra Nº"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Total amount"
+msgstr "Importe total"
+
+#. module: purchase
+#: rml:purchase.order:0
+msgid "Date Ordered"
+msgstr "Fecha ordenado"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Purchase Control"
+msgstr "Control de compra"
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.purchase_form_action2
+#: model:ir.ui.menu,name:purchase.menu_purchase_order_draft
+msgid "Request For Quotations"
+msgstr "Solicitud de presupuestos"
+
+#. module: purchase
+#: field:purchase.order,invoice_method:0
+msgid "Invoicing Control"
+msgstr "Método facturación"
+
+#. module: purchase
+#: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
+msgid "Approve"
+msgstr "Aprobar"
+
+#. module: purchase
+#: model:process.node,name:purchase.process_node_approvepurchaseorder0
+msgid "Approved Purchase"
+msgstr "Compra aprobada"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid "From Packing list, Create invoice."
+msgstr "Desde albarán, crear factura."
+
+#. module: purchase
+#: field:purchase.order,amount_total:0
+msgid "Total"
+msgstr "Total"
+
+#. module: purchase
+#: wizard_view:purchase.order.merge,init:0
+msgid "Are you sure you want to merge these orders ?"
+msgstr "¿Está seguro que quiere fusionar estos pedidos?"
+
+#. module: purchase
+#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
+msgid "Approving Purchase Order"
+msgstr "Aprobación pedido de compra"
+
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
+msgid "After approved purchase order , it comes into the supplier invoice"
+msgstr ""
+"Después del pedido de compra aprobado, se convierte en factura de proveedor"
+
+#. module: purchase
+#: view:purchase.order.line:0
+msgid "Stock Moves"
+msgstr "Movimientos de stock"
+
+#. module: purchase
+#: selection:report.purchase.order.category,state:0
+#: selection:report.purchase.order.product,state:0
+msgid "Waiting Schedule"
+msgstr ""
+
+#. module: purchase
+#: field:report.purchase.order.category,price_total:0
+#: field:report.purchase.order.product,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: purchase
+#: selection:report.purchase.order.category,state:0
+#: selection:report.purchase.order.product,state:0
+msgid "Quotation"
+msgstr ""
+
+#. module: purchase
+#: selection:report.purchase.order.category,state:0
+#: selection:report.purchase.order.product,state:0
+msgid "Manual in progress"
+msgstr ""
+
+#. module: purchase
+#: selection:report.purchase.order.category,state:0
+#: selection:report.purchase.order.product,state:0
+msgid "In progress"
+msgstr ""
diff --git a/addons/purchase/i18n/et.po b/addons/purchase/i18n/et.po
index 8f42de9da0d..2166bdf48aa 100644
--- a/addons/purchase/i18n/et.po
+++ b/addons/purchase/i18n/et.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:47+0000\n"
+"PO-Revision-Date: 2010-08-22 05:58+0000\n"
"Last-Translator: lyyser \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-20 03:37+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 03:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: purchase
diff --git a/addons/purchase/i18n/lt.po b/addons/purchase/i18n/lt.po
index aa087191cff..d238ad9606c 100644
--- a/addons/purchase/i18n/lt.po
+++ b/addons/purchase/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:43+0000\n"
+"PO-Revision-Date: 2010-08-22 05:54+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:37+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 03:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: purchase
diff --git a/addons/purchase/i18n/tr.po b/addons/purchase/i18n/tr.po
index 626e1226cc1..e3718cc8622 100644
--- a/addons/purchase/i18n/tr.po
+++ b/addons/purchase/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:21+0000\n"
+"PO-Revision-Date: 2010-08-22 05:23+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:37+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 03:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: purchase
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 89dc343ea6d..533c035d7ac 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -222,6 +222,7 @@
{'search_default_draft': 1,'search_default_create_uid':uid}
tree,form,graph,calendar
+ With the Requests for quotation menu you can create new quotations, review existing one and confirm them to order once the supplier offer is approved.
@@ -233,6 +234,7 @@
tree,form,graph,calendar
{'search_default_approved': 1,'search_default_create_uid':uid}
+ From the Purchase Orders menu, you can create directly new orders and consult the list of your orders in their various state.
diff --git a/addons/report_intrastat/i18n/pt_BR.po b/addons/report_intrastat/i18n/pt_BR.po
index ef2307722f7..bb185e91372 100644
--- a/addons/report_intrastat/i18n/pt_BR.po
+++ b/addons/report_intrastat/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:46+0000\n"
+"PO-Revision-Date: 2010-08-22 05:56+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:38+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/tr.po b/addons/report_intrastat/i18n/tr.po
index 35871e5e787..192d438a289 100644
--- a/addons/report_intrastat/i18n/tr.po
+++ b/addons/report_intrastat/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:45+0000\n"
+"PO-Revision-Date: 2010-08-22 05:56+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:38+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: report_intrastat
diff --git a/addons/resource/i18n/de.po b/addons/resource/i18n/de.po
new file mode 100644
index 00000000000..99d858f983d
--- /dev/null
+++ b/addons/resource/i18n/de.po
@@ -0,0 +1,332 @@
+# German 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: 2010-08-18 06:50+0000\n"
+"PO-Revision-Date: 2010-08-22 07:55+0000\n"
+"Last-Translator: Ferdinand @ ChriCar \n"
+"Language-Team: German \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 04:02+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: resource
+#: help:resource.calendar.leaves,resource_id:0
+msgid ""
+"If empty, this is a generic holiday for the company. If a resource is set, "
+"the holiday/leave is only for this resource"
+msgstr ""
+"Wenn leer, dann ist es ein allgemeiner Feiertag für die Firma. Wenn "
+"definiert, dann gilt der Feiertag nur für diese Ressource"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Friday"
+msgstr "Freitag"
+
+#. module: resource
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Der Objektname muss mit \"x_\" beginnen und darf keine Sonderzeichen "
+"beinhalten!"
+
+#. module: resource
+#: field:resource.resource,resource_type:0
+msgid "Resource Type"
+msgstr "Ressource Typ"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_leaves
+#: view:resource.calendar.leaves:0
+msgid "Leave Detail"
+msgstr "Abwesenheitsdetail"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.resource_calendar_resources_leaves
+msgid "Resources Leaves"
+msgstr "Abwesende Ressourcen"
+
+#. module: resource
+#: field:resource.calendar,attendance_ids:0
+#: view:resource.calendar.attendance:0
+#: view:resource.calendar.leaves:0
+msgid "Working Time"
+msgstr "Arbeitszeit"
+
+#. module: resource
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Fehlerhafter XML-Code für diese Ansicht!"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Thursday"
+msgstr "Donnerstag"
+
+#. module: resource
+#: view:resource.calendar:0
+#: view:resource.calendar.leaves:0
+#: view:resource.resource:0
+msgid "Group By..."
+msgstr "Gruppiert nach..."
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Sunday"
+msgstr "Sonntag"
+
+#. module: resource
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Ungültiger Modellname in der Aktionsdefinition."
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Search Resource"
+msgstr "Suche Ressource"
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Type"
+msgstr "Typ"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_resource_tree
+#: view:resource.resource:0
+msgid "Resources"
+msgstr "Ressourcen"
+
+#. module: resource
+#: field:resource.calendar,manager:0
+msgid "Workgroup manager"
+msgstr "Abteilungsleiter"
+
+#. module: resource
+#: view:resource.calendar:0
+msgid "Search Working Period"
+msgstr "Suche Arbeitsperiode"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Monday"
+msgstr "Montag"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar
+msgid "Resource Calendar"
+msgstr "Ressourcen Kalender"
+
+#. module: resource
+#: field:resource.calendar,company_id:0
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,company_id:0
+#: view:resource.resource:0
+#: field:resource.resource,company_id:0
+msgid "Company"
+msgstr "Mandant"
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Material"
+msgstr "Material"
+
+#. module: resource
+#: field:resource.calendar.attendance,dayofweek:0
+msgid "Day of week"
+msgstr "Wochentag"
+
+#. module: resource
+#: field:resource.calendar.attendance,date_from:0
+msgid "Starting date"
+msgstr "Anfangsdatum"
+
+#. module: resource
+#: view:resource.resource:0
+#: field:resource.resource,user_id:0
+msgid "User"
+msgstr "Benutzer"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Search Working Period Leaves"
+msgstr "Suche Arbeitsperioden Abwesenheiten"
+
+#. module: resource
+#: field:resource.calendar.leaves,date_to:0
+msgid "End Date"
+msgstr "Enddatum"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.resource_calendar_closing_days
+msgid "Closing Days"
+msgstr "Abschlussdatum"
+
+#. module: resource
+#: model:ir.module.module,shortdesc:resource.module_meta_information
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,resource_id:0
+#: view:resource.resource:0
+msgid "Resource"
+msgstr "Ressource"
+
+#. module: resource
+#: view:resource.calendar:0
+#: field:resource.calendar,name:0
+#: field:resource.calendar.attendance,name:0
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,name:0
+#: field:resource.resource,name:0
+msgid "Name"
+msgstr "Bezeichnung"
+
+#. module: resource
+#: model:ir.module.module,description:resource.module_meta_information
+msgid ""
+"\n"
+" Module for resource management\n"
+" A resource represent something that can be scheduled\n"
+" (a developer on a task or a workcenter on manufacturing orders).\n"
+" This module manages a resource calendar associated to every resource.\n"
+" It also manages the leaves of every resource.\n"
+"\n"
+" "
+msgstr ""
+
+#. module: resource
+#: help:resource.resource,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the resource "
+"record without removing it."
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Wednesday"
+msgstr "Mittwoch"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
+#: view:resource.calendar:0
+msgid "Working Period"
+msgstr "Arbeits-/Bürozeiten"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_resource
+msgid "Resource Detail"
+msgstr "Ressource Detail"
+
+#. module: resource
+#: field:resource.resource,active:0
+msgid "Active"
+msgstr "Aktiv"
+
+#. module: resource
+#: field:resource.calendar.attendance,calendar_id:0
+msgid "Resource's Calendar"
+msgstr "Ressourcen Kalender"
+
+#. module: resource
+#: help:resource.resource,user_id:0
+msgid "Related user name for the resource to manage its access."
+msgstr ""
+
+#. module: resource
+#: help:resource.resource,calendar_id:0
+msgid "Define the schedule of resource"
+msgstr "Definire den Einsatzplan für diese Ressource"
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_from:0
+msgid "Work from"
+msgstr "Arbeitszeit von"
+
+#. module: resource
+#: field:resource.resource,code:0
+msgid "Code"
+msgstr "Code"
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_to:0
+msgid "Work to"
+msgstr "Arbeitszeit bis"
+
+#. module: resource
+#: help:resource.resource,time_efficiency:0
+msgid ""
+"This field depict the efficiency of the resource to complete tasks. e.g "
+"resource put alone on a phase of 5 days with 5 tasks assigned to him, will "
+"show a load of 100% for this phase by default, but if we put a efficency of "
+"200%, then his load will only be 50%."
+msgstr ""
+"Dieses Feld beschreibt die Effizienz der Ressource bei der Erfüllung einer "
+"Aufgabe. \r\n"
+"Werden Ressource für 5 Tage zugeteilt wird eine Auslastung von 100% "
+"angezeigt. \r\n"
+"Wenn die Effizienz auf 200% gesetzt wird, wird eine Auslastung von 50% "
+"angezeigt."
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Tuesday"
+msgstr "Dienstag"
+
+#. module: resource
+#: field:resource.calendar.leaves,calendar_id:0
+#: field:resource.resource,calendar_id:0
+msgid "Working time"
+msgstr "Arbeitszeit"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
+msgid "Resource Leaves"
+msgstr "Ressource Abwesenheiten"
+
+#. module: resource
+#: view:resource.calendar:0
+msgid "Manager"
+msgstr "Manager"
+
+#. module: resource
+#: code:addons/resource/faces/resource.py:0
+#, python-format
+msgid "(vacation)"
+msgstr "(Ferien)"
+
+#. module: resource
+#: field:resource.resource,time_efficiency:0
+msgid "Efficiency factor"
+msgstr "Effizienzfaktor"
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Human"
+msgstr "Mensch"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_attendance
+msgid "Work Detail"
+msgstr "Arbeitsdetail"
+
+#. module: resource
+#: field:resource.calendar.leaves,date_from:0
+msgid "Start Date"
+msgstr "Startdatum"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Saturday"
+msgstr "Samstag"
diff --git a/addons/resource/i18n/pl.po b/addons/resource/i18n/pl.po
new file mode 100644
index 00000000000..2faa53549c2
--- /dev/null
+++ b/addons/resource/i18n/pl.po
@@ -0,0 +1,326 @@
+# 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: 2010-08-18 06:50+0000\n"
+"PO-Revision-Date: 2010-08-22 05:49+0000\n"
+"Last-Translator: OpenERP Administrators \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-08-23 04:02+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: resource
+#: help:resource.calendar.leaves,resource_id:0
+msgid ""
+"If empty, this is a generic holiday for the company. If a resource is set, "
+"the holiday/leave is only for this resource"
+msgstr ""
+"Jeśli puste, to jest to ogólny dzień wolny dla firmy. Jeśli ustawiono zasób, "
+"to jest to dzień wolny/urlop tylko dla tego zasobu"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Friday"
+msgstr "Piątek"
+
+#. module: resource
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
+"specjalnych !"
+
+#. module: resource
+#: field:resource.resource,resource_type:0
+msgid "Resource Type"
+msgstr "Typ zasobu"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_leaves
+#: view:resource.calendar.leaves:0
+msgid "Leave Detail"
+msgstr "Opis nieobecności"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.resource_calendar_resources_leaves
+msgid "Resources Leaves"
+msgstr "Nieobecności zasobu"
+
+#. module: resource
+#: field:resource.calendar,attendance_ids:0
+#: view:resource.calendar.attendance:0
+#: view:resource.calendar.leaves:0
+msgid "Working Time"
+msgstr "Czas pracy"
+
+#. module: resource
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Thursday"
+msgstr "Czwartek"
+
+#. module: resource
+#: view:resource.calendar:0
+#: view:resource.calendar.leaves:0
+#: view:resource.resource:0
+msgid "Group By..."
+msgstr "Grupuj wg..."
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Sunday"
+msgstr "Niedziela"
+
+#. module: resource
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Search Resource"
+msgstr "Szukaj zasobów"
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Type"
+msgstr "Typ"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_resource_tree
+#: view:resource.resource:0
+msgid "Resources"
+msgstr "Zasoby"
+
+#. module: resource
+#: field:resource.calendar,manager:0
+msgid "Workgroup manager"
+msgstr "Kierownik grupy"
+
+#. module: resource
+#: view:resource.calendar:0
+msgid "Search Working Period"
+msgstr "Szukaj okresu pracy"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Monday"
+msgstr "Poniedziałek"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar
+msgid "Resource Calendar"
+msgstr "Kalendarz zasobu"
+
+#. module: resource
+#: field:resource.calendar,company_id:0
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,company_id:0
+#: view:resource.resource:0
+#: field:resource.resource,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Material"
+msgstr "Materiał"
+
+#. module: resource
+#: field:resource.calendar.attendance,dayofweek:0
+msgid "Day of week"
+msgstr "Dzień tygodnia"
+
+#. module: resource
+#: field:resource.calendar.attendance,date_from:0
+msgid "Starting date"
+msgstr "Data rozpoczęcia"
+
+#. module: resource
+#: view:resource.resource:0
+#: field:resource.resource,user_id:0
+msgid "User"
+msgstr "Użytkownik"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Date"
+msgstr "Data"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Search Working Period Leaves"
+msgstr "Szukaj nieobecności w okresie pracy"
+
+#. module: resource
+#: field:resource.calendar.leaves,date_to:0
+msgid "End Date"
+msgstr "Data końcowa"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.resource_calendar_closing_days
+msgid "Closing Days"
+msgstr "Dni zamknięcia"
+
+#. module: resource
+#: model:ir.module.module,shortdesc:resource.module_meta_information
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,resource_id:0
+#: view:resource.resource:0
+msgid "Resource"
+msgstr "Zasób"
+
+#. module: resource
+#: view:resource.calendar:0
+#: field:resource.calendar,name:0
+#: field:resource.calendar.attendance,name:0
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,name:0
+#: field:resource.resource,name:0
+msgid "Name"
+msgstr "Nazwa"
+
+#. module: resource
+#: model:ir.module.module,description:resource.module_meta_information
+msgid ""
+"\n"
+" Module for resource management\n"
+" A resource represent something that can be scheduled\n"
+" (a developer on a task or a workcenter on manufacturing orders).\n"
+" This module manages a resource calendar associated to every resource.\n"
+" It also manages the leaves of every resource.\n"
+"\n"
+" "
+msgstr ""
+
+#. module: resource
+#: help:resource.resource,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the resource "
+"record without removing it."
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Wednesday"
+msgstr "Środa"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
+#: view:resource.calendar:0
+msgid "Working Period"
+msgstr "Godziny pracy"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_resource
+msgid "Resource Detail"
+msgstr "Szczegóły zasobu"
+
+#. module: resource
+#: field:resource.resource,active:0
+msgid "Active"
+msgstr "Aktywne"
+
+#. module: resource
+#: field:resource.calendar.attendance,calendar_id:0
+msgid "Resource's Calendar"
+msgstr "Kalendarz zasobów"
+
+#. module: resource
+#: help:resource.resource,user_id:0
+msgid "Related user name for the resource to manage its access."
+msgstr "Użytkownik powiązany z zasobem do zarządzania jego dostępnością"
+
+#. module: resource
+#: help:resource.resource,calendar_id:0
+msgid "Define the schedule of resource"
+msgstr "Definiuj terminarz zasobu"
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_from:0
+msgid "Work from"
+msgstr "Pracuje od"
+
+#. module: resource
+#: field:resource.resource,code:0
+msgid "Code"
+msgstr "Kod"
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_to:0
+msgid "Work to"
+msgstr "Pracuje do"
+
+#. module: resource
+#: help:resource.resource,time_efficiency:0
+msgid ""
+"This field depict the efficiency of the resource to complete tasks. e.g "
+"resource put alone on a phase of 5 days with 5 tasks assigned to him, will "
+"show a load of 100% for this phase by default, but if we put a efficency of "
+"200%, then his load will only be 50%."
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Tuesday"
+msgstr "Wtorek"
+
+#. module: resource
+#: field:resource.calendar.leaves,calendar_id:0
+#: field:resource.resource,calendar_id:0
+msgid "Working time"
+msgstr "Czas pracy"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
+msgid "Resource Leaves"
+msgstr "Niebecności zasobu"
+
+#. module: resource
+#: view:resource.calendar:0
+msgid "Manager"
+msgstr "Menedżer"
+
+#. module: resource
+#: code:addons/resource/faces/resource.py:0
+#, python-format
+msgid "(vacation)"
+msgstr ""
+
+#. module: resource
+#: field:resource.resource,time_efficiency:0
+msgid "Efficiency factor"
+msgstr "Współczynnik efektywności"
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Human"
+msgstr "Człowiek"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_attendance
+msgid "Work Detail"
+msgstr "Szczegóły pracy"
+
+#. module: resource
+#: field:resource.calendar.leaves,date_from:0
+msgid "Start Date"
+msgstr "Data Początkowa"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Saturday"
+msgstr "Sobota"
diff --git a/addons/sale/i18n/es_EC.po b/addons/sale/i18n/es_EC.po
new file mode 100644
index 00000000000..73ca506bc80
--- /dev/null
+++ b/addons/sale/i18n/es_EC.po
@@ -0,0 +1,1516 @@
+# Spanish (Ecuador) 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-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-08-20 18:13+0000\n"
+"Last-Translator: Cristian Salamea (GnuThink) \n"
+"Language-Team: Spanish (Ecuador) \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-21 03:58+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Partial Delivery"
+msgstr "Envío parcial"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Procurement"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr ""
+
+#. module: sale
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Waiting Schedule"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,step:0
+msgid "Steps To Deliver a Sale Order"
+msgstr ""
+
+#. module: sale
+#: wizard_field:sale.advance_payment_inv,init,qtty:0
+#: rml:sale.order:0
+msgid "Quantity"
+msgstr ""
+
+#. module: sale
+#: wizard_view:sale.advance_payment_inv,create:0
+msgid "You invoice has been successfully created !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Automatic Declaration"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+#: model:ir.ui.menu,name:sale.menu_action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Invoice Exception"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is the list of picking list that have been generated for this invoice"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_deliveryorder0
+msgid "Delivery, from the warehouse to the customer."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_picking_policy
+msgid "sale.config.picking_policy"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_validate0
+msgid "Validate"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Make Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"Whenever confirm button is clicked, the draft state is moved to manual. that "
+"is, quotation is moved to sale order."
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
+msgid "Cancel Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Manual Designation"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,note:0
+#: view:sale.order.line:0
+#: field:sale.order.line,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
+msgid "Invoice after delivery"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr ""
+
+#. module: sale
+#: rml:sale.order:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,order_policy:0
+msgid "Shipping Policy"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Shipping Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+msgid "Total"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Origin"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_packinglist0
+msgid "Outgoing Products"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Reference"
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,picking_policy:0
+msgid "All at Once"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleprocurement0
+msgid "Procurement is created after confirmation of sale order."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: sale
+#: rml:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procure Method"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: sale
+#: rml:sale.order:0
+msgid "Fax :"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_net:0
+msgid "Net Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree9
+#: model:ir.ui.menu,name:sale.menu_action_order_tree9
+msgid "My sales order in progress"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you invoice based on ordered or shipped quantities. If the product "
+"is a service, shipped quantities means hours spent on the associated tasks."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree_all
+#: model:ir.ui.menu,name:sale.menu_action_order_tree_all
+msgid "All Sales Order"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,order_policy:0
+msgid "Invoice Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sale Shop"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: sale
+#: rml:sale.order:0
+msgid "Order N°"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,order_line:0
+#: view:sale.order.line:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: sale
+#: rml:sale.order:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Untaxed amount"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_packing0
+msgid ""
+"Packing list is created when 'Assign' is being clicked after confirming the "
+"sale order. This transaction moves the sale order to packing list."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree8
+#: model:ir.ui.menu,name:sale.menu_action_order_tree8
+msgid "My sales order waiting Invoice"
+msgstr ""
+
+#. module: sale
+#: rml:sale.order:0
+msgid "Shipping address :"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
+msgid ""
+"When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it "
+"will automatic create after delivery."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Complete Delivery"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Manual Description"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity (UoM)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree1
+#: model:ir.ui.menu,name:sale.menu_action_order_line_tree1
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_saleorderprocurement0
+msgid "Sale Order Procurement"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_packing0
+msgid "Packing"
+msgstr ""
+
+#. module: sale
+#: rml:sale.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,name:0
+msgid "Order Reference"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+msgid "Done"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.menu_shop_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice on Order After Delivery"
+msgstr ""
+
+#. module: sale
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,picking_ids:0
+msgid "Related Packing"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_account_id:0
+msgid "Payment Accounts"
+msgstr ""
+
+#. module: sale
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Ref"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales orders"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_saleprocurement0
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr ""
+
+#. module: sale
+#: view:sale.shop:0
+msgid "Payment accounts"
+msgstr ""
+
+#. module: sale
+#: wizard_button:sale.advance_payment_inv,create,end:0
+msgid "Close"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: model:process.node,name:sale.process_node_invoiceafterdelivery0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: sale
+#: wizard_field:sale.order.line.make_invoice,init,grouped:0
+#: wizard_field:sale.order.make_invoice,init,grouped:0
+msgid "Group the invoices"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_action_order_tree5
+msgid "All Quotations"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "Draft customer invoice, to be reviewed by accountant."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree3
+#: model:ir.ui.menu,name:sale.menu_action_order_tree3
+msgid "Sales Order To Be Invoiced"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorderprocurement0
+msgid "Procurement for each line"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree10
+#: model:ir.ui.menu,name:sale.menu_action_order_tree10
+msgid "My Quotations"
+msgstr ""
+
+#. module: sale
+#: wizard_view:sale.advance_payment_inv,create:0
+msgid "Invoices"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Line"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,picking_policy:0
+msgid "Packing Default Policy"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Manages the delivery and invoicing progress"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Shipping Default Policy"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr ""
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+#: model:ir.ui.menu,name:sale.menu_sale_root
+msgid "Sales Management"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,order_id:0
+msgid "Order Ref"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,user_id:0
+msgid "Salesman"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleorderprocurement0
+msgid ""
+"In sale order , procuerement for each line and it comes into the procurement "
+"order"
+msgstr ""
+
+#. module: sale
+#: rml:sale.order:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.wizard,name:sale.advance_payment
+msgid "Advance Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_action_order_line_tree2
+msgid "Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.todo,note:sale.config_wizard_step_sale_picking_policy
+msgid ""
+"This Configuration step use to set default picking policy when make sale "
+"order"
+msgstr ""
+
+#. module: sale
+#: model:process.process,name:sale.process_process_salesprocess0
+msgid "Sales Process"
+msgstr ""
+
+#. module: sale
+#: wizard_view:sale.order.line.make_invoice,init:0
+#: wizard_button:sale.order.line.make_invoice,init,invoice:0
+#: wizard_view:sale.order.make_invoice,init:0
+#: wizard_button:sale.order.make_invoice,init,invoice:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: sale
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree7
+#: model:ir.ui.menu,name:sale.menu_action_order_tree7
+msgid "My sales in shipping exception"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "Sales Configuration"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+#: model:ir.ui.menu,name:sale.menu_action_order_tree2
+msgid "Sales in Exception"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Procurement Corrected"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Shipping & Manual Invoice"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleorderprocurement0
+#: model:process.transition,name:sale.process_transition_saleprocurement0
+msgid "Sale Procurement"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "Configure Sale Order Logistic"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,state:0
+msgid "Status"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,picking_policy:0
+msgid "Packing Policy"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+msgid "Product sales"
+msgstr ""
+
+#. module: sale
+#: rml:sale.order:0
+msgid "Our Salesman"
+msgstr ""
+
+#. module: sale
+#: wizard_button:sale.advance_payment_inv,init,create:0
+msgid "Create Advance Invoice"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleprocurement0
+msgid "One procurement for each product."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+msgid "Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:product.product,pricelist_sale:0
+msgid "Sale Pricelists"
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,picking_policy:0
+msgid "Direct Delivery"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.order,state:0
+msgid "Quotation"
+msgstr ""
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance Product"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"Invoice is created when 'Create Invoice' is being clicked after confirming "
+"the sale order. This transaction moves the sale order to invoices."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Compute"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: model:ir.ui.menu,name:sale.menu_action_shop_form
+#: field:sale.order,shop_id:0
+msgid "Shop"
+msgstr ""
+
+#. module: sale
+#: rml:sale.order:0
+msgid "VAT"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+#: model:ir.ui.menu,name:sale.menu_action_order_tree4
+msgid "Sales Order in Progress"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_assign0
+msgid "Assign"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "History"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
+" - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the packing order after the payment of this invoice.\n"
+" - The 'Shipping & Manual Invoice' will create the packing order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice.\n"
+" - The 'Invoice on Order After Delivery' choice will generate the draft "
+"invoice based on sale order after all packing lists have been finished.\n"
+" - The 'Invoice from the packing' choice is used to create an invoice "
+"during the packing process."
+msgstr ""
+
+#. module: sale
+#: rml:sale.order:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,step:0
+msgid "Delivery Order Only"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales order lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_packinglist0
+msgid "Packing OUT is created for stockable products."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other data"
+msgstr ""
+
+#. module: sale
+#: wizard_field:sale.advance_payment_inv,init,amount:0
+#: rml:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: sale
+#: rml:sale.order:0
+msgid "Invoice address :"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: field:sale.order,invoice_ids:0
+msgid "Invoice"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: model:process.transition.action,name:sale.process_transition_action_cancel1
+#: model:process.transition.action,name:sale.process_transition_action_cancel2
+#: wizard_button:sale.advance_payment_inv,init,end:0
+#: view:sale.config.picking_policy:0
+#: view:sale.order.line:0
+#: wizard_button:sale.order.line.make_invoice,init,end:0
+#: wizard_button:sale.order.make_invoice,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sale order. The exception state is "
+"automatically set when a cancel operation occurs in the invoice validation "
+"(Invoice Exception) or in the packing list process (Shipping Exception). The "
+"'Waiting Schedule' state is set when the invoice is confirmed but waiting "
+"for the scheduler to run on the date 'Date Ordered'."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "UoM"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_deliver0
+msgid ""
+"Confirming the packing list moves them to delivery order. This can be done "
+"by clicking on 'Validate' button."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: sale
+#: wizard_view:sale.advance_payment_inv,init:0
+msgid "Advance Payment"
+msgstr ""
+
+#. module: sale
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid "Confirm sale order and Create invoice."
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,step:0
+msgid "Packing List & Delivery Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order Lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.order:0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: sale
+#: wizard_view:sale.order.line.make_invoice,init:0
+#: wizard_view:sale.order.make_invoice,init:0
+msgid "Do you really want to create the invoices ?"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoiceafterdelivery0
+msgid "Invoice based on packing lists"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "Set Default"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales order"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Quotation (A sale order in draft state)"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "Sale Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr ""
+
+#. module: sale
+#: wizard_field:sale.advance_payment_inv,init,product_id:0
+#: field:sale.order.line,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: sale
+#: wizard_button:sale.advance_payment_inv,create,open:0
+msgid "Open Advance Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_order_id:0
+msgid "Ordering Contact"
+msgstr ""
+
+#. module: sale
+#: rml:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr ""
+
+#. module: sale
+#: rml:sale.order:0
+msgid "Price"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_deliver0
+msgid "Deliver"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr ""
+
+#. module: sale
+#: rml:sale.order:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: sale
+#: rml:sale.order:0
+msgid "Quotation N°"
+msgstr ""
+
+#. module: sale
+#: field:stock.move,sale_line_id:0
+msgid "Sale Order Line"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice from the Packing"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.wizard,name:sale.wizard_sale_order_line_invoice
+#: model:ir.actions.wizard,name:sale.wizard_sale_order_make_invoice
+msgid "Make invoices"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_order_id:0
+msgid ""
+"The name and address of the contact that requested the order or quotation."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr ""
+
+#. module: sale
+#: field:product.product,pricelist_purchase:0
+msgid "Purchase Pricelists"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_saleorder0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: field:stock.picking,sale_id:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,name:0
+msgid "Name"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree_new
+#: model:ir.ui.menu,name:sale.menu_action_order_tree_new
+msgid "New Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total amount"
+msgstr ""
+
+#. module: sale
+#: rml:sale.order:0
+#: field:sale.order,date_order:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Manual In Progress"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.picking_policy,step:0
+msgid ""
+"By default, Open ERP is able to manage complex routing and paths of products "
+"in your warehouse and partner locations. This will configure the most common "
+"and simple methods to deliver products to the customer in one or two "
+"operations by the worker."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+msgid "Configure Picking Policy for Sale Order"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_order0
+msgid "Order"
+msgstr ""
+
+#. module: sale
+#: rml:sale.order:0
+msgid "Payment Terms"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Invoice Corrected"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,delay:0
+msgid "Delivery Delay"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Related invoices"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Payment Before Delivery"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sale order. "
+"The same sale order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "States"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "After confirming order, Create the invoice."
+msgstr ""
+
+#. module: sale
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,picked_rate:0
+#: field:sale.order,shipped:0
+msgid "Picked"
+msgstr ""
+
+#. module: sale
+#: view:sale.shop:0
+msgid "Accounting"
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,order_policy:0
+msgid "Invoice Based on Deliveries"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+#: model:ir.ui.menu,name:sale.menu_action_order_tree
+msgid "My Sales Order"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sale Order line"
+msgstr ""
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Dashboard for sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales_manager
+#: model:ir.ui.menu,name:sale.menu_board_sales_manager
+msgid "Sale Dashboard"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales of the month"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales manager board"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases of the month"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "My open quotations"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Cases statistics"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Top ten sales of the month"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,price_average:0
+#: field:report.sale.order.product,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_created
+msgid "Report of Created Sale Order"
+msgstr ""
+
+#. module: sale
+#: view:report.sale.order.category:0
+msgid "Sales Orders by category"
+msgstr ""
+
+#. module: sale
+#: model:ir.report.custom,name:sale.ir_report_custom_6
+#: model:ir.report.custom,title:sale.ir_report_custom_6
+msgid "Monthly cumulated sales turnover over one year"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_product
+msgid "Sales Orders by Products"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu1
+msgid "Monthly Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_turnover_product_tree
+#: model:ir.model,name:sale.model_report_turnover_per_product
+#: view:report.turnover.per.product:0
+msgid "Turnover Per Product"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_82
+msgid "All Months"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,price_total:0
+#: field:report.sale.order.product,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_report_sale_order_category
+msgid "Sales Orders by Categories"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_sale_list
+#: model:ir.ui.menu,name:sale.menu_report_order_sale_list
+msgid "Sales of the Month"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_product_tree
+#: model:ir.ui.menu,name:sale.menu_report_order_product
+msgid "Sales by Product (this month)"
+msgstr ""
+
+#. module: sale
+#: model:ir.report.custom,name:sale.ir_report_custom_4
+#: model:ir.report.custom,title:sale.ir_report_custom_4
+msgid "Monthly sales turnover over one year"
+msgstr ""
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_category_tree_all
+#: model:ir.ui.menu,name:sale.menu_report_order_category_all
+#: view:report.sale.order.category:0
+msgid "Sales by Category of Products"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu3
+msgid "Monthly Cumulated Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,quantity:0
+#: field:report.sale.order.product,quantity:0
+msgid "# of Products"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_product_tree_all
+#: model:ir.ui.menu,name:sale.menu_report_order_product_all
+#: view:report.sale.order.product:0
+msgid "Sales by Product"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_81
+msgid "This Month"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,category_id:0
+msgid "Categories"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
+msgid "Created Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_80
+msgid "Reporting"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_turnover_month_tree
+#: model:ir.model,name:sale.model_report_turnover_per_month
+#: view:report.turnover.per.month:0
+msgid "Turnover Per Month"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.ir_ui_menu2
+msgid "Daily Sales Turnover Over One Year"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.next_id_83
+msgid "Graphs"
+msgstr ""
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "Manual in progress"
+msgstr ""
+
+#. module: sale
+#: field:report.turnover.per.month,turnover:0
+#: field:report.turnover.per.product,turnover:0
+msgid "Total Turnover"
+msgstr ""
+
+#. module: sale
+#: selection:report.sale.order.category,state:0
+#: selection:report.sale.order.product,state:0
+msgid "In progress"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_category_tree
+#: model:ir.ui.menu,name:sale.menu_report_order_category
+msgid "Sales by Category of Product (this month)"
+msgstr ""
+
+#. module: sale
+#: model:ir.report.custom,name:sale.ir_report_custom_5
+#: model:ir.report.custom,title:sale.ir_report_custom_5
+msgid "Daily sales turnover over one year"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,name:0
+#: field:report.sale.order.product,name:0
+#: field:report.turnover.per.month,name:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.category,count:0
+#: field:report.sale.order.product,count:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: sale
+#: field:report.sale.order.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: sale
+#: view:report.sale.order.created:0
+msgid "Created Sales orders"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_so_pipeline
+#: view:sale.order:0
+msgid "Sales by State"
+msgstr ""
diff --git a/addons/sale/i18n/pt_BR.po b/addons/sale/i18n/pt_BR.po
index e15b28ac84c..35b5186945d 100644
--- a/addons/sale/i18n/pt_BR.po
+++ b/addons/sale/i18n/pt_BR.po
@@ -8,20 +8,19 @@ msgstr ""
"Project-Id-Version: pt_BR\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:47+0000\n"
-"Last-Translator: Renato Lima - http://www.akretion.com "
-"\n"
+"PO-Revision-Date: 2010-08-22 05:57+0000\n"
+"Last-Translator: OpenERP Administrators \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-20 03:38+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale
#: selection:sale.order,picking_policy:0
msgid "Partial Delivery"
-msgstr "Entrega Parcial"
+msgstr ""
#. module: sale
#: view:sale.order:0
@@ -41,7 +40,7 @@ msgstr "Ordem de Entrega"
#. module: sale
#: field:sale.order.line,address_allotment_id:0
msgid "Allotment Partner"
-msgstr ""
+msgstr "Parceiro designado"
#. module: sale
#: constraint:ir.actions.act_window:0
@@ -129,12 +128,12 @@ msgstr "Validar"
#. module: sale
#: view:sale.order:0
msgid "Make Invoice"
-msgstr ""
+msgstr "Gerar fatura"
#. module: sale
#: field:sale.order.line,price_subtotal:0
msgid "Subtotal"
-msgstr ""
+msgstr "Subtotal"
#. module: sale
#: model:process.transition,note:sale.process_transition_confirmquotation0
@@ -142,6 +141,8 @@ msgid ""
"Whenever confirm button is clicked, the draft state is moved to manual. that "
"is, quotation is moved to sale order."
msgstr ""
+"Sempre que clicar no botão confirmar, o estado de rascunho é trocado para "
+"manual, ou seja, cotação se transforma em ordem de venda."
#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
@@ -165,12 +166,12 @@ msgstr "Designação Manual"
#: view:sale.order.line:0
#: field:sale.order.line,notes:0
msgid "Notes"
-msgstr "Notas"
+msgstr "Anotações"
#. module: sale
#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
msgid "Invoice after delivery"
-msgstr ""
+msgstr "Faturar depois de entreguar"
#. module: sale
#: field:sale.order,amount_tax:0
@@ -181,7 +182,7 @@ msgstr "Impostos"
#. module: sale
#: rml:sale.order:0
msgid "Net Total :"
-msgstr ""
+msgstr "Total Líquido"
#. module: sale
#: field:sale.order,order_policy:0
@@ -207,17 +208,17 @@ msgstr ""
#. module: sale
#: field:sale.order,origin:0
msgid "Origin"
-msgstr ""
+msgstr "Origem"
#. module: sale
#: field:sale.order,partner_invoice_id:0
msgid "Invoice Address"
-msgstr "Endereço Faturamento"
+msgstr "Endereço de Faturamento"
#. module: sale
#: model:process.node,name:sale.process_node_packinglist0
msgid "Outgoing Products"
-msgstr ""
+msgstr "Produtos a serem despachados"
#. module: sale
#: view:sale.order:0
@@ -227,12 +228,12 @@ msgstr "Referência"
#. module: sale
#: selection:sale.config.picking_policy,picking_policy:0
msgid "All at Once"
-msgstr ""
+msgstr "Partida única"
#. module: sale
#: model:process.transition,note:sale.process_transition_saleprocurement0
msgid "Procurement is created after confirmation of sale order."
-msgstr ""
+msgstr "Aquisição criada depois da confirmação do pedido"
#. module: sale
#: field:sale.order,project_id:0
@@ -248,12 +249,12 @@ msgstr "Imposto:"
#. module: sale
#: field:sale.order.line,type:0
msgid "Procure Method"
-msgstr ""
+msgstr "Método de Aquisição"
#. module: sale
#: view:sale.order:0
msgid "Extra Info"
-msgstr "Info. Extra"
+msgstr "Informações Adicionais"
#. module: sale
#: rml:sale.order:0
@@ -263,13 +264,13 @@ msgstr "Fax :"
#. module: sale
#: field:sale.order.line,price_net:0
msgid "Net Price"
-msgstr ""
+msgstr "Preço Líquido"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree9
#: model:ir.ui.menu,name:sale.menu_action_order_tree9
msgid "My sales order in progress"
-msgstr ""
+msgstr "Meus pedidos em andamento"
#. module: sale
#: field:sale.order.line,product_uos_qty:0
@@ -284,6 +285,11 @@ msgid ""
"choose if you invoice based on ordered or shipped quantities. If the product "
"is a service, shipped quantities means hours spent on the associated tasks."
msgstr ""
+"O pedido irá gerar automaticamente a fatura. Pode haver diferença entre a "
+"quantidade especificada no pedido e aquela efetivamente despachada. É "
+"necessário definir se a fatura deve se basear na quantidade pedida ou ou "
+"despachada. Quando se trata de serviços, a quantidade despachada significa o "
+"total de horas gastos nas tarefas associadas."
#. module: sale
#: selection:sale.order.line,state:0
@@ -293,28 +299,28 @@ msgstr "Confirmada"
#. module: sale
#: field:sale.shop,payment_default_id:0
msgid "Default Payment Term"
-msgstr "Pagamento Padrão"
+msgstr "Condição de Pagamento Padrão"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree_all
#: model:ir.ui.menu,name:sale.menu_action_order_tree_all
msgid "All Sales Order"
-msgstr ""
+msgstr "Todas as Ordens de Venda"
#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
msgid "Confirm"
-msgstr ""
+msgstr "Confirmar"
#. module: sale
#: field:sale.order,partner_shipping_id:0
msgid "Shipping Address"
-msgstr "Endereço Entrega"
+msgstr "Endereço de Entrega"
#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
-msgstr "Quantidades Enbarcada"
+msgstr "Quantidade Enbarcada"
#. module: sale
#: selection:sale.config.picking_policy,order_policy:0
@@ -330,7 +336,7 @@ msgstr "Estabelecimento de Venda"
#. module: sale
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
-msgstr "Estoque Disponível"
+msgstr "Estoque"
#. module: sale
#: rml:sale.order:0
@@ -376,7 +382,7 @@ msgstr ""
#: model:ir.actions.act_window,name:sale.action_order_tree8
#: model:ir.ui.menu,name:sale.menu_action_order_tree8
msgid "My sales order waiting Invoice"
-msgstr ""
+msgstr "Meus pedidos aguardando emissão da Fatura"
#. module: sale
#: rml:sale.order:0
@@ -490,7 +496,7 @@ msgstr ""
#. module: sale
#: field:sale.order,client_order_ref:0
msgid "Customer Ref"
-msgstr ""
+msgstr "Ref. do Cliente"
#. module: sale
#: view:sale.order:0
@@ -529,7 +535,7 @@ msgstr "Agrupar Notas Fiscais"
#: model:ir.actions.act_window,name:sale.action_order_tree5
#: model:ir.ui.menu,name:sale.menu_action_order_tree5
msgid "All Quotations"
-msgstr "Todas Cotações"
+msgstr "Todas as Cotações"
#. module: sale
#: field:sale.order.line,discount:0
@@ -571,12 +577,12 @@ msgstr "Linha de Pedido"
#. module: sale
#: field:sale.config.picking_policy,picking_policy:0
msgid "Packing Default Policy"
-msgstr ""
+msgstr "Política Padrão de Empacotamento"
#. module: sale
#: model:process.node,note:sale.process_node_saleorder0
msgid "Manages the delivery and invoicing progress"
-msgstr ""
+msgstr "Gerencia o progresso das entregas e do faturamento"
#. module: sale
#: field:sale.config.picking_policy,order_policy:0
@@ -586,7 +592,7 @@ msgstr "Politica Padrão de Embarque"
#. module: sale
#: field:sale.order.line,product_packaging:0
msgid "Packaging"
-msgstr ""
+msgstr "Empacotamento"
#. module: sale
#: model:ir.module.module,shortdesc:sale.module_meta_information
@@ -632,7 +638,7 @@ msgstr "Faturado"
#. module: sale
#: model:ir.actions.wizard,name:sale.advance_payment
msgid "Advance Invoice"
-msgstr ""
+msgstr "Avançar Fatura"
#. module: sale
#: field:sale.order,state:0
@@ -655,7 +661,7 @@ msgstr ""
#. module: sale
#: model:process.process,name:sale.process_process_salesprocess0
msgid "Sales Process"
-msgstr ""
+msgstr "Processo de Vendas"
#. module: sale
#: wizard_view:sale.order.line.make_invoice,init:0
@@ -663,7 +669,7 @@ msgstr ""
#: wizard_view:sale.order.make_invoice,init:0
#: wizard_button:sale.order.make_invoice,init,invoice:0
msgid "Create invoices"
-msgstr ""
+msgstr "Gerar faturas"
#. module: sale
#: constraint:product.template:0
@@ -676,23 +682,23 @@ msgstr ""
#: model:ir.actions.act_window,name:sale.action_order_tree7
#: model:ir.ui.menu,name:sale.menu_action_order_tree7
msgid "My sales in shipping exception"
-msgstr ""
+msgstr "Minhas vendas sob status de exceção"
#. module: sale
#: view:sale.config.picking_policy:0
msgid "Sales Configuration"
-msgstr ""
+msgstr "Configuração de Vendas"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree2
#: model:ir.ui.menu,name:sale.menu_action_order_tree2
msgid "Sales in Exception"
-msgstr ""
+msgstr "Vendas em Exceção"
#. module: sale
#: selection:sale.order.line,type:0
msgid "on order"
-msgstr "em ordem"
+msgstr "no pedido"
#. module: sale
#: selection:sale.order.line,state:0
@@ -707,7 +713,7 @@ msgstr "Pago"
#. module: sale
#: view:sale.order:0
msgid "Procurement Corrected"
-msgstr ""
+msgstr "Processo de Aquisição Corrigido"
#. module: sale
#: selection:sale.order,order_policy:0
@@ -743,7 +749,7 @@ msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
msgid "Product sales"
-msgstr ""
+msgstr "Vendas de Produtos"
#. module: sale
#: rml:sale.order:0
@@ -792,7 +798,7 @@ msgstr "Cotação"
#. module: sale
#: model:product.template,name:sale.advance_product_0_product_template
msgid "Advance Product"
-msgstr ""
+msgstr "Avançar o Produto"
#. module: sale
#: model:process.transition,note:sale.process_transition_invoice0
@@ -827,7 +833,7 @@ msgstr "Ordem de Venda em Processamento"
#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_assign0
msgid "Assign"
-msgstr ""
+msgstr "Designar"
#. module: sale
#: view:sale.order:0
@@ -912,7 +918,7 @@ msgstr "Endereço de Faturamento :"
#: model:process.transition,name:sale.process_transition_invoice0
#: field:sale.order,invoice_ids:0
msgid "Invoice"
-msgstr ""
+msgstr "Fatura"
#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
@@ -935,6 +941,11 @@ msgid ""
"'Waiting Schedule' state is set when the invoice is confirmed but waiting "
"for the scheduler to run on the date 'Date Ordered'."
msgstr ""
+"Status do pedido ou cotação. O status é automaticamente modificado para "
+"exceção quando uma operação de cancelamento ocorre na etapa de validação da "
+"fatura ou no processo de empacotamento. O status de espera é acionado quando "
+"a fatura está confirmada mas na fila, esperando a data correta para ser "
+"produzida."
#. module: sale
#: view:sale.order:0
@@ -973,12 +984,12 @@ msgstr ""
#. module: sale
#: model:process.transition,note:sale.process_transition_saleinvoice0
msgid "Confirm sale order and Create invoice."
-msgstr ""
+msgstr "Confirmar Pedido e Gerar Fatura."
#. module: sale
#: selection:sale.config.picking_policy,step:0
msgid "Packing List & Delivery Order"
-msgstr ""
+msgstr "Lista de Empacotamento e Pedido de Entrega"
#. module: sale
#: selection:sale.order.line,state:0
@@ -1020,12 +1031,12 @@ msgstr "Ordem de Venda"
#. module: sale
#: model:process.node,note:sale.process_node_quotation0
msgid "Quotation (A sale order in draft state)"
-msgstr ""
+msgstr "Cotação (Rascunho do pedido)"
#. module: sale
#: model:process.transition,name:sale.process_transition_saleinvoice0
msgid "Sale Invoice"
-msgstr ""
+msgstr "Fatura (Vendas)"
#. module: sale
#: field:sale.order,incoterm:0
@@ -1041,7 +1052,7 @@ msgstr "Produto"
#. module: sale
#: wizard_button:sale.advance_payment_inv,create,open:0
msgid "Open Advance Invoice"
-msgstr ""
+msgstr "Abrir Fatura Avançada"
#. module: sale
#: field:sale.order,partner_order_id:0
@@ -1062,7 +1073,7 @@ msgstr "Preço"
#. module: sale
#: model:process.transition,name:sale.process_transition_deliver0
msgid "Deliver"
-msgstr ""
+msgstr "Entrega"
#. module: sale
#: model:ir.actions.report.xml,name:sale.report_sale_order
@@ -1082,29 +1093,29 @@ msgstr "Cotação N°"
#. module: sale
#: field:stock.move,sale_line_id:0
msgid "Sale Order Line"
-msgstr "Linhas da Ordem de Venda"
+msgstr "Linha de Pedidos"
#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
msgid "Cancel Assignation"
-msgstr ""
+msgstr "Cancelar Designação"
#. module: sale
#: selection:sale.order,order_policy:0
msgid "Invoice from the Packing"
-msgstr ""
+msgstr "Fatura gerada a partir do empacotamento"
#. module: sale
#: model:ir.actions.wizard,name:sale.wizard_sale_order_line_invoice
#: model:ir.actions.wizard,name:sale.wizard_sale_order_make_invoice
msgid "Make invoices"
-msgstr ""
+msgstr "Gerar faturas"
#. module: sale
#: help:sale.order,partner_order_id:0
msgid ""
"The name and address of the contact that requested the order or quotation."
-msgstr ""
+msgstr "Nome e endereço de quem requisitou o pedido ou cotação"
#. module: sale
#: field:sale.order,partner_id:0
@@ -1140,7 +1151,7 @@ msgstr "Faturar em"
#: model:ir.actions.act_window,name:sale.action_order_tree_new
#: model:ir.ui.menu,name:sale.menu_action_order_tree_new
msgid "New Quotation"
-msgstr ""
+msgstr "Nova Cotação"
#. module: sale
#: view:sale.order:0
@@ -1185,7 +1196,7 @@ msgstr "Configurar Politica de Separação para Ordem de Venda"
#. module: sale
#: model:process.node,name:sale.process_node_order0
msgid "Order"
-msgstr "Ordem"
+msgstr "Pedido"
#. module: sale
#: rml:sale.order:0
@@ -1229,6 +1240,8 @@ msgid ""
"The same sale order may have been invoiced in several times (by line for "
"example)."
msgstr ""
+"Lista de Faturas geradas para este pedido. O mesmo pedido pode constar "
+"diversas vezes na fatura (ordenado por linha, por exemplo)"
#. module: sale
#: view:sale.order:0
@@ -1244,7 +1257,7 @@ msgstr "Peso"
#. module: sale
#: model:process.node,note:sale.process_node_order0
msgid "After confirming order, Create the invoice."
-msgstr ""
+msgstr "Criar a Fatura Após Confirmar o Pedido"
#. module: sale
#: constraint:product.product:0
@@ -1276,53 +1289,53 @@ msgstr "Movimentações de Estoque"
#: model:ir.actions.act_window,name:sale.action_order_tree
#: model:ir.ui.menu,name:sale.menu_action_order_tree
msgid "My Sales Order"
-msgstr ""
+msgstr "Meus Pedidos"
#. module: sale
#: model:ir.model,name:sale.model_sale_order_line
msgid "Sale Order line"
-msgstr ""
+msgstr "Linha de Pedidos"
#. module: sale
#: model:ir.module.module,shortdesc:sale.module_meta_information
msgid "Dashboard for sales"
-msgstr ""
+msgstr "Painel de Vendas"
#. module: sale
#: model:ir.actions.act_window,name:sale.open_board_sales_manager
#: model:ir.ui.menu,name:sale.menu_board_sales_manager
msgid "Sale Dashboard"
-msgstr "Dashboard de Venda"
+msgstr "Painel de Vendas"
#. module: sale
#: view:board.board:0
msgid "Sales of the month"
-msgstr ""
+msgstr "Vendas do Mes"
#. module: sale
#: view:board.board:0
msgid "Sales manager board"
-msgstr ""
+msgstr "Grupo de Gerentes de Vendas"
#. module: sale
#: view:board.board:0
msgid "Cases of the month"
-msgstr ""
+msgstr "Casos do Mes"
#. module: sale
#: view:board.board:0
msgid "My open quotations"
-msgstr ""
+msgstr "Minhas Cotações em Aberto"
#. module: sale
#: view:board.board:0
msgid "Cases statistics"
-msgstr ""
+msgstr "Estatísticas de Casos"
#. module: sale
#: view:board.board:0
msgid "Top ten sales of the month"
-msgstr ""
+msgstr "As 10 Maiores Vendas do Mes"
#. module: sale
#: field:report.sale.order.category,price_average:0
@@ -1338,23 +1351,23 @@ msgstr "Relatório de Ordem de Venda Criada"
#. module: sale
#: view:report.sale.order.category:0
msgid "Sales Orders by category"
-msgstr ""
+msgstr "Vendas ordenadas por Categoria"
#. module: sale
#: model:ir.report.custom,name:sale.ir_report_custom_6
#: model:ir.report.custom,title:sale.ir_report_custom_6
msgid "Monthly cumulated sales turnover over one year"
-msgstr ""
+msgstr "Retorno Mensal Acumulado de Vendas no Período de Um Ano"
#. module: sale
#: model:ir.model,name:sale.model_report_sale_order_product
msgid "Sales Orders by Products"
-msgstr ""
+msgstr "Pedidos Ordenados por Produto"
#. module: sale
#: model:ir.ui.menu,name:sale.ir_ui_menu1
msgid "Monthly Sales Turnover Over One Year"
-msgstr ""
+msgstr "Retorno Mensal de Vendas no Período de Um Ano"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_turnover_product_tree
@@ -1377,55 +1390,55 @@ msgstr "Preço Total"
#. module: sale
#: model:ir.model,name:sale.model_report_sale_order_category
msgid "Sales Orders by Categories"
-msgstr ""
+msgstr "Pedidos Ordenados por Categoria"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_sale_list
#: model:ir.ui.menu,name:sale.menu_report_order_sale_list
msgid "Sales of the Month"
-msgstr ""
+msgstr "Vendas Mensais"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_product_tree
#: model:ir.ui.menu,name:sale.menu_report_order_product
msgid "Sales by Product (this month)"
-msgstr ""
+msgstr "Vendas por Produto (este mes)"
#. module: sale
#: model:ir.report.custom,name:sale.ir_report_custom_4
#: model:ir.report.custom,title:sale.ir_report_custom_4
msgid "Monthly sales turnover over one year"
-msgstr ""
+msgstr "Retorno Mensal de Vendas no Período de Um Ano"
#. module: sale
#: model:ir.module.module,shortdesc:sale.module_meta_information
msgid "Sales Management - Reporting"
-msgstr ""
+msgstr "Gerenciamento de Vendas - Relatórios"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_category_tree_all
#: model:ir.ui.menu,name:sale.menu_report_order_category_all
#: view:report.sale.order.category:0
msgid "Sales by Category of Products"
-msgstr ""
+msgstr "Vendas por Categoria de Produtos"
#. module: sale
#: model:ir.ui.menu,name:sale.ir_ui_menu3
msgid "Monthly Cumulated Sales Turnover Over One Year"
-msgstr ""
+msgstr "Retorno Mensal de Vendas Acumuladas no Período de Um Ano"
#. module: sale
#: field:report.sale.order.category,quantity:0
#: field:report.sale.order.product,quantity:0
msgid "# of Products"
-msgstr ""
+msgstr "Total de Produtos"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_product_tree_all
#: model:ir.ui.menu,name:sale.menu_report_order_product_all
#: view:report.sale.order.product:0
msgid "Sales by Product"
-msgstr ""
+msgstr "Vendas por produto"
#. module: sale
#: model:ir.ui.menu,name:sale.next_id_81
@@ -1435,12 +1448,12 @@ msgstr "Este mes"
#. module: sale
#: field:report.sale.order.category,category_id:0
msgid "Categories"
-msgstr ""
+msgstr "Categorias"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
msgid "Created Sale Orders"
-msgstr ""
+msgstr "Pedidos Gerados"
#. module: sale
#: model:ir.ui.menu,name:sale.next_id_80
@@ -1452,12 +1465,12 @@ msgstr "Relatórios"
#: model:ir.model,name:sale.model_report_turnover_per_month
#: view:report.turnover.per.month:0
msgid "Turnover Per Month"
-msgstr "Retorno por Mês"
+msgstr "Retorno Mensal"
#. module: sale
#: model:ir.ui.menu,name:sale.ir_ui_menu2
msgid "Daily Sales Turnover Over One Year"
-msgstr ""
+msgstr "Retorno diário de Vendas no pPríodo de Um Ano"
#. module: sale
#: model:ir.ui.menu,name:sale.next_id_83
@@ -1515,10 +1528,10 @@ msgstr "Data de Criação"
#. module: sale
#: view:report.sale.order.created:0
msgid "Created Sales orders"
-msgstr "Odem de Vendas Criadas"
+msgstr "Odem de Vendas Gerada"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_so_pipeline
#: view:sale.order:0
msgid "Sales by State"
-msgstr ""
+msgstr "Vendas por Estado"
diff --git a/addons/sale/i18n/sr.po b/addons/sale/i18n/sr.po
index 8f0df74962f..8b7978b509d 100644
--- a/addons/sale/i18n/sr.po
+++ b/addons/sale/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:39+0000\n"
+"PO-Revision-Date: 2010-08-22 05:48+0000\n"
"Last-Translator: OpenERP Administrators \n"
"Language-Team: Serbian \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-20 03:38+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale
diff --git a/addons/sale/i18n/sv.po b/addons/sale/i18n/sv.po
index 149170b20e4..5084eb65258 100644
--- a/addons/sale/i18n/sv.po
+++ b/addons/sale/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:43+0000\n"
+"PO-Revision-Date: 2010-08-22 05:53+0000\n"
"Last-Translator: Anders Eriksson (Mobila System) \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-20 03:38+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale
diff --git a/addons/sale/i18n/tr.po b/addons/sale/i18n/tr.po
index 77d6ac24e53..182d6116946 100644
--- a/addons/sale/i18n/tr.po
+++ b/addons/sale/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:37+0000\n"
+"PO-Revision-Date: 2010-08-22 05:39+0000\n"
"Last-Translator: OpenERP Administrators \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-20 03:38+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale
diff --git a/addons/sale/i18n/uk.po b/addons/sale/i18n/uk.po
index 7cc8b5245a9..8f494f69044 100644
--- a/addons/sale/i18n/uk.po
+++ b/addons/sale/i18n/uk.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:37+0000\n"
+"PO-Revision-Date: 2010-08-22 05:34+0000\n"
"Last-Translator: Jay (OpenERP) \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-20 03:38+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale
diff --git a/addons/sale/i18n/vi.po b/addons/sale/i18n/vi.po
index a656800033e..3f61ca6b82f 100644
--- a/addons/sale/i18n/vi.po
+++ b/addons/sale/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:44+0000\n"
+"PO-Revision-Date: 2010-08-22 05:55+0000\n"
"Last-Translator: Fabien (Open ERP) \n"
"Language-Team: Vietnamese \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-20 03:38+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale
diff --git a/addons/sale_journal/i18n/pl.po b/addons/sale_journal/i18n/pl.po
index b74af62af04..f6426db7f96 100644
--- a/addons/sale_journal/i18n/pl.po
+++ b/addons/sale_journal/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:39+0000\n"
+"PO-Revision-Date: 2010-08-22 05:48+0000\n"
"Last-Translator: OpenERP Administrators \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale_journal
diff --git a/addons/sale_journal/i18n/tr.po b/addons/sale_journal/i18n/tr.po
index 0cf719af5bb..2024aafecf5 100644
--- a/addons/sale_journal/i18n/tr.po
+++ b/addons/sale_journal/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:46+0000\n"
+"PO-Revision-Date: 2010-08-22 05:56+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale_journal
diff --git a/addons/sale_layout/i18n/de.po b/addons/sale_layout/i18n/de.po
new file mode 100644
index 00000000000..bf8b0aa25e8
--- /dev/null
+++ b/addons/sale_layout/i18n/de.po
@@ -0,0 +1,279 @@
+# German 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-26 08:45+0000\n"
+"PO-Revision-Date: 2010-08-22 07:15+0000\n"
+"Last-Translator: Ferdinand @ ChriCar \n"
+"Language-Team: German \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 04:02+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Sub Total"
+msgstr "Zwischensumme"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Title"
+msgstr "Überschrift"
+
+#. module: sale_layout
+#: model:ir.module.module,shortdesc:sale_layout.module_meta_information
+msgid "sale_layout"
+msgstr "sale_layout"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Disc. (%)"
+msgstr "Rabatt (%)"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Note"
+msgstr "Notiz"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Unit Price"
+msgstr "Preis/ME"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Order N°"
+msgstr "Bestellnummer"
+
+#. module: sale_layout
+#: field:sale.order,abstract_line_ids:0
+msgid "Order Lines"
+msgstr "Auftragszeilen"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Disc.(%)"
+msgstr "Rabatt (%)"
+
+#. module: sale_layout
+#: field:sale.order.line,layout_type:0
+msgid "Layout Type"
+msgstr "Layout Typ"
+
+#. module: sale_layout
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Seq."
+msgstr "Seq."
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Product"
+msgstr "Produkt"
+
+#. module: sale_layout
+#: model:ir.module.module,description:sale_layout.module_meta_information
+msgid ""
+"\n"
+" This module provides some features to improve the layout of the Sale "
+"Order.\n"
+"\n"
+" It gives you the possibility to\n"
+" * order all the lines of an sale order\n"
+" * add titles, comment lines, sub total lines\n"
+" * draw horizontal lines and put page breaks \n"
+"\n"
+" "
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Description"
+msgstr "Beschreibung"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Manual Description"
+msgstr "Manuelle Beschreibung"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Our Salesman"
+msgstr "Unser Verkäufer"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Automatic Declaration"
+msgstr "Automatischer Liefernachweis"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Invoice Lines"
+msgstr "Rechnungszeilen"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Quantity"
+msgstr "Menge"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Quotation N°"
+msgstr "Angebot Nr."
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "VAT"
+msgstr "USt."
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Make Invoice"
+msgstr "Erzeuge Rechnung"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Properties"
+msgstr "Eigenschaften"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Invoice address :"
+msgstr "Rechnungsanschrift:"
+
+#. module: sale_layout
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Fehlerhafter XML-Code für diese Ansicht!"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Page Break"
+msgstr "Seitenwechsel"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Notes"
+msgstr "Notiz"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Date Ordered"
+msgstr "Auftragsdatum"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Shipping address :"
+msgstr "Lieferanschrift:"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Taxes"
+msgstr "Steuern"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Net Total :"
+msgstr "Gesamt Netto:"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Tel. :"
+msgstr "Tel.:"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Total :"
+msgstr "Summe :"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Payment Terms"
+msgstr "Zahlungsbedingungen"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "History"
+msgstr "Verlauf"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sale Order Lines"
+msgstr "Auftragspositionen"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Separator Line"
+msgstr "Trennlinie"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Your Reference"
+msgstr "Ihre Referenz"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sales order lines"
+msgstr "Auftragspositionen"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Qty"
+msgstr "Menge"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "States"
+msgstr "Zustände"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "TVA :"
+msgstr "USt.:"
+
+#. module: sale_layout
+#: model:ir.actions.report.xml,name:sale_layout.sale_order_1
+msgid "Order with Layout"
+msgstr "Auftrag mit Layout"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Zusatzinfo"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "UoM"
+msgstr "ME"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Fax :"
+msgstr "Fax:"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Order Line"
+msgstr "Auftragszeile"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Price"
+msgstr "Preis"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Taxes :"
+msgstr "Steuern:"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr "Lagerbuchungen"
diff --git a/addons/sale_layout/i18n/pl.po b/addons/sale_layout/i18n/pl.po
new file mode 100644
index 00000000000..078e7895114
--- /dev/null
+++ b/addons/sale_layout/i18n/pl.po
@@ -0,0 +1,279 @@
+# 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-26 08:45+0000\n"
+"PO-Revision-Date: 2010-08-22 05:49+0000\n"
+"Last-Translator: OpenERP Administrators \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-08-23 04:02+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Sub Total"
+msgstr "Wartość"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Title"
+msgstr "Tytuł"
+
+#. module: sale_layout
+#: model:ir.module.module,shortdesc:sale_layout.module_meta_information
+msgid "sale_layout"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Disc. (%)"
+msgstr "Up. (%)"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Note"
+msgstr "Notatka"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Unit Price"
+msgstr "Cena jedn."
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Order N°"
+msgstr "Nr zamówienia"
+
+#. module: sale_layout
+#: field:sale.order,abstract_line_ids:0
+msgid "Order Lines"
+msgstr "Pozycje zamówienia"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Disc.(%)"
+msgstr "Up.(%)"
+
+#. module: sale_layout
+#: field:sale.order.line,layout_type:0
+msgid "Layout Type"
+msgstr "Typ układu"
+
+#. module: sale_layout
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Seq."
+msgstr "Num."
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Product"
+msgstr "Produkt"
+
+#. module: sale_layout
+#: model:ir.module.module,description:sale_layout.module_meta_information
+msgid ""
+"\n"
+" This module provides some features to improve the layout of the Sale "
+"Order.\n"
+"\n"
+" It gives you the possibility to\n"
+" * order all the lines of an sale order\n"
+" * add titles, comment lines, sub total lines\n"
+" * draw horizontal lines and put page breaks \n"
+"\n"
+" "
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Manual Description"
+msgstr "Opis ręczny"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Our Salesman"
+msgstr "Nasz sprzedawca"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Automatic Declaration"
+msgstr "Deklaracja automatyczna"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Invoice Lines"
+msgstr "Pozycje faktury"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Quantity"
+msgstr "Ilość"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Quotation N°"
+msgstr "Nr oferty"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "VAT"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Make Invoice"
+msgstr "Utwórz fakturę"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Properties"
+msgstr "Właściwości"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Invoice address :"
+msgstr "Adres do faktury :"
+
+#. module: sale_layout
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Page Break"
+msgstr "Podział strony"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Notes"
+msgstr "Uwagi"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Date Ordered"
+msgstr "Data zamówienia"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Shipping address :"
+msgstr "Adres do wysyłki :"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Taxes"
+msgstr "Podatki"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Net Total :"
+msgstr "Suma netto :"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Total :"
+msgstr "Suma :"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Payment Terms"
+msgstr "Warunki Płatności"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "History"
+msgstr "Historia"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sale Order Lines"
+msgstr "Pozycje zamówienia sprzedaży"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Separator Line"
+msgstr "Linia rozdzielająca"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Your Reference"
+msgstr "Twój odnośnik"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sales order lines"
+msgstr "Pozycje zamówienia sprzedaży"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Qty"
+msgstr "Il."
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "States"
+msgstr "Stany"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "TVA :"
+msgstr "VAT :"
+
+#. module: sale_layout
+#: model:ir.actions.report.xml,name:sale_layout.sale_order_1
+msgid "Order with Layout"
+msgstr "Zamowienie z układem"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Dodatkowe informacje"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "UoM"
+msgstr "JM"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Fax :"
+msgstr "Faks :"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Order Line"
+msgstr "Pozycja zamówienia"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Price"
+msgstr "Cena"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Taxes :"
+msgstr "Podatki :"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr "Przesunięcia zapasów"
diff --git a/addons/sale_margin/i18n/de.po b/addons/sale_margin/i18n/de.po
new file mode 100644
index 00000000000..946b99789f4
--- /dev/null
+++ b/addons/sale_margin/i18n/de.po
@@ -0,0 +1,375 @@
+# German 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-25 14:28+0000\n"
+"PO-Revision-Date: 2010-08-22 07:24+0000\n"
+"Last-Translator: Ferdinand @ ChriCar \n"
+"Language-Team: German \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 04:02+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+#: selection:stock.invoice_onshipping,init,type:0
+msgid "Customer Refund"
+msgstr "Kundengutschrift"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_report_account_invoice_product
+msgid "report.account.invoice.product"
+msgstr "report.account.invoice.product"
+
+#. module: sale_margin
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Der Objektname muss mit \"x_\" beginnen und darf keine Sonderzeichen "
+"beinhalten!"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_product
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_product
+msgid "Invoices by Product"
+msgstr "Rechnugnen je Produkt"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+#: selection:stock.invoice_onshipping,init,type:0
+msgid "Customer Invoice"
+msgstr "Ausgangsrechnung"
+
+#. module: sale_margin
+#: wizard_view:stock.invoice_onshipping,init:0
+msgid "Create invoices"
+msgstr "Erzeuge Rechnungen"
+
+#. module: sale_margin
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Fehlerhafter XML-Code für diese Ansicht!"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_report_account_invoice_partner_product
+msgid "report.account.invoice.partner.product"
+msgstr "report.account.invoice.partner.product"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+#: selection:stock.invoice_onshipping,init,type:0
+msgid "Supplier Invoice"
+msgstr "Eingangsrechnungen"
+
+#. module: sale_margin
+#: field:report.account.invoice,state:0
+#: field:report.account.invoice.category,state:0
+#: field:report.account.invoice.partner,state:0
+#: field:report.account.invoice.partner.product,state:0
+#: field:report.account.invoice.product,state:0
+msgid "State"
+msgstr "Status"
+
+#. module: sale_margin
+#: view:stock.picking:0
+msgid "Create Invoice"
+msgstr "Erzeuge Rechnung"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Draft"
+msgstr "Entwurf"
+
+#. module: sale_margin
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Ungültiger Modellname in der Aktionsdefinition."
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_month_product
+msgid "All Months"
+msgstr "Alle Monate"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_product_tree
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_product_tree_all
+msgid "report.account.invoice.partner.product.tree"
+msgstr "report.account.invoice.partner.product.tree"
+
+#. module: sale_margin
+#: field:report.account.invoice,type:0
+#: field:report.account.invoice.category,type:0
+#: field:report.account.invoice.partner,type:0
+#: field:report.account.invoice.partner.product,type:0
+#: field:report.account.invoice.product,type:0
+#: wizard_field:stock.invoice_onshipping,init,type:0
+msgid "Type"
+msgstr "Typ"
+
+#. module: sale_margin
+#: wizard_field:stock.invoice_onshipping,init,journal_id:0
+msgid "Destination Journal"
+msgstr "Zieljournal"
+
+#. module: sale_margin
+#: view:stock.picking:0
+msgid "Supplier Invoices"
+msgstr "Eingangsrechnungen"
+
+#. module: sale_margin
+#: field:report.account.invoice.partner.product,product_id:0
+#: field:report.account.invoice.product,product_id:0
+msgid "Product"
+msgstr "Produkt"
+
+#. module: sale_margin
+#: view:report.account.invoice.partner:0
+msgid "Invoices by partner"
+msgstr "Rechnungen je Partner"
+
+#. module: sale_margin
+#: view:report.account.invoice.category:0
+msgid "Invoices by category"
+msgstr "Rechnungen je Kategorie"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Paid"
+msgstr "Bezahlt"
+
+#. module: sale_margin
+#: model:ir.actions.wizard,name:sale_margin.wizard_picking_invoice_create
+#: wizard_button:stock.invoice_onshipping,init,create_invoice:0
+msgid "Create invoice"
+msgstr "Erzeuge Rechnung"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_category_tree
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_category_tree_all
+msgid "report.account.invoice.category.tree"
+msgstr "report.account.invoice.category.tree"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_partner_product
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_partner_product
+msgid "Invoices by Partner and Product"
+msgstr "Rechnungen je Partner und Produkt"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_report_account_invoice_category
+msgid "report.account.invoice.category"
+msgstr "report.account.invoice.category"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_this_month_product
+msgid "This Month"
+msgstr "Dieser Monat"
+
+#. module: sale_margin
+#: field:report.account.invoice.category,categ_id:0
+msgid "Categories"
+msgstr "Kategorien"
+
+#. module: sale_margin
+#: field:account.invoice.line,cost_price:0
+#: field:report.account.invoice,cost_price:0
+#: field:report.account.invoice.category,cost_price:0
+#: field:report.account.invoice.partner,cost_price:0
+#: field:report.account.invoice.partner.product,cost_price:0
+#: field:report.account.invoice.product,cost_price:0
+#: field:sale.order.line,purchase_price:0
+msgid "Cost Price"
+msgstr "Herstellungskosten"
+
+#. module: sale_margin
+#: wizard_field:stock.invoice_onshipping,init,group:0
+msgid "Group by partner"
+msgstr "Gruppiert nach Partner"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_report_account_invoice_partner
+msgid "report.account.invoice.partner"
+msgstr "report.account.invoice.partner"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_partner
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_partner
+msgid "Invoices by Partner"
+msgstr "Rechnungen je Partner"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_category
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_category
+msgid "Invoices by Category"
+msgstr "Rechnungen je Kategorie"
+
+#. module: sale_margin
+#: view:report.account.invoice.partner.product:0
+msgid "Invoices by partner and product"
+msgstr "Rechnungen je Partner und Produkt"
+
+#. module: sale_margin
+#: field:report.account.invoice,amount:0
+#: field:report.account.invoice.category,amount:0
+#: field:report.account.invoice.partner,amount:0
+#: field:report.account.invoice.partner.product,amount:0
+#: field:report.account.invoice.product,amount:0
+msgid "Amount"
+msgstr "Betrag"
+
+#. module: sale_margin
+#: wizard_field:stock.invoice_onshipping,init,invoice_date:0
+msgid "Invoiced date"
+msgstr "Rechnungsdatum"
+
+#. module: sale_margin
+#: selection:report.account.invoice,type:0
+#: selection:report.account.invoice.category,type:0
+#: selection:report.account.invoice.partner,type:0
+#: selection:report.account.invoice.partner.product,type:0
+#: selection:report.account.invoice.product,type:0
+#: selection:stock.invoice_onshipping,init,type:0
+msgid "Supplier Refund"
+msgstr "Lieferantengutschrift"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_tree
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_tree_all
+msgid "report.account.invoice.partner.tree"
+msgstr "report.account.invoice.partner.tree"
+
+#. module: sale_margin
+#: field:report.account.invoice,margin:0
+#: field:report.account.invoice.category,margin:0
+#: field:report.account.invoice.partner,margin:0
+#: field:report.account.invoice.partner.product,margin:0
+#: field:report.account.invoice.product,margin:0
+#: field:sale.order,margin:0
+#: field:sale.order.line,margin:0
+msgid "Margin"
+msgstr "Marge"
+
+#. module: sale_margin
+#: field:report.account.invoice,quantity:0
+#: field:report.account.invoice.category,quantity:0
+#: field:report.account.invoice.partner,quantity:0
+#: field:report.account.invoice.partner.product,quantity:0
+#: field:report.account.invoice.product,quantity:0
+msgid "Quantity"
+msgstr "Menge"
+
+#. module: sale_margin
+#: view:report.account.invoice.product:0
+msgid "Invoices by product"
+msgstr "Rechnungen je Produkt"
+
+#. module: sale_margin
+#: model:ir.module.module,shortdesc:sale_margin.module_meta_information
+msgid "Margins in Sale Orders"
+msgstr "Deckungsbeiträge in Verkaufsaufträgen"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_report_account_invoice
+msgid "report.account.invoice"
+msgstr "report.account.invoice"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_invoices
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_invoices
+#: view:report.account.invoice:0
+#: view:stock.picking:0
+#: field:stock.picking,invoice_ids:0
+msgid "Invoices"
+msgstr "Rechnungen"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Pro-forma"
+msgstr "Pro-Forma"
+
+#. module: sale_margin
+#: field:report.account.invoice,name:0
+#: field:report.account.invoice.category,name:0
+#: field:report.account.invoice.partner,name:0
+#: field:report.account.invoice.partner.product,name:0
+#: field:report.account.invoice.product,name:0
+msgid "Month"
+msgstr "Monat"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Canceled"
+msgstr "Abgebrochen"
+
+#. module: sale_margin
+#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
+msgid "Invoice"
+msgstr "Rechnung"
+
+#. module: sale_margin
+#: wizard_button:stock.invoice_onshipping,init,end:0
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#. module: sale_margin
+#: field:report.account.invoice.partner,partner_id:0
+#: field:report.account.invoice.partner.product,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_tree
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_tree_all
+msgid "report.account.invoice.tree"
+msgstr "report.account.invoice.tree"
+
+#. module: sale_margin
+#: selection:report.account.invoice,state:0
+#: selection:report.account.invoice.category,state:0
+#: selection:report.account.invoice.partner,state:0
+#: selection:report.account.invoice.partner.product,state:0
+#: selection:report.account.invoice.product,state:0
+msgid "Open"
+msgstr "Offen"
+
+#. module: sale_margin
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_product_tree
+#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_product_tree_all
+msgid "report.account.invoice.product.tree"
+msgstr "report.account.invoice.product.tree"
diff --git a/addons/sale_mrp/i18n/de.po b/addons/sale_mrp/i18n/de.po
new file mode 100644
index 00000000000..b2bbce3e10e
--- /dev/null
+++ b/addons/sale_mrp/i18n/de.po
@@ -0,0 +1,74 @@
+# German 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: 2010-06-28 09:21+0000\n"
+"PO-Revision-Date: 2010-08-22 07:17+0000\n"
+"Last-Translator: Ferdinand @ ChriCar \n"
+"Language-Team: German \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 04:02+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_ref:0
+msgid "Indicate the Customer Reference from sale order."
+msgstr "zeigt Kundenreferenz aus dem Verkaufsauftrag"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_name:0
+msgid "Indicate the name of sale order."
+msgstr "Zeigt die Bezeichnungdes Verkaufsauftrages"
+
+#. module: sale_mrp
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Fehlerhafter XML-Code für diese Ansicht!"
+
+#. module: sale_mrp
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Der Objektname muss mit \"x_\" beginnen und darf keine Sonderzeichen "
+"beinhalten!"
+
+#. module: sale_mrp
+#: field:mrp.production,sale_name:0
+msgid "Sale Name"
+msgstr "Verkauf Bezeichnung"
+
+#. module: sale_mrp
+#: model:ir.model,name:sale_mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Produktionsauftrag"
+
+#. module: sale_mrp
+#: model:ir.module.module,description:sale_mrp.module_meta_information
+msgid ""
+"\n"
+" This module provides facility to the user to install mrp and sale "
+"modules\n"
+" at a time. It is basically used when we want to keep track of "
+"production\n"
+" orders generated from sale orders.\n"
+" It adds sale name and sale Reference on production order\n"
+" "
+msgstr ""
+
+#. module: sale_mrp
+#: field:mrp.production,sale_ref:0
+msgid "Sale Reference"
+msgstr "Verkaufsauftrag Referenz"
+
+#. module: sale_mrp
+#: model:ir.module.module,shortdesc:sale_mrp.module_meta_information
+msgid "Sales and MRP Management"
+msgstr "Verkauf und Prokuktions Management"
diff --git a/addons/stock/i18n/bs.po b/addons/stock/i18n/bs.po
index 639387defad..fc5f2282870 100644
--- a/addons/stock/i18n/bs.po
+++ b/addons/stock/i18n/bs.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:39+0000\n"
+"PO-Revision-Date: 2010-08-22 05:48+0000\n"
"Last-Translator: adnan \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-20 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 03:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock
diff --git a/addons/stock/i18n/de.po b/addons/stock/i18n/de.po
index c655987bfbd..6f74b75bcee 100644
--- a/addons/stock/i18n/de.po
+++ b/addons/stock/i18n/de.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:54+0000\n"
-"Last-Translator: OpenERP Administrators \n"
+"PO-Revision-Date: 2010-08-22 06:53+0000\n"
+"Last-Translator: Ferdinand @ ChriCar \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-20 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 03:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock
@@ -687,7 +687,7 @@ msgstr "Lagerort beim Partner"
#: help:stock.move,tracking_id:0
msgid ""
"Tracking lot is the code that will be put on the logistical unit/pallet"
-msgstr ""
+msgstr "Diese Losnummer wird für die logistische Einheit/Pallette vergeben"
#. module: stock
#: view:stock.tracking:0
diff --git a/addons/stock/i18n/it.po b/addons/stock/i18n/it.po
index f4dd0433689..347bef76a32 100644
--- a/addons/stock/i18n/it.po
+++ b/addons/stock/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:39+0000\n"
+"PO-Revision-Date: 2010-08-22 05:47+0000\n"
"Last-Translator: Davide Corio - Domsense \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-20 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 03:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock
diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po
index ebf7539312b..9ccf36968e8 100644
--- a/addons/stock/i18n/pl.po
+++ b/addons/stock/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:42+0000\n"
+"PO-Revision-Date: 2010-08-22 05:53+0000\n"
"Last-Translator: OpenERP Administrators \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-20 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 03:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock
diff --git a/addons/stock/i18n/pt_BR.po b/addons/stock/i18n/pt_BR.po
index d58162e66cd..1790a2b3014 100644
--- a/addons/stock/i18n/pt_BR.po
+++ b/addons/stock/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:24+0000\n"
+"PO-Revision-Date: 2010-08-22 05:26+0000\n"
"Last-Translator: Renato Lima - http://www.akretion.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-20 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 03:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock
diff --git a/addons/stock/i18n/tr.po b/addons/stock/i18n/tr.po
index 1d26d5c13ed..ab4048ed5ad 100644
--- a/addons/stock/i18n/tr.po
+++ b/addons/stock/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:37+0000\n"
+"PO-Revision-Date: 2010-08-22 05:31+0000\n"
"Last-Translator: OpenERP Administrators \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-20 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 03:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 244d9574f95..c76bc609a65 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -181,7 +181,10 @@ class stock_location(osv.osv):
'chained_journal_id': fields.many2one('stock.journal', 'Chained Journal'),
'chained_location_id': fields.many2one('stock.location', 'Chained Location If Fixed'),
'chained_location_type': fields.selection([('none', 'None'), ('customer', 'Customer'), ('fixed', 'Fixed Location')],
- 'Chained Location Type', required=True),
+ 'Chained Location Type', required=True,
+ help="This field is set to determine the destination location.\n" \
+ "If the field is set to 'customer', the location is given by the properties of the partner form.\n"\
+ "If the field is set to 'fixed', the destination location is given by the field Location if link is fixed."),
'chained_auto_packing': fields.selection(
[('auto', 'Automatic Move'), ('manual', 'Manual Operation'), ('transparent', 'Automatic No Step Added')],
'Automatic Move',
diff --git a/addons/stock_invoice_directly/i18n/tr.po b/addons/stock_invoice_directly/i18n/tr.po
index 2d336b2a05f..fbaf577b903 100644
--- a/addons/stock_invoice_directly/i18n/tr.po
+++ b/addons/stock_invoice_directly/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:49+0000\n"
+"PO-Revision-Date: 2010-08-22 06:02+0000\n"
"Last-Translator: OpenERP Administrators \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-20 03:40+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock_invoice_directly
diff --git a/addons/stock_location/i18n/tr.po b/addons/stock_location/i18n/tr.po
index b72ff5a2793..543d7613794 100644
--- a/addons/stock_location/i18n/tr.po
+++ b/addons/stock_location/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:55+0000\n"
+"PO-Revision-Date: 2010-08-22 06:06+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock_location
diff --git a/addons/stock_no_autopicking/i18n/tr.po b/addons/stock_no_autopicking/i18n/tr.po
index e25ac4d1abf..991405a1d1b 100644
--- a/addons/stock_no_autopicking/i18n/tr.po
+++ b/addons/stock_no_autopicking/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:37+0000\n"
+"PO-Revision-Date: 2010-08-22 05:43+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock_no_autopicking
diff --git a/addons/subscription/i18n/tr.po b/addons/subscription/i18n/tr.po
index 66890cba860..7b8f05eb33f 100644
--- a/addons/subscription/i18n/tr.po
+++ b/addons/subscription/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:41+0000\n"
+"PO-Revision-Date: 2010-08-22 05:52+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 03:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: subscription
diff --git a/addons/survey/i18n/de.po b/addons/survey/i18n/de.po
index 1bbc2a85bf1..60da3433fc6 100644
--- a/addons/survey/i18n/de.po
+++ b/addons/survey/i18n/de.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-11-26 06:01+0000\n"
-"PO-Revision-Date: 2010-03-31 21:32+0000\n"
+"PO-Revision-Date: 2010-08-22 06:51+0000\n"
"Last-Translator: Ferdinand @ ChriCar \n"
"Language-Team: German \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-12 04:08+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: survey
@@ -263,7 +263,7 @@ msgstr "Fehlerhafter XML Code für diese Ansicht!"
#: model:ir.model,name:survey.model_survey_response_answer
#: view:survey.response.answer:0
msgid "Survey Response Answer"
-msgstr ""
+msgstr "Umfrage Anwort"
#. module: survey
#: rml:survey_analysis_report:0
@@ -403,6 +403,15 @@ msgid ""
"invitation of the survey\n"
" "
msgstr ""
+"\n"
+" Diese Mould wird für Umfragen verwendet. Es hängt von den Antorten und "
+"Überarbeitungen von verschiedenen Benutzern ab.\n"
+" Eine Umfrage kann mehrere Seiten haben. Jede Seite kann mehrere Fragen "
+"haben und jede Frage mehrere Antworten.\n"
+" Verschieden Benutzer können verschiedene Antworten geben.\n"
+" An Partner können Einladunge in Form von EMails mit Benutzername und "
+"Passwort gesandt werden.\n"
+" "
#. module: survey
#: view:survey:0
@@ -523,7 +532,7 @@ msgstr "Fertig"
#: code:addons/survey/survey.py:0
#, python-format
msgid "'\" + que_rec[0]['question'] + \"' This question requires an answer."
-msgstr ""
+msgstr "'\" + que_rec[0]['question'] + \"' Diese Frage bedarf einer Antwort"
#. module: survey
#: view:survey:0
@@ -639,7 +648,7 @@ msgstr "# Fragen"
#. module: survey
#: rml:survey_analysis_report:0
msgid "Que:"
-msgstr ""
+msgstr "Warteschlange"
#. module: survey
#: field:survey,page_ids:0
diff --git a/addons/thunderbird/i18n/pl.po b/addons/thunderbird/i18n/pl.po
new file mode 100644
index 00000000000..3d765bd002f
--- /dev/null
+++ b/addons/thunderbird/i18n/pl.po
@@ -0,0 +1,87 @@
+# 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-26 06:05+0000\n"
+"PO-Revision-Date: 2010-08-22 05:50+0000\n"
+"Last-Translator: OpenERP Administrators \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-08-23 04:02+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,copy_to:0
+msgid "Copy To"
+msgstr "Kopia do"
+
+#. module: thunderbird
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
+"specjalnych !"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,description:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,reference:0
+msgid "Reference"
+msgstr "Odniesienie"
+
+#. module: thunderbird
+#: model:ir.model,name:thunderbird.model_tinythunderbird_partner
+msgid "Thunderbid mails"
+msgstr ""
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,attachments:0
+msgid "Attached Files"
+msgstr "Załączone pliki"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,res_user_id:0
+msgid "User"
+msgstr "Użytkownik"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,receiver:0
+msgid "Receiver"
+msgstr "Odbiorca"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,title:0
+msgid "Subject"
+msgstr "Temat"
+
+#. module: thunderbird
+#: code:addons/thunderbird/partner/partner.py:0
+#, python-format
+msgid "Archive"
+msgstr "Archiwum"
+
+#. module: thunderbird
+#: model:ir.module.module,shortdesc:thunderbird.module_meta_information
+msgid "Thunderbird Interface"
+msgstr "Interfejs Thunderbird"
+
+#. module: thunderbird
+#: field:tinythunderbird.partner,sender:0
+msgid "Sender"
+msgstr "Nadawca"
diff --git a/addons/warning/i18n/tr.po b/addons/warning/i18n/tr.po
index e65e62f7fa9..2a97804876d 100644
--- a/addons/warning/i18n/tr.po
+++ b/addons/warning/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:50+0000\n"
+"PO-Revision-Date: 2010-08-22 06:02+0000\n"
"Last-Translator: Fabien (Open ERP) \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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: warning
diff --git a/addons/wiki/i18n/tr.po b/addons/wiki/i18n/tr.po
index fe6dfdb2450..de4623087f8 100644
--- a/addons/wiki/i18n/tr.po
+++ b/addons/wiki/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:52+0000\n"
+"PO-Revision-Date: 2010-08-22 06:04+0000\n"
"Last-Translator: adsiz_1029@hotmail.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-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-23 04:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: wiki
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index d21b8f9e9cd..a22267bd52a 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -185,6 +185,7 @@
tree,form
+ Wiki Pages allows you to share ideas and questions with your coworkers. You can create a new document that can be link to one or several applications (CRM, Sales, etc.). You can use keywords to ease access to your wiki pages. There is a basic wiki editing for text format.
|