pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Merge]

Browse Source 
bzr revid: vir@tinyerp.com-20100820042555-n0eba4qa8go23rkf
This commit is contained in:
Vir (Open ERP)
2010-08-20 09:55:55 +05:30
parent ad4ce554d7 bd16462c71
commit 081c24e542
261 changed files with 3737 additions and 1570 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account.py
-7
View File
@@ -407,16 +407,9 @@ class account_account(osv.osv):
'level': fields.function(_get_level, string='Level', method=True, store=True, type='integer'),
}
# def _default_company(self, cr, uid, context={}):
# user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
# if user.company_id:
# return user.company_id.id
# return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
_defaults = {
'type': lambda *a : 'view',
'reconcile': lambda *a: False,
#'company_id': _default_company,
'active': lambda *a: True,
'check_history': lambda *a: True,
'currency_mode': lambda *a: 'current',
addons/account/account_bank_statement.py
+2 -2
View File
@@ -605,10 +605,10 @@ class account_bank_statement_reconcile_line(osv.osv):
'account_id': fields.many2one('account.account', 'Account', required=True),
'line_id': fields.many2one('account.bank.statement.reconcile', 'Reconcile'),
'amount': fields.float('Amount', required=True),
'analytic_id': fields.many2one('account.analytic.account',"Analytic Account")
'analytic_id': fields.many2one('account.analytic.account',"Analytic Account", domain=[('parent_id', '!=', False)])
}
_defaults = {
'name': lambda *a: 'Write-Off',
'name': 'Write-Off',
}
account_bank_statement_reconcile_line()
addons/account/account_invoice_view.xml
+3 -3
View File
@@ -62,12 +62,12 @@
<field colspan="4" name="name"/>
<field colspan="4" name="origin" groups="base.group_extended"/>
<field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(parent.fiscal_position,account_id)" groups="base.group_user"/>
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id" groups="base.group_extended"/>
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="base.group_extended"/>
<newline/>
<field name="price_subtotal"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<field colspan="4" name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]"/>
<field colspan="4" name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','!=',False),('company_id', '=', parent.company_id)]"/>
</page>
<page string="Notes">
<field colspan="4" name="note" nolabel="1"/>
@@ -178,7 +178,7 @@
<field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"/>
<field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(parent.fiscal_position,account_id)"/>
<field name="invoice_line_tax_id" view_mode="2" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/>
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id" groups="base.group_extended"/>
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="base.group_extended"/>
<field name="quantity"/>
<field name="price_unit"/>
<!-- Removed if subtotal is set -->
addons/account/account_view.xml
+8 -6
View File
@@ -496,6 +496,7 @@
<field name="period_id"/>
<field name="balance_start"/>
<field name="balance_end_real"/>
<field name="currency" invisible="1"/>
<button name="%(action_view_account_statement_from_invoice_lines)d"
string="Import Invoices" type="action" icon="gtk-dnd"
attrs="{'invisible':[('state','=','confirm')]}"/>
@@ -896,7 +897,7 @@
<field name="debit" sum="Total debit"/>
<field name="credit" sum="Total credit"/>
<field name="account_tax_id" groups="base.group_extended"/>
<field name="analytic_account_id" groups="base.group_extended"/>
<field name="analytic_account_id" groups="base.group_extended" domain="[('parent_id','!=',False)]"/>
<field name="amount_currency" groups="base.group_extended"/>
<field name="currency_id" groups="base.group_extended"/>
<field name="reconcile_partial_id" groups="base.group_extended"/>
@@ -973,7 +974,7 @@
<group col="2" colspan="2" groups="base.group_extended">
<separator colspan="2" string="Analytic"/>
<field name="analytic_account_id" groups="base.group_extended"/>
<field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="base.group_extended"/>
</group>
<separator string="Narration" colspan="4"/>
<field name="narration" colspan="4" nolabel="1"/>
@@ -1018,7 +1019,7 @@
<field name="blocked" select="3"/>
<newline/>
<field name="account_tax_id" domain="[('parent_id','=',False)]"/>
<field name="analytic_account_id" groups="base.group_extended"/>
<field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="base.group_extended"/>
<separator colspan="4" string="State"/>
<newline/>
<field name="reconcile_id"/>
@@ -1246,7 +1247,7 @@
<group col="2" colspan="2" groups="base.group_extended">
<separator colspan="2" string="Analytic"/>
<field name="analytic_account_id" groups="base.group_extended"/>
<field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="base.group_extended"/>
</group>
<separator string="Narration" colspan="4"/>
<field name="narration" colspan="4" nolabel="1"/>
@@ -1265,7 +1266,7 @@
<field name="date_maturity"/>
<field name="debit" sum="Total Debit"/>
<field name="credit" sum="Total Credit"/>
<field name="analytic_account_id" groups="base.group_extended"/>
<field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="base.group_extended"/>
<field name="amount_currency" groups="base.group_extended"/>
<field name="currency_id" groups="base.group_extended"/>
<field name="tax_code_id"/>
@@ -1911,7 +1912,7 @@
<field name="debit" sum="Total debit"/>
<field name="credit" sum="Total credit"/>
<field name="account_tax_id"/>
<field name="analytic_account_id" groups="base.group_extended"/>
<field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="base.group_extended"/>
<field name="state"/>
</tree>
</field>
@@ -2464,6 +2465,7 @@
<field name="journal_id" on_change="onchange_journal_id(journal_id)" domain="[('type','=','cash')]" select="1" />
<field name="user_id" select="1" readonly="1"/>
<field name="period_id" select="1"/>
<field name="currency" invisible="1"/>
</group>
<notebook colspan="4">
addons/account/configurable_account_chart.xml
+8
View File
@@ -304,6 +304,14 @@
<field name="user_type" ref="conf_account_type_expense"/>
</record>
<record id="conf_a_salary_expense" model="account.account.template">
<field name="code">221</field>
<field name="name">Salary Expenses</field>
<field ref="conf_ovr" name="parent_id"/>
<field name="type">other</field>
<field name="user_type" ref="conf_account_type_expense"/>
</record>
<!-- <record id="account.property_account_expense_categ" model="ir.property">
<field eval="'account.account,'+str(a_expense)" name="value"/>
</record> -->
addons/account/demo/account_minimal.xml
+8
View File
@@ -300,6 +300,14 @@
<field name="parent_id" ref="ovr"/>
</record>
<record id="a_salary_expense" model="account.account">
<field name="code">X2112</field>
<field name="name">Salary Expenses - (test)</field>
<field ref="ovr" name="parent_id"/>
<field name="type">other</field>
<field name="user_type" ref="account_type_expense"/>
</record>
<!-- Properties -->
<record forcecreate="True" id="property_account_receivable" model="ir.property">
<field name="name">property_account_receivable</field>
addons/account/i18n/da.po
+3 -3
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:26+0000\n"
"Last-Translator: vra (openerp) <Unknown>\n"
"PO-Revision-Date: 2010-08-19 05:51+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Danish <da@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/de.po
+3 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:23+0000\n"
"Last-Translator: vra (openerp) <Unknown>\n"
"PO-Revision-Date: 2010-08-19 05:55+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/es_EC.po
+52 -52
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 18:15+0000\n"
"PO-Revision-Date: 2010-08-20 00:46+0000\n"
"Last-Translator: Cristian Salamea (GnuThink) <ovnicraft@gmail.com>\n"
"Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -715,7 +715,7 @@ msgstr "Nota de Debito"
#. module: account
#: wizard_view:account.analytic.account.chart,init:0
msgid "Select the Period for Analysis"
msgstr ""
msgstr "Seleccione el período de análisis"
#. module: account
#: field:account.tax,ref_tax_sign:0
@@ -914,7 +914,7 @@ msgstr "Importe de Moneda"
#. module: account
#: field:account.chart.template,property_account_expense_categ:0
msgid "Expense Category Account"
msgstr ""
msgstr "Cuenta categoría gastos"
#. module: account
#: wizard_field:account.fiscalyear.close,init,fy2_id:0
@@ -1066,7 +1066,7 @@ msgstr "Nueva factura de proveedor"
#. module: account
#: wizard_field:account.invoice.pay,init,amount:0
msgid "Amount paid"
msgstr ""
msgstr "Importe pagado"
#. module: account
#: selection:account.invoice,type:0
@@ -1078,7 +1078,7 @@ msgstr "Factura de cliente"
#. module: account
#: wizard_view:account.open_closed_fiscalyear,init:0
msgid "Choose Fiscal Year"
msgstr ""
msgstr "Escoja el ejercicio fiscal"
#. module: account
#: field:account.sequence.fiscalyear,sequence_main_id:0
@@ -1094,7 +1094,7 @@ msgstr "Imprimir diarios analíticos"
#. module: account
#: rml:account.tax.code.entries:0
msgid "Voucher Nb"
msgstr ""
msgstr "Núm. de comprobante"
#. module: account
#: help:account.payment.term.line,sequence:0
@@ -1108,12 +1108,12 @@ msgstr ""
#. module: account
#: field:account.bank.statement.reconcile,total_new:0
msgid "Total write-off"
msgstr ""
msgstr "Desajuste total"
#. module: account
#: view:account.tax.template:0
msgid "Compute Code for Taxes included prices"
msgstr ""
msgstr "Código para el cálculo de precios con impuestos incluidos"
#. module: account
#: view:account.invoice.tax:0
@@ -1127,12 +1127,12 @@ msgstr "Códigos de impuestos"
#: field:account.tax.template,chart_template_id:0
#: field:wizard.multi.charts.accounts,chart_template_id:0
msgid "Chart Template"
msgstr ""
msgstr "Plantilla plan contable"
#. module: account
#: field:account.chart.template,property_account_income_categ:0
msgid "Income Category Account"
msgstr ""
msgstr "Cuenta de la categoría de ingresos"
#. module: account
#: model:ir.actions.act_window,name:account.analytic_account_form
@@ -1144,7 +1144,7 @@ msgstr "Nueva cuenta analítica"
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
msgstr ""
msgstr "Plantillas de Tipos de Contribuyentes"
#. module: account
#: rml:account.invoice:0
@@ -1155,12 +1155,12 @@ msgstr "Precio unitario"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "Period from :"
msgstr ""
msgstr "Periodo desde :"
#. module: account
#: model:ir.model,name:account.model_wizard_multi_charts_accounts
msgid "wizard.multi.charts.accounts"
msgstr ""
msgstr "Plan de Cuentas Multiple"
#. module: account
#: model:account.journal,name:account.sales_journal
@@ -1170,13 +1170,13 @@ msgstr "Diario de ventas"
#. module: account
#: help:account.model.line,amount_currency:0
msgid "The amount expressed in an optional other currency."
msgstr ""
msgstr "El importe expresado en otra divisa opcional."
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr ""
msgstr "Plantilla de Tipo de Contribuyente"
#. module: account
#: field:account.payment.term,line_ids:0
@@ -1202,7 +1202,7 @@ msgstr "¿Está seguro que desea cerrar el ejercicio fiscal?"
#. module: account
#: selection:account.move,type:0
msgid "Bank Receipt"
msgstr ""
msgstr "Recibo bancario"
#. module: account
#: view:res.partner:0
@@ -1217,7 +1217,7 @@ msgstr "Lista plantilla impuestos"
#. module: account
#: model:process.transition,name:account.process_transition_invoiceimport0
msgid "Invoice import"
msgstr ""
msgstr "Importe factura"
#. module: account
#: model:ir.actions.wizard,name:account.action_move_journal_line_form_select
@@ -1248,7 +1248,7 @@ msgstr "Moneda de la compañía"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Fiscal Position Template Account Mapping"
msgstr ""
msgstr "Mapeo cuentas plantilla posición fiscal"
#. module: account
#: field:account.analytic.account,parent_id:0
@@ -1258,12 +1258,12 @@ msgstr "Cuenta analítica padre"
#. module: account
#: wizard_button:account.move.line.reconcile,init_partial,addendum:0
msgid "Reconcile With Write-Off"
msgstr ""
msgstr "Conciliación con desfase"
#. module: account
#: field:account.move.line,tax_amount:0
msgid "Tax/Base Amount"
msgstr ""
msgstr "Importe impuestos/base"
#. module: account
#: help:wizard.multi.charts.accounts,code_digits:0
@@ -1293,7 +1293,7 @@ msgstr "Importe fijo"
#. module: account
#: rml:account.analytic.account.analytic.check:0
msgid "Analytic Credit"
msgstr ""
msgstr "Haber analítico"
#. module: account
#: field:account.move.line,reconcile_partial_id:0
@@ -1327,7 +1327,7 @@ msgstr "Valor"
#: wizard_field:account.invoice.pay,addendum,writeoff_acc_id:0
#: wizard_field:account.move.line.reconcile,addendum,writeoff_acc_id:0
msgid "Write-Off account"
msgstr ""
msgstr "Cuenta de desajuste"
#. module: account
#: field:account.model.line,model_id:0
@@ -1339,17 +1339,17 @@ msgstr "Modelo"
#: model:ir.actions.wizard,name:account.wizard_fiscalyear_close_state
#: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
msgid "Close a Fiscal Year"
msgstr ""
msgstr "Cerrar un ejercicio fiscal"
#. module: account
#: field:account.journal,centralisation:0
msgid "Centralised counterpart"
msgstr ""
msgstr "Homólogo centralizado"
#. module: account
#: view:wizard.company.setup:0
msgid "Message"
msgstr ""
msgstr "Mensaje"
#. module: account
#: model:process.node,note:account.process_node_supplierpaymentorder0
@@ -1388,7 +1388,7 @@ msgstr "El método de cálculo del importe del impuesto."
#: model:process.node,note:account.process_node_accountingentries0
#: model:process.node,note:account.process_node_supplieraccountingentries0
msgid "Validated accounting entries."
msgstr ""
msgstr "Asientos contables validados."
#. module: account
#: wizard_view:account.move.line.unreconcile,init:0
@@ -1409,7 +1409,7 @@ msgstr "Archivo electrónico"
#. module: account
#: view:res.partner:0
msgid "Customer Credit"
msgstr ""
msgstr "Haber del cliente"
#. module: account
#: field:account.invoice,tax_line:0
@@ -1474,7 +1474,7 @@ msgstr "Mostrar cuentas "
#. module: account
#: model:ir.model,name:account.model_account_bank_statement_reconcile_line
msgid "Statement reconcile line"
msgstr ""
msgstr "Línea de conciliación de extracto"
#. module: account
#: view:account.tax:0
@@ -1488,7 +1488,7 @@ msgstr "Dejarlo vacío para usar la cuenta de ingresos"
#: wizard_view:account.move.line.reconcile,init_full:0
#: wizard_view:account.move.line.reconcile,init_partial:0
msgid "Write-Off"
msgstr ""
msgstr "Desajuste"
#. module: account
#: help:account.invoice,partner_bank:0
@@ -1512,17 +1512,17 @@ msgstr "Cerrar estados"
#. module: account
#: model:ir.model,name:account.model_wizard_company_setup
msgid "wizard.company.setup"
msgstr ""
msgstr "Asistente de Configuracion de Compañia"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
msgid "account.analytic.line.extended"
msgstr ""
msgstr "account.analytic.line.extended"
#. module: account
#: field:account.journal,refund_journal:0
msgid "Refund Journal"
msgstr ""
msgstr "Diario de Reembolsos"
#. module: account
#: model:account.account.type,name:account.account_type_income
@@ -1542,7 +1542,7 @@ msgstr "Tel. :"
#. module: account
#: field:account.invoice.tax,tax_amount:0
msgid "Tax Code Amount"
msgstr ""
msgstr "Importe código impuesto"
#. module: account
#: selection:account.account.type,sign:0
@@ -1577,7 +1577,7 @@ msgstr "Generar plan contable a partir de una plantilla de plan contable"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_legal_statement
msgid "Legal Statements"
msgstr ""
msgstr "Declaraciones oficiales"
#. module: account
#: field:account.tax.code,parent_id:0
@@ -1634,7 +1634,7 @@ msgstr "Cuentas a cobrar y pagar"
#: view:account.subscription:0
#: field:account.subscription,lines_id:0
msgid "Subscription Lines"
msgstr ""
msgstr "Líneas de asientos periódicos"
#. module: account
#: selection:account.analytic.journal,type:0
@@ -1663,7 +1663,7 @@ msgstr "Cerrar período"
#. module: account
#: rml:account.overdue:0
msgid "Due"
msgstr ""
msgstr "Pendiente"
#. module: account
#: rml:account.journal.period.print:0
@@ -1678,7 +1678,7 @@ msgstr "Tipo de cuentas permitidas (vacío para ningún control)"
#. module: account
#: field:account.bank.statement,balance_start:0
msgid "Starting Balance"
msgstr ""
msgstr "Saldo inicial"
#. module: account
#: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,journal:0
@@ -1696,7 +1696,7 @@ msgstr "Ctdad máx."
#. module: account
#: wizard_button:account.invoice.refund,init,refund:0
msgid "Refund Invoice"
msgstr ""
msgstr "Reembolsar Factura"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_period_tree
@@ -1754,7 +1754,7 @@ msgstr "Incluir en importe base"
#. module: account
#: rml:account.analytic.account.analytic.check:0
msgid "Delta Credit"
msgstr ""
msgstr "Diferencia haber"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile
@@ -1765,7 +1765,7 @@ msgstr "Romper conciliación de los asientos"
#. module: account
#: model:process.node,note:account.process_node_supplierdraftinvoices0
msgid "Pre-generated invoice from control"
msgstr ""
msgstr "Factura pre-generada de control"
#. module: account
#: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
@@ -1845,18 +1845,18 @@ msgstr "Fecha o código"
#. module: account
#: field:account.analytic.account,user_id:0
msgid "Account Manager"
msgstr ""
msgstr "Gestor contable"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "to :"
msgstr ""
msgstr "a :"
#. module: account
#: wizard_field:account.move.line.reconcile,init_full,debit:0
#: wizard_field:account.move.line.reconcile,init_partial,debit:0
msgid "Debit amount"
msgstr ""
msgstr "Importe debe"
#. module: account
#: selection:account.subscription,period_type:0
@@ -1888,7 +1888,7 @@ msgstr "Fecha inicial"
#. module: account
#: model:account.journal,name:account.refund_expenses_journal
msgid "x Expenses Credit Notes Journal"
msgstr ""
msgstr "x Diario facturas rectificativas (abono) de gastos"
#. module: account
#: field:account.analytic.journal,type:0
@@ -1909,40 +1909,40 @@ msgstr "Cuentas permitidas (vacío para ningún control)"
#. module: account
#: view:account.invoice:0
msgid "Untaxed amount"
msgstr ""
msgstr "Base imponible"
#. module: account
#: field:account.tax,account_collected_id:0
#: field:account.tax.template,account_collected_id:0
msgid "Invoice Tax Account"
msgstr ""
msgstr "Cuenta impuestos de facturas"
#. module: account
#: view:account.move.line:0
msgid "Analytic Lines"
msgstr ""
msgstr "Líneas analíticas"
#. module: account
#: wizard_view:account.invoice.pay,init:0
#: model:ir.actions.wizard,name:account.wizard_invoice_pay
msgid "Pay invoice"
msgstr ""
msgstr "Pagar factura"
#. module: account
#: constraint:account.invoice:0
msgid "Error: Invalid Bvr Number (wrong checksum)."
msgstr ""
msgstr "Error: Número BVR inválido (checksum erróneo)."
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree5
#: model:ir.ui.menu,name:account.menu_invoice_draft
msgid "Draft Customer Invoices"
msgstr ""
msgstr "Facturas de cliente en borrador"
#. module: account
#: model:ir.model,name:account.model_account_subscription_line
msgid "Account Subscription Line"
msgstr ""
msgstr "Línea de subscripción de contabilidad"
#. module: account
#: selection:account.account.balance.report,checktype,state:0
addons/account/i18n/hu.po
+3 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:17+0000\n"
"Last-Translator: vra (openerp) <Unknown>\n"
"PO-Revision-Date: 2010-08-19 05:54+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/it.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 20:38+0000\n"
"PO-Revision-Date: 2010-08-19 05:51+0000\n"
"Last-Translator: Andrea <amarin@mr-service.it>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/lt.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:14+0000\n"
"PO-Revision-Date: 2010-08-19 05:48+0000\n"
"Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/pl.po
+3 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:14+0000\n"
"Last-Translator: vra (openerp) <Unknown>\n"
"PO-Revision-Date: 2010-08-19 05:48+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/sq.po
+2 -2
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: ASTRIT BOKSHI <astritbokshi@gmail.com>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:08+0000\n"
"PO-Revision-Date: 2010-08-19 05:37+0000\n"
"Last-Translator: bokshas <astritbokshi@gmail.com>\n"
"Language-Team: Albanian <sq@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/sv.po
+3 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:18+0000\n"
"Last-Translator: vra (openerp) <Unknown>\n"
"PO-Revision-Date: 2010-08-19 05:53+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: <> <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/tr.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:19+0000\n"
"PO-Revision-Date: 2010-08-19 05:48+0000\n"
"Last-Translator: Omer Barlas <omer@barlas.com.tr>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/zh_CN.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:13+0000\n"
"PO-Revision-Date: 2010-08-19 05:40+0000\n"
"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/project/project_view.xml
+1 -1
View File
@@ -60,7 +60,7 @@
<field name="credit"/>
<field name="balance"/>
<field name="company_currency_id"/>
<!-- <field name="date"/>-->
<field name="date" invisible="1"/>
<!-- <field name="parent_id" invisible="1"/>-->
<!-- <field name="type" invisible="1"/>-->
<!-- <field name="partner_id" invisible="1"/>-->
addons/account/security/ir.model.access.csv
-1
View File
@@ -199,4 +199,3 @@
"access_account_analytic_line_accounting_accountant","account.analytic.line","analytic.model_account_analytic_line","account.group_accounting_accountant",1,0,0,0
"access_account_analytic_journal_accounting_accountant","account.analytic.journal","model_account_analytic_journal","account.group_accounting_accountant",1,0,0,0
"access_account_bank_statement_reconcile_accounting_accountant","account.bank.statement.reconcile","model_account_bank_statement_reconcile","account.group_accounting_accountant",1,1,1,1
"access_account_move_journal_manager","account.move.journal.manager","model_account_move_journal","account.group_account_manager",1,0,0,0
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
199 access_account_analytic_line_accounting_accountant account.analytic.line analytic.model_account_analytic_line account.group_accounting_accountant 1 0 0 0
200 access_account_analytic_journal_accounting_accountant account.analytic.journal model_account_analytic_journal account.group_accounting_accountant 1 0 0 0
201 access_account_bank_statement_reconcile_accounting_accountant account.bank.statement.reconcile model_account_bank_statement_reconcile account.group_accounting_accountant 1 1 1 1
access_account_move_journal_manager account.move.journal.manager model_account_move_journal account.group_account_manager 1 0 0 0
addons/account/wizard/account_pay_invoice.py
+1 -1
View File
@@ -35,7 +35,7 @@ class account_invoice_pay_writeoff(osv.osv_memory):
'writeoff_acc_id': fields.many2one('account.account', 'Write-Off account', required=True),
'writeoff_journal_id': fields.many2one('account.journal', 'Write-Off journal', required=True),
'comment': fields.char('Comment', size=64, required=True),
'analytic_id': fields.many2one('account.analytic.account','Analytic Account')
'analytic_id': fields.many2one('account.analytic.account','Analytic Account', domain=[('parent_id', '!=', False)])
}
_defaults = {
'comment': 'Write-Off',
addons/account/wizard/account_reconcile.py
+1 -1
View File
@@ -148,7 +148,7 @@ class account_move_line_reconcile_writeoff(osv.osv_memory):
'writeoff_acc_id': fields.many2one('account.account','Write-Off account', required=True),
'date_p': fields.date('Date'),
'comment': fields.char('Comment', size= 64, required=True),
'analytic_id': fields.many2one('account.analytic.account', 'Analytic Account'),
'analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', domain=[('parent_id', '!=', False)]),
}
_defaults = {
'date_p': time.strftime('%Y-%m-%d'),
addons/account_analytic_analysis/account_analytic_analysis.py
+13 -13
View File
@@ -41,7 +41,7 @@ class account_analytic_account(osv.osv):
group by account_analytic_line.account_id" ,(parent_ids,))
for account_id, sum in cr.fetchall():
res[account_id] = round(sum,2)
return self._compute_currency_for_level_tree(cr, uid, ids, parent_ids, res, context)
def _ca_to_invoice_calc(self, cr, uid, ids, name, arg, context=None):
@@ -154,7 +154,7 @@ class account_analytic_account(osv.osv):
for account_id, sum in cr.fetchall():
res[account_id] = round(sum,2)
return self._compute_currency_for_level_tree(cr, uid, ids, parent_ids, res, context)
# TODO Take care of pricelist and purchase !
def _ca_theorical_calc(self, cr, uid, ids, name, arg, context=None):
res = {}
@@ -185,7 +185,7 @@ class account_analytic_account(osv.osv):
GROUP BY account_analytic_line.account_id""",(parent_ids,))
for account_id, sum in cr.fetchall():
res2[account_id] = round(sum,2)
for obj_id in ids:
res.setdefault(obj_id, 0.0)
res2.setdefault(obj_id, 0.0)
@@ -194,7 +194,7 @@ class account_analytic_account(osv.osv):
if child_id != obj_id:
res[obj_id] += res.get(child_id, 0.0)
res[obj_id] += res2.get(child_id, 0.0)
# sum both result on account_id
for id in ids:
res[id] = round(res.get(id, 0.0),2) + round(res2.get(id, 0.0),2)
@@ -384,7 +384,7 @@ class account_analytic_account(osv.osv):
'month_ids': fields.function(_month, method=True, type='many2many', relation='account_analytic_analysis.summary.month', string='Month'),
'user_ids': fields.function(_user, method=True, type="many2many", relation='account_analytic_analysis.summary.user', string='User'),
}
account_analytic_account()
class account_analytic_account_summary_user(osv.osv):
@@ -401,12 +401,12 @@ class account_analytic_account_summary_user(osv.osv):
max_user = cr.fetchone()[0]
account_ids = [int(str(x/max_user - (x%max_user == 0 and 1 or 0))) for x in ids]
user_ids = [int(str(x-((x/max_user - (x%max_user == 0 and 1 or 0)) *max_user))) for x in ids]
parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', account_ids)]))
parent_ids = tuple(account_obj.search(cr, uid, [('parent_id', 'child_of', account_ids)]))
if parent_ids:
cr.execute('SELECT id, unit_amount ' \
'FROM account_analytic_analysis_summary_user ' \
'WHERE account_id IN %s ' \
'AND "user" IN %s',(parent_ids, user_ids,))
'AND "user" IN %s',(parent_ids, tuple(user_ids),))
for sum_id, unit_amount in cr.fetchall():
res[sum_id] = unit_amount
for obj_id in ids:
@@ -425,7 +425,7 @@ class account_analytic_account_summary_user(osv.osv):
string='Total Time'),
'user' : fields.many2one('res.users', 'User'),
}
def init(self, cr):
tools.sql.drop_view_if_exists(cr, 'account_analytic_analysis_summary_user')
cr.execute('CREATE OR REPLACE VIEW account_analytic_analysis_summary_user AS (' \
@@ -472,7 +472,7 @@ class account_analytic_account_summary_user(osv.osv):
fields = self._columns.keys()
# construct a clause for the rules :
d1, d2 = self.pool.get('ir.rule').domain_get(cr, user, self._name)
d1, d2, tables = self.pool.get('ir.rule').domain_get(cr, user, self._name, 'read', context=context)
# all inherited fields + all non inherited fields for which the attribute whose name is in load is True
fields_pre = filter(lambda x: x in self._columns and getattr(self._columns[x],'_classic_write'), fields) + self._inherits.values()
@@ -567,12 +567,12 @@ class account_analytic_account_summary_month(osv.osv):
account_obj = self.pool.get('account.analytic.account')
account_ids = [int(str(int(x))[:-6]) for x in ids]
month_ids = [int(str(int(x))[-6:]) for x in ids]
parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', account_ids)]))
parent_ids = tuple(account_obj.search(cr, uid, [('parent_id', 'child_of', account_ids)]))
if parent_ids:
cr.execute('SELECT id, unit_amount ' \
'FROM account_analytic_analysis_summary_month ' \
'WHERE account_id IN %s ' \
'AND month_id IN %s ',(parent_ids, month_ids,))
'AND month_id IN %s ',(parent_ids, tuple(month_ids),))
for sum_id, unit_amount in cr.fetchall():
res[sum_id] = unit_amount
for obj_id in ids:
@@ -650,7 +650,7 @@ class account_analytic_account_summary_month(osv.osv):
fields = self._columns.keys()
# construct a clause for the rules :
d1, d2 = self.pool.get('ir.rule').domain_get(cr, user, self._name)
d1, d2, tables = self.pool.get('ir.rule').domain_get(cr, user, self._name)
# all inherited fields + all non inherited fields for which the attribute whose name is in load is True
fields_pre = filter(lambda x: x in self._columns and getattr(self._columns[x],'_classic_write'), fields) + self._inherits.values()
@@ -684,7 +684,7 @@ class account_analytic_account_summary_month(osv.osv):
res.extend(cr.dictfetchall())
else:
res = map(lambda x: {'id': x}, ids)
res_trans_obj = self.pool.get('ir.translation')
for f in fields_pre:
if self._columns[f].translate:
addons/account_analytic_analysis/i18n/bg.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:07+0000\n"
"PO-Revision-Date: 2010-08-19 05:49+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
addons/account_analytic_analysis/i18n/fi.po
+3 -3
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:22+0000\n"
"Last-Translator: vra (openerp) <Unknown>\n"
"PO-Revision-Date: 2010-08-19 05:54+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Finnish <fi@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
addons/account_analytic_analysis/i18n/it.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 12:15+0000\n"
"PO-Revision-Date: 2010-08-19 05:41+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
addons/account_analytic_analysis/i18n/lt.po
+3 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:28+0000\n"
"Last-Translator: vra (openerp) <Unknown>\n"
"PO-Revision-Date: 2010-08-19 05:51+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
addons/account_analytic_analysis/i18n/tr.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:06+0000\n"
"PO-Revision-Date: 2010-08-19 05:50+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
addons/account_analytic_default/account_analytic_default_view.xml
+2 -2
View File
@@ -8,7 +8,7 @@
<field name="arch" type="xml">
<tree string="Analytic Defaults">
<field name="sequence"/>
<field name="analytic_id" required="1"/>
<field name="analytic_id" required="1" domain="[('parent_id','!=',False)]"/>
<field name="product_id"/>
<field name="partner_id"/>
<field name="user_id"/>
@@ -25,7 +25,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Analytic Defaults">
<field name="analytic_id" required="1"/>
<field name="analytic_id" required="1" domain="[('parent_id','!=',False)]"/>
<field name="sequence"/>
<separator string="Conditions" colspan="4"/>
<field name="product_id"/>
addons/account_analytic_default/i18n/lt.po
+3 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:07+0000\n"
"Last-Translator: vra (openerp) <Unknown>\n"
"PO-Revision-Date: 2010-08-19 05:49+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_default
addons/account_analytic_default/i18n/tr.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:06+0000\n"
"PO-Revision-Date: 2010-08-19 05:50+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_default
addons/account_analytic_plans/i18n/lt.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:07+0000\n"
"PO-Revision-Date: 2010-08-19 05:49+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
addons/account_analytic_plans/i18n/tr.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:14+0000\n"
"PO-Revision-Date: 2010-08-19 05:48+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
addons/account_budget/crossovered_budget_view.xml
+2 -2
View File
@@ -85,7 +85,7 @@
</graph>
<tree string="Budget Lines" editable="top">
<field name="crossovered_budget_id"/>
<field name="analytic_account_id" groups="base.group_extended"/>
<field name="analytic_account_id" groups="base.group_extended" domain="[('parent_id','!=',False)]"/>
<field name="date_from"/>
<field name="date_to"/>
<field name="paid_date"/>
@@ -96,7 +96,7 @@
</tree>
<form string="Budget Lines">
<field name="crossovered_budget_id"/>
<field name="analytic_account_id" groups="base.group_extended"/>
<field name="analytic_account_id" groups="base.group_extended" domain="[('parent_id','!=',False)]" />
<field name="date_from"/>
<field name="date_to"/>
<field name="paid_date"/>
addons/account_budget/i18n/lt.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:28+0000\n"
"PO-Revision-Date: 2010-08-19 05:51+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
addons/account_budget/i18n/tr.po
+3 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:28+0000\n"
"Last-Translator: vra (openerp) <Unknown>\n"
"PO-Revision-Date: 2010-08-19 05:51+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
addons/account_coda/i18n/ar.po
+2 -2
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-11-24 13:11+0000\n"
"PO-Revision-Date: 2010-08-18 13:22+0000\n"
"PO-Revision-Date: 2010-08-19 05:41+0000\n"
"Last-Translator: bamuhrez <bamuhrez@gmail.com>\n"
"Language-Team: Arabic <ar@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_coda
addons/account_followup/i18n/lt.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:14+0000\n"
"PO-Revision-Date: 2010-08-19 05:48+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
addons/account_followup/i18n/tr.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:06+0000\n"
"PO-Revision-Date: 2010-08-19 05:50+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
addons/account_invoice_layout/i18n/it.po
+3 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 16:43+0000\n"
"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
"PO-Revision-Date: 2010-08-19 05:41+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
addons/account_invoice_layout/i18n/lt.po
+3 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:13+0000\n"
"Last-Translator: vra (openerp) <Unknown>\n"
"PO-Revision-Date: 2010-08-19 05:48+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
addons/account_invoice_layout/i18n/tr.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:37+0000\n"
"PO-Revision-Date: 2010-08-19 05:51+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
addons/account_payment/i18n/lt.po
+3 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:22+0000\n"
"Last-Translator: vra (openerp) <Unknown>\n"
"PO-Revision-Date: 2010-08-19 05:55+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
addons/account_payment/i18n/tr.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:23+0000\n"
"PO-Revision-Date: 2010-08-19 05:55+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
addons/account_payment/wizard/account_payment_pay.py
+4 -4
View File
@@ -38,15 +38,15 @@ class account_payment_make_payment(osv.osv_memory):
obj_payment_order.set_done(cr,uid,context['active_id'],context)
return {}
gw= obj_payment_order.get_wizard(t)
gw = obj_payment_order.get_wizard(t)
if not gw:
obj_payment_order.set_done(cr,uid,context['active_id'],context)
return {}
module, wizard= gw
result = mod_obj._get_id(cr, uid, module, wizard)
id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
return act_obj.read(cr, uid, [id])[0]
result = obj_model._get_id(cr, uid, module, wizard)
id = obj_model.read(cr, uid, [result], ['res_id'])[0]['res_id']
return obj_act.read(cr, uid, [id])[0]
#result['context'] = str({'fiscalyear': data['form']['fiscalyear']})
addons/account_report/i18n/it.po
+3 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 16:40+0000\n"
"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
"PO-Revision-Date: 2010-08-19 05:41+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
addons/account_report/i18n/lt.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:21+0000\n"
"PO-Revision-Date: 2010-08-19 05:50+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
addons/account_report/i18n/tr.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:25+0000\n"
"PO-Revision-Date: 2010-08-19 05:52+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
addons/account_reporting/i18n/lt.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:19+0000\n"
"PO-Revision-Date: 2010-08-19 05:45+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
addons/account_reporting/i18n/tr.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:19+0000\n"
"PO-Revision-Date: 2010-08-19 05:53+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
addons/account_tax_include/i18n/tr.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:21+0000\n"
"PO-Revision-Date: 2010-08-19 05:51+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
addons/account_voucher/__openerp__.py
+1 -1
View File
@@ -48,7 +48,7 @@
"voucher_wizard.xml"
],
"test" : [
"test/account_voucher.yml",
# "test/account_voucher.yml",
],
'certificate': '0037580727101',
addons/account_voucher/i18n/lt.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:34+0000\n"
"PO-Revision-Date: 2010-08-19 05:51+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
addons/account_voucher/i18n/tr.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:21+0000\n"
"PO-Revision-Date: 2010-08-19 05:51+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
addons/account_voucher/voucher.py
+260 -392
View File
@@ -117,13 +117,6 @@ class account_voucher(osv.osv):
else:
return False
def _get_type(self, cr, uid, context={}):
vtype = context.get('type', False)
return vtype
def _get_reference_type(self, cursor, user, context=None):
return [('none', 'Free Reference')]
def _get_journal(self, cr, uid, context={}):
journal_pool = self.pool.get('account.journal')
@@ -137,18 +130,19 @@ class account_voucher(osv.osv):
return res[0]
else:
return False
def _get_type(self, cr, uid, context={}):
return context.get('type')
def _get_pay_journal(self, cr, uid, context={}):
journal_pool = self.pool.get('account.journal')
res = journal_pool.search(cr, uid, [('type', '=', 'bank')], limit=1)
if res:
return res[0]
else:
return False
def _get_currency(self, cr, uid, context):
user = self.pool.get('res.users').browse(cr, uid, uid)
if user.company_id:
@@ -156,22 +150,49 @@ class account_voucher(osv.osv):
else:
return self.pool.get('res.currency').search(cr, uid, [('rate','=',1.0)])[0]
def _compute_total(self, cr, uid, ids, name, args, context=None):
position_pool = self.pool.get('account.fiscal.position')
voucher_pool = self.pool.get('account.voucher')
voucher_line_pool = self.pool.get('account.voucher.line')
partner_pool = self.pool.get('res.partner')
tax_pool = self.pool.get('account.tax')
res = {}
for voucher in self.browse(cr, uid, ids):
total = 0.0
for line in voucher.payment_ids:
total += line.amount
# tax = tax_pool.browse(cr, uid, voucher.tax_id.id)
# total_tax = total * (voucher.tax_amount/100)
# tax_id = voucher.tax_id.id
# partner = voucher.partner_id and partner_pool.browse(cr, uid, voucher.partner_id.id) or False
# taxes = position_pool.map_tax(cr, uid, partner and partner.property_account_position or False, [voucher.tax_id])
# taxes = tax_pool.browse(cr, uid, taxes)
# for tax in tax_pool.compute_all(cr, uid, taxes, res[voucher.id], 1).get('taxes'):
# total_tax += tax.get('amount')
res[voucher.id] = total + voucher.tax_amount
return res
_name = 'account.voucher'
_description = 'Accounting Voucher'
_order = "id desc"
_rec_name = 'number'
_columns = {
'type':fields.selection([
('payment','Payment'),
('receipt','Receipt'),
('sale','Sale'),
('purchase','Purchase'),
],'Type', select=True, readonly=True),
'name':fields.char('Memo', size=256, required=False, readonly=True, states={'draft':[('readonly',False)]}),
'type': fields.selection([
('payment', 'Payment'),
('receipt', 'Receipt'),
('sale', 'Sales'),
('purchase', 'Purchase')],
'Type', select=True , size=128, readonly=True),
'date':fields.date('Date', readonly=True, states={'draft':[('readonly',False)]}, help="Effective date for accounting entries"),
'journal_id':fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
'account_id':fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft':[('readonly',False)]}, domain=[('type','<>','view')]),
'account_id':fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft':[('readonly',False)]}),
'payment_ids':fields.one2many('account.voucher.line','voucher_id','Voucher Lines', readonly=True, states={'draft':[('readonly',False)]}),
'period_id': fields.many2one('account.period', 'Period', required=True, readonly=True, states={'draft':[('readonly',False)]}),
'narration':fields.text('Narration', readonly=True, states={'draft':[('readonly',False)]}),
@@ -189,38 +210,104 @@ class account_voucher(osv.osv):
\n* The \'Pro-forma\' when voucher is in Pro-forma state,voucher does not have an voucher number. \
\n* The \'Posted\' state is used when user create voucher,a voucher number is generated and voucher entries are created in account \
\n* The \'Cancelled\' state is used when user cancel voucher.'),
'amount':fields.float('Amount', readonly=True),
'amount': fields.function(_compute_total, method=True, type='float', digits=(14,2), string='Total', store=True),
'tax_amount':fields.float('Tax Amount', digits=(14,2), readonly=True, states={'draft':[('readonly',False)]}),
'reference': fields.char('Ref #', size=64, readonly=True, states={'draft':[('readonly',False)]}, help="Payment or Receipt transaction number, i.e. Bank cheque number or payorder number or Wire transfer number or Acknowledge number."),
'reference_type': fields.selection(_get_reference_type, 'Reference Type', required=True),
'number': fields.related('move_id', 'name', type="char", readonly=True, string='Number'),
'move_id':fields.many2one('account.move', 'Account Entry'),
'move_ids': fields.related('move_id','line_id', type='many2many', relation='account.move.line', string='Journal Items', readonly=True, states={'draft':[('readonly',False)]}),
'partner_id':fields.many2one('res.partner', 'Partner', readonly=True, states={'draft':[('readonly',False)]}),
'audit': fields.related('move_id','to_check', type='boolean', relation='account.move', string='Audit Complete ?'),
'pay_now':fields.selection([
('pay_now','Pay Now'),
('pay_later','Pay Later'),
('pay_now','Pay Directly'),
('pay_later','Pay Later or Group Funds'),
],'Payment', select=True, readonly=True, states={'draft':[('readonly',False)]}),
'pay_journal_id':fields.many2one('account.journal', 'Payment Journal', readonly=True, states={'draft':[('readonly',False)]}, domain=[('type','in',['bank','cash'])]),
'pay_account_id':fields.many2one('account.account', 'Payment Account', readonly=True, states={'draft':[('readonly',False)]}, domain=[('type','<>','view')]),
'pay_amount':fields.float('Payment Amount', readonly=True, states={'draft':[('readonly',False)]}),
'tax_id':fields.many2one('account.tax', 'Tax', required=False),
'tax_id':fields.many2one('account.tax', 'Tax', readonly=True, states={'draft':[('readonly',False)]}),
}
_defaults = {
'type':_get_type,
'period_id': _get_period,
'type': _get_type,
'journal_id':_get_journal,
'currency_id': _get_currency,
'state': lambda *a: 'draft',
'pay_now':lambda *a: 'pay_now',
'pay_now':lambda *a: 'pay_later',
'name': lambda *a: '/',
'date' : lambda *a: time.strftime('%Y-%m-%d'),
'reference_type': lambda *a: "none",
'audit': lambda *a: False,
'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.voucher',context=c),
}
def onchange_tax_id(self, cr, uid, ids, amount, tax_id, context={}):
res = {
'tax_amount':False
}
tax_pool = self.pool.get('account.tax')
if tax_id:
tax = tax_pool.browse(cr, uid, tax_id)
if tax.type == 'percent':
res.update({
'tax_amount':amount * tax.amount
})
if tax.type == 'fixed':
res.update({
'tax_amount':amount + tax.amount
})
return {
'value':res
}
def create(self, cr, uid, vals, context={}):
"""
Create a new record for a model account_voucher
@param cr: A database cursor
@param user: ID of the user currently logged in
@param vals: provides data for new record
@param context: context arguments, like lang, time zone
@return: Returns an id of the new record
"""
old_line = []
new_lines = []
payment_ids = vals.get('payment_ids')
if not payment_ids:
payment_ids = []
vals.update({
'payment_ids':False
})
for line in payment_ids:
id1 = line[0]
id2 = line[1]
res = line[2]
if id1 == 0 and id2 == 0:
new_lines += [(id1, id2, res)]
else:
old_line += [(id1, id2, res)]
if new_lines:
vals.update({
'payment_ids':new_lines
})
res_id = super(account_voucher, self).create(cr, uid, vals, context)
if old_line:
new_payment_ids = []
for line in old_line:
id1 = line[0]
id2 = line[1]
res = line[2]
res.update({
'voucher_id':res_id
})
new_payment_ids += [(id1, id2, res)]
self.write(cr, uid, [res_id], {'payment_ids':new_payment_ids})
return res_id
def onchange_partner_id(self, cr, uid, ids, partner_id, ttype, context={}):
"""
Returns a dict that contains new values and context
@@ -235,6 +322,7 @@ class account_voucher(osv.osv):
"""
move_pool = self.pool.get('account.move')
line_pool = self.pool.get('account.voucher.line')
partner_pool = self.pool.get('res.partner')
res = []
context.update({
@@ -253,18 +341,22 @@ class account_voucher(osv.osv):
if line_ids:
line_pool.unlink(cr, uid, line_ids)
return default
account_id = False
partner = partner_pool.browse(cr, uid, partner_id)
if ttype in ('sale', 'receipt'):
account_id = partner.property_account_receivable.id
elif ttype in ('purchase', 'payment'):
account_id = partner.property_account_payable.id
default['value'].update({
'account_id':account_id
})
if ttype not in ('payment', 'receipt'):
return default
if not ids:
raise osv.except_osv(_('Invalid !'), _('Please save voucher before selection partner !'))
line_ids = line_pool.search(cr, uid, [('voucher_id','=',ids[0])])
if line_ids:
line_pool.unlink(cr, uid, line_ids)
voucher_id = ids[0]
voucher_id = ids and ids[0] or False
ids = move_pool.search(cr, uid, [('reconcile_id','=', False), ('state','=','posted'), ('partner_id','=',partner_id)], context=context)
for move in move_pool.browse(cr, uid, ids):
rs = {
@@ -286,8 +378,10 @@ class account_voucher(osv.osv):
})
line_id = line_pool.create(cr, uid, rs)
res += [line_id]
res = {'payment_ids':res, 'account_id':account_id}
return {
'value':{'payment_ids':res},
'value':res,
'context':context,
}
@@ -315,38 +409,9 @@ class account_voucher(osv.osv):
'value':res,
'context':context,
}
def onchange_account(self, cr, uid, ids, account_id):
if not account_id:
return {
'value':{'amount':False}
}
account = self.pool.get('account.account').browse(cr, uid, account_id)
balance=account.balance
return {
'value':{'amount':balance}
}
def onchange_pay_journal(self, cr, uid, ids, journal_id, ttype):
res = {'pay_account_id':False}
if not journal_id:
return {
'value':res
}
journal_pool = self.pool.get('account.journal')
journal = journal_pool.browse(cr, uid, journal_id)
if journal and ttype == 'sale':
account_id = journal.default_debit_account_id
res.update({
'pay_account_id':account_id.id
})
return {
'value':res
}
def onchange_journal(self, cr, uid, ids, journal_id, ttype):
res = {'account_id':False}
res = {}
if not journal_id:
return {
@@ -355,22 +420,6 @@ class account_voucher(osv.osv):
journal_pool = self.pool.get('account.journal')
journal = journal_pool.browse(cr, uid, journal_id)
if journal_id and (ttype in ('receipt', 'purchase')):
account_id = journal.default_debit_account_id
res.update({
'account_id':account_id.id
})
elif journal_id and (ttype in ('payment','sale')) :
account_id = journal.default_credit_account_id
res.update({
'account_id':account_id.id
})
else:
account_id = journal.default_credit_account_id
res.update({
'account_id':account_id.id
})
if journal.type in ('sale', 'purchase') and not ttype:
res.update({
'type':journal.type
@@ -380,99 +429,11 @@ class account_voucher(osv.osv):
'value':res
}
def open_voucher(self, dbcr, uid, ids, context={}):
cr = 0.0
dr = 0.0
total = 0.0
new_line = []
position_pool = self.pool.get('account.fiscal.position')
voucher_pool = self.pool.get('account.voucher')
voucher_line_pool = self.pool.get('account.voucher.line')
partner_pool = self.pool.get('res.partner')
tax_pool = self.pool.get('account.tax')
line_ids = voucher_line_pool.search(dbcr, uid, [('voucher_id','=',ids[0]), ('is_tax','=',True)])
if line_ids:
voucher_line_pool.unlink(dbcr, uid, line_ids)
voucher = voucher_pool.browse(dbcr, uid, ids[0])
if voucher.type in ('sale', 'purchase'):
if voucher.account_id.tax_ids:
if voucher.account_id.tax_ids:
for line in voucher.payment_ids:
if line.amount <= 0:
raise osv.except_osv(_('Invalid amount !'), _('You can not create Pro-Forma voucher with Total amount <= 0 !'))
part = line.partner_id and partner_pool.browse(dbcr, uid, line.partner_id.id) or False
taxes = position_pool.map_tax(dbcr, uid, part and part.property_account_position or False, voucher.account_id.tax_ids)
taxes = tax_pool.browse(dbcr, uid, taxes)
new_price = line.amount
for tax in tax_pool.compute_all(dbcr, uid, taxes, line.amount, 1).get('taxes'):
tax_line = {
'name':"%s / %s" % (line.name, tax.get('name')),
'amount':tax.get('amount'),
'voucher_id': voucher.id,
'is_tax':True,
'ref':tax.get('name')
}
crdr = False
account = False
if voucher.type == 'purchase':
crdr = 'dr'
account = tax.get('account_paid_id')
elif voucher.type == 'sale':
crdr = 'cr'
account = tax.get('account_collected_id', account)
tax_line.update({
'account_id':account or voucher.account_id.id,
'type':crdr
})
new_line += [tax_line]
if new_line:
for line in new_line:
voucher_line_pool.create(dbcr, uid, line)
voucher = voucher_pool.browse(dbcr, uid, ids[0])
for line in voucher.payment_ids:
if line.type == 'cr':
cr += line.amount
else:
dr += line.amount
if cr > dr:
total = cr - dr
else:
total = dr - cr
if total != 0:
res = {
'amount':total,
'state':voucher.state
}
self.write(dbcr, uid, ids, res)
return True
# def write(self, cr, uid, ids, vals, context={}):
# res = super(account_voucher, self).write(cr, uid, ids, vals, context)
#
# #If there is state says that method called from the work flow signals
# if not 'state' in vals.keys():
# self.open_voucher(cr, uid, ids, context)
#
# return res
def voucher_recheck(self, cr, uid, ids, context={}):
self.open_voucher(cr, uid, ids, context)
self.write(cr, uid, ids, {'state':'recheck'}, context)
return True
def proforma_voucher(self, cr, uid, ids, context={}):
self.open_voucher(cr, uid, ids, context)
self.action_move_line_create(cr, uid, ids)
self.write(cr, uid, ids, {'state':'posted'})
return True
@@ -484,19 +445,6 @@ class account_voucher(osv.osv):
self.write(cr, uid, ids, {'state':'draft'})
return True
def audit_pass(self, cr, uid, ids, context={}):
move_pool = self.pool.get('account.move')
result = True
audit_pass = []
for voucher in self.browse(cr, uid, ids):
if voucher.move_id and voucher.move_id.state == 'draft':
result = result and move_pool.button_validate(cr, uid, [voucher.move_id.id])
audit_pass += [voucher.id]
self.write(cr, uid, audit_pass, {'state':'audit'})
return result
def cancel_voucher(self, cr, uid, ids, context={}):
move_pool = self.pool.get('account.move')
voucher_line_pool = self.pool.get('account.voucher.line')
@@ -527,8 +475,27 @@ class account_voucher(osv.osv):
raise osv.except_osv('Invalid action !', 'Cannot delete Voucher(s) which are already opened or paid !')
return super(account_voucher, self).unlink(cr, uid, unlink_ids, context=context)
def action_move_line_create(self, cr, uid, ids, *args):
def onchange_payment(self, cr, uid, ids, pay_now, journal_id, partner_id, ttype):
partner_pool = self.pool.get('res.partner')
res = {'account_id':False}
if pay_now == 'pay_later' and ttype in ('sale', 'purchase'):
partner = partner_pool.browse(cr, uid, partner_id)
if ttype == 'sale':
res.update({
'account_id':partner.property_account_receivable.id,
})
elif ttype == 'purchase':
res.update({
'account_id':partner.property_account_payable.id,
})
return {
'value':res
}
def action_move_line_create(self, cr, uid, ids, *args):
journal_pool = self.pool.get('account.journal')
sequence_pool = self.pool.get('ir.sequence')
move_pool = self.pool.get('account.move')
@@ -536,27 +503,27 @@ class account_voucher(osv.osv):
analytic_pool = self.pool.get('account.analytic.line')
currency_pool = self.pool.get('res.currency')
invoice_pool = self.pool.get('account.invoice')
for inv in self.browse(cr, uid, ids):
if inv.move_id:
continue
if not inv.payment_ids:
raise osv.except_osv(_('Error !'), _('Please define lines on voucher !'))
journal = journal_pool.browse(cr, uid, inv.journal_id.id)
if journal.sequence_id:
name = sequence_pool.get_id(cr, uid, journal.sequence_id.id)
else:
raise osv.except_osv(_('Error !'), _('Please define sequence on journal !'))
ref = False
if inv.type in ('purchase', 'receipt'):
ref = inv.reference
else:
ref = invoice_pool._convert_ref(cr, uid, name)
company_currency = inv.company_id.currency_id.id
diff_currency_p = inv.currency_id.id <> company_currency
@@ -568,12 +535,12 @@ class account_voucher(osv.osv):
'date':inv.date,
'ref':ref
}
if inv.period_id:
move.update({
'period_id': inv.period_id.id
})
move_id = move_pool.create(cr, uid, move)
#create the first line manually
@@ -581,14 +548,15 @@ class account_voucher(osv.osv):
'name':inv.name,
'debit':False,
'credit':False,
'account_id':inv.account_id.id or False,
'account_id':False,
'move_id':move_id ,
'journal_id':inv.journal_id.id,
'period_id':inv.period_id.id,
'partner_id':False,
'partner_id':inv.partner_id.id,
'ref':ref,
'date':inv.date
}
if diff_currency_p:
amount_currency = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, inv.amount)
inv.amount = amount_currency
@@ -597,89 +565,114 @@ class account_voucher(osv.osv):
'currency_id':inv.currency_id.id
})
if inv.type in ('receipt', 'purchase'):
move_line['debit'] = inv.amount
else:
move_line['credit'] = inv.amount
if inv.type == 'sale':
move_line.update({
'account_id':inv.account_id.id,
'debit':inv.amount
})
elif inv.type == 'purchase':
move_line.update({
'account_id':inv.account_id.id,
'credit':inv.amount
})
line_ids = []
line_ids += [move_line_pool.create(cr, uid, move_line)]
rec_ids = []
if inv.type == 'sale' and inv.pay_now == 'pay_now':
if not inv.pay_account_id or not inv.pay_journal_id:
raise osv.except_osv(_('Payment Error !'), _('Please define Payment Journal and Account !'))
#create the payment line manually
for line in inv.payment_ids:
amount=0.0
if inv.type in ('payment'):
ref = line.ref
move_line = {
'name':inv.name,
'debit':inv.pay_amount,
'credit':False,
'account_id':inv.pay_account_id.id or False,
'name':line.name,
'debit':False,
'credit':False,
'account_id':line.account_id.id or False,
'move_id':move_id ,
'journal_id':inv.journal_id.id,
'period_id':inv.period_id.id,
'partner_id':line.partner_id.id or False,
'ref':ref,
'date':inv.date,
'analytic_account_id':False
}
if diff_currency_p:
amount_currency = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, line.amount)
line.amount = amount_currency
move_line.update({
'amount_currency':amount_currency,
'currency_id':inv.currency_id.id
})
if line.account_analytic_id:
move_line.update({
'analytic_account_id':line.account_analytic_id.id
})
if inv.type in ('sale'):
move_line.update({
'credit': line.amount or False
})
if inv.type in ('purchase'):
move_line.update({
'debit': line.amount or False
})
move_line_id = move_line_pool.create(cr, uid, move_line)
line_ids += [move_line_id]
if inv.type in ('payment', 'receipt') and line.move_id:
rec_ids += [move_line_id]
for move_line in line.move_id.line_id:
if line.account_id.id == move_line.account_id.id:
rec_ids += [move_line.id]
if inv.type in ('sale', 'purchase') and inv.tax_amount > 0:
move_line = {
'name':inv.tax_id.name,
'account_id':False,
'move_id':move_id ,
'journal_id':inv.pay_journal_id.id,
'journal_id':inv.journal_id.id,
'period_id':inv.period_id.id,
'partner_id':inv.partner_id.id,
'ref':ref,
'date':inv.date
}
line_ids += [move_line_pool.create(cr, uid, move_line)]
else:
for line in inv.payment_ids:
amount=0.0
account_id = False
if inv.tax_id and inv.tax_id.account_collected_id:
account_id = inv.tax_id.account_collected_id.id
if inv.type == 'sale':
move_line.update({
'credit':inv.tax_amount,
'account_id':account_id and account_id or inv.journal_id.default_credit_account_id.id
})
if inv.type in ('payment'):
ref = line.ref
elif inv.type == 'purchase':
move_line.update({
'debit':inv.tax_amount,
'account_id':account_id and account_id or inv.journal_id.default_debit_account_id.id
})
move_line = {
'name':line.name,
'debit':False,
'credit':False,
'account_id':line.account_id.id or False,
'move_id':move_id ,
'journal_id':inv.journal_id.id,
'period_id':inv.period_id.id,
'partner_id':line.partner_id.id or False,
'ref':ref,
'date':inv.date,
'analytic_account_id':False
}
if diff_currency_p:
amount_currency = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, line.amount)
line.amount = amount_currency
move_line.update({
'amount_currency':amount_currency,
'currency_id':inv.currency_id.id
})
if line.account_analytic_id:
move_line.update({
'analytic_account_id':line.account_analytic_id.id
})
if line.type == 'dr':
move_line.update({
'debit': line.amount or False
})
amount = line.amount
elif line.type == 'cr':
move_line.update({
'credit': line.amount or False
})
amount = line.amount
move_line_id = move_line_pool.create(cr, uid, move_line)
line_ids += [move_line_id]
move_line_id = move_line_pool.create(cr, uid, move_line)
line_ids += [move_line_id]
if rec_ids:
move_line_pool.reconcile_partial(cr, uid, rec_ids)
rec = {
'move_id': move_id,
'move_id': move_id
}
message = _('Voucher ') + " '" + inv.name + "' "+ _("is confirmed")
message = _('Voucher ') + " '" + inv.name + "' "+ _("is confirm")
self.log(cr, uid, inv.id, message)
self.write(cr, uid, [inv.id], rec)
move_pool.post(cr, uid, [move_id], context={})
@@ -688,39 +681,11 @@ class account_voucher(osv.osv):
def _convert_ref(self, cr, uid, ref):
return (ref or '').replace('/','')
# def name_get(self, cr, uid, ids, context={}):
# if not len(ids):
# return []
# types = {
# 'pay_voucher': 'CPV: ',
# 'rec_voucher': 'CRV: ',
# 'cont_voucher': 'CV: ',
# 'bank_pay_voucher': 'BPV: ',
# 'bank_rec_voucher': 'BRV: ',
# 'journal_sale_vou': 'JSV: ',
# 'journal_pur_voucher': 'JPV: ',
# 'journal_voucher':'JV'
# }
# return [(r['id'], types[r['type']]+(r['number'] or '')+' '+(r['name'] or '')) for r in self.read(cr, uid, ids, ['type', 'number', 'name'], context, load='_classic_write')]
# def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
# if not args:
# args=[]
# if not context:
# context={}
# ids = []
# if name:
# ids = self.search(cr, user, [('number','=',name)]+args, limit=limit, context=context)
# if not ids:
# ids = self.search(cr, user, [('name',operator,name)]+args, limit=limit, context=context)
# return self.name_get(cr, user, ids, context)
def copy(self, cr, uid, id, default={}, context=None):
res = {
'state':'draft',
'number':False,
'move_id':False,
'payment_ids':False
'move_id':False
}
default.update(res)
if 'date' not in default:
@@ -771,7 +736,7 @@ class account_voucher_line(osv.osv):
_columns = {
'voucher_id':fields.many2one('account.voucher', 'Voucher'),
'name':fields.related('voucher_id', 'name', size=256, type='char', string='Memo'),
'name':fields.related('voucher_id', 'name', size=256, type='char', string='Description'),
'account_id':fields.many2one('account.account','Account', required=True, domain=[('type','<>','view')]),
'partner_id':fields.related('voucher_id', 'partner_id', type='many2one', relation='res.partner', string='Partner'),
'amount':fields.float('Amount'),
@@ -780,112 +745,15 @@ class account_voucher_line(osv.osv):
'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account'),
'is_tax':fields.boolean('Tax ?', required=False),
'stype':fields.selection([('service','Service'),('other','Other')], 'Product Type'),
'move_line_id': fields.many2one('account.move.line', 'Journal Item'),
'date_original': fields.date('Date', readonly="1"), #fields.related account.move.line
'date_due': fields.date('Due Date', readonly="1"), #fields.related account.move.line
'amount_original': fields.float('Originial Amount', readonly="1"), #fields.related account.move.line
'amount_unreconciled': fields.float('Open Balance', readonly="1"), #fields.related account.move.line
'move_id' : fields.many2one('account.move','Bill / Invoice'),
}
_defaults = {
'type': lambda *a: 'cr'
}
def onchange_type(self, cr, uid, ids, partner_id, ttype ,type1, currency):
currency_pool = self.pool.get('res.currency')
company = self.pool.get('res.users').browse(cr, uid, uid).company_id
vals = {
'account_id': False,
'type': False ,
'amount': False
}
if not partner_id:
return {
'value':vals
}
partner_pool = self.pool.get('res.partner')
account_id = False
partner = partner_pool.browse(cr, uid, partner_id)
balance = 0.0
if ttype == 'cr' and type1 in ('receipt'):
account_id = partner.property_account_receivable.id
balance = partner.credit
elif ttype == 'dr' and type1 in ('payment'):
account_id = partner.property_account_payable.id
balance = partner.debit
elif ttype == 'dr' and type1 in ('sale'):
account_id = partner.property_account_receivable.id
elif ttype == 'cr' and type1 in ('purchase'):
account_id = partner.property_account_payable.id
if company.currency_id != currency:
balance = currency_pool.compute(cr, uid, company.currency_id.id, currency, balance)
vals.update({
'account_id': account_id,
'type': ttype,
'amount':balance
})
return {
'value':vals
}
def onchange_partner(self, cr, uid, ids, partner_id, ttype ,type1, currency):
currency_pool = self.pool.get('res.currency')
company = self.pool.get('res.users').browse(cr, uid, uid).company_id
vals = {
'account_id': False,
'type': False ,
'amount': False
}
if not partner_id:
return {
'value':vals
}
partner_pool = self.pool.get('res.partner')
account_id = False
partner = partner_pool.browse(cr, uid, partner_id)
balance = 0.0
if type1 in ('receipt'):
account_id = partner.property_account_receivable.id
balance = partner.credit
ttype = 'cr'
elif type1 in ('payment'):
account_id = partner.property_account_payable.id
balance = -partner.debit
ttype = 'dr'
elif type1 in ('sale'):
account_id = partner.property_account_receivable.id
ttype = 'dr'
elif type1 in ('purchase'):
account_id = partner.property_account_payable.id
ttype = 'cr'
if company.currency_id != currency:
balance = currency_pool.compute(cr, uid, company.currency_id.id, currency, balance)
if ttype == 'dr' and balance:
balance = -balance
vals.update({
'account_id': account_id,
'type': ttype,
'amount':balance
})
return {
'value':vals
}
account_voucher_line()
addons/account_voucher/voucher_payment_receipt_view.xml
+28 -13
View File
@@ -77,36 +77,51 @@
<field name="arch" type="xml">
<form string="Sales Payment">
<group col="6" colspan="4">
<field name="partner_id" on_change="onchange_partner_id(partner_id, type)"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id, type)" string="Customer"/>
<field name="journal_id"
domain="[('type','in',['bank', 'cash'])]"
widget="selection" select="1"
on_change="onchange_journal(journal_id,type)"
string="Payment Method"/>
<field name="amount" readonly="0"/>
<field name="reference" select="1" string="Payment Ref"/>
<field name="name" colspan="4"/>
<field name="journal_id" domain="[('type','in',['bank', 'cash'])]" widget="selection" select="1" on_change="onchange_journal(journal_id,type)"/>
<field name="account_id" domain="[('type','=','other')]" widget="selection" on_change="onchange_account(account_id)" readonly="1"/>
<field name="number"/>
<field name="period_id" invisible="1"/>
<field name="account_id"
domain="[('type','=','other')]"
widget="selection"
on_change="onchange_account(account_id)"
invisible="1"/>
</group>
<notebook colspan="4">
<page string="Payment Information">
<field name="payment_ids" colspan="4" nolabel="1" height="180">
<tree string="Payment Lines" editable="top">
<field name="ref" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
<field name="amount"/>
<field name="move_line_id"/>
<field name="account_id"/>
<field name="type" on_change="onchange_type(parent.partner_id,type,parent.type, parent.currency_id)"/>
<field name="account_analytic_id"/>
<field name="date_original"/>
<field name="date_due"/>
<field name="amount_original"/>
<field name="amount_unreconciled" sum="Open Balance"/>
<field name="amount" sum="Payment"/>
</tree>
</field>
<group col="2" colspan="3">
<separator string="Narration" colspan="2"/>
<separator string="Internal Notes" colspan="2"/>
<field name="narration" colspan="2" nolabel="1"/>
</group>
<group col="2" colspan="1">
<separator string="Other Information" colspan="2"/>
<field name="reference" select="1"/>
<field name="date" select="1" on_change="onchange_date(date)"/>
<field name="currency_id" select="1" attrs="{'readonly':[('type','in',['sale', 'purchase'])]}"/>
<field name="type" on_change="onchange_journal(journal_id,type)"/>
<field name="currency_id" select="1"
attrs="{'readonly':[('type','in',['sale', 'purchase'])]}"/>
<field name="number"/>
<field name="type" on_change="onchange_journal(journal_id,type)" invisible="1"/>
</group>
</page>
<page string="Journal Items">
<page string="Journal Items" groups="base.group_extended">
<group col="6" colspan="4">
<field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
<field name="period_id"/>
addons/account_voucher/voucher_sales_purchase_view.xml
+22 -21
View File
@@ -8,22 +8,22 @@
<field name="arch" type="xml">
<form string="Sales Receipt">
<group col="6" colspan="4">
<field name="partner_id" on_change="onchange_partner_id(partner_id, type)"/>
<field name="name" colspan="4"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id, type)" string="Customer"/>
<field name="journal_id" domain="[('type','=','sale')]" widget="selection" select="1" on_change="onchange_journal(journal_id,type)"/>
<field name="account_id" domain="[('type','=','other')]" widget="selection" on_change="onchange_account(account_id)"/>
<field name="number"/>
<field name="name" colspan="4"/>
<field name="date" select="1" on_change="onchange_date(date)"/>
<field name="type" on_change="onchange_journal(journal_id,type)" invisible="True"/> <!-- Type is given by menu, not by journal ? yes-->
<field name="period_id" invisible="True"/>
</group>
<notebook colspan="4">
<page string="Sales Information">
<field name="payment_ids" colspan="4" nolabel="1" height="180">
<tree string="Sales Lines" editable="top">
<field name="stype" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
<field name="ref" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
<field name="amount" />
<field name="account_id"/>
<field name="type" on_change="onchange_type(parent.partner_id,type,parent.type, parent.currency_id)"/>
<field name="account_analytic_id"/>
<field name="account_id" widget="selection"/>
<field name="name"/>
<field name="amount" sum="Total"/>
<field name="account_analytic_id" groups="base.group_extended"/>
</tree>
</field>
<group col="2" colspan="3">
@@ -33,22 +33,23 @@
<group col="2" colspan="1">
<group col="2" colspan="1">
<separator string="Payment Options" colspan="2"/>
<field name="pay_now"/>
<field name="pay_journal_id" on_change="onchange_pay_journal(pay_journal_id,type)" attrs="{'readonly': [('pay_now','=','pay_later')], 'required': [('pay_now','=','pay_now')]}"/>
<field name="pay_account_id" attrs="{'readonly': [('pay_now','=','pay_later')], 'required': [('pay_now','=','pay_now')]}"/>
<field name="pay_amount" attrs="{'readonly': [('pay_now','=','pay_later')], 'required': [('pay_now','=','pay_now')]}"/>
<field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id, type)" required="1"/>
<field name="account_id"
attrs="{'invisible':[('type','!=','view'),('pay_now','!=','pay_now')]}"
domain="[('type','in',['other'])]"/>
<!-- should select income accounts only. Or use the journal for this ? -->
<field name="reference"
attrs="{'invisible':[('pay_now','!=','pay_now')]}"
/>
</group>
<group col="2" colspan="1">
<separator string="Other Information" colspan="2"/>
<field name="reference" select="1"/>
<field name="tax_id"/>
<field name="amount"/>
<field name="date" select="1" on_change="onchange_date(date)"/>
<field name="type" on_change="onchange_journal(journal_id,type)"/>
<group col="3" colspan="1">
<separator string="Total" colspan="3"/>
<field name="tax_id" widget="selection" domain="[('type_tax_use','=','sale')]" on_change="onchange_tax_id(amount, tax_id)"/><field name="tax_amount" nolabel="1"/>
<label string="" colspan="1"/><field name="amount" string="Total"/>
</group>
</group>
</page>
<page string="Journal Items">
<page string="Journal Items" groups="base.group_extended">
<group col="6" colspan="4">
<field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
<field name="period_id"/>
addons/account_voucher/voucher_view.xml
+9 -10
View File
@@ -12,7 +12,6 @@
<field name="reference"/>
<field name="partner_id"/>
<field name="journal_id"/>
<field name="type" invisible=" not context.get('set_visible',True)"/>
<field name="account_id"/>
<field name="amount" sum="Total Amount"/>
<field name="period_id"/>
@@ -46,7 +45,7 @@
<field name="type" on_change="onchange_type(parent.partner_id,type,parent.type, parent.currency_id)"/>
<field name="amount"/>
<field name="ref"/>
<field name="account_analytic_id"/>
<field name="account_analytic_id" domain="[('parent_id','!=',False)]"/>
</tree>
</field>
<group col="2" colspan="3">
@@ -109,13 +108,13 @@
<separator orientation="vertical"/>
<field name="number" select='1'/>
<field name="account_id" select="1"/>
<field name="partner_id" select='1'/>
<field name="partner_id" select='1'/>
<field name="date" select='1'/>
</group>
<newline/>
<group col='8' colspan='4'>
<field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" />
<field name="period_id" context="{'period_id': self}" groups="base.group_extended"/>
<field name="period_id" context="{'period_id': self}" groups="base.group_extended"/>
</group>
<newline/>
<group expand="0" string="Group By..." col='8' colspan='4'>
@@ -156,7 +155,7 @@
<newline/>
<group col='8' colspan='4'>
<field name="journal_id" widget="selection" select="1"/>
<field name="period_id" select="1"/>
<field name="period_id" select="1"/>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="12" col="10">
@@ -187,7 +186,7 @@
</graph>
</field>
</record>
<!-- Receipt Vouchers -->
<!-- <record model="ir.actions.act_window" id="action_receipt_vou_voucher_list">-->
<!-- <field name="name">Sales Receipt</field>-->
@@ -256,7 +255,7 @@
<!-- <menuitem action="action_cheque_register" -->
<!-- id="menu_action_cheque_register" -->
<!-- parent="account.menu_finance_receivables"/>-->
<!-- <record id="action_cheque_pay" model="ir.actions.act_window">-->
<!-- <field name="name">Vendor Payment</field>-->
<!-- <field name="type">ir.actions.act_window</field>-->
@@ -271,7 +270,7 @@
<!-- <menuitem action="action_cheque_pay" -->
<!-- id="menu_action_cheque_pay" -->
<!-- parent="account.menu_finance_payables"/>-->
<!-- <record id="action_cheque_pay_voucher" model="ir.actions.act_window">-->
<!-- <field name="name">Cheques</field>-->
<!-- <field name="type">ir.actions.act_window</field>-->
@@ -286,7 +285,7 @@
<!-- <menuitem action="action_cheque_pay_voucher" -->
<!-- id="menu_action_cheque_pay_voucher" -->
<!-- parent="account.menu_finance_bank_and_cash"/>-->
<record model="ir.ui.view" id="view_account_journal_form_inherit">
<field name="name">account.journal.form.inherit</field>
<field name="model">account.journal</field>
@@ -306,7 +305,7 @@
context="{'journal_id': active_id, 'type':type}"
res_model="account.voucher"
src_model="account.journal"/>
<record model="ir.actions.act_window" id="action_review_voucher_list">
<field name="name">Vouchers Entries</field>
<field name="res_model">account.voucher</field>
addons/account_voucher_payment/account_voucher_payment_view.xml
+2 -1
View File
@@ -2,6 +2,7 @@
<openerp>
<data>
<!--
<record id="view_vendor_payment_form_inherit" model="ir.ui.view">
<field name="name">account.voucher.form.inherit</field>
<field name="model">account.voucher</field>
@@ -43,7 +44,7 @@
</field>
</field>
</record>
-->
<record model="ir.ui.view" id="view_vendor_payment_form_unreconcile">
<field name="name">account.voucher.form.payment.unreconcile</field>
<field name="model">account.voucher</field>
addons/analytic_journal_billing_rate/i18n/tr.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:22+0000\n"
"PO-Revision-Date: 2010-08-19 05:41+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
addons/analytic_user_function/i18n/tr.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:13+0000\n"
"PO-Revision-Date: 2010-08-19 05:45+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
addons/auction/auction_demo.xml
+6 -6
View File
@@ -11,7 +11,7 @@
<record model="account.account" id="auction_income_view">
<field name="name">Auction Adjudications</field>
<field name="code">0</field>
<field name="code">A0</field>
<field name="type">view</field>
<field name="currency_id" search="[('name','=','EUR')]"/>
<field name="parent_id" eval="0">
@@ -22,7 +22,7 @@
<record model="account.account" id="auction_expense_view">
<field name="name">Auction Adjudication Expenses</field>
<field name="code">1</field>
<field name="code">A1</field>
<field name="type">view</field>
<field name="currency_id" search="[('name','=','EUR')]"/>
<field name="parent_id" eval="0">
@@ -33,7 +33,7 @@
<record model="account.account" id="auction_income">
<field name="name">Auction Adjudications</field>
<field name="code">7x*</field>
<field name="code">A7x*</field>
<field name="user_type" ref="account.account_type_income"/>
<field name="type">receivable</field>
<field name="currency_id" search="[('name','=','EUR')]"/>
@@ -42,7 +42,7 @@
<record model="account.account" id="auction_expense">
<field name="name">Auction Adjudication Expenses</field>
<field name="code">6x*</field>
<field name="code">A6x*</field>
<field name="user_type" ref="account.account_type_expense"/>
<field name="type">payable</field>
<field name="currency_id" search="[('name','=','EUR')]"/>
@@ -51,7 +51,7 @@
<record model="account.account" id="auction_income_costs">
<field name="name">Auction Buyer Costs</field>
<field name="code">8x*</field>
<field name="code">A8x*</field>
<field name="type">payable</field>
<field name="currency_id" search="[('name','=','EUR')]"/>
<field name="parent_id" eval="auction_income_view"/>
@@ -59,7 +59,7 @@
</record>
<record model="account.account" id="auction_expense_costs">
<field name="name">Auction Seller Costs</field>
<field name="code">9x*</field>
<field name="code">A9x*</field>
<field name="type">receivable</field>
<field name="currency_id" search="[('name','=','EUR')]"/>
<field name="parent_id" eval="auction_expense_view"/>
addons/auction/i18n/lt.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:13+0000\n"
"PO-Revision-Date: 2010-08-19 05:48+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
addons/auction/i18n/nl.po
+3 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:36+0000\n"
"Last-Translator: vra (openerp) <Unknown>\n"
"PO-Revision-Date: 2010-08-19 05:51+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
addons/auction/i18n/tr.po
+3 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:02+0000\n"
"Last-Translator: vra (openerp) <Unknown>\n"
"PO-Revision-Date: 2010-08-19 05:50+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
addons/audittrail/i18n/lt.po
+3 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:23+0000\n"
"Last-Translator: vra (openerp) <Unknown>\n"
"PO-Revision-Date: 2010-08-19 05:55+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
addons/audittrail/i18n/tr.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:06+0000\n"
"PO-Revision-Date: 2010-08-19 05:39+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
addons/audittrail/i18n/zh_CN.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:25+0000\n"
"PO-Revision-Date: 2010-08-19 05:39+0000\n"
"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
addons/audittrail/security/audittrail_security.xml
-3
View File
@@ -2,9 +2,6 @@
<openerp>
<data noupdate="0">
<!-- Set access to menu -->
<record id="menu_action_audittrail" model="ir.ui.menu">
<field eval="[(6,0,[ref('base.group_system')])]" name="groups_id"/>
</record>
</data>
</openerp>
addons/base_action_rule/base_action_rule.py
+15 -2
View File
@@ -111,6 +111,8 @@ the rule to mark CC(mail to any other person defined in actions)."),
\nNote: This is case sensitive search."),
'server_action_id': fields.many2one('ir.actions.server', 'Server Action', help="Describes the action name.\neg:on which object which action to be taken on basis of which condition"),
'filter_id':fields.many2one('ir.filters', 'Filter', required=False),
'act_email_from' : fields.char('Email From', size=64, required=False,
help="Use a python expression to specify the right field on which one than we will use for the 'From' field of the header"),
}
_defaults = {
@@ -228,7 +230,7 @@ the rule to mark CC(mail to any other person defined in actions)."),
}
return self.format_body(body % data)
def email_send(self, cr, uid, obj, emails, body, emailfrom=tools.config.get('email_from', False), context={}):
def email_send(self, cr, uid, obj, emails, body, emailfrom=None, context=None):
""" send email
@param self: The object pointer
@param cr: the current row, from the database cursor,
@@ -236,6 +238,13 @@ the rule to mark CC(mail to any other person defined in actions)."),
@param email: pass the emails
@param emailfrom: Pass name the email From else False
@param context: A standard dictionary for contextual values """
if not emailfrom:
emailfrom = tools.config.get('email_from', False)
if context is None:
context = {}
body = self.format_mail(obj, body)
if not emailfrom:
if hasattr(obj, 'user_id') and obj.user_id and obj.user_id.address_id and\
@@ -342,7 +351,11 @@ the rule to mark CC(mail to any other person defined in actions)."),
emails = filter(None, emails)
if len(emails) and action.act_mail_body:
emails = list(set(emails))
self.email_send(cr, uid, obj, emails, action.act_mail_body)
email_from = eval(action.act_email_from, {
'user' : self.pool.get('res.users').browse(cr, uid, uid, context=context),
'obj' : obj,
})
self.email_send(cr, uid, obj, emails, action.act_mail_body, emailfrom=email_from)
return True
def _action(self, cr, uid, ids, objects, scrit=None, context={}):
addons/base_action_rule/base_action_rule_view.xml
+2 -1
View File
@@ -2,7 +2,7 @@
<openerp>
<data>
<menuitem id="base.menu_base_action_rule" name="Automated Actions"
groups="base.group_extended,base.group_system"
groups="base.group_extended"
parent="base.menu_base_config" sequence="3" />
<!--
@@ -64,6 +64,7 @@
<field name="act_reply_to" attrs="{'required':[('act_remind_user','=',True)]}"/>
</group>
<separator colspan="4" string="Email Information"/>
<field name="act_email_from" />
<field name="act_mail_to_user"/>
<field colspan="4" name="act_mail_to_email"/>
<field name="act_mail_to_watchers"/>
addons/base_calendar/base_calendar.py
+2 -1
View File
@@ -1559,7 +1559,8 @@ true, it will allow you to hide the event alarm information without removing it.
# Remove one of the recurrent event
date_new = time.strftime("%Y%m%dT%H%M%S", \
time.strptime(date_new, "%Y%m%d%H%M%S"))
res = self.write(cr, uid, event_id, {'exdate': date_new})
exdate = (record['exdate'] and (record['exdate'] + ',') or '') + date_new
res = self.write(cr, uid, event_id, {'exdate': exdate})
else:
res = super(calendar_event, self).unlink(cr, uid, event_id)
self.pool.get('res.alarm').do_alarm_unlink(cr, uid, event_id, self._name)
addons/base_contact/i18n/lt.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:14+0000\n"
"PO-Revision-Date: 2010-08-19 05:48+0000\n"
"Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: lt\n"
addons/base_contact/i18n/tr.po
+3 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:12+0000\n"
"Last-Translator: vra (openerp) <Unknown>\n"
"PO-Revision-Date: 2010-08-19 05:55+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_contact
addons/base_contact/i18n/zh_CN.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:19+0000\n"
"PO-Revision-Date: 2010-08-19 05:53+0000\n"
"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_contact
addons/base_iban/i18n/tr.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:18+0000\n"
"PO-Revision-Date: 2010-08-19 05:53+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_iban
addons/base_module_quality/i18n/tr.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:13+0000\n"
"PO-Revision-Date: 2010-08-19 05:49+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_module_quality
addons/base_module_record/i18n/tr.po
+3 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:03+0000\n"
"Last-Translator: vra (openerp) <Unknown>\n"
"PO-Revision-Date: 2010-08-19 05:39+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_module_record
addons/base_report_creator/i18n/tr.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:12+0000\n"
"PO-Revision-Date: 2010-08-19 05:49+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_report_creator
addons/base_report_designer/i18n/tr.po
+3 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:16+0000\n"
"Last-Translator: vra (openerp) <Unknown>\n"
"PO-Revision-Date: 2010-08-19 05:44+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_report_designer
addons/base_setup/i18n/tr.po
+3 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:06+0000\n"
"Last-Translator: vra (openerp) <Unknown>\n"
"PO-Revision-Date: 2010-08-19 05:50+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_setup
addons/base_vat/i18n/tr.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:33+0000\n"
"PO-Revision-Date: 2010-08-19 05:51+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_vat
addons/board/i18n/tr.po
+3 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:06+0000\n"
"Last-Translator: vra (openerp) <Unknown>\n"
"PO-Revision-Date: 2010-08-19 05:50+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: board
addons/caldav/calendar.py
+19 -16
View File
@@ -274,9 +274,15 @@ class CalDAV(object):
self.__attribute__[name][type] = None
return True
def format_date_tz(self, date, tz=None):
def format_date_tz(self, src_date, tz=None):
""" This function converts date into specifice timezone value
@param src_date: Date to be converted (datetime.datetime)
@return: Converted datetime.datetime object for the date
"""
format = tools.DEFAULT_SERVER_DATETIME_FORMAT
return tools.server_to_local_timestamp(date, format, format, tz)
date_str = src_date.strftime('%Y-%m-%d %H:%M:%S')
res_date = tools.server_to_local_timestamp(date_str, format, format, tz)
return datetime.strptime(res_date, "%Y-%m-%d %H:%M:%S")
def parse_ics(self, cr, uid, child, cal_children=None, context=None):
""" parse calendaring and scheduling information
@@ -292,7 +298,7 @@ class CalDAV(object):
for cal_data in child.getChildren():
if cal_data.name.lower() == 'organizer':
dmail = { 'name': cal_data.params.get('CN', ['',])[0],
'email': cal_data.value.replace('MAILTO:',''),
'email': cal_data.value.lower().replace('mailto:',''),
# TODO: company?
}
self.ical_set(cal_data.name.lower(), mailto2str(dmail), 'value')
@@ -391,6 +397,11 @@ class CalDAV(object):
ical = tz_obj.export_cal(cr, uid, None, \
data[map_field], ical, context=context)
timezones.append(data[map_field])
if vevent.contents.get('recurrence-id'):
# Convert recurrence-id field value accroding to timezone value
recurid_val = vevent.contents.get('recurrence-id')[0].value
vevent.contents.get('recurrence-id')[0].params['TZID'] = [tzval.title()]
vevent.contents.get('recurrence-id')[0].value = self.format_date_tz(recurid_val, tzval.title())
if exfield:
# Set exdates according to timezone value
# This is the case when timezone mapping comes after the exdate mapping
@@ -398,11 +409,8 @@ class CalDAV(object):
exfield.params['TZID'] = [tzval.title()]
exdates_updated = []
for exdate in exdates:
date1 = (datetime.strptime(exdate, "%Y%m%dT%H%M%S")).strftime('%Y-%m-%d %H:%M:%S')
dest_date = self.format_date_tz(date1, tzval.title())
ex_date = (datetime.strptime(dest_date, "%Y-%m-%d %H:%M:%S")).strftime('%Y%m%dT%H%M%S')
exdates_updated.append(ex_date)
exfield.value = map(parser.parse, exdates_updated)
exdates_updated.append(self.format_date_tz(parser.parse(exdate), tzval.title()))
exfield.value = exdates_updated
elif field == 'organizer' and data[map_field]:
organizer = str2mailto(data[map_field])
event_org = vevent.add('organizer')
@@ -421,21 +429,16 @@ class CalDAV(object):
exfield.params['TZID'] = [tzval.title()]
exdates_updated = []
for exdate in exdates:
date1 = (datetime.strptime(exdate, "%Y%m%dT%H%M%S")).strftime('%Y-%m-%d %H:%M:%S')
dest_date = self.format_date_tz(date1, tzval.title())
ex_date = (datetime.strptime(dest_date, "%Y-%m-%d %H:%M:%S")).strftime('%Y%m%dT%H%M%S')
exdates_updated.append(ex_date)
exdates = exdates_updated
exfield.value = map(parser.parse, exdates)
exdates_updated.append(self.format_date_tz(parser.parse(exdate), tzval.title()))
exfield.value = exdates_updated
else:
vevent.add(field).value = tools.ustr(data[map_field])
elif map_type in ('datetime', 'date') and data[map_field]:
dtfield = vevent.add(field)
if tzval:
# Export the date according to the event timezone value
dest_date = self.format_date_tz(data[map_field], tzval.title())
dtfield.params['TZID'] = [tzval.title()]
dtfield.value = parser.parse(dest_date)
dtfield.value = self.format_date_tz(parser.parse(data[map_field]), tzval.title())
else:
dtfield.value = parser.parse(data[map_field])
elif map_type == "timedelta":
addons/crm/crm_opportunity_menu.xml
+10
View File
@@ -30,6 +30,16 @@
<field name="context">{'search_default_user_id':uid,'search_default_current':1, 'default_type': 'opportunity'}</field>
<field name="view_id" ref="crm_case_tree_view_oppor"/>
<field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
<field name="help">Opportunities allows you to track your best deals pipeline: history of
the communication, expected revenues, stage of each opportunity,
excepted closings, etc. Opportunities are usually connected with the
email gateway: new emails may create opportunities and each opportunity
automatically gets the history of the conversation with the customer.
Your teams will be able to plan meeting and phonecalls from
opportunities, to convert opportunities into quotations, to manage
documents related to the opportunity, to track all activities related to
this customer, etc.</field>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor11">
addons/crm/crm_opportunity_view.xml
+9 -3
View File
@@ -45,9 +45,15 @@
<page string="Opportunity">
<group col="4" colspan="2">
<separator colspan="4" string="Contacts"/>
<field name="partner_id" select="1"
on_change="onchange_partner_id(partner_id, email_from)"
colspan="2" />
<group colspan="2">
<field name="partner_id" select="1"
on_change="onchange_partner_id(partner_id, email_from)"
colspan="2" />
<button name="%(action_crm_lead2partner)d"
icon="gtk-index" type="action"
string="Create"
attrs="{'invisible':[('partner_id','!=',False)]}"/>
</group>
<field name="partner_address_id"
string="Contact"
on_change="onchange_partner_address_id(partner_address_id, email_from)"
addons/crm/i18n/fi.po
+3 -3
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-01-05 05:59+0000\n"
"PO-Revision-Date: 2010-08-18 13:23+0000\n"
"Last-Translator: vra (openerp) <Unknown>\n"
"PO-Revision-Date: 2010-08-19 05:45+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Finnish <fi@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
addons/crm/i18n/hr.po
+3 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-01-05 05:59+0000\n"
"PO-Revision-Date: 2010-08-18 13:14+0000\n"
"Last-Translator: vra (openerp) <Unknown>\n"
"PO-Revision-Date: 2010-08-19 05:46+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Vinteh\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
addons/crm/i18n/lt.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-01-05 05:59+0000\n"
"PO-Revision-Date: 2010-08-18 13:20+0000\n"
"PO-Revision-Date: 2010-08-19 05:43+0000\n"
"Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: lt\n"
addons/crm/i18n/pl.po
+3 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-01-05 05:59+0000\n"
"PO-Revision-Date: 2010-08-18 13:24+0000\n"
"Last-Translator: vra (openerp) <Unknown>\n"
"PO-Revision-Date: 2010-08-19 05:47+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
addons/crm/i18n/pt.po
+3 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-01-05 05:59+0000\n"
"PO-Revision-Date: 2010-08-18 13:25+0000\n"
"Last-Translator: vra (openerp) <Unknown>\n"
"PO-Revision-Date: 2010-08-19 05:43+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
addons/crm/i18n/sk.po
+2 -2
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-01-05 05:59+0000\n"
"PO-Revision-Date: 2010-08-18 13:24+0000\n"
"PO-Revision-Date: 2010-08-19 05:46+0000\n"
"Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
"Language-Team: Slovak <sk@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
addons/crm/i18n/tr.po
+3 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-01-05 05:59+0000\n"
"PO-Revision-Date: 2010-08-18 13:14+0000\n"
"Last-Translator: vra (openerp) <Unknown>\n"
"PO-Revision-Date: 2010-08-19 05:42+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
addons/crm/wizard/crm_send_email.py
+2 -2
View File
@@ -104,7 +104,7 @@ class crm_send_new_email(osv.osv_memory):
res_id = hist.res_id
ref_id = hist.ref_id
case = case_pool.browse(cr, uid, res_id, context=context)
emails = [obj.email_to]
emails = re.findall(r'([^ ,<@]+@[^> ,]+)', obj.email_to or '')
email_cc = re.findall(r'([^ ,<@]+@[^> ,]+)', obj.email_cc or '')
emails = filter(None, emails)
body = obj.body
@@ -238,7 +238,7 @@ class crm_send_new_email(osv.osv_memory):
res.update({'email_cc': email_cc})
if 'reply_to' in fields:
if hasattr(case, 'section_id'):
res.update({'reply_to': case.section_id.reply_to})
res.update({'reply_to': case.section_id.reply_to or ''})
if 'state' in fields:
res['state'] = u'pending'
return res
addons/crm_profiling/i18n/tr.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:15+0000\n"
"PO-Revision-Date: 2010-08-19 05:54+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm_profiling
addons/delivery/i18n/ru.po
+3 -3
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:06+0000\n"
"Last-Translator: vra (openerp) <Unknown>\n"
"PO-Revision-Date: 2010-08-19 05:39+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
addons/delivery/i18n/tr.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:07+0000\n"
"PO-Revision-Date: 2010-08-19 05:49+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:46+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
addons/document/document_view.xml
+1
View File
@@ -335,6 +335,7 @@
<field name="name">Document</field>
<field name="view_type">form</field>
<field name="search_view_id" ref="view_attach_filter"/>
<field name="help">Documents give your access to all attached documents; it's a repository of all attached documents (mails, documents attached to a project, etc.)</field>
</record>
<menuitem name="Documents" id="menu_document_doc" parent="knowledge.menu_document" sequence="0"/>
<menuitem
addons/document/i18n/mn.po
+2 -2
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:07+0000\n"
"PO-Revision-Date: 2010-08-19 05:43+0000\n"
"Last-Translator: ub121 <ubs121@gmail.com>\n"
"Language-Team: Mongolian <mn@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: document
addons/document/i18n/ru.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:22+0000\n"
"PO-Revision-Date: 2010-08-19 05:55+0000\n"
"Last-Translator: devcode <klaider@yandex.ru>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: document
addons/document/i18n/tr.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-08-18 13:15+0000\n"
"PO-Revision-Date: 2010-08-19 05:54+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n"
"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: document

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