|
- [[ 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..f607f195d00 100644
--- a/addons/account_report/account_view.xml
+++ b/addons/account_report/account_view.xml
@@ -17,15 +17,13 @@
-
+
-
@@ -50,8 +48,6 @@
-
diff --git a/addons/account_report/account_wizard.xml b/addons/account_report/account_wizard.xml
index 1e07a8fc248..c731b89a34b 100644
--- a/addons/account_report/account_wizard.xml
+++ b/addons/account_report/account_wizard.xml
@@ -1,10 +1,5 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/addons/account_report/i18n/lt.po b/addons/account_report/i18n/lt.po
index 43443d10bf9..544f6a71695 100644
--- a/addons/account_report/i18n/lt.po
+++ b/addons/account_report/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:50+0000\n"
+"PO-Revision-Date: 2010-08-24 06:06+0000\n"
"Last-Translator: Fabien (Open ERP) \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-20 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-08-25 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/tr.po b/addons/account_report/i18n/tr.po
index 1e6843c2e6f..627c98cdf2a 100644
--- a/addons/account_report/i18n/tr.po
+++ b/addons/account_report/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:52+0000\n"
+"PO-Revision-Date: 2010-08-24 06:09+0000\n"
"Last-Translator: Fabien (Open ERP) \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-20 03:36+0000\n"
+"X-Launchpad-Export-Date: 2010-08-25 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/report/accounting_report.py b/addons/account_report/report/accounting_report.py
index 1bb6e7bbab8..f38f09d1e7f 100644
--- a/addons/account_report/report/accounting_report.py
+++ b/addons/account_report/report/accounting_report.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#
##############################################################################
@@ -42,8 +42,6 @@ class accounting_report(report_sxw.rml_parse):
'amount':res[0]['amount'],
'note':res[0]['note'],
'level': level,
-# 'color_font':res[0]['color_font'],
-# 'color_back':res[0]['color_back'],
}
self.ret_list.append(ret_dict)
diff --git a/addons/account_report/report/print_indicator.py b/addons/account_report/report/print_indicator.py
index 4245bf40415..55596764dc6 100644
--- a/addons/account_report/report/print_indicator.py
+++ b/addons/account_report/report/print_indicator.py
@@ -23,15 +23,6 @@ import pooler
import time
from report import report_sxw
-#from report.interface import report_int
-#from reportlab.graphics.shapes import Drawing
-#from reportlab.graphics.charts.barcharts import VerticalBarChart
-#import reportlab.lib.colors as colors
-#from reportlab.graphics.widgetbase import Widget, TypedPropertyCollection
-#from reportlab.graphics.charts.textlabels import BarChartLabel
-#from reportlab.graphics import renderPM
-#from report.render import render
-#from report.interface import report_int
from pychart import *
import StringIO
theme.use_color = 1
@@ -70,14 +61,6 @@ class accounting_report_indicator(report_sxw.rml_parse):
ind_ids=self.pool.get('account.report.report').search(self.cr,self.uid,[])
obj_inds=self.pool.get('account.report.report').browse(self.cr,self.uid,ind_ids)
-# def find_child(obj):
-# self.list.append(obj)
-# if obj.child_ids:
-# for child in obj.child_ids:
-# find_child(child)
-# return True
-#
-# find_child(obj_inds)
for obj_ind in obj_inds:
level = 0
@@ -245,39 +228,6 @@ class accounting_report_indicator(report_sxw.rml_parse):
if intercall:
return True
self.count +=1
-# drawing = Drawing(400, 300)
-# data = [
-# tuple(data_val),
-# ]
-# value_min=0.0
-# vmin=min(data_val)
-# vmax=max(data_val)
-#
-# val_min=((vmin < 0.00 and vmin-2.00) or 0.00)
-# # calculating maximum
-# val_max=(vmax/(pow(10,len(str(int(vmax)))-2))+1)*pow(10,len(str(int(vmax)))-2)
-# bc = VerticalBarChart()
-# bc.x = 50
-# bc.y = 50
-# bc.height = 245
-# bc.width = 300
-# bc.data = data
-# value_step=(abs(val_max)-abs(val_min))/5
-#
-# bc.strokeColor = colors.black
-# bc.valueAxis.valueMin = val_min
-# bc.valueAxis.valueMax = val_max
-# bc.valueAxis.valueStep = value_step
-#
-# bc.categoryAxis.labels.boxAnchor = 'ne'
-# bc.categoryAxis.labels.dx = 8
-#
-# bc.categoryAxis.labels.dy = -2
-# bc.categoryAxis.labels.angle = 30
-# bc.categoryAxis.categoryNames = data_period
-# drawing.add(bc)
-# drawing.save(formats=['png'],fnRoot=path+str(self.count),title="helo")
-# renderPM.drawToFile(drawing1, 'example1.jpg','jpg')
import os
path=tools.config['addons_path']+"/account_report/tmp_images/image"
@@ -286,7 +236,6 @@ class accounting_report_indicator(report_sxw.rml_parse):
os.mkdir(dirname)
can = canvas.init('image'+str(self.count)+".png")
-# can.clip(0,0,600,400)
data=zip(self.header_name,self.header_val)
@@ -300,7 +249,6 @@ class accounting_report_indicator(report_sxw.rml_parse):
can.close()
os.system('cp '+'image'+str(self.count)+'.png ' +path+str(self.count)+'.png')
os.system('rm '+'image'+str(self.count)+'.png')
-# can.endclip()
return path+str(self.count)+'.png'
report_sxw.report_sxw('report.print.indicators', 'account.report.history',
diff --git a/addons/account_reporting/account.py b/addons/account_reporting/account.py
index c8b3273491a..c1c68f04d9b 100644
--- a/addons/account_reporting/account.py
+++ b/addons/account_reporting/account.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#
##############################################################################
import time
@@ -88,7 +88,6 @@ class account_report_bs(osv.osv):
'code': fields.char('Code', size=64, required=True),
'account_id': fields.many2many('account.account', 'account_report_rel', 'report_id', 'account_id', 'Accounts'),
'note': fields.text('Note'),
-# 'style': fields.selection(_style, 'Style'),
'color_font' : fields.many2one('color.rml','Font Color'),
'color_back' : fields.many2one('color.rml','Back Color'),
'font_style' : fields.selection(_font, 'Font'),
diff --git a/addons/account_reporting/account_report.xml b/addons/account_reporting/account_report.xml
index 7603aaf5c45..ebfe70e4c50 100644
--- a/addons/account_reporting/account_report.xml
+++ b/addons/account_reporting/account_report.xml
@@ -1,18 +1,6 @@
-
-
-
-
-
-
-
diff --git a/addons/account_reporting/i18n/lt.po b/addons/account_reporting/i18n/lt.po
index 1b4f2e593ac..8799d418803 100644
--- a/addons/account_reporting/i18n/lt.po
+++ b/addons/account_reporting/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:45+0000\n"
+"PO-Revision-Date: 2010-08-24 06:02+0000\n"
"Last-Translator: Fabien (Open ERP) \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-25 03:55+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/tr.po b/addons/account_reporting/i18n/tr.po
index e894d1e3d8c..bc45bff2370 100644
--- a/addons/account_reporting/i18n/tr.po
+++ b/addons/account_reporting/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:53+0000\n"
+"PO-Revision-Date: 2010-08-24 06:09+0000\n"
"Last-Translator: Fabien (Open ERP) \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-25 03:55+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/report/account_report_bs.py b/addons/account_reporting/report/account_report_bs.py
index 89ad84d1065..22628224306 100644
--- a/addons/account_reporting/report/account_report_bs.py
+++ b/addons/account_reporting/report/account_report_bs.py
@@ -24,7 +24,6 @@ import pooler
import locale
from report import report_sxw
-#from addons.account.wizard import wizard_account_balance_report
parents = {
'tr':1,
@@ -124,8 +123,6 @@ class account_report_bs(report_sxw.rml_parse):
res1['level'] = r['level'] + 1
break
result.append(res1)
- #res1 = self.check_child_id(account_id,level,ctx,report_type)
- #result += res1
if report_obj.child_id:
ids2 = [(x.code,x.id) for x in report_obj.child_id]
ids2.sort()
@@ -133,33 +130,6 @@ class account_report_bs(report_sxw.rml_parse):
return result
-# def check_child_id(self,account_id,level,ctx,report_type):
-# account = self.pool.get('account.account').browse(self.cr,self.uid,[account_id],ctx)[0]
-# result = []
-# res = {
-# 'code': account.code,
-# 'name': account.name,
-# 'level': level+1,
-# 'balance': account.balance,
-# 'color_font' : 'black',
-# 'color_back' :'white',
-# 'font_style' : 'Helvetica',
-# }
-# result.append(res)
-# if report_type != 'with_account':
-# acc_child_id = self.pool.get('account.account').search(self.cr,self.uid,[('parent_id','=',[account_id]),('type','=','view')])
-# for child_id in acc_child_id :
-# result += self.check_child_id(child_id,level+1,ctx,report_type)
-# return result
-#
-#
-#
-# def _sum_credit(self):
-# return self.sum_credit
-#
-# def _sum_debit(self):
-# return self.sum_debit
-
report_sxw.report_sxw('report.account.report.bs', 'account.report.bs', 'addons/account_reporting/report/account_report_bs.rml', parser=account_report_bs)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_tax_include/account_tax_include.py b/addons/account_tax_include/account_tax_include.py
index 20adc9bcfcc..afd1ef36ae7 100644
--- a/addons/account_tax_include/account_tax_include.py
+++ b/addons/account_tax_include/account_tax_include.py
@@ -161,8 +161,6 @@ class account_invoice_line(osv.osv):
# note: will call product_id_change_unit_price_inv with context...
# Temporary trap, for bad context that came from koo:
- # if isinstance(context, str):
- # print "str context:", context
ctx = (context and context.copy()) or {}
ctx.update({'price_type': ctx.get('price_type', 'tax_excluded')})
diff --git a/addons/account_tax_include/i18n/tr.po b/addons/account_tax_include/i18n/tr.po
index 97a384c4ba7..8e787f4e345 100644
--- a/addons/account_tax_include/i18n/tr.po
+++ b/addons/account_tax_include/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:51+0000\n"
+"PO-Revision-Date: 2010-08-24 06:06+0000\n"
"Last-Translator: Fabien (Open ERP) \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
+"X-Launchpad-Export-Date: 2010-08-25 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index d76f1881d71..d02011de47e 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -42,10 +42,11 @@
"voucher_workflow.xml",
"voucher_report.xml",
"wizard/account_voucher_open_view.xml",
+ "wizard/account_voucher_unreconcile_view.xml",
"voucher_view.xml",
"voucher_sales_purchase_view.xml",
"voucher_payment_receipt_view.xml",
- "voucher_wizard.xml"
+ "voucher_wizard.xml",
],
"test" : [
# "test/account_voucher.yml",
diff --git a/addons/account_voucher/i18n/lt.po b/addons/account_voucher/i18n/lt.po
index 419215d661f..86cff924204 100644
--- a/addons/account_voucher/i18n/lt.po
+++ b/addons/account_voucher/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:51+0000\n"
+"PO-Revision-Date: 2010-08-24 06:07+0000\n"
"Last-Translator: Fabien (Open ERP) \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-25 03:55+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/tr.po b/addons/account_voucher/i18n/tr.po
index 84688fefa25..c5119caa6ac 100644
--- a/addons/account_voucher/i18n/tr.po
+++ b/addons/account_voucher/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:51+0000\n"
+"PO-Revision-Date: 2010-08-24 06:06+0000\n"
"Last-Translator: Fabien (Open ERP) \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-25 03:55+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/report/report_voucher.py b/addons/account_voucher/report/report_voucher.py
index 1524f972e6a..a3f3bb0380d 100644
--- a/addons/account_voucher/report/report_voucher.py
+++ b/addons/account_voucher/report/report_voucher.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#
##############################################################################
@@ -37,19 +37,19 @@ class report_voucher(report_sxw.rml_parse):
def convert(self, amount, cur):
amt_en = amount_to_text_en.amount_to_text(amount, 'en', cur);
return amt_en
-
+
def debit(self, move_ids):
debit = 0.0
- for move in move_ids:#self.pool.get('account.move.line').browse(self.cr, self.uid, move_ids):
+ for move in move_ids:
debit +=move.debit
return debit
-
+
def credit(self, move_ids):
credit = 0.0
- for move in move_ids:#self.pool.get('account.move.line').browse(self.cr, self.uid, move_ids):
+ for move in move_ids:
credit +=move.credit
return credit
-
+
def _get_ref(self, voucher_id, move_ids):
voucher_line = self.pool.get('account.voucher.line').search(self.cr, self.uid, [('partner_id','=',move_ids.partner_id.id), ('voucher_id','=',voucher_id)])
if voucher_line:
diff --git a/addons/account_voucher/report/rml_parse.py b/addons/account_voucher/report/rml_parse.py
index 721c87fbcf5..e23d8c52947 100644
--- a/addons/account_voucher/report/rml_parse.py
+++ b/addons/account_voucher/report/rml_parse.py
@@ -107,7 +107,6 @@ class rml_parse(report_sxw.rml_parse):
return Stringer
def explode_this(self,chaine,length):
- #chaine = self.repair_string(chaine)
chaine = rstrip(chaine)
ast = list(chaine)
i = length
diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index 23fe8ae7493..2c2ea28b7c9 100644
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -40,6 +40,17 @@ class account_journal(osv.osv):
}
account_journal()
+class account_account(osv.osv):
+ """
+ account_account
+ """
+
+ _inherit = 'account.account'
+ _columns = {
+ 'user_type_type': fields.related('user_type','report_type', type='char', size=64, relation='account.account.type', string='User Type Code', readonly=True, store=True)
+ }
+account_account()
+
class account_move(osv.osv):
_inherit = 'account.move'
@@ -150,33 +161,6 @@ class account_voucher(osv.osv):
else:
return self.pool.get('res.currency').search(cr, uid, [('rate','=',1.0)])[0]
- def _compute_total(self, cr, uid, ids, name, args, context=None):
- position_pool = self.pool.get('account.fiscal.position')
- voucher_pool = self.pool.get('account.voucher')
- voucher_line_pool = self.pool.get('account.voucher.line')
- partner_pool = self.pool.get('res.partner')
- tax_pool = self.pool.get('account.tax')
-
- res = {}
- for voucher in self.browse(cr, uid, ids):
- total = 0.0
- for line in voucher.payment_ids:
- total += line.amount
-
-# tax = tax_pool.browse(cr, uid, voucher.tax_id.id)
-# total_tax = total * (voucher.tax_amount/100)
-
-# tax_id = voucher.tax_id.id
-# partner = voucher.partner_id and partner_pool.browse(cr, uid, voucher.partner_id.id) or False
-# taxes = position_pool.map_tax(cr, uid, partner and partner.property_account_position or False, [voucher.tax_id])
-# taxes = tax_pool.browse(cr, uid, taxes)
-# for tax in tax_pool.compute_all(cr, uid, taxes, res[voucher.id], 1).get('taxes'):
-# total_tax += tax.get('amount')
-
- res[voucher.id] = total + voucher.tax_amount
-
- return res
-
_name = 'account.voucher'
_description = 'Accounting Voucher'
_order = "id desc"
@@ -189,7 +173,7 @@ class account_voucher(osv.osv):
('sale','Sale'),
('purchase','Purchase'),
],'Type', select=True, readonly=True),
- 'name':fields.char('Memo', size=256, required=False, readonly=True, states={'draft':[('readonly',False)]}),
+ 'name':fields.char('Memo', size=256, readonly=True, states={'draft':[('readonly',False)]}),
'date':fields.date('Date', readonly=True, states={'draft':[('readonly',False)]}, help="Effective date for accounting entries"),
'journal_id':fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
'account_id':fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft':[('readonly',False)]}),
@@ -210,7 +194,8 @@ class account_voucher(osv.osv):
\n* The \'Pro-forma\' when voucher is in Pro-forma state,voucher does not have an voucher number. \
\n* The \'Posted\' state is used when user create voucher,a voucher number is generated and voucher entries are created in account \
\n* The \'Cancelled\' state is used when user cancel voucher.'),
- 'amount': fields.function(_compute_total, method=True, type='float', digits=(14,2), string='Total', store=True),
+ #'amount': fields.function(_compute_total, method=True, type='float', digits=(14,2), string='Total', store=True),
+ 'amount': fields.float('Total', digits=(16, 2), readonly=True, states={'draft':[('readonly',False)]}),
'tax_amount':fields.float('Tax Amount', digits=(14,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."),
'number': fields.related('move_id', 'name', type="char", readonly=True, string='Number'),
@@ -232,32 +217,77 @@ class account_voucher(osv.osv):
'currency_id': _get_currency,
'state': lambda *a: 'draft',
'pay_now':lambda *a: 'pay_later',
- 'name': lambda *a: '/',
+ 'name': lambda *a: '',
'date' : lambda *a: time.strftime('%Y-%m-%d'),
'audit': lambda *a: False,
'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.voucher',context=c),
}
-
- def onchange_tax_id(self, cr, uid, ids, amount, tax_id, context={}):
- res = {
- 'tax_amount':False
- }
+
+ def compute_tax(self, cr, uid, ids, context={}):
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
- })
+ partner_pool = self.pool.get('res.partner')
+ position_pool = self.pool.get('account.fiscal.position')
+ voucher_line_pool = self.pool.get('account.voucher.line')
+
+ for voucher in self.browse(cr, uid, ids):
+ total = 0.0
+ for line in voucher.payment_ids:
+ total += line.amount
+
+ if voucher.tax_id:
+ tax_id = voucher.tax_id.id
+ tax = [tax_pool.browse(cr, uid, tax_id)]
+
+ if voucher.partner_id:
+ partner = partner_pool.browse(cr, uid, voucher.partner_id) or False
+ taxes = position_pool.map_tax(cr, uid, partner and partner.property_account_position or False, tax)
+ tax = tax_pool.browse(cr, uid, taxes)
+
+ voucher_total_tax = 0.0
+ voucher_total_amount = 0.0
+ if voucher.tax_id.price_include:
+ for line in voucher.payment_ids:
+ total_amount = 0.0
+ total_tax = 0.0
+ for tax_line in tax_pool.compute_all(cr, uid, tax, line.amount, 1).get('taxes'):
+ total_tax += tax_line.get('amount')
+ total_amount += tax_line.get('price_unit')
+ voucher_total_tax += total_tax
+ voucher_line_pool.write(cr, uid, [line.id], {'amount':total_amount})
+ voucher_total_amount = total
+ else:
+ for tax_line in tax_pool.compute_all(cr, uid, tax, total, 1).get('taxes'):
+ voucher_total_tax += tax_line.get('amount')
+ voucher_total_amount = total + voucher_total_tax
+ self.write(cr, uid, [voucher.id], {'tax_amount':voucher_total_tax, 'amount':voucher_total_amount})
+
+ return True
+
+ def onchange_price(self, cr, uid, ids, payment_ids, tax_id, partner_id=False, context={}):
+ tax_pool = self.pool.get('account.tax')
+ partner_pool = self.pool.get('res.partner')
+ position_pool = self.pool.get('account.fiscal.position')
+
+ res = {
+ 'tax_amount':False,
+ 'amount':False
+ }
+
+ tax_amount = 0.0
+ total = 0.0
+
+ for line in payment_ids:
+ total += line[2].get('amount')
+
+ res.update({
+ 'amount':total,
+ 'tax_amount':tax_amount
+ })
return {
'value':res
}
-
+
def create(self, cr, uid, vals, context={}):
"""
Create a new record for a model account_voucher
@@ -273,9 +303,10 @@ class account_voucher(osv.osv):
new_lines = []
payment_ids = vals.get('payment_ids')
+
if not payment_ids:
payment_ids = []
-
+
vals.update({
'payment_ids':False
})
@@ -292,6 +323,7 @@ class account_voucher(osv.osv):
vals.update({
'payment_ids':new_lines
})
+
res_id = super(account_voucher, self).create(cr, uid, vals, context)
if old_line:
@@ -300,15 +332,16 @@ class account_voucher(osv.osv):
id1 = line[0]
id2 = line[1]
res = line[2]
- res.update({
- 'voucher_id':res_id
- })
- new_payment_ids += [(id1, id2, res)]
+ if res:
+ res.update({
+ 'voucher_id':res_id
+ })
+ new_payment_ids += [(id1, id2, res)]
self.write(cr, uid, [res_id], {'payment_ids':new_payment_ids})
return res_id
- def onchange_partner_id(self, cr, uid, ids, partner_id, ttype, context={}):
+ def onchange_partner_id(self, cr, uid, ids, partner_id, ttype, journal_id=False, context={}):
"""
Returns a dict that contains new values and context
@@ -322,7 +355,9 @@ class account_voucher(osv.osv):
"""
move_pool = self.pool.get('account.move')
line_pool = self.pool.get('account.voucher.line')
+ move_line_pool = self.pool.get('account.move.line')
partner_pool = self.pool.get('res.partner')
+ journal_pool = self.pool.get('account.journal')
res = []
context.update({
@@ -330,56 +365,87 @@ class account_voucher(osv.osv):
'partner_id':partner_id,
'voucher':True,
})
+ if journal_id:
+ context.update({
+ 'journal_id':journal_id,
+ })
default = {
- 'value':{},
+ 'value':{'payment_ids':[],'amount':0.0},
'context':context,
}
- if not partner_id or not ttype:
+ if not partner_id:
if ids:
line_ids = line_pool.search(cr, uid, [('voucher_id','=',ids[0])])
if line_ids:
line_pool.unlink(cr, uid, line_ids)
return default
-
+
account_id = False
partner = partner_pool.browse(cr, uid, partner_id)
- if ttype in ('sale', 'receipt'):
+ if ttype in ('sale'):
account_id = partner.property_account_receivable.id
- elif ttype in ('purchase', 'payment'):
+ elif ttype in ('purchase'):
account_id = partner.property_account_payable.id
-
+ elif ttype in ('payment', 'receipt'):
+ journal = journal_pool.browse(cr, uid, journal_id)
+ if ttype == 'payment':
+ account_id = journal.default_credit_account_id.id
+ elif ttype == 'receipt':
+ account_id = journal.default_debit_account_id.id
+
default['value'].update({
'account_id':account_id
})
-
if ttype not in ('payment', 'receipt'):
return default
voucher_id = ids and ids[0] or False
- ids = move_pool.search(cr, uid, [('reconcile_id','=', False), ('state','=','posted'), ('partner_id','=',partner_id)], context=context)
- for move in move_pool.browse(cr, uid, ids):
- rs = {
- 'ref':move.ref or '/',
- 'move_id':move.id,
+ search_type = 'credit'
+ account_type = False
+ if ttype == 'receipt':
+ search_type = 'debit'
+ account_type = 'receivable'
+ elif ttype == 'payment':
+ search_type = 'credit'
+ account_type = 'payable'
+
+ ids = move_line_pool.search(cr, uid, [('account_id.type','=', account_type), ('reconcile_id','=', False), ('partner_id','=',partner_id), (search_type,'>',0)], context=context)
+ total = 0.0
+ for line in move_line_pool.browse(cr, uid, ids):
+ amount = 0.0
+ rs = move_line_pool.default_get(cr, uid, move_line_pool._columns.keys(), context=context)
+ rs.update({
+ 'name':line.move_id.name,
+ 'ref':line.ref or '/',
+ 'move_id':line.move_id.id,
+ 'move_line_id':line.id,
'voucher_id':voucher_id,
- }
+ 'amount':amount,
+ })
+
if ttype == 'payment':
rs.update({
- 'account_id':move.partner_id.property_account_payable.id,
- 'type':'dr',
- 'amount':move.amount
+ 'account_id':line.account_id, #line.move_id.partner_id.property_account_payable.id,
+ #'amount':line.credit
})
+ amount = line.credit
elif ttype == 'receipt':
rs.update({
- 'account_id':move.partner_id.property_account_receivable.id,
- 'type':'cr',
- 'amount':move.amount
+ 'account_id':line.move_id.partner_id.property_account_receivable.id,
+ #'amount':line.debit
})
- line_id = line_pool.create(cr, uid, rs)
+ amount = line.debit
+
+ total += amount
+ line_id = line_pool.create(cr, uid, rs, context=context)
res += [line_id]
- res = {'payment_ids':res, 'account_id':account_id}
+ res = {
+ 'payment_ids':res,
+ 'account_id':account_id,
+ 'amount':total
+ }
return {
'value':res,
'context':context,
@@ -435,7 +501,7 @@ class account_voucher(osv.osv):
def proforma_voucher(self, cr, uid, ids, context={}):
self.action_move_line_create(cr, uid, ids)
- self.write(cr, uid, ids, {'state':'posted'})
+ #self.write(cr, uid, ids, )
return True
def action_cancel_draft(self, cr, uid, ids, context={}):
@@ -454,10 +520,6 @@ class account_voucher(osv.osv):
move_pool.button_cancel(cr, uid, [voucher.move_id.id])
move_pool.unlink(cr, uid, [voucher.move_id.id])
- line_ids = voucher_line_pool.search(cr, uid, [('voucher_id','=',voucher.id), ('is_tax','=',True)])
- if line_ids:
- voucher_line_pool.unlink(cr, uid, line_ids)
-
res = {
'state':'cancel',
'move_id':False,
@@ -496,6 +558,7 @@ class account_voucher(osv.osv):
}
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')
@@ -545,10 +608,10 @@ class account_voucher(osv.osv):
#create the first line manually
move_line = {
- 'name':inv.name,
+ 'name':inv.name and inv.name or '/',
'debit':False,
'credit':False,
- 'account_id':False,
+ 'account_id':inv.account_id.id,
'move_id':move_id ,
'journal_id':inv.journal_id.id,
'period_id':inv.period_id.id,
@@ -564,31 +627,33 @@ class account_voucher(osv.osv):
'amount_currency':amount_currency,
'currency_id':inv.currency_id.id
})
-
- if inv.type == 'sale':
+
+ total_amount = inv.amount
+ if inv.type in ('sale', 'receipt'):
move_line.update({
- 'account_id':inv.account_id.id,
- 'debit':inv.amount
+ 'debit':total_amount
})
elif inv.type == 'purchase':
move_line.update({
- 'account_id':inv.account_id.id,
- 'credit':inv.amount
+ 'credit':total_amount
})
line_ids = []
- line_ids += [move_line_pool.create(cr, uid, move_line)]
- rec_ids = []
-
+
+ master_line = move_line_pool.create(cr, uid, move_line)
+ line_ids += [master_line]
+ rec_list_ids = []
+ line_total = 0.0
+
for line in inv.payment_ids:
-
+ rec_ids = []
amount=0.0
if inv.type in ('payment'):
ref = line.ref
move_line = {
- 'name':line.name,
+ 'name':line.name and line.name or '/',
'debit':False,
'credit':False,
'account_id':line.account_id.id or False,
@@ -614,7 +679,8 @@ class account_voucher(osv.osv):
'analytic_account_id':line.account_analytic_id.id
})
- if inv.type in ('sale'):
+ line_total += line.amount
+ if inv.type in ('sale', 'receipt'):
move_line.update({
'credit': line.amount or False
})
@@ -626,16 +692,21 @@ class account_voucher(osv.osv):
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 line.move_line_id:
+ rec_ids += [line.move_line_id.id]
+
+ if rec_ids:
+ rec_list_ids.append(rec_ids)
if inv.type in ('sale', 'purchase') and inv.tax_amount > 0:
+ name = '/'
+ if not inv.tax_id:
+ name = inv.tax_id.name
move_line = {
- 'name':inv.tax_id.name,
+ 'name':name,
'account_id':False,
'move_id':move_id ,
'journal_id':inv.journal_id.id,
@@ -663,19 +734,35 @@ class account_voucher(osv.osv):
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)
-
+ if line_total != inv.amount and inv.type in ('payment', 'receipt'):
+ name = '/'
+
+ move_line = {
+ 'name':name,
+ 'account_id':False,
+ 'move_id':move_id ,
+ 'journal_id':inv.journal_id.id,
+ 'period_id':inv.period_id.id,
+ 'partner_id':inv.partner_id.id,
+ 'ref':ref,
+ 'date':inv.date
+ }
+ account_id = False
+
rec = {
- 'move_id': move_id
+ 'move_id': move_id,
+ 'state':'posted'
}
- 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={})
-
+ for rec_ids in rec_list_ids:
+ move_line_pool.reconcile_partial(cr, uid, rec_ids)
+
+ inv = self.browse(cr, uid, inv.id)
+ name = inv.name and inv.name or inv.number
+ message = _('Voucher ') + " '" + str(name) + "' "+ _("is confirm")
+ self.log(cr, uid, inv.id, message)
return True
def _convert_ref(self, cr, uid, ref):
@@ -724,10 +811,10 @@ class account_voucher(osv.osv):
#Restrict the list of journal view in search view
if view_type == 'search':
journal_list = journal_pool.name_search(cr, uid, '', [], context=context)
- res['fields']['journal_id']['selection'] = journal_list
+ res['fields']['journal_id']['selection'] = journal_list
return res
-
+
account_voucher()
class account_voucher_line(osv.osv):
@@ -736,24 +823,100 @@ class account_voucher_line(osv.osv):
_columns = {
'voucher_id':fields.many2one('account.voucher', 'Voucher'),
- 'name':fields.related('voucher_id', 'name', size=256, type='char', string='Description'),
+ 'name':fields.char('Description', size=256),
'account_id':fields.many2one('account.account','Account', required=True, domain=[('type','<>','view')]),
'partner_id':fields.related('voucher_id', 'partner_id', type='many2one', relation='res.partner', string='Partner'),
'amount':fields.float('Amount'),
- 'type':fields.selection([('dr','Debit'),('cr','Credit')], 'Cr/Dr'),
+# 'type':fields.selection([('dr','Debit'),('cr','Credit')], 'Cr/Dr'),
'ref':fields.char('Reference', size=32),
'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account'),
- 'is_tax':fields.boolean('Tax ?', required=False),
'stype':fields.selection([('service','Service'),('other','Other')], 'Product Type'),
'move_line_id': fields.many2one('account.move.line', 'Journal Item'),
- 'date_original': fields.date('Date', readonly="1"), #fields.related account.move.line
- 'date_due': fields.date('Due Date', readonly="1"), #fields.related account.move.line
+ 'date_original': fields.related('move_line_id','date', type='date', relation='account.move.line', string='Date', readonly="1"),
+# 'date_original': fields.date('Date', readonly="1"), #fields.related account.move.line
+ 'date_due': fields.related('move_line_id','date_maturity', type='date', relation='account.move.line', string='Due Date', readonly="1"),
+# 'date_due': fields.date('Due Date', readonly="1"), #fields.related account.move.line
'amount_original': fields.float('Originial Amount', readonly="1"), #fields.related account.move.line
- 'amount_unreconciled': fields.float('Open Balance', readonly="1"), #fields.related account.move.line
+ 'amount_unreconciled': fields.related('move_line_id','balance', type='float', relation='account.move.line', string='Open Balance', readonly="1"),
+# 'amount_unreconciled': fields.float('Open Balance', readonly="1"), #fields.related account.move.line
'move_id' : fields.many2one('account.move','Bill / Invoice'),
}
_defaults = {
- 'type': lambda *a: 'cr'
+ 'name': lambda *a: '/'
}
+ def onchange_move_line_id(self, cr, user, ids, move_line_id, context={}):
+ """
+ Returns a dict that contains new values and context
+
+ @param cr: A database cursor
+ @param user: ID of the user currently logged in
+ @param move_line_id: latest value from user input for field move_line_id
+ @param args: other arguments
+ @param context: context arguments, like lang, time zone
+
+ @return: Returns a dict which contains new values, and context
+ """
+ res = {}
+ move_line_pool = self.pool.get('account.move.line')
+ if move_line_id:
+ move_line = move_line_pool.browse(cr, user, move_line_id)
+
+ move_id = move_line.move_id.id
+ amount = move_line.credit and move_line.credit or move_line.debit
+ account_id = move_line.account_id.id
+
+ res.update({
+ 'move_id':move_id,
+ 'amount':amount,
+ 'account_id':account_id
+ })
+ context.update({
+ 'journal_id':move_line.journal_id.id,
+ 'partner_id':move_line.partner_id.id,
+ 'account_id':account_id
+ })
+ return {
+ 'value':res,
+ 'context':context,
+ }
+
+ def default_get(self, cr, user, fields_list, context=None):
+ """
+ Returns default values for fields
+ @param cr: A database cursor
+ @param user: ID of the user currently logged in
+ @param fields_list: list of fields, for which default values are required to be read
+ @param context: context arguments, like lang, time zone
+
+ @return: Returns a dict that contains default values for fields
+ """
+ journal_pool = self.pool.get('account.journal')
+ partner_pool = self.pool.get('res.partner')
+ account_id = False
+
+ values = super(account_voucher_line, self).default_get(cr, user, fields_list, context=context)
+ journal_id = context.get('journal_id', False)
+ ttype = context.get('type', False)
+ partner_id = context.get('partner_id', False)
+
+ if ttype and journal_id and ttype in ('sale', 'purchase'):
+ journal = journal_pool.browse(cr, user, journal_id)
+ if ttype == 'sale' and journal:
+ account_id = journal.default_credit_account_id and journal.default_credit_account_id.id or False
+ elif ttype == 'purchase' and journal:
+ account_id = journal.default_credit_account_id and journal.default_debit_account_id.id or False
+ elif ttype and partner_id and ttype in ('payment', 'receipt'):
+ partner = partner_pool.browse(cr, user, partner_id)
+ if ttype == 'receipt' and partner:
+ account_id = partner.property_account_receivable and partner.property_account_receivable.id or False
+ elif ttype == 'payment' and partner:
+ account_id = partner.property_account_receivable and partner.property_account_payable.id or False
+
+ if not account_id:
+ raise osv.except_osv(_('Invalid Error !'), _('Please change partner and try again !'))
+ values.update({
+ 'account_id':account_id
+ })
+ return values
account_voucher_line()
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index e2c66b890e2..06d77904dba 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -8,7 +8,7 @@
@@ -77,30 +78,28 @@
diff --git a/addons/account_voucher/voucher_report.xml b/addons/account_voucher/voucher_report.xml
index f6f721b93ef..57134d3cdec 100644
--- a/addons/account_voucher/voucher_report.xml
+++ b/addons/account_voucher/voucher_report.xml
@@ -10,13 +10,13 @@
header = "False"
menu="True"/>
-
+
+
+
+
+
+
+
+
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index ad5e742b3e0..f049524d5b6 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -8,19 +8,18 @@
@@ -91,7 +91,7 @@
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index f692654c73b..fd9ecc6c806 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -81,10 +81,8 @@
-
-
@@ -187,48 +185,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Journal Vouchers
@@ -241,51 +197,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
account.journal.form.inherit
account.journal
@@ -317,10 +228,5 @@
-
-
-
-
-
-
+
diff --git a/addons/account_voucher/voucher_wizard.xml b/addons/account_voucher/voucher_wizard.xml
index b8851b51afe..86c8221f417 100644
--- a/addons/account_voucher/voucher_wizard.xml
+++ b/addons/account_voucher/voucher_wizard.xml
@@ -1,18 +1,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/account_voucher/voucher_workflow.xml b/addons/account_voucher/voucher_workflow.xml
index 961032458c9..9c4f2d15e71 100644
--- a/addons/account_voucher/voucher_workflow.xml
+++ b/addons/account_voucher/voucher_workflow.xml
@@ -7,18 +7,11 @@
True
-
-
-
-
-
-
True
proforma
write({'state':'draft'})
-
function
@@ -30,12 +23,12 @@
True
-
-
- recheck
- voucher_recheck()
- function
-
+
+
+
+
+
+
@@ -44,52 +37,32 @@
cancel_voucher()
function
-
-
-
-
-
-
-
-
-
-
-
-
-
-
proforma_voucher
- amount <= journal_id.max_amount
+ True
-
-
-
- proforma_voucher
- amount > journal_id.max_amount
-
-
-
-
-
- recheck_voucher
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
- cancel_voucher
-
diff --git a/addons/account_voucher/wizard/__init__.py b/addons/account_voucher/wizard/__init__.py
index bd436ecd135..a5c9a5e4f59 100644
--- a/addons/account_voucher/wizard/__init__.py
+++ b/addons/account_voucher/wizard/__init__.py
@@ -20,3 +20,4 @@
##############################################################################
import account_voucher_open
+import account_voucher_unreconcile
diff --git a/addons/account_voucher_payment/wizard/account_voucher_unreconcile.py b/addons/account_voucher/wizard/account_voucher_unreconcile.py
similarity index 100%
rename from addons/account_voucher_payment/wizard/account_voucher_unreconcile.py
rename to addons/account_voucher/wizard/account_voucher_unreconcile.py
diff --git a/addons/account_voucher_payment/wizard/account_voucher_unreconcile_view.xml b/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
similarity index 100%
rename from addons/account_voucher_payment/wizard/account_voucher_unreconcile_view.xml
rename to addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
diff --git a/addons/account_voucher_payment/__init__.py b/addons/account_voucher_payment/__init__.py
deleted file mode 100755
index ad7558e11ee..00000000000
--- a/addons/account_voucher_payment/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2009 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-import account_voucher_payment
-import wizard
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_voucher_payment/__openerp__.py b/addons/account_voucher_payment/__openerp__.py
deleted file mode 100755
index 04dc4f08945..00000000000
--- a/addons/account_voucher_payment/__openerp__.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2009 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-{
- "name" : "Invoice Payment/Receipt by Vouchers.",
- "version" : "1.0",
- "author" : 'OpenERP SA & Axelor',
- "description": """Extension Account Voucher module includes allows to link payment / receipt
- entries with voucher, also automatically reconcile during the payment and receipt entries
- """,
- "category" : "Generic Modules/Accounting",
- "website" : "http://www.openerp.com",
- "depends" : [
- "base",
- "account",
- "account_voucher",
- ],
- "init_xml" : [
- ],
-
- "demo_xml" : [],
- "update_xml" : [
- "security/ir.model.access.csv",
- "wizard/account_voucher_unreconcile_view.xml",
- "account_voucher_payment_view.xml",
-
- ],
- "test" : [
- "test/account_voucher_payment.yml",
- ],
-
- "active": False,
- "installable": True,
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_voucher_payment/account_voucher_payment.py b/addons/account_voucher_payment/account_voucher_payment.py
deleted file mode 100755
index 6e57e0efc12..00000000000
--- a/addons/account_voucher_payment/account_voucher_payment.py
+++ /dev/null
@@ -1,280 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2009 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-from osv import fields, osv
-from tools.translate import _
-
-#class account_move_line(osv.osv):
-# _inherit = "account.move.line"
-# _columns = {
-# 'voucher_invoice': fields.many2one('account.invoice', 'Invoice', readonly=True),
-# }
-#account_move_line()
-
-class account_voucher(osv.osv):
- _inherit = 'account.voucher'
-
- _columns = {
- 'payment_ids':fields.one2many('account.voucher.line', 'voucher_id', 'Voucher Lines', readonly=True, states={'draft':[('readonly',False)]}),
- }
-
- def action_move_line_create(self, cr, uid, ids, *args):
-
- journal_pool = self.pool.get('account.journal')
- sequence_pool = self.pool.get('ir.sequence')
- move_pool = self.pool.get('account.move')
- move_line_pool = self.pool.get('account.move.line')
- analytic_pool = self.pool.get('account.analytic.line')
- currency_pool = self.pool.get('res.currency')
- invoice_pool = self.pool.get('account.invoice')
- invoice_pool = self.pool.get('account.invoice')
-
- for inv in self.browse(cr, uid, ids):
-
- if inv.move_id:
- continue
-
- if not inv.payment_ids:
- raise osv.except_osv(_('Error !'), _('Please define lines on voucher !'))
-
- journal = journal_pool.browse(cr, uid, inv.journal_id.id)
- if journal.sequence_id:
- name = sequence_pool.get_id(cr, uid, journal.sequence_id.id)
- else:
- raise osv.except_osv(_('Error !'), _('Please define sequence on journal !'))
-
- ref = False
- if inv.type in ('purchase', 'receipt'):
- ref = inv.reference
- else:
- ref = invoice_pool._convert_ref(cr, uid, name)
-
- company_currency = inv.company_id.currency_id.id
- diff_currency_p = inv.currency_id.id <> company_currency
-
- move = {
- 'name' : name,
- 'journal_id': journal.id,
- 'type' : inv.type,
- 'narration' : inv.narration and inv.narration or inv.name,
- 'date':inv.date,
- 'ref':ref
- }
-
- if inv.period_id:
- move.update({
- 'period_id': inv.period_id.id
- })
-
- move_id = move_pool.create(cr, uid, move)
-
- #create the first line manually
- move_line = {
- 'name':inv.name,
- 'debit':False,
- 'credit':False,
- 'account_id':inv.account_id.id or False,
- 'move_id':move_id ,
- 'journal_id':inv.journal_id.id,
- 'period_id':inv.period_id.id,
- 'partner_id':inv.partner_id.id,
- 'ref':ref,
- 'date':inv.date
- }
- if diff_currency_p:
- amount_currency = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, inv.amount)
- inv.amount = amount_currency
- move_line.update({
- 'amount_currency':amount_currency,
- 'currency_id':inv.currency_id.id
- })
-
- if inv.type in ('receipt', 'purchase'):
- move_line['debit'] = inv.amount
- else:
- move_line['credit'] = inv.amount
-
- line_ids = []
- line_ids += [move_line_pool.create(cr, uid, move_line)]
- rec_ids = []
-
- if inv.type == 'sale' and inv.pay_now == 'pay_now':
- #create the payment line manually
- move_line = {
- 'name':inv.name,
- 'debit':inv.pay_amount,
- 'credit':False,
- 'account_id':inv.pay_account_id.id or False,
- 'move_id':move_id ,
- 'journal_id':inv.pay_journal_id.id,
- 'period_id':inv.period_id.id,
- 'partner_id':inv.partner_id.id,
- 'ref':ref,
- 'date':inv.date
- }
- line_ids += [move_line_pool.create(cr, uid, move_line)]
- else:
- for line in inv.payment_ids:
-
- amount=0.0
-
- if inv.type in ('payment'):
- ref = line.ref
-
- move_line = {
- 'name':line.name,
- 'debit':False,
- 'credit':False,
- 'account_id':line.account_id.id or False,
- 'move_id':move_id ,
- 'journal_id':inv.journal_id.id,
- 'period_id':inv.period_id.id,
- 'partner_id':line.partner_id.id or False,
- 'ref':ref,
- 'date':inv.date,
- 'analytic_account_id':False
- }
-
- if diff_currency_p:
- amount_currency = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, line.amount)
- line.amount = amount_currency
- move_line.update({
- 'amount_currency':amount_currency,
- 'currency_id':inv.currency_id.id
- })
-
- if line.account_analytic_id:
- move_line.update({
- 'analytic_account_id':line.account_analytic_id.id
- })
-
- if line.type == 'dr':
- move_line.update({
- 'debit': line.amount or False
- })
-
- elif line.type == 'cr':
- move_line.update({
- 'credit': line.amount or False
- })
-
- move_line_id = move_line_pool.create(cr, uid, move_line)
- line_ids += [move_line_id]
-
- if line.move_id and inv.type in ('payment', 'receipt'):
- rec_ids += [move_line_id]
- for move_line in line.move_id.line_id:
- if line.account_id.id == move_line.account_id.id:
- rec_ids += [move_line.id]
-
- if rec_ids:
- move_line_pool.reconcile_partial(cr, uid, rec_ids)
-
- rec = {
- 'move_id': move_id
- }
-
- message = _('Voucher ') + " '" + inv.name + "' "+ _("is confirm")
- self.log(cr, uid, inv.id, message)
-
- self.write(cr, uid, [inv.id], rec)
- move_pool.post(cr, uid, [move_id], context={})
-
- return True
-
-account_voucher()
-
-class account_voucher_line(osv.osv):
- _inherit = 'account.voucher.line'
-
- def default_get(self, cr, uid, fields, context={}):
- data = super(account_voucher_line, self).default_get(cr, uid, fields, context)
- self.voucher_context = context
- return data
-
- _columns = {
- 'move_id' : fields.many2one('account.move','Bill / Invoice'),
- }
-
- def move_line_get_item(self, cr, uid, line, context={}):
- res = super(account_voucher_line, self).move_line_get_item(cr, uid, line, context)
- res['invoice'] = line.invoice_id or False
- return res
-
- def onchange_invoice_id(self, cr, uid, ids, invoice_id, currency_id):
- currency_pool = self.pool.get('res.currency')
- invoice_pool = self.pool.get('account.move')
- res = {
-
- }
- if not invoice_id:
- return {
- 'value':res
- }
- else:
- invoice = invoice_pool.browse(cr, uid, invoice_id)
- residual = invoice.amount
-
- company_currency = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id
- currency_diff = company_currency != currency_id
-
- if currency_diff:
- residual = currency_pool.compute(cr, uid, company_currency, currency_id, residual)
-
- if residual > 0:
- res.update({
- 'amount': residual,
- 'ref':invoice.name
- })
-
- return {
- 'value':res
- }
-
- def onchange_line_account(self, cr, uid, ids, account_id, type, type1):
- if not account_id:
- return {'value' : {'account_id' : False, 'type' : False ,'amount':False}}
- obj = self.pool.get('account.account')
- acc_id = False
-
- if type1 in ('receipt'):
- acc_id = obj.browse(cr, uid, account_id)
- balance = acc_id.credit
- type = 'cr'
- elif type1 in ('payment') :
- acc_id = obj.browse(cr, uid, account_id)
- balance = acc_id.debit
- type = 'dr'
- elif type1 in ('sale') :
- acc_id = obj.browse(cr, uid, account_id)
- balance = acc_id.credit
- type = 'dr'
- elif type1 in ('purchase') :
- acc_id = obj.browse(cr, uid, account_id)
- balance = acc_id.debit
- type = 'cr'
-
- return {
- 'value' : {'type' : type, 'amount':balance}
- }
-account_voucher_line()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_voucher_payment/account_voucher_payment_view.xml b/addons/account_voucher_payment/account_voucher_payment_view.xml
deleted file mode 100755
index 894229f26e7..00000000000
--- a/addons/account_voucher_payment/account_voucher_payment_view.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-
-
-
-
- account.voucher.form.payment.unreconcile
- account.voucher
- form
-
-
-
-
-
-
-
- account.voucher.form.receipt.unreconcile
- account.voucher
- form
-
-
-
-
-
-
-
-
-
diff --git a/addons/account_voucher_payment/i18n/account_voucher_payment.pot b/addons/account_voucher_payment/i18n/account_voucher_payment.pot
deleted file mode 100644
index 0a6e050af91..00000000000
--- a/addons/account_voucher_payment/i18n/account_voucher_payment.pot
+++ /dev/null
@@ -1,82 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_voucher_payment
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-13 20:11:36+0000\n"
-"PO-Revision-Date: 2009-05-13 20:11:36+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: account_voucher_payment
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation transactions"
-msgstr ""
-
-#. module: account_voucher_payment
-#: model:ir.module.module,description:account_voucher_payment.module_name_translation
-msgid "This module includes :\n"
-" * It reconcile the invoice (supplier, customer) while paying through \n"
-" Accounting Vouchers\n"
-" "
-msgstr ""
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"
-msgstr ""
-
-#. module: account_voucher_payment
-#: view:account.voucher:0
-#: field:account.voucher,voucher_line_ids:0
-msgid "Voucher Lines"
-msgstr ""
-
-#. module: account_voucher_payment
-#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation
-msgid "Invoice Payment/Receipt by Vouchers."
-msgstr ""
-
-#. module: account_voucher_payment
-#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
-msgid "Unreconcile entries"
-msgstr ""
-
-#. module: account_voucher_payment
-#: field:account.move.line,voucher_invoice:0
-#: field:account.voucher.line,invoice_id:0
-msgid "Invoice"
-msgstr ""
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: account_voucher_payment
-#: field:account.voucher,partner_id:0
-msgid "Partner"
-msgstr ""
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,unrec:0
-msgid "Unreconcile"
-msgstr ""
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation"
-msgstr ""
-
diff --git a/addons/account_voucher_payment/i18n/ca.po b/addons/account_voucher_payment/i18n/ca.po
deleted file mode 100644
index 225da8f9e95..00000000000
--- a/addons/account_voucher_payment/i18n/ca.po
+++ /dev/null
@@ -1,95 +0,0 @@
-# Catalan translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2009-05-13 20:11+0000\n"
-"PO-Revision-Date: 2010-08-10 15:03+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"\n"
-"Language-Team: Catalan \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:08+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_voucher_payment
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invàlid per a la definició de la vista!"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation transactions"
-msgstr "Trenca conciliació de transaccions"
-
-#. module: account_voucher_payment
-#: model:ir.module.module,description:account_voucher_payment.module_name_translation
-msgid ""
-"This module includes :\n"
-" * It reconcile the invoice (supplier, customer) while paying through \n"
-" Accounting Vouchers\n"
-" "
-msgstr ""
-"Aquest mòdul inclou:\n"
-" * Concilia factures de proveïdors i clients mentre són pagades "
-"mitjançant \n"
-" comprovants comptables\n"
-" "
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Si trenqueu conciliació de transaccions, també heu de comprovar totes les "
-"accions que estan relacionades amb aquestes transaccions ja que no seran "
-"eliminades"
-
-#. module: account_voucher_payment
-#: view:account.voucher:0
-#: field:account.voucher,voucher_line_ids:0
-msgid "Voucher Lines"
-msgstr "Línies de comprovant"
-
-#. module: account_voucher_payment
-#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation
-msgid "Invoice Payment/Receipt by Vouchers."
-msgstr "Pagaments i rebuts de factures per comprovant."
-
-#. module: account_voucher_payment
-#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
-msgid "Unreconcile entries"
-msgstr "Trenca conciliació entrades"
-
-#. module: account_voucher_payment
-#: field:account.move.line,voucher_invoice:0
-#: field:account.voucher.line,invoice_id:0
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,end:0
-msgid "Cancel"
-msgstr "Cancel·la"
-
-#. module: account_voucher_payment
-#: field:account.voucher,partner_id:0
-msgid "Partner"
-msgstr ""
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,unrec:0
-msgid "Unreconcile"
-msgstr "Trenca conciliació"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation"
-msgstr "Trenca conciliació"
diff --git a/addons/account_voucher_payment/i18n/ca_ES.po b/addons/account_voucher_payment/i18n/ca_ES.po
deleted file mode 100644
index 6bafc34d136..00000000000
--- a/addons/account_voucher_payment/i18n/ca_ES.po
+++ /dev/null
@@ -1,81 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_voucher_payment
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-13 19:47:47+0000\n"
-"PO-Revision-Date: 2009-05-16 18:57+0100\n"
-"Last-Translator: Jordi Esteve \n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: \n"
-
-#. module: account_voucher_payment
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invàlid per a la definició de la vista!"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation transactions"
-msgstr "Trenca conciliació de transaccions"
-
-#. module: account_voucher_payment
-#: field:account.move.line,voucher_invoice:0
-#: field:account.voucher.line,invoice_id:0
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"
-msgstr "Si trenqueu conciliació de transaccions, també heu de comprovar totes les accions que estan relacionades amb aquestes transaccions ja que no seran eliminades"
-
-#. module: account_voucher_payment
-#: view:account.voucher:0
-#: field:account.voucher,voucher_line_ids:0
-msgid "Voucher Lines"
-msgstr "Línies de comprovant"
-
-#. module: account_voucher_payment
-#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation
-msgid "Invoice Payment/Receipt by Vouchers."
-msgstr "Pagaments i rebuts de factures per comprovant."
-
-#. module: account_voucher_payment
-#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
-msgid "Unreconcile entries"
-msgstr "Trenca conciliació entrades"
-
-#. module: account_voucher_payment
-#: model:ir.module.module,description:account_voucher_payment.module_name_translation
-msgid ""
-"This module includes :\n"
-" * It reconcile the invoice (supplier, customer) while paying through \n"
-" Accounting Vouchers\n"
-" "
-msgstr ""
-"Aquest mòdul inclou:\n"
-" * Concilia factures de proveïdors i clients mentre són pagades mitjançant \n"
-" comprovants comptables\n"
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,end:0
-msgid "Cancel"
-msgstr "Cancel·la"
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,unrec:0
-msgid "Unreconcile"
-msgstr "Trenca conciliació"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation"
-msgstr "Trenca conciliació"
-
diff --git a/addons/account_voucher_payment/i18n/el.po b/addons/account_voucher_payment/i18n/el.po
deleted file mode 100644
index 5531e87022f..00000000000
--- a/addons/account_voucher_payment/i18n/el.po
+++ /dev/null
@@ -1,93 +0,0 @@
-# Greek translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2009-05-13 20:11+0000\n"
-"PO-Revision-Date: 2010-06-22 05:05+0000\n"
-"Last-Translator: Panayiotis Konstantinidis \n"
-"Language-Team: Greek \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:08+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_voucher_payment
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Λανθασμένο XML για αρχιτεκτονική όψης!"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation transactions"
-msgstr "Ασυμβίβαστες συναλλαγές"
-
-#. module: account_voucher_payment
-#: model:ir.module.module,description:account_voucher_payment.module_name_translation
-msgid ""
-"This module includes :\n"
-" * It reconcile the invoice (supplier, customer) while paying through \n"
-" Accounting Vouchers\n"
-" "
-msgstr ""
-"Αυτή η μονάδα περιλαμβάνει :\n"
-" * Εναρμονίζει το τιμολόγιο ( προμηθευτή, πελάτη ) καθώς πληρώνει απο τον "
-"\n"
-" Λογαριασμό Παραστατικών\n"
-" "
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Αν ακυρώσετε συμφωνημένες συναλλαγές θα πρέπει να ελέγξετε όλες τις "
-"ενέργειες που συνδέονται με αυτές διότι δεν θα διαγραφούν."
-
-#. module: account_voucher_payment
-#: view:account.voucher:0
-#: field:account.voucher,voucher_line_ids:0
-msgid "Voucher Lines"
-msgstr "Γραμμές Παραστατικού"
-
-#. module: account_voucher_payment
-#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation
-msgid "Invoice Payment/Receipt by Vouchers."
-msgstr "Πληρωμή Τιμολογίου/ Απόδειξη απο Παραστατικό"
-
-#. module: account_voucher_payment
-#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
-msgid "Unreconcile entries"
-msgstr "Ασυμβίβαστες εγγραφές"
-
-#. module: account_voucher_payment
-#: field:account.move.line,voucher_invoice:0
-#: field:account.voucher.line,invoice_id:0
-msgid "Invoice"
-msgstr "Τιμολόγιο"
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,end:0
-msgid "Cancel"
-msgstr "Ακύρωση"
-
-#. module: account_voucher_payment
-#: field:account.voucher,partner_id:0
-msgid "Partner"
-msgstr "Συνεργάτης"
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,unrec:0
-msgid "Unreconcile"
-msgstr "Ακυρώνω"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation"
-msgstr "Ακύρωση"
diff --git a/addons/account_voucher_payment/i18n/es.po b/addons/account_voucher_payment/i18n/es.po
deleted file mode 100644
index 134c11751e9..00000000000
--- a/addons/account_voucher_payment/i18n/es.po
+++ /dev/null
@@ -1,94 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2009-05-13 20:11+0000\n"
-"PO-Revision-Date: 2010-08-11 05:38+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"\n"
-"Language-Team: Spanish \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:08+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_voucher_payment
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation transactions"
-msgstr "Romper conciliación de transacciones"
-
-#. module: account_voucher_payment
-#: model:ir.module.module,description:account_voucher_payment.module_name_translation
-msgid ""
-"This module includes :\n"
-" * It reconcile the invoice (supplier, customer) while paying through \n"
-" Accounting Vouchers\n"
-" "
-msgstr ""
-"Este módulo incluye :\n"
-" * Concilia facturas de proveedores y clientes mientras son pagadas "
-"mediante \n"
-" comprobantes contables\n"
-" "
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Si rompe conciliación de transacciones, también debe verificar todas las "
-"acciones que están enlazadas a estas transacciones porque no serán eliminadas"
-
-#. module: account_voucher_payment
-#: view:account.voucher:0
-#: field:account.voucher,voucher_line_ids:0
-msgid "Voucher Lines"
-msgstr "Líneas de comprobante"
-
-#. module: account_voucher_payment
-#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation
-msgid "Invoice Payment/Receipt by Vouchers."
-msgstr "Pagos y recibos de facturas por comprobantes."
-
-#. module: account_voucher_payment
-#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
-msgid "Unreconcile entries"
-msgstr "Romper concilación entradas"
-
-#. module: account_voucher_payment
-#: field:account.move.line,voucher_invoice:0
-#: field:account.voucher.line,invoice_id:0
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,end:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: account_voucher_payment
-#: field:account.voucher,partner_id:0
-msgid "Partner"
-msgstr "Compañero"
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,unrec:0
-msgid "Unreconcile"
-msgstr "Romper conciliación"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation"
-msgstr "Romper conciliación"
diff --git a/addons/account_voucher_payment/i18n/es_ES.po b/addons/account_voucher_payment/i18n/es_ES.po
deleted file mode 100644
index 28765ce533a..00000000000
--- a/addons/account_voucher_payment/i18n/es_ES.po
+++ /dev/null
@@ -1,81 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_voucher_payment
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-13 19:47:47+0000\n"
-"PO-Revision-Date: 2009-05-16 18:57+0100\n"
-"Last-Translator: Jordi Esteve \n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: \n"
-
-#. module: account_voucher_payment
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation transactions"
-msgstr "Romper conciliación de transacciones"
-
-#. module: account_voucher_payment
-#: field:account.move.line,voucher_invoice:0
-#: field:account.voucher.line,invoice_id:0
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"
-msgstr "Si rompe conciliación de transacciones, también debe verificar todas las acciones que están enlazadas a estas transacciones porque no serán eliminadas"
-
-#. module: account_voucher_payment
-#: view:account.voucher:0
-#: field:account.voucher,voucher_line_ids:0
-msgid "Voucher Lines"
-msgstr "Líneas de comprobante"
-
-#. module: account_voucher_payment
-#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation
-msgid "Invoice Payment/Receipt by Vouchers."
-msgstr "Pagos y recibos de facturas por comprobantes."
-
-#. module: account_voucher_payment
-#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
-msgid "Unreconcile entries"
-msgstr "Romper concilación entradas"
-
-#. module: account_voucher_payment
-#: model:ir.module.module,description:account_voucher_payment.module_name_translation
-msgid ""
-"This module includes :\n"
-" * It reconcile the invoice (supplier, customer) while paying through \n"
-" Accounting Vouchers\n"
-" "
-msgstr ""
-"Este módulo incluye :\n"
-" * Concilia facturas de proveedores y clientes mientras son pagadas mediante \n"
-" comprobantes contables\n"
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,end:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,unrec:0
-msgid "Unreconcile"
-msgstr "Romper conciliación"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation"
-msgstr "Romper conciliación"
-
diff --git a/addons/account_voucher_payment/i18n/et.po b/addons/account_voucher_payment/i18n/et.po
deleted file mode 100644
index ff959abf935..00000000000
--- a/addons/account_voucher_payment/i18n/et.po
+++ /dev/null
@@ -1,86 +0,0 @@
-# Estonian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2009-05-13 20:11+0000\n"
-"PO-Revision-Date: 2010-06-08 17:42+0000\n"
-"Last-Translator: lyyser \n"
-"Language-Team: Estonian \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:08+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_voucher_payment
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation transactions"
-msgstr "Mittesobivad tehingud"
-
-#. module: account_voucher_payment
-#: model:ir.module.module,description:account_voucher_payment.module_name_translation
-msgid ""
-"This module includes :\n"
-" * It reconcile the invoice (supplier, customer) while paying through \n"
-" Accounting Vouchers\n"
-" "
-msgstr ""
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-
-#. module: account_voucher_payment
-#: view:account.voucher:0
-#: field:account.voucher,voucher_line_ids:0
-msgid "Voucher Lines"
-msgstr "Tähiku read"
-
-#. module: account_voucher_payment
-#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation
-msgid "Invoice Payment/Receipt by Vouchers."
-msgstr ""
-
-#. module: account_voucher_payment
-#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
-msgid "Unreconcile entries"
-msgstr "Kooskõlastamatta kirjed"
-
-#. module: account_voucher_payment
-#: field:account.move.line,voucher_invoice:0
-#: field:account.voucher.line,invoice_id:0
-msgid "Invoice"
-msgstr "Arve"
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,end:0
-msgid "Cancel"
-msgstr "Katkesta"
-
-#. module: account_voucher_payment
-#: field:account.voucher,partner_id:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,unrec:0
-msgid "Unreconcile"
-msgstr ""
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation"
-msgstr ""
diff --git a/addons/account_voucher_payment/i18n/fr_BE.po b/addons/account_voucher_payment/i18n/fr_BE.po
deleted file mode 100644
index 07044b31a84..00000000000
--- a/addons/account_voucher_payment/i18n/fr_BE.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_voucher_payment
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-11-26 06:54:11+0000\n"
-"PO-Revision-Date: 2009-11-26 06:54:11+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: account_voucher_payment
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation transactions"
-msgstr ""
-
-#. module: account_voucher_payment
-#: field:account.move.line,voucher_invoice:0
-#: field:account.voucher.line,invoice_id:0
-msgid "Invoice"
-msgstr ""
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"
-msgstr ""
-
-#. module: account_voucher_payment
-#: view:account.voucher:0
-#: field:account.voucher,voucher_line_ids:0
-msgid "Voucher Lines"
-msgstr ""
-
-#. module: account_voucher_payment
-#: model:ir.module.module,shortdesc:account_voucher_payment.module_meta_information
-msgid "Invoice Payment/Receipt by Vouchers."
-msgstr ""
-
-#. module: account_voucher_payment
-#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
-msgid "Unreconcile entries"
-msgstr ""
-
-#. module: account_voucher_payment
-#: model:ir.module.module,description:account_voucher_payment.module_meta_information
-msgid "This module includes :\n"
-" * It reconcile the invoice (supplier, customer) while paying through \n"
-" Accounting Vouchers\n"
-" "
-msgstr ""
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,unrec:0
-msgid "Unreconcile"
-msgstr ""
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation"
-msgstr ""
-
diff --git a/addons/account_voucher_payment/i18n/pt_BR.po b/addons/account_voucher_payment/i18n/pt_BR.po
deleted file mode 100644
index 65d8341d436..00000000000
--- a/addons/account_voucher_payment/i18n/pt_BR.po
+++ /dev/null
@@ -1,89 +0,0 @@
-# Brazilian Portuguese translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2009-05-13 20:11+0000\n"
-"PO-Revision-Date: 2010-07-28 14:21+0000\n"
-"Last-Translator: Leandro Chaves \n"
-"Language-Team: Brazilian Portuguese \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:08+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_voucher_payment
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para a arquitetura de exibição"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation transactions"
-msgstr "Transações não conciliadas"
-
-#. module: account_voucher_payment
-#: model:ir.module.module,description:account_voucher_payment.module_name_translation
-msgid ""
-"This module includes :\n"
-" * It reconcile the invoice (supplier, customer) while paying through \n"
-" Accounting Vouchers\n"
-" "
-msgstr ""
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Se você desfazer a reconciliação de transações, você deve também verificar "
-"todas as ações que estão ligadas a essas operações, porque elas não serão "
-"desfeitas pelo sistema"
-
-#. module: account_voucher_payment
-#: view:account.voucher:0
-#: field:account.voucher,voucher_line_ids:0
-msgid "Voucher Lines"
-msgstr "Linhas de Comprovantes"
-
-#. module: account_voucher_payment
-#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation
-msgid "Invoice Payment/Receipt by Vouchers."
-msgstr ""
-
-#. module: account_voucher_payment
-#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
-msgid "Unreconcile entries"
-msgstr "Anular reconciliação de lançamentos"
-
-#. module: account_voucher_payment
-#: field:account.move.line,voucher_invoice:0
-#: field:account.voucher.line,invoice_id:0
-msgid "Invoice"
-msgstr "Fatura"
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,end:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: account_voucher_payment
-#: field:account.voucher,partner_id:0
-msgid "Partner"
-msgstr "Parceiro"
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,unrec:0
-msgid "Unreconcile"
-msgstr "Não concilidado"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation"
-msgstr "Desconciliação"
diff --git a/addons/account_voucher_payment/i18n/sl.po b/addons/account_voucher_payment/i18n/sl.po
deleted file mode 100644
index f090b7071f9..00000000000
--- a/addons/account_voucher_payment/i18n/sl.po
+++ /dev/null
@@ -1,88 +0,0 @@
-# Slovenian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2009-05-13 20:11+0000\n"
-"PO-Revision-Date: 2010-07-28 12:23+0000\n"
-"Last-Translator: Simon Vidmar \n"
-"Language-Team: Slovenian \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:08+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_voucher_payment
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neveljaven XML za arhitekturo pogleda!"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation transactions"
-msgstr "Preklic uskladitve transakcij"
-
-#. module: account_voucher_payment
-#: model:ir.module.module,description:account_voucher_payment.module_name_translation
-msgid ""
-"This module includes :\n"
-" * It reconcile the invoice (supplier, customer) while paying through \n"
-" Accounting Vouchers\n"
-" "
-msgstr ""
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr ""
-"Če prekličete uskladitev transakcij, morate tudi preveriti vse akcije, ki so "
-"povezane s temi transakcijami, kajti le te ne bodo onemogočene."
-
-#. module: account_voucher_payment
-#: view:account.voucher:0
-#: field:account.voucher,voucher_line_ids:0
-msgid "Voucher Lines"
-msgstr ""
-
-#. module: account_voucher_payment
-#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation
-msgid "Invoice Payment/Receipt by Vouchers."
-msgstr ""
-
-#. module: account_voucher_payment
-#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
-msgid "Unreconcile entries"
-msgstr "Prekliči uskladitev vknjižb"
-
-#. module: account_voucher_payment
-#: field:account.move.line,voucher_invoice:0
-#: field:account.voucher.line,invoice_id:0
-msgid "Invoice"
-msgstr "Račun"
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,end:0
-msgid "Cancel"
-msgstr "Prekliči"
-
-#. module: account_voucher_payment
-#: field:account.voucher,partner_id:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,unrec:0
-msgid "Unreconcile"
-msgstr "Prekliči uskladitev"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation"
-msgstr "Preklic uskladitve"
diff --git a/addons/account_voucher_payment/i18n/zh_CN.po b/addons/account_voucher_payment/i18n/zh_CN.po
deleted file mode 100644
index 00ccf4661a2..00000000000
--- a/addons/account_voucher_payment/i18n/zh_CN.po
+++ /dev/null
@@ -1,90 +0,0 @@
-# Chinese (Simplified) translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2009-05-13 20:11+0000\n"
-"PO-Revision-Date: 2010-07-14 03:27+0000\n"
-"Last-Translator: Black Jack \n"
-"Language-Team: Chinese (Simplified) \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:08+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_voucher_payment
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation transactions"
-msgstr "取消对账"
-
-#. module: account_voucher_payment
-#: model:ir.module.module,description:account_voucher_payment.module_name_translation
-msgid ""
-"This module includes :\n"
-" * It reconcile the invoice (supplier, customer) while paying through \n"
-" Accounting Vouchers\n"
-" "
-msgstr ""
-"这模块包括:\n"
-" *在支付时核销发票(供应商, 客户) \n"
-" 原始凭证\n"
-" "
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
-msgstr "如果取消交易的核销, 你必须检验链接该交易的所有操作. 因为他们不会被禁止."
-
-#. module: account_voucher_payment
-#: view:account.voucher:0
-#: field:account.voucher,voucher_line_ids:0
-msgid "Voucher Lines"
-msgstr "原始凭证明细"
-
-#. module: account_voucher_payment
-#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation
-msgid "Invoice Payment/Receipt by Vouchers."
-msgstr "发票付款/ 收入的原始凭证"
-
-#. module: account_voucher_payment
-#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
-msgid "Unreconcile entries"
-msgstr "取消核销"
-
-#. module: account_voucher_payment
-#: field:account.move.line,voucher_invoice:0
-#: field:account.voucher.line,invoice_id:0
-msgid "Invoice"
-msgstr "发票"
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,end:0
-msgid "Cancel"
-msgstr "取消"
-
-#. module: account_voucher_payment
-#: field:account.voucher,partner_id:0
-msgid "Partner"
-msgstr "业务伙伴"
-
-#. module: account_voucher_payment
-#: wizard_button:account.voucher.unreconcile,init,unrec:0
-msgid "Unreconcile"
-msgstr "取消核销"
-
-#. module: account_voucher_payment
-#: wizard_view:account.voucher.unreconcile,init:0
-msgid "Unreconciliation"
-msgstr "取消对账"
diff --git a/addons/account_voucher_payment/security/ir.model.access.csv b/addons/account_voucher_payment/security/ir.model.access.csv
deleted file mode 100644
index 0343f29f43a..00000000000
--- a/addons/account_voucher_payment/security/ir.model.access.csv
+++ /dev/null
@@ -1 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
diff --git a/addons/account_voucher_payment/test/account_voucher_payment.yml b/addons/account_voucher_payment/test/account_voucher_payment.yml
deleted file mode 100644
index 8bcea6a23a4..00000000000
--- a/addons/account_voucher_payment/test/account_voucher_payment.yml
+++ /dev/null
@@ -1,118 +0,0 @@
--
- In order to test account_voucher_payment module in OpenERP I create an invoice and paid it through voucher
--
- I create a customer invoice record
--
- !record {model: account.invoice, id: account_invoice_voucher_payment}:
- account_id: account.a_recv
- address_contact_id: base.res_partner_address_3000
- address_invoice_id: base.res_partner_address_3000
- company_id: base.main_company
- currency_id: base.EUR
- invoice_line:
- - account_id: account.a_sale
- name: '[PC1] Basic PC'
- price_unit: 450.0
- quantity: 1.0
- product_id: product.product_product_pc1
- uos_id: product.product_uom_unit
- journal_id: account.sales_journal
- partner_id: base.res_partner_desertic_hispafuentes
- reference_type: none
-
--
- I check that Initially customer invoice is in the "Draft" state
--
- !assert {model: account.invoice, id: account_invoice_voucher_payment}:
- - state == 'draft'
--
- I change the state of invoice to "Proforma2" by clicking PRO-FORMA button
--
- !workflow {model: account.invoice, action: invoice_proforma2, ref: account_invoice_voucher_payment}
--
- I check that the invoice state is now "Proforma2"
--
- !assert {model: account.invoice, id: account_invoice_voucher_payment}:
- - state == 'proforma2'
--
- I create invoice by clicking on Create button
--
- !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_voucher_payment}
--
- I check that the invoice state is "Open"
--
- !assert {model: account.invoice, id: account_invoice_voucher_payment}:
- - state == 'open'
-
--
- I create a voucher record for above invoice
--
- !record {model: account.voucher, id: account_voucher_voucherforaxelor1}:
- account_id: account.cash
- company_id: base.main_company
- currency_id: base.EUR
- journal_id: account.bank_journal
- name: Voucher for Axelor
- narration: Basic Pc
- payment_ids:
- - account_id: account.a_recv
- amount: 450.0
- name: Voucher for Axelor
- partner_id: base.res_partner_desertic_hispafuentes
- invoice_id: account_invoice_voucher_payment
- type: cr
- period_id: account.period_6
- reference_type: none
-
--
- I check that Initially customer voucher is in the "Draft" state
--
- !assert {model: account.voucher, id: account_voucher_voucherforaxelor1}:
- - state == 'draft'
--
- I change the state of voucher to "proforma" by clicking PRO-FORMA button
--
- !workflow {model: account.voucher, action: open_voucher, ref: account_voucher_voucherforaxelor1}
--
- I check that the voucher state is now "proforma"
--
- !assert {model: account.voucher, id: account_voucher_voucherforaxelor1}:
- - state == 'proforma'
--
- I create voucher by clicking on Create button
--
- !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_voucherforaxelor1}
--
- I check that the voucher state is "Waiting for re-checking"
--
- !assert {model: account.voucher, id: account_voucher_voucherforaxelor1}:
- - state == 'recheck'
--
- I clicked on Validate Button
--
- !workflow {model: account.voucher, action: recheck_voucher, ref: account_voucher_voucherforaxelor1}
--
- I check that the voucher state is "posted"
--
- !assert {model: account.voucher, id: account_voucher_voucherforaxelor1}:
- - state == 'posted'
-
--
- I check that Moves get created for this voucher
--
- !python {model: account.voucher}: |
- acc_id=self.browse(cr, uid, ref("account_voucher_voucherforaxelor1"))
- assert(acc_id.move_id)
-
--
- I check that the invoice state is now Done
--
- !assert {model: account.invoice, id: account_invoice_voucher_payment}:
- - state == 'paid'
-
-
-
-
-
-
-
diff --git a/addons/account_voucher_payment/wizard/__init__.py b/addons/account_voucher_payment/wizard/__init__.py
deleted file mode 100644
index 32ab938c5a6..00000000000
--- a/addons/account_voucher_payment/wizard/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2009 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-#
-##############################################################################
-
-import account_voucher_unreconcile
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic/__openerp__.py b/addons/analytic/__openerp__.py
index 80585ee39da..1f21fb3fce3 100644
--- a/addons/analytic/__openerp__.py
+++ b/addons/analytic/__openerp__.py
@@ -29,7 +29,8 @@
"description": """Module for defining analytic accounting object.
""",
"init_xml" : [],
- "update_xml": ["security/ir.model.access.csv",
+ "update_xml": ['security/analytic_security.xml',
+ "security/ir.model.access.csv",
],
'demo_xml': [
],
diff --git a/addons/analytic/i18n/de.po b/addons/analytic/i18n/de.po
new file mode 100644
index 00000000000..e9f672dcf4f
--- /dev/null
+++ b/addons/analytic/i18n/de.po
@@ -0,0 +1,269 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2010-06-18 10:59+0000\n"
+"PO-Revision-Date: 2010-08-23 06:40+0000\n"
+"Last-Translator: Ferdinand-chricar \n"
+"Language-Team: German \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-08-25 03:56+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: analytic
+#: field:account.analytic.account,child_ids:0
+msgid "Child Accounts"
+msgstr "untergeordnete Konten"
+
+#. module: analytic
+#: help:account.analytic.line,amount_currency:0
+msgid ""
+"The amount expressed in the related account currency if not equal to the "
+"company one."
+msgstr "Der Betrag in Fremdwährung, wenn diese von der Hauptwährung abweicht"
+
+#. module: analytic
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Der Objektname muss mit \"x_\" beginnen und darf keine Sonderzeichen "
+"beinhalten!"
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account Name"
+msgstr "Kontenbezeichnung"
+
+#. module: analytic
+#: help:account.analytic.line,unit_amount:0
+msgid "Specifies the amount of quantity to count."
+msgstr "Definiert die zu zählende Menge"
+
+#. module: analytic
+#: help:account.analytic.line,currency_id:0
+msgid "The related account currency if not equal to the company one."
+msgstr ""
+
+#. module: analytic
+#: model:ir.module.module,description:analytic.module_meta_information
+msgid ""
+"Module for defining analytic accounting object.\n"
+" "
+msgstr ""
+"Diese Module definiert analytische Kostenrechnung\n"
+" "
+
+#. module: analytic
+#: field:account.analytic.account,state:0
+msgid "State"
+msgstr "Status"
+
+#. module: analytic
+#: field:account.analytic.account,user_id:0
+msgid "Account Manager"
+msgstr "Konto Manager"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Draft"
+msgstr "Entwurf"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Closed"
+msgstr "Abgeschlossen"
+
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Soll"
+
+#. module: analytic
+#: help:account.analytic.account,state:0
+msgid ""
+"* When an account is created its in 'Draft' state. "
+" \n"
+"* If any associated partner is there, it can be in 'Open' state. "
+" \n"
+"* If any pending balance is there it can be in 'Pending'. "
+" \n"
+"* And finally when all the transactions are over, it can be in 'Close' "
+"state. \n"
+"* The project can be in either if the states 'Template' and 'Running'.\n"
+" If it is template then we can make projects based on the template projects. "
+"If its in 'Running' state it is a normal project. "
+" \n"
+" If it is to be reviewed then the state is 'Pending'.\n"
+" When the project is completed the state is set to 'Done'."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,type:0
+msgid "Account Type"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Template"
+msgstr "Vorlage"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Pending"
+msgstr "Unerledigt"
+
+#. module: analytic
+#: model:ir.model,name:analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Analyse Zeile"
+
+#. module: analytic
+#: field:account.analytic.account,description:0
+#: field:account.analytic.line,name:0
+msgid "Description"
+msgstr "Beschreibung"
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price."
+msgstr "Ergebnis aus Menge * Produkt Einstandspreis"
+
+#. module: analytic
+#: field:account.analytic.account,company_id:0
+#: field:account.analytic.line,company_id:0
+msgid "Company"
+msgstr "Mandant"
+
+#. module: analytic
+#: field:account.analytic.account,quantity_max:0
+msgid "Maximum Quantity"
+msgstr "Max. Menge"
+
+#. module: analytic
+#: field:account.analytic.line,user_id:0
+msgid "User"
+msgstr "Benutzer"
+
+#. module: analytic
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Übergeordnetes Analyse Konto"
+
+#. module: analytic
+#: field:account.analytic.line,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: analytic
+#: field:account.analytic.account,currency_id:0
+#: field:account.analytic.line,currency_id:0
+msgid "Account currency"
+msgstr "Währung des Kontos"
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "View"
+msgstr "Ansicht"
+
+#. module: analytic
+#: help:account.analytic.account,quantity_max:0
+msgid "Sets the higher limit of quantity of hours."
+msgstr "Obergrenze der Stunden"
+
+#. module: analytic
+#: field:account.analytic.account,credit:0
+msgid "Credit"
+msgstr "Haben"
+
+#. module: analytic
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Betrag"
+
+#. module: analytic
+#: field:account.analytic.account,contact_id:0
+msgid "Contact"
+msgstr "Ansprechpartner"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Cancelled"
+msgstr "Abgebrochen"
+
+#. module: analytic
+#: field:account.analytic.account,balance:0
+msgid "Balance"
+msgstr "Saldo"
+
+#. module: analytic
+#: field:account.analytic.account,date_start:0
+msgid "Date Start"
+msgstr "Startdatum"
+
+#. module: analytic
+#: field:account.analytic.account,quantity:0
+#: field:account.analytic.line,unit_amount:0
+msgid "Quantity"
+msgstr "Menge"
+
+#. module: analytic
+#: field:account.analytic.account,date:0
+msgid "Date End"
+msgstr "Enddatum"
+
+#. module: analytic
+#: field:account.analytic.account,code:0
+msgid "Account Code"
+msgstr "Kontonummer"
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: analytic
+#: field:account.analytic.account,complete_name:0
+msgid "Full Account Name"
+msgstr "vollständiger Kontoname"
+
+#. module: analytic
+#: field:account.analytic.line,account_id:0
+#: model:ir.model,name:analytic.model_account_analytic_account
+#: model:ir.module.module,shortdesc:analytic.module_meta_information
+msgid "Analytic Account"
+msgstr "Analytisches Konto"
+
+#. module: analytic
+#: field:account.analytic.account,company_currency_id:0
+msgid "Currency"
+msgstr "Währung"
+
+#. module: analytic
+#: field:account.analytic.line,amount_currency:0
+msgid "Amount currency"
+msgstr "Betrag in Währung"
+
+#. module: analytic
+#: field:account.analytic.account,partner_id:0
+msgid "Associated Partner"
+msgstr "Zugehöriger Partner"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Open"
+msgstr "Offen"
+
+#. module: analytic
+#: field:account.analytic.account,line_ids:0
+msgid "Analytic Entries"
+msgstr "Analytische Buchungen"
diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml
new file mode 100644
index 00000000000..a382380d962
--- /dev/null
+++ b/addons/analytic/security/analytic_security.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ analytic company rule
+
+
+ [('company_id','=',user.company_id.id)]
+
+
+
diff --git a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml b/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml
index 3288ca9daf8..39be4c76a23 100644
--- a/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml
+++ b/addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml
@@ -35,7 +35,6 @@
-
diff --git a/addons/analytic_journal_billing_rate/i18n/tr.po b/addons/analytic_journal_billing_rate/i18n/tr.po
index 698bc1f3bbe..3035a37b52f 100644
--- a/addons/analytic_journal_billing_rate/i18n/tr.po
+++ b/addons/analytic_journal_billing_rate/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:41+0000\n"
+"PO-Revision-Date: 2010-08-24 05:57+0000\n"
"Last-Translator: Fabien (Open ERP) \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-25 03:55+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py
index 2f5152faea6..0bb9afc3386 100644
--- a/addons/analytic_user_function/analytic_user_function.py
+++ b/addons/analytic_user_function/analytic_user_function.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#
##############################################################################
@@ -54,7 +54,7 @@ class hr_analytic_timesheet(osv.osv):
# Look in account, if no value for the user => look in parent until there is no more parent to look
# Take the first found... if nothing found => return False
def _get_related_user_account_recursiv(self, cr, uid, user_id, account_id):
-
+
temp=self.pool.get('analytic_user_funct_grid').search(cr, uid, [('user_id', '=', user_id),('account_id', '=', account_id) ])
account=self.pool.get('account.analytic.account').browse(cr, uid, account_id)
if temp:
@@ -64,21 +64,19 @@ class hr_analytic_timesheet(osv.osv):
return self._get_related_user_account_recursiv(cr, uid, user_id, account.parent_id.id)
else:
return False
-
-
+
+
def on_change_account_id(self, cr, uid, ids, account_id, user_id=False, unit_amount=0):
- #{'value': {'to_invoice': False, 'amount': (-162.0,), 'product_id': 7, 'general_account_id': (5,)}}
res = {}
if not (account_id):
#avoid a useless call to super
- return res
+ return res
if not (user_id):
return super(hr_analytic_timesheet, self).on_change_account_id(cr, uid, ids, account_id)
#get the browse record related to user_id and account_id
temp = self._get_related_user_account_recursiv(cr, uid, user_id, account_id)
- # temp = self.pool.get('analytic_user_funct_grid').search(cr, uid, [('user_id', '=', user_id),('account_id', '=', account_id) ])
if not temp:
#if there isn't any record for this user_id and account_id
return super(hr_analytic_timesheet, self).on_change_account_id(cr, uid, ids, account_id)
@@ -100,9 +98,9 @@ class hr_analytic_timesheet(osv.osv):
'for this product: "%s" (id:%d)') % \
(r.product_id.name, r.product_id.id,))
# Compute based on pricetype
- amount_unit = self.on_change_unit_amount(cr, uid, ids,
+ amount_unit = self.on_change_unit_amount(cr, uid, ids,
r.product_id.id, unit_amount, r.product_id.uom_id.id)['value']['amount']
-
+
amount = unit_amount * amount_unit
res ['value']['amount']= - round(amount, 2)
res ['value']['general_account_id']= a
@@ -112,19 +110,18 @@ class hr_analytic_timesheet(osv.osv):
res = {}
if not (user_id):
#avoid a useless call to super
- return res
+ return res
#get the old values from super
res = super(hr_analytic_timesheet, self).on_change_user_id(cr, uid, ids, user_id)
if account_id:
#get the browse record related to user_id and account_id
- # temp = self.pool.get('analytic_user_funct_grid').search(cr, uid, [('user_id', '=', user_id),('account_id', '=', account_id) ])
temp = self._get_related_user_account_recursiv(cr, uid, user_id, account_id)
if temp:
#add the value from the new relation analytic_user_funct_grid
r = self.pool.get('analytic_user_funct_grid').browse(cr, uid, temp)[0]
- res['value']['product_id'] = r.product_id.id
+ res['value']['product_id'] = r.product_id.id
#the change of product has to impact the amount, uom and general_account_id
a = r.product_id.product_tmpl_id.property_account_expense.id
@@ -136,9 +133,9 @@ class hr_analytic_timesheet(osv.osv):
'for this product: "%s" (id:%d)') % \
(r.product_id.name, r.product_id.id,))
# Compute based on pricetype
- amount_unit = self.on_change_unit_amount(cr, uid, ids,
+ amount_unit = self.on_change_unit_amount(cr, uid, ids,
r.product_id.id, unit_amount, r.product_id.uom_id.id)['value']['amount']
-
+
amount = unit_amount * amount_unit
res ['value']['amount']= - round(amount, 2)
res ['value']['general_account_id']= a
diff --git a/addons/analytic_user_function/i18n/tr.po b/addons/analytic_user_function/i18n/tr.po
index 5e9d2a2f653..dd1ab6308f4 100644
--- a/addons/analytic_user_function/i18n/tr.po
+++ b/addons/analytic_user_function/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-19 05:45+0000\n"
+"PO-Revision-Date: 2010-08-24 06:02+0000\n"
"Last-Translator: Fabien (Open ERP) \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
+"X-Launchpad-Export-Date: 2010-08-25 03:55+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/auction/__openerp__.py b/addons/auction/__openerp__.py
index 75b50113028..69fef0748c4 100644
--- a/addons/auction/__openerp__.py
+++ b/addons/auction/__openerp__.py
@@ -43,14 +43,11 @@
'init_xml': ['auction_sequence.xml', 'auction_data.xml'],
'update_xml': [
'security/ir.model.access.csv',
- # 'wizard/auction_lots_able_view.xml',
- # 'wizard/auction_lots_enable_view.xml',
'wizard/auction_lots_make_invoice_buyer_view.xml',
'wizard/auction_lots_make_invoice_view.xml',
'wizard/auction_taken_view.xml',
'wizard/auction_lots_auction_move_view.xml',
'wizard/auction_pay_buy_view.xml',
- #'wizard/auction_payer_sel_view.xml',
'wizard/auction_lots_sms_send_view.xml',
'wizard/auction_catalog_flagey_view.xml',
'wizard/auction_lots_buyer_map_view.xml',
@@ -59,12 +56,11 @@
'report/report_auction_view.xml',
'auction_wizard.xml',
'board_auction_view.xml',
- # 'board_auction_manager_view.xml',
],
'demo_xml': ['auction_demo.xml','board_auction_demo.xml'],
'test': ['test/auction.yml'],
-
+
'installable': True,
'active': False,
'certificate': '0039333102717',
diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index 0014edada56..5ea2441e6fd 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -35,10 +35,10 @@ import tools
class auction_artists(osv.osv):
_name = "auction.artists"
_columns = {
- 'name': fields.char('Artist/Author Name', size=64, required=True),
- 'pseudo': fields.char('Pseudo', size=64),
- 'birth_death_dates':fields.char('Birth / Death dates', size=64),
- 'biography': fields.text('Biography'),
+ 'name': fields.char('Artist/Author Name', size=64, required=True),
+ 'pseudo': fields.char('Pseudo', size=64),
+ 'birth_death_dates':fields.char('Birth / Death dates', size=64),
+ 'biography': fields.text('Biography'),
}
auction_artists()
@@ -49,10 +49,10 @@ class auction_dates(osv.osv):
"""Auction Dates"""
_name = "auction.dates"
_description=__doc__
-
+
def _adjudication_get(self, cr, uid, ids, prop, unknow_none, unknow_dict):
res={}
- total = 0.0
+ total = 0.0
lots_obj = self.pool.get('auction.lots')
for auction in self.browse(cr, uid, ids):
lots_ids = lots_obj.search(cr, uid, [('auction_id', '=', auction.id)])
@@ -71,27 +71,27 @@ class auction_dates(osv.osv):
return name
_columns = {
- 'name': fields.char('Auction Name', size=64, required=True),
- 'expo1': fields.date('First Exposition Day', required=True, help="Beginning Exposition Date For Auction"),
- 'expo2': fields.date('Last Exposition Day', required=True, help="Last Exposition Date For Auction"),
- 'auction1': fields.date('First Auction Day', required=True, help="Start Date Of Auction"),
- 'auction2': fields.date('Last Auction Day', required=True, help="End Date Of Auction"),
- 'journal_id': fields.many2one('account.journal', 'Buyer Journal', required=True, help="Account Journal For Buyer"),
- 'journal_seller_id': fields.many2one('account.journal', 'Seller Journal', required=True, help="Account Journal For Seller"),
- 'buyer_costs': fields.many2many('account.tax', 'auction_buyer_taxes_rel', 'auction_id', 'tax_id', 'Buyer Costs', help="Account Tax For Buyer"),
- 'seller_costs': fields.many2many('account.tax', 'auction_seller_taxes_rel', 'auction_id', 'tax_id', 'Seller Costs', help="Account Tax For Seller"),
- 'acc_income': fields.many2one('account.account', 'Income Account', required=True),
- 'acc_expense': fields.many2one('account.account', 'Expense Account', required=True),
- 'adj_total': fields.function(_adjudication_get, method=True, string='Total Adjudication', store=True),
- 'state': fields.selection((('draft', 'Draft'), ('closed', 'Closed')), 'State', select=1, readonly=True,
- help='When auction starts the state is \'Draft\'.\n At the end of auction, the state becomes \'Closed\'.'),
- 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True),
+ 'name': fields.char('Auction Name', size=64, required=True),
+ 'expo1': fields.date('First Exposition Day', required=True, help="Beginning Exposition Date For Auction"),
+ 'expo2': fields.date('Last Exposition Day', required=True, help="Last Exposition Date For Auction"),
+ 'auction1': fields.date('First Auction Day', required=True, help="Start Date Of Auction"),
+ 'auction2': fields.date('Last Auction Day', required=True, help="End Date Of Auction"),
+ 'journal_id': fields.many2one('account.journal', 'Buyer Journal', required=True, help="Account Journal For Buyer"),
+ 'journal_seller_id': fields.many2one('account.journal', 'Seller Journal', required=True, help="Account Journal For Seller"),
+ 'buyer_costs': fields.many2many('account.tax', 'auction_buyer_taxes_rel', 'auction_id', 'tax_id', 'Buyer Costs', help="Account Tax For Buyer"),
+ 'seller_costs': fields.many2many('account.tax', 'auction_seller_taxes_rel', 'auction_id', 'tax_id', 'Seller Costs', help="Account Tax For Seller"),
+ 'acc_income': fields.many2one('account.account', 'Income Account', required=True),
+ 'acc_expense': fields.many2one('account.account', 'Expense Account', required=True),
+ 'adj_total': fields.function(_adjudication_get, method=True, string='Total Adjudication', store=True),
+ 'state': fields.selection((('draft', 'Draft'), ('closed', 'Closed')), 'State', select=1, readonly=True,
+ help='When auction starts the state is \'Draft\'.\n At the end of auction, the state becomes \'Closed\'.'),
+ 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True),
}
-
+
_defaults = {
- 'state': lambda *a: 'draft',
+ 'state': lambda *a: 'draft',
}
-
+
_order = "auction1 desc"
def close(self, cr, uid, ids, context=None):
@@ -112,7 +112,7 @@ class auction_dates(osv.osv):
new_seller_invoice = lots_obj.seller_trans_create(cr, uid, lots_ids2, {})
self.write(cr, uid, ids, {'state': 'closed'}) #close the auction
return True
-
+
auction_dates()
#----------------------------------------------------------
@@ -120,27 +120,27 @@ auction_dates()
#----------------------------------------------------------
class auction_deposit(osv.osv):
"""Auction Deposit Border"""
-
+
_name = "auction.deposit"
_description=__doc__
_order = "id desc"
_columns = {
- 'transfer' : fields.boolean('Transfer'),
- 'name': fields.char('Depositer Inventory', size=64, required=True),
- 'partner_id': fields.many2one('res.partner', 'Seller', required=True, change_default=True),
- 'date_dep': fields.date('Deposit date', required=True),
- 'method': fields.selection((('keep', 'Keep until sold'), ('decease', 'Decrease limit of 10%'), ('contact', 'Contact the Seller')), 'Withdrawned method', required=True),
- 'tax_id': fields.many2one('account.tax', 'Expenses'),
- 'create_uid': fields.many2one('res.users', 'Created by', readonly=True),
- 'info': fields.char('Description', size=64),
- 'lot_id': fields.one2many('auction.lots', 'bord_vnd_id', 'Objects'),
- 'specific_cost_ids': fields.one2many('auction.deposit.cost', 'deposit_id', 'Specific Costs'),
- 'total_neg': fields.boolean('Allow Negative Amount'),
+ 'transfer' : fields.boolean('Transfer'),
+ 'name': fields.char('Depositer Inventory', size=64, required=True),
+ 'partner_id': fields.many2one('res.partner', 'Seller', required=True, change_default=True),
+ 'date_dep': fields.date('Deposit date', required=True),
+ 'method': fields.selection((('keep', 'Keep until sold'), ('decease', 'Decrease limit of 10%'), ('contact', 'Contact the Seller')), 'Withdrawned method', required=True),
+ 'tax_id': fields.many2one('account.tax', 'Expenses'),
+ 'create_uid': fields.many2one('res.users', 'Created by', readonly=True),
+ 'info': fields.char('Description', size=64),
+ 'lot_id': fields.one2many('auction.lots', 'bord_vnd_id', 'Objects'),
+ 'specific_cost_ids': fields.one2many('auction.deposit.cost', 'deposit_id', 'Specific Costs'),
+ 'total_neg': fields.boolean('Allow Negative Amount'),
}
_defaults = {
- 'method': lambda *a: 'keep',
- 'total_neg': lambda *a: False,
- 'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'auction.deposit'),
+ 'method': lambda *a: 'keep',
+ 'total_neg': lambda *a: False,
+ 'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'auction.deposit'),
}
auction_deposit()
@@ -149,16 +149,16 @@ auction_deposit()
# (Specific) Deposit Costs
#----------------------------------------------------------
class auction_deposit_cost(osv.osv):
-
+
"""Auction Deposit Cost"""
-
+
_name = 'auction.deposit.cost'
_description=__doc__
_columns = {
- 'name': fields.char('Cost Name', required=True, size=64),
- 'amount': fields.float('Amount'),
- 'account': fields.many2one('account.account', 'Destination Account', required=True),
- 'deposit_id': fields.many2one('auction.deposit', 'Deposit'),
+ 'name': fields.char('Cost Name', required=True, size=64),
+ 'amount': fields.float('Amount'),
+ 'account': fields.many2one('account.account', 'Destination Account', required=True),
+ 'deposit_id': fields.many2one('auction.deposit', 'Deposit'),
}
auction_deposit_cost()
@@ -166,16 +166,16 @@ auction_deposit_cost()
# Lots Categories
#----------------------------------------------------------
class aie_category(osv.osv):
-
+
_name="aie.category"
_order = "name"
_columns={
- 'name': fields.char('Name', size=64, required=True),
- 'code':fields.char('Code', size=64),
- 'parent_id': fields.many2one('aie.category', 'Parent aie Category', ondelete='cascade'),
- 'child_ids': fields.one2many('aie.category', 'parent_id', help="Childs aie category")
+ 'name': fields.char('Name', size=64, required=True),
+ 'code':fields.char('Code', size=64),
+ 'parent_id': fields.many2one('aie.category', 'Parent aie Category', ondelete='cascade'),
+ 'child_ids': fields.one2many('aie.category', 'parent_id', help="Childs aie category")
}
-
+
def name_get(self, cr, uid, ids, context=None):
if not context:
context = {}
@@ -189,22 +189,22 @@ class aie_category(osv.osv):
name = record['parent_id'][1] + ' / ' + name
res.append((record['id'], name))
return res
-
-aie_category()
-
+
+aie_category()
+
class auction_lot_category(osv.osv):
"""Auction Lots Category"""
-
+
_name = 'auction.lot.category'
_description=__doc__
_columns = {
- 'name': fields.char('Category Name', required=True, size=64),
- 'priority': fields.float('Priority'),
- 'active' : fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the auction lot category without removing it."),
- 'aie_categ': fields.many2one('aie.category', 'Category', ondelete='cascade'),
+ 'name': fields.char('Category Name', required=True, size=64),
+ 'priority': fields.float('Priority'),
+ 'active' : fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the auction lot category without removing it."),
+ 'aie_categ': fields.many2one('aie.category', 'Category', ondelete='cascade'),
}
_defaults = {
- 'active' : lambda *a: 1,
+ 'active' : lambda *a: 1,
}
auction_lot_category()
@@ -217,11 +217,11 @@ def _type_get(self, cr, uid, context=None):
obj = self.pool.get('auction.lot.category')
ids = obj.search(cr, uid, [])
res = obj.read(cr, uid, ids, ['name'], context)
- res = [(r['name'], r['name']) for r in res]
- return res
+ res = [(r['name'], r['name']) for r in res]
+ return res
class auction_lots(osv.osv):
-
+
"""Auction Object"""
_name = "auction.lots"
_order = "obj_num,lot_num,id"
@@ -231,7 +231,7 @@ class auction_lots(osv.osv):
if not context:
context={}
return self.write(cr, uid, ids, {'state':'unsold'})
-
+
def button_taken_away(self, cr, uid, ids, context=None):
if not context:
context={}
@@ -256,7 +256,7 @@ class auction_lots(osv.osv):
"""
if not context:
context = {}
-
+
res = {}
account_analytic_line_obj = self.pool.get('account.analytic.line')
lots = self.browse(cr, uid, ids, context)
@@ -289,24 +289,24 @@ class auction_lots(osv.osv):
elif name == "gross_revenue":
if lot.auction_id:
result = lot.buyer_price - lot.seller_price
-
+
elif name == "net_revenue":
if lot.auction_id:
result = lot.buyer_price - lot.seller_price - lot.costs
-
+
elif name == "gross_margin":
if ((lot.obj_price==0) and (lot.state=='draft')):
amount = lot.lot_est1
- else:
+ else:
amount = lot.obj_price
if amount > 0:
result = (lot.gross_revenue * 100) / amount
result = round(result,2)
-
+
elif name == "net_margin":
if ((lot.obj_price==0) and (lot.state=='draft')):
amount = lot.lot_est1
- else:
+ else:
amount = lot.obj_price
if amount > 0:
result = (lot.net_revenue * 100) / amount
@@ -320,8 +320,8 @@ class auction_lots(osv.osv):
auct_id = lot.auction_id.id
lot_count = self.search(cr, uid, [('auction_id', '=', auct_id)], count=True)
line_ids = account_analytic_line_obj.search(cr, uid, [
- ('account_id', '=', lot.auction_id.account_analytic_id.id),
- ('journal_id', '<>', lot.auction_id.journal_id.id),
+ ('account_id', '=', lot.auction_id.account_analytic_id.id),
+ ('journal_id', '<>', lot.auction_id.journal_id.id),
('journal_id', '<>', lot.auction_id.journal_seller_id.id)])
indir_cost = lot.bord_vnd_id.specific_cost_ids
for r in lot.bord_vnd_id.specific_cost_ids:
@@ -330,20 +330,20 @@ class auction_lots(osv.osv):
if line.amount:
som -= line.amount
result = som/lot_count
-
+
elif name=="paid_ach":
result = False
if lot.ach_inv_id and lot.ach_inv_id.state == 'paid':
result = True
-
+
elif name=="paid_vnd":
result = False
if lot.sel_inv_id and lot.sel_inv_id.state == 'paid':
- result = True
-
+ result = True
+
res[lot.id][name] = result
-
-
+
+
return res
def onchange_obj_ret(self, cr, uid, ids, obj_ret, context=None):
@@ -354,66 +354,66 @@ class auction_lots(osv.osv):
return {}
_columns = {
- 'bid_lines':fields.one2many('auction.bid_line', 'lot_id', 'Bids'),
- 'auction_id': fields.many2one('auction.dates', 'Auction', select=1, help="Auction For Object"),
- 'bord_vnd_id': fields.many2one('auction.deposit', 'Depositer Inventory', required=True, help="Provide Deposit Information: seller, Withdrawned Method, Object, Deposit Costs"),
- 'name': fields.char('Title', size=64, required=True, help='Auction Object Name'),
- 'name2': fields.char('Short Description (2)', size=64),
- 'lot_type': fields.selection(_type_get, 'Object category', size=64),
- 'author_right': fields.many2one('account.tax', 'Author rights', help="Account Tax For Author Commission"),
- 'lot_est1': fields.float('Minimum Estimation', help="Minimum Estimate Price"),
- 'lot_est2': fields.float('Maximum Estimation', help="Maximum Estimate Price"),
- 'lot_num': fields.integer('List Number', required=True, select=1, help="List Number In Depositer Inventory"),
- 'create_uid': fields.many2one('res.users', 'Created by', readonly=True),
- 'history_ids':fields.one2many('auction.lot.history', 'lot_id', 'Auction history'),
- 'lot_local':fields.char('Location', size=64, help="Auction Location"),
- 'artist_id':fields.many2one('auction.artists', 'Artist/Author'),
- 'artist2_id':fields.many2one('auction.artists', 'Artist/Author2'),
- 'important':fields.boolean('To be Emphatized'),
- 'product_id':fields.many2one('product.product', 'Product', required=True),
- 'obj_desc': fields.text('Object Description'),
- 'obj_num': fields.integer('Catalog Number'),
- 'obj_ret': fields.float('Price retired', help="Object Ret"),
- 'obj_comm': fields.boolean('Commission'),
- 'obj_price': fields.float('Adjudication price', help="Object Price"),
- 'ach_avance': fields.float('Buyer Advance'),
- 'ach_login': fields.char('Buyer Username', size=64),
+ 'bid_lines':fields.one2many('auction.bid_line', 'lot_id', 'Bids'),
+ 'auction_id': fields.many2one('auction.dates', 'Auction', select=1, help="Auction For Object"),
+ 'bord_vnd_id': fields.many2one('auction.deposit', 'Depositer Inventory', required=True, help="Provide Deposit Information: seller, Withdrawned Method, Object, Deposit Costs"),
+ 'name': fields.char('Title', size=64, required=True, help='Auction Object Name'),
+ 'name2': fields.char('Short Description (2)', size=64),
+ 'lot_type': fields.selection(_type_get, 'Object category', size=64),
+ 'author_right': fields.many2one('account.tax', 'Author rights', help="Account Tax For Author Commission"),
+ 'lot_est1': fields.float('Minimum Estimation', help="Minimum Estimate Price"),
+ 'lot_est2': fields.float('Maximum Estimation', help="Maximum Estimate Price"),
+ 'lot_num': fields.integer('List Number', required=True, select=1, help="List Number In Depositer Inventory"),
+ 'create_uid': fields.many2one('res.users', 'Created by', readonly=True),
+ 'history_ids':fields.one2many('auction.lot.history', 'lot_id', 'Auction history'),
+ 'lot_local':fields.char('Location', size=64, help="Auction Location"),
+ 'artist_id':fields.many2one('auction.artists', 'Artist/Author'),
+ 'artist2_id':fields.many2one('auction.artists', 'Artist/Author2'),
+ 'important':fields.boolean('To be Emphatized'),
+ 'product_id':fields.many2one('product.product', 'Product', required=True),
+ 'obj_desc': fields.text('Object Description'),
+ 'obj_num': fields.integer('Catalog Number'),
+ 'obj_ret': fields.float('Price retired', help="Object Ret"),
+ 'obj_comm': fields.boolean('Commission'),
+ 'obj_price': fields.float('Adjudication price', help="Object Price"),
+ 'ach_avance': fields.float('Buyer Advance'),
+ 'ach_login': fields.char('Buyer Username', size=64),
'ach_uid': fields.many2one('res.partner', 'Buyer'),
- 'seller_id': fields.related('bord_vnd_id','partner_id', type='many2one', relation='res.partner', string='Seller', readonly=True),
- 'ach_emp': fields.boolean('Taken Away', readonly=True, help="When state is Taken Away, This field is Marked as True"),
- 'is_ok': fields.boolean('Buyer\'s payment', help="When Buyer Pay For Bank statement', This field is Marked"),
- 'ach_inv_id': fields.many2one('account.invoice', 'Buyer Invoice', readonly=True, states={'draft':[('readonly', False)]}),
- 'sel_inv_id': fields.many2one('account.invoice', 'Seller Invoice', readonly=True, states={'draft':[('readonly', False)]}),
- 'vnd_lim': fields.float('Seller limit'),
- 'vnd_lim_net': fields.boolean('Net limit ?', readonly=True),
- 'image': fields.binary('Image', help="Object Image"),
- 'paid_vnd':fields.function(_getprice, string='Seller Paid', method=True, type='boolean', store=True, multi="paid_vnd", help="When state of Seller Invoice is 'Paid', This field is selected as True."),
- 'paid_ach':fields.function(_getprice, string='Buyer Invoice Reconciled', method=True, type='boolean', store=True, multi="paid_ach", help="When state of Buyer Invoice is 'Paid', This field is selected as True."),
+ 'seller_id': fields.related('bord_vnd_id','partner_id', type='many2one', relation='res.partner', string='Seller', readonly=True),
+ 'ach_emp': fields.boolean('Taken Away', readonly=True, help="When state is Taken Away, This field is Marked as True"),
+ 'is_ok': fields.boolean('Buyer\'s payment', help="When Buyer Pay For Bank statement', This field is Marked"),
+ 'ach_inv_id': fields.many2one('account.invoice', 'Buyer Invoice', readonly=True, states={'draft':[('readonly', False)]}),
+ 'sel_inv_id': fields.many2one('account.invoice', 'Seller Invoice', readonly=True, states={'draft':[('readonly', False)]}),
+ 'vnd_lim': fields.float('Seller limit'),
+ 'vnd_lim_net': fields.boolean('Net limit ?', readonly=True),
+ 'image': fields.binary('Image', help="Object Image"),
+ 'paid_vnd':fields.function(_getprice, string='Seller Paid', method=True, type='boolean', store=True, multi="paid_vnd", help="When state of Seller Invoice is 'Paid', This field is selected as True."),
+ 'paid_ach':fields.function(_getprice, string='Buyer Invoice Reconciled', method=True, type='boolean', store=True, multi="paid_ach", help="When state of Buyer Invoice is 'Paid', This field is selected as True."),
'state': fields.selection((
- ('draft', 'Draft'),
- ('unsold', 'Unsold'),
- ('paid', 'Paid'),
- ('sold', 'Sold'),
- ('taken_away', 'Taken away')), 'State', required=True, readonly=True,
+ ('draft', 'Draft'),
+ ('unsold', 'Unsold'),
+ ('paid', 'Paid'),
+ ('sold', 'Sold'),
+ ('taken_away', 'Taken away')), 'State', required=True, readonly=True,
help=' * The \'Draft\' state is used when a object is encoding as a new object. \
\n* The \'Unsold\' state is used when object does not sold for long time, user can also set it as draft state after unsold. \
\n* The \'Paid\' state is used when user pay for the object \
- \n* The \'Sold\' state is used when user buy the object.'),
- 'buyer_price': fields.function(_getprice, method=True, string='Buyer price', store=True, multi="buyer_price", help="Buyer Price"),
- 'seller_price': fields.function(_getprice, method=True, string='Seller price', store=True, multi="seller_price", help="Seller Price"),
- 'gross_revenue':fields.function(_getprice, method=True, string='Gross revenue', store=True, multi="gross_revenue", help="Buyer Price - Seller Price"),
- 'gross_margin':fields.function(_getprice, method=True, string='Gross Margin (%)', store=True, multi="gross_margin", help="(Gross Revenue*100.0)/ Object Price"),
- 'costs':fields.function(_getprice, method=True, string='Indirect costs', store=True, multi="costs", help="Deposit cost"),
- 'statement_id': fields.many2many('account.bank.statement.line', 'auction_statement_line_rel', 'auction_id', 'statement', 'Payment', help="Bank statement Line For Given Buyer"),
- 'net_revenue':fields.function(_getprice, method=True, string='Net revenue', store=True, multi="net_revenue", help="Buyer Price - Seller Price - Indirect Cost"),
- 'net_margin':fields.function(_getprice, method=True, string='Net Margin (%)', store=True, multi="net_margin", help="(Net Revenue * 100)/ Object Price"),
+ \n* The \'Sold\' state is used when user buy the object.'),
+ 'buyer_price': fields.function(_getprice, method=True, string='Buyer price', store=True, multi="buyer_price", help="Buyer Price"),
+ 'seller_price': fields.function(_getprice, method=True, string='Seller price', store=True, multi="seller_price", help="Seller Price"),
+ 'gross_revenue':fields.function(_getprice, method=True, string='Gross revenue', store=True, multi="gross_revenue", help="Buyer Price - Seller Price"),
+ 'gross_margin':fields.function(_getprice, method=True, string='Gross Margin (%)', store=True, multi="gross_margin", help="(Gross Revenue*100.0)/ Object Price"),
+ 'costs':fields.function(_getprice, method=True, string='Indirect costs', store=True, multi="costs", help="Deposit cost"),
+ 'statement_id': fields.many2many('account.bank.statement.line', 'auction_statement_line_rel', 'auction_id', 'statement', 'Payment', help="Bank statement Line For Given Buyer"),
+ 'net_revenue':fields.function(_getprice, method=True, string='Net revenue', store=True, multi="net_revenue", help="Buyer Price - Seller Price - Indirect Cost"),
+ 'net_margin':fields.function(_getprice, method=True, string='Net Margin (%)', store=True, multi="net_margin", help="(Net Revenue * 100)/ Object Price"),
}
_defaults = {
- 'state':lambda *a: 'draft',
- 'lot_num':lambda *a:1,
- 'is_ok': lambda *a: False,
+ 'state':lambda *a: 'draft',
+ 'lot_num':lambda *a:1,
+ 'is_ok': lambda *a: False,
}
-
+
def name_get(self, cr, user, ids, context=None):
if not context:
context={}
@@ -467,7 +467,7 @@ class auction_lots(osv.osv):
amount+=t['amount']
amount_total['value']= amount
amount_total['amount']= amount
-
+
return amount_total
@@ -481,7 +481,7 @@ class auction_lots(osv.osv):
tax_cost_ids.append(border_id.tax_id)
elif lot.auction_id and lot.auction_id.seller_costs:
tax_cost_ids += lot.auction_id.seller_costs
-
+
tax_costs = self.pool.get('account.tax').compute_all(cr, uid, tax_cost_ids, lot.obj_price, 1)['taxes']
# delete useless keys from the costs computed by the tax object... this is useless but cleaner...
for cost in tax_costs:
@@ -497,13 +497,13 @@ class auction_lots(osv.osv):
#FIXME:the string passes have lot 'should go through the system translations.
obj_price_wh_costs = reduce(lambda x, y: x + y['amount'], tax_costs, lot.obj_price)
if obj_price_wh_costs < lot.vnd_lim:
- costs.append({ 'type': 1,
- 'id': lot.obj_num,
- 'name': 'Remise lot '+ str(lot.obj_num),
+ costs.append({ 'type': 1,
+ 'id': lot.obj_num,
+ 'name': 'Remise lot '+ str(lot.obj_num),
'amount': lot.vnd_lim - obj_price_wh_costs}
)
return costs
-
+
def compute_seller_costs(self, cr, uid, ids, manual_only=False):
lots = self.browse(cr, uid, ids)
costs = []
@@ -543,9 +543,9 @@ class auction_lots(osv.osv):
# sum remise limite net and ristourne
def compute_seller_costs_summed(self, cr, uid, ids): #ach_pay_id
-
+
"""This Fuction sum Net remittance limit and refund"""
-
+
taxes = self.compute_seller_costs(cr, uid, ids)
taxes_summed = {}
for tax in taxes:
@@ -567,7 +567,7 @@ class auction_lots(osv.osv):
return taxes_summed.values()
def buyer_proforma(self, cr, uid, ids, context=None):
-
+
if not context:
context={}
invoices = {}
@@ -589,11 +589,10 @@ class auction_lots(osv.osv):
if not invoice_addr_id:
raise orm.except_orm(_('No Invoice Address'), _('The Buyer "%s" has no Invoice Address.') % (contact_addr_id,))
inv = {
- 'name': 'Auction proforma:' +lot.name,
- 'journal_id': lot.auction_id.journal_id.id,
- 'partner_id': partner_ref,
- 'type': 'out_invoice',
- # 'state':'proforma',
+ 'name': 'Auction proforma:' +lot.name,
+ 'journal_id': lot.auction_id.journal_id.id,
+ 'partner_id': partner_ref,
+ 'type': 'out_invoice',
}
inv.update(inv_ref.onchange_partner_id(cr, uid, [], 'out_invoice', partner_ref)['value'])
inv['account_id'] = inv['account_id'] and inv['account_id'][0]
@@ -648,10 +647,10 @@ class auction_lots(osv.osv):
contact_addr_id = res['contact']
invoice_addr_id = res['invoice']
inv = {
- 'name': 'Auction:' +lot.name,
- 'journal_id': lot.auction_id.journal_seller_id.id,
- 'partner_id': lot.bord_vnd_id.partner_id.id,
- 'type': 'in_invoice',
+ 'name': 'Auction:' +lot.name,
+ 'journal_id': lot.auction_id.journal_seller_id.id,
+ 'partner_id': lot.bord_vnd_id.partner_id.id,
+ 'type': 'in_invoice',
}
inv.update(inv_ref.onchange_partner_id(cr, uid, [], 'in_invoice', lot.bord_vnd_id.partner_id.id)['value'])
inv_id = inv_ref.create(cr, uid, inv, context)
@@ -666,14 +665,14 @@ class auction_lots(osv.osv):
taxes += map(lambda x: x.id, lot.auction_id.seller_costs)
inv_line= {
- 'invoice_id': inv_id,
- 'quantity': 1,
- 'product_id': lot.product_id.id,
- 'name': '['+str(lot.obj_num)+'] '+lot.auction_id.name,
- 'invoice_line_tax_id': [(6, 0, taxes)],
- 'account_analytic_id': lot.auction_id.account_analytic_id.id,
- 'account_id': lot.auction_id.acc_expense.id,
- 'price_unit': lot.obj_price,
+ 'invoice_id': inv_id,
+ 'quantity': 1,
+ 'product_id': lot.product_id.id,
+ 'name': '['+str(lot.obj_num)+'] '+lot.auction_id.name,
+ 'invoice_line_tax_id': [(6, 0, taxes)],
+ 'account_analytic_id': lot.auction_id.account_analytic_id.id,
+ 'account_id': lot.auction_id.acc_expense.id,
+ 'price_unit': lot.obj_price,
}
inv_line_obj.create(cr, uid, inv_line, context)
inv_ref.button_compute(cr, uid, invoices.values())
@@ -715,11 +714,11 @@ class auction_lots(osv.osv):
price = lot.obj_price or 0.0
lot_name =lot.obj_num
inv = {
- 'name':lot.auction_id.name or '',
- 'reference': lot.ach_login,
- 'journal_id': lot.auction_id.journal_id.id,
- 'partner_id': lot.ach_uid.id,
- 'type': 'out_invoice',
+ 'name':lot.auction_id.name or '',
+ 'reference': lot.ach_login,
+ 'journal_id': lot.auction_id.journal_id.id,
+ 'partner_id': lot.ach_uid.id,
+ 'type': 'out_invoice',
}
if invoice_number:
inv['number'] = invoice_number
@@ -734,14 +733,14 @@ class auction_lots(osv.osv):
taxes.append(lot.author_right.id)
inv_line= {
- 'invoice_id': inv_id,
- 'quantity': 1,
- 'product_id': lot.product_id.id,
- 'name': '['+str(lot.obj_num)+'] '+ lot.name,
- 'invoice_line_tax_id': [(6, 0, taxes)],
- 'account_analytic_id': lot.auction_id.account_analytic_id.id,
- 'account_id': lot.auction_id.acc_income.id,
- 'price_unit': lot.obj_price,
+ 'invoice_id': inv_id,
+ 'quantity': 1,
+ 'product_id': lot.product_id.id,
+ 'name': '['+str(lot.obj_num)+'] '+ lot.name,
+ 'invoice_line_tax_id': [(6, 0, taxes)],
+ 'account_analytic_id': lot.auction_id.account_analytic_id.id,
+ 'account_id': lot.auction_id.acc_income.id,
+ 'price_unit': lot.obj_price,
}
inv_line_obj.create(cr, uid, inv_line, context)
inv_ref.button_compute(cr, uid, [inv_id])
@@ -756,21 +755,21 @@ auction_lots()
#----------------------------------------------------------
class auction_bid(osv.osv):
"""Bid Auctions"""
-
+
_name = "auction.bid"
_description=__doc__
_order = 'id desc'
_columns = {
- 'partner_id': fields.many2one('res.partner', 'Buyer Name', required=True),
- 'contact_tel':fields.char('Contact', size=64),
- 'name': fields.char('Bid ID', size=64, required=True),
- 'auction_id': fields.many2one('auction.dates', 'Auction Date', required=True),
- 'bid_lines': fields.one2many('auction.bid_line', 'bid_id', 'Bid'),
+ 'partner_id': fields.many2one('res.partner', 'Buyer Name', required=True),
+ 'contact_tel':fields.char('Contact', size=64),
+ 'name': fields.char('Bid ID', size=64, required=True),
+ 'auction_id': fields.many2one('auction.dates', 'Auction Date', required=True),
+ 'bid_lines': fields.one2many('auction.bid_line', 'bid_id', 'Bid'),
}
_defaults = {
- 'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'auction.bid'),
+ 'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'auction.bid'),
}
-
+
def onchange_contact(self, cr, uid, ids, partner_id):
if not partner_id:
return {'value': {'contact_tel':False}}
@@ -785,13 +784,13 @@ auction_bid()
class auction_lot_history(osv.osv):
"""Lot History"""
-
+
_name = "auction.lot.history"
_description=__doc__
_columns = {
- 'name': fields.date('Date', size=64),
- 'lot_id': fields.many2one('auction.lots', 'Object', required=True, ondelete='cascade'),
- 'auction_id': fields.many2one('auction.dates', 'Auction date', required=True, ondelete='cascade'),
+ 'name': fields.date('Date', size=64),
+ 'lot_id': fields.many2one('auction.lots', 'Object', required=True, ondelete='cascade'),
+ 'auction_id': fields.many2one('auction.dates', 'Auction date', required=True, ondelete='cascade'),
'price': fields.float('Withdrawn price', digits=(16, 2))
}
_defaults = {
@@ -804,11 +803,11 @@ class auction_bid_lines(osv.osv):
_description="Bid"
_columns = {
- 'name': fields.char('Bid date', size=64),
- 'bid_id': fields.many2one('auction.bid', 'Bid ID', required=True, ondelete='cascade'),
- 'lot_id': fields.many2one('auction.lots', 'Object', required=True, ondelete='cascade'),
- 'call': fields.boolean('To be Called'),
- 'price': fields.float('Maximum Price'),
+ 'name': fields.char('Bid date', size=64),
+ 'bid_id': fields.many2one('auction.bid', 'Bid ID', required=True, ondelete='cascade'),
+ 'lot_id': fields.many2one('auction.lots', 'Object', required=True, ondelete='cascade'),
+ 'call': fields.boolean('To be Called'),
+ 'price': fields.float('Maximum Price'),
'auction': fields.char(string='Auction Name', size=64)
}
_defaults = {
diff --git a/addons/auction/auction_demo.xml b/addons/auction/auction_demo.xml
index 0103d4c3f8e..51d9c166178 100644
--- a/addons/auction/auction_demo.xml
+++ b/addons/auction/auction_demo.xml
@@ -34,12 +34,12 @@
Auction Adjudications
A7x*
-
+
receivable
-
+
Auction Adjudication Expenses
A6x*
@@ -128,7 +128,7 @@
default
-
+
Louvain-la-Neuve
Thomas Passot
@@ -141,12 +141,12 @@
-
+
Philippe Lavilier
1345-1450
-
+
POREAU OSWALD
1877-1955
@@ -195,7 +195,7 @@
-
+
TVA
0.12
@@ -211,7 +211,7 @@
-
+
Buyer Costs
0.21
@@ -219,7 +219,7 @@
-
+
Seller Costs1
-0.10
@@ -227,7 +227,7 @@
-
+
Seller Costs
-0.10
@@ -253,7 +253,7 @@
-
+
Oeuvres a 21%
@@ -267,7 +267,7 @@
1
-
+
Furniture
2
@@ -279,7 +279,7 @@
2
-
+
Sculpture
10
@@ -389,7 +389,6 @@
-
@@ -403,10 +402,8 @@
4
0.00
-
-
@@ -420,17 +417,14 @@
4
375
-
-
Plastic glass
5
-
300
500
show pices
@@ -462,7 +456,6 @@
bresslet
7
-
150
400
show pices
@@ -478,7 +471,6 @@
gold chain
11
-
400
700
show pices
@@ -494,7 +486,6 @@
fiber glass
8
-
300
500
show pices
@@ -510,7 +501,6 @@
lake photos
9
-
100
200
show pices
@@ -526,7 +516,6 @@
mobile photos
10
-
4500
4700
show models
@@ -542,7 +531,6 @@
Antique photos
11
-
1600
2200
show map Items
@@ -558,7 +546,6 @@
Hardware photos
12
-
2600
2800
show map Items
@@ -590,7 +577,6 @@
mobile accesories photos
13
-
1600
2200
show map Items
@@ -606,7 +592,6 @@
pikes-candles
14
-
30
50
show map Items
@@ -622,7 +607,6 @@
Coffee Service
15
-
10
20
show map Items
@@ -823,9 +807,7 @@
Demo
-
-
@@ -836,43 +818,43 @@
sign_in
-
+
sign_out
-
+
sign_in
-
+
sign_out
-
+
sign_in
-
+
sign_out
-
+
sign_in
-
+
sign_out
@@ -886,43 +868,43 @@
sign_in
-
+
sign_out
-
+
sign_in
-
+
sign_out
-
+
sign_in
-
+
sign_out
-
+
sign_in
-
+
sign_out
diff --git a/addons/auction/auction_report.xml b/addons/auction/auction_report.xml
index 885c08582ee..4df44c9c96a 100644
--- a/addons/auction/auction_report.xml
+++ b/addons/auction/auction_report.xml
@@ -1,7 +1,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/auction/auction_wizard.xml b/addons/auction/auction_wizard.xml
index ab1b051add5..70caa14cd3b 100644
--- a/addons/auction/auction_wizard.xml
+++ b/addons/auction/auction_wizard.xml
@@ -1,45 +1,6 @@
-
-
diff --git a/addons/auction/board_auction_demo.xml b/addons/auction/board_auction_demo.xml
index f260f8bb1fc..1727d6a3522 100644
--- a/addons/auction/board_auction_demo.xml
+++ b/addons/auction/board_auction_demo.xml
@@ -2,13 +2,6 @@
-
-
-
-
-
-
-
diff --git a/addons/auction/board_auction_view.xml b/addons/auction/board_auction_view.xml
index 8a183c267d8..8865550949e 100644
--- a/addons/auction/board_auction_view.xml
+++ b/addons/auction/board_auction_view.xml
@@ -10,20 +10,19 @@
form
tree,form
-
+
auction.deposit
form
tree,form
-
-
+
+
report.auction.estimation.adj.category.tree
auction.lots
tree
-
@@ -47,13 +46,13 @@
-
+
Min est/Adj/Max est
auction.lots
form
graph,tree
-
+
board.auction.form
@@ -103,9 +102,9 @@
menu
-
+
-
+
|