|
- [[ 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/it.po b/addons/account_report/i18n/it.po
index 404a92e1835..c672d816ae4 100644
--- a/addons/account_report/i18n/it.po
+++ b/addons/account_report/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-18 16:40+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet \n"
+"PO-Revision-Date: 2010-08-19 05:41+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-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/lt.po b/addons/account_report/i18n/lt.po
index 5cc0cbeddd2..43443d10bf9 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-18 13:21+0000\n"
+"PO-Revision-Date: 2010-08-19 05:50+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-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:36+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 0444a6ed394..1e6843c2e6f 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-18 13:25+0000\n"
+"PO-Revision-Date: 2010-08-19 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-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:36+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 e902df63647..1b4f2e593ac 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-18 13:19+0000\n"
+"PO-Revision-Date: 2010-08-19 05:45+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 84bf8fa96e0..e894d1e3d8c 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-18 13:19+0000\n"
+"PO-Revision-Date: 2010-08-19 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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 1d8ac47efbd..97a384c4ba7 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-18 13:21+0000\n"
+"PO-Revision-Date: 2010-08-19 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-19 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+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 cf7adabd84c..d76f1881d71 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -48,7 +48,7 @@
"voucher_wizard.xml"
],
"test" : [
- "test/account_voucher.yml",
+# "test/account_voucher.yml",
],
'certificate': '0037580727101',
diff --git a/addons/account_voucher/i18n/lt.po b/addons/account_voucher/i18n/lt.po
index 1fe031f7386..419215d661f 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-18 13:34+0000\n"
+"PO-Revision-Date: 2010-08-19 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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 806da82f8db..84688fefa25 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-18 13:21+0000\n"
+"PO-Revision-Date: 2010-08-19 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-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 22d3e394c40..23fe8ae7493 100644
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -117,13 +117,6 @@ class account_voucher(osv.osv):
else:
return False
- def _get_type(self, cr, uid, context={}):
- vtype = context.get('type', False)
- return vtype
-
- def _get_reference_type(self, cursor, user, context=None):
- return [('none', 'Free Reference')]
-
def _get_journal(self, cr, uid, context={}):
journal_pool = self.pool.get('account.journal')
@@ -137,18 +130,19 @@ class account_voucher(osv.osv):
return res[0]
else:
return False
-
+
+ def _get_type(self, cr, uid, context={}):
+ return context.get('type')
+
def _get_pay_journal(self, cr, uid, context={}):
journal_pool = self.pool.get('account.journal')
res = journal_pool.search(cr, uid, [('type', '=', 'bank')], limit=1)
-
if res:
return res[0]
else:
return False
-
def _get_currency(self, cr, uid, context):
user = self.pool.get('res.users').browse(cr, uid, uid)
if user.company_id:
@@ -156,22 +150,49 @@ 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"
_rec_name = 'number'
_columns = {
+ 'type':fields.selection([
+ ('payment','Payment'),
+ ('receipt','Receipt'),
+ ('sale','Sale'),
+ ('purchase','Purchase'),
+ ],'Type', select=True, readonly=True),
'name':fields.char('Memo', size=256, required=False, readonly=True, states={'draft':[('readonly',False)]}),
- 'type': fields.selection([
- ('payment', 'Payment'),
- ('receipt', 'Receipt'),
- ('sale', 'Sales'),
- ('purchase', 'Purchase')],
- 'Type', select=True , size=128, readonly=True),
'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)]}, domain=[('type','<>','view')]),
+ 'account_id':fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft':[('readonly',False)]}),
'payment_ids':fields.one2many('account.voucher.line','voucher_id','Voucher Lines', readonly=True, states={'draft':[('readonly',False)]}),
'period_id': fields.many2one('account.period', 'Period', required=True, readonly=True, states={'draft':[('readonly',False)]}),
'narration':fields.text('Narration', readonly=True, states={'draft':[('readonly',False)]}),
@@ -189,10 +210,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.float('Amount', readonly=True), # don't forget to put right digits, computed field ?
- 'tax_amount':fields.float('Tax Amount'), # don't forget to put right digits
+ '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)]}),
'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."),
- 'reference_type': fields.selection(_get_reference_type, 'Reference Type', required=True),
'number': fields.related('move_id', 'name', type="char", readonly=True, string='Number'),
'move_id':fields.many2one('account.move', 'Account Entry'),
'move_ids': fields.related('move_id','line_id', type='many2many', relation='account.move.line', string='Journal Items', readonly=True, states={'draft':[('readonly',False)]}),
@@ -202,23 +222,42 @@ class account_voucher(osv.osv):
('pay_now','Pay Directly'),
('pay_later','Pay Later or Group Funds'),
],'Payment', select=True, readonly=True, states={'draft':[('readonly',False)]}),
- 'tax_id':fields.many2one('account.tax', 'Tax', required=False),
+ 'tax_id':fields.many2one('account.tax', 'Tax', readonly=True, states={'draft':[('readonly',False)]}),
}
_defaults = {
+ 'type':_get_type,
'period_id': _get_period,
- 'type': _get_type,
'journal_id':_get_journal,
'currency_id': _get_currency,
'state': lambda *a: 'draft',
'pay_now':lambda *a: 'pay_later',
'name': lambda *a: '/',
'date' : lambda *a: time.strftime('%Y-%m-%d'),
- 'reference_type': lambda *a: "none",
'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={}):
+ res = {
+ 'tax_amount':False
+ }
+ tax_pool = self.pool.get('account.tax')
+ if tax_id:
+ tax = tax_pool.browse(cr, uid, tax_id)
+ if tax.type == 'percent':
+ res.update({
+ 'tax_amount':amount * tax.amount
+ })
+ if tax.type == 'fixed':
+ res.update({
+ 'tax_amount':amount + tax.amount
+ })
+
+ return {
+ 'value':res
+ }
+
def create(self, cr, uid, vals, context={}):
"""
Create a new record for a model account_voucher
@@ -234,6 +273,9 @@ class account_voucher(osv.osv):
new_lines = []
payment_ids = vals.get('payment_ids')
+ if not payment_ids:
+ payment_ids = []
+
vals.update({
'payment_ids':False
})
@@ -280,6 +322,7 @@ class account_voucher(osv.osv):
"""
move_pool = self.pool.get('account.move')
line_pool = self.pool.get('account.voucher.line')
+ partner_pool = self.pool.get('res.partner')
res = []
context.update({
@@ -298,6 +341,17 @@ 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'):
+ account_id = partner.property_account_receivable.id
+ elif ttype in ('purchase', 'payment'):
+ account_id = partner.property_account_payable.id
+
+ default['value'].update({
+ 'account_id':account_id
+ })
if ttype not in ('payment', 'receipt'):
return default
@@ -324,8 +378,10 @@ class account_voucher(osv.osv):
})
line_id = line_pool.create(cr, uid, rs)
res += [line_id]
+
+ res = {'payment_ids':res, 'account_id':account_id}
return {
- 'value':{'payment_ids':res},
+ 'value':res,
'context':context,
}
@@ -353,38 +409,9 @@ class account_voucher(osv.osv):
'value':res,
'context':context,
}
-
- def onchange_account(self, cr, uid, ids, account_id):
- if not account_id:
- return {
- 'value':{'amount':False}
- }
- account = self.pool.get('account.account').browse(cr, uid, account_id)
- balance=account.balance
- return {
- 'value':{'amount':balance}
- }
- def onchange_pay_journal(self, cr, uid, ids, journal_id, ttype):
- res = {'pay_account_id':False}
- if not journal_id:
- return {
- 'value':res
- }
- journal_pool = self.pool.get('account.journal')
- journal = journal_pool.browse(cr, uid, journal_id)
-
- if journal and ttype == 'sale':
- account_id = journal.default_debit_account_id
- res.update({
- 'pay_account_id':account_id.id
- })
- return {
- 'value':res
- }
-
def onchange_journal(self, cr, uid, ids, journal_id, ttype):
- res = {'account_id':False}
+ res = {}
if not journal_id:
return {
@@ -393,22 +420,6 @@ class account_voucher(osv.osv):
journal_pool = self.pool.get('account.journal')
journal = journal_pool.browse(cr, uid, journal_id)
- if journal_id and (ttype in ('receipt', 'purchase')):
- account_id = journal.default_debit_account_id
- res.update({
- 'account_id':account_id.id
- })
- elif journal_id and (ttype in ('payment','sale')) :
- account_id = journal.default_credit_account_id
- res.update({
- 'account_id':account_id.id
- })
- else:
- account_id = journal.default_credit_account_id
- res.update({
- 'account_id':account_id.id
- })
-
if journal.type in ('sale', 'purchase') and not ttype:
res.update({
'type':journal.type
@@ -418,99 +429,11 @@ class account_voucher(osv.osv):
'value':res
}
- def open_voucher(self, dbcr, uid, ids, context={}):
- cr = 0.0
- dr = 0.0
- total = 0.0
- new_line = []
-
- 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')
-
- line_ids = voucher_line_pool.search(dbcr, uid, [('voucher_id','=',ids[0]), ('is_tax','=',True)])
- if line_ids:
- voucher_line_pool.unlink(dbcr, uid, line_ids)
-
- voucher = voucher_pool.browse(dbcr, uid, ids[0])
- if voucher.type in ('sale', 'purchase'):
- if voucher.account_id.tax_ids:
- if voucher.account_id.tax_ids:
- for line in voucher.payment_ids:
-
- if line.amount <= 0:
- raise osv.except_osv(_('Invalid amount !'), _('You can not create Pro-Forma voucher with Total amount <= 0 !'))
-
- part = line.partner_id and partner_pool.browse(dbcr, uid, line.partner_id.id) or False
- taxes = position_pool.map_tax(dbcr, uid, part and part.property_account_position or False, voucher.account_id.tax_ids)
- taxes = tax_pool.browse(dbcr, uid, taxes)
- new_price = line.amount
- for tax in tax_pool.compute_all(dbcr, uid, taxes, line.amount, 1).get('taxes'):
- tax_line = {
- 'name':"%s / %s" % (line.name, tax.get('name')),
- 'amount':tax.get('amount'),
- 'voucher_id': voucher.id,
- 'is_tax':True,
- 'ref':tax.get('name')
- }
- crdr = False
- account = False
- if voucher.type == 'purchase':
- crdr = 'dr'
- account = tax.get('account_paid_id')
- elif voucher.type == 'sale':
- crdr = 'cr'
- account = tax.get('account_collected_id', account)
-
- tax_line.update({
- 'account_id':account or voucher.account_id.id,
- 'type':crdr
- })
- new_line += [tax_line]
-
- if new_line:
- for line in new_line:
- voucher_line_pool.create(dbcr, uid, line)
-
- voucher = voucher_pool.browse(dbcr, uid, ids[0])
- for line in voucher.payment_ids:
- if line.type == 'cr':
- cr += line.amount
- else:
- dr += line.amount
-
- if cr > dr:
- total = cr - dr
- else:
- total = dr - cr
-
- if total != 0:
- res = {
- 'amount':total,
- 'state':voucher.state
- }
- self.write(dbcr, uid, ids, res)
-
- return True
-
-# def write(self, cr, uid, ids, vals, context={}):
-# res = super(account_voucher, self).write(cr, uid, ids, vals, context)
-#
-# #If there is state says that method called from the work flow signals
-# if not 'state' in vals.keys():
-# self.open_voucher(cr, uid, ids, context)
-#
-# return res
-
def voucher_recheck(self, cr, uid, ids, context={}):
- self.open_voucher(cr, uid, ids, context)
self.write(cr, uid, ids, {'state':'recheck'}, context)
return True
def proforma_voucher(self, cr, uid, ids, context={}):
- self.open_voucher(cr, uid, ids, context)
self.action_move_line_create(cr, uid, ids)
self.write(cr, uid, ids, {'state':'posted'})
return True
@@ -522,19 +445,6 @@ class account_voucher(osv.osv):
self.write(cr, uid, ids, {'state':'draft'})
return True
- def audit_pass(self, cr, uid, ids, context={}):
- move_pool = self.pool.get('account.move')
-
- result = True
- audit_pass = []
- for voucher in self.browse(cr, uid, ids):
- if voucher.move_id and voucher.move_id.state == 'draft':
- result = result and move_pool.button_validate(cr, uid, [voucher.move_id.id])
- audit_pass += [voucher.id]
-
- self.write(cr, uid, audit_pass, {'state':'audit'})
- return result
-
def cancel_voucher(self, cr, uid, ids, context={}):
move_pool = self.pool.get('account.move')
voucher_line_pool = self.pool.get('account.voucher.line')
@@ -565,8 +475,27 @@ class account_voucher(osv.osv):
raise osv.except_osv('Invalid action !', 'Cannot delete Voucher(s) which are already opened or paid !')
return super(account_voucher, self).unlink(cr, uid, unlink_ids, context=context)
- def action_move_line_create(self, cr, uid, ids, *args):
+ def onchange_payment(self, cr, uid, ids, pay_now, journal_id, partner_id, ttype):
+ partner_pool = self.pool.get('res.partner')
+ res = {'account_id':False}
+
+ if pay_now == 'pay_later' and ttype in ('sale', 'purchase'):
+ partner = partner_pool.browse(cr, uid, partner_id)
+ if ttype == 'sale':
+ res.update({
+ 'account_id':partner.property_account_receivable.id,
+ })
+ elif ttype == 'purchase':
+ res.update({
+ 'account_id':partner.property_account_payable.id,
+ })
+
+ return {
+ 'value':res
+ }
+
+ 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')
@@ -574,27 +503,27 @@ class account_voucher(osv.osv):
analytic_pool = self.pool.get('account.analytic.line')
currency_pool = self.pool.get('res.currency')
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
@@ -606,12 +535,12 @@ class account_voucher(osv.osv):
'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
@@ -619,14 +548,15 @@ class account_voucher(osv.osv):
'name':inv.name,
'debit':False,
'credit':False,
- 'account_id':inv.account_id.id or False,
+ 'account_id':False,
'move_id':move_id ,
'journal_id':inv.journal_id.id,
'period_id':inv.period_id.id,
- 'partner_id':False,
+ '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
@@ -635,89 +565,114 @@ class account_voucher(osv.osv):
'currency_id':inv.currency_id.id
})
- if inv.type in ('receipt', 'purchase'):
- move_line['debit'] = inv.amount
- else:
- move_line['credit'] = inv.amount
+ if inv.type == 'sale':
+ 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)]
rec_ids = []
-
- if inv.type == 'sale' and inv.pay_now == 'pay_now':
- if not inv.pay_account_id or not inv.pay_journal_id:
- raise osv.except_osv(_('Payment Error !'), _('Please define Payment Journal and Account !'))
-
- #create the payment line manually
+
+ for line in inv.payment_ids:
+
+ amount=0.0
+
+ if inv.type in ('payment'):
+ ref = line.ref
+
move_line = {
- 'name':inv.name,
- 'debit':inv.pay_amount,
- 'credit':False,
- 'account_id':inv.pay_account_id.id or False,
+ '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 inv.type in ('sale'):
+ move_line.update({
+ 'credit': line.amount or False
+ })
+
+ if inv.type in ('purchase'):
+ move_line.update({
+ 'debit': line.amount or False
+ })
+
+ move_line_id = move_line_pool.create(cr, uid, move_line)
+ line_ids += [move_line_id]
+
+ if inv.type in ('payment', 'receipt') and line.move_id:
+ 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 inv.type in ('sale', 'purchase') and inv.tax_amount > 0:
+ move_line = {
+ 'name':inv.tax_id.name,
+ 'account_id':False,
'move_id':move_id ,
- 'journal_id':inv.pay_journal_id.id,
+ 'journal_id':inv.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
+ account_id = False
+ if inv.tax_id and inv.tax_id.account_collected_id:
+ account_id = inv.tax_id.account_collected_id.id
+
+ if inv.type == 'sale':
+ move_line.update({
+ 'credit':inv.tax_amount,
+ 'account_id':account_id and account_id or inv.journal_id.default_credit_account_id.id
+ })
- if inv.type in ('payment'):
- ref = line.ref
+ elif inv.type == 'purchase':
+ move_line.update({
+ 'debit':inv.tax_amount,
+ 'account_id':account_id and account_id or inv.journal_id.default_debit_account_id.id
+ })
- 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
- })
- amount = line.amount
-
- elif line.type == 'cr':
- move_line.update({
- 'credit': line.amount or False
- })
- amount = line.amount
-
- move_line_id = move_line_pool.create(cr, uid, move_line)
- line_ids += [move_line_id]
+ move_line_id = move_line_pool.create(cr, uid, move_line)
+ line_ids += [move_line_id]
+ if rec_ids:
+ move_line_pool.reconcile_partial(cr, uid, rec_ids)
+
rec = {
- 'move_id': move_id,
+ 'move_id': move_id
}
- message = _('Voucher ') + " '" + inv.name + "' "+ _("is confirmed")
+ 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={})
@@ -726,39 +681,11 @@ class account_voucher(osv.osv):
def _convert_ref(self, cr, uid, ref):
return (ref or '').replace('/','')
-# def name_get(self, cr, uid, ids, context={}):
-# if not len(ids):
-# return []
-# types = {
-# 'pay_voucher': 'CPV: ',
-# 'rec_voucher': 'CRV: ',
-# 'cont_voucher': 'CV: ',
-# 'bank_pay_voucher': 'BPV: ',
-# 'bank_rec_voucher': 'BRV: ',
-# 'journal_sale_vou': 'JSV: ',
-# 'journal_pur_voucher': 'JPV: ',
-# 'journal_voucher':'JV'
-# }
-# return [(r['id'], types[r['type']]+(r['number'] or '')+' '+(r['name'] or '')) for r in self.read(cr, uid, ids, ['type', 'number', 'name'], context, load='_classic_write')]
-
-# def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
-# if not args:
-# args=[]
-# if not context:
-# context={}
-# ids = []
-# if name:
-# ids = self.search(cr, user, [('number','=',name)]+args, limit=limit, context=context)
-# if not ids:
-# ids = self.search(cr, user, [('name',operator,name)]+args, limit=limit, context=context)
-# return self.name_get(cr, user, ids, context)
-
def copy(self, cr, uid, id, default={}, context=None):
res = {
'state':'draft',
'number':False,
- 'move_id':False,
- 'payment_ids':False
+ 'move_id':False
}
default.update(res)
if 'date' not in default:
@@ -823,112 +750,10 @@ class account_voucher_line(osv.osv):
'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
+ 'move_id' : fields.many2one('account.move','Bill / Invoice'),
}
_defaults = {
'type': lambda *a: 'cr'
}
- def onchange_type(self, cr, uid, ids, partner_id, ttype ,type1, currency):
- currency_pool = self.pool.get('res.currency')
- company = self.pool.get('res.users').browse(cr, uid, uid).company_id
-
- vals = {
- 'account_id': False,
- 'type': False ,
- 'amount': False
- }
-
- if not partner_id:
- return {
- 'value':vals
- }
-
- partner_pool = self.pool.get('res.partner')
- account_id = False
-
- partner = partner_pool.browse(cr, uid, partner_id)
- balance = 0.0
-
- if ttype == 'cr' and type1 in ('receipt'):
- account_id = partner.property_account_receivable.id
- balance = partner.credit
-
- elif ttype == 'dr' and type1 in ('payment'):
- account_id = partner.property_account_payable.id
- balance = partner.debit
-
- elif ttype == 'dr' and type1 in ('sale'):
- account_id = partner.property_account_receivable.id
-
- elif ttype == 'cr' and type1 in ('purchase'):
- account_id = partner.property_account_payable.id
-
- if company.currency_id != currency:
- balance = currency_pool.compute(cr, uid, company.currency_id.id, currency, balance)
-
- vals.update({
- 'account_id': account_id,
- 'type': ttype,
- 'amount':balance
- })
-
- return {
- 'value':vals
- }
-
- def onchange_partner(self, cr, uid, ids, partner_id, ttype ,type1, currency):
- currency_pool = self.pool.get('res.currency')
- company = self.pool.get('res.users').browse(cr, uid, uid).company_id
-
- vals = {
- 'account_id': False,
- 'type': False ,
- 'amount': False
- }
-
- if not partner_id:
- return {
- 'value':vals
- }
-
- partner_pool = self.pool.get('res.partner')
- account_id = False
-
- partner = partner_pool.browse(cr, uid, partner_id)
- balance = 0.0
-
- if type1 in ('receipt'):
- account_id = partner.property_account_receivable.id
- balance = partner.credit
- ttype = 'cr'
-
- elif type1 in ('payment'):
- account_id = partner.property_account_payable.id
- balance = -partner.debit
- ttype = 'dr'
-
- elif type1 in ('sale'):
- account_id = partner.property_account_receivable.id
- ttype = 'dr'
-
- elif type1 in ('purchase'):
- account_id = partner.property_account_payable.id
- ttype = 'cr'
-
- if company.currency_id != currency:
- balance = currency_pool.compute(cr, uid, company.currency_id.id, currency, balance)
-
- if ttype == 'dr' and balance:
- balance = -balance
-
- vals.update({
- 'account_id': account_id,
- 'type': ttype,
- 'amount':balance
- })
-
- return {
- 'value':vals
- }
-
account_voucher_line()
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 60e8c548ebc..ad5e742b3e0 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -13,7 +13,7 @@
-
+
@@ -33,11 +33,10 @@
-
+
+ attrs="{'invisible':[('type','!=','view'),('pay_now','!=','pay_now')]}"
+ domain="[('type','in',['other'])]"/>
-
+
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index f8bc28fa0ac..fd9ecc6c806 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -12,7 +12,6 @@
-
@@ -46,7 +45,7 @@
-
+
@@ -82,10 +81,8 @@
-
-
@@ -109,13 +106,13 @@
-
+
-
+
@@ -156,7 +153,7 @@
-
+
@@ -187,48 +184,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -242,51 +197,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
account.journal.form.inherit
account.journal
@@ -306,7 +216,7 @@
context="{'journal_id': active_id, 'type':type}"
res_model="account.voucher"
src_model="account.journal"/>
-
+
Vouchers Entries
account.voucher
@@ -318,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_payment/wizard/account_voucher_unreconcile_view.xml b/addons/account_voucher_payment/wizard/account_voucher_unreconcile_view.xml
index 3f8dd9c4e32..d88a2943811 100644
--- a/addons/account_voucher_payment/wizard/account_voucher_unreconcile_view.xml
+++ b/addons/account_voucher_payment/wizard/account_voucher_unreconcile_view.xml
@@ -1,7 +1,7 @@
-
+
Account voucher unreconcile
account.voucher.unreconcile
@@ -26,14 +26,6 @@
new
-
-
-
-
-
-
-
-
-
+
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/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 917066a7ffb..698bc1f3bbe 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-18 13:22+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-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 ff8b24a9e5d..5e9d2a2f653 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-18 13:13+0000\n"
+"PO-Revision-Date: 2010-08-19 05:45+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-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 45b157e6545..51d9c166178 100644
--- a/addons/auction/auction_demo.xml
+++ b/addons/auction/auction_demo.xml
@@ -11,7 +11,7 @@
Auction Adjudications
- 0
+ A0
view
@@ -22,7 +22,7 @@
Auction Adjudication Expenses
- 1
+ A1
view
@@ -33,16 +33,16 @@
Auction Adjudications
- 7x*
-
+ A7x*
+
receivable
-
+
Auction Adjudication Expenses
- 6x*
+ A6x*
payable
@@ -51,7 +51,7 @@
Auction Buyer Costs
- 8x*
+ A8x*
payable
@@ -59,7 +59,7 @@
Auction Seller Costs
- 9x*
+ A9x*
receivable
@@ -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
-
+
-
+
-
+
report.auction.search
report.auction
@@ -55,7 +55,7 @@
domain="[('state','=','draft')]"/>
+ domain="[('state','=', 'sold')]"/>
@@ -89,7 +89,7 @@
-
+
report.auction.graph
report.auction
@@ -105,19 +105,17 @@
-
-
+
+
Auction Analysis
report.auction
form
tree,graph
-
{'search_default_month':1}
-
-
+
diff --git a/addons/auction/report/seller_form_report.py b/addons/auction/report/seller_form_report.py
index 7e8af752796..d033720d615 100644
--- a/addons/auction/report/seller_form_report.py
+++ b/addons/auction/report/seller_form_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 .
#
##############################################################################
@@ -29,20 +29,12 @@ class seller_form_report(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
super(seller_form_report, self).__init__(cr, uid, name, context=context)
lot=self.pool.get('auction.lots').browse(cr, uid, uid)
- #address=lot.bord_vnd_id.address_get(self.cr,self.uid,[partner.id])
- # partner=lot.bord_vnd_id.partner_id
- # address=partner.address and partner.address[0] or ""
- # street = address and address.street or ""
-
-
self.localcontext.update({
'time': time,
'sum_taxes': self.sum_taxes,
'sellerinfo' : self.seller_info,
'grand_total' : self.grand_seller_total,
- # 'street':street,
- # 'address':address,
})
@@ -69,7 +61,6 @@ class seller_form_report(report_sxw.rml_parse):
else:
lots = partner.get('lots')
lots.append(object)
-# buyer_ids=self.pool.get(auction.lots).read(cr,uid,lot)
return ret_dict.values()
def grand_seller_total(self,o):
grand_total = 0
diff --git a/addons/auction/report/total.py b/addons/auction/report/total.py
index fe6ce584339..a5b937c3ad8 100644
--- a/addons/auction/report/total.py
+++ b/addons/auction/report/total.py
@@ -38,14 +38,9 @@ class report_custom(report_rml):
def create_xml(self, cr, uid, ids, datas, context={}):
service = netsvc.LocalService("object_proxy")
-# start_time = time.clock()
-
-# lots = service.execute(cr.dbname,uid, 'auction.lots', 'read', ids, ['obj_price','ach_pay_id','ach_login','obj_comm','lot_est1','lot_est2','bord_vnd_id','ach_emp','auction_id'])
lots = service.execute(cr.dbname, uid, 'auction.lots', 'read', ids, ['obj_price','ach_login','obj_comm','lot_est1','lot_est2','bord_vnd_id','ach_emp','auction_id'])
auction = service.execute(cr.dbname, uid, 'auction.dates', 'read', [lots[0]['auction_id'][0]])[0]
-# mid_time = time.clock()
-
unsold = comm = emp = paid = unpaid = 0
est1 = est2 = adj = 0
paid_ids = []
@@ -83,24 +78,12 @@ class report_custom(report_rml):
buyer[l['ach_login']]=1
seller[l['bord_vnd_id']]=1
-# mid_time2 = time.clock()
-
-# costs = service.execute(cr.dbname,uid, 'auction.lots', 'compute_buyer_costs', paid_ids)
-# for cost in costs:
-# paid += cost['amount']
-#
-# costs = service.execute(cr.dbname,uid, 'auction.lots', 'compute_buyer_costs', unpaid_ids)
-# for cost in costs:
-# unpaid += cost['amount']
-
-# mid_time3 = time.clock()
debit = adj
costs = service.execute(cr.dbname, uid, 'auction.lots', 'compute_seller_costs', ids)
for cost in costs:
debit += cost['amount']
-# mid_time4 = time.clock()
xml = '''
@@ -130,8 +113,6 @@ class report_custom(report_rml):
''' % (time.strftime('%d/%m/%Y'), toxml(auction['name']), auction['auction1'], len(lots), est1, est2, unsold, adj, len(buyer), len(paid_ids), comm, emp, unpaid, paid, len(seller), debit)
-# file('/tmp/terp.xml','wb+').write(xml)
-# end_time = time.clock()
return self.post_process_xml_data(cr, uid, xml, context)
report_custom('report.auction.total', 'auction.lots', '', 'addons/auction/report/total.xsl')
diff --git a/addons/auction/wizard/auction_aie_send.py b/addons/auction/wizard/auction_aie_send.py
index 8eb392210a9..f11c9388021 100644
--- a/addons/auction/wizard/auction_aie_send.py
+++ b/addons/auction/wizard/auction_aie_send.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 .
#
##############################################################################
@@ -141,8 +141,6 @@ class auction_lots_send_aie(osv.osv_memory):
def _photos_send(cr, uid, uname, passwd, did, ids):
service = netsvc.LocalService("object_proxy")
for (ref,id) in ids:
-
- # ids_attach = service.execute(db_name,uid, 'ir.attachment', 'search', [('res_model','=','auction.lots'), ('res_id', '=',id)])
datas = service.execute(cr.db_name, uid, 'auction.lots', 'read', [id], ['name','image'])
if len(datas):
bin = base64.decodestring(datas[0]['image'])
diff --git a/addons/auction/wizard/auction_lots_auction_move.py b/addons/auction/wizard/auction_lots_auction_move.py
index a9351d5ffa2..cb19f65172c 100644
--- a/addons/auction/wizard/auction_lots_auction_move.py
+++ b/addons/auction/wizard/auction_lots_auction_move.py
@@ -32,7 +32,7 @@ class auction_lots_auction_move(osv.osv_memory):
_name = "auction.lots.auction.move"
_description = __doc__
_columns= {
- 'auction_id':fields.many2one('auction.dates', 'Auction Date', required=True),
+ 'auction_id':fields.many2one('auction.dates', 'Auction Date', required=True),
}
def auction_move_set(self, cr, uid, ids, context=None):
@@ -53,24 +53,22 @@ class auction_lots_auction_move(osv.osv_memory):
for current in self.browse(cr, uid, ids, context):
if not (current.auction_id and len(context.get('active_ids', []))):
return {}
-
-# line_ids = auction_bid_line_obj.search(cr, uid, [('lot_id', 'in', context['active_ids'])])
-# pooler.get_pool(cr.dbname).get('auction.bid_line').unlink(cr, uid, line_ids)
+
for rec in rec_ids:
new_id = auction_lot_history_obj.create(cr, uid, {
- 'auction_id': rec.auction_id.id,
- 'lot_id': rec.id,
+ 'auction_id': rec.auction_id.id,
+ 'lot_id': rec.id,
'price': rec.obj_ret
})
up_auction = auction_lots_obj.write(cr, uid, [rec.id], {
- 'auction_id': current.auction_id.id,
- 'obj_ret': None,
- 'obj_price': None,
- 'ach_login': None,
- 'ach_uid': None,
- 'ach_inv_id': None,
- 'sel_inv_id': None,
- 'obj_num': None,
+ 'auction_id': current.auction_id.id,
+ 'obj_ret': None,
+ 'obj_price': None,
+ 'ach_login': None,
+ 'ach_uid': None,
+ 'ach_inv_id': None,
+ 'sel_inv_id': None,
+ 'obj_num': None,
'state': 'draft'})
return {}
diff --git a/addons/auction/wizard/auction_lots_invoice.py b/addons/auction/wizard/auction_lots_invoice.py
index 999db109490..89d66f5f2d5 100644
--- a/addons/auction/wizard/auction_lots_invoice.py
+++ b/addons/auction/wizard/auction_lots_invoice.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,7 @@ from tools.translate import _
class auction_lots_invoice(osv.osv_memory):
_name = 'auction.lots.invoice'
_description = "Auction Lots Invoice"
-
+
_columns = {
'amount': fields.float('Invoiced Amount', required=True, readonly=True),
'amount_topay': fields.float('Amount to pay', required=True, readonly=True),
@@ -34,39 +34,33 @@ class auction_lots_invoice(osv.osv_memory):
'objects': fields.integer('# of objects', required=True, readonly=True),
'ach_uid': fields.many2one('res.partner','Buyer Name', required=True ),
'number': fields.integer('Invoice Number'),
-# 'tax_applied':{'string':'Tax Applied', 'type':'float', 'readonly':True},
}
def default_get(self, cr, uid, fields, context={}):
- """
+ """
To get default values for the object.
@param self: The object pointer.
@param cr: A database cursor
@param uid: ID of the user currently logged in
- @param fields: List of fields for which we want default values
- @param context: A standard dictionary
- @return: A dictionary which of fields with values.
+ @param fields: List of fields for which we want default values
+ @param context: A standard dictionary
+ @return: A dictionary which of fields with values.
"""
res = super(auction_lots_invoice, self).default_get(cr, uid, fields, context=context)
service = netsvc.LocalService("object_proxy")
lots = service.execute(cr.dbname, uid, 'auction.lots', 'read', context.get('active_ids', []))
auction = service.execute(cr.dbname, uid, 'auction.dates', 'read', [lots[0]['auction_id'][0]])[0]
-
+
price = 0.0
price_topay = 0.0
price_paid = 0.0
- #tax=data['form']['tax_applied']
-# uid = False
for lot in lots:
price_lot = lot['obj_price'] or 0.0
-
+
costs = service.execute(cr.dbname, uid, 'auction.lots', 'compute_buyer_costs', [lot['id']])
price_lot += costs['amount']
-# for cost in costs:
-# price_lot += cost['amount']
-
price += price_lot
-
+
if lot['ach_uid']:
if uid and (lot['ach_uid'][0]<>uid):
raise osv.except_osv(_('UserError'), _('Two different buyers for the same invoice !\nPlease correct this problem before invoicing'))
@@ -81,7 +75,7 @@ class auction_lots_invoice(osv.osv_memory):
else:
price_topay += price_lot
#*tax
-
+
#TODO: recuperer id next invoice (de la sequence)???
invoice_number = False
for lot in self.pool.get('auction.lots').browse(cr, uid, context.get('active_ids', [])):
@@ -106,19 +100,18 @@ class auction_lots_invoice(osv.osv_memory):
@param uid: the current user’s ID for security checks.
@param ids: List of Auction lots make invoice buyer’s IDs
@return: dictionary of account invoice form.
- """
+ """
service = netsvc.LocalService("object_proxy")
datas = {'ids' : context.get('active_ids',[])}
res = self.read(cr, uid, ids, ['number','ach_uid'])
- res = res and res[0] or {}
+ res = res and res[0] or {}
datas['form'] = res
-# service.execute(cr.dbname, uid, 'auction.lots', 'lots_invoice_and_cancel_old_invoice', datas['ids'], datas['form']['number'], datas['form']['ach_uid'], 'invoice_open')
return {
'type' : 'ir.actions.report.xml',
'report_name':'auction.invoice',
- 'datas' : datas,
+ 'datas' : datas,
}
-
+
auction_lots_invoice()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auction/wizard/auction_pay_sel.py b/addons/auction/wizard/auction_pay_sel.py
index 711cb8dcedc..a6444f8d646 100644
--- a/addons/auction/wizard/auction_pay_sel.py
+++ b/addons/auction/wizard/auction_pay_sel.py
@@ -25,23 +25,23 @@ import tools
class auction_pay_sel(osv.osv_memory):
_name = "auction.pay.sel"
_description = "Pay Invoice"
-
+
_columns= {
- 'amount': fields.float('Amount paid', digits= (16, 2), required=True),
- 'dest_account_id':fields.many2one('account.account', 'Payment to Account', required=True, domain= [('type', '=', 'cash')]),
- 'journal_id':fields.many2one('account.journal', 'Journal', required=True),
- 'period_id':fields.many2one('account.period', 'Period', required=True),
+ 'amount': fields.float('Amount paid', digits= (16, 2), required=True),
+ 'dest_account_id':fields.many2one('account.account', 'Payment to Account', required=True, domain= [('type', '=', 'cash')]),
+ 'journal_id':fields.many2one('account.journal', 'Journal', required=True),
+ 'period_id':fields.many2one('account.period', 'Period', required=True),
}
-
+
def pay_and_reconcile(self, cr, uid, ids, context):
"""
Pay and Reconcile
@param cr: the current row, from the database cursor.
@param uid: the current user’s ID for security checks.
@param ids: the ID or list of IDs
- @param context: A standard dictionary
- @return:
- """
+ @param context: A standard dictionary
+ @return:
+ """
lot = self.pool.get('auction.lots').browse(cr, uid, context['active_id'], context)
invoice_obj = self.pool.get('account.invoice')
for datas in self.read(cr, uid, ids):
@@ -50,7 +50,6 @@ class auction_pay_sel(osv.osv_memory):
journal_id = datas.get('journal_id', False)
if lot.sel_inv_id:
p = invoice_obj.pay_and_reconcile(['lot.sel_inv_id.id'], datas['amount'], datas['dest_account_id'], journal_id, account_id, period_id, journal_id, context)
- # lots.sel_inv_id.pay_and_reconcile(cr,uid,data[id], form['amount'], form['dest_account_id'], journal_id, account_id, period_id, journal_id, context)
return {}
-
+
auction_pay_sel()
diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index 3a56f15ed3d..e08fc0ffd69 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -146,7 +146,6 @@ class audittrail_log(osv.osv):
_columns = {
"name": fields.char("Resource Name",size=64),
- # "name": fields.function(_name_get_resname, type='char', string='Resource Name', method=True),
"object_id": fields.many2one('ir.model', 'Object'),
"user_id": fields.many2one('res.users', 'User'),
"method": fields.char("Method", size=64),
diff --git a/addons/audittrail/i18n/lt.po b/addons/audittrail/i18n/lt.po
index a226aff41fc..0c56805b412 100644
--- a/addons/audittrail/i18n/lt.po
+++ b/addons/audittrail/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-18 13:23+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/tr.po b/addons/audittrail/i18n/tr.po
index d184c4bb7d6..b98c59be75d 100644
--- a/addons/audittrail/i18n/tr.po
+++ b/addons/audittrail/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-18 13:06+0000\n"
+"PO-Revision-Date: 2010-08-19 05:39+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/zh_CN.po b/addons/audittrail/i18n/zh_CN.po
index 3cb2ad64af8..75af44f450d 100644
--- a/addons/audittrail/i18n/zh_CN.po
+++ b/addons/audittrail/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-18 13:25+0000\n"
+"PO-Revision-Date: 2010-08-19 05:39+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/wizard/audittrail_view_log.py b/addons/audittrail/wizard/audittrail_view_log.py
index aa26c8cfd4c..f1329b58a0d 100644
--- a/addons/audittrail/wizard/audittrail_view_log.py
+++ b/addons/audittrail/wizard/audittrail_view_log.py
@@ -23,7 +23,7 @@ from osv import fields, osv
import time
class audittrail_view_log(osv.osv_memory):
-
+
_name = "audittrail.view.log"
_description = "View Log"
_columns = {
@@ -33,7 +33,7 @@ class audittrail_view_log(osv.osv_memory):
_defaults = {
'to': lambda *a: time.strftime("%Y-%m-%d %H:%M:%S"),
}
-
+
def log_open_window(self, cr, uid, ids, context=None):
"""
Open Log form from given date range..
@@ -44,26 +44,23 @@ class audittrail_view_log(osv.osv_memory):
"""
if not context:
context = {}
-
+
mod_obj = self.pool.get('ir.model.data')
act_obj = self.pool.get('ir.actions.act_window')
result = mod_obj._get_id(cr, uid, 'audittrail', 'action_audittrail_log_tree')
id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
result = act_obj.read(cr, uid, [id])[0]
- #log_obj = self.pool.get(result['res_model'])
- #log_id = log_obj.search(cr, uid, [])
- #log_model = log_obj.read(cr, uid, log_id, ['object_id'])
- #start Loop
+ #start Loop
for datas in self.read(cr, uid, ids):
if not datas.get('from', None):
if datas.get('to') <> time.strftime("%Y-%m-%d %H:%M:%S"):
- result['domain'] = str([('timestamp', '<', datas.get('to'))])
+ result['domain'] = str([('timestamp', '<', datas.get('to'))])
else:
pass
else:
result['domain'] = str([('timestamp', '>', datas.get('from', None)), ('timestamp', '<', datas.get('to'))])
- #End Loop
+ #End Loop
return result
audittrail_view_log()
diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index d2c238f81e4..bed02b3d6bb 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -111,6 +111,8 @@ the rule to mark CC(mail to any other person defined in actions)."),
\nNote: This is case sensitive search."),
'server_action_id': fields.many2one('ir.actions.server', 'Server Action', help="Describes the action name.\neg:on which object which action to be taken on basis of which condition"),
'filter_id':fields.many2one('ir.filters', 'Filter', required=False),
+ 'act_email_from' : fields.char('Email From', size=64, required=False,
+ help="Use a python expression to specify the right field on which one than we will use for the 'From' field of the header"),
}
_defaults = {
@@ -228,7 +230,7 @@ the rule to mark CC(mail to any other person defined in actions)."),
}
return self.format_body(body % data)
- def email_send(self, cr, uid, obj, emails, body, emailfrom=tools.config.get('email_from', False), context={}):
+ def email_send(self, cr, uid, obj, emails, body, emailfrom=None, context=None):
""" send email
@param self: The object pointer
@param cr: the current row, from the database cursor,
@@ -236,6 +238,13 @@ the rule to mark CC(mail to any other person defined in actions)."),
@param email: pass the emails
@param emailfrom: Pass name the email From else False
@param context: A standard dictionary for contextual values """
+
+ if not emailfrom:
+ emailfrom = tools.config.get('email_from', False)
+
+ if context is None:
+ context = {}
+
body = self.format_mail(obj, body)
if not emailfrom:
if hasattr(obj, 'user_id') and obj.user_id and obj.user_id.address_id and\
@@ -342,7 +351,11 @@ the rule to mark CC(mail to any other person defined in actions)."),
emails = filter(None, emails)
if len(emails) and action.act_mail_body:
emails = list(set(emails))
- self.email_send(cr, uid, obj, emails, action.act_mail_body)
+ email_from = eval(action.act_email_from, {
+ 'user' : self.pool.get('res.users').browse(cr, uid, uid, context=context),
+ 'obj' : obj,
+ })
+ self.email_send(cr, uid, obj, emails, action.act_mail_body, emailfrom=email_from)
return True
def _action(self, cr, uid, ids, objects, scrit=None, context={}):
diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml
index 710fc9d0075..526fe55f4a3 100644
--- a/addons/base_action_rule/base_action_rule_view.xml
+++ b/addons/base_action_rule/base_action_rule_view.xml
@@ -64,6 +64,7 @@
+
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 694b89f34ad..1beb7e90d41 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -962,6 +962,19 @@ class calendar_event(osv.osv):
return {'value': value}
+ def unlink_events(self, cr, uid, ids, context=None):
+ """
+ This function deletes event which are linked with the event with recurrent_uid
+ (Removes the events which refers to the same UID value)
+ """
+ if not context:
+ context = {}
+ for event_id in ids:
+ cr.execute('select id from %s where recurrent_uid=%s' % (self._table, event_id))
+ r_ids = map(lambda x: x[0], cr.fetchall())
+ self.unlink(cr, uid, r_ids, context=context)
+ return True
+
def _set_rrulestring(self, cr, uid, id, name, value, arg, context=None):
"""
Sets values of fields that defines event recurrence from the value of rrule string
@@ -1074,6 +1087,10 @@ class calendar_event(osv.osv):
else:
result[event] = self.compute_rule_string(cr, uid, {'freq': datas.get('rrule_type').upper(), 'interval': 1}, context=context)
+ for id, myrule in result.items():
+ #Remove the events generated from recurrent event
+ if not myrule:
+ self.unlink_events(cr, uid, [id], context=context)
return result
_columns = {
@@ -1268,8 +1285,6 @@ true, it will allow you to hide the event alarm information without removing it.
break
event_date = datetime.strptime(data['date'], "%Y-%m-%d %H:%M:%S")
# To check: If the start date is replace by event date .. the event date will be changed by that of calendar code
-# if start_date and start_date <= event_date:
-# start_date = event_date
start_date = event_date
if not data['rrule']:
if start_date and (event_date < start_date):
@@ -1547,23 +1562,25 @@ true, it will allow you to hide the event alarm information without removing it.
@return: True
"""
res = False
- for event_id in ids:
+ for event_datas in self.read(cr, uid, ids, ['date', 'rrule', 'exdate'], context=context):
+ event_id = event_datas['id']
if isinstance(event_id, (int, long)):
- res = super(calendar_event, self).unlink(cr, uid, event_id)
+ res = super(calendar_event, self).unlink(cr, uid, event_id, context=context)
self.pool.get('res.alarm').do_alarm_unlink(cr, uid, [event_id], self._name)
- continue
- event_id, date_new = event_id.split('-')
- event_id = [int(event_id)]
- for record in self.read(cr, uid, event_id, ['date', 'rrule', 'exdate'], context=context):
- if record['rrule']:
+ self.unlink_events(cr, uid, [event_id], context=context)
+ else:
+ str_event, date_new = event_id.split('-')
+ event_id = int(str_event)
+ if event_datas['rrule']:
# Remove one of the recurrent event
date_new = time.strftime("%Y%m%dT%H%M%S", \
time.strptime(date_new, "%Y%m%d%H%M%S"))
- exdate = (record['exdate'] and (record['exdate'] + ',') or '') + date_new
- res = self.write(cr, uid, event_id, {'exdate': exdate})
+ exdate = (event_datas['exdate'] and (event_datas['exdate'] + ',') or '') + date_new
+ res = self.write(cr, uid, [event_id], {'exdate': exdate})
else:
- res = super(calendar_event, self).unlink(cr, uid, event_id)
- self.pool.get('res.alarm').do_alarm_unlink(cr, uid, event_id, self._name)
+ res = super(calendar_event, self).unlink(cr, uid, [event_id], context=context)
+ self.pool.get('res.alarm').do_alarm_unlink(cr, uid, [event_id], self._name)
+ self.unlink_events(cr, uid, [event_id], context=context)
return res
def create(self, cr, uid, vals, context=None):
@@ -1822,7 +1839,6 @@ class res_users(osv.osv):
('state', '=', 'accepted'), ('user_id', 'in', ids)
])
- # result = cr.dictfetchall()
for attendee_data in attendee_obj.read(cr, uid, attendee_ids, ['user_id']):
user_id = attendee_data['user_id']
status = 'busy'
diff --git a/addons/base_contact/i18n/lt.po b/addons/base_contact/i18n/lt.po
index 258c4026c3a..57d6ce90ce6 100644
--- a/addons/base_contact/i18n/lt.po
+++ b/addons/base_contact/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-18 13:14+0000\n"
+"PO-Revision-Date: 2010-08-19 05:48+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-19 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: lt\n"
diff --git a/addons/base_contact/i18n/tr.po b/addons/base_contact/i18n/tr.po
index 98041e5ad3b..fb0e40338ed 100644
--- a/addons/base_contact/i18n/tr.po
+++ b/addons/base_contact/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-18 13:12+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 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-19 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_contact
diff --git a/addons/base_contact/i18n/zh_CN.po b/addons/base_contact/i18n/zh_CN.po
index b22c7a3da96..02181f05607 100644
--- a/addons/base_contact/i18n/zh_CN.po
+++ b/addons/base_contact/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-18 13:19+0000\n"
+"PO-Revision-Date: 2010-08-19 05:53+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-19 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_contact
diff --git a/addons/base_contact/process/base_contact_process.xml b/addons/base_contact/process/base_contact_process.xml
index f8d28ab8e93..876905c1812 100644
--- a/addons/base_contact/process/base_contact_process.xml
+++ b/addons/base_contact/process/base_contact_process.xml
@@ -37,7 +37,6 @@
-
diff --git a/addons/base_iban/i18n/tr.po b/addons/base_iban/i18n/tr.po
index e15efd8046f..f63ebf0ee12 100644
--- a/addons/base_iban/i18n/tr.po
+++ b/addons/base_iban/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-18 13:18+0000\n"
+"PO-Revision-Date: 2010-08-19 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-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_iban
diff --git a/addons/base_module_doc_rst/base_module_doc_rst.py b/addons/base_module_doc_rst/base_module_doc_rst.py
index fafa9069391..c7671a62bd4 100755
--- a/addons/base_module_doc_rst/base_module_doc_rst.py
+++ b/addons/base_module_doc_rst/base_module_doc_rst.py
@@ -53,7 +53,6 @@ class module(osv.osv):
res = {}
for rel in relations:
# if we have to display the string along with field name then uncomment the first line n comment the second line
- # res.setdefault(rel[0], set()).add(rel[1]+'('+rel[4]+')')
res.setdefault(rel[0], set()).add(rel[1])
res.setdefault(rel[3], set())
val = []
@@ -102,8 +101,6 @@ class module(osv.osv):
object_ids = self._get_module_objects(cr, uid, module_name, context=context)
if not object_ids:
return {'module_file': False}
-# raise orm.except_orm(_('Warning'),
-# _('No object available on this module or Module is not installed'))
context.update({'level': 1})
dots = self.get_graphical_representation(cr, uid, object_ids, context=context)
# todo: use os.realpath
@@ -123,56 +120,6 @@ class module(osv.osv):
module()
-#class report_graph_instance(object):
-# def __init__(self, cr, uid, ids, data):
-# print "data", data
-# self.done = False
-#
-# graph = pydot.Dot(fontsize=16, label="")
-#
-# ps_string = graph.create_ps(prog='dot')
-# if os.name == 'nt':
-# prog = 'ps2pdf.bat'
-# else:
-# prog = 'ps2pdf'
-#
-# args = (prog, '-', '-')
-# try:
-# input, output = tools.exec_command_pipe(*args)
-# except:
-# return
-#
-# input.write(ps_string)
-# input.close()
-#
-# self.result = output.read()
-# output.close()
-# self.done = True
-#
-# def is_done(self):
-# return self.done
-#
-# def get(self):
-# if self.done:
-# return self.result
-# else:
-# return False
-#
-#class report_graph(report.interface.report_int):
-# def init__(self, name, table):
-# super(report_graph, self).__init__(name)
-#
-# def result(self):
-# if self.obj.is_done():
-# return (True, self.obj.get(), 'pdf')
-# else:
-# return (False, False, False)
-#
-# def create(self, cr, uid, ids, data, context=None):
-# self.obj = report_graph_instance(cr, uid, ids, data)
-# return (self.obj.get(), 'pdf')
-#
-#report_graph('report.ir.model.graph')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_module_doc_rst/report/report_proximity_graph.py b/addons/base_module_doc_rst/report/report_proximity_graph.py
index 10f5d28fc20..6f3db7e3273 100644
--- a/addons/base_module_doc_rst/report/report_proximity_graph.py
+++ b/addons/base_module_doc_rst/report/report_proximity_graph.py
@@ -37,9 +37,6 @@ class report_graph(report.interface.report_int):
module_record = module_obj.browse(cr, uid, module_id, context=context)
if module_record.name not in nodes:
# Add new field ir.module.module object in server side. field name = module_type/
-# if module_record.module_type:
-# nodes.append((module_record.name, module_record.module_type))
-# else:
nodes.append((module_record.name, "unknown"))
if module_record.dependencies_id:
for depen in module_record.dependencies_id:
diff --git a/addons/base_module_doc_rst/wizard/wizard_tech_guide_rst.py b/addons/base_module_doc_rst/wizard/wizard_tech_guide_rst.py
index 327367e1d06..02561c6eb5c 100644
--- a/addons/base_module_doc_rst/wizard/wizard_tech_guide_rst.py
+++ b/addons/base_module_doc_rst/wizard/wizard_tech_guide_rst.py
@@ -282,9 +282,6 @@ class RstDoc(object):
title,
'#' * len(title),
"",
- #".. index::",
- #" single: %s object" % (obj_name),
- #".. ",
]
for field in obj['fields']:
@@ -292,11 +289,6 @@ class RstDoc(object):
"",
write_field(field),
"",
- #".. index::",
- #" single: %s field" % (field[0]),
- #".. ",
- #"",
- #"",
]
slo.extend(slf)
sl.extend(slo)
@@ -499,11 +491,6 @@ class wizard_tech_guide_rst(wizard.interface):
logger.notifyChannel("base_module_doc_rst", netsvc.LOG_ERROR, msg)
return ""
-## def _object_doc(self, cr, uid, obj):
-## pool = pooler.get_pool(cr.dbname)
-## modobj = pool.get(obj)
-## return modobj.__doc__
-
states = {
'init': {
'actions': [_generate],
diff --git a/addons/base_module_quality/base_module_quality.py b/addons/base_module_quality/base_module_quality.py
index d6d67d448c8..c19bd37f97f 100644
--- a/addons/base_module_quality/base_module_quality.py
+++ b/addons/base_module_quality/base_module_quality.py
@@ -95,7 +95,6 @@ class abstract_quality_check(object):
x_file = getattr(x_module, item)
x_obj = getattr(x_file, item)
self.tests.append(x_obj)
-# raise 'Not Implemented'
def run_test(self, cr, uid, module_path=""):
'''
@@ -211,7 +210,6 @@ class module_quality_check(osv.osv):
..........]}
So here the detail result is in html format and summary will be in text_wiki format.
'''
- #list_folders = os.listdir(config['addons_path']+'/base_module_quality/')
pool = pooler.get_pool(cr.dbname)
obj_module = pool.get('ir.module.module')
if not module_state:
diff --git a/addons/base_module_quality/i18n/tr.po b/addons/base_module_quality/i18n/tr.po
index 57d960ff5b6..0ec39b07132 100644
--- a/addons/base_module_quality/i18n/tr.po
+++ b/addons/base_module_quality/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-18 13:13+0000\n"
+"PO-Revision-Date: 2010-08-19 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-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_module_quality
diff --git a/addons/base_module_quality/pylint_test/pylint_test.py b/addons/base_module_quality/pylint_test/pylint_test.py
index 12400dbb196..dfae53fbbae 100644
--- a/addons/base_module_quality/pylint_test/pylint_test.py
+++ b/addons/base_module_quality/pylint_test/pylint_test.py
@@ -64,21 +64,12 @@ class quality_test(base_module_quality.abstract_quality_check):
self.result += _("Error. Is pylint correctly installed? (http://pypi.python.org/pypi/pylint)")+"\n"
return None
count += 1
-# leftchar = -1
-# while res[leftchar:leftchar+1] != ' ' and leftchar-1 <= 0:
-# leftchar -= 1
-# rightchar = -10
-# while res[rightchar:rightchar+1] != '/' and rightchar+1 <= 0:
-# rightchar += 1
try:
-# score += float(res[leftchar+1:rightchar])
scr = res.split("Your code has been rated at")[1].split("")[0].split("/")[0]
score += float(scr)
- #self.result += file + ": " + res[leftchar+1:rightchar] + "/10\n"
dict_py[file_py] = [file_py, scr]
except:
score += 0
- #self.result += file + ": "+_("Unable to parse the result. Check the details.")+"\n"
dict_py[file_py] = [file_py, _("Unable to parse the result. Check the details.")]
replace_string = ''
replace_string += res
diff --git a/addons/base_module_quality/structure_test/structure_test.py b/addons/base_module_quality/structure_test/structure_test.py
index 10b80aaacdd..2238d5f3a93 100644
--- a/addons/base_module_quality/structure_test/structure_test.py
+++ b/addons/base_module_quality/structure_test/structure_test.py
@@ -50,7 +50,6 @@ This test checks if the module satisfy tiny structure
f_list = []
module_dict = {}
module_dict['module'] = []
-# count = 0
final_score = 0.0
if not module_name.islower():
@@ -67,7 +66,6 @@ This test checks if the module satisfy tiny structure
elif file_struct == 'process' and os.path.isdir(path):
module_dict[file_struct] = []
elif file_struct != 'i18n' and os.path.isdir(path):
-# self.counter += 1
self.run_test(cr, uid, path)
module_dict['module'].append(file_struct)
f_list.append(file_struct)
diff --git a/addons/base_module_record/i18n/tr.po b/addons/base_module_record/i18n/tr.po
index 18b7a8ff810..f3bf7d935f9 100644
--- a/addons/base_module_record/i18n/tr.po
+++ b/addons/base_module_record/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-18 13:03+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 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-19 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_module_record
diff --git a/addons/base_report_creator/base_report_creator.py b/addons/base_report_creator/base_report_creator.py
index 3ba79bad2c0..bb2379ba3b8 100644
--- a/addons/base_report_creator/base_report_creator.py
+++ b/addons/base_report_creator/base_report_creator.py
@@ -34,7 +34,7 @@ class report_creator(osv.osv):
# Should request only used fields
#
def export_data(self, cr, uid, ids, fields_to_export, context=None):
-
+
if context is None:
context = {}
data_l = self.read(cr, uid, ids, ['sql_query'], context)
@@ -52,7 +52,7 @@ class report_creator(osv.osv):
final_datas += [datas]
#End Loop
return {'datas': final_datas}
-
+
def fields_get(self, cr, user, fields=None, context=None):
"""
Get Fields.
@@ -63,7 +63,7 @@ class report_creator(osv.osv):
"""
if context is None:
context = {}
-
+
data = context and context.get('report_id', False) or False
if (not context) or 'report_id' not in context:
return super(report_creator, self).fields_get(cr, user, fields, context)
@@ -82,7 +82,7 @@ class report_creator(osv.osv):
i += 1
else:
fields['column_count'] = {'readonly': True, 'type': 'integer', 'string': 'Count', 'size': 64, 'name': 'column_count'}
-
+
return fields
#
@@ -97,7 +97,7 @@ class report_creator(osv.osv):
"""
if context is None:
context = {}
-
+
data = context and context.get('report_id', False) or False
if (not context) or 'report_id' not in context:
return super(report_creator, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
@@ -113,7 +113,7 @@ class report_creator(osv.osv):
i += 1
else:
fields['column_count'] = {'readonly': True, 'type': 'integer', 'string': 'Count', 'size': 64, 'name': 'column_count'}
-
+
arch = ''
if view_type == 'graph':
orientation_eval = {'horz':'horizontal','vert' :'vertical'}
@@ -128,7 +128,7 @@ class report_creator(osv.osv):
i += 1
else:
arch += '' % ('column_count',)
-
+
elif view_type == 'calendar':
required_types = ['date_start', 'date_delay', 'color']
set_dict = {'view_type':view_type, 'string':report.name}
@@ -141,7 +141,7 @@ class report_creator(osv.osv):
i += 1
else:
field_cal = 'column_count'
- set_dict[f.calendar_mode] = field_cal
+ set_dict[f.calendar_mode] = field_cal
del required_types[required_types.index(f.calendar_mode)]
else:
@@ -149,8 +149,8 @@ class report_creator(osv.osv):
temp_list.append('''''' % {'name': 'field' + str(i)})
i += 1
else:
- temp_list.append('''''' % {'name':'column_count'})
-
+ temp_list.append('''''' % {'name':'column_count'})
+
arch += '''<% (view_type)s string = "%(string)s" date_start = "%(date_start)s" ''' % set_dict
if set_dict.get('date_delay', False):
arch += ''' date_delay = "%(date_delay)s" ''' % set_dict
@@ -217,7 +217,7 @@ class report_creator(osv.osv):
continue
related_name = self.pool.get(field_dict.get('relation')).name_get(cr, user, [r[k]], context)[0]
r[k] = related_name
-
+
return res
def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
@@ -226,12 +226,12 @@ class report_creator(osv.osv):
@param cr: the current row, from the database cursor,
@param user: the current user’s ID for security checks,
@param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
- @return: List of id
+ @return: List of id
"""
if context is None:
context = {}
context_id = context.get('report_id', False)
-
+
if (not context) or 'report_id' not in context:
return super(report_creator, self).search(cr, user, args, offset, limit, order, context, count)
if context_id:
@@ -243,7 +243,7 @@ class report_creator(osv.osv):
fields['field'+str(i)] = (f.field_id.model, f.field_id.name)
i += 1
else:
- fields['column_count'] = (False, 'Count')
+ fields['column_count'] = (False, 'Count')
newargs = []
newargs2 = []
for a in args:
@@ -274,7 +274,7 @@ class report_creator(osv.osv):
filter_list = []
for model in models:
model_dict[model.model] = self.pool.get(model.model)._table
-
+
model_list = model_dict.keys()
reference_model_dict = {}
for model in model_dict:
@@ -284,7 +284,7 @@ class report_creator(osv.osv):
model_pool = self.pool.get(model)
fields_get = model_pool.fields_get(cr, uid)
model_columns = {}
-
+
def _get_inherit_fields(obj):
pool_model = self.pool.get(obj)
#Adding the columns of the model itself
@@ -293,11 +293,11 @@ class report_creator(osv.osv):
for record in pool_model._inherits.keys():
_get_inherit_fields(record)
- _get_inherit_fields(model)
-
- fields_filter = dict(filter(lambda x:x[1].get('relation', False)
- and x[1].get('relation') in rest_list
- and x[1].get('type') == 'many2one'
+ _get_inherit_fields(model)
+
+ fields_filter = dict(filter(lambda x:x[1].get('relation', False)
+ and x[1].get('relation') in rest_list
+ and x[1].get('type') == 'many2one'
and not (isinstance(model_columns[x[0]], fields.function) or isinstance(model_columns[x[0]], fields.related)), fields_get.items()))
if fields_filter:
model in model_list and model_list.remove(model)
@@ -316,7 +316,7 @@ class report_creator(osv.osv):
if k in self.pool.get(model)._columns:
str_where = model_dict.get(model)+"."+ k + "=" + model_dict.get(v.get('relation'))+'.id'
where_list.append(str_where)
-
+
if reference_model_dict:
self.model_set_id = model_dict.get(reference_model_dict.keys()[reference_model_dict.values().index(min(reference_model_dict.values()))])
if model_list and not len(model_dict.keys()) == 1:
@@ -348,20 +348,19 @@ class report_creator(osv.osv):
if ret_str.endswith('or'):
ret_str = ret_str[0:len(ret_str)-2]
ret_str = ret_str.strip()
-
+
return ret_str % {'uid': uid}
def _id_get(self, cr, uid, id, context):
"""
Get Model id
"""
-# return 'min(sale_order_line.id)'
return self.model_set_id and 'min('+self.model_set_id+'.id)'
def _sql_query_get(self, cr, uid, ids, prop, unknow_none, context, where_plus=[], limit=None, offset=None):
"""
Get sql query which return on sql_query field.
- @return: Dictionary of sql query.
+ @return: Dictionary of sql query.
"""
result = {}
for obj in self.browse(cr, uid, ids):
@@ -379,7 +378,7 @@ class report_creator(osv.osv):
groupby.append(t+'.'+f.field_id.name)
else:
fields.append('\t'+f.group_method+'('+t+'.'+f.field_id.name+')'+' as field'+str(i))
-
+
i += 1
models = self._path_get(cr, uid, obj.model_ids, obj.filter_ids)
check = self._id_get(cr, uid, ids[0], context)
@@ -458,7 +457,7 @@ class report_creator(osv.osv):
rep = self.browse(cr, uid, ids, context=context)
if not rep:
return False
-
+
rep = rep[0]
view_mode = rep.view_type1
if rep.view_type2:
@@ -500,15 +499,15 @@ class report_creator(osv.osv):
def _aggregation_error(self, cr, uid, ids):
"""
- constraints function which specify that
+ constraints function which specify that
aggregate function to the non calculated field..
@param cr: the current row, from the database cursor,
@param uid: the current user’s ID for security checks,
- @param ids: List of Report creator's id.
+ @param ids: List of Report creator's id.
@return: True if model colume type is in integer or float.
or false model colume type is not in integer or float.
"""
-
+
aggregate_columns = ('integer', 'float')
apply_functions = ('sum', 'min', 'max', 'avg', 'count')
this_objs = self.browse(cr, uid, ids)
@@ -517,13 +516,12 @@ class report_creator(osv.osv):
# Allowing to use count(*)
if not fld.field_id.model and fld.group_method == 'count':
continue
- model_column = self.pool.get(fld.field_id.model)._columns[fld.field_id.name]
+ model_column = self.pool.get(fld.field_id.model)._columns[fld.field_id.name]
if model_column._type not in aggregate_columns and fld.group_method in apply_functions:
return False
return True
def _calander_view_error(self, cr, uid, ids):
-# required_types = ['date_start','date_delay','color']
required_types = []
this_objs = self.browse(cr, uid, ids)
for obj in this_objs:
diff --git a/addons/base_report_creator/i18n/tr.po b/addons/base_report_creator/i18n/tr.po
index 03848ddae61..e5a4341502e 100644
--- a/addons/base_report_creator/i18n/tr.po
+++ b/addons/base_report_creator/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-18 13:12+0000\n"
+"PO-Revision-Date: 2010-08-19 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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_report_creator
diff --git a/addons/base_report_creator/wizard/wiz_set_filter_fields.py b/addons/base_report_creator/wizard/wiz_set_filter_fields.py
index 064e54264c4..dc7c977e694 100644
--- a/addons/base_report_creator/wizard/wiz_set_filter_fields.py
+++ b/addons/base_report_creator/wizard/wiz_set_filter_fields.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 .
#
##############################################################################
@@ -62,11 +62,11 @@ def _set_field_domain(self,cr,uid,data,context):
this_model = data.get('model')
this_pooler = pooler.get_pool(cr.dbname).get(this_model)
this_data = this_pooler.read(cr,uid,data.get('ids'),['model_ids'],context)[0]
- select_field_fields['field_id']['domain'] = [('model_id','in',this_data.get('model_ids')),('ttype','<>','many2many'),('ttype','<>','one2many')]
+ select_field_fields['field_id']['domain'] = [('model_id','in',this_data.get('model_ids')),('ttype','<>','many2many'),('ttype','<>','one2many')]
return {'field_id':False}
def set_field_operator(self,field_name,field_type,search_operator,search_value):
- field_search = [field_name,search_operator,search_value]
+ field_search = [field_name,search_operator,search_value]
if search_operator == '=':
if field_type=='many2one':
field_search[1]='in'
@@ -132,7 +132,7 @@ def _set_filter_value(self, cr, uid, data, context):
if field_type in ['float','integer']:
value_data = value_data or 0
-
+
if field_type == 'many2many' and value_data and len(value_data):
fields_list = set_field_operator(self,table_name+"."+field_data['name'],field_data['ttype'],form_data['operator'],value_data[0][2])
else:
@@ -145,9 +145,6 @@ def _set_filter_value(self, cr, uid, data, context):
'condition' : form_data['condition']
}
pooler.get_pool(cr.dbname).get('base_report_creator.report.filter').create(cr,uid,create_dict,context)
- #end if field_type == 'many2many' and value_data and len(value_data):
-# pooler.get_pool(cr.dbname).get('custom.report.filter').create(cr,uid,form_data)
- #end if field_type:
return {}
def _set_form_value(self, cr, uid, data, context):
@@ -155,8 +152,6 @@ def _set_form_value(self, cr, uid, data, context):
field_data = pooler.get_pool(cr.dbname).get('ir.model.fields').read(cr,uid,[field_id])[0]
fields_dict = pooler.get_pool(cr.dbname).get(field_data.get('model')).fields_get(cr,uid,fields=[field_data.get('name')])
value_field = set_value_fields.get('value')
-# print "fields_dict :",fields_dict.get(field_data.get('name'))
-# set_value_fields['value']= fields_dict.get(field_data.get('name'))
for k,v in value_field.items():
if k in ('size','relation','type'):
del value_field[k]
@@ -170,15 +165,15 @@ def _set_form_value(self, cr, uid, data, context):
selection_data = pooler.get_pool(cr.dbname).get(field_data['model']).fields_get(cr,uid,[field_data['name']])
value_field['selection'] = selection_data.get(field_data['name']).get('selection')
operator = (field_type=='many2one') and 'in' or '='
- ret_dict={'field_id':field_id,'operator':operator, 'condition':'and','value':False}
+ ret_dict={'field_id':field_id,'operator':operator, 'condition':'and','value':False}
return ret_dict
def _set_operator(self, cr, uid, data, context):
field = pooler.get_pool(cr.dbname).get('ir.model.fields').browse(cr, uid, data['form']['field_id'])
operator = set_value_fields['operator']['selection']
- while operator:
+ while operator:
operator.pop(operator.__len__()-1)
-
+
if field.ttype == 'many2one':
operator.append(('in','Equals'))
operator.append(('in','Contains'))
@@ -210,7 +205,7 @@ class set_filter_fields(wizard.interface):
states = {
'init': {
'actions': [_set_field_domain],
- 'result': {'type':'form', 'arch':select_field_form, 'fields':select_field_fields, 'state':[('end','Cancel'),('set_value_select_field','Continue')]}
+ 'result': {'type':'form', 'arch':select_field_form, 'fields':select_field_fields, 'state':[('end','Cancel'),('set_value_select_field','Continue')]}
},
'set_value_select_field':{
'actions': [_set_form_value, _set_operator],
diff --git a/addons/base_report_designer/i18n/tr.po b/addons/base_report_designer/i18n/tr.po
index 09d23fe2810..c2b1567372a 100644
--- a/addons/base_report_designer/i18n/tr.po
+++ b/addons/base_report_designer/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-18 13:16+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 05:44+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_report_designer
diff --git a/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py b/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py
index 661ea44708a..1a29324fb83 100644
--- a/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py
+++ b/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py
@@ -290,8 +290,6 @@ class PyOpenOffice(object):
def oo_replace(self,content):
regex = [
(r"]*/>", ""),
- #(r"(.*?)", "$1"),
- #(r"(.*?)", "$1"),
(r"(.*?)]*/>", "$2"),
]
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 a6e2227752a..a568d349d6b 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-18 13:06+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 05:50+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-19 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+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 b83dda61644..d9bbd9cecc5 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-18 13:33+0000\n"
+"PO-Revision-Date: 2010-08-19 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-19 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+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 12b54a55b96..7490b1b5016 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-18 13:06+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 05:50+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 f48e9f3b691..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.replace('MAILTO:',''),
+ '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_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index a1d02c5e33a..cb1d30954e1 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -45,9 +45,15 @@
-
+
+
+
+
-
-
-
-
-
diff --git a/addons/crm/i18n/fi.po b/addons/crm/i18n/fi.po
index b9a60226fe8..484b0cae327 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-18 13:23+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 05:45+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-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+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 b34dea45bbc..5ccb24fcb02 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-18 13:14+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 05:46+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-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+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 b6ed64d277a..6ad0e157d2a 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-18 13:20+0000\n"
+"PO-Revision-Date: 2010-08-19 05:43+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-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+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 be7b1ff39f1..726f96b3a94 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-18 13:24+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 05:47+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-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+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 91d81c9bf64..2b2cdad6aa2 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-18 13:25+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 05:43+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-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+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 d29f59185c8..16a837df509 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-18 13:24+0000\n"
+"PO-Revision-Date: 2010-08-19 05:46+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-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+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 c6e3f44180d..f25a15fd991 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-18 13:14+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 05:42+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-19 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+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/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index 892b42ca460..ae4e87f30ad 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -104,7 +104,7 @@ class crm_send_new_email(osv.osv_memory):
res_id = hist.res_id
ref_id = hist.ref_id
case = case_pool.browse(cr, uid, res_id, context=context)
- emails = [obj.email_to]
+ emails = re.findall(r'([^ ,<@]+@[^> ,]+)', obj.email_to or '')
email_cc = re.findall(r'([^ ,<@]+@[^> ,]+)', obj.email_cc or '')
emails = filter(None, emails)
body = obj.body
@@ -238,7 +238,7 @@ class crm_send_new_email(osv.osv_memory):
res.update({'email_cc': email_cc})
if 'reply_to' in fields:
if hasattr(case, 'section_id'):
- res.update({'reply_to': case.section_id.reply_to})
+ res.update({'reply_to': case.section_id.reply_to or ''})
if 'state' in fields:
res['state'] = u'pending'
return res
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 5af7aa1052c..100626f18da 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-18 13:15+0000\n"
+"PO-Revision-Date: 2010-08-19 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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 2a6ab5cd87a..7331e1252f3 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-18 13:06+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 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-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+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 0f816ecf186..446c3d44aa6 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-18 13:07+0000\n"
+"PO-Revision-Date: 2010-08-19 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-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+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 30a3ef39bac..47f601e6745 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-18 13:07+0000\n"
+"PO-Revision-Date: 2010-08-19 05:43+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-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 9fb4d23e0b9..8d90f0a5b86 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-18 13:22+0000\n"
+"PO-Revision-Date: 2010-08-19 05:55+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-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 23a52a9867a..640ca77198c 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-18 13:15+0000\n"
+"PO-Revision-Date: 2010-08-19 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-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 fb543513804..7bd3d0af319 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-18 13:32+0000\n"
+"PO-Revision-Date: 2010-08-19 05:51+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-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 e9561343930..4865c6f187a 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-18 13:24+0000\n"
+"PO-Revision-Date: 2010-08-19 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-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 263d41e2e50..5408fe717e7 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-18 13:24+0000\n"
+"PO-Revision-Date: 2010-08-19 05:41+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-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 803d11eb105..62f49646cc6 100644
--- a/addons/email_template/email_template_account.py
+++ b/addons/email_template/email_template_account.py
@@ -211,7 +211,7 @@ class email_template_account(osv.osv):
raise error
try:
if serv.has_extn('AUTH') or this_object.smtpuname or this_object.smtppass:
- serv.login(this_object.smtpuname, this_object.smtppass)
+ serv.login(str(this_object.smtpuname), str(this_object.smtppass))
except Exception, error:
raise error
return serv
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 a90930f4046..f169ea95771 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-18 13:21+0000\n"
+"PO-Revision-Date: 2010-08-19 05:46+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 d80733593d8..aa94743ad97 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-18 13:13+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 05:41+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 15c7dea6c32..d703327eea3 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-18 13:35+0000\n"
+"PO-Revision-Date: 2010-08-19 05:45+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 fa5239b4e84..221dcc799ba 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-18 13:22+0000\n"
+"PO-Revision-Date: 2010-08-19 05:41+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 e2a9a4529a1..d4da9961fee 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-18 13:13+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 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-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/it.po b/addons/hr_attendance/i18n/it.po
index ef5617dbce0..a02260204ed 100644
--- a/addons/hr_attendance/i18n/it.po
+++ b/addons/hr_attendance/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-18 13:27+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet \n"
+"PO-Revision-Date: 2010-08-19 05:41+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-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 d4a3ec5dd78..4a2eaeb5eff 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-18 13:16+0000\n"
+"PO-Revision-Date: 2010-08-19 05:46+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-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 86e7ab32edb..24d35b0df14 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-18 13:14+0000\n"
+"PO-Revision-Date: 2010-08-19 05:55+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-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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/tr.po b/addons/hr_contract/i18n/tr.po
index beaae108c7e..b12c3462768 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-18 13:37+0000\n"
+"PO-Revision-Date: 2010-08-19 05:45+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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.
-
+
@@ -89,7 +89,7 @@
-
+
@@ -164,6 +164,7 @@
form
{"search_default_user_id":uid}
+ The OpenERP expenses management module allows you to track the full flow. Every month, the employees record their expenses. At the end of the month, their managers validates the expenses sheets which creates costs on projects/analytic accounts. The accountant validates the proposed entries and the employee can be reimbursed. You can also reinvoice the customer at the end of the flow.
diff --git a/addons/hr_expense/hr_expense_workflow.xml b/addons/hr_expense/hr_expense_workflow.xml
index 972cdcaab8f..cfeee8387ce 100644
--- a/addons/hr_expense/hr_expense_workflow.xml
+++ b/addons/hr_expense/hr_expense_workflow.xml
@@ -55,7 +55,6 @@
refused
function
expense_canceled()
-
@@ -79,13 +78,6 @@
-
-
diff --git a/addons/hr_expense/i18n/pt_BR.po b/addons/hr_expense/i18n/pt_BR.po
index 918874de719..f97a3d5a3a6 100644
--- a/addons/hr_expense/i18n/pt_BR.po
+++ b/addons/hr_expense/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-18 13:24+0000\n"
+"PO-Revision-Date: 2010-08-19 05:46+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_expense
diff --git a/addons/hr_expense/i18n/tr.po b/addons/hr_expense/i18n/tr.po
index 86743bebab1..3cc30393170 100644
--- a/addons/hr_expense/i18n/tr.po
+++ b/addons/hr_expense/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-18 13:07+0000\n"
+"PO-Revision-Date: 2010-08-19 05:46+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_expense
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index e093526ad34..7d68b216494 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -29,7 +29,7 @@
"description": """Human Ressources: Holidays tracking and workflow
This module allows you to manage leaves and leaves requests.
- Implements a dashboard for human resource management that includes.
+ Implements a dashboard for human resource management that includes.
* My Leaves
* My Expenses
Note that:
@@ -63,7 +63,6 @@
'wizard/hr_holidays_summary_department_view.xml',
'wizard/hr_holidays_summary_employees_view.xml',
'board_hr_holidays_view.xml',
- #'process/hr_holidays_process.xml'
],
'demo_xml': ['hr_holidays_demo.xml',],
'test': ['test/test_hr_holiday.yml'],
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 3a628b17e47..efd5df4b480 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -430,20 +430,6 @@ class hr_holidays(osv.osv):
self.holidays_confirm(cr, uid, holiday_ids)
self.holidays_validate(cr, uid, holiday_ids)
- #if record.holiday_status_id.categ_id and record.date_from and record.date_to and record.employee_id:
-# if record.holiday_status_id.categ_id and record.date_from and record.date_to:
-# vals={}
-# vals['name']=record.name
-# vals['categ_id']=record.holiday_status_id.categ_id.id
-# epoch_c = time.mktime(time.strptime(record.date_to,'%Y-%m-%d %H:%M:%S'))
-# epoch_d = time.mktime(time.strptime(record.date_from,'%Y-%m-%d %H:%M:%S'))
-# diff_day = (epoch_c - epoch_d)/(3600*24)
-# vals['duration'] = (diff_day) * 8
-# vals['note'] = record.notes
-## vals['user_id'] = record.user_id.id
-# vals['date'] = record.date_from
-# if record.holiday_type=='employee':
-# vals['user_id'] = record.user_id.id
if record.holiday_status_id.categ_id and record.date_from and record.date_to and record.employee_id:
diff_day = self._get_number_of_days(record.date_from, record.date_to)
vals = {
diff --git a/addons/hr_holidays/hr_holidays_demo.xml b/addons/hr_holidays/hr_holidays_demo.xml
index 2ea95b76620..bfa051dff7a 100644
--- a/addons/hr_holidays/hr_holidays_demo.xml
+++ b/addons/hr_holidays/hr_holidays_demo.xml
@@ -1,52 +1,52 @@
-
+
-
-
- Casual Leave
- True
- black
-
+
+
+ Casual Leave
+ True
+ black
+
-
- Casual Leave for Fabien Pinckaers
-
- add
- 12
-
-
+
+ Casual Leave for Fabien Pinckaers
+
+ add
+ 12
+
+
-
- Trip with Family
-
- 2010-01-04 08:00
- 2010-01-06 18:00
- remove
- 3
-
-
+
+ Trip with Family
+
+
+
+ remove
+ 3
+
+
-
-
- Sick Leave
- True
- red
-
+
+
+ Sick Leave
+ True
+ red
+
-
- Doctor Appointment
-
- 2010-02-01 00:00
- 2010-02-03 08:00
- remove
- draft
- 3
-
-
+
+ Doctor Appointment
+
+
+
+ remove
+ draft
+ 3
+
+
-
-
+
+
-
+
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index b29bf56bfb8..9e8c9d527b4 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -36,7 +36,7 @@
-
+
Leave Request
hr.holidays
@@ -47,7 +47,7 @@
-
+
Leave Request
hr.holidays
@@ -165,10 +165,6 @@
-
-
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 70f18dd32d7..1f3676e4cfb 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-18 13:17+0000\n"
+"PO-Revision-Date: 2010-08-19 05:39+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 642fbc40e89..95f561aede0 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-18 13:07+0000\n"
+"PO-Revision-Date: 2010-08-19 05:39+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 8a9b0fdf162..566be19f790 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-18 12:44+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 05:47+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 48943f0be71..8a8e98c2b6c 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-18 13:22+0000\n"
+"PO-Revision-Date: 2010-08-19 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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 a18e70f5df5..072100485c8 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-18 13:17+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:38+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 8257313d245..ef1cbfe3c18 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-18 13:26+0000\n"
+"PO-Revision-Date: 2010-08-19 05:43+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:38+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 f0fd19a821c..2a08a7415bc 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-18 13:32+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 05:46+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 e82290b173c..e01d6abb57f 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-18 13:21+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 05:45+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-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:40+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 c748ad51b56..06c83d0cec6 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-18 13:17+0000\n"
+"PO-Revision-Date: 2010-08-19 05:39+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-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:40+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 3a30ea66ca3..dcccd81b72b 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-18 13:14+0000\n"
+"PO-Revision-Date: 2010-08-19 05:46+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-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:40+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 e79c8dc41d6..5d2aab024a7 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-18 13:16+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 05:44+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 fb19010e27b..b922562e8b4 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-18 13:23+0000\n"
+"PO-Revision-Date: 2010-08-19 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-19 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+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 356eaf412f6..cd00420e285 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-18 13:31+0000\n"
+"PO-Revision-Date: 2010-08-19 05:46+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 f0d6af479e7..c1674f85cc3 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -461,7 +461,7 @@ class marketing_campaign_transition(osv.osv):
transition = self.browse(cr, uid, ids[0], context)
if transition.trigger != 'time':
raise ValueError('Delta is only relevant for timed transiton')
- return relativedelta(**{transition.interval_type: transition.interval_nbr})
+ return relativedelta(**{str(transition.interval_type): transition.interval_nbr})
_columns = {
diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index ec92ec83326..94d31fcb441 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -63,6 +63,7 @@
+
diff --git a/addons/membership/i18n/tr.po b/addons/membership/i18n/tr.po
index ea6fcf9ae05..7c2ec8fb466 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-18 13:17+0000\n"
+"PO-Revision-Date: 2010-08-19 05:46+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-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: membership
diff --git a/addons/mrp/i18n/pt_BR.po b/addons/mrp/i18n/pt_BR.po
index 6ab1bf77129..288f2ee6558 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-18 13:16+0000\n"
+"PO-Revision-Date: 2010-08-19 05:44+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-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+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 5b50b9caa22..b065a3fba69 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-18 13:34+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 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-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:36+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 ce73521928b..aebd50b896a 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-18 13:29+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 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-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+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 82815c93bc7..68f47a573f6 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-18 13:33+0000\n"
+"PO-Revision-Date: 2010-08-19 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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 24cb464db71..fae0f4a3492 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-18 13:07+0000\n"
+"PO-Revision-Date: 2010-08-19 05:39+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-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 76d7515818b..ceebd2904b7 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-18 13:14+0000\n"
+"PO-Revision-Date: 2010-08-19 05:46+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-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp_subproduct
diff --git a/addons/olap/i18n/nl.po b/addons/olap/i18n/nl.po
new file mode 100644
index 00000000000..0a5c91249ee
--- /dev/null
+++ b/addons/olap/i18n/nl.po
@@ -0,0 +1,1399 @@
+# Dutch 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 05:24+0000\n"
+"PO-Revision-Date: 2010-08-19 06:42+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Dutch \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-Generator: Launchpad (build Unknown)\n"
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Hide"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_saved_query_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_saved_query_form
+#: view:olap.saved.query:0
+msgid "Olap Saved Query"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,time:0
+#: field:olap.saved.query,time:0
+msgid "Time"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid "Auto Configure Structure"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Olap fact database"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,value_sql:0
+msgid ""
+"You can provide valid sql expression. Make sure it have function with fully "
+"qualified column name like (sum,avg ...)(tablename.columnname (+,- ...) "
+"tablename.columnname)"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,schema_id:0
+msgid "Schema id"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,database_id:0
+msgid "Database Connection"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "MySQL"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_password:0
+msgid "Database password"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.tables:0
+msgid "Olap database tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Connection url"
+msgstr ""
+
+#. module: olap
+#: view:olap.application.table:0
+msgid "Olap Application Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.parameters.config.wizard,host_name:0
+msgid "Server Name"
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_password:0
+msgid "Password for the login."
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,application_id:0
+#: field:olap.application.table,application_id:0
+msgid "Application Id"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.todo,note:olap.config_auto_directory
+msgid "This wizard will configure the URL of the web client"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_fact_database_form
+#: model:ir.ui.menu,name:olap.menu_bi_conf_fact
+msgid "Fact Databases"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_browser_url
+msgid "Cube Browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_dimension_form
+msgid "Olap Dimension"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_database_columns
+msgid "Olap Database Columns"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "BI Web Client."
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_port:0
+msgid " Port to be used in connection"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,primary_key:0
+msgid "Primary Key"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,table_id:0
+msgid "Table Id"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "This wizard will automatically configure the web client for BI."
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,type:0
+msgid "Database type"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query_builder,back:0
+#: wizard_view:olap.query_builder,init:0
+msgid "Cube Fetcher"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,info:0
+#: wizard_view:olap.load.table,ok:0
+msgid "Your database structure has been correctly loaded"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_parameters_config_wizard
+msgid "Olap Server Parameters"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_cube_table_form
+msgid "Olap Cube Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,formatstring:0
+msgid "Format string"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,exec,exec:0
+#: wizard_button:olap.query_builder,ok,exec:0
+msgid "Execute"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.application.configuration,configure,end:0
+#: wizard_button:olap.fact.database.test_connection,init,end:0
+#: wizard_button:olap.load.table,info,end:0
+#: wizard_button:olap.query.logs.clear,info,end:0
+#: wizard_button:olap.query.logs.clear,ok,end:0
+#: view:olap.warehouse.wizard:0
+msgid "Ok"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_conf_known_application
+msgid "Known Application"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,level:0
+#: wizard_field:olap.query_builder,ok,level:0
+msgid "Level"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,column_id_name:0
+#: field:olap.measure,value_column_id_name:0
+msgid "Column ID"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid ""
+"We will load the complete structure of the database by introspection, so "
+"that you will be able to work on it, and specify a better structure "
+"according to your reporting needs."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_form
+msgid "Olap Applicatiion"
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,name:0
+msgid "Query Name"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,mdx_query:0
+#: wizard_field:olap.query_builder,ok,mdx_query:0
+msgid "MDX Query"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_bi_auto_configure_wizard
+msgid "bi.auto.configure.wizard"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,primary_key:0
+msgid "Primary key"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.act_bi_auto_configure
+msgid "Auto Configuration"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,note:0
+msgid "Schema description"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.act_bi_load_db_wizard
+msgid "Load database Structure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_level
+#: view:olap.level:0
+msgid "Olap level"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "None (0000.00)"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_host:0
+msgid "Database host"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_fact_database
+msgid "Olap Fact Database"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid "Auto Congifuring Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,name:0
+msgid "Application name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,column_link_id:0
+msgid "Relational Column"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,type:0
+msgid "Level class"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,name:0
+msgid "Cube name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_table_form
+msgid "Olap Applicatiion Table"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_saved_query
+msgid "olap.saved.query"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,column_name:0
+msgid "Columns Name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_hierarchy_form
+msgid "Olap Hierarchies"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,ready:0
+msgid "Ready"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,measure_type:0
+#: field:olap.measure,value_column:0
+msgid "Fact Table Column"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_database_tables_form
+#: field:olap.application,table_ids:0
+#: view:olap.fact.database:0
+#: field:olap.fact.database,table_ids:0
+msgid "Tables"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application
+msgid "Olap application"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Schema is ready to use"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_designer_url
+msgid "Cube Designer"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_login:0
+msgid "Database login"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_table_form
+msgid "Application Table"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query.logs.clear,info:0
+#: wizard_view:olap.query.logs.clear,ok:0
+msgid "Logs Cleared successfully"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_schema
+#: model:ir.ui.menu,name:olap.menu_action_olap_schema_form
+#: view:olap.schema:0
+msgid "Olap Schema"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_form
+msgid "Application"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,mdx_query_output:0
+#: wizard_field:olap.query_builder,ok,mdx_query_output:0
+msgid "MDX Query Output"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,primary_key_table:0
+msgid "Primary key table"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,table_name:0
+msgid ""
+"The name of the table on which the column is defined. If False, take the "
+"table from the cube."
+msgstr ""
+
+#. module: olap
+#: view:olap.warehouse.wizard:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_dimension_form
+msgid "Olap Dimensions"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,user_id:0
+msgid "Tiny ERP User"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_application_configuration
+msgid "Configure from Application"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_port:0
+msgid "Database port"
+msgstr ""
+
+#. module: olap
+#: help:olap.parameters.config.wizard,host_port:0
+msgid ""
+"Put the port for the server. Put 8080 if its not clear."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "The Structure is Loaded"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,cube_id:0
+#: field:olap.measure,cube_id:0
+#: field:olap.query.logs,cube_id:0
+#: field:olap.saved.query,cube_id:0
+msgid "Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table,available_table_ids:0
+msgid "Available Tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Configure Manually"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,related_to:0
+msgid "Related To"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Olap database columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,field_id:0
+msgid "Link Field"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Mark as Configured"
+msgstr ""
+
+#. module: olap
+#: view:olap.application.field:0
+msgid "Olap Application Field"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Comma Seperator (0,000)"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,agregator:0
+msgid "Agregator"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,configure:0
+msgid "Your database structure (Open ERP) has been sucessfully configured."
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: olap
+#: help:olap.parameters.config.wizard,host_name:0
+msgid ""
+"Put here the server address or IP Put localhost if its not "
+"clear."
+msgstr ""
+
+#. module: olap
+#: view:olap.database.tables:0
+msgid "Database tables"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Reload Structure"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,init:0
+msgid "This will Auto Configure Application"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid "Load Data Structure"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+#: view:bi.load.db.wizard:0
+#: wizard_button:olap.application.configuration,init,end:0
+#: wizard_button:olap.load.table,init,end:0
+#: view:olap.parameters.config.wizard:0
+#: wizard_button:olap.query.logs.clear,init,end:0
+#: wizard_button:olap.query_builder,exec,end:0
+#: wizard_button:olap.query_builder,ok,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid ""
+"After having loaded the structure, you will be able to hide/show or rename "
+"tables and columns to simplify end-users interface. The following database "
+"will be loaded:"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_level_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_level_form
+#: view:olap.level:0
+msgid "Olap Level"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,loaded:0
+msgid "Loaded"
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_name:0
+msgid "Name of the database to be used for analysis."
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_login:0
+msgid "Login for the database name specified."
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,dimension_id:0
+#: wizard_field:olap.query_builder,exec,dimension:0
+#: wizard_field:olap.query_builder,ok,dimension:0
+msgid "Dimension"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application_table
+msgid "Olap application table"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+msgid ""
+"We will load the complete structure of the database by introspection, "
+"so that you will be able to work on it, and specify a better structure "
+"according to your reporting needs."
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,axis_keys:0
+msgid "Axis Keys"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,query_log:0
+msgid "Query Logging"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,measure_type:0
+msgid "Measure Type"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,fact_database_id:0
+msgid "Database Id"
+msgstr ""
+
+#. module: olap
+#: help:olap.fact.database,db_host:0
+msgid "Give hostname to make connection to the database."
+msgstr ""
+
+#. module: olap
+#: field:olap.level,hierarchy_id:0
+msgid "Hierarchy"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "The Structure is Configured."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_schema_form
+msgid "Olap Schemas"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,table_id:0
+msgid "Fact table"
+msgstr ""
+
+#. module: olap
+#: view:bi.auto.configure.wizard:0
+msgid ""
+"This will Auto Configure Application. This will help to increase the "
+"readability of the tables and columns by giving it meaningful and easy to "
+"comprehend name. You can hides particular data and columns by reconfiguring "
+"the structure option."
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_application_field_form
+msgid "Olap Applicatiion Field"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,query:0
+#: field:olap.saved.query,query:0
+#: view:olap.warehouse.wizard:0
+#: field:olap.warehouse.wizard,query:0
+msgid "Query"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Auto Application Configuration"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Postfix Default Currency(0000.00 EUR)"
+msgstr ""
+
+#. module: olap
+#: field:bi.load.db.wizard,db_name:0
+#: wizard_field:olap.load.table,init,db_name:0
+msgid "Database Name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,measure_ids:0
+msgid "Measures"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_conf_cube_query_builder
+#: wizard_view:olap.query_builder,exec:0
+#: wizard_view:olap.query_builder,ok:0
+msgid "Query Builder"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,dimension_ids:0
+msgid "Dimensions"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_cube
+#: view:olap.cube:0
+msgid "Olap cube"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_warehouse
+#: model:ir.model,name:olap.model_olap_warehouse_wizard
+#: model:ir.ui.menu,name:olap.menu_bi_warehouse
+msgid "Olap Warehouse"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_application_field_form
+msgid "Application Field"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_dimension
+#: view:olap.dimension:0
+msgid "Olap dimension"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,name:0
+msgid "Application field name"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Connection parameters"
+msgstr ""
+
+#. module: olap
+#: field:bi.auto.configure.wizard,name:0
+#: field:bi.load.db.wizard,fact_table:0
+#: wizard_field:olap.load.table,init,fact_table:0
+msgid "Fact Name"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+msgid "Database columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.table,table_name:0
+#: field:olap.cube.table,name:0
+#: field:olap.level,table_name:0
+#: field:olap.measure,table_name:0
+msgid "Table name"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,measure_type:0
+msgid "Select between auto column or sql expression for the measures"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_load_column
+msgid "Open Columns"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_database_columns_form
+#: field:olap.database.tables,columns:0
+msgid "Columns"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_test_connection
+#: view:olap.fact.database:0
+msgid "Test Connection"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_measure_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_measure_form
+msgid "Olap Measures"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.application.configuration,init,configure:0
+#: view:olap.parameters.config.wizard:0
+msgid "Configure"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+msgid ""
+"After having loaded the structure, you will be able to hide/show or "
+"rename tables and columns to simplify end-users interface. The following "
+"database will be loaded:"
+msgstr ""
+
+#. module: olap
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,hierarchy:0
+#: wizard_field:olap.query_builder,ok,hierarchy:0
+msgid "Hiearchy"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,measure_type:0
+#: field:olap.measure,value_sql:0
+msgid "SQL Expression"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_menu_olap_load_table
+msgid "Load Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,level_ids:0
+msgid "Levels"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_application_field
+msgid "Olap application field"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_database_columns_form
+msgid "Database Columns"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,active:0
+#: field:olap.database.tables,active:0
+msgid "Active"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,datatype:0
+msgid "Integer"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,init:0
+msgid " Auto Configure "
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "Sum"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query.logs.clear,init,user_name:0
+#: field:olap.saved.query,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,count:0
+msgid "Count"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,name:0
+msgid "End-User Name"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Postfix Default Currency with comma seperator (0,000.00 EUR)"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,datatype:0
+msgid "Datatype"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,back,ok:0
+#: wizard_button:olap.query_builder,init,ok:0
+msgid "Fetch Data"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Prefix Default Currency with comma seperator (EUR 0,000.00)"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,info:0
+#: wizard_view:olap.load.table,ok:0
+#: wizard_view:olap.query.logs.clear,info:0
+#: wizard_view:olap.query.logs.clear,ok:0
+msgid "Load Data"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,query_ids:0
+msgid "Queries"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "Oracle"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_cube_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_cube_form
+#: model:ir.ui.menu,name:olap.menu_bi_conf_cubes
+msgid "Olap Cubes"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_cube_table_form
+msgid "Olap Cubes Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.measure,name:0
+msgid "Measure name"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,connection_type:0
+msgid "Socket"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,connection_type:0
+msgid "Connection type"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "count"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,db_name:0
+msgid "Database name"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,type:0
+msgid "Type"
+msgstr ""
+
+#. module: olap
+#: view:olap.database.columns:0
+#: view:olap.database.tables:0
+msgid "Show"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.query_builder,exec,back:0
+#: wizard_button:olap.query_builder,ok,back:0
+msgid "Change cube"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_view_olap_database_tables_form
+#: view:olap.cube.table:0
+#: field:olap.cube.table,line_ids:0
+msgid "Database Tables"
+msgstr ""
+
+#. module: olap
+#: help:olap.level,table_name:0
+msgid ""
+"The name of the table on which the column is defined. If False, take the "
+"table from the hierarchy."
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Nothing has been Configured"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,name:0
+msgid "Dimension name"
+msgstr ""
+
+#. module: olap
+#: wizard_button:olap.load.table,ok,end:0
+msgid "Continue and Configure Structure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_measure
+#: view:olap.measure:0
+msgid "Olap measure"
+msgstr ""
+
+#. module: olap
+#: help:olap.cube,table_id:0
+msgid "Table(s) for cube."
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,exec,measure:0
+#: wizard_field:olap.query_builder,ok,measure:0
+msgid "Measure"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,column_db_name:0
+msgid "Column DBName"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "We Can Start building Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,table_id:0
+msgid "Database Table"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,name:0
+msgid "Schema name"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_query_logs_my_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_query_logs_my_form
+#: view:olap.query.logs:0
+msgid "My Logs"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Information"
+msgstr ""
+
+#. module: olap
+#: wizard_field:olap.query_builder,back,cube_schema:0
+#: wizard_field:olap.query_builder,init,cube_schema:0
+msgid "Select Cube"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,table_id:0
+msgid "Fact table(s)"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.url,name:olap.menu_url_cube_designer
+msgid "name_menu_url_cube_designer"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_config_bi_parameters
+msgid "Parameters Configuration"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Connect to Database"
+msgstr ""
+
+#. module: olap
+#: selection:olap.schema,state:0
+msgid "Database Connected"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,table_name:0
+#: field:olap.application.table,name:0
+msgid "Application table name"
+msgstr ""
+
+#. module: olap
+#: help:olap.hierarchy,table_id:0
+msgid "Table(s) to make hierarchy on the cube."
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "General information"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,query:0
+msgid "Application Query"
+msgstr ""
+
+#. module: olap
+#: help:olap.cube,query_log:0
+msgid "Enabling this will log all the queries in the browser"
+msgstr ""
+
+#. module: olap
+#: field:olap.saved.query,mdx_id:0
+msgid "Module"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,is_hidden:0
+#: field:olap.application.table,is_hidden:0
+#: field:olap.database.columns,hide:0
+#: field:olap.database.tables,hide:0
+msgid "Hidden"
+msgstr ""
+
+#. module: olap
+#: field:olap.dimension,hierarchy_ids:0
+msgid "Hierarchies"
+msgstr ""
+
+#. module: olap
+#: field:olap.query.logs,result_size:0
+msgid "Result Size"
+msgstr ""
+
+#. module: olap
+#: view:olap.application:0
+msgid "Olap Application"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_database_tables
+msgid "Olap Database Tables"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,formatstring:0
+msgid "Prefix Default Currency (EUR 0000.00)"
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Olap cube_table"
+msgstr ""
+
+#. module: olap
+#: view:olap.parameters.config.wizard:0
+msgid "Parameters Configure"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_hierarchy
+#: view:olap.hierarchy:0
+msgid "Olap hierarchy"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_cube_table
+#: model:ir.model,name:olap.model_olap_cube_table_line
+msgid "Olap cube table"
+msgstr ""
+
+#. module: olap
+#: field:olap.application.field,field_name:0
+msgid "Field name"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_olap_query_logs
+msgid "Olap query logs"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,name:0
+msgid "Fact name"
+msgstr ""
+
+#. module: olap
+#: help:olap.measure,formatstring:0
+msgid " Let you specify how the measure to be displayed in cube browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_server_parameters
+msgid "Server Parameters"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.load.table,init:0
+#: wizard_button:olap.load.table,init,ok:0
+#: view:olap.schema:0
+msgid "Load Database Structure"
+msgstr ""
+
+#. module: olap
+#: field:olap.level,name:0
+msgid "Level name"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube,schema_id:0
+#: field:olap.query.logs,schema_id:0
+#: field:olap.saved.query,schema_id:0
+msgid "Schema"
+msgstr ""
+
+#. module: olap
+#: field:olap.fact.database,connection_url:0
+#: field:olap.schema,app_detect:0
+msgid "Connection URL"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,cube_ids:0
+msgid "Cubes"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "ReConfigure Structure"
+msgstr ""
+
+#. module: olap
+#: field:olap.application,field_ids:0
+msgid "Fields"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,agregator:0
+msgid "Average"
+msgstr ""
+
+#. module: olap
+#: view:bi.load.db.wizard:0
+msgid "Load Database Tables"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_action_olap_hierarchy_form
+msgid "Olap Hierarchy"
+msgstr ""
+
+#. module: olap
+#: field:olap.cube.table.line,cube_table_id:0
+msgid "Cube Table"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi
+msgid "Businesss Intelligence"
+msgstr ""
+
+#. module: olap
+#: model:ir.model,name:olap.model_bi_load_db_wizard
+msgid "bi.load.db.wizard"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.url,name:olap.menu_url_cube_browser
+msgid "name_menu_url_cube_browser"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_view_olap_fact_database_form
+msgid "Databases"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,name:0
+msgid "Hierarchy name"
+msgstr ""
+
+#. module: olap
+#: model:ir.module.module,description:olap.module_meta_information
+msgid ""
+"\n"
+" Base module to manage Olap schemas. Cube designer.\n"
+" "
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Joined Tables"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,loaded:0
+msgid "Loading Datastructure"
+msgstr ""
+
+#. module: olap
+#: view:olap.cube.table:0
+msgid "Joined Table"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,type:0
+msgid "PostgreSQL"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.query.logs.clear,init:0
+msgid " To Load Data"
+msgstr ""
+
+#. module: olap
+#: field:olap.hierarchy,sequence:0
+#: field:olap.level,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: olap
+#: model:ir.ui.menu,name:olap.menu_bi_conf_tools
+msgid "Tools"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,state:0
+msgid "Schema State"
+msgstr ""
+
+#. module: olap
+#: selection:olap.measure,datatype:0
+msgid "Float"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.act_window,name:olap.action_olap_query_logs_form
+#: model:ir.ui.menu,name:olap.menu_action_olap_query_logs_form
+#: view:olap.query.logs:0
+msgid "All Logs"
+msgstr ""
+
+#. module: olap
+#: selection:olap.fact.database,connection_type:0
+#: field:olap.parameters.config.wizard,host_port:0
+msgid "Port"
+msgstr ""
+
+#. module: olap
+#: view:olap.fact.database:0
+msgid "Fact database"
+msgstr ""
+
+#. module: olap
+#: model:ir.module.module,shortdesc:olap.module_meta_information
+msgid "olap"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.columns,name:0
+msgid "Column Name"
+msgstr ""
+
+#. module: olap
+#: field:olap.database.tables,table_db_name:0
+msgid "Table Name"
+msgstr ""
+
+#. module: olap
+#: wizard_view:olap.application.configuration,configure:0
+msgid "Auto Configure"
+msgstr ""
+
+#. module: olap
+#: field:olap.schema,configure:0
+msgid "Configuring Datastructure"
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_load_configuration_table
+msgid "Open Configuration"
+msgstr ""
+
+#. module: olap
+#: view:olap.schema:0
+msgid "Configure Automatically "
+msgstr ""
+
+#. module: olap
+#: model:ir.actions.wizard,name:olap.bi_clear_logs
+#: model:ir.ui.menu,name:olap.menu_bi_clear_logs
+#: wizard_button:olap.query.logs.clear,init,ok:0
+msgid "Clear Logs"
+msgstr ""
diff --git a/addons/olap_crm/i18n/it.po b/addons/olap_crm/i18n/it.po
index 76c8378ea2b..a1c45470805 100644
--- a/addons/olap_crm/i18n/it.po
+++ b/addons/olap_crm/i18n/it.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 05:29+0000\n"
-"PO-Revision-Date: 2010-08-18 13:38+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet \n"
+"PO-Revision-Date: 2010-08-19 05:41+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Italian \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-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: olap_crm
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 fab2c74a7f3..3c951d1b83b 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-18 13:23+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-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+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 ab6b47445d8..a7a82b5b10c 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-18 13:26+0000\n"
+"PO-Revision-Date: 2010-08-19 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-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+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 41a9c62e777..b7cc3067661 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-18 12:43+0000\n"
+"PO-Revision-Date: 2010-08-19 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-19 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: process
diff --git a/addons/product/i18n/lt.po b/addons/product/i18n/lt.po
index a9d65ddcfb0..8a7bf28a707 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-18 13:30+0000\n"
+"PO-Revision-Date: 2010-08-19 05:43+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 ec7010aeb9c..8d72fe7f38a 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-18 13:12+0000\n"
+"PO-Revision-Date: 2010-08-19 05:43+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 3bab518990e..b6dabf65204 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-18 13:07+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 05:43+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 ad07d952ddd..103e1e5ad21 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-18 13:34+0000\n"
+"PO-Revision-Date: 2010-08-19 05:55+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 b2aaa854b13..2d3a7d5e0a2 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-18 12:46+0000\n"
+"PO-Revision-Date: 2010-08-19 05:47+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 36d2a49f1f2..d3214b6f45f 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-18 13:22+0000\n"
+"PO-Revision-Date: 2010-08-19 05:47+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product
diff --git a/addons/product_margin/i18n/pt_BR.po b/addons/product_margin/i18n/pt_BR.po
index f93329bfa4b..a035609206a 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-18 13:07+0000\n"
+"PO-Revision-Date: 2010-08-19 05:39+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-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 70d14fbd813..d521bf17121 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-18 13:34+0000\n"
+"PO-Revision-Date: 2010-08-19 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-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product_margin
diff --git a/addons/profile_accounting/i18n/tr.po b/addons/profile_accounting/i18n/tr.po
index 99da0f543e8..604446b7423 100644
--- a/addons/profile_accounting/i18n/tr.po
+++ b/addons/profile_accounting/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-18 13:22+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-19 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: profile_accounting
diff --git a/addons/project/i18n/lt.po b/addons/project/i18n/lt.po
index bdb1191540d..1dfde4cdf44 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-18 13:31+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 05:46+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-19 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:36+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 c96a821e572..528427ca61b 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-18 13:06+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 05:44+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-19 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:36+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 4ad024d1cbe..abfd51442d5 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-18 13:01+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 05:45+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-19 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project
diff --git a/addons/project_gtd/i18n/tr.po b/addons/project_gtd/i18n/tr.po
index 41938de1c47..cc85de8b0aa 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-18 13:21+0000\n"
+"PO-Revision-Date: 2010-08-19 05:45+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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/project_mrp/i18n/tr.po b/addons/project_mrp/i18n/tr.po
index ed09204e54c..e41b0688de2 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-18 13:28+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 05:37+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 e2870a49af1..6a6ac248d23 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-18 13:18+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 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-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_retro_planning
diff --git a/addons/project_scrum/i18n/tr.po b/addons/project_scrum/i18n/tr.po
index 8e1744b6025..8303129c044 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-18 13:08+0000\n"
+"PO-Revision-Date: 2010-08-19 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-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+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 127eee4f42f..bbb3da79b08 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-18 13:07+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 05:46+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_timesheet
diff --git a/addons/purchase/i18n/et.po b/addons/purchase/i18n/et.po
index 2c203cd43a7..8f42de9da0d 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-18 13:06+0000\n"
+"PO-Revision-Date: 2010-08-19 05:47+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-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+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 1ef258095b2..aa087191cff 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-18 13:26+0000\n"
+"PO-Revision-Date: 2010-08-19 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-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+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 344d621f94a..626e1226cc1 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-18 13:12+0000\n"
+"PO-Revision-Date: 2010-08-19 05:21+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-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:37+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 8c5eed3b720..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.
@@ -252,7 +254,7 @@
-
+
-
+
\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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:38+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 2156a3fab56..35871e5e787 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-18 13:33+0000\n"
+"PO-Revision-Date: 2010-08-19 05:45+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: report_intrastat
diff --git a/addons/resource/i18n/fr.po b/addons/resource/i18n/fr.po
index 7e201b5aa73..ca19ddbb5dc 100644
--- a/addons/resource/i18n/fr.po
+++ b/addons/resource/i18n/fr.po
@@ -6,18 +6,21 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-08-18 06:50:02+0000\n"
-"PO-Revision-Date: 2010-08-18 06:50:02+0000\n"
+"POT-Creation-Date: 2010-08-18 06:50+0000\n"
+"PO-Revision-Date: 2010-08-19 10:49+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"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:40+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"
+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 ""
#. module: resource
@@ -27,7 +30,8 @@ msgstr ""
#. module: resource
#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
msgstr ""
#. module: resource
@@ -186,7 +190,8 @@ msgstr ""
#. module: resource
#: model:ir.module.module,description:resource.module_meta_information
-msgid "\n"
+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"
@@ -198,7 +203,9 @@ 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."
+msgid ""
+"If the active field is set to true, it will allow you to hide the resource "
+"record without removing it."
msgstr ""
#. module: resource
@@ -254,7 +261,11 @@ msgstr ""
#. 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%."
+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
@@ -307,4 +318,4 @@ msgstr ""
#. module: resource
#: selection:resource.calendar.attendance,dayofweek:0
msgid "Saturday"
-msgstr ""
\ No newline at end of file
+msgstr ""
diff --git a/addons/sale/i18n/pt_BR.po b/addons/sale/i18n/pt_BR.po
index f184df4700d..e15b28ac84c 100644
--- a/addons/sale/i18n/pt_BR.po
+++ b/addons/sale/i18n/pt_BR.po
@@ -8,14 +8,14 @@ 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-18 12:49+0000\n"
+"PO-Revision-Date: 2010-08-19 05:47+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale
diff --git a/addons/sale/i18n/sr.po b/addons/sale/i18n/sr.po
index 48914f5d014..8f0df74962f 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-18 13:18+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 05:39+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:38+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 06a4c1c2210..149170b20e4 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-18 13:24+0000\n"
+"PO-Revision-Date: 2010-08-19 05:43+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:38+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 ca4766c17a4..77d6ac24e53 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-18 13:12+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 05:37+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:38+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 a88be72e241..7cc8b5245a9 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-18 13:27+0000\n"
+"PO-Revision-Date: 2010-08-19 05:37+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:38+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 5d9667b1a06..a656800033e 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-18 13:15+0000\n"
+"PO-Revision-Date: 2010-08-19 05:44+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale
diff --git a/addons/sale_crm/wizard/crm_make_sale_view.xml b/addons/sale_crm/wizard/crm_make_sale_view.xml
index 736a0712b53..c6b589145c7 100644
--- a/addons/sale_crm/wizard/crm_make_sale_view.xml
+++ b/addons/sale_crm/wizard/crm_make_sale_view.xml
@@ -13,7 +13,7 @@
-
+
diff --git a/addons/sale_journal/i18n/pl.po b/addons/sale_journal/i18n/pl.po
index 37fcbc18ea9..b74af62af04 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-18 13:07+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 d05cb581ae4..0cf719af5bb 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-18 13:16+0000\n"
+"PO-Revision-Date: 2010-08-19 05:46+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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale_journal
diff --git a/addons/stock/i18n/bs.po b/addons/stock/i18n/bs.po
index be5648330d6..639387defad 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-18 13:06+0000\n"
+"PO-Revision-Date: 2010-08-19 05:39+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-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:36+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 ecde2b77c08..c655987bfbd 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-18 13:16+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 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-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock
diff --git a/addons/stock/i18n/it.po b/addons/stock/i18n/it.po
index 87b5b5bc25d..f4dd0433689 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-18 13:08+0000\n"
+"PO-Revision-Date: 2010-08-19 05:39+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-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:36+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 97886df994a..ebf7539312b 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-18 13:36+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 05:42+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-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:36+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 d1a0b88cf86..d58162e66cd 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-18 13:12+0000\n"
+"PO-Revision-Date: 2010-08-19 05:24+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-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:36+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 1881946505f..1d26d5c13ed 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-18 13:19+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 05:37+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-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:36+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 cb34ce47df0..2d336b2a05f 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-18 13:08+0000\n"
-"Last-Translator: vra (openerp) \n"
+"PO-Revision-Date: 2010-08-19 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-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:40+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 06410910d08..b72ff5a2793 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-18 13:22+0000\n"
+"PO-Revision-Date: 2010-08-19 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-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 6574d1c560f..e25ac4d1abf 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-18 13:12+0000\n"
+"PO-Revision-Date: 2010-08-19 05: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-19 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 84cd0eed7ea..66890cba860 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-18 13:31+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-19 03:46+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: subscription
diff --git a/addons/warning/i18n/tr.po b/addons/warning/i18n/tr.po
index ba86c85cb65..e65e62f7fa9 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-18 13:06+0000\n"
+"PO-Revision-Date: 2010-08-19 05:50+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-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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 7eba57a241c..fe6dfdb2450 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-18 13:21+0000\n"
+"PO-Revision-Date: 2010-08-19 05:52+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-19 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-08-20 03:39+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.
|