odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3 

bzr revid: mtr@mtr-20110105082702-0vy3oe5t2etwfm52
This commit is contained in:
mtr 2011-01-05 13:57:02 +05:30
parent fd120595c6 a124598535
commit 6c2dc909c1
319 changed files with 5033 additions and 5527 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/account/account_analytic_line.py
View File

@ -51,7 +51,6 @@ class account_analytic_line(osv.osv):
context = {}
if context.get('from_date',False):
args.append(['date', '>=', context['from_date']])
if context.get('to_date',False):
args.append(['date','<=', context['to_date']])
return super(account_analytic_line, self).search(cr, uid, args, offset, limit,

847
addons/account/i18n/account.pot
View File

File diff suppressed because it is too large Load Diff

6
addons/account/i18n/fr.po
View File

@ -489,7 +489,7 @@ msgstr "Date de création"
#. module: account
#: selection:account.journal,type:0
msgid "Purchase Refund"
msgstr "Remboursement d'achat"
msgstr "Avoir fournisseur"
#. module: account
#: selection:account.journal,type:0
@ -1632,7 +1632,7 @@ msgstr "Compte fournisseurs débiteurs"
#: field:account.tax,account_paid_id:0
#: field:account.tax.template,account_paid_id:0
msgid "Refund Tax Account"
msgstr "Compte de taxe à payer"
msgstr "Compte de taxe pour avoirs"
#. module: account
#: view:account.bank.statement:0
@ -9899,7 +9899,7 @@ msgstr "Rechercher une facture"
#: view:account.invoice.report:0
#: model:ir.actions.act_window,name:account.action_account_invoice_refund
msgid "Refund"
msgstr "Rembourser"
msgstr "Créer un avoir"
#. module: account
#: field:wizard.multi.charts.accounts,bank_accounts_id:0

2
addons/account/report/__init__.py
View File

@ -39,8 +39,6 @@ import account_invoice_report
import account_report
import account_entries_report
import account_analytic_entries_report
#import voucher_print
import account_voucher_print
import account_balance_sheet
import account_profit_loss

1
addons/account/report/account_balance.py
View File

@ -20,6 +20,7 @@
##############################################################################
import time
from report import report_sxw
from common_report_header import common_report_header

2
addons/account/report/account_entries_report_view.xml
View File

@ -80,7 +80,7 @@
<filter string="Unposted" icon="terp-document-new" domain="[('move_state','=','draft')]" help = "entries"/>
<filter string="Posted" icon="terp-camera_test" domain="[('move_state','=','posted')]" help = "Posted entries"/>
<separator orientation="vertical"/>
<filter string="Unreconciled" icon="terp-dolar_ok!" domain="[('reconcile_id','=',False)]" help = "Unreconciled entries"/>
<filter string="Unreconciled" icon="terp-dolar_ok!" domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help = "Unreconciled entries"/>
<filter string="Reconciled" icon="terp-dolar" domain="[('reconcile_id','!=',False)]" help = "Reconciled entries"/>
<separator orientation="vertical"/>
<field name="account_id"/>

4
addons/account/report/account_general_ledger.py
View File

@ -103,7 +103,9 @@ class general_ledger(report_sxw.rml_parse, common_report_header):
def get_children_accounts(self, account):
res = []
currency_obj = self.pool.get('res.currency')
ids_acc = self.pool.get('account.account')._get_children_and_consol(self.cr, self.uid, account.id)
currency = account.currency_id and account.currency_id or account.company_id.currency_id
for child_account in self.pool.get('account.account').browse(self.cr, self.uid, ids_acc, context=self.context):
sql = """
SELECT count(id)
@ -119,7 +121,7 @@ class general_ledger(report_sxw.rml_parse, common_report_header):
res.append(child_account)
elif self.display_account == 'bal_solde':
if child_account.type != 'view' and num_entry <> 0:
if ( sold_account <> 0.0):
if currency_obj.is_zero(self.cr, self.uid, currency, sold_account) != 0:
res.append(child_account)
else:
res.append(child_account)

69
addons/account/report/account_voucher_print.py
View File

@ -1,69 +0,0 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
#
# 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 <http://www.gnu.org/licenses/>.
#
##############################################################################
import time
from report import report_sxw
from tools import amount_to_text_en
class report_voucher_move(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context=None):
super(report_voucher_move, self).__init__(cr, uid, name, context=context)
self.localcontext.update({
'time': time,
'convert':self.convert,
'get_title': self.get_title,
'debit':self.debit,
'credit':self.credit,
})
self.user = uid
def convert(self, amount):
user_id = self.pool.get('res.users').browse(self.cr, self.user, [self.user])[0]
return amount_to_text_en.amount_to_text(amount, 'en', user_id.company_id.currency_id.name)
def get_title(self, voucher):
title = ''
if voucher.journal_id:
type = voucher.journal_id.type
title = type[0].swapcase() + type[1:] + " Voucher"
return title
def debit(self, move_ids):
debit = 0.0
for move in move_ids:
debit +=move.debit
return debit
def credit(self, move_ids):
credit = 0.0
for move in move_ids:
credit +=move.credit
return credit
report_sxw.report_sxw(
'report.account.move.voucher',
'account.move',
'addons/account/report/account_voucher_print.rml',
parser=report_voucher_move,header="external"
)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

470
addons/account/report/account_voucher_print.rml
View File

@ -1,470 +0,0 @@
<?xml version="1.0"?>
<document filename="Voucher.pdf">
<template pageSize="(595.0,842.0)" title="Voucher" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="28.0" y1="42.0" width="525" height="772"/>
</pageTemplate>
</template>
<stylesheet>
<blockTableStyle id="Standard_Outline">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table6">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table4">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="2,0" stop="2,-1"/>
<lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="2,0" stop="2,0"/>
<lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="3,0" stop="3,-1"/>
<lineStyle kind="LINEAFTER" colorName="#b3b3b3" start="3,0" stop="3,-1"/>
<lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="3,0" stop="3,0"/>
<lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="3,-1" stop="3,-1"/>
</blockTableStyle>
<blockTableStyle id="Table5">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="2,0" stop="2,-1"/>
<lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="2,0" stop="2,0"/>
<lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="3,0" stop="3,-1"/>
<lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="3,0" stop="3,0"/>
<lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="4,0" stop="4,-1"/>
<lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="4,0" stop="4,0"/>
<lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="5,0" stop="5,-1"/>
<lineStyle kind="LINEAFTER" colorName="#b3b3b3" start="5,0" stop="5,-1"/>
<lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="5,0" stop="5,0"/>
<lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="5,-1" stop="5,-1"/>
</blockTableStyle>
<blockTableStyle id="Heading1">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="2,0" stop="2,-1"/>
<lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="2,0" stop="2,0"/>
<lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="2,-1" stop="2,-1"/>
</blockTableStyle>
<blockTableStyle id="Table2">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#ffffff" start="2,-1" stop="2,-1"/>
</blockTableStyle>
<blockTableStyle id="last_info">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table1">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="2,0" stop="2,-1"/>
<lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="2,0" stop="2,0"/>
<lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="2,-1" stop="2,-1"/>
</blockTableStyle>
<blockTableStyle id="Table3">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" fontName="Helvetica"/>
<paraStyle name="P2" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P3" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P4" fontName="Helvetica-Bold" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P5" fontName="Helvetica-Bold" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P6" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P7" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Standard" fontName="Helvetica"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Index" fontName="Helvetica"/>
<paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Footer" fontName="Helvetica"/>
<paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
<paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Drawing" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="Header" fontName="Helvetica"/>
<paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica" fontSize="10.0" leading="13"/>
<paraStyle name="Addressee" fontName="Helvetica" spaceBefore="0.0" spaceAfter="3.0"/>
<paraStyle name="Signature" fontName="Helvetica"/>
<paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 5" fontName="Helvetica-Bold" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 4" fontName="Helvetica-BoldOblique" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Salutation" fontName="Helvetica"/>
<paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_9_30" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9_italic" fontName="Helvetica-Oblique" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9_30_italic" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<images/>
</stylesheet>
<story>
<pto>
<pto_header>
<blockTable colWidths="313.0,107.0,105.0" style="Heading1">
<tr>
<td>
<para style="terp_tblheader_Details">Particulars</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Debit</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Credit</para>
</td>
</tr>
</blockTable>
</pto_header>
<para style="P8">[[ repeatIn(objects,'voucher') ]]</para>
<blockTable colWidths="524.0" style="Table6">
<tr>
<td>
<para style="terp_header_Centre">[[ get_title(voucher) ]]</para>
</td>
</tr>
</blockTable>
<para style="Standard">
<font color="white"> </font>
</para>
<blockTable colWidths="63.0,200.0,52.0,210.0" style="Table4">
<tr>
<td>
<para style="terp_tblheader_General">Journal:</para>
</td>
<td>
<para style="terp_default_9">[[ voucher.journal_id.name ]]</para>
</td>
<td>
<para style="terp_tblheader_General">Number:</para>
</td>
<td>
<para style="terp_default_9">[[ voucher.name ]]</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="63.0,72.0,44.0,84.0,52.0,210.0" style="Table5">
<tr>
<td>
<para style="terp_tblheader_General">State:</para>
</td>
<td>
<para style="terp_default_9">PRO-FORMA [[ ((voucher.state == 'proforma') or removeParentNode('para')) and '' ]]</para>
<para style="terp_default_9">Draft[[ ((voucher.state == 'draft') or removeParentNode('para')) and '' ]]</para>
<para style="terp_default_9">Canceled [[ ((voucher.state == 'cancel') or removeParentNode('para')) and '' ]]</para>
<para style="terp_default_9">Posted [[ ((voucher.state == 'posted') or removeParentNode('para')) and '' ]]</para>
</td>
<td>
<para style="terp_tblheader_General">Ref. :</para>
</td>
<td>
<para style="terp_default_9">[[ voucher.ref]]</para>
</td>
<td>
<para style="terp_tblheader_General">Date:</para>
</td>
<td>
<para style="terp_default_9">[[ formatLang(voucher.date , date=True) or '' ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_9">
<font color="white"> </font>
</para>
<para style="terp_default_9">
<font color="white"> </font>
</para>
<blockTable colWidths="313.0,107.0,105.0" style="Heading1">
<tr>
<td>
<para style="terp_tblheader_Details">Particulars</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Debit</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Credit</para>
</td>
</tr>
</blockTable>
<para style="terp_default_1">
<font color="white"> </font>
</para>
<section>
<para style="terp_default_8">[[ repeatIn(voucher.line_id,'line_id') ]]</para>
<blockTable colWidths="313.0,106.0,105.0" style="Table2">
<tr>
<td>
<para style="terp_default_Bold_9">[[ (line_id.partner_id and line_id.partner_id.name) or 'Account']]</para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ formatLang(line_id.debit) ]]</para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ formatLang(line_id.credit) ]]</para>
</td>
</tr>
<tr>
<td>
<para style="terp_default_9_30">[[ line_id.account_id.name ]] </para>
</td>
<td>
<para style="terp_default_9">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_9">
<font color="white"> </font>
</para>
</td>
</tr>
<tr>
<td>
<para style="terp_default_9_30_italic">[[ line_id.name ]]-[[voucher.ref]]</para>
</td>
<td>
<para style="terp_default_9">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_9">
<font color="white"> </font>
</para>
</td>
</tr>
</blockTable>
<para style="terp_default_1">
<font color="white"> </font>
</para>
</section>
<para style="terp_default_1">
<font color="white"> </font>
</para>
<blockTable colWidths="313.0,106.0,105.0" style="last_info">
<tr>
<td>
<para style="P4">Through : </para>
</td>
<td>
<para style="P2">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P2">
<font color="white"> </font>
</para>
</td>
</tr>
<tr>
<td>
<para style="terp_default_9_italic">[[ voucher.narration or '']]</para>
</td>
<td>
<para style="P2">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P2">
<font color="white"> </font>
</para>
</td>
</tr>
<tr>
<td>
<para style="P4">On Account of : </para>
</td>
<td>
<para style="P2">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P2">
<font color="white"> </font>
</para>
</td>
</tr>
<tr>
<td>
<para style="P7">[[ voucher.line_id and voucher.line_id[0].name or removeParentNode('para') ]]</para>
</td>
<td>
<para style="P2">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P2">
<font color="white"> </font>
</para>
</td>
</tr>
<tr>
<td>
<para style="P4">Amount (in words) : </para>
</td>
<td>
<para style="P4">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P4">
<font color="white"> </font>
</para>
</td>
</tr>
<tr>
<td>
<para style="P7">[[ convert(voucher.amount) ]]</para>
</td>
<td>
<para style="P3">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P3">
<font color="white"> </font>
</para>
</td>
</tr>
</blockTable>
<para style="terp_default_1">
<font color="white"> </font>
</para>
<blockTable colWidths="313.0,106.0,105.0" style="Table1">
<tr>
<td>
<para style="P5">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ formatLang(debit(voucher.line_id))]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">[[ formatLang(credit(voucher.line_id)) ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_1">
<font color="white"> </font>
</para>
<blockTable colWidths="154.0,160.0,63.0,148.0" style="Table3">
<tr>
<td>
<para style="terp_default_9">
<font color="white"> </font>
</para>
<para style="terp_default_9">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_9">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_9">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_9">
<font color="white"> </font>
</para>
</td>
</tr>
<tr>
<td>
<para style="P6">Receiver's Signature</para>
</td>
<td>
<para style="P6">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P6">
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_Right_9">Authorised Signatory</para>
</td>
</tr>
</blockTable>
<para style="P1">
<font color="white"> </font>
</para>
</pto>
</story>
</document>

5
addons/account/res_currency.py
View File

@ -21,6 +21,7 @@
from osv import osv
"""Inherit res.currency to handle accounting date values when converting currencies"""
class res_currency_account(osv.osv):
_inherit = "res.currency"
@ -41,4 +42,6 @@ class res_currency_account(osv.osv):
rate = float(tot2)/float(tot1)
return rate
res_currency_account()
res_currency_account()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

28
addons/account/security/account_security.xml
View File

@ -16,98 +16,98 @@
<field name="name">Account Entry</field>
<field ref="model_account_move" name="model_id"/>
<field eval="True" name="global"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
</record>
<record id="account_move_line_comp_rule" model="ir.rule">
<field name="name">Entry lines</field>
<field model="ir.model" name="model_id" ref="model_account_move_line"/>
<field eval="True" name="global"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
</record>
<record id="journal_period_comp_rule" model="ir.rule">
<field name="name">Journal Period</field>
<field model="ir.model" name="model_id" ref="model_account_journal_period"/>
<field eval="True" name="global"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
</record>
<record id="journal_comp_rule" model="ir.rule">
<field name="name">Journal multi-company</field>
<field model="ir.model" name="model_id" ref="model_account_journal"/>
<field eval="True" name="global"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
</record>
<record id="analytic_journal_comp_rule" model="ir.rule">
<field name="name">Analytic journal multi-company</field>
<field model="ir.model" name="model_id" ref="model_account_analytic_journal"/>
<field eval="True" name="global"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
</record>
<record id="analytic_journal_comp_rule_false" model="ir.rule">
<field name="name">Analytic journal multi-company</field>
<field model="ir.model" name="model_id" ref="model_account_analytic_journal"/>
<field eval="True" name="global"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
</record>
<record id="period_comp_rule" model="ir.rule">
<field name="name">Period multi-company</field>
<field model="ir.model" name="model_id" ref="model_account_period"/>
<field eval="True" name="global"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
</record>
<record id="fiscal_year_comp_rule" model="ir.rule">
<field name="name">Fiscal year multi-company</field>
<field model="ir.model" name="model_id" ref="model_account_fiscalyear"/>
<field eval="True" name="global"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
</record>
<record id="account_comp_rule" model="ir.rule">
<field name="name">Account multi-company</field>
<field model="ir.model" name="model_id" ref="model_account_account"/>
<field eval="True" name="global"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
</record>
<record id="tax_comp_rule" model="ir.rule">
<field name="name">Tax multi-company</field>
<field model="ir.model" name="model_id" ref="model_account_tax"/>
<field eval="True" name="global"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','=',user.company_id.id)]</field>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
</record>
<record id="tax_code_comp_rule" model="ir.rule">
<field name="name">Tax code multi-company</field>
<field model="ir.model" name="model_id" ref="model_account_tax_code"/>
<field eval="True" name="global"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
</record>
<record id="invoice_comp_rule" model="ir.rule">
<field name="name">Invoice multi-company</field>
<field model="ir.model" name="model_id" ref="model_account_invoice"/>
<field eval="True" name="global"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
</record>
<record id="account_fiscal_position_comp_rule" model="ir.rule">
<field name="name">Account fiscal Mapping company rule</field>
<field model="ir.model" name="model_id" ref="model_account_fiscal_position"/>
<field eval="True" name="global"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
</record>
<record id="account_model_comp_rule" model="ir.rule">
<field name="name">Account model company rule</field>
<field model="ir.model" name="model_id" ref="model_account_model"/>
<field eval="True" name="global"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
</record>
</data></openerp>

1
addons/account/security/ir.model.access.csv
View File

@ -98,6 +98,7 @@
"access_account_bank_statement_manager","account.bank.statement manager","model_account_bank_statement","account.group_account_manager",1,1,1,1
"access_account_entries_report_manager","account.entries.report","model_account_entries_report","account.group_account_manager",1,1,1,1
"access_account_entries_report_user","account.entries.report","model_account_entries_report","account.group_account_user",1,0,0,0
"access_account_entries_report_invoice","account.entries.report","model_account_entries_report","account.group_account_invoice",1,0,0,0
"access_account_entries_report_employee","account.entries.report employee","model_account_entries_report","base.group_user",1,0,0,0
"access_analytic_entries_report_manager","analytic.entries.report","model_analytic_entries_report","account.group_account_manager",1,0,0,0
"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_manager",1,1,1,1

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
98 access_account_bank_statement_manager account.bank.statement manager model_account_bank_statement account.group_account_manager 1 1 1 1
99 access_account_entries_report_manager account.entries.report model_account_entries_report account.group_account_manager 1 1 1 1
100 access_account_entries_report_user account.entries.report model_account_entries_report account.group_account_user 1 0 0 0
101 access_account_entries_report_invoice account.entries.report model_account_entries_report account.group_account_invoice 1 0 0 0
102 access_account_entries_report_employee account.entries.report employee model_account_entries_report base.group_user 1 0 0 0
103 access_analytic_entries_report_manager analytic.entries.report model_analytic_entries_report account.group_account_manager 1 0 0 0
104 access_account_cashbox_line account.cashbox.line model_account_cashbox_line account.group_account_manager 1 1 1 1

20
addons/account/test/account_report.yml
View File

@ -28,14 +28,6 @@
(data, format) = netsvc.LocalService('report.account.overdue').create(cr, uid, [ref('base.res_partner_asus'),ref('base.res_partner_agrolait'),ref('base.res_partner_c2c')], {}, {})
if tools.config['test_report_directory']:
file(os.path.join(tools.config['test_report_directory'], 'account-report_overdue.'+format), 'wb+').write(data)
-
In order to test the PDF reports defined on Account Move, we will print the Voucher Report
-
!python {model: account.move}: |
import netsvc, tools, os
(data, format) = netsvc.LocalService('report.account.move.voucher').create(cr, uid, [ref('account.account_move_0')], {}, {})
if tools.config['test_report_directory']:
file(os.path.join(tools.config['test_report_directory'], 'account-voucher-report.'+format), 'wb+').write(data)
-
Print the Aged Partner Balance Report
-
@ -44,7 +36,7 @@
ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')],'active_id':ref('account.chart0')})
data_dict = {'chart_account_id':ref('account.chart0')}
from tools import test_reports
test_reports.try_report_action(cr, uid, 'action_account_aged_balance_view',wiz_data=data_dict, context=ctx, our_module='account')
test_reports.try_report_action(cr, uid, 'action_account_aged_balance_view',wiz_data=data_dict, context=ctx, our_module='account')
-
Print the Account Balance Sheet in Horizontal mode
-
@ -53,7 +45,7 @@
ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
data_dict = {'chart_account_id':ref('account.chart0'),'display_type': True}
from tools import test_reports
test_reports.try_report_action(cr, uid, 'action_account_bs_report',wiz_data=data_dict, context=ctx, our_module='account')
test_reports.try_report_action(cr, uid, 'action_account_bs_report',wiz_data=data_dict, context=ctx, our_module='account')
-
Print the Account Balance Sheet in Normal mode
-
@ -62,7 +54,7 @@
ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
data_dict = {'chart_account_id':ref('account.chart0'),'display_type': False}
from tools import test_reports
test_reports.try_report_action(cr, uid, 'action_account_bs_report',wiz_data=data_dict, context=ctx, our_module='account')
test_reports.try_report_action(cr, uid, 'action_account_bs_report',wiz_data=data_dict, context=ctx, our_module='account')
-
Print the Account Balance Report in Normal mode through the wizard - From Account Chart
-
@ -157,7 +149,7 @@
ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
data_dict = {'chart_account_id':ref('account.chart0'),'display_type': False}
from tools import test_reports
test_reports.try_report_action(cr, uid, 'action_account_pl_report',wiz_data=data_dict, context=ctx, our_module='account')
test_reports.try_report_action(cr, uid, 'action_account_pl_report',wiz_data=data_dict, context=ctx, our_module='account')
-
Print the Profit-Loss Report in Horizontal Mode
-
@ -166,7 +158,7 @@
ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
data_dict = {'chart_account_id':ref('account.chart0'),'display_type': True}
from tools import test_reports
test_reports.try_report_action(cr, uid, 'action_account_pl_report',wiz_data=data_dict, context=ctx, our_module='account')
test_reports.try_report_action(cr, uid, 'action_account_pl_report',wiz_data=data_dict, context=ctx, our_module='account')
-
Print the Analytic Balance Report through the wizard
-
@ -215,4 +207,4 @@
ctx.update({'model': 'account.analytic.account','active_ids': [ref('account.analytic_root')]})
data_dict = {}
from tools import test_reports
test_reports.try_report_action(cr, uid, 'action_account_analytic_invert_balance',wiz_data=data_dict, context=ctx, our_module='account')
test_reports.try_report_action(cr, uid, 'action_account_analytic_invert_balance',wiz_data=data_dict, context=ctx, our_module='account')

2
addons/account/wizard/account_change_currency.py
View File

@ -72,7 +72,7 @@ class account_change_currency(osv.osv_memory):
new_price = (line.price_unit / old_rate ) * rate
obj_inv_line.write(cr, uid, [line.id], {'price_unit': new_price})
obj_inv.write(cr, uid, [invoice.id], {'currency_id': new_currency}, context=context)
return {}
return {'type': 'ir.actions.act_window_close'}
account_change_currency()

2
addons/account/wizard/account_fiscalyear_close.py
View File

@ -215,7 +215,7 @@ class account_fiscalyear_close(osv.osv_memory):
cr.execute('UPDATE account_fiscalyear ' \
'SET end_journal_period_id = %s ' \
'WHERE id = %s', (ids[0], old_fyear.id))
return {}
return {'type': 'ir.actions.act_window_close'}
account_fiscalyear_close()

2
addons/account/wizard/account_fiscalyear_close_state.py
View File

@ -57,7 +57,7 @@ class account_fiscalyear_close_state(osv.osv_memory):
fy_pool = self.pool.get('account.fiscalyear')
fy_code = fy_pool.browse(cr, uid, fy_id, context=context).code
fy_pool.log(cr, uid, fy_id, "Fiscal year '%s' is closed, no more modification allowed." % (fy_code))
return {}
return {'type': 'ir.actions.act_window_close'}
account_fiscalyear_close_state()

4
addons/account/wizard/account_invoice_state.py
View File

@ -43,7 +43,7 @@ class account_invoice_confirm(osv.osv_memory):
if record['state'] not in ('draft','proforma','proforma2'):
raise osv.except_osv(_('Warning'), _("Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-Forma' state!"))
wf_service.trg_validate(uid, 'account.invoice', record['id'], 'invoice_open', cr)
return {}
return {'type': 'ir.actions.act_window_close'}
account_invoice_confirm()
@ -67,7 +67,7 @@ class account_invoice_cancel(osv.osv_memory):
if record['state'] in ('cancel','paid'):
raise osv.except_osv(_('Warning'), _("Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' or 'Done' state!"))
wf_service.trg_validate(uid, 'account.invoice', record['id'], 'invoice_cancel', cr)
return {}
return {'type': 'ir.actions.act_window_close'}
account_invoice_cancel()

2
addons/account/wizard/account_open_closed_fiscalyear.py
View File

@ -42,7 +42,7 @@ class account_open_closed_fiscalyear(osv.osv_memory):
ids_move = move_obj.search(cr, uid, [('journal_id','=',period_journal.journal_id.id),('period_id','=',period_journal.period_id.id)])
if ids_move:
cr.execute('delete from account_move where id IN %s', (tuple(ids_move),))
return {}
return {'type': 'ir.actions.act_window_close'}
account_open_closed_fiscalyear()

2
addons/account/wizard/account_period_close.py
View File

@ -50,7 +50,7 @@ class account_period_close(osv.osv_memory):
# Log message for Period
for period_id, name in period_pool.name_get(cr, uid, [id]):
period_pool.log(cr, uid, period_id, "Period '%s' is closed, no more modification allowed for this period." % (name))
return {}
return {'type': 'ir.actions.act_window_close'}
account_period_close()

6
addons/account/wizard/account_reconcile.py
View File

@ -101,7 +101,7 @@ class account_move_line_reconcile(osv.osv_memory):
context.update({'stop_reconcile': True})
account_move_line_obj.reconcile(cr, uid, context['active_ids'], 'manual', account_id,
period_id, journal_id, context=context)
return {}
return {'type': 'ir.actions.act_window_close'}
account_move_line_reconcile()
@ -145,7 +145,7 @@ class account_move_line_reconcile_writeoff(osv.osv_memory):
if context is None:
context = {}
account_move_line_obj.reconcile_partial(cr, uid, context['active_ids'], 'manual', context=context)
return {}
return {'type': 'ir.actions.act_window_close'}
def trans_rec_reconcile(self, cr, uid, ids, context=None):
account_move_line_obj = self.pool.get('account.move.line')
@ -169,7 +169,7 @@ class account_move_line_reconcile_writeoff(osv.osv_memory):
context.update({'stop_reconcile': True})
account_move_line_obj.reconcile(cr, uid, context['active_ids'], 'manual', account_id,
period_id, journal_id, context=context)
return {}
return {'type': 'ir.actions.act_window_close'}
account_move_line_reconcile_writeoff()

2
addons/account/wizard/account_reconcile_partner_process.py
View File

@ -83,7 +83,7 @@ class account_partner_reconcile_process(osv.osv_memory):
res_partner_obj.write(cr, uid, partner_id[0], {'last_reconciliation_date': time.strftime('%Y-%m-%d')}, context)
#TODO: we have to find a way to update the context of the current tab (we could open a new tab with the context but it's not really handy)
#TODO: remove that comments when the client side dev is done
return {}
return {'type': 'ir.actions.act_window_close'}
_columns = {
'to_reconcile': fields.float('Remaining Partners', readonly=True, help='This is the remaining partners for who you should check if there is something to reconcile or not. This figure already count the current partner as reconciled.'),

4
addons/account/wizard/account_report_account_balance.py
View File

@ -19,8 +19,6 @@
#
##############################################################################
from lxml import etree
from osv import osv
class account_balance_report(osv.osv_memory):
@ -38,4 +36,4 @@ class account_balance_report(osv.osv_memory):
account_balance_report()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

2
addons/account/wizard/account_report_aged_partner_balance.py
View File

@ -22,8 +22,6 @@
import time
from datetime import datetime
from dateutil.relativedelta import relativedelta
from lxml import etree
from osv import osv, fields
from tools.translate import _

4
addons/account/wizard/account_report_balance_sheet.py
View File

@ -19,8 +19,6 @@
#
##############################################################################
from lxml import etree
from osv import osv, fields
from tools.translate import _
@ -86,4 +84,4 @@ class account_bs_report(osv.osv_memory):
account_bs_report()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

4
addons/account/wizard/account_report_profit_loss.py
View File

@ -19,8 +19,6 @@
#
##############################################################################
from lxml import etree
from osv import osv, fields
class account_pl_report(osv.osv_memory):
@ -60,4 +58,4 @@ class account_pl_report(osv.osv_memory):
account_pl_report()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

2
addons/account/wizard/account_state_open.py
View File

@ -37,7 +37,7 @@ class account_state_open(osv.osv_memory):
raise osv.except_osv(_('Warning'), _('Invoice is already reconciled'))
wf_service = netsvc.LocalService("workflow")
res = wf_service.trg_validate(uid, 'account.invoice', context['active_ids'][0], 'open_test', cr)
return {}
return {'type': 'ir.actions.act_window_close'}
account_state_open()

4
addons/account/wizard/account_unreconcile.py
View File

@ -31,7 +31,7 @@ class account_unreconcile(osv.osv_memory):
context = {}
if context.get('active_ids', False):
obj_move_line._remove_move_reconcile(cr, uid, context['active_ids'], context=context)
return {}
return {'type': 'ir.actions.act_window_close'}
account_unreconcile()
@ -46,7 +46,7 @@ class account_unreconcile_reconcile(osv.osv_memory):
rec_ids = context['active_ids']
if rec_ids:
obj_move_reconcile.unlink(cr, uid, rec_ids, context=context)
return {}
return {'type': 'ir.actions.act_window_close'}
account_unreconcile_reconcile()

4
addons/account/wizard/account_validate_account_move.py
View File

@ -38,7 +38,7 @@ class validate_account_move(osv.osv_memory):
if not ids_move:
raise osv.except_osv(_('Warning'), _('Specified Journal does not have any account move entries in draft state for this period'))
obj_move.button_validate(cr, uid, ids_move, context=context)
return {}
return {'type': 'ir.actions.act_window_close'}
validate_account_move()
@ -60,7 +60,7 @@ class validate_account_move_lines(osv.osv_memory):
if not move_ids:
raise osv.except_osv(_('Warning'), _('Selected Entry Lines does not have any account move enties in draft state'))
obj_move.button_validate(cr, uid, move_ids, context)
return {}
return {'type': 'ir.actions.act_window_close'}
validate_account_move_lines()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

6
addons/account_accountant/i18n/account_accountant.pot
View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:43:19+0000\n"
"PO-Revision-Date: 2010-12-21 19:43:19+0000\n"
"POT-Creation-Date: 2011-01-03 16:56:46+0000\n"
"PO-Revision-Date: 2011-01-03 16:56:46+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"

35
addons/account_analytic_analysis/i18n/account_analytic_analysis.pot
View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:43:19+0000\n"
"PO-Revision-Date: 2010-12-21 19:43:19+0000\n"
"POT-Creation-Date: 2011-01-03 16:56:46+0000\n"
"PO-Revision-Date: 2011-01-03 16:56:46+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -31,16 +31,12 @@ msgid "Computed using the formula: Maximum Quantity - Hours Tot."
msgstr ""
#. module: account_analytic_analysis
#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
#: code:addons/account_analytic_analysis/account_analytic_analysis.py:532
#: code:addons/account_analytic_analysis/account_analytic_analysis.py:703
#, python-format
msgid "AccessError"
msgstr ""
#. module: account_analytic_analysis
#: field:account.analytic.account,ca_theorical:0
msgid "Theorical Revenue"
msgstr ""
#. module: account_analytic_analysis
#: help:account.analytic.account,last_invoice_date:0
msgid "Date of the last invoice created for this analytic account."
@ -69,13 +65,13 @@ msgid "Computed using the formula: Theorial Revenue - Total Costs"
msgstr ""
#. module: account_analytic_analysis
#: field:account.analytic.account,theorical_margin:0
msgid "Theorical Margin"
#: field:account.analytic.account,real_margin_rate:0
msgid "Real Margin Rate (%)"
msgstr ""
#. module: account_analytic_analysis
#: field:account.analytic.account,real_margin_rate:0
msgid "Real Margin Rate (%)"
#: field:account.analytic.account,ca_theorical:0
msgid "Theoretical Revenue"
msgstr ""
#. module: account_analytic_analysis
@ -108,6 +104,11 @@ msgstr ""
msgid "Remaining Hours"
msgstr ""
#. module: account_analytic_analysis
#: field:account.analytic.account,theorical_margin:0
msgid "Theoretical Margin"
msgstr ""
#. module: account_analytic_analysis
#: help:account.analytic.account,ca_theorical:0
msgid "Based on the costs you had on the project, what would have been the revenue if all these costs have been invoiced at the normal sale price provided by the pricelist."
@ -155,7 +156,8 @@ msgid "Invoiced Amount"
msgstr ""
#. module: account_analytic_analysis
#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
#: code:addons/account_analytic_analysis/account_analytic_analysis.py:533
#: code:addons/account_analytic_analysis/account_analytic_analysis.py:704
#, python-format
msgid "You try to bypass an access rule (Document type: %s)."
msgstr ""
@ -175,6 +177,11 @@ msgstr ""
msgid "Real Margin"
msgstr ""
#. module: account_analytic_analysis
#: constraint:account.analytic.account:0
msgid "Error! The currency has to be the same as the currency of the selected company"
msgstr ""
#. module: account_analytic_analysis
#: help:account.analytic.account,ca_invoiced:0
msgid "Total customer invoiced amount for this account."

6
addons/account_analytic_default/i18n/account_analytic_default.pot
View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:43:20+0000\n"
"PO-Revision-Date: 2010-12-21 19:43:20+0000\n"
"POT-Creation-Date: 2011-01-03 16:56:46+0000\n"
"PO-Revision-Date: 2011-01-03 16:56:46+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"

40
addons/account_analytic_plans/i18n/account_analytic_plans.pot
View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:43:20+0000\n"
"PO-Revision-Date: 2010-12-21 19:43:20+0000\n"
"POT-Creation-Date: 2011-01-03 16:56:47+0000\n"
"PO-Revision-Date: 2011-01-03 16:56:47+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -66,6 +66,12 @@ msgstr ""
msgid "Analytic Plan Line"
msgstr ""
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:60
#, python-format
msgid "User Error"
msgstr ""
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
msgid "Analytic Plan Instance"
@ -152,7 +158,7 @@ msgid "Sales Order Line"
msgstr ""
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:47
#: view:analytic.plan.create.model:0
#, python-format
msgid "Distribution Model Saved"
@ -174,13 +180,13 @@ msgid "Percentage"
msgstr ""
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/account_analytic_plans.py:0
#: code:addons/account_analytic_plans/account_analytic_plans.py:201
#, python-format
msgid "A model having this name and code already exists !"
msgstr ""
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
#, python-format
msgid "No analytic plan defined !"
msgstr ""
@ -198,9 +204,8 @@ msgid "Analytic Plans"
msgstr ""
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:0
#, python-format
msgid "User Error"
#: report:account.analytic.account.crossovered.analytic:0
msgid "Perc(%)"
msgstr ""
#. module: account_analytic_plans
@ -264,7 +269,8 @@ msgid "To Date"
msgstr ""
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/account_analytic_plans.py:0
#: code:addons/account_analytic_plans/account_analytic_plans.py:321
#: code:addons/account_analytic_plans/account_analytic_plans.py:462
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
msgstr ""
@ -359,8 +365,9 @@ msgid "Root account of this plan."
msgstr ""
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/account_analytic_plans.py:0
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
#: code:addons/account_analytic_plans/account_analytic_plans.py:201
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
#, python-format
msgid "Error"
msgstr ""
@ -376,7 +383,7 @@ msgid "Quantity"
msgstr ""
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
#, python-format
msgid "Please put a name and a code before saving the model !"
msgstr ""
@ -387,7 +394,8 @@ msgid "Print Crossovered Analytic"
msgstr ""
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/account_analytic_plans.py:0
#: code:addons/account_analytic_plans/account_analytic_plans.py:321
#: code:addons/account_analytic_plans/account_analytic_plans.py:462
#, python-format
msgid "No Analytic Journal !"
msgstr ""
@ -424,7 +432,7 @@ msgid "Analytic Distribution Lines"
msgstr ""
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/account_analytic_plans.py:0
#: code:addons/account_analytic_plans/account_analytic_plans.py:214
#, python-format
msgid "The Total Should be Between %s and %s"
msgstr ""
@ -501,7 +509,7 @@ msgid "The name of the journal must be unique per company !"
msgstr ""
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/account_analytic_plans.py:0
#: code:addons/account_analytic_plans/account_analytic_plans.py:214
#, python-format
msgid "Value Error"
msgstr ""

2
addons/account_analytic_plans/wizard/analytic_plan_create_model.py
View File

@ -53,7 +53,7 @@ class analytic_plan_create_model(osv.osv_memory):
'target': 'new',
}
else:
return {}
return {'type': 'ir.actions.act_window_close'}
analytic_plan_create_model()

15
addons/account_anglo_saxon/i18n/account_anglo_saxon.pot
View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:43:21+0000\n"
"PO-Revision-Date: 2010-12-21 19:43:21+0000\n"
"POT-Creation-Date: 2011-01-03 16:56:48+0000\n"
"PO-Revision-Date: 2011-01-03 16:56:48+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -21,8 +21,8 @@ msgid " Accounting Property"
msgstr ""
#. module: account_anglo_saxon
#: model:ir.model,name:account_anglo_saxon.model_product_category
msgid "Product Category"
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique !"
msgstr ""
#. module: account_anglo_saxon
@ -50,6 +50,11 @@ msgstr ""
msgid "Product Template"
msgstr ""
#. module: account_anglo_saxon
#: model:ir.model,name:account_anglo_saxon.model_product_category
msgid "Product Category"
msgstr ""
#. module: account_anglo_saxon
#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
msgid "Stock Accounting for Anglo Saxon countries"

2
addons/account_anglo_saxon/invoice.py
View File

@ -21,7 +21,7 @@
#
##############################################################################
from osv import fields, osv
from osv import osv
class account_invoice_line(osv.osv):
_inherit = "account.invoice.line"

39
addons/account_budget/i18n/account_budget.pot
View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:43:21+0000\n"
"PO-Revision-Date: 2010-12-21 19:43:21+0000\n"
"POT-Creation-Date: 2011-01-03 16:56:49+0000\n"
"PO-Revision-Date: 2011-01-03 16:56:49+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -32,13 +32,14 @@ msgid "Budgetary Positions"
msgstr ""
#. module: account_budget
#: view:account.budget.crossvered.summary.report:0
msgid "This wizard is used to print summary of budgets"
#: code:addons/account_budget/account_budget.py:119
#, python-format
msgid "The General Budget '%s' has no Accounts!"
msgstr ""
#. module: account_budget
#: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
msgid "A budget is a forecast of your company's income and expenses expected for a period in the future. With a budget, a company is able to carefully look at how much money they are taking in during a given period, and figure out the best way to divide it among various categories. By keeping track of where your money goes, you may be less likely to overspend, and more likely to meet your financial goals. Forecast a budget by detailing the expected revenue per analytic account and monitor its evolution based on the actuals realised during that period."
#: report:account.budget:0
msgid "Printed at:"
msgstr ""
#. module: account_budget
@ -117,6 +118,16 @@ msgstr ""
msgid "Status"
msgstr ""
#. module: account_budget
#: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
msgid "A budget is a forecast of your company's income and expenses expected for a period in the future. With a budget, a company is able to carefully look at how much money they are taking in during a given period, and figure out the best way to divide it among various categories. By keeping track of where your money goes, you may be less likely to overspend, and more likely to meet your financial goals. Forecast a budget by detailing the expected revenue per analytic account and monitor its evolution based on the actuals realised during that period."
msgstr ""
#. module: account_budget
#: view:account.budget.crossvered.summary.report:0
msgid "This wizard is used to print summary of budgets"
msgstr ""
#. module: account_budget
#: report:account.budget:0
#: report:crossovered.budget.report:0
@ -182,6 +193,7 @@ msgid "Practical Amt"
msgstr ""
#. module: account_budget
#: view:account.analytic.account:0
#: view:account.budget.post:0
#: view:crossovered.budget:0
#: field:crossovered.budget.lines,practical_amount:0
@ -201,6 +213,7 @@ msgid "Account Budget report for analytic account"
msgstr ""
#. module: account_budget
#: view:account.analytic.account:0
#: view:account.budget.post:0
#: view:crossovered.budget:0
#: field:crossovered.budget.lines,theoritical_amount:0
@ -235,12 +248,7 @@ msgid "Budget"
msgstr ""
#. module: account_budget
#: report:account.budget:0
msgid "Printed at:"
msgstr ""
#. module: account_budget
#: code:addons/account_budget/account_budget.py:0
#: code:addons/account_budget/account_budget.py:119
#, python-format
msgid "Error!"
msgstr ""
@ -270,9 +278,8 @@ msgid "Budgets"
msgstr ""
#. module: account_budget
#: code:addons/account_budget/account_budget.py:0
#, python-format
msgid "The General Budget '%s' has no Accounts!"
#: constraint:account.analytic.account:0
msgid "Error! The currency has to be the same as the currency of the selected company"
msgstr ""
#. module: account_budget

6
addons/account_budget/security/account_budget_security.xml
View File

@ -6,21 +6,21 @@
<field name="name">Budget post multi-company</field>
<field name="model_id" ref="model_account_budget_post"/>
<field eval="True" name="global"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
</record>
<record id="budget_comp_rule" model="ir.rule">
<field name="name">Budget multi-company</field>
<field name="model_id" ref="model_crossovered_budget"/>
<field eval="True" name="global"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
</record>
<record id="budget_lines_comp_rule" model="ir.rule">
<field name="name">Budget lines multi-company</field>
<field name="model_id" ref="model_crossovered_budget_lines"/>
<field eval="True" name="global"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
</record>
</data>

6
addons/account_cancel/i18n/account_cancel.pot
View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:43:22+0000\n"
"PO-Revision-Date: 2010-12-21 19:43:22+0000\n"
"POT-Creation-Date: 2011-01-03 16:56:49+0000\n"
"PO-Revision-Date: 2011-01-03 16:56:49+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"

6
addons/account_chart/i18n/account_chart.pot
View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:43:22+0000\n"
"PO-Revision-Date: 2010-12-21 19:43:22+0000\n"
"POT-Creation-Date: 2011-01-03 16:56:49+0000\n"
"PO-Revision-Date: 2011-01-03 16:56:49+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"

12
addons/account_coda/i18n/account_coda.pot
View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:43:22+0000\n"
"PO-Revision-Date: 2010-12-21 19:43:22+0000\n"
"POT-Creation-Date: 2011-01-03 16:56:50+0000\n"
"PO-Revision-Date: 2011-01-03 16:56:50+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -68,7 +68,7 @@ msgid "Coda import"
msgstr ""
#. module: account_coda
#: code:addons/account_coda/account_coda.py:0
#: code:addons/account_coda/account_coda.py:51
#, python-format
msgid "Coda file not found for bank statement !!"
msgstr ""
@ -137,7 +137,7 @@ msgid "Open Statements"
msgstr ""
#. module: account_coda
#: code:addons/account_coda/wizard/account_coda_import.py:0
#: code:addons/account_coda/wizard/account_coda_import.py:167
#, python-format
msgid "The bank account %s is not defined for the partner %s.\n"
""
@ -204,7 +204,7 @@ msgid "Coda Logs"
msgstr ""
#. module: account_coda
#: code:addons/account_coda/wizard/account_coda_import.py:0
#: code:addons/account_coda/wizard/account_coda_import.py:311
#, python-format
msgid "Result"
msgstr ""

2
addons/account_coda/security/account_security.xml
View File

@ -5,7 +5,7 @@
<field name="name">Account Coda model company rule</field>
<field model="ir.model" name="model_id" ref="model_account_coda"/>
<field eval="True" name="global"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
</record>
</data></openerp>

18
addons/account_followup/i18n/account_followup.pot
View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:43:24+0000\n"
"PO-Revision-Date: 2010-12-21 19:43:24+0000\n"
"POT-Creation-Date: 2011-01-03 16:56:51+0000\n"
"PO-Revision-Date: 2011-01-03 16:56:51+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -16,7 +16,7 @@ msgstr ""
"Plural-Forms: \n"
#. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:0
#: code:addons/account_followup/wizard/account_followup_print.py:295
#, python-format
msgid "Follwoup Summary"
msgstr ""
@ -54,7 +54,7 @@ msgid "Group By..."
msgstr ""
#. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:0
#: code:addons/account_followup/wizard/account_followup_print.py:287
#, python-format
msgid "\n"
"\n"
@ -183,7 +183,7 @@ msgid "Partners"
msgstr ""
#. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:0
#: code:addons/account_followup/wizard/account_followup_print.py:138
#, python-format
msgid "Invoices Reminder"
msgstr ""
@ -369,7 +369,7 @@ msgid "Due"
msgstr ""
#. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:0
#: code:addons/account_followup/wizard/account_followup_print.py:56
#, python-format
msgid "Select Partners"
msgstr ""
@ -430,7 +430,7 @@ msgid "Send email confirmation"
msgstr ""
#. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:0
#: code:addons/account_followup/wizard/account_followup_print.py:284
#, python-format
msgid "All E-mails have been successfully sent to Partners:.\n"
"\n"
@ -615,7 +615,7 @@ msgid "Maturity"
msgstr ""
#. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:0
#: code:addons/account_followup/wizard/account_followup_print.py:286
#, python-format
msgid "E-Mail not sent to following Partners, Email not available !\n"
"\n"

66
addons/account_invoice_layout/i18n/account_invoice_layout.pot
View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:43:24+0000\n"
"PO-Revision-Date: 2010-12-21 19:43:24+0000\n"
"POT-Creation-Date: 2011-01-03 16:56:51+0000\n"
"PO-Revision-Date: 2011-01-03 16:56:51+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -95,7 +95,7 @@ msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "Document"
msgid "Tel. :"
msgstr ""
#. module: account_invoice_layout
@ -125,8 +125,9 @@ msgid "Product"
msgstr ""
#. module: account_invoice_layout
#: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
msgid "Write Messages"
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "Description"
msgstr ""
#. module: account_invoice_layout
@ -148,7 +149,6 @@ msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "Taxes:"
msgstr ""
@ -158,8 +158,8 @@ msgid "Source Account"
msgstr ""
#. module: account_invoice_layout
#: view:account.invoice.special.msg:0
msgid "Cancel"
#: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
msgid "Write Messages"
msgstr ""
#. module: account_invoice_layout
@ -193,19 +193,17 @@ msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "Partner Ref."
msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: model:ir.model,name:account_invoice_layout.model_account_invoice
#: report:notify_account.invoice:0
msgid "Invoice"
msgid "Refund"
msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "Fax :"
msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
msgid "Total:"
msgstr ""
@ -237,9 +235,18 @@ msgid "Amount"
msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: model:notify.message,msg:account_invoice_layout.demo_message1
msgid "ERP & CRM Solutions..."
msgstr ""
#. module: account_invoice_layout
#: report:notify_account.invoice:0
msgid "Tel. :"
msgid "Net Total :"
msgstr ""
#. module: account_invoice_layout
#: report:notify_account.invoice:0
msgid "Total :"
msgstr ""
#. module: account_invoice_layout
@ -261,7 +268,7 @@ msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "Refund"
msgid "Origin"
msgstr ""
#. module: account_invoice_layout
@ -274,6 +281,12 @@ msgstr ""
msgid "Separator Line"
msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "Your Reference"
msgstr ""
#. module: account_invoice_layout
#: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
msgid "Invoices Layout Improvement"
@ -303,7 +316,6 @@ msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "Net Total:"
msgstr ""
@ -314,13 +326,14 @@ msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: model:ir.model,name:account_invoice_layout.model_account_invoice
#: report:notify_account.invoice:0
msgid "Fax :"
msgid "Invoice"
msgstr ""
#. module: account_invoice_layout
#: model:notify.message,msg:account_invoice_layout.demo_message1
msgid "Be Expert with the Experts..."
#: view:account.invoice.special.msg:0
msgid "Cancel"
msgstr ""
#. module: account_invoice_layout
@ -334,6 +347,11 @@ msgstr ""
msgid "Message"
msgstr ""
#. module: account_invoice_layout
#: report:notify_account.invoice:0
msgid "Taxes :"
msgstr ""
#. module: account_invoice_layout
#: model:ir.ui.menu,name:account_invoice_layout.menu_notify_mesage_tree_form
msgid "All Notification Messages"

26
addons/account_payment/i18n/account_payment.pot
View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:43:25+0000\n"
"PO-Revision-Date: 2010-12-21 19:43:25+0000\n"
"POT-Creation-Date: 2011-01-03 16:56:52+0000\n"
"PO-Revision-Date: 2011-01-03 16:56:52+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -246,7 +246,7 @@ msgid "Choose an option for the Payment Order:'Fixed' stands for a date specifie
msgstr ""
#. module: account_payment
#: code:addons/account_payment/account_move_line.py:0
#: code:addons/account_payment/account_move_line.py:110
#, python-format
msgid "Error !"
msgstr ""
@ -394,7 +394,7 @@ msgid "The successor message of Communication."
msgstr ""
#. module: account_payment
#: code:addons/account_payment/account_move_line.py:0
#: code:addons/account_payment/account_move_line.py:110
#, python-format
msgid "No partner defined on entry line"
msgstr ""
@ -450,6 +450,12 @@ msgstr ""
msgid "Search"
msgstr ""
#. module: account_payment
#: model:ir.actions.report.xml,name:account_payment.payment_order1
#: model:ir.model,name:account_payment.model_payment_order
msgid "Payment Order"
msgstr ""
#. module: account_payment
#: field:payment.line,date:0
msgid "Payment Date"
@ -552,9 +558,8 @@ msgid "Information"
msgstr ""
#. module: account_payment
#: model:ir.actions.report.xml,name:account_payment.payment_order1
#: model:ir.model,name:account_payment.model_payment_order
msgid "Payment Order"
#: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
msgid "A payment order is a payment request from your company to pay a supplier invoice or a customer credit note. Here you can register all payment orders that should be done, keep track of all payment orders and mention the invoice reference and the partner the payment should be done for."
msgstr ""
#. module: account_payment
@ -662,11 +667,6 @@ msgstr ""
msgid "Total"
msgstr ""
#. module: account_payment
#: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
msgid "A payment order is a payment request that your company does in order to pay a supplier invoice or a customer credit note. Here you can register all payment orders that should be done, keep track of all payment orders and mention the invoice reference and the partner the payment should be done for."
msgstr ""
#. module: account_payment
#: view:account.payment.make.payment:0
#: model:ir.actions.act_window,name:account_payment.action_account_payment_make_payment

2
addons/account_payment/security/account_payment_security.xml
View File

@ -10,7 +10,7 @@
<field name="name">Payment Mode company rule</field>
<field model="ir.model" name="model_id" ref="model_payment_mode"/>
<field eval="True" name="global"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
</record>
</data>

4
addons/account_payment/wizard/account_payment_order.py
View File

@ -65,7 +65,7 @@ class payment_order_create(osv.osv_memory):
data = self.read(cr, uid, ids, [], context=context)[0]
line_ids = data['entries']
if not line_ids:
return {}
return {'type': 'ir.actions.act_window_close'}
payment = order_obj.browse(cr, uid, context['active_id'], context=context)
t = None
@ -90,7 +90,7 @@ class payment_order_create(osv.osv_memory):
'date': date_to_pay,
'currency': line.invoice and line.invoice.currency_id.id or False,
}, context=context)
return {}
return {'type': 'ir.actions.act_window_close'}
def search_entries(self, cr, uid, ids, context=None):
line_obj = self.pool.get('account.move.line')

2
addons/account_payment/wizard/account_payment_pay.py
View File

@ -37,7 +37,7 @@ class account_payment_make_payment(osv.osv_memory):
# obj_act = self.pool.get('ir.actions.act_window')
# order = obj_payment_order.browse(cr, uid, context['active_id'], context)
obj_payment_order.set_done(cr, uid, [context['active_id']], context)
return {}
return {'type': 'ir.actions.act_window_close'}
# t = order.mode and order.mode.type.code or 'manual'
# if t == 'manual':
# obj_payment_order.set_done(cr,uid,context['active_id'],context)

2
addons/account_payment/wizard/account_payment_populate_statement.py
View File

@ -65,7 +65,7 @@ class account_payment_populate_statement(osv.osv_memory):
data = self.read(cr, uid, ids, [], context=context)[0]
line_ids = data['lines']
if not line_ids:
return {}
return {'type': 'ir.actions.act_window_close'}
statement = statement_obj.browse(cr, uid, context['active_id'], context=context)

6
addons/account_sequence/i18n/account_sequence.pot
View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:43:25+0000\n"
"PO-Revision-Date: 2010-12-21 19:43:25+0000\n"
"POT-Creation-Date: 2011-01-03 16:56:52+0000\n"
"PO-Revision-Date: 2011-01-03 16:56:52+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"

273
addons/account_voucher/i18n/account_voucher.pot
View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:43:26+0000\n"
"PO-Revision-Date: 2010-12-21 19:43:26+0000\n"
"POT-Creation-Date: 2011-01-03 16:56:53+0000\n"
"PO-Revision-Date: 2011-01-03 16:56:53+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -21,7 +21,7 @@ msgid "Unreconciliation transactions"
msgstr ""
#. module: account_voucher
#: code:addons/account_voucher/account_voucher.py:0
#: code:addons/account_voucher/account_voucher.py:259
#, python-format
msgid "Write-Off"
msgstr ""
@ -36,6 +36,11 @@ msgstr ""
msgid "Open Customer Journal Entries"
msgstr ""
#. module: account_voucher
#: view:sale.receipt.report:0
msgid "Voucher Date"
msgstr ""
#. module: account_voucher
#: report:voucher.print:0
msgid "Particulars"
@ -43,11 +48,12 @@ msgstr ""
#. module: account_voucher
#: view:account.voucher:0
#: view:sale.receipt.report:0
msgid "Group By..."
msgstr ""
#. module: account_voucher
#: code:addons/account_voucher/account_voucher.py:0
#: code:addons/account_voucher/account_voucher.py:607
#, python-format
msgid "Cannot delete Voucher(s) which are already opened or paid !"
msgstr ""
@ -79,13 +85,14 @@ msgid "Bill Payment"
msgstr ""
#. module: account_voucher
#: field:account.voucher.line,amount_original:0
msgid "Originial Amount"
#: code:addons/account_voucher/account_voucher.py:753
#, python-format
msgid "You have to configure account base code and account tax code on the '%s' tax!"
msgstr ""
#. module: account_voucher
#: view:account.statement.from.invoice.lines:0
#: code:addons/account_voucher/wizard/account_statement_from_invoice.py:0
#: code:addons/account_voucher/wizard/account_statement_from_invoice.py:182
#: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice_lines
#, python-format
msgid "Import Entries"
@ -96,6 +103,11 @@ msgstr ""
msgid "Account voucher unreconcile"
msgstr ""
#. module: account_voucher
#: selection:sale.receipt.report,month:0
msgid "March"
msgstr ""
#. module: account_voucher
#: model:ir.actions.act_window,help:account_voucher.action_sale_receipt
msgid "When you sell products to a customer, you can give him a sales receipt or an invoice. When the sales receipt is confirmed, it creates journal items automatically and you can record the customer payment related to this sales receipt."
@ -109,6 +121,8 @@ msgstr ""
#. module: account_voucher
#: field:account.voucher,company_id:0
#: field:account.voucher.line,company_id:0
#: view:sale.receipt.report:0
#: field:sale.receipt.report,company_id:0
msgid "Company"
msgstr ""
@ -118,8 +132,8 @@ msgid "Set to Draft"
msgstr ""
#. module: account_voucher
#: field:account.voucher,comment:0
msgid "Write-Off Comment"
#: help:account.voucher,reference:0
msgid "Transaction reference number."
msgstr ""
#. module: account_voucher
@ -137,6 +151,12 @@ msgstr ""
msgid "Validate"
msgstr ""
#. module: account_voucher
#: view:sale.receipt.report:0
#: field:sale.receipt.report,day:0
msgid "Day"
msgstr ""
#. module: account_voucher
#: view:account.voucher:0
msgid "Search Vouchers"
@ -144,12 +164,14 @@ msgstr ""
#. module: account_voucher
#: selection:account.voucher,type:0
#: selection:sale.receipt.report,type:0
msgid "Purchase"
msgstr ""
#. module: account_voucher
#: field:account.voucher,account_id:0
#: field:account.voucher.line,account_id:0
#: field:sale.receipt.report,account_id:0
msgid "Account"
msgstr ""
@ -163,9 +185,16 @@ msgstr ""
msgid "Ok"
msgstr ""
#. module: account_voucher
#: model:ir.actions.act_window,help:account_voucher.action_sale_receipt_report_all
msgid "From this report, you can have an overview of the amount invoiced to your customer as well as payment delays. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs."
msgstr ""
#. module: account_voucher
#: field:account.voucher,date_due:0
#: field:account.voucher.line,date_due:0
#: view:sale.receipt.report:0
#: field:sale.receipt.report,date_due:0
msgid "Due Date"
msgstr ""
@ -186,6 +215,7 @@ msgstr ""
#. module: account_voucher
#: selection:account.voucher,type:0
#: selection:sale.receipt.report,type:0
msgid "Sale"
msgstr ""
@ -217,11 +247,12 @@ msgstr ""
#. module: account_voucher
#: view:account.voucher:0
msgid "Bill Information"
msgid "Other Information"
msgstr ""
#. module: account_voucher
#: selection:account.voucher,state:0
#: selection:sale.receipt.report,state:0
msgid "Cancelled"
msgstr ""
@ -257,6 +288,12 @@ msgstr ""
msgid "Amount (in words) :"
msgstr ""
#. module: account_voucher
#: view:sale.receipt.report:0
#: field:sale.receipt.report,nbr:0
msgid "# of Voucher Lines"
msgstr ""
#. module: account_voucher
#: field:account.voucher.line,account_analytic_id:0
msgid "Analytic Account"
@ -282,9 +319,7 @@ msgstr ""
#. module: account_voucher
#: view:account.voucher:0
#: field:account.voucher,partner_id:0
#: field:account.voucher.line,partner_id:0
msgid "Partner"
msgid "Paid Amount"
msgstr ""
#. module: account_voucher
@ -293,18 +328,13 @@ msgid "Import Invoices"
msgstr ""
#. module: account_voucher
#: code:addons/account_voucher/account_voucher.py:0
#, python-format
msgid "You have to configure account base code and account tax code on the '%s' tax!"
msgstr ""
#. module: account_voucher
#: selection:account.voucher,pay_now:0
msgid "Pay Later or Group Funds"
#: report:voucher.print:0
msgid "Account :"
msgstr ""
#. module: account_voucher
#: selection:account.voucher,type:0
#: selection:sale.receipt.report,type:0
msgid "Receipt"
msgstr ""
@ -337,6 +367,7 @@ msgstr ""
#. module: account_voucher
#: view:account.voucher:0
#: field:account.voucher,state:0
#: view:sale.receipt.report:0
msgid "State"
msgstr ""
@ -345,6 +376,17 @@ msgstr ""
msgid "Accounting Voucher Entries"
msgstr ""
#. module: account_voucher
#: view:sale.receipt.report:0
#: field:sale.receipt.report,type:0
msgid "Type"
msgstr ""
#. module: account_voucher
#: field:account.voucher.unreconcile,remove:0
msgid "Want to remove accounting entries too ?"
msgstr ""
#. module: account_voucher
#: view:account.voucher:0
#: model:ir.actions.act_window,name:account_voucher.act_journal_voucher_open
@ -352,7 +394,7 @@ msgid "Voucher Entries"
msgstr ""
#. module: account_voucher
#: code:addons/account_voucher/account_voucher.py:0
#: code:addons/account_voucher/account_voucher.py:656
#, python-format
msgid "Error !"
msgstr ""
@ -380,14 +422,19 @@ msgid "Sales Receipt"
msgstr ""
#. module: account_voucher
#: code:addons/account_voucher/account_voucher.py:0
#: code:addons/account_voucher/account_voucher.py:607
#, python-format
msgid "Invalid action !"
msgstr ""
#. module: account_voucher
#: view:account.voucher:0
msgid "Other Information"
msgid "Bill Information"
msgstr ""
#. module: account_voucher
#: selection:sale.receipt.report,month:0
msgid "July"
msgstr ""
#. module: account_voucher
@ -400,15 +447,21 @@ msgstr ""
msgid "Tax Amount"
msgstr ""
#. module: account_voucher
#: view:sale.receipt.report:0
#: field:sale.receipt.report,due_delay:0
msgid "Avg. Due Delay"
msgstr ""
#. module: account_voucher
#: view:account.invoice:0
#: code:addons/account_voucher/invoice.py:0
#: code:addons/account_voucher/invoice.py:32
#, python-format
msgid "Pay Invoice"
msgstr ""
#. module: account_voucher
#: code:addons/account_voucher/account_voucher.py:0
#: code:addons/account_voucher/account_voucher.py:753
#, python-format
msgid "No Account Base Code and Account Tax Code!"
msgstr ""
@ -425,7 +478,11 @@ msgstr ""
#. module: account_voucher
#: view:account.voucher:0
msgid "Paid Amount"
#: field:account.voucher,partner_id:0
#: field:account.voucher.line,partner_id:0
#: view:sale.receipt.report:0
#: field:sale.receipt.report,partner_id:0
msgid "Partner"
msgstr ""
#. module: account_voucher
@ -439,8 +496,13 @@ msgid "The amount of the voucher must be the same amount as the one on the state
msgstr ""
#. module: account_voucher
#: selection:account.voucher,pay_now:0
msgid "Pay Directly"
#: view:account.voucher:0
msgid "To Review"
msgstr ""
#. module: account_voucher
#: view:account.voucher:0
msgid "Expense Lines"
msgstr ""
#. module: account_voucher
@ -450,8 +512,8 @@ msgid "Invoices"
msgstr ""
#. module: account_voucher
#: field:account.voucher.unreconcile,remove:0
msgid "Want to remove accounting entries too ?"
#: selection:sale.receipt.report,month:0
msgid "December"
msgstr ""
#. module: account_voucher
@ -460,8 +522,15 @@ msgstr ""
msgid "Voucher Lines"
msgstr ""
#. module: account_voucher
#: view:sale.receipt.report:0
#: field:sale.receipt.report,month:0
msgid "Month"
msgstr ""
#. module: account_voucher
#: field:account.voucher,currency_id:0
#: field:sale.receipt.report,currency_id:0
msgid "Currency"
msgstr ""
@ -471,20 +540,35 @@ msgid "Payable and Receivables"
msgstr ""
#. module: account_voucher
#: report:voucher.print:0
msgid "Account :"
#: selection:account.voucher,pay_now:0
#: selection:sale.receipt.report,pay_now:0
msgid "Pay Later or Group Funds"
msgstr ""
#. module: account_voucher
#: view:sale.receipt.report:0
#: field:sale.receipt.report,user_id:0
msgid "Salesman"
msgstr ""
#. module: account_voucher
#: view:sale.receipt.report:0
#: field:sale.receipt.report,delay_to_pay:0
msgid "Avg. Delay To Pay"
msgstr ""
#. module: account_voucher
#: view:account.voucher:0
#: selection:account.voucher,state:0
#: view:sale.receipt.report:0
#: selection:sale.receipt.report,state:0
#: report:voucher.print:0
msgid "Draft"
msgstr ""
#. module: account_voucher
#: field:account.voucher,type:0
msgid "Default Type"
#: field:account.voucher,writeoff_acc_id:0
msgid "Write-Off account"
msgstr ""
#. module: account_voucher
@ -492,11 +576,22 @@ msgstr ""
msgid "Currency:"
msgstr ""
#. module: account_voucher
#: view:sale.receipt.report:0
#: field:sale.receipt.report,price_total_tax:0
msgid "Total With Tax"
msgstr ""
#. module: account_voucher
#: report:voucher.print:0
msgid "PRO-FORMA"
msgstr ""
#. module: account_voucher
#: selection:sale.receipt.report,month:0
msgid "August"
msgstr ""
#. module: account_voucher
#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
msgid "The supplier payment form allows you to track the payment you do to your suppliers. When you select a supplier, the payment method and an amount for the payment, OpenERP will propose to reconcile your payment with the open supplier invoices or bills."
@ -507,6 +602,11 @@ msgstr ""
msgid "Total Amount"
msgstr ""
#. module: account_voucher
#: selection:sale.receipt.report,month:0
msgid "June"
msgstr ""
#. module: account_voucher
#: field:account.voucher.line,type:0
msgid "Cr/Dr"
@ -530,16 +630,18 @@ msgstr ""
#. module: account_voucher
#: field:account.voucher,date:0
#: field:account.voucher.line,date_original:0
#: field:sale.receipt.report,date:0
msgid "Date"
msgstr ""
#. module: account_voucher
#: view:account.voucher:0
msgid "Post"
#: selection:sale.receipt.report,month:0
msgid "November"
msgstr ""
#. module: account_voucher
#: view:account.voucher:0
#: view:sale.receipt.report:0
msgid "Extended Filters..."
msgstr ""
@ -559,8 +661,14 @@ msgid "Write-Off Analytic Account"
msgstr ""
#. module: account_voucher
#: view:account.voucher:0
msgid "Expense Lines"
#: selection:account.voucher,pay_now:0
#: selection:sale.receipt.report,pay_now:0
msgid "Pay Directly"
msgstr ""
#. module: account_voucher
#: selection:sale.receipt.report,month:0
msgid "October"
msgstr ""
#. module: account_voucher
@ -568,6 +676,11 @@ msgstr ""
msgid "Previous Payments ?"
msgstr ""
#. module: account_voucher
#: selection:sale.receipt.report,month:0
msgid "January"
msgstr ""
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_voucher_list
#: model:ir.ui.menu,name:account_voucher.menu_encode_entries_by_voucher
@ -585,11 +698,16 @@ msgid "Credit"
msgstr ""
#. module: account_voucher
#: code:addons/account_voucher/account_voucher.py:0
#: code:addons/account_voucher/account_voucher.py:656
#, python-format
msgid "Please define a sequence on the journal !"
msgstr ""
#. module: account_voucher
#: view:account.voucher:0
msgid "Open Supplier Journal Entries"
msgstr ""
#. module: account_voucher
#: report:voucher.print:0
msgid "Through :"
@ -602,8 +720,8 @@ msgid "Supplier Payment"
msgstr ""
#. module: account_voucher
#: help:account.voucher,reference:0
msgid "Transaction reference number."
#: view:account.voucher:0
msgid "Post"
msgstr ""
#. module: account_voucher
@ -611,6 +729,12 @@ msgstr ""
msgid "Invoices and outstanding transactions"
msgstr ""
#. module: account_voucher
#: view:sale.receipt.report:0
#: field:sale.receipt.report,price_total:0
msgid "Total Without Tax"
msgstr ""
#. module: account_voucher
#: view:account.voucher:0
msgid "Bill Date"
@ -638,8 +762,8 @@ msgid "Bank Statement"
msgstr ""
#. module: account_voucher
#: view:account.voucher:0
msgid "To Review"
#: selection:sale.receipt.report,month:0
msgid "September"
msgstr ""
#. module: account_voucher
@ -647,6 +771,13 @@ msgstr ""
msgid "Sales Information"
msgstr ""
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
#: view:sale.receipt.report:0
msgid "Sales Receipt Analysis"
msgstr ""
#. module: account_voucher
#: field:account.voucher.line,voucher_id:0
#: model:res.request.link,name:account_voucher.req_link_voucher
@ -673,6 +804,8 @@ msgstr ""
#. module: account_voucher
#: selection:account.voucher,state:0
#: view:sale.receipt.report:0
#: selection:sale.receipt.report,state:0
msgid "Pro-forma"
msgstr ""
@ -737,10 +870,17 @@ msgstr ""
msgid "Canceled"
msgstr ""
#. module: account_voucher
#: selection:sale.receipt.report,month:0
msgid "May"
msgstr ""
#. module: account_voucher
#: field:account.statement.from.invoice,journal_ids:0
#: view:account.voucher:0
#: field:account.voucher,journal_id:0
#: view:sale.receipt.report:0
#: field:sale.receipt.report,journal_id:0
msgid "Journal"
msgstr ""
@ -755,6 +895,11 @@ msgstr ""
msgid "Credits"
msgstr ""
#. module: account_voucher
#: field:account.voucher.line,amount_original:0
msgid "Original Amount"
msgstr ""
#. module: account_voucher
#: report:voucher.print:0
msgid "State:"
@ -766,12 +911,16 @@ msgstr ""
#: view:account.voucher:0
#: field:account.voucher,pay_now:0
#: selection:account.voucher,type:0
#: field:sale.receipt.report,pay_now:0
#: selection:sale.receipt.report,type:0
msgid "Payment"
msgstr ""
#. module: account_voucher
#: view:account.voucher:0
#: selection:account.voucher,state:0
#: view:sale.receipt.report:0
#: selection:sale.receipt.report,state:0
#: report:voucher.print:0
msgid "Posted"
msgstr ""
@ -782,8 +931,8 @@ msgid "Customer"
msgstr ""
#. module: account_voucher
#: field:account.voucher,writeoff_acc_id:0
msgid "Write-Off account"
#: selection:sale.receipt.report,month:0
msgid "February"
msgstr ""
#. module: account_voucher
@ -792,8 +941,18 @@ msgid "Supplier Invoices and Outstanding transactions"
msgstr ""
#. module: account_voucher
#: view:account.voucher:0
msgid "Open Supplier Journal Entries"
#: field:account.voucher,comment:0
msgid "Write-Off Comment"
msgstr ""
#. module: account_voucher
#: selection:sale.receipt.report,month:0
msgid "April"
msgstr ""
#. module: account_voucher
#: field:account.voucher,type:0
msgid "Default Type"
msgstr ""
#. module: account_voucher
@ -807,6 +966,11 @@ msgstr ""
msgid "Account Entry"
msgstr ""
#. module: account_voucher
#: field:sale.receipt.report,state:0
msgid "Voucher State"
msgstr ""
#. module: account_voucher
#: help:account.voucher,date:0
msgid "Effective date for accounting entries"
@ -827,6 +991,17 @@ msgstr ""
msgid "Untax Amount"
msgstr ""
#. module: account_voucher
#: model:ir.model,name:account_voucher.model_sale_receipt_report
msgid "Sales Receipt Statistics"
msgstr ""
#. module: account_voucher
#: view:sale.receipt.report:0
#: field:sale.receipt.report,year:0
msgid "Year"
msgstr ""
#. module: account_voucher
#: view:account.voucher:0
#: field:account.voucher.line,amount_unreconciled:0

3
addons/account_voucher/report/account_voucher_sales_receipt.py
View File

@ -17,11 +17,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import time
from osv import fields, osv
import pooler
from tools import config
import tools
class sale_receipt_report(osv.osv):

4
addons/account_voucher/security/account_voucher_security.xml
View File

@ -5,13 +5,13 @@
<field name="name">Voucher multi-company</field>
<field model="ir.model" name="model_id" ref="model_account_voucher"/>
<field eval="True" name="global"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
</record>
<record id="voucher_line_comp_rule" model="ir.rule">
<field name="name">Voucher Line multi-company</field>
<field model="ir.model" name="model_id" ref="model_account_voucher_line"/>
<field eval="True" name="global"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
</record>
</data>
</openerp>

6
addons/account_voucher/wizard/account_statement_from_invoice.py
View File

@ -39,11 +39,11 @@ class account_statement_from_invoice_lines(osv.osv_memory):
context = {}
statement_id = context.get('statement_id', False)
if not statement_id:
return {}
return {'type': 'ir.actions.act_window_close'}
data = self.read(cr, uid, ids, context=context)[0]
line_ids = data['line_ids']
if not line_ids:
return {}
return {'type': 'ir.actions.act_window_close'}
line_obj = self.pool.get('account.move.line')
statement_obj = self.pool.get('account.bank.statement')
@ -115,7 +115,7 @@ class account_statement_from_invoice_lines(osv.osv_memory):
'voucher_id': voucher_id,
'date': time.strftime('%Y-%m-%d'), #time.strftime('%Y-%m-%d'), #line.date_maturity or,
}, context=context)
return {}
return {'type': 'ir.actions.act_window_close'}
account_statement_from_invoice_lines()

2
addons/account_voucher/wizard/account_voucher_unreconcile.py
View File

@ -55,7 +55,7 @@ class account_voucher_unreconcile(osv.osv_memory):
# wf_service = netsvc.LocalService("workflow")
# wf_service.trg_validate(uid, 'account.voucher', context.get('active_id'), 'cancel_voucher', cr)
return {}
return {'type': 'ir.actions.act_window_close'}
account_voucher_unreconcile()

11
addons/analytic/i18n/analytic.pot
View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:43:26+0000\n"
"PO-Revision-Date: 2010-12-21 19:43:26+0000\n"
"POT-Creation-Date: 2011-01-03 16:56:53+0000\n"
"PO-Revision-Date: 2011-01-03 16:56:53+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -166,6 +166,11 @@ msgstr ""
msgid "Contact"
msgstr ""
#. module: analytic
#: constraint:account.analytic.account:0
msgid "Error! The currency has to be the same as the currency of the selected company"
msgstr ""
#. module: analytic
#: selection:account.analytic.account,state:0
msgid "Cancelled"

2
addons/analytic/security/analytic_security.xml
View File

@ -5,7 +5,7 @@
<field name="name">Analytic multi company rule</field>
<field model="ir.model" name="model_id" ref="model_account_analytic_account"/>
<field eval="True" name="global"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
</record>
<record id="group_analytic_accounting" model="res.groups" context="{'noadmin':True}">
<field name="name">Useability / Analytic Accounting</field>

15
addons/analytic_journal_billing_rate/i18n/analytic_journal_billing_rate.pot
View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:43:27+0000\n"
"PO-Revision-Date: 2010-12-21 19:43:27+0000\n"
"POT-Creation-Date: 2011-01-03 16:56:54+0000\n"
"PO-Revision-Date: 2011-01-03 16:56:54+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -31,6 +31,11 @@ msgstr ""
msgid "Analytic Journal"
msgstr ""
#. module: analytic_journal_billing_rate
#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
msgid "Invoice"
msgstr ""
#. module: analytic_journal_billing_rate
#: view:analytic_journal_rate_grid:0
msgid "Billing Rate per Journal for this Analytic Account"
@ -58,8 +63,8 @@ msgid "Analytic Journal Billing Rate, Define the default invoicing rate for a sp
msgstr ""
#. module: analytic_journal_billing_rate
#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
msgid "Invoice"
#: constraint:account.analytic.account:0
msgid "Error! The currency has to be the same as the currency of the selected company"
msgstr ""
#. module: analytic_journal_billing_rate

17
addons/analytic_user_function/i18n/analytic_user_function.pot
View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:43:27+0000\n"
"PO-Revision-Date: 2010-12-21 19:43:27+0000\n"
"POT-Creation-Date: 2011-01-03 16:56:54+0000\n"
"PO-Revision-Date: 2011-01-03 16:56:54+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -21,7 +21,8 @@ msgid "Product"
msgstr ""
#. module: analytic_user_function
#: code:addons/analytic_user_function/analytic_user_function.py:0
#: code:addons/analytic_user_function/analytic_user_function.py:96
#: code:addons/analytic_user_function/analytic_user_function.py:131
#, python-format
msgid "Error !"
msgstr ""
@ -49,7 +50,13 @@ msgid "User"
msgstr ""
#. module: analytic_user_function
#: code:addons/analytic_user_function/analytic_user_function.py:0
#: constraint:account.analytic.account:0
msgid "Error! The currency has to be the same as the currency of the selected company"
msgstr ""
#. module: analytic_user_function
#: code:addons/analytic_user_function/analytic_user_function.py:97
#: code:addons/analytic_user_function/analytic_user_function.py:132
#, python-format
msgid "There is no expense account define for this product: \"%s\" (id:%d)"
msgstr ""

6
addons/association/i18n/association.pot
View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:43:27+0000\n"
"PO-Revision-Date: 2010-12-21 19:43:27+0000\n"
"POT-Creation-Date: 2011-01-03 16:56:54+0000\n"
"PO-Revision-Date: 2011-01-03 16:56:54+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"

76
addons/auction/i18n/auction.pot
View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:43:30+0000\n"
"PO-Revision-Date: 2010-12-21 19:43:30+0000\n"
"POT-Creation-Date: 2011-01-03 16:56:57+0000\n"
"PO-Revision-Date: 2011-01-03 16:56:57+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -292,13 +292,13 @@ msgid "Object Image"
msgstr ""
#. module: auction
#: code:addons/auction/wizard/auction_lots_buyer_map.py:0
#: code:addons/auction/wizard/auction_lots_buyer_map.py:70
#, python-format
msgid "No buyer is set for this lot."
msgstr ""
#. module: auction
#: code:addons/auction/auction.py:0
#: code:addons/auction/auction.py:578
#, python-format
msgid "The Buyer \"%s\" has no Invoice Address."
msgstr ""
@ -373,7 +373,7 @@ msgid "June"
msgstr ""
#. module: auction
#: code:addons/auction/wizard/auction_catalog_flagey_report.py:0
#: code:addons/auction/wizard/auction_catalog_flagey_report.py:63
#, python-format
msgid "No Lots belong to this Auction Date"
msgstr ""
@ -501,7 +501,8 @@ msgid "Payment"
msgstr ""
#. module: auction
#: code:addons/auction/auction.py:0
#: code:addons/auction/auction.py:571
#: code:addons/auction/auction.py:686
#, python-format
msgid "The object \"%s\" has no buyer assigned."
msgstr ""
@ -644,8 +645,9 @@ msgid "Account tax for seller"
msgstr ""
#. module: auction
#: code:addons/auction/wizard/auction_lots_invoice.py:0
#: code:addons/auction/wizard/auction_lots_numerotate.py:0
#: code:addons/auction/wizard/auction_lots_invoice.py:68
#: code:addons/auction/wizard/auction_lots_numerotate.py:103
#: code:addons/auction/wizard/auction_lots_numerotate.py:129
#, python-format
msgid "UserError"
msgstr ""
@ -691,6 +693,11 @@ msgstr ""
msgid "Type"
msgstr ""
#. module: auction
#: help:aie.category,child_ids:0
msgid "children aie category"
msgstr ""
#. module: auction
#: help:auction.lots,ach_emp:0
msgid "When state is Taken Away, this field is marked as True"
@ -788,7 +795,7 @@ msgid "(Keep empty for automatic number)"
msgstr ""
#. module: auction
#: code:addons/auction/auction.py:0
#: code:addons/auction/auction.py:578
#, python-format
msgid "No Invoice Address"
msgstr ""
@ -799,7 +806,8 @@ msgid "Bailiffs Listing"
msgstr ""
#. module: auction
#: code:addons/auction/wizard/auction_lots_numerotate.py:0
#: code:addons/auction/wizard/auction_lots_numerotate.py:103
#: code:addons/auction/wizard/auction_lots_numerotate.py:129
#, python-format
msgid "This record does not exist !"
msgstr ""
@ -1050,15 +1058,19 @@ msgid "Invoice Number"
msgstr ""
#. module: auction
#: code:addons/auction/wizard/auction_lots_buyer_map.py:0
#: code:addons/auction/wizard/auction_lots_numerotate.py:0
#: code:addons/auction/wizard/auction_lots_buyer_map.py:87
#: code:addons/auction/wizard/auction_lots_numerotate.py:77
#: code:addons/auction/wizard/auction_lots_numerotate.py:95
#: code:addons/auction/wizard/auction_lots_numerotate.py:122
#: code:addons/auction/wizard/auction_lots_numerotate.py:137
#: code:addons/auction/wizard/auction_lots_numerotate.py:173
#, python-format
msgid "Active IDs not Found"
msgstr ""
#. module: auction
#: code:addons/auction/wizard/auction_aie_send.py:0
#: code:addons/auction/wizard/auction_aie_send_result.py:0
#: code:addons/auction/wizard/auction_aie_send.py:167
#: code:addons/auction/wizard/auction_aie_send_result.py:117
#, python-format
msgid "Connection to WWW.Auction-in-Europe.com failed !"
msgstr ""
@ -1087,7 +1099,7 @@ msgid "Depositer Inventory"
msgstr ""
#. module: auction
#: code:addons/auction/auction.py:0
#: code:addons/auction/auction.py:692
#, python-format
msgid "The Buyer has no Invoice Address."
msgstr ""
@ -1301,7 +1313,7 @@ msgid "Deposit Date"
msgstr ""
#. module: auction
#: code:addons/auction/wizard/auction_lots_numerotate.py:0
#: code:addons/auction/wizard/auction_lots_numerotate.py:145
#, python-format
msgid "This lot does not exist !"
msgstr ""
@ -1361,7 +1373,7 @@ msgid "Auction Analysis"
msgstr ""
#. module: auction
#: code:addons/auction/wizard/auction_pay_buy.py:0
#: code:addons/auction/wizard/auction_pay_buy.py:80
#, python-format
msgid "Payment aborted !"
msgstr ""
@ -1439,11 +1451,6 @@ msgstr ""
msgid "Lot"
msgstr ""
#. module: auction
#: help:aie.category,child_ids:0
msgid "children aie category"
msgstr ""
#. module: auction
#: model:ir.model,name:auction.model_auction_artists
msgid "auction.artists"
@ -1529,7 +1536,8 @@ msgid "Last exposition date for auction"
msgstr ""
#. module: auction
#: code:addons/auction/auction.py:0
#: code:addons/auction/auction.py:571
#: code:addons/auction/auction.py:686
#, python-format
msgid "Missed buyer !"
msgstr ""
@ -1545,7 +1553,7 @@ msgid "Auction manager "
msgstr ""
#. module: auction
#: code:addons/auction/wizard/auction_lots_invoice.py:0
#: code:addons/auction/wizard/auction_lots_invoice.py:68
#, python-format
msgid "Two different buyers for the same invoice !\n"
"Please correct this problem before invoicing"
@ -1774,8 +1782,8 @@ msgid "Net revenue"
msgstr ""
#. module: auction
#: code:addons/auction/wizard/auction_catalog_flagey_report.py:0
#: code:addons/auction/wizard/auction_pay_buy.py:0
#: code:addons/auction/wizard/auction_catalog_flagey_report.py:63
#: code:addons/auction/wizard/auction_pay_buy.py:87
#, python-format
msgid "Error!"
msgstr ""
@ -1911,7 +1919,7 @@ msgid "Configuration"
msgstr ""
#. module: auction
#: code:addons/auction/wizard/auction_pay_buy.py:0
#: code:addons/auction/wizard/auction_pay_buy.py:80
#, python-format
msgid "You should pay all the total: \"%.2f\" are missing to accomplish the payment."
msgstr ""
@ -2044,7 +2052,7 @@ msgid "Payment Lines"
msgstr ""
#. module: auction
#: code:addons/auction/auction.py:0
#: code:addons/auction/auction.py:692
#, python-format
msgid "Missed Address !"
msgstr ""
@ -2081,10 +2089,10 @@ msgid "Auction Date:"
msgstr ""
#. module: auction
#: code:addons/auction/wizard/auction_aie_send.py:0
#: code:addons/auction/wizard/auction_aie_send_result.py:0
#: code:addons/auction/wizard/auction_lots_buyer_map.py:0
#: code:addons/auction/wizard/auction_lots_numerotate.py:0
#: code:addons/auction/wizard/auction_aie_send.py:167
#: code:addons/auction/wizard/auction_aie_send_result.py:116
#: code:addons/auction/wizard/auction_lots_buyer_map.py:70
#: code:addons/auction/wizard/auction_lots_numerotate.py:145
#, python-format
msgid "Error"
msgstr ""
@ -2167,7 +2175,7 @@ msgid "Objects Description"
msgstr ""
#. module: auction
#: code:addons/auction/wizard/auction_pay_buy.py:0
#: code:addons/auction/wizard/auction_pay_buy.py:87
#, python-format
msgid "No auction date for \"%s\": Please set one."
msgstr ""

2
addons/auction/wizard/auction_aie_send.py
View File

@ -220,7 +220,7 @@ class auction_lots_send_aie(osv.osv_memory):
def send_pdf(self, cr, uid, ids, context=None):
threaded_calculation = threading.Thread(target=self._send, args=(cr, uid, ids, context))
threaded_calculation.start()
return {}
return {'type': 'ir.actions.act_window_close'}
auction_lots_send_aie()

2
addons/auction/wizard/auction_aie_send_result.py
View File

@ -137,7 +137,7 @@ class auction_lots_pay(osv.osv_memory):
lots = service.execute(cr.dbname, uid, 'auction.lots', 'read', context['active_ids'], ['obj_num','obj_price'])
args = pickle.dumps(lots)
self._catalog_send(datas['uname'], datas['password'], datas['dates'], args)
return {}
return {'type': 'ir.actions.act_window_close'}
auction_lots_pay()

2
addons/auction/wizard/auction_lots_able.py
View File

@ -41,6 +41,6 @@ class auction_lots_able(osv.osv_memory):
if context is None:
context = {}
self.pool.get('auction.lots').write(cr, uid, context.get('active_ids', []), {'ach_emp':True})
return {}
return {'type': 'ir.actions.act_window_close'}
auction_lots_able()

4
addons/auction/wizard/auction_lots_auction_move.py
View File

@ -52,7 +52,7 @@ class auction_lots_auction_move(osv.osv_memory):
rec_ids = auction_lots_obj.browse(cr, uid, context.get('active_ids', []))
for current in self.browse(cr, uid, ids, context=context):
if not (current.auction_id and len(context.get('active_ids', []))):
return {}
return {'type': 'ir.actions.act_window_close'}
for rec in rec_ids:
new_id = auction_lot_history_obj.create(cr, uid, {
@ -70,7 +70,7 @@ class auction_lots_auction_move(osv.osv_memory):
'sel_inv_id': None,
'obj_num': None,
'state': 'draft'})
return {}
return {'type': 'ir.actions.act_window_close'}
auction_lots_auction_move()

2
addons/auction/wizard/auction_lots_buyer_map.py
View File

@ -90,7 +90,7 @@ class wiz_auc_lots_buyer_map(osv.osv_memory):
for lots in lots_obj.browse(cr, uid, rec_ids, context=context):
if lots.ach_login == current.ach_login:
lots_obj.write(cr, uid, [lots.id], {'ach_uid': current.ach_uid.id}, context=context)
return {}
return {'type': 'ir.actions.act_window_close'}
def fields_view_get(self, cr, uid, view_id=None, view_type='form',
context=None, toolbar=False, submenu=False):

2
addons/auction/wizard/auction_lots_cancel.py
View File

@ -49,7 +49,7 @@ class auction_lots_cancel(osv.osv):
supplier_refund_inv_id = invoice_obj.refund(cr, uid, [lot.ach_inv_id.id])
if lot.sel_inv_id:
customer_refund_inv_id = invoice_obj.refund(cr, uid, [lot.sel_inv_id.id])
return {}
return {'type': 'ir.actions.act_window_close'}
_columns = {
}

2
addons/auction/wizard/auction_lots_enable.py
View File

@ -38,6 +38,6 @@ class auction_lots_enable(osv.osv_memory):
if context is None:
context = {}
self.pool.get('auction.lots').write(cr, uid, context.get('active_id',False), {'ach_emp':False})
return {}
return {'type': 'ir.actions.act_window_close'}
auction_lots_enable()

2
addons/auction/wizard/auction_lots_numerotate.py
View File

@ -178,7 +178,7 @@ class auction_lots_numerotate(osv.osv_memory):
for rec_id in rec_ids:
lots_obj.write(cr, uid, [rec_id.id], {'obj_num':nbr})
nbr+=1
return {}
return {'type': 'ir.actions.act_window_close'}
auction_lots_numerotate()

2
addons/auction/wizard/auction_pay_buy.py
View File

@ -100,7 +100,7 @@ class auction_pay_buy(osv.osv_memory):
})
for lot in lots:
lot_obj.write(cr, uid, [lot.id], {'statement_id':[(4, new_id)]})
return {}
return {'type': 'ir.actions.act_window_close'}
auction_pay_buy()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

2
addons/auction/wizard/auction_pay_sel.py
View File

@ -52,6 +52,6 @@ class auction_pay_sel(osv.osv_memory):
journal_id = datas.get('journal_id', False)
if lot.sel_inv_id:
p = invoice_obj.pay_and_reconcile(['lot.sel_inv_id.id'], datas['amount'], datas['dest_account_id'], journal_id, account_id, period_id, journal_id, context)
return {}
return {'type': 'ir.actions.act_window_close'}
auction_pay_sel()

4
addons/auction/wizard/auction_payer_sel.py
View File

@ -29,7 +29,7 @@ class auction_payer(osv.osv_memory):
if context is None:
context = {}
self.pool.get('auction.lots').write(cr, uid, context.get('active_ids', []), {'is_ok':True, 'state':'paid'})
return {}
return {'type': 'ir.actions.act_window_close'}
auction_payer()
@ -50,7 +50,7 @@ class auction_payer_sel(osv.osv_memory):
if context is None:
context = {}
self.pool.get('auction.lots').write(cr, uid, context.get('active_ids', []), {'paid_vnd':True})
return {}
return {'type': 'ir.actions.act_window_close'}
auction_payer_sel()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

2
addons/auction/wizard/auction_transfer_unsold_object.py
View File

@ -82,6 +82,6 @@ class auction_transfer_unsold_object(osv.osv):
'ach_inv_id':None,
'sel_inv_id':None,
'state':'draft'})
return {}
return {'type': 'ir.actions.act_window_close'}
auction_transfer_unsold_object()

4
addons/audittrail/audittrail.py
View File

@ -20,7 +20,7 @@
##############################################################################
from osv import fields, osv
from osv.osv import osv_pool
from osv.osv import osv_pool, object_proxy
from tools.translate import _
import ir
import pooler
@ -184,7 +184,7 @@ class audittrail_log_line(osv.osv):
audittrail_log_line()
class audittrail_objects_proxy(osv_pool):
class audittrail_objects_proxy(object_proxy):
""" Uses Object proxy for auditing changes on object of subscribed Rules"""
def get_value_text(self, cr, uid, field_name, values, model, context=None):

16
addons/audittrail/i18n/audittrail.pot
View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:43:30+0000\n"
"PO-Revision-Date: 2010-12-21 19:43:30+0000\n"
"POT-Creation-Date: 2011-01-03 16:56:57+0000\n"
"PO-Revision-Date: 2011-01-03 16:56:57+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -21,7 +21,7 @@ msgid "Audit Trail"
msgstr ""
#. module: audittrail
#: code:addons/audittrail/audittrail.py:0
#: code:addons/audittrail/audittrail.py:81
#, python-format
msgid "WARNING: audittrail is not part of the pool"
msgstr ""
@ -127,11 +127,6 @@ msgstr ""
msgid "Log Lines"
msgstr ""
#. module: audittrail
#: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree
msgid "Rules"
msgstr ""
#. module: audittrail
#: view:audittrail.log:0
#: field:audittrail.log,object_id:0
@ -161,6 +156,7 @@ msgstr ""
#. module: audittrail
#: model:ir.actions.act_window,name:audittrail.action_audittrail_rule_tree
#: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree
msgid "Audit Rules"
msgstr ""
@ -223,7 +219,7 @@ msgid "Log Reads"
msgstr ""
#. module: audittrail
#: code:addons/audittrail/audittrail.py:0
#: code:addons/audittrail/audittrail.py:82
#, python-format
msgid "Change audittrail depends -- Setting rule as DRAFT"
msgstr ""

25
addons/base_action_rule/i18n/base_action_rule.pot
View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:43:45+0000\n"
"PO-Revision-Date: 2010-12-21 19:43:45+0000\n"
"POT-Creation-Date: 2011-01-03 16:57:13+0000\n"
"PO-Revision-Date: 2011-01-03 16:57:13+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -71,7 +71,12 @@ msgid "Days"
msgstr ""
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:0
#: field:base.action.rule,last_run:0
msgid "Last Run"
msgstr ""
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:313
#, python-format
msgid "Error!"
msgstr ""
@ -101,11 +106,6 @@ msgstr ""
msgid "Check this if you want the rule to send a reminder by email to the partner."
msgstr ""
#. module: base_action_rule
#: model:ir.actions.act_window,help:base_action_rule.base_action_rule_act
msgid "Create actions automatically triggered based on a user activity in the system.E.g.: an opportunity created by a specific user can be automatically maintained with a specific sales team, or an opportunity which still has status pending after 14 days triggers an automatic reminder email."
msgstr ""
#. module: base_action_rule
#: view:base.action.rule:0
msgid "Conditions on Model Partner"
@ -141,6 +141,11 @@ msgstr ""
msgid "State"
msgstr ""
#. module: base_action_rule
#: model:ir.actions.act_window,help:base_action_rule.base_action_rule_act
msgid "Use automated actions to automatically trigger actions for various screens. Example: a lead created by a specific user may be automatically set to a specific sales team, or an opportunity which still has status pending after 14 days might trigger an automatic reminder email."
msgstr ""
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_email:0
msgid "Email-id of the persons whom mail is to be sent"
@ -280,7 +285,7 @@ msgid "Active"
msgstr ""
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:0
#: code:addons/base_action_rule/base_action_rule.py:314
#, python-format
msgid "No E-Mail ID Found for your Company address!"
msgstr ""

6
addons/base_calendar/base_calendar.py
View File

@ -1150,8 +1150,9 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
('weekly', 'Weeks'),
('monthly', 'Months'),
('yearly', 'Years'), ], 'Frequency'),
'interval': fields.integer('Interval', help="Repeat every (Days/Week/Month/Year)"),
'end_type' : fields.selection([('forever', 'Forever'), ('count', 'Fix amout of times'), ('end_date','End date')], 'Way to end reccurency'),
'interval': fields.integer('Repeat every', help="Repeat every (Days/Week/Month/Year)"),
'count': fields.integer('Repeat', help="Repeat x times"),
'mo': fields.boolean('Mon'),
'tu': fields.boolean('Tue'),
@ -1189,6 +1190,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
return res
_defaults = {
'end_type' : 'forever',
'state': 'tentative',
'class': 'public',
'show_as': 'busy',

26
addons/base_calendar/base_calendar_view.xml
View File

@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!-- Attendee form view-->
<!-- Attendee form view-->
<record id="base_calendar_attendee_form_view" model="ir.ui.view">
<field name="name">calendar.attendee.form</field>
@ -348,18 +347,21 @@
<group col="4" colspan="4" name="rrule">
<group col="4" colspan="4">
<field name="rrule_type" string="Recurrency period"
attrs="{'readonly':[('recurrent_uid','!=',False)]}" />
<label string="" colspan="2"/>
attrs="{'readonly':[('recurrent_uid','!=',False)]}" />
<field name="interval" />
<separator string="End of recurrency" colspan="4"/>
<field name="count" attrs="{'readonly': [('end_date','!=',False)]}"/>
<field name="end_type" />
<label string=" " colspan="2" />
<newline />
<field name="end_date" attrs="{'readonly': [('count','!=',False)]}"/>
<field name="count" attrs="{'invisible' : [('end_type', '!=', 'count')] }"/>
<label string=" " colspan="2" />
<newline />
<field name="end_date" attrs="{'invisible' : [('end_type', '!=', 'end_date')] }"/>
<newline />
<separator string="Repeat interval" colspan="4"/>
<field name="interval" /> <label string="" colspan="2"/>
</group>
<group col="8" colspan="4" name="Select weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}">
<separator string="Choose day where repeat the meeting" colspan="8"/>
@ -379,13 +381,13 @@
<group col="2" colspan="1">
<field name="select1" />
</group>
<group col="2" colspan="1"
attrs="{'invisible' : [('select1','=','day')]}">
<group col="2" colspan="1">
<field name="day"
attrs="{'required' : [('select1','=','date'), ('rrule_type','=','monthly')]}" />
attrs="{'required' : [('select1','=','date'), ('rrule_type','=','monthly')],
'invisible' : ['|', ('select1','=','day'), ('rrule_type','!=','monthly')]}" />
</group>
<group col="3" colspan="1"
attrs="{'invisible' : [('select1','=','date'), ('rrule_type','=','monthly')]}">
attrs="{'invisible' : ['|', ('select1','=','date'), ('rrule_type','!=','monthly')]}">
<field name="byday" string="The"
attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')]}" />
<field name="week_list" nolabel="1"

262
addons/base_calendar/i18n/base_calendar.pot
View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:43:47+0000\n"
"PO-Revision-Date: 2010-12-21 19:43:47+0000\n"
"POT-Creation-Date: 2011-01-03 16:57:14+0000\n"
"PO-Revision-Date: 2011-01-03 16:57:14+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -60,8 +60,14 @@ msgid "Invited User"
msgstr ""
#. module: base_calendar
#: view:base.calendar.set.exrule:0
msgid "Select range to Exclude"
#: view:calendar.attendee:0
msgid "Invitation"
msgstr ""
#. module: base_calendar
#: help:calendar.event,recurrency:0
#: help:calendar.todo,recurrency:0
msgid "Recurrent Meeting"
msgstr ""
#. module: base_calendar
@ -96,12 +102,6 @@ msgstr ""
msgid "Fourth"
msgstr ""
#. module: base_calendar
#: help:calendar.event,count:0
#: help:calendar.todo,count:0
msgid "Repeat max that times"
msgstr ""
#. module: base_calendar
#: field:calendar.event,show_as:0
#: field:calendar.todo,show_as:0
@ -125,11 +125,8 @@ msgid "Public"
msgstr ""
#. module: base_calendar
#: selection:calendar.alarm,trigger_interval:0
#: selection:calendar.event,freq:0
#: selection:calendar.todo,freq:0
#: selection:res.alarm,trigger_interval:0
msgid "Hours"
#: view:calendar.event:0
msgid " "
msgstr ""
#. module: base_calendar
@ -140,7 +137,7 @@ msgid "March"
msgstr ""
#. module: base_calendar
#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0
#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
#, python-format
msgid "Warning !"
msgstr ""
@ -179,8 +176,8 @@ msgid "Indicats whether the favor of a reply is requested"
msgstr ""
#. module: base_calendar
#: field:calendar.alarm,alarm_id:0
msgid "Basic Alarm"
#: model:ir.model,name:base_calendar.model_ir_attachment
msgid "ir.attachment"
msgstr ""
#. module: base_calendar
@ -189,9 +186,8 @@ msgid "The users that the original request was delegated to"
msgstr ""
#. module: base_calendar
#: view:calendar.attendee:0
#: field:calendar.attendee,delegated_to:0
msgid "Delegated To"
#: field:calendar.attendee,ref:0
msgid "Event Ref"
msgstr ""
#. module: base_calendar
@ -213,11 +209,6 @@ msgstr ""
msgid "Tue"
msgstr ""
#. module: base_calendar
#: model:ir.model,name:base_calendar.model_ir_attachment
msgid "ir.attachment"
msgstr ""
#. module: base_calendar
#: selection:base.calendar.set.exrule,freq:0
#: selection:calendar.event,rrule_type:0
@ -225,6 +216,12 @@ msgstr ""
msgid "Yearly"
msgstr ""
#. module: base_calendar
#: selection:calendar.alarm,trigger_related:0
#: selection:res.alarm,trigger_related:0
msgid "The event ends"
msgstr ""
#. module: base_calendar
#: selection:base.calendar.set.exrule,byday:0
#: selection:calendar.event,byday:0
@ -257,9 +254,11 @@ msgid "Invitation Detail"
msgstr ""
#. module: base_calendar
#: code:addons/base_calendar/base_calendar.py:0
#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:0
#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0
#: code:addons/base_calendar/base_calendar.py:1354
#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:136
#, python-format
msgid "Error!"
msgstr ""
@ -270,13 +269,8 @@ msgid "Chair Person"
msgstr ""
#. module: base_calendar
#: view:calendar.event:0
msgid "Exclude range"
msgstr ""
#. module: base_calendar
#: view:calendar.event:0
msgid "Select data for Custom Rule"
#: selection:calendar.alarm,action:0
msgid "Procedure"
msgstr ""
#. module: base_calendar
@ -287,8 +281,6 @@ msgstr ""
#. module: base_calendar
#: selection:calendar.alarm,trigger_interval:0
#: selection:calendar.event,freq:0
#: selection:calendar.todo,freq:0
#: selection:res.alarm,trigger_interval:0
msgid "Minutes"
msgstr ""
@ -314,9 +306,10 @@ msgid "Secondly"
msgstr ""
#. module: base_calendar
#: selection:calendar.alarm,trigger_related:0
#: selection:res.alarm,trigger_related:0
msgid "The event ends"
#: field:calendar.alarm,event_date:0
#: field:calendar.attendee,event_date:0
#: view:calendar.event:0
msgid "Event Date"
msgstr ""
#. module: base_calendar
@ -331,8 +324,12 @@ msgid "Provide external email address who will receive this invitation."
msgstr ""
#. module: base_calendar
#: help:calendar.attendee,partner_id:0
msgid "Partner related to contact"
#: model:ir.module.module,description:base_calendar.module_meta_information
msgid "Full featured calendar system that supports:\n"
" - Calendar of events\n"
" - Alerts (create requests)\n"
" - Recurring events\n"
" - Invitations to people"
msgstr ""
#. module: base_calendar
@ -357,12 +354,6 @@ msgstr ""
msgid "Optional Participation"
msgstr ""
#. module: base_calendar
#: help:calendar.event,interval:0
#: help:calendar.todo,interval:0
msgid "Repeat every x"
msgstr ""
#. module: base_calendar
#: field:calendar.event,date_deadline:0
#: field:calendar.todo,date_deadline:0
@ -370,14 +361,17 @@ msgid "Deadline"
msgstr ""
#. module: base_calendar
#: code:addons/base_calendar/base_calendar.py:0
#: code:addons/base_calendar/base_calendar.py:385
#: code:addons/base_calendar/base_calendar.py:1090
#: code:addons/base_calendar/base_calendar.py:1092
#, python-format
msgid "Warning!"
msgstr ""
#. module: base_calendar
#: view:base.calendar.set.exrule:0
msgid "_Cancel"
#: help:calendar.event,active:0
#: help:calendar.todo,active:0
msgid "If the active field is set to true, it will allow you to hide the event alarm information without removing it."
msgstr ""
#. module: base_calendar
@ -394,13 +388,25 @@ msgid "Organizer"
msgstr ""
#. module: base_calendar
#: code:addons/base_calendar/base_calendar.py:0
#: view:calendar.attendee:0
#: view:calendar.event:0
#: field:calendar.event,user_id:0
#: field:calendar.todo,user_id:0
msgid "Responsible"
msgstr ""
#. module: base_calendar
#: view:calendar.event:0
#: model:res.request.link,name:base_calendar.request_link_meeting
#, python-format
msgid "Event"
msgstr ""
#. module: base_calendar
#: help:calendar.event,edit_all:0
#: help:calendar.todo,edit_all:0
msgid "Edit all Occurrences of recurrent Meeting."
msgstr ""
#. module: base_calendar
#: selection:calendar.alarm,trigger_occurs:0
#: selection:res.alarm,trigger_occurs:0
@ -448,6 +454,11 @@ msgstr ""
msgid "Invite Type"
msgstr ""
#. module: base_calendar
#: help:calendar.attendee,partner_id:0
msgid "Partner related to contact"
msgstr ""
#. module: base_calendar
#: view:res.alarm:0
msgid "Reminder details"
@ -496,8 +507,9 @@ msgid "Run"
msgstr ""
#. module: base_calendar
#: model:ir.model,name:base_calendar.model_calendar_alarm
msgid "Event alarm information"
#: field:calendar.event,exdate:0
#: field:calendar.todo,exdate:0
msgid "Exception Date/Times"
msgstr ""
#. module: base_calendar
@ -514,9 +526,8 @@ msgid "Repeat Until"
msgstr ""
#. module: base_calendar
#: selection:calendar.event,freq:0
#: selection:calendar.todo,freq:0
msgid "Seconds"
#: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
msgid "Create specific calendar alarms that may be assigned to calendar events or meetings."
msgstr ""
#. module: base_calendar
@ -535,6 +546,11 @@ msgstr ""
msgid "Caldav URL"
msgstr ""
#. module: base_calendar
#: view:base.calendar.set.exrule:0
msgid "Select range to Exclude"
msgstr ""
#. module: base_calendar
#: field:calendar.event,recurrent_uid:0
#: field:calendar.todo,recurrent_uid:0
@ -576,6 +592,11 @@ msgstr ""
msgid "Participation required"
msgstr ""
#. module: base_calendar
#: view:base.calendar.set.exrule:0
msgid "_Cancel"
msgstr ""
#. module: base_calendar
#: field:calendar.event,create_date:0
#: field:calendar.todo,create_date:0
@ -596,7 +617,7 @@ msgid "Daily"
msgstr ""
#. module: base_calendar
#: code:addons/base_calendar/base_calendar.py:0
#: code:addons/base_calendar/base_calendar.py:385
#, python-format
msgid "Can not Duplicate"
msgstr ""
@ -700,6 +721,12 @@ msgstr ""
msgid "Individual"
msgstr ""
#. module: base_calendar
#: help:calendar.event,count:0
#: help:calendar.todo,count:0
msgid "Repeat x times"
msgstr ""
#. module: base_calendar
#: field:calendar.alarm,user_id:0
msgid "Owner"
@ -755,7 +782,8 @@ msgid "Group"
msgstr ""
#. module: base_calendar
#: view:calendar.event:0
#: field:calendar.event,edit_all:0
#: field:calendar.todo,edit_all:0
msgid "Edit All"
msgstr ""
@ -777,7 +805,15 @@ msgid "Fri"
msgstr ""
#. module: base_calendar
#: code:addons/base_calendar/base_calendar.py:0
#: selection:calendar.alarm,trigger_interval:0
#: selection:calendar.event,freq:0
#: selection:calendar.todo,freq:0
#: selection:res.alarm,trigger_interval:0
msgid "Hours"
msgstr ""
#. module: base_calendar
#: code:addons/base_calendar/base_calendar.py:1092
#, python-format
msgid "Count can not be Negative"
msgstr ""
@ -814,6 +850,11 @@ msgstr ""
msgid "Invitation From"
msgstr ""
#. module: base_calendar
#: view:calendar.event:0
msgid "End of recurrency"
msgstr ""
#. module: base_calendar
#: view:calendar.event:0
#: field:calendar.event.edit.all,alarm_id:0
@ -847,6 +888,8 @@ msgstr ""
#. module: base_calendar
#: field:calendar.alarm,repeat:0
#: field:calendar.event,count:0
#: field:calendar.todo,count:0
#: field:res.alarm,repeat:0
msgid "Repeat"
msgstr ""
@ -885,10 +928,8 @@ msgid "June"
msgstr ""
#. module: base_calendar
#: field:calendar.alarm,event_date:0
#: field:calendar.attendee,event_date:0
#: view:calendar.event:0
msgid "Event Date"
#: field:calendar.alarm,alarm_id:0
msgid "Basic Alarm"
msgstr ""
#. module: base_calendar
@ -940,8 +981,6 @@ msgstr ""
#. module: base_calendar
#: field:base.calendar.set.exrule,count:0
#: field:calendar.event,count:0
#: field:calendar.todo,count:0
msgid "Count"
msgstr ""
@ -1006,7 +1045,7 @@ msgid "Wednesday"
msgstr ""
#. module: base_calendar
#: code:addons/base_calendar/base_calendar.py:0
#: code:addons/base_calendar/base_calendar.py:1090
#, python-format
msgid "Interval can not be Negative"
msgstr ""
@ -1026,8 +1065,8 @@ msgid "Active"
msgstr ""
#. module: base_calendar
#: view:calendar.attendee:0
msgid "Invitation"
#: view:calendar.event:0
msgid "Choose day in the month where repeat the meeting"
msgstr ""
#. module: base_calendar
@ -1057,8 +1096,9 @@ msgid "Participation role for the calendar user"
msgstr ""
#. module: base_calendar
#: field:calendar.attendee,ref:0
msgid "Event Ref"
#: view:calendar.attendee:0
#: field:calendar.attendee,delegated_to:0
msgid "Delegated To"
msgstr ""
#. module: base_calendar
@ -1071,6 +1111,11 @@ msgstr ""
msgid "Search Events"
msgstr ""
#. module: base_calendar
#: view:calendar.event:0
msgid "Recurrency Option"
msgstr ""
#. module: base_calendar
#: selection:base.calendar.set.exrule,freq:0
#: selection:calendar.event,rrule_type:0
@ -1080,8 +1125,6 @@ msgstr ""
#. module: base_calendar
#: help:calendar.alarm,active:0
#: help:calendar.event,active:0
#: help:calendar.todo,active:0
#: help:res.alarm,active:0
msgid "If the active field is set to true, it will allow you to hide the event alarm information without removing it."
msgstr ""
@ -1129,6 +1172,12 @@ msgstr ""
msgid "Done"
msgstr ""
#. module: base_calendar
#: help:calendar.event,interval:0
#: help:calendar.todo,interval:0
msgid "Repeat every (Days/Week/Month/Year)"
msgstr ""
#. module: base_calendar
#: view:base_calendar.invite.attendee:0
#: field:base_calendar.invite.attendee,user_ids:0
@ -1137,7 +1186,6 @@ msgstr ""
#. module: base_calendar
#: view:base.calendar.set.exrule:0
#: view:calendar.event:0
msgid "of"
msgstr ""
@ -1160,11 +1208,6 @@ msgstr ""
msgid "Tuesday"
msgstr ""
#. module: base_calendar
#: selection:calendar.alarm,action:0
msgid "Procedure"
msgstr ""
#. module: base_calendar
#: help:calendar.alarm,description:0
msgid "Provides a more complete description of the calendar component, than that provided by the \"SUMMARY\" property"
@ -1196,15 +1239,12 @@ msgid "Tentative"
msgstr ""
#. module: base_calendar
#: view:calendar.attendee:0
#: view:calendar.event:0
#: field:calendar.event,user_id:0
#: field:calendar.todo,user_id:0
msgid "Responsible"
#: field:calendar.event,recurrency:0
#: field:calendar.todo,recurrency:0
msgid "Recurrent"
msgstr ""
#. module: base_calendar
#: view:calendar.event:0
#: field:calendar.event,rrule_type:0
#: field:calendar.todo,rrule_type:0
msgid "Recurrency"
@ -1223,12 +1263,6 @@ msgstr ""
msgid "Thursday"
msgstr ""
#. module: base_calendar
#: selection:calendar.event,rrule_type:0
#: selection:calendar.todo,rrule_type:0
msgid "Custom"
msgstr ""
#. module: base_calendar
#: field:calendar.event,exrule:0
#: field:calendar.todo,exrule:0
@ -1259,8 +1293,9 @@ msgid "Month"
msgstr ""
#. module: base_calendar
#: selection:base_calendar.invite.attendee,type:0
msgid "External Email"
#: view:base_calendar.invite.attendee:0
#: view:calendar.event:0
msgid "Invite People"
msgstr ""
#. module: base_calendar
@ -1319,12 +1354,6 @@ msgstr ""
msgid "ir.values"
msgstr ""
#. module: base_calendar
#: view:base_calendar.invite.attendee:0
#: view:calendar.event:0
msgid "Invite People"
msgstr ""
#. module: base_calendar
#: model:ir.model,name:base_calendar.model_ir_model
msgid "Objects"
@ -1344,12 +1373,8 @@ msgid "Sat"
msgstr ""
#. module: base_calendar
#: model:ir.module.module,description:base_calendar.module_meta_information
msgid "Full featured calendar system that supports:\n"
" - Calendar of events\n"
" - Alerts (create requests)\n"
" - Recurring events\n"
" - Invitations to people"
#: view:calendar.event:0
msgid "Choose day where repeat the meeting"
msgstr ""
#. module: base_calendar
@ -1392,9 +1417,8 @@ msgid "Name"
msgstr ""
#. module: base_calendar
#: field:calendar.event,exdate:0
#: field:calendar.todo,exdate:0
msgid "Exception Date/Times"
#: model:ir.model,name:base_calendar.model_calendar_alarm
msgid "Event alarm information"
msgstr ""
#. module: base_calendar
@ -1411,7 +1435,7 @@ msgid "Alarm"
msgstr ""
#. module: base_calendar
#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0
#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
#, python-format
msgid "Please Apply Recurrency before applying Exception Rule."
msgstr ""
@ -1421,6 +1445,11 @@ msgstr ""
msgid "Sent By User"
msgstr ""
#. module: base_calendar
#: view:calendar.event:0
msgid "Repeat interval"
msgstr ""
#. module: base_calendar
#: selection:base.calendar.set.exrule,month_list:0
#: selection:calendar.event,month_list:0
@ -1428,6 +1457,11 @@ msgstr ""
msgid "April"
msgstr ""
#. module: base_calendar
#: view:calendar.event:0
msgid "Recurrency period"
msgstr ""
#. module: base_calendar
#: field:base.calendar.set.exrule,week_list:0
#: field:calendar.event,week_list:0
@ -1548,8 +1582,8 @@ msgid "Duration"
msgstr ""
#. module: base_calendar
#: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
msgid "Create specific calendar alarms that can be assigned to calendar events or meetings."
#: selection:base_calendar.invite.attendee,type:0
msgid "External Email"
msgstr ""
#. module: base_calendar

6
addons/base_calendar/wizard/base_calendar_invite_attendee.py
View File

@ -68,7 +68,7 @@ send an Email to Invited Person')
model = False
context_id = context and context.get('active_id', False) or False
if not context or not context.get('model'):
return {}
return {'type': 'ir.actions.act_window_close'}
else:
model = context.get('model')
@ -89,7 +89,7 @@ send an Email to Invited Person')
if context_id:
ref = {'ref': '%s,%s' % (model, base_calendar.base_calendar_id2real_id(context_id))}
else:
return {}
return {'type': 'ir.actions.act_window_close'}
if type == 'internal':
if not datas.get('user_ids'):
@ -144,7 +144,7 @@ send an Email to Invited Person')
att_obj._send_mail(cr, uid, attendees, mail_to, \
email_from = current_user.user_email or tools.config.get('email_from', False))
return {}
return {'type': 'ir.actions.act_window_close'}
def onchange_partner_id(self, cr, uid, ids, partner_id, *args, **argv):

2
addons/base_calendar/wizard/base_calendar_set_exrule.py
View File

@ -150,7 +150,7 @@ class base_calendar_set_exrule(osv.osv_memory):
+ enddate + monthstring + yearstring
model_obj.write(cr, uid, ex_id,{'exrule': exrule_string})
return {}
return {'type': 'ir.actions.act_window_close'}
_defaults = {
'freq': lambda *x: 'None',

2
addons/base_calendar/wizard/calendar_event_edit_all.py
View File

@ -78,7 +78,7 @@ class calendar_event_edit_all(osv.osv_memory):
model = context.get('model', False)
model_obj = self.pool.get(model)
model_obj.modify_all(cr, uid, [context_id], datas, context=context)
return {}
return {'type': 'ir.actions.act_window_close'}
_name = "calendar.event.edit.all"
_description = "Calendar Edit all event"

6
addons/base_contact/i18n/base_contact.pot
View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:43:47+0000\n"
"PO-Revision-Date: 2010-12-21 19:43:47+0000\n"
"POT-Creation-Date: 2011-01-03 16:57:15+0000\n"
"PO-Revision-Date: 2011-01-03 16:57:15+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"

2
addons/base_crypt/crypt.py
View File

@ -40,9 +40,7 @@ from random import seed, sample
from string import letters, digits
from osv import fields,osv
import pooler
import tools
from tools.translate import _
from service import security
magic_md5 = '$1$'

47
addons/base_crypt/i18n/base_crypt.pot Executable file → Normal file
View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.6\n"
"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-11-26 09:12:09+0000\n"
"PO-Revision-Date: 2009-11-26 09:12:09+0000\n"
"POT-Creation-Date: 2011-01-03 16:57:15+0000\n"
"PO-Revision-Date: 2011-01-03 16:57:15+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -16,22 +16,49 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_crypt
#: model:ir.module.module,description:base_crypt.module_meta_information
msgid "Module for password encryption."
#: sql_constraint:res.users:0
msgid "You can not have two users with the same login !"
msgstr ""
#. module: base_crypt
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
#: model:ir.model,name:base_crypt.model_res_users
msgid "res.users"
msgstr ""
#. module: base_crypt
#: constraint:res.users:0
msgid "The chosen company is not in the allowed companies for this user"
msgstr ""
#. module: base_crypt
#: code:addons/base_crypt/crypt.py:134
#, python-format
msgid "Please specify the password !"
msgstr ""
#. module: base_crypt
#: model:ir.module.module,shortdesc:base_crypt.module_meta_information
msgid "Base"
msgid "Base - Password Encryption"
msgstr ""
#. module: base_crypt
#: field:res.users,input_pw:0
msgid "Password"
#: code:addons/base_crypt/crypt.py:134
#, python-format
msgid "Error"
msgstr ""
#. module: base_crypt
#: model:ir.module.module,description:base_crypt.module_meta_information
msgid "This module replaces the cleartext password in the database with a password hash,\n"
"preventing anyone from reading the original password.\n"
"For your existing user base, the removal of the cleartext passwords occurs the first time\n"
"a user logs into the database, after installing base_crypt.\n"
"After installing this module it won't be possible to recover a forgotten password for your\n"
"users, the only solution is for an admin to set a new password.\n"
"\n"
"Note: installing this module does not mean you can ignore basic security measures,\n"
"as the password is still transmitted unencrypted on the network (by the client),\n"
"unless you are using a secure protocol such as XML-RPCS.\n"
" "
msgstr ""

26
addons/base_iban/i18n/base_iban.pot
View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:43:48+0000\n"
"PO-Revision-Date: 2010-12-21 19:43:48+0000\n"
"POT-Creation-Date: 2011-01-03 16:57:16+0000\n"
"PO-Revision-Date: 2011-01-03 16:57:16+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -21,7 +21,7 @@ msgid "Create IBAN bank accounts"
msgstr ""
#. module: base_iban
#: code:addons/base_iban/base_iban.py:0
#: code:addons/base_iban/base_iban.py:120
#, python-format
msgid "The IBAN does not seems to be correct. You should have entered something like this %s"
msgstr ""
@ -51,21 +51,13 @@ msgstr ""
msgid "bic"
msgstr ""
#. module: base_iban
#: model:ir.module.module,description:base_iban.module_meta_information
msgid "\n"
"This module installs the base for IBAN (International Bank Account Number) bank accounts and checks for its validity\n"
"\n"
" "
msgstr ""
#. module: base_iban
#: model:res.partner.bank.type.field,name:base_iban.bank_iban_field
msgid "iban"
msgstr ""
#. module: base_iban
#: code:addons/base_iban/base_iban.py:0
#: code:addons/base_iban/base_iban.py:121
#, python-format
msgid "The IBAN is invalid, It should begin with the country code"
msgstr ""
@ -80,6 +72,14 @@ msgstr ""
msgid "IBAN Account"
msgstr ""
#. module: base_iban
#: model:ir.module.module,description:base_iban.module_meta_information
msgid "\n"
"This module installs the base for IBAN (International Bank Account Number) bank accounts and checks for its validity.\n"
"\n"
" "
msgstr ""
#. module: base_iban
#: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field
msgid "acc_number"

6
addons/base_module_doc_rst/i18n/base_module_doc_rst.pot
View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:43:48+0000\n"
"PO-Revision-Date: 2010-12-21 19:43:48+0000\n"
"POT-Creation-Date: 2011-01-03 16:57:16+0000\n"
"PO-Revision-Date: 2011-01-03 16:57:16+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"

2
addons/base_module_doc_rst/wizard/generate_relation_graph.py
View File

@ -35,7 +35,7 @@ def _get_graph(self, cr, uid, datas, context=None):
module_data = mod_obj.get_relation_graph(cr, uid, module.name, context=context)
if module_data['module_file']:
mod_obj.write(cr, uid, [module.id], {'file_graph': module_data['module_file']}, context=context)
return {}
return {'type': 'ir.actions.act_window_close'}
class create_graph(wizard.interface):
states = {

180
addons/base_module_quality/i18n/base_module_quality.pot
View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:43:48+0000\n"
"PO-Revision-Date: 2010-12-21 19:43:48+0000\n"
"POT-Creation-Date: 2011-01-03 16:57:17+0000\n"
"PO-Revision-Date: 2011-01-03 16:57:17+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -16,20 +16,21 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_module_quality
#: code:addons/base_module_quality/object_test/object_test.py:0
#: code:addons/base_module_quality/pep8_test/pep8_test.py:0
#: code:addons/base_module_quality/object_test/object_test.py:187
#: code:addons/base_module_quality/object_test/object_test.py:204
#: code:addons/base_module_quality/pep8_test/pep8_test.py:274
#, python-format
msgid "Suggestion"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/base_module_quality.py:0
#: code:addons/base_module_quality/base_module_quality.py:100
#, python-format
msgid "Programming Error"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/method_test/method_test.py:0
#: code:addons/base_module_quality/method_test/method_test.py:31
#, python-format
msgid "Method Test"
msgstr ""
@ -40,7 +41,7 @@ msgid "Base module quality - To check the quality of other modules"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/object_test/object_test.py:0
#: code:addons/base_module_quality/object_test/object_test.py:34
#, python-format
msgid "\n"
"Test checks for fields, views, security rules, dependancy level\n"
@ -48,7 +49,7 @@ msgid "\n"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/speed_test/speed_test.py:0
#: code:addons/base_module_quality/speed_test/speed_test.py:127
#, python-format
msgid "O(n) or worst"
msgstr ""
@ -59,54 +60,58 @@ msgid "Skipped"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/method_test/method_test.py:0
#: code:addons/base_module_quality/method_test/method_test.py:46
#, python-format
msgid "Module has no objects"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/speed_test/speed_test.py:0
#: code:addons/base_module_quality/speed_test/speed_test.py:49
#, python-format
msgid "Speed Test"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/terp_test/terp_test.py:0
#: code:addons/base_module_quality/terp_test/terp_test.py:54
#, python-format
msgid "The module does not contain the __openerp__.py file"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/method_test/method_test.py:0
#: code:addons/base_module_quality/object_test/object_test.py:0
#: code:addons/base_module_quality/pep8_test/pep8_test.py:0
#: code:addons/base_module_quality/speed_test/speed_test.py:0
#: code:addons/base_module_quality/terp_test/terp_test.py:0
#: code:addons/base_module_quality/workflow_test/workflow_test.py:0
#: code:addons/base_module_quality/method_test/method_test.py:82
#: code:addons/base_module_quality/object_test/object_test.py:187
#: code:addons/base_module_quality/object_test/object_test.py:204
#: code:addons/base_module_quality/pep8_test/pep8_test.py:274
#: code:addons/base_module_quality/speed_test/speed_test.py:144
#: code:addons/base_module_quality/speed_test/speed_test.py:151
#: code:addons/base_module_quality/terp_test/terp_test.py:132
#: code:addons/base_module_quality/workflow_test/workflow_test.py:143
#, python-format
msgid "Object Name"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/method_test/method_test.py:0
#: code:addons/base_module_quality/method_test/method_test.py:54
#: code:addons/base_module_quality/method_test/method_test.py:61
#: code:addons/base_module_quality/method_test/method_test.py:68
#, python-format
msgid "Ok"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/terp_test/terp_test.py:0
#: code:addons/base_module_quality/terp_test/terp_test.py:34
#, python-format
msgid "This test checks if the module satisfies the current coding standard used by OpenERP."
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/wizard/quality_save_report.py:0
#: code:addons/base_module_quality/wizard/quality_save_report.py:46
#, python-format
msgid "No report to save!"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/object_test/object_test.py:0
#: code:addons/base_module_quality/object_test/object_test.py:177
#, python-format
msgid "Result of dependancy in %"
msgstr ""
@ -117,19 +122,19 @@ msgid "The test will be completed only if the module is installed or if the test
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/pylint_test/pylint_test.py:0
#: code:addons/base_module_quality/pylint_test/pylint_test.py:99
#, python-format
msgid "Result (/10)"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/terp_test/terp_test.py:0
#: code:addons/base_module_quality/terp_test/terp_test.py:33
#, python-format
msgid "Terp Test"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/object_test/object_test.py:0
#: code:addons/base_module_quality/object_test/object_test.py:33
#, python-format
msgid "Object Test"
msgstr ""
@ -140,38 +145,38 @@ msgid "Save Report"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/wizard/module_quality_check.py:0
#: code:addons/base_module_quality/wizard/module_quality_check.py:46
#: model:ir.actions.wizard,name:base_module_quality.create_quality_check_id
#, python-format
msgid "Quality Check"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/speed_test/speed_test.py:0
#: code:addons/base_module_quality/speed_test/speed_test.py:128
#, python-format
msgid "Not Efficient"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/wizard/quality_save_report.py:0
#: code:addons/base_module_quality/wizard/quality_save_report.py:46
#, python-format
msgid "Warning"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/unit_test/unit_test.py:0
#: code:addons/base_module_quality/unit_test/unit_test.py:35
#, python-format
msgid "Unit Test"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/speed_test/speed_test.py:0
#: code:addons/base_module_quality/speed_test/speed_test.py:151
#, python-format
msgid "Reading Complexity"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/pep8_test/pep8_test.py:0
#: code:addons/base_module_quality/pep8_test/pep8_test.py:267
#, python-format
msgid "Result of pep8_test in %"
msgstr ""
@ -182,7 +187,7 @@ msgid "State"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/unit_test/unit_test.py:0
#: code:addons/base_module_quality/unit_test/unit_test.py:50
#, python-format
msgid "Module does not have 'unit_test/test.py' file"
msgstr ""
@ -193,7 +198,7 @@ msgid "Ponderation"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/object_test/object_test.py:0
#: code:addons/base_module_quality/object_test/object_test.py:177
#, python-format
msgid "Result of Security in %"
msgstr ""
@ -204,25 +209,25 @@ msgid "Some tests are more critical than others, so they have a bigger weight in
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/speed_test/speed_test.py:0
#: code:addons/base_module_quality/speed_test/speed_test.py:120
#, python-format
msgid "No enough data"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/terp_test/terp_test.py:0
#: code:addons/base_module_quality/terp_test/terp_test.py:132
#, python-format
msgid "Result (/1)"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/speed_test/speed_test.py:0
#: code:addons/base_module_quality/speed_test/speed_test.py:151
#, python-format
msgid "N (Number of Records)"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/speed_test/speed_test.py:0
#: code:addons/base_module_quality/speed_test/speed_test.py:133
#, python-format
msgid "No data"
msgstr ""
@ -238,13 +243,13 @@ msgid "Save report"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/workflow_test/workflow_test.py:0
#: code:addons/base_module_quality/workflow_test/workflow_test.py:34
#, python-format
msgid "This test checks where object has workflow or not on it if there is a state field and several buttons on it and also checks validity of workflow xml file"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/structure_test/structure_test.py:0
#: code:addons/base_module_quality/structure_test/structure_test.py:151
#, python-format
msgid "Result in %"
msgstr ""
@ -255,14 +260,14 @@ msgid "Standard entries"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/pep8_test/pep8_test.py:0
#: code:addons/base_module_quality/pylint_test/pylint_test.py:0
#: code:addons/base_module_quality/pep8_test/pep8_test.py:58
#: code:addons/base_module_quality/pylint_test/pylint_test.py:88
#, python-format
msgid "No python file found"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/speed_test/speed_test.py:0
#: code:addons/base_module_quality/speed_test/speed_test.py:144
#: view:module.quality.check:0
#: view:module.quality.detail:0
#, python-format
@ -285,20 +290,20 @@ msgid "Note"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/speed_test/speed_test.py:0
#: code:addons/base_module_quality/speed_test/speed_test.py:85
#, python-format
msgid "<html>O(1) means that the number of SQL requests to read the object does not depand on the number of objects we are reading. This feature is mostly wished.\n"
"</html>"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/terp_test/terp_test.py:0
#: code:addons/base_module_quality/terp_test/terp_test.py:120
#, python-format
msgid "__openerp__.py file"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/unit_test/unit_test.py:0
#: code:addons/base_module_quality/unit_test/unit_test.py:70
#, python-format
msgid "Status"
msgstr ""
@ -310,7 +315,7 @@ msgid "Tests"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/speed_test/speed_test.py:0
#: code:addons/base_module_quality/speed_test/speed_test.py:50
#, python-format
msgid "\n"
"This test checks the speed of the module. Note that at least 5 demo data is needed in order to run it.\n"
@ -319,13 +324,13 @@ msgid "\n"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/pylint_test/pylint_test.py:0
#: code:addons/base_module_quality/pylint_test/pylint_test.py:71
#, python-format
msgid "Unable to parse the result. Check the details."
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/structure_test/structure_test.py:0
#: code:addons/base_module_quality/structure_test/structure_test.py:33
#, python-format
msgid "\n"
"This test checks if the module satisfy tiny structure\n"
@ -333,50 +338,53 @@ msgid "\n"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/structure_test/structure_test.py:0
#: code:addons/base_module_quality/workflow_test/workflow_test.py:0
#: code:addons/base_module_quality/structure_test/structure_test.py:151
#: code:addons/base_module_quality/workflow_test/workflow_test.py:136
#, python-format
msgid "Module Name"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/unit_test/unit_test.py:0
#: code:addons/base_module_quality/unit_test/unit_test.py:56
#, python-format
msgid "Error! Module is not properly loaded/installed"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/speed_test/speed_test.py:0
#: code:addons/base_module_quality/speed_test/speed_test.py:115
#: code:addons/base_module_quality/speed_test/speed_test.py:116
#, python-format
msgid "Error in Read method"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/speed_test/speed_test.py:0
#: code:addons/base_module_quality/speed_test/speed_test.py:138
#, python-format
msgid "Score is below than minimal score(%s%%)"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/speed_test/speed_test.py:0
#: code:addons/base_module_quality/speed_test/speed_test.py:151
#, python-format
msgid "N/2"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/method_test/method_test.py:0
#: code:addons/base_module_quality/method_test/method_test.py:57
#: code:addons/base_module_quality/method_test/method_test.py:64
#: code:addons/base_module_quality/method_test/method_test.py:71
#, python-format
msgid "Exception"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/base_module_quality.py:0
#: code:addons/base_module_quality/base_module_quality.py:100
#, python-format
msgid "Test Is Not Implemented"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/speed_test/speed_test.py:0
#: code:addons/base_module_quality/speed_test/speed_test.py:151
#, python-format
msgid "N"
msgstr ""
@ -387,32 +395,32 @@ msgid "Report Save"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/structure_test/structure_test.py:0
#: code:addons/base_module_quality/structure_test/structure_test.py:172
#, python-format
msgid "Feedback about structure of module"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/speed_test/speed_test.py:0
#: code:addons/base_module_quality/speed_test/speed_test.py:73
#, python-format
msgid "Given module has no objects.Speed test can work only when new objects are created in the module along with demo data"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/pylint_test/pylint_test.py:0
#: code:addons/base_module_quality/pylint_test/pylint_test.py:32
#, python-format
msgid "This test uses Pylint and checks if the module satisfies the coding standard of Python. See http://www.logilab.org/project/name/pylint for further info.\n"
" "
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/workflow_test/workflow_test.py:0
#: code:addons/base_module_quality/workflow_test/workflow_test.py:143
#, python-format
msgid "Feed back About Workflow of Module"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/workflow_test/workflow_test.py:0
#: code:addons/base_module_quality/workflow_test/workflow_test.py:129
#, python-format
msgid "No Workflow define"
msgstr ""
@ -428,7 +436,7 @@ msgid "Cancel"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/pep8_test/pep8_test.py:0
#: code:addons/base_module_quality/pep8_test/pep8_test.py:32
#, python-format
msgid "\n"
"PEP-8 Test , copyright of py files check, method can not call from loops\n"
@ -441,13 +449,13 @@ msgid "Final Score (%)"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/pylint_test/pylint_test.py:0
#: code:addons/base_module_quality/pylint_test/pylint_test.py:61
#, python-format
msgid "Error. Is pylint correctly installed? (http://pypi.python.org/pypi/pylint)"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/speed_test/speed_test.py:0
#: code:addons/base_module_quality/speed_test/speed_test.py:125
#, python-format
msgid "Efficient"
msgstr ""
@ -458,13 +466,13 @@ msgid "Rated Module"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/workflow_test/workflow_test.py:0
#: code:addons/base_module_quality/workflow_test/workflow_test.py:33
#, python-format
msgid "Workflow Test"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/unit_test/unit_test.py:0
#: code:addons/base_module_quality/unit_test/unit_test.py:36
#, python-format
msgid "\n"
"This test checks the Unit Test(PyUnit) Cases of the module. Note that 'unit_test/test.py' is needed in module.\n"
@ -473,7 +481,7 @@ msgid "\n"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/method_test/method_test.py:0
#: code:addons/base_module_quality/method_test/method_test.py:32
#, python-format
msgid "\n"
"This test checks if the module classes are raising exception when calling basic methods or not.\n"
@ -486,43 +494,43 @@ msgid "Details"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/speed_test/speed_test.py:0
#: code:addons/base_module_quality/speed_test/speed_test.py:119
#, python-format
msgid "Warning! Not enough demo data"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/pylint_test/pylint_test.py:0
#: code:addons/base_module_quality/pylint_test/pylint_test.py:31
#, python-format
msgid "Pylint Test"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/pep8_test/pep8_test.py:0
#: code:addons/base_module_quality/pep8_test/pep8_test.py:31
#, python-format
msgid "PEP-8 Test"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/object_test/object_test.py:0
#: code:addons/base_module_quality/object_test/object_test.py:187
#, python-format
msgid "Field name"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/speed_test/speed_test.py:0
#: code:addons/base_module_quality/speed_test/speed_test.py:151
#, python-format
msgid "1"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/speed_test/speed_test.py:0
#: code:addons/base_module_quality/speed_test/speed_test.py:132
#, python-format
msgid "Warning! Object has no demo data"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/terp_test/terp_test.py:0
#: code:addons/base_module_quality/terp_test/terp_test.py:140
#, python-format
msgid "Tag Name"
msgstr ""
@ -560,8 +568,8 @@ msgid "Name"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/object_test/object_test.py:0
#: code:addons/base_module_quality/workflow_test/workflow_test.py:0
#: code:addons/base_module_quality/object_test/object_test.py:177
#: code:addons/base_module_quality/workflow_test/workflow_test.py:136
#, python-format
msgid "Result of views in %"
msgstr ""
@ -577,25 +585,25 @@ msgid "Save report as .html format"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/base_module_quality.py:0
#: code:addons/base_module_quality/base_module_quality.py:269
#, python-format
msgid "The module has to be installed before running this test."
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/speed_test/speed_test.py:0
#: code:addons/base_module_quality/speed_test/speed_test.py:123
#, python-format
msgid "O(1)"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/object_test/object_test.py:0
#: code:addons/base_module_quality/object_test/object_test.py:177
#, python-format
msgid "Result of fields in %"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/unit_test/unit_test.py:0
#: code:addons/base_module_quality/unit_test/unit_test.py:70
#: view:module.quality.detail:0
#: field:module.quality.detail,summary:0
#, python-format
@ -603,20 +611,20 @@ msgid "Summary"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/pylint_test/pylint_test.py:0
#: code:addons/base_module_quality/structure_test/structure_test.py:0
#: code:addons/base_module_quality/pylint_test/pylint_test.py:99
#: code:addons/base_module_quality/structure_test/structure_test.py:172
#, python-format
msgid "File Name"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/pep8_test/pep8_test.py:0
#: code:addons/base_module_quality/pep8_test/pep8_test.py:274
#, python-format
msgid "Line number"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/structure_test/structure_test.py:0
#: code:addons/base_module_quality/structure_test/structure_test.py:32
#, python-format
msgid "Structure Test"
msgstr ""
@ -627,7 +635,7 @@ msgid "Quality"
msgstr ""
#. module: base_module_quality
#: code:addons/base_module_quality/terp_test/terp_test.py:0
#: code:addons/base_module_quality/terp_test/terp_test.py:140
#, python-format
msgid "Feed back About terp file of Module"
msgstr ""

8
addons/base_module_record/i18n/base_module_record.pot
View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:43:49+0000\n"
"PO-Revision-Date: 2010-12-21 19:43:49+0000\n"
"POT-Creation-Date: 2011-01-03 16:57:17+0000\n"
"PO-Revision-Date: 2011-01-03 16:57:17+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -202,7 +202,7 @@ msgid "Export Customizations As Data File"
msgstr ""
#. module: base_module_record
#: code:addons/base_module_record/wizard/base_module_save.py:0
#: code:addons/base_module_record/wizard/base_module_save.py:129
#, python-format
msgid "Error"
msgstr ""

2
addons/base_module_record/wizard/base_module_record_data.py
View File

@ -100,7 +100,7 @@ def _record_objects(self, cr, uid, data, context):
for s_id in search_ids:
args=(cr.dbname,uid,obj_name,'copy',s_id,{},context)
mod.recording_data.append(('query',args, {}, s_id))
return {}
return {'type': 'ir.actions.act_window_close'}
def _check(self, cr, uid, data, context):
pool = pooler.get_pool(cr.dbname)

2
addons/base_module_record/wizard/base_module_record_objects.py
View File

@ -90,7 +90,7 @@ def _record_objects(self, cr, uid, data, context):
for s_id in search_ids:
args=(cr.dbname,uid,obj_name,'copy',s_id,{},context)
mod.recording_data.append(('query',args, {}, s_id))
return {}
return {'type': 'ir.actions.act_window_close'}
def inter_call(self,cr,uid,data,context):
res=base_module_save._create_module(self,cr, uid, data, context)

1
addons/base_report_creator/base_report_creator.py
View File

@ -196,7 +196,6 @@ class report_creator(osv.osv):
res = super(report_creator, self).read(cr, user, ids, fields, context, load)
if (not context) or 'report_id' not in context:
return res
ctx = context or {}
wp = ''
for data in res:
if not data.get('sql_query'):

10
addons/base_report_creator/i18n/base_report_creator.pot
View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:43:49+0000\n"
"PO-Revision-Date: 2010-12-21 19:43:49+0000\n"
"POT-Creation-Date: 2011-01-03 16:57:17+0000\n"
"PO-Revision-Date: 2011-01-03 16:57:17+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -47,7 +47,7 @@ msgid "Graph Mode"
msgstr ""
#. module: base_report_creator
#: code:addons/base_report_creator/base_report_creator.py:0
#: code:addons/base_report_creator/base_report_creator.py:321
#, python-format
msgid "These is/are model(s) (%s) in selection which is/are not related to any other model"
msgstr ""
@ -116,7 +116,7 @@ msgid "Custom Reports"
msgstr ""
#. module: base_report_creator
#: code:addons/base_report_creator/base_report_creator.py:0
#: code:addons/base_report_creator/base_report_creator.py:321
#, python-format
msgid "No Related Models!!"
msgstr ""

4
addons/base_report_creator/wizard/report_menu_create.py
View File

@ -49,7 +49,7 @@ class report_menu_create(osv.osv_memory):
if context_id:
data = self.browse(cr, uid, ids, context=context)
if not data:
return {}
return {'type': 'ir.actions.act_window_close'}
data = data[0]
board = obj_board.browse(cr, uid, context_id, context=context)
@ -77,7 +77,7 @@ class report_menu_create(osv.osv_memory):
'action': 'ir.actions.act_window, ' + str(action_id)
}, context=context)
obj_board.write(cr, uid, context_id, {'menu_id': menu_id})
return {}
return {'type': 'ir.actions.act_window_close'}
report_menu_create()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

4
addons/base_report_creator/wizard/wiz_set_filter_fields.py
View File

@ -145,7 +145,7 @@ def _set_filter_value(self, cr, uid, data, context):
'condition' : form_data['condition']
}
pooler.get_pool(cr.dbname).get('base_report_creator.report.filter').create(cr,uid,create_dict,context)
return {}
return {'type': 'ir.actions.act_window_close'}
def _set_form_value(self, cr, uid, data, context):
field_id = data['form']['field_id']
@ -199,7 +199,7 @@ def _set_operator(self, cr, uid, data, context):
elif field.ttype in ('boolean', 'selection'):
operator.append(('=','Equals'))
operator.append(('<>','Not Equals'))
return {}
return {'type': 'ir.actions.act_window_close'}
class set_filter_fields(wizard.interface):
states = {

3
addons/base_report_designer/__openerp__.py
View File

@ -36,8 +36,7 @@ upload the report using the same wizard.
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
'depends': ['base'],
'init_xml': ['security/base_report_security.xml',
'wizard/base_report_design_view.xml'],
'init_xml': ['wizard/base_report_design_view.xml'],
'update_xml': ['base_report_designer_installer.xml'],
'demo_xml': [],
'installable': True,

6
addons/base_report_designer/i18n/base_report_designer.pot
View File

@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:43:50+0000\n"
"PO-Revision-Date: 2010-12-21 19:43:50+0000\n"
"POT-Creation-Date: 2011-01-03 16:57:18+0000\n"
"PO-Revision-Date: 2011-01-03 16:57:18+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"

1
addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py
View File

@ -344,7 +344,6 @@ if __name__ == "__main__":
parser.error("incorrect number of arguments")
import sys
import StringIO
fname = sys.argv[1]
f = fname

BIN
addons/base_report_designer/plugin/openerp_report_designer.zip
View File

Binary file not shown.

12
addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
View File

@ -140,28 +140,16 @@ class ServerParameter( unohelper.Base, XJobExecutor ):
ErrorDialog("Connection Refuse...","Please enter valid Login/Password")
self.win.endExecute()
try:
ids = self.sock.execute(sDatabase,UID,sPassword, 'res.groups' , 'search', [('name','=','OpenOfficeReportDesigner')])
ids_module =self.sock.execute(sDatabase, UID, sPassword, 'ir.module.module', 'search', [('name','=','base_report_designer'),('state', '=', 'installed')])
dict_groups =self.sock.execute(sDatabase, UID,sPassword, 'res.groups' , 'read',ids,['users'])
except :
import traceback,sys
info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
self.logobj.log_write('ServerParameter', LOG_ERROR, info)
if not len(ids) :
ErrorDialog("Group Not Found!!! Create a group named \n\n"'"OpenOfficeReportDesigner"'" \n\n ","","Group Name Error")
self.logobj.log_write('Group Error',LOG_WARNING, ':Create a group OpenOfficeReportDesigner using database %s' % (sDatabase))
self.win.endExecute()
if not len(ids_module):
ErrorDialog("Please Install base_report_designer module", "", "Module Uninstalled Error")
self.logobj.log_write('Module Not Found',LOG_WARNING, ':base_report_designer not install in database %s' % (sDatabase))
self.win.endExecute()
if UID not in dict_groups[0]['users']:
ErrorDialog("Connection Refuse...","You have not access these Report Designer")
self.logobj.log_write('Connection Refuse',LOG_WARNING, " Not Access Report Designer ")
self.win.endExecute()
else:
desktop=getDesktop()
doc = desktop.getCurrentComponent()

Some files were not shown because too many files have changed in this diff Show More