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-20100818042927-kbtyfhzxwczmrupa
This commit is contained in:
Vir (Open ERP)
2010-08-18 09:59:27 +05:30
parent 9f00ec5d53 ad32f01bae
commit f2b463d102
485 changed files with 4472 additions and 4580 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account_invoice_view.xml
+5 -5
View File
@@ -62,7 +62,7 @@
<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="account.group_account_user"/>
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id" groups="base.group_extended"/>
<newline/>
<field name="price_subtotal"/>
@@ -154,7 +154,7 @@
<field name="number" readonly="1"/>
<field name="type" invisible="1"/>
<field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
<button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}"/>
<button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
<newline/>
<field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0}"/>
<field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
@@ -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"/>
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id" groups="base.group_extended"/>
<field name="quantity"/>
<field name="price_unit"/>
<!-- Removed if subtotal is set -->
@@ -263,7 +263,7 @@
<field name="number"/>
<field name="type" invisible="1"/>
<field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
<button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}"/>
<button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
<newline/>
<field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" groups="base.group_user"/>
<field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
@@ -302,7 +302,7 @@
<field name="state"/>
<field name="residual"/>
<group col="7" colspan="4" groups="base.group_user">
<button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-check"/>
<button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-check" groups="account.group_account_user"/>
<button name="invoice_open" states="draft,proforma2" string="Create" icon="terp-document-new"/>
<button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
<button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="terp-dolar_ok!"/>
addons/account/account_menuitem.xml
+3 -3
View File
@@ -7,7 +7,7 @@
<menuitem id="menu_finance_payables" name="Payables" parent="menu_finance" sequence="2" groups="group_account_user,group_account_manager,base.group_system"/>
<menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="3"/>
<!-- <menuitem id="menu_accounting" name="Accounting" parent="menu_finance" sequence="5"/>-->
<menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8"/>
<menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user,group_account_manager,base.group_system"/>
<menuitem id="periodical_processing_journal_entries_validation" name="Draft Entries" parent="menu_finance_periodical_processing" groups="group_account_user,group_account_manager,base.group_system"/>
<menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
<!-- <menuitem id="periodical_processing_recurrent_entries" name="Recurrent Entries" parent="menu_finance_periodical_processing"/>-->
@@ -20,8 +20,8 @@
<menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
<menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="13" groups="base.group_system"/>
<menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
<menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration"/>
<menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts"/>
<menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration" groups="base.group_extended"/>
<menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts" groups="base.group_extended"/>
<menuitem id="menu_low_level" name="Low Level" parent="menu_finance_accounting" groups="base.group_extended"/>
<menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration"/>
<menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>
addons/account/account_move_line.py
+1 -1
View File
@@ -455,7 +455,7 @@ class account_move_line(osv.osv):
'invoice': fields.function(_invoice, method=True, string='Invoice',
type='many2one', relation='account.invoice', fnct_search=_invoice_search),
'account_tax_id':fields.many2one('account.tax', 'Tax'),
'analytic_account_id' : fields.many2one('account.analytic.account', 'Analytic Account'),
'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account'),
#TODO: remove this
'amount_taxed':fields.float("Taxed Amount", digits_compute=dp.get_precision('Account')),
'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True)
addons/account/account_view.xml
+19 -15
View File
@@ -113,7 +113,7 @@
<field name="model">account.period</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree colors="blue:state in ('draft');gray:state in ('done') " string="Period">
<tree colors="blue:state in ('draft');gray:state in ('done') " string="Period">
<field name="code"/>
<field name="name"/>
<field name="date_start"/>
@@ -895,7 +895,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"/>
<field name="analytic_account_id" groups="base.group_extended"/>
<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"/>
@@ -970,15 +970,15 @@
<field name="blocked"/>
</group>
<group col="2" colspan="2">
<group col="2" colspan="2" groups="base.group_extended">
<separator colspan="2" string="Analytic"/>
<field name="analytic_account_id"/>
<field name="analytic_account_id" groups="base.group_extended"/>
</group>
<separator string="Narration" colspan="4"/>
<field name="narration" colspan="4" nolabel="1"/>
</page>
<page string="Analytic Lines">
<field colspan="4" name="analytic_lines" nolabel="1" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
<page string="Analytic Lines" groups="base.group_extended">
<field colspan="4" name="analytic_lines" nolabel="1" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}" groups="base.group_extended"/>
</page>
</notebook>
</form>
@@ -1017,15 +1017,15 @@
<field name="blocked" select="3"/>
<newline/>
<field name="account_tax_id" domain="[('parent_id','=',False)]"/>
<field name="analytic_account_id"/>
<field name="analytic_account_id" groups="base.group_extended"/>
<separator colspan="4" string="State"/>
<newline/>
<field name="reconcile_id"/>
<field name="reconcile_partial_id"/>
<field name="state"/>
</page>
<page string="Analytic Lines">
<field colspan="4" name="analytic_lines" nolabel="1"/>
<page string="Analytic Lines" groups="base.group_extended">
<field colspan="4" name="analytic_lines" nolabel="1" groups="base.group_extended"/>
</page>
</notebook>
</form>
@@ -1243,15 +1243,15 @@
<field name="blocked"/>
</group>
<group col="2" colspan="2">
<group col="2" colspan="2" groups="base.group_extended">
<separator colspan="2" string="Analytic"/>
<field name="analytic_account_id"/>
<field name="analytic_account_id" groups="base.group_extended"/>
</group>
<separator string="Narration" colspan="4"/>
<field name="narration" colspan="4" nolabel="1"/>
</page>
<page string="Analytic Lines">
<field colspan="4" name="analytic_lines" nolabel="1" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
<page string="Analytic Lines" groups="base.group_extended">
<field colspan="4" name="analytic_lines" nolabel="1" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}" groups="base.group_extended"/>
</page>
</notebook>
</form>
@@ -1264,7 +1264,7 @@
<field name="date_maturity"/>
<field name="debit" sum="Total Debit"/>
<field name="credit" sum="Total Credit"/>
<field name="analytic_account_id"/>
<field name="analytic_account_id" 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"/>
@@ -1356,6 +1356,10 @@
res_model="account.move.line"
src_model="account.move"/>
<record id="account.act_account_move_to_account_move_line_open" model="ir.actions.act_window">
<field eval="[(6,0,[ref('account.group_accounting_accountant')])]" name="groups_id"/>
</record>
<!-- <record id="action_move_to_review" model="ir.actions.act_window">-->
<!-- <field name="name">Journal Entries</field>-->
<!-- <field name="type">ir.actions.act_window</field>-->
@@ -1906,7 +1910,7 @@
<field name="debit" sum="Total debit"/>
<field name="credit" sum="Total credit"/>
<field name="account_tax_id"/>
<field name="analytic_account_id"/>
<field name="analytic_account_id" groups="base.group_extended"/>
<field name="state"/>
</tree>
</field>
addons/account/board_account_view.xml
+1 -1
View File
@@ -49,7 +49,7 @@
<field name="view_id" ref="board_account_form"/>
</record>
<menuitem id="menu_dashboard_acc" name="Dashboard" sequence="2" parent="account.menu_finance_reporting"/>
<menuitem id="menu_dashboard_acc" name="Dashboard" sequence="2" parent="account.menu_finance_reporting" groups="group_account_user,group_account_manager,base.group_system"/>
<menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="menu_dashboard_acc" sequence="1"/>
<menuitem icon="terp-account" id="account.menu_finance" name="Accounting" sequence="13" action="open_board_account"/>
</data>
addons/account/i18n/da.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-15 12:23+0000\n"
"PO-Revision-Date: 2010-08-16 09:43+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-16 06:44+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 06:58+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/de.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-15 10:07+0000\n"
"PO-Revision-Date: 2010-08-16 09: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-16 06:44+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 06:58+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/hu.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-15 11:44+0000\n"
"PO-Revision-Date: 2010-08-16 09:46+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-16 06:44+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 06:58+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/it.po
+99 -80
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-15 12:30+0000\n"
"Last-Translator: eLBati - albatos.com <lorenzo.battistini@albatos.com>\n"
"PO-Revision-Date: 2010-08-16 13:11+0000\n"
"Last-Translator: Nicola Riolini - Micronaet <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-16 06:44+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 06:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -389,7 +389,7 @@ msgstr "Descrizione della Fattura"
#. module: account
#: constraint:account.analytic.account:0
msgid "Error! You can not create recursive analytic accounts."
msgstr ""
msgstr "Errore! Non puoi creare account analitici ricorsivi"
#. module: account
#: field:account.bank.statement.reconcile,total_entry:0
@@ -436,7 +436,7 @@ msgstr "Negativo"
#. module: account
#: rml:account.partner.balance:0
msgid "(Account/Partner) Name"
msgstr ""
msgstr "Nome (Conto/Partner)"
#. module: account
#: selection:account.move,type:0
@@ -622,6 +622,8 @@ msgid ""
"The sequence field is used to order the resources from lower sequences to "
"higher ones"
msgstr ""
"Il campo \"sequenza\" è usato per ordinare le risorse dalla sequenza minote "
"alla maggiore"
#. module: account
#: wizard_view:account.analytic.account.chart,init:0
@@ -712,7 +714,7 @@ msgstr "Resi da clienti"
#. module: account
#: wizard_view:account.analytic.account.chart,init:0
msgid "Select the Period for Analysis"
msgstr ""
msgstr "Seleziona il periodo per l'analisi"
#. module: account
#: field:account.tax,ref_tax_sign:0
@@ -725,7 +727,7 @@ msgstr ""
#. module: account
#: help:res.partner,credit:0
msgid "Total amount this customer owes you."
msgstr ""
msgstr "Importo totale che questo cliente vi deve"
#. module: account
#: view:account.move.line:0
@@ -838,6 +840,8 @@ msgid ""
"These types are defined according to your country. The type contain more "
"information about the account and it's specificities."
msgstr ""
"Questi tipi sono definiti a seconda della tua nazione. I tipi contengono più "
"informazioni circa il conto e la sua specificità"
#. module: account
#: selection:account.automatic.reconcile,init,power:0
@@ -959,12 +963,12 @@ msgstr "Data finale"
#. module: account
#: field:account.invoice.tax,base_amount:0
msgid "Base Code Amount"
msgstr ""
msgstr "Importo codice base"
#. module: account
#: help:account.journal,user_id:0
msgid "The user responsible for this journal"
msgstr ""
msgstr "L'utente responsabile per questo giornale"
#. module: account
#: field:account.journal,default_debit_account_id:0
@@ -1139,7 +1143,7 @@ msgstr "Nuovo conto analitico"
#: 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 "Modelli di \"posizioni fiscali\""
#. module: account
#: rml:account.invoice:0
@@ -1150,7 +1154,7 @@ msgstr "Prezzo unitario"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "Period from :"
msgstr ""
msgstr "Periodo che va da:"
#. module: account
#: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -1171,7 +1175,7 @@ msgstr "L'importo espresso in un'altra valuta opzionale"
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
msgstr ""
msgstr "Modelli di \"posizioni fiscali\""
#. module: account
#: field:account.payment.term,line_ids:0
@@ -1192,7 +1196,7 @@ msgstr "Apri conti"
#. module: account
#: wizard_view:account.fiscalyear.close.state,init:0
msgid "Are you sure you want to close the fiscal year ?"
msgstr ""
msgstr "Sei sicuro di voler chiudere l'anno fiscale?"
#. module: account
#: selection:account.move,type:0
@@ -1207,7 +1211,7 @@ msgstr "Conto bancario"
#. module: account
#: field:account.chart.template,tax_template_ids:0
msgid "Tax Template List"
msgstr ""
msgstr "Lista modelli di tasse"
#. module: account
#: model:process.transition,name:account.process_transition_invoiceimport0
@@ -1242,7 +1246,7 @@ msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
msgid "Parent Analytic Account"
msgstr ""
msgstr "Conto Analitico Padre"
#. module: account
#: wizard_button:account.move.line.reconcile,init_partial,addendum:0
@@ -1282,7 +1286,7 @@ msgstr "Importo fissato"
#. module: account
#: rml:account.analytic.account.analytic.check:0
msgid "Analytic Credit"
msgstr ""
msgstr "Credito analitico"
#. module: account
#: field:account.move.line,reconcile_partial_id:0
@@ -1333,12 +1337,12 @@ msgstr "Chiusura Anno Fiscale"
#. module: account
#: field:account.journal,centralisation:0
msgid "Centralised counterpart"
msgstr ""
msgstr "Contropartita centralizzata"
#. module: account
#: view:wizard.company.setup:0
msgid "Message"
msgstr ""
msgstr "Messaggio"
#. module: account
#: model:process.node,note:account.process_node_supplierpaymentorder0
@@ -1371,7 +1375,7 @@ msgstr "Voci analitiche"
#. module: account
#: help:account.tax,type:0
msgid "The computation method for the tax amount."
msgstr ""
msgstr "Il metodo di calcolo per l'importo delle tasse"
#. module: account
#: model:process.node,note:account.process_node_accountingentries0
@@ -1405,7 +1409,7 @@ msgstr "Voci tassa"
#. module: account
#: field:ir.sequence,fiscal_ids:0
msgid "Sequences"
msgstr ""
msgstr "Sequenze"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_type_form
@@ -1439,12 +1443,12 @@ msgstr "Libro Giornale"
#: field:account.account,child_id:0
#: field:account.analytic.account,child_ids:0
msgid "Child Accounts"
msgstr ""
msgstr "Conto figlio"
#. module: account
#: field:account.account,check_history:0
msgid "Display History"
msgstr ""
msgstr "Mostra lo storico"
#. module: account
#: wizard_field:account.third_party_ledger.report,init,date1:0
@@ -1455,7 +1459,7 @@ msgstr " Data d'inizio"
#: wizard_field:account.account.balance.report,checktype,display_account:0
#: wizard_field:account.general.ledger.report,checktype,display_account:0
msgid "Display accounts "
msgstr ""
msgstr "Mostra conti "
#. module: account
#: model:ir.model,name:account.model_account_bank_statement_reconcile_line
@@ -1482,6 +1486,8 @@ msgid ""
"The partner bank account to pay\n"
"Keep empty to use the default"
msgstr ""
"Il conto della banca del partner da pagare\n"
"Lasciare vuoto per usare il default"
#. module: account
#: field:res.partner,debit:0
@@ -1506,7 +1512,7 @@ msgstr "account.analytic.line.extended"
#. module: account
#: field:account.journal,refund_journal:0
msgid "Refund Journal"
msgstr ""
msgstr "Giornale dei Fondi"
#. module: account
#: model:account.account.type,name:account.account_type_income
@@ -1577,7 +1583,7 @@ msgstr "Apri per la riconciliazione"
#. module: account
#: model:account.journal,name:account.bilan_journal
msgid "Journal d'ouverture"
msgstr ""
msgstr "Giornale d'apertura"
#. module: account
#: selection:account.tax,tax_group:0
@@ -1599,7 +1605,7 @@ msgstr "Lasciare il campo vuoto per usare il conto Spesa"
#. module: account
#: wizard_field:account.automatic.reconcile,init,account_ids:0
msgid "Account to reconcile"
msgstr ""
msgstr "Conto da riconciliare"
#. module: account
#: rml:account.invoice:0
@@ -1618,7 +1624,7 @@ msgstr "Conti di incasso e pagamento"
#: view:account.subscription:0
#: field:account.subscription,lines_id:0
msgid "Subscription Lines"
msgstr ""
msgstr "Linee sottoscritte"
#. module: account
#: selection:account.analytic.journal,type:0
@@ -1647,7 +1653,7 @@ msgstr "Chiudi periodo"
#. module: account
#: rml:account.overdue:0
msgid "Due"
msgstr ""
msgstr "Dovuto"
#. module: account
#: rml:account.journal.period.print:0
@@ -1675,7 +1681,7 @@ msgstr "Libro Giornale"
#. module: account
#: rml:account.analytic.account.quantity_cost_ledger:0
msgid "Max Qty:"
msgstr ""
msgstr "Quant. massima:"
#. module: account
#: wizard_button:account.invoice.refund,init,refund:0
@@ -1687,7 +1693,7 @@ msgstr "Fattura di resi"
#: model:ir.actions.wizard,name:account.wizard_period_close
#: model:ir.ui.menu,name:account.menu_action_account_period_close_tree
msgid "Close a Period"
msgstr ""
msgstr "Chiudi un periodo"
#. module: account
#: model:ir.actions.act_window,name:account.act_acc_analytic_acc_2_report_hr_timesheet_invoice_journal
@@ -1697,7 +1703,7 @@ msgstr "Costi e ricavi"
#. module: account
#: constraint:account.account:0
msgid "Error ! You can not create recursive accounts."
msgstr ""
msgstr "Errore! Non puoi creare conti ricorsivi"
#. module: account
#: rml:account.tax.code.entries:0
@@ -1707,7 +1713,7 @@ msgstr "Numero conto"
#. module: account
#: view:account.config.wizard:0
msgid "Skip"
msgstr ""
msgstr "Salta"
#. module: account
#: field:account.invoice,period_id:0
@@ -1727,7 +1733,7 @@ msgstr "Riapri"
#. module: account
#: wizard_view:account.fiscalyear.close,init:0
msgid "Are you sure you want to create entries?"
msgstr ""
msgstr "Sei sicuro di voler creare la voce?"
#. module: account
#: field:account.tax,include_base_amount:0
@@ -1743,7 +1749,7 @@ msgstr "Delta di Credito"
#: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile
#: model:ir.actions.wizard,name:account.wizard_unreconcile
msgid "Unreconcile Entries"
msgstr ""
msgstr "Voci non riconciliate"
#. module: account
#: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -1753,13 +1759,13 @@ msgstr ""
#. module: account
#: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
msgid "Cost Legder for period"
msgstr ""
msgstr "Libro mastro dei costi per il periodo"
#. module: account
#: model:ir.actions.act_window,name:account.action_bank_statement_tree2
#: model:ir.ui.menu,name:account.menu_bank_statement_tree2
msgid "New Statement"
msgstr ""
msgstr "Nuova dichiarazione"
#. module: account
#: wizard_field:account.analytic.account.chart,init,from_date:0
@@ -1822,7 +1828,7 @@ msgstr ""
#. module: account
#: rml:account.analytic.account.cost_ledger:0
msgid "Date or Code"
msgstr ""
msgstr "Data o codice"
#. module: account
#: field:account.analytic.account,user_id:0
@@ -1832,7 +1838,7 @@ msgstr "Gestione conti"
#. 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
@@ -1870,7 +1876,7 @@ msgstr "Data inizio"
#. module: account
#: model:account.journal,name:account.refund_expenses_journal
msgid "x Expenses Credit Notes Journal"
msgstr ""
msgstr "x Giornale note di accredito su Acquisti"
#. module: account
#: field:account.analytic.journal,type:0
@@ -1942,7 +1948,7 @@ msgstr "Numero di Giorni"
#. module: account
#: help:account.invoice,reference:0
msgid "The partner reference of this invoice."
msgstr ""
msgstr "Il partner di riferimento per questa fattura."
#. module: account
#: wizard_field:account.general.ledger.report,checktype,sortbydate:0
@@ -1957,7 +1963,7 @@ msgstr "Da verificare"
#. module: account
#: help:res.partner,debit:0
msgid "Total amount you have to pay to this supplier."
msgstr ""
msgstr "Totale da pagare a questo fornitore"
#. module: account
#: selection:account.automatic.reconcile,init,power:0
@@ -1982,7 +1988,7 @@ msgstr "Piano dei conti"
#. module: account
#: help:account.tax,name:0
msgid "This name will be displayed on reports"
msgstr ""
msgstr "Questo nome sarà visualizzato sulle stampe"
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@@ -2014,7 +2020,7 @@ msgstr "Resi da clienti"
#. module: account
#: rml:account.vat.declaration:0
msgid "Tax Amount"
msgstr ""
msgstr "Importo Imposta"
#. module: account
#: rml:account.analytic.account.quantity_cost_ledger:0
@@ -2024,7 +2030,7 @@ msgstr ""
#. module: account
#: field:account.journal.period,name:0
msgid "Journal-Period Name"
msgstr ""
msgstr "Nome periodo del giornale"
#. module: account
#: field:account.tax.code,name:0
@@ -2039,6 +2045,9 @@ msgid ""
"'draft' state and instead goes directly to the 'posted state' without any "
"manual validation."
msgstr ""
"Selezionare questa casella se non vuoi che le nuove movimentazioni contabili "
"saltino lo stato 'bozza' e diventino invece direttamente 'confermate' senza "
"alcuna validazione manuale."
#. module: account
#: field:account.bank.statement.line,partner_id:0
@@ -2062,7 +2071,7 @@ msgstr ""
#. module: account
#: rml:account.invoice:0
msgid "Draft Invoice"
msgstr ""
msgstr "Fattura in bozza"
#. module: account
#: model:account.account.type,name:account.account_type_expense
@@ -2072,7 +2081,7 @@ msgstr "Uscita"
#. module: account
#: field:account.journal,invoice_sequence_id:0
msgid "Invoice Sequence"
msgstr ""
msgstr "Sequenza di fatturazione"
#. module: account
#: wizard_view:account.automatic.reconcile,init:0
@@ -2082,7 +2091,7 @@ msgstr "Opzioni"
#. module: account
#: model:process.process,name:account.process_process_invoiceprocess0
msgid "Customer Invoice Process"
msgstr ""
msgstr "Processo di fatturazione cliente"
#. module: account
#: rml:account.invoice:0
@@ -2092,7 +2101,7 @@ msgstr ""
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
msgid "Opening Entries Period"
msgstr ""
msgstr "Periodo di Voci aperte"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_validate_account_moves
@@ -2109,7 +2118,7 @@ msgstr "giorni"
#. module: account
#: selection:account.aged.trial.balance,init,direction_selection:0
msgid "Past"
msgstr ""
msgstr "Passato"
#. module: account
#: field:account.analytic.account,company_currency_id:0
@@ -2133,7 +2142,7 @@ msgstr "Fattura non pagate"
#. module: account
#: model:process.transition,name:account.process_transition_paymentreconcile0
msgid "Payment Reconcile"
msgstr ""
msgstr "Pagamento riconciliato"
#. module: account
#: model:ir.actions.act_window,name:account.action_bank_statement_reconciliation_form
@@ -2145,7 +2154,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_subscription_form_new
#: model:ir.ui.menu,name:account.menu_action_subscription_form_new
msgid "New Subscription"
msgstr ""
msgstr "Nuova sottoscrizione"
#. module: account
#: view:account.payment.term:0
@@ -2161,7 +2170,7 @@ msgstr "Registrazione analitica"
#: view:res.company:0
#: field:res.company,overdue_msg:0
msgid "Overdue Payments Message"
msgstr ""
msgstr "Messaggio in caso di pagamenti in ritardo"
#. module: account
#: model:ir.actions.act_window,name:account.action_tax_code_tree
@@ -2203,7 +2212,7 @@ msgstr "Bozze"
#. module: account
#: wizard_field:account.invoice.refund,init,period:0
msgid "Force period"
msgstr ""
msgstr "Forza il periodo"
#. module: account
#: selection:account.account.type,close_method:0
@@ -2214,7 +2223,7 @@ msgstr "Dettaglio"
#: selection:account.account,type:0
#: selection:account.account.template,type:0
msgid "Consolidation"
msgstr ""
msgstr "Consolidamento"
#. module: account
#: field:account.chart.template,account_root_id:0
@@ -2246,7 +2255,7 @@ msgstr "Piano dei conti"
#. module: account
#: model:account.journal,name:account.check_journal
msgid "x Checks Journal"
msgstr ""
msgstr "x Controllo giornale"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_generate_subscription
@@ -2257,7 +2266,7 @@ msgstr "Creare voci relative a canoni"
#. module: account
#: wizard_field:account.fiscalyear.close,init,journal_id:0
msgid "Opening Entries Journal"
msgstr ""
msgstr "Giornale delle Voci aperte"
#. module: account
#: view:account.config.wizard:0
@@ -2286,12 +2295,12 @@ msgstr "Tutti i periodi sono vuoti"
#. module: account
#: model:account.account.type,name:account.account_type_liability
msgid "Liability"
msgstr ""
msgstr "Debiti"
#. module: account
#: selection:account.automatic.reconcile,init,power:0
msgid "2"
msgstr ""
msgstr "2"
#. module: account
#: wizard_view:account.chart,init:0
@@ -2303,7 +2312,7 @@ msgstr ""
#. module: account
#: help:account.invoice.tax,base_code_id:0
msgid "The account basis of the tax declaration."
msgstr ""
msgstr "Il conto si basa sulla denuncia della tassa"
#. module: account
#: rml:account.analytic.account.journal:0
@@ -2328,7 +2337,7 @@ msgstr "Data"
#. module: account
#: field:account.invoice,reference_type:0
msgid "Reference Type"
msgstr ""
msgstr "Tipo riferimento"
#. module: account
#: wizard_button:account.move.line.unreconcile,init,unrec:0
@@ -2351,7 +2360,7 @@ msgstr "Voci di documento"
#: field:account.analytic.line,user_id:0
#: field:account.journal,user_id:0
msgid "User"
msgstr ""
msgstr "Utente Open ERP"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_template_form
@@ -2372,7 +2381,7 @@ msgstr ""
#. module: account
#: rml:account.journal.period.print:0
msgid "Voucher No"
msgstr ""
msgstr "Buono Numero"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_automatic_reconcile
@@ -2388,7 +2397,7 @@ msgstr "Importa fattura"
#. module: account
#: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
msgid "and Journals"
msgstr ""
msgstr "e Giornali"
#. module: account
#: view:account.tax:0
@@ -2411,11 +2420,13 @@ msgid ""
"Set if the tax computation is based on the computation of child taxes rather "
"than on the total amount."
msgstr ""
"Indica se il calcolo della tassa è basato sul conteggio delle tasse "
"\"figlio\" invece che sul totale importo."
#. module: account
#: rml:account.central.journal:0
msgid "Journal Code"
msgstr ""
msgstr "Codifica Giornale"
#. module: account
#: help:account.tax,applicable_type:0
@@ -2423,11 +2434,13 @@ msgid ""
"If not applicable (computed through a Python code), the tax won't appear on "
"the invoice."
msgstr ""
"Se non applicabile (calcolato attraverso una procedura Python), la tassa non "
"appare sulla fattura"
#. module: account
#: field:account.model,lines_id:0
msgid "Model Entries"
msgstr ""
msgstr "Voce Modello"
#. module: account
#: field:account.analytic.account,date:0
@@ -2470,7 +2483,7 @@ msgstr "Codifica di registrazioni per linea"
#. module: account
#: help:account.chart.template,tax_template_ids:0
msgid "List of all the taxes that have to be installed by the wizard"
msgstr ""
msgstr "Elenco di tutte le imposte che devono essere installate dal wizard"
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@@ -2483,7 +2496,7 @@ msgstr "Periodo da"
#: model:process.node,name:account.process_node_bankstatement0
#: model:process.node,name:account.process_node_supplierbankstatement0
msgid "Bank Statement"
msgstr ""
msgstr "Estratto conto"
#. module: account
#: wizard_view:account.invoice.pay,addendum:0
@@ -2505,13 +2518,13 @@ msgstr "L'importo in valuta del Libro Giornale"
#. module: account
#: wizard_field:account.general.ledger.report,checktype,landscape:0
msgid "Landscape Mode"
msgstr ""
msgstr "Modalità Orizzontale"
#. module: account
#: model:process.transition,note:account.process_transition_analyticinvoice0
#: model:process.transition,note:account.process_transition_supplieranalyticcost0
msgid "From analytic accounts, Create invoice."
msgstr ""
msgstr "Dai conti analitici, Crea fattura."
#. module: account
#: wizard_button:account.account.balance.report,account_selection,end:0
@@ -2582,7 +2595,7 @@ msgstr "Usa questo codice per la Dichiarazione IVA"
#. module: account
#: field:account.move.line,blocked:0
msgid "Litigation"
msgstr ""
msgstr "Causa"
#. module: account
#: view:account.move.line:0
@@ -2594,7 +2607,7 @@ msgstr "Informazione"
#. module: account
#: model:ir.ui.menu,name:account.menu_tax_report
msgid "Taxes Reports"
msgstr ""
msgstr "Stampa Tasse"
#. module: account
#: field:res.partner,property_account_payable:0
@@ -2619,13 +2632,15 @@ msgstr "Conto Crediti predefinito"
#. module: account
#: model:process.node,name:account.process_node_supplierpaymentorder0
msgid "Payment Order"
msgstr ""
msgstr "Ordine di Pagamento"
#. module: account
#: help:account.account.template,reconcile:0
msgid ""
"Check this option if you want the user to reconcile entries in this account."
msgstr ""
"Spunta questa opzione se vuoi che sia l'utente a riconciliare le voci di "
"questo conto"
#. module: account
#: rml:account.analytic.account.journal:0
@@ -2648,12 +2663,12 @@ msgstr "Capitale"
#. module: account
#: field:wizard.company.setup,overdue_msg:0
msgid "Overdue Payment Message"
msgstr ""
msgstr "Messaggio per pagamento in ritardo"
#. module: account
#: model:ir.model,name:account.model_account_tax_code_template
msgid "Tax Code Template"
msgstr ""
msgstr "Modelli di Codice Tassa"
#. module: account
#: rml:account.partner.balance:0
@@ -2678,7 +2693,7 @@ msgstr "Movimenti di fine anno"
#. module: account
#: model:ir.ui.menu,name:account.menu_generic_report
msgid "Generic Reports"
msgstr ""
msgstr "Stampe generiche"
#. module: account
#: wizard_field:account.automatic.reconcile,init,power:0
@@ -2734,7 +2749,7 @@ msgstr "Numero fattura"
#. module: account
#: field:account.period,date_stop:0
msgid "End of Period"
msgstr ""
msgstr "Concludi il periodo"
#. module: account
#: wizard_button:populate_statement_from_inv,go,finish:0
@@ -2750,7 +2765,7 @@ msgstr "Imponibile"
#: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
#: model:ir.actions.wizard,name:account.account_analytic_account_inverted_balance_report
msgid "Inverted Analytic Balance"
msgstr ""
msgstr "Bilancio Conti Analitici inverso"
#. module: account
#: field:account.tax,applicable_type:0
@@ -2788,7 +2803,7 @@ msgstr ""
#. module: account
#: wizard_field:account.aged.trial.balance,init,direction_selection:0
msgid "Analysis Direction"
msgstr ""
msgstr "Analisi della direzione"
#. module: account
#: wizard_button:populate_statement_from_inv,init,go:0
@@ -2812,6 +2827,10 @@ msgid ""
"higher ones. The order is important if you have a tax that has several tax "
"children. In this case, the evaluation order is important."
msgstr ""
"Il campo sequenza è usato per ordinare le linee delle tasse dalla più "
"piccola alla più grande. Questo ordinamento è importante se hai delle tasse "
"che hanno tasse \"figlio\". In questo caso, l'ordine con cui vendono "
"valutate è importante."
#. module: account
#: field:account.journal.column,view_id:0
@@ -2819,12 +2838,12 @@ msgstr ""
#: field:account.journal.view,name:0
#: model:ir.model,name:account.model_account_journal_view
msgid "Journal View"
msgstr ""
msgstr "Vista Giornale"
#. module: account
#: selection:account.move.line,centralisation:0
msgid "Credit Centralisation"
msgstr ""
msgstr "Centralizzazione del credito"
#. module: account
#: rml:account.overdue:0
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-15 11:30+0000\n"
"PO-Revision-Date: 2010-08-16 09:38+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-16 06:44+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 06:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/pl.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-15 11:29+0000\n"
"PO-Revision-Date: 2010-08-16 09:38+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-16 06:44+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 06:59+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-15 10:43+0000\n"
"PO-Revision-Date: 2010-08-16 09:19+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-16 06:44+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 06:58+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/i18n/sv.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-15 11:45+0000\n"
"PO-Revision-Date: 2010-08-16 09:45+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-16 06:44+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 06:59+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-15 11:53+0000\n"
"PO-Revision-Date: 2010-08-16 09:37+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-16 06:45+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 06:59+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-15 11:07+0000\n"
"PO-Revision-Date: 2010-08-16 09:18+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-16 06:45+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 06:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
addons/account/invoice.py
+8 -8
View File
@@ -598,9 +598,9 @@ class account_invoice(osv.osv):
def copy(self, cr, uid, id, default={}, context=None):
default.update({
'state':'draft',
'number':False,
'move_id':False,
'state':'draft',
'number':False,
'move_id':False,
'move_name':False,
'internal_number': False,
})
@@ -941,7 +941,7 @@ class account_invoice(osv.osv):
def action_number(self, cr, uid, ids, *args):
#TODO: not correct fix but required a frech values before reading it.
self.write(cr, uid, ids, {})
for obj_inv in self.browse(cr, uid, ids):
id = obj_inv.id
invtype = obj_inv.type
@@ -950,7 +950,7 @@ class account_invoice(osv.osv):
reference = obj_inv.reference or ''
self.write(cr, uid, ids, {'internal_number':number})
if invtype in ('in_invoice', 'in_refund'):
ref = reference
else:
@@ -967,7 +967,7 @@ class account_invoice(osv.osv):
'WHERE account_move_line.move_id = %s ' \
'AND account_analytic_line.move_id = account_move_line.id',
(ref, move_id))
for inv_id, name in self.name_get(cr, uid, [id]):
message = _('Invoice ') + " '" + name + "' "+ _("is validated.")
self.log(cr, uid, inv_id, message)
@@ -1367,8 +1367,8 @@ class account_invoice_line(osv.osv):
else:
result.update({'price_unit': res.list_price, 'invoice_line_tax_id': tax_id})
if not name:
result['name'] = res.partner_ref
# if not name:
result['name'] = res.partner_ref
domain = {}
result['uos_id'] = res.uom_id.id or uom or False
addons/account/project/project_view.xml
+16 -16
View File
@@ -78,7 +78,7 @@
<group colspan="4" col="6">
<field name="name" select="1" colspan="4"/>
<field name="code" select="1"/>
<field name="parent_id" on_change="on_change_parent(parent_id)"/>
<field name="parent_id" on_change="on_change_parent(parent_id)" groups="base.group_extended"/>
<field name="company_id" select="2" widget="selection" groups="base.group_multi_company"/>
<field name="type" select="2"/>
<field name="company_currency_id" select="2"/>
@@ -113,7 +113,7 @@
<field name="search_view_id" ref="account.view_account_analytic_account_search"/>
</record>
<!--<menuitem id="menu_analytic_account" name="Analytic Accounts" parent="account.menu_analytic_accounting"/>-->
<menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="menu_analytic_accounting"/>
<menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="menu_analytic_accounting" groups="base.group_extended"/>
<record id="act_account_renew_view" model="ir.actions.act_window">
<field name="name">Accounts to Renew</field>
@@ -144,7 +144,7 @@
<!-- <wizard id="wizard_analytic_account_chart" menu="False" model="account.analytic.account" name="account.analytic.account.chart" string="Analytic Chart of Accounts"/>
<menuitem icon="STOCK_INDENT" action="wizard_analytic_account_chart" id="menu_action_analytic_account_tree2" parent="account.menu_finance_charts" type="wizard"/>-->
<menuitem id="next_id_40" name="Analytic" parent="account.menu_finance_generic_reporting" sequence="4"/>
<menuitem id="next_id_40" name="Analytic" parent="account.menu_finance_generic_reporting" sequence="4" groups="base.group_extended"/>
<!-- <menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart_balance" parent="next_id_40"/>-->
<record id="view_account_analytic_line_form" model="ir.ui.view">
@@ -157,7 +157,7 @@
<field colspan="4" name="name" select="1"/>
<field name="amount" select="2"/>
<field name="date" select="1"/>
<field name="account_id" select="1"/>
<field name="account_id" select="1" groups="base.group_extended"/>
<field name="journal_id" select="2"/>
<field name="general_account_id" select="2"/>
<field name="move_id" select="2"/>
@@ -183,7 +183,7 @@
<field name="name"/>
<field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" sum="Total quantity"/>
<field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
<field domain="[('type','=','normal')]" name="account_id"/>
<field domain="[('type','=','normal')]" name="account_id" groups="base.group_extended"/>
<field invisible="True" name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
<field name="amount" sum="Total amount"/>
<field name="general_account_id"/>
@@ -203,7 +203,7 @@
<search string="Search Analytic Lines">
<group col='6' colspan='4'>
<field name="name" select="1"/>
<field name="account_id" select="1"/>
<field name="account_id" select="1" groups="base.group_extended"/>
<field name="amount" select="1"/>
<field name="date" select="1"/>
<field name="user_id" widget="selection"/>
@@ -215,7 +215,7 @@
<newline/>
<group string="Group By..." expand="0">
<filter string="General Account" context="{'group_by':'general_account_id'}"/>
<filter string="Analytic Account" context="{'group_by':'account_id'}"/>
<filter string="Analytic Account" context="{'group_by':'account_id'}" groups="base.group_extended"/>
<filter string="Analytic Journal" context="{'group_by':'journal_id'}"/>
<filter string="Product" context="{'group_by':'product_id'}"/>
</group>
@@ -263,7 +263,7 @@
<field name="arch" type="xml">
<form string="Project line">
<field name="name"/>
<field name="account_id"/>
<field name="account_id" groups="base.group_extended"/>
<field name="date" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
<field name="journal_id"/>
<field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
@@ -308,12 +308,12 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Analytic Journals">
<group>
<field name="name"/>
<field name="code"/>
<field name="type"/>
</group>
<newline/>
<group>
<field name="name"/>
<field name="code"/>
<field name="type"/>
</group>
<newline/>
<group expand="0" string="Group By...">
<filter string="Type" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'type'}"/>
</group>
@@ -342,7 +342,7 @@
<field name="view_mode">tree,form,search</field>
<field name="search_view_id" ref="view_analytic_journal_search" />
</record>
<menuitem action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic_accounting"/>
<menuitem action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic_accounting" groups="base.group_extended"/>
#
# Open journal entries
@@ -390,7 +390,7 @@
<field name="view_type">tree</field>
<field name="help">To print an analytics (or costs) journal for a given period. The report give code, move name, account number, general amount and analytic amount.</field>
</record>
<menuitem action="action_account_analytic_journal_tree" id="account_analytic_journal_print" parent="account.next_id_40"/>
<menuitem action="action_account_analytic_journal_tree" id="account_analytic_journal_print" parent="account.next_id_40" groups="base.group_extended"/>
<!-- <record id="action_account_analytic_journal_tree2" model="ir.actions.act_window">-->
addons/account/project/wizard/account_analytic_chart_view.xml
+2 -1
View File
@@ -38,7 +38,8 @@
parent="account.menu_finance_charts"
action="action_account_analytic_chart"
id="menu_action_analytic_account_tree2"
icon="STOCK_INDENT"/>
icon="STOCK_INDENT"
groups="base.group_extended"/>
</data>
</openerp>
addons/account/report/account_analytic_entries_report_view.xml
+1 -1
View File
@@ -107,7 +107,7 @@
<field name="help">A tool search lets you know statistics on your analytics records that match your needs.</field>
</record>
<menuitem action="action_analytic_entries_report" id="menu_action_analytic_entries_report" parent="account.menu_finance_statistic_report_statement" sequence="4"/>
<menuitem action="action_analytic_entries_report" id="menu_action_analytic_entries_report" parent="account.menu_finance_statistic_report_statement" sequence="4" groups="base.group_extended"/>
</data>
</openerp>
addons/account/security/ir.model.access.csv
+52 -46
View File
@@ -157,50 +157,56 @@
"access_report_account_receivable_user","report.account.receivable.user","model_report_account_receivable","account.group_account_user",1,1,1,1
"access_account_sequence_fiscal_year_invoice","account.sequence.fiscalyear invoice","model_account_sequence_fiscalyear","account.group_account_invoice",1,1,1,1
"access_account_invoice_report","account.invoice.report","model_account_invoice_report","account.group_account_invoice",1,0,0,0
"access_account_invoice","account.invoice","model_account_invoice","account.group_accounting_accountant",1,1,1,1
"access_account_invoice_line","account.invoice.line","model_account_invoice_line","account.group_accounting_accountant",1,1,1,1
"access_res_partner","res.partner","base.model_res_partner","account.group_accounting_accountant",1,1,1,1
"access_account_account","account.account","model_account_account","account.group_accounting_accountant",1,0,0,0
"access_account_account_type","account.type","model_account_account_type","account.group_accounting_accountant",1,0,0,0
"access_account_tax","account.tax","model_account_tax","account.group_accounting_accountant",1,0,0,0
"access_account_tax_code","account.tax.code","model_account_tax_code","account.group_accounting_accountant",1,0,0,0
"access_account_invoice_tax","account.invoice.tax","model_account_invoice_tax","account.group_accounting_accountant",1,0,0,0
"access_res_partner_address","res.partner.address","base.model_res_partner_address","account.group_accounting_accountant",1,1,1,1
"access_account_move","account.move","model_account_move","account.group_accounting_accountant",1,1,1,1
"access_account_move_line","account.move.line","model_account_move_line","account.group_accounting_accountant",1,1,1,1
"access_res_partner_bank","res.partner.bank","base.model_res_partner_bank","account.group_accounting_accountant",1,0,0,0
"access_res_partner_event","res.partner.event","base.model_res_partner_event","account.group_accounting_accountant",1,0,0,0
"access_res_currency_rate","res.currency.rate","base.model_res_currency_rate","account.group_accounting_accountant",1,1,0,0
"access_res_currency","res.currency","base.model_res_currency","account.group_accounting_accountant",1,1,0,0
"access_product_template","product.template","product.model_product_template","account.group_accounting_accountant",1,0,0,0
"access_product_product","product.product","product.model_product_product","account.group_accounting_accountant",1,0,0,0
"access_product_category","product.category","product.model_product_category","account.group_accounting_accountant",1,0,0,0
"access_product_pricelist","product.pricelist","product.model_product_pricelist","account.group_accounting_accountant",1,0,0,0
"access_product_pricelist_version","product.pricelist.version","product.model_product_pricelist_version","account.group_accounting_accountant",1,0,0,0
"access_product_pricelist_item","product.pricelist.item","product.model_product_pricelist_item","account.group_accounting_accountant",1,0,0,0
"access_account_payment_term","account.payment.term","model_account_payment_term","account.group_accounting_accountant",1,0,0,0
"access_res_payterm","res.payterm","base.model_res_payterm","account.group_accounting_accountant",1,0,0,0
"access_account_payment_term_line","account.payment.term.line","model_account_payment_term_line","account.group_accounting_accountant",1,0,0,0
"access_account_journal","account.journal","model_account_journal","account.group_accounting_accountant",1,0,0,0
"access_account_fiscalyear","account.fiscalyear","model_account_fiscalyear","account.group_accounting_accountant",1,0,0,0
"access_account_period","account.period","model_account_period","account.group_accounting_accountant",1,0,0,0
"access_account_move_reconcile","account.move.reconcile","model_account_move_reconcile","account.group_accounting_accountant",1,1,1,1
"access_account_tax_code","account.tax.code","model_account_tax_code","account.group_accounting_accountant",1,0,0,0
"access_account_bank_statement","account.bank.statement","model_account_bank_statement","account.group_accounting_accountant",1,1,1,1
"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_accounting_accountant",1,1,1,1
"access_account_invoice_accounting_accountant","account.invoice","model_account_invoice","account.group_accounting_accountant",1,1,1,1
"access_account_invoice_line_accounting_accountant","account.invoice.line","model_account_invoice_line","account.group_accounting_accountant",1,1,1,1
"access_res_partner_accounting_accountant","res.partner","base.model_res_partner","account.group_accounting_accountant",1,1,1,1
"access_account_account_accounting_accountant","account.account","model_account_account","account.group_accounting_accountant",1,0,0,0
"access_account_account_type_accounting_accountant","account.type","model_account_account_type","account.group_accounting_accountant",1,0,0,0
"access_account_tax_accounting_accountant","account.tax","model_account_tax","account.group_accounting_accountant",1,0,0,0
"access_account_tax_code_accounting_accountant","account.tax.code","model_account_tax_code","account.group_accounting_accountant",1,0,0,0
"access_account_invoice_tax_accounting_accountant","account.invoice.tax","model_account_invoice_tax","account.group_accounting_accountant",1,0,0,0
"access_res_partner_address_accounting_accountant","res.partner.address","base.model_res_partner_address","account.group_accounting_accountant",1,1,1,1
"access_account_move_accounting_accountant","account.move","model_account_move","account.group_accounting_accountant",1,1,1,1
"access_account_move_line_accounting_accountant","account.move.line","model_account_move_line","account.group_accounting_accountant",1,1,1,1
"access_res_partner_bank_accounting_accountant","res.partner.bank","base.model_res_partner_bank","account.group_accounting_accountant",1,0,0,0
"access_res_partner_event_accounting_accountant","res.partner.event","base.model_res_partner_event","account.group_accounting_accountant",1,0,0,0
"access_res_currency_rate_accounting_accountant","res.currency.rate","base.model_res_currency_rate","account.group_accounting_accountant",1,1,0,0
"access_res_currency_accounting_accountant","res.currency","base.model_res_currency","account.group_accounting_accountant",1,1,0,0
"access_product_template_accounting_accountant","product.template","product.model_product_template","account.group_accounting_accountant",1,0,0,0
"access_product_product_accounting_accountant","product.product","product.model_product_product","account.group_accounting_accountant",1,0,0,0
"access_product_category_accounting_accountant","product.category","product.model_product_category","account.group_accounting_accountant",1,0,0,0
"access_product_pricelist_accounting_accountant","product.pricelist","product.model_product_pricelist","account.group_accounting_accountant",1,0,0,0
"access_product_pricelist_version_accounting_accountant","product.pricelist.version","product.model_product_pricelist_version","account.group_accounting_accountant",1,0,0,0
"access_product_pricelist_item_accounting_accountant","product.pricelist.item","product.model_product_pricelist_item","account.group_accounting_accountant",1,0,0,0
"access_account_payment_term_accounting_accountant","account.payment.term","model_account_payment_term","account.group_accounting_accountant",1,0,0,0
"access_res_payterm_accounting_accountant","res.payterm","base.model_res_payterm","account.group_accounting_accountant",1,0,0,0
"access_account_payment_term_line_accounting_accountant","account.payment.term.line","model_account_payment_term_line","account.group_accounting_accountant",1,0,0,0
"access_account_journal_accounting_accountant","account.journal","model_account_journal","account.group_accounting_accountant",1,0,0,0
"access_account_fiscalyear_accounting_accountant","account.fiscalyear","model_account_fiscalyear","account.group_accounting_accountant",1,0,0,0
"access_account_period_accounting_accountant","account.period","model_account_period","account.group_accounting_accountant",1,0,0,0
"access_account_move_reconcile_accounting_accountant","account.move.reconcile","model_account_move_reconcile","account.group_accounting_accountant",1,1,1,1
"access_account_tax_code_accounting_accountant","account.tax.code","model_account_tax_code","account.group_accounting_accountant",1,0,0,0
"access_account_bank_statement_accounting_accountant","account.bank.statement","model_account_bank_statement","account.group_accounting_accountant",1,1,1,1
"access_account_cashbox_line_accounting_accountant","account.cashbox.line","model_account_cashbox_line","account.group_accounting_accountant",1,1,1,1
"access_account_bank_statement_reconcile_line","account.bank.statement.reconcile.line","model_account_bank_statement_reconcile_line","account.group_accounting_accountant",1,1,1,1
"access_account_bank_statement_line","account.bank.statement.line","model_account_bank_statement_line","account.group_accounting_accountant",1,1,1,1
"access_account_invoice_report","account.invoice.report","model_account_invoice_report","account.group_accounting_accountant",1,0,0,0
"access_report_account_receivable","report.account.receivable","model_report_account_receivable","account.group_accounting_accountant",1,0,0,0
"access_temp_range","temp.range","model_temp_range","account.group_accounting_accountant",1,0,0,0
"access_report_aged_receivable","report.aged.receivable","model_report_aged_receivable","account.group_accounting_accountant",1,0,0,0
"access_report_invoice_created","report.invoice.created","model_report_invoice_created","account.group_accounting_accountant",1,0,0,0
"access_account_entries_report","account.entries.report","model_account_entries_report","account.group_accounting_accountant",1,0,0,0
"access_account_invoice_report","account.invoice.report","model_account_invoice_report","account.group_accounting_accountant",1,0,0,0
"access_account_journal_view","account.journal.view","model_account_journal_view","account.group_accounting_accountant",1,0,0,0
"access_account_journal_period","account.journal.period","model_account_journal_period","account.group_accounting_accountant",1,1,1,1
"access_account_journal_column","account.journal.column","model_account_journal_column","account.group_accounting_accountant",1,1,1,1
"access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","account.group_accounting_accountant",1,0,0,0
"access_account_analytic_line","account.analytic.line","analytic.model_account_analytic_line","account.group_accounting_accountant",1,0,0,0
"access_account_analytic_journal","account.analytic.journal","model_account_analytic_journal","account.group_accounting_accountant",1,0,0,0
"access_account_bank_statement_reconcile","account.bank.statement.reconcile","model_account_bank_statement_reconcile","account.group_accounting_accountant",1,1,1,1
"access_account_bank_statement_line_accounting_accountant","account.bank.statement.line","model_account_bank_statement_line","account.group_accounting_accountant",1,1,1,1
"access_account_invoice_report_accounting_accountant","account.invoice.report","model_account_invoice_report","account.group_accounting_accountant",1,0,0,0
"access_report_account_receivable_accounting_accountant","report.account.receivable","model_report_account_receivable","account.group_accounting_accountant",1,0,0,0
"access_temp_range_accounting_accountant","temp.range","model_temp_range","account.group_accounting_accountant",1,0,0,0
"access_report_aged_receivable_accounting_accountant","report.aged.receivable","model_report_aged_receivable","account.group_accounting_accountant",1,0,0,0
"access_report_invoice_created_accounting_accountant","report.invoice.created","model_report_invoice_created","account.group_accounting_accountant",1,0,0,0
"access_account_entries_report_accounting_accountant","account.entries.report","model_account_entries_report","account.group_accounting_accountant",1,0,0,0
"access_account_invoice_report_accounting_accountant","account.invoice.report","model_account_invoice_report","account.group_accounting_accountant",1,0,0,0
"access_account_journal_view_accounting_accountant","account.journal.view","model_account_journal_view","account.group_accounting_accountant",1,0,0,0
"access_account_journal_period_accounting_accountant","account.journal.period","model_account_journal_period","account.group_accounting_accountant",1,1,1,1
"access_account_journal_column_accounting_accountant","account.journal.column","model_account_journal_column","account.group_accounting_accountant",1,1,1,1
"access_account_analytic_account_accounting_accountant","account.analytic.account","analytic.model_account_analytic_account","account.group_accounting_accountant",1,0,0,0
"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_account_user","account.move","model_account_move","account.group_account_user",1,1,1,1
"access_account_move_line_account_user","account.move.line","model_account_move_line","account.group_account_user",1,1,1,1
"access_account_journal_account_user","account.journal","model_account_journal","account.group_account_user",1,0,0,0
"access_account_journal_view_account_user","account.journal.view","model_account_journal_view","account.group_account_user",1,0,0,0
"access_account_journal_period_account_user","account.journal.period","model_account_journal_period","account.group_account_user",1,0,0,0
"access_account_journal_column_account_user","account.journal.column","model_account_journal_column","account.group_account_user",1,0,0,0
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
157 access_report_account_receivable_user report.account.receivable.user model_report_account_receivable account.group_account_user 1 1 1 1
158 access_account_sequence_fiscal_year_invoice account.sequence.fiscalyear invoice model_account_sequence_fiscalyear account.group_account_invoice 1 1 1 1
159 access_account_invoice_report account.invoice.report model_account_invoice_report account.group_account_invoice 1 0 0 0
160 access_account_invoice access_account_invoice_accounting_accountant account.invoice model_account_invoice account.group_accounting_accountant 1 1 1 1
161 access_account_invoice_line access_account_invoice_line_accounting_accountant account.invoice.line model_account_invoice_line account.group_accounting_accountant 1 1 1 1
162 access_res_partner access_res_partner_accounting_accountant res.partner base.model_res_partner account.group_accounting_accountant 1 1 1 1
163 access_account_account access_account_account_accounting_accountant account.account model_account_account account.group_accounting_accountant 1 0 0 0
164 access_account_account_type access_account_account_type_accounting_accountant account.type model_account_account_type account.group_accounting_accountant 1 0 0 0
165 access_account_tax access_account_tax_accounting_accountant account.tax model_account_tax account.group_accounting_accountant 1 0 0 0
166 access_account_tax_code access_account_tax_code_accounting_accountant account.tax.code model_account_tax_code account.group_accounting_accountant 1 0 0 0
167 access_account_invoice_tax access_account_invoice_tax_accounting_accountant account.invoice.tax model_account_invoice_tax account.group_accounting_accountant 1 0 0 0
168 access_res_partner_address access_res_partner_address_accounting_accountant res.partner.address base.model_res_partner_address account.group_accounting_accountant 1 1 1 1
169 access_account_move access_account_move_accounting_accountant account.move model_account_move account.group_accounting_accountant 1 1 1 1
170 access_account_move_line access_account_move_line_accounting_accountant account.move.line model_account_move_line account.group_accounting_accountant 1 1 1 1
171 access_res_partner_bank access_res_partner_bank_accounting_accountant res.partner.bank base.model_res_partner_bank account.group_accounting_accountant 1 0 0 0
172 access_res_partner_event access_res_partner_event_accounting_accountant res.partner.event base.model_res_partner_event account.group_accounting_accountant 1 0 0 0
173 access_res_currency_rate access_res_currency_rate_accounting_accountant res.currency.rate base.model_res_currency_rate account.group_accounting_accountant 1 1 0 0
174 access_res_currency access_res_currency_accounting_accountant res.currency base.model_res_currency account.group_accounting_accountant 1 1 0 0
175 access_product_template access_product_template_accounting_accountant product.template product.model_product_template account.group_accounting_accountant 1 0 0 0
176 access_product_product access_product_product_accounting_accountant product.product product.model_product_product account.group_accounting_accountant 1 0 0 0
177 access_product_category access_product_category_accounting_accountant product.category product.model_product_category account.group_accounting_accountant 1 0 0 0
178 access_product_pricelist access_product_pricelist_accounting_accountant product.pricelist product.model_product_pricelist account.group_accounting_accountant 1 0 0 0
179 access_product_pricelist_version access_product_pricelist_version_accounting_accountant product.pricelist.version product.model_product_pricelist_version account.group_accounting_accountant 1 0 0 0
180 access_product_pricelist_item access_product_pricelist_item_accounting_accountant product.pricelist.item product.model_product_pricelist_item account.group_accounting_accountant 1 0 0 0
181 access_account_payment_term access_account_payment_term_accounting_accountant account.payment.term model_account_payment_term account.group_accounting_accountant 1 0 0 0
182 access_res_payterm access_res_payterm_accounting_accountant res.payterm base.model_res_payterm account.group_accounting_accountant 1 0 0 0
183 access_account_payment_term_line access_account_payment_term_line_accounting_accountant account.payment.term.line model_account_payment_term_line account.group_accounting_accountant 1 0 0 0
184 access_account_journal access_account_journal_accounting_accountant account.journal model_account_journal account.group_accounting_accountant 1 0 0 0
185 access_account_fiscalyear access_account_fiscalyear_accounting_accountant account.fiscalyear model_account_fiscalyear account.group_accounting_accountant 1 0 0 0
186 access_account_period access_account_period_accounting_accountant account.period model_account_period account.group_accounting_accountant 1 0 0 0
187 access_account_move_reconcile access_account_move_reconcile_accounting_accountant account.move.reconcile model_account_move_reconcile account.group_accounting_accountant 1 1 1 1
188 access_account_tax_code access_account_tax_code_accounting_accountant account.tax.code model_account_tax_code account.group_accounting_accountant 1 0 0 0
189 access_account_bank_statement access_account_bank_statement_accounting_accountant account.bank.statement model_account_bank_statement account.group_accounting_accountant 1 1 1 1
190 access_account_cashbox_line access_account_cashbox_line_accounting_accountant account.cashbox.line model_account_cashbox_line account.group_accounting_accountant 1 1 1 1
191 access_account_bank_statement_reconcile_line account.bank.statement.reconcile.line model_account_bank_statement_reconcile_line account.group_accounting_accountant 1 1 1 1
192 access_account_bank_statement_line access_account_bank_statement_line_accounting_accountant account.bank.statement.line model_account_bank_statement_line account.group_accounting_accountant 1 1 1 1
193 access_account_invoice_report access_account_invoice_report_accounting_accountant account.invoice.report model_account_invoice_report account.group_accounting_accountant 1 0 0 0
194 access_report_account_receivable access_report_account_receivable_accounting_accountant report.account.receivable model_report_account_receivable account.group_accounting_accountant 1 0 0 0
195 access_temp_range access_temp_range_accounting_accountant temp.range model_temp_range account.group_accounting_accountant 1 0 0 0
196 access_report_aged_receivable access_report_aged_receivable_accounting_accountant report.aged.receivable model_report_aged_receivable account.group_accounting_accountant 1 0 0 0
197 access_report_invoice_created access_report_invoice_created_accounting_accountant report.invoice.created model_report_invoice_created account.group_accounting_accountant 1 0 0 0
198 access_account_entries_report access_account_entries_report_accounting_accountant account.entries.report model_account_entries_report account.group_accounting_accountant 1 0 0 0
199 access_account_invoice_report access_account_invoice_report_accounting_accountant account.invoice.report model_account_invoice_report account.group_accounting_accountant 1 0 0 0
200 access_account_journal_view access_account_journal_view_accounting_accountant account.journal.view model_account_journal_view account.group_accounting_accountant 1 0 0 0
201 access_account_journal_period access_account_journal_period_accounting_accountant account.journal.period model_account_journal_period account.group_accounting_accountant 1 1 1 1
202 access_account_journal_column access_account_journal_column_accounting_accountant account.journal.column model_account_journal_column account.group_accounting_accountant 1 1 1 1
203 access_account_analytic_account access_account_analytic_account_accounting_accountant account.analytic.account analytic.model_account_analytic_account account.group_accounting_accountant 1 0 0 0
204 access_account_analytic_line access_account_analytic_line_accounting_accountant account.analytic.line analytic.model_account_analytic_line account.group_accounting_accountant 1 0 0 0
205 access_account_analytic_journal access_account_analytic_journal_accounting_accountant account.analytic.journal model_account_analytic_journal account.group_accounting_accountant 1 0 0 0
206 access_account_bank_statement_reconcile access_account_bank_statement_reconcile_accounting_accountant account.bank.statement.reconcile model_account_bank_statement_reconcile account.group_accounting_accountant 1 1 1 1
207 access_account_move_account_user account.move model_account_move account.group_account_user 1 1 1 1
208 access_account_move_line_account_user account.move.line model_account_move_line account.group_account_user 1 1 1 1
209 access_account_journal_account_user account.journal model_account_journal account.group_account_user 1 0 0 0
210 access_account_journal_view_account_user account.journal.view model_account_journal_view account.group_account_user 1 0 0 0
211 access_account_journal_period_account_user account.journal.period model_account_journal_period account.group_account_user 1 0 0 0
212 access_account_journal_column_account_user account.journal.column model_account_journal_column account.group_account_user 1 0 0 0
addons/account/wizard/account_move_journal_view.xml
+7 -3
View File
@@ -8,7 +8,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Standard entries">
</form>
</field>
</record>
@@ -21,7 +21,7 @@
<field name="context">{'journal_type':'sale','view_mode':False}</field>
<field name="target">new</field>
</record>
<menuitem action="action_account_moves_sale" sequence="10" id="menu_eaction_account_moves_sale" parent="menu_finance_receivables" icon="STOCK_JUSTIFY_FILL"/>
<menuitem action="action_account_moves_sale" sequence="10" id="menu_eaction_account_moves_sale" parent="menu_finance_receivables" icon="STOCK_JUSTIFY_FILL" groups="group_account_user,group_account_manager,base.group_system"/>
<!-- <record id="action_account_moves_purchase_refund" model="ir.actions.act_window">-->
<!-- <field name="name">Journal Refund Items</field>-->
@@ -42,7 +42,10 @@
<field name="target">new</field>
</record>
<menuitem action="action_account_moves_purchase" sequence="10"
id="menu_eaction_account_moves_purchase" parent="menu_finance_payables" icon="STOCK_JUSTIFY_FILL"/>
id="menu_eaction_account_moves_purchase"
parent="menu_finance_payables"
icon="STOCK_JUSTIFY_FILL"
groups="group_account_user,group_account_manager,base.group_system"/>
<!-- <record id="action_account_moves_sale_refund" model="ir.actions.act_window">-->
<!-- <field name="name">Journal Refund Items</field>-->
@@ -69,6 +72,7 @@
id="menu_eaction_account_moves_all"
parent="account.menu_finance_entries"
sequence="4"
groups="group_account_user,group_account_manager,base.group_system"
/>
</data>
</openerp>
addons/account/wizard/account_pay_invoice.py
+30 -20
View File
@@ -18,6 +18,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import time
from osv import fields, osv
@@ -34,15 +35,15 @@ 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')
}
_defaults = {
'comment': 'Write-Off',
}
}
def pay_and_reconcile_writeoff(self, cr, uid, ids, context=None):
data = self.read(cr, uid, ids,context=context)[0]
context.update({'write_off':data})
data = self.read(cr, uid, ids, context=context)[0]
context.update({'write_off': data})
self.pool.get('account.invoice.pay').pay_and_reconcile(cr, uid, ids, context=context)
return {}
@@ -60,26 +61,33 @@ class account_invoice_pay(osv.osv_memory):
'date': fields.date('Date payment', required=True),
'journal_id': fields.many2one('account.journal', 'Journal/Payment Mode', required=True, domain=[('type','=','cash')]),
'period_id': fields.many2one('account.period', 'Period', required=True),
}
}
def view_init(self, cr, uid, ids, context=None):
invoice = self.pool.get('account.invoice').browse(cr, uid, context['active_id'], context=context)
if invoice.state in ['draft', 'proforma2', 'cancel']:
raise osv.except_osv(_('Error !'), _('Can not pay draft/proforma/cancel invoice.'))
if context is None:
context = {}
if context.get('active_id', False):
invoice = self.pool.get('account.invoice').browse(cr, uid, context['active_id'], context=context)
if invoice.state in ['draft', 'proforma2', 'cancel']:
raise osv.except_osv(_('Error !'), _('Can not pay draft/proforma/cancel invoice.'))
pass
def _get_period(self, cr, uid, context=None):
ids = self.pool.get('account.period').find(cr, uid, context=context)
period_id = False
ids = self.pool.get('account.period').find(cr, uid, context=context)
if len(ids):
period_id = ids[0]
return period_id
def _get_amount(self, cr, uid, context=None):
return self.pool.get('account.invoice').browse(cr, uid, context['active_id'], context=context).residual
if context is None:
context = {}
if context.get('active_id', False):
return self.pool.get('account.invoice').browse(cr, uid, context['active_id'], context=context).residual
return 0.0
_defaults = {
'date': lambda *a: time.strftime('%Y-%m-%d'),
'date': time.strftime('%Y-%m-%d'),
'period_id': _get_period,
'amount': _get_amount,
}
@@ -87,10 +95,11 @@ class account_invoice_pay(osv.osv_memory):
def wo_check(self, cr, uid, ids, context=None):
cur_obj = self.pool.get('res.currency')
mod_obj = self.pool.get('ir.model.data')
inv_obj = self.pool.get('account.invoice')
if context is None:
context = {}
data = self.read(cr, uid, ids,context=context)[0]
invoice = self.pool.get('account.invoice').browse(cr, uid, context['active_id'], context)
invoice = inv_obj.browse(cr, uid, context['active_id'], context)
journal = self.pool.get('account.journal').browse(cr, uid, data['journal_id'], context)
# Here we need that:
@@ -114,11 +123,11 @@ class account_invoice_pay(osv.osv_memory):
amount_paid = data['amount']
# Get the old payment if there are some
if invoice.payment_ids:
debit=credit=0.0
debit = credit = 0.0
for payment in invoice.payment_ids:
debit+=payment.debit
credit+=payment.credit
amount_paid+=abs(debit-credit)
debit += payment.debit
credit += payment.credit
amount_paid += abs(debit-credit)
# Test if there is a difference according to currency rouding setting
if self.pool.get('res.currency').is_zero(cr, uid, invoice.company_id.currency_id,
@@ -136,10 +145,11 @@ class account_invoice_pay(osv.osv_memory):
'views': [(resource_id,'form')],
'type': 'ir.actions.act_window',
'target': 'new',
}
}
def pay_and_reconcile(self, cr, uid, ids, context=None):
cur_obj = self.pool.get('res.currency')
inv_obj = self.pool.get('account.invoice')
if context is None:
context = {}
data = self.read(cr, uid, ids, context=context)[0]
@@ -154,8 +164,8 @@ class account_invoice_pay(osv.osv_memory):
amount = data['amount']
invoice = self.pool.get('account.invoice').browse(cr, uid, context['active_id'], context)
journal = self.pool.get('account.journal').browse(cr, uid, data['journal_id'], context)
invoice = inv_obj.browse(cr, uid, context['active_id'], context=context)
journal = self.pool.get('account.journal').browse(cr, uid, data['journal_id'], context=context)
# Compute the amount in company's currency, with the journal currency (which is equal to payment currency)
# when it is needed : If payment currency (according to selected journal.currency) is <> from company currency
if journal.currency and invoice.company_id.currency_id.id<>journal.currency.id:
@@ -181,7 +191,7 @@ class account_invoice_pay(osv.osv_memory):
acc_id = journal.default_credit_account_id and journal.default_credit_account_id.id
if not acc_id:
raise osv.except_osv(_('Error !'), _('Your journal must have a default credit and debit account.'))
self.pool.get('account.invoice').pay_and_reconcile(cr, uid, [context['active_id']],
inv_obj.pay_and_reconcile(cr, uid, [context['active_id']],
amount, acc_id, data['period_id'], data['journal_id'], writeoff_account_id,
data['period_id'], writeoff_journal_id, context, data['name'])
return {}
addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+3 -3
View File
@@ -1,7 +1,7 @@
<openerp>
<data>
<menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
<menuitem id="menu_invoicing" name="Billing" parent="base.menu_main_pm" sequence="4"/>
<menuitem id="menu_invoicing" name="Billing" parent="base.menu_main_pm" sequence="4" groups="base.group_extended"/>
<record id="action_hr_tree_invoiced_all" model="ir.actions.act_window">
<field name="name">All Uninvoiced Entries</field>
@@ -11,7 +11,7 @@
<field name="domain">[('invoice_id','=',False),('to_invoice','!=',False)]</field>
<field name="search_view_id" ref="account.view_account_analytic_line_filter"/>
</record>
<menuitem action="action_hr_tree_invoiced_all" id="menu_action_hr_tree_invoiced_all" parent="menu_invoicing"/>
<menuitem action="action_hr_tree_invoiced_all" id="menu_action_hr_tree_invoiced_all" parent="menu_invoicing" groups="base.group_extended"/>
<record id="action_account_analytic_managed_overpassed" model="ir.actions.act_window">
<field name="name">Overpassed Accounts</field>
@@ -20,6 +20,6 @@
<field name="view_mode">tree,form,graph</field>
<field name="domain">[('date','&lt;=',time.strftime('%Y-%m-%d')),('state','=','open')]</field>
</record>
<menuitem action="action_account_analytic_managed_overpassed" id="menu_action_account_analytic_managed_overpassed" sequence="50" parent="menu_invoicing"/>
<menuitem action="action_account_analytic_managed_overpassed" id="menu_action_account_analytic_managed_overpassed" sequence="50" parent="menu_invoicing" groups="base.group_extended"/>
</data>
</openerp>
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-15 10:39+0000\n"
"PO-Revision-Date: 2010-08-16 09: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-16 06:45+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
addons/account_analytic_analysis/i18n/fi.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-15 10:04+0000\n"
"PO-Revision-Date: 2010-08-16 09:46+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-16 06:45+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
addons/account_analytic_analysis/i18n/lt.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-15 12:33+0000\n"
"PO-Revision-Date: 2010-08-16 09: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-16 06:45+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 07:00+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-15 10:37+0000\n"
"PO-Revision-Date: 2010-08-16 09:40+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-16 06:45+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
addons/account_analytic_default/account_analytic_default_view.xml
+3 -2
View File
@@ -52,7 +52,7 @@
</search>
</field>
</record>
<record id="action_analytic_default_form" model="ir.actions.act_window">
<field name="name">Analytic Defaults</field>
<field name="res_model">account.analytic.default</field>
@@ -81,7 +81,8 @@
id="analytic_rule_action_user"
res_model="account.analytic.default"
src_model="res.users"
domain="[('user_id','=',active_id)]"/>
domain="[('user_id','=',active_id)]"
groups="base.group_extended"/>
<act_window
name="Analytic Rules"
addons/account_analytic_default/i18n/it.po
+8 -8
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: 2009-09-08 15:21+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"PO-Revision-Date: 2010-08-16 08:15+0000\n"
"Last-Translator: Nicola Riolini - Micronaet <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-12 03:59+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_default
@@ -21,12 +21,12 @@ msgstr ""
#: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_form
#: model:ir.ui.menu,name:account_analytic_default.menu_analytic_defaul_form
msgid "Analytic Defaults"
msgstr ""
msgstr "Valori predefiniti Conti analitici"
#. module: account_analytic_default
#: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
msgid "Account Analytic Default"
msgstr ""
msgstr "Valori predefiniti Conti Analitici"
#. module: account_analytic_default
#: constraint:ir.ui.view:0
@@ -69,12 +69,12 @@ msgstr "Prodotto"
#. module: account_analytic_default
#: field:account.analytic.default,analytic_id:0
msgid "Analytic Account"
msgstr ""
msgstr "Conto analitico"
#. module: account_analytic_default
#: model:ir.model,name:account_analytic_default.model_account_analytic_default
msgid "Analytic Distributions"
msgstr ""
msgstr "Distribuzione conto analitico"
#. module: account_analytic_default
#: field:account.analytic.default,user_id:0
@@ -84,7 +84,7 @@ msgstr "Utente"
#. module: account_analytic_default
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr ""
msgstr "Nome del modulo non valido nella definizione dell'azione."
#. module: account_analytic_default
#: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open
addons/account_analytic_default/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-15 10:38+0000\n"
"PO-Revision-Date: 2010-08-16 09:40+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-16 06:45+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_default
addons/account_analytic_default/i18n/nb.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-15 11:37+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"PO-Revision-Date: 2010-08-16 09:47+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Norwegian Bokmal <nb@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-16 06:45+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 07:00+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-15 10:33+0000\n"
"PO-Revision-Date: 2010-08-16 09:40+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-16 06:45+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_default
addons/account_analytic_plans/account_analytic_plans.py
+8 -8
View File
@@ -53,7 +53,7 @@ class account_analytic_plan(osv.osv):
'name': fields.char('Analytic Plan', size=64, required=True, select=True,),
'plan_ids': fields.one2many('account.analytic.plan.line','plan_id','Analytic Plans'),
}
account_analytic_plan()
class account_analytic_plan_line(osv.osv):
@@ -72,7 +72,7 @@ class account_analytic_plan_line(osv.osv):
'min_required': 100.0,
'max_required': 100.0,
}
account_analytic_plan_line()
class account_analytic_plan_instance(osv.osv):
@@ -168,7 +168,7 @@ class account_analytic_plan_instance(osv.osv):
<field name="account%d_ids" string="%s" colspan="4">
<tree string="%s" editable="bottom">
<field name="rate"/>
<field name="analytic_account_id" domain="[('parent_id','child_of',[%d])]"/>
<field name="analytic_account_id" domain="[('parent_id','child_of',[%d])]" groups="base.group_extended"/>
</tree>
</field>
<newline/>"""%(i,tools.to_xml(line.name),tools.to_xml(line.name),line.root_analytic_id and line.root_analytic_id.id or 0)
@@ -189,7 +189,7 @@ class account_analytic_plan_instance(osv.osv):
pids = self.pool.get('account.analytic.plan.instance').search(cr, uid, [('name','=',vals['name']),('code','=',vals['code']),('plan_id','<>',False)])
if pids:
raise osv.except_osv(_('Error'), _('A model having this name and code already exists !'))
acct_anal_acct = self.pool.get('account.analytic.account')
acct_anal_plan_line_obj = self.pool.get('account.analytic.plan.line')
res = acct_anal_plan_line_obj.search(cr, uid, [('plan_id','=',journal.plan_id.id)])
@@ -256,7 +256,7 @@ class account_journal(osv.osv):
_columns = {
'plan_id':fields.many2one('account.analytic.plan', 'Analytic Plans'),
}
account_journal()
class account_invoice_line(osv.osv):
@@ -282,7 +282,7 @@ class account_invoice_line(osv.osv):
if rec and rec.analytics_id:
res_prod['value'].update({'analytics_id':rec.analytics_id.id})
return res_prod
account_invoice_line()
class account_move_line(osv.osv):
@@ -396,7 +396,7 @@ class analytic_default(osv.osv):
_columns = {
'analytics_id': fields.many2one('account.analytic.plan.instance', 'Analytic Distribution'),
}
analytic_default()
class sale_order_line(osv.osv):
@@ -409,7 +409,7 @@ class sale_order_line(osv.osv):
sale_line = self.browse(cr, uid, ids[0], context)
inv_line_obj = self.pool.get('account.invoice.line')
acct_anal_def_obj = self.pool.get('account.analytic.default')
for line in inv_line_obj.browse(cr, uid, create_ids, context):
rec = acct_anal_def_obj.account_get(cr, uid, line.product_id.id, sale_line.order_id.partner_id.id, uid, time.strftime('%Y-%m-%d'), context)
addons/account_analytic_plans/account_analytic_plans_view.xml
+9 -9
View File
@@ -24,7 +24,7 @@
<field name="inherit_id" ref="account.view_move_form"/>
<field name="arch" type="xml">
<field name="analytic_account_id" position="replace">
<field name="analytics_id" context="{'journal_id':journal_id}"/>
<field name="analytics_id" context="{'journal_id':journal_id}" groups="base.group_extended"/>
</field>
</field>
</record>
@@ -45,7 +45,7 @@
<field name="inherit_id" ref="account.view_move_line_form"/>
<field name="arch" type="xml">
<field name="move_id" position="after">
<field name="analytics_id" context="{'journal_id':journal_id}" />
<field name="analytics_id" context="{'journal_id':journal_id}" groups="base.group_extended"/>
</field>
</field>
</record>
@@ -60,7 +60,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<field name="account_analytic_id" position="replace">
<field name="analytics_id" context="{'journal_id':parent.journal_id}" domain="[('plan_id','&lt;&gt;',False)]"/>
<field name="analytics_id" context="{'journal_id':parent.journal_id}" domain="[('plan_id','&lt;&gt;',False)]" groups="base.group_extended"/>
</field>
</field>
</record>
@@ -73,7 +73,7 @@
<field name="priority">2</field>
<field name="arch" type="xml">
<field name="account_analytic_id" position="replace">
<field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]" context="{'journal_id':parent.journal_id}" />
<field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]" context="{'journal_id':parent.journal_id}" groups="base.group_extended"/>
</field>
</field>
</record>
@@ -90,13 +90,13 @@
<field name="plan_id" required="True"/>
<field name="journal_id"/>
<field name="account_ids" nolabel="1" colspan="4">
<form string="Analytic Distribution">
<form string="Analytic Distribution">
<field name="rate"/>
<field name="analytic_account_id"/>
<field name="analytic_account_id" groups="base.group_extended"/>
</form>
<tree string="Analytic Distribution" editable="bottom">
<field name="rate"/>
<field name="analytic_account_id"/>
<field name="analytic_account_id" groups="base.group_extended"/>
</tree>
</field>
</form>
@@ -140,7 +140,7 @@
<field name="arch" type="xml">
<form string="Analytic Distribution Line">
<field name="plan_id"/>
<field name="analytic_account_id"/>
<field name="analytic_account_id" groups="base.group_extended"/>
<field name="rate"/>
</form>
</field>
@@ -153,7 +153,7 @@
<field name="arch" type="xml">
<tree string="Analytic Distribution Lines">
<field name="plan_id" select="1"/>
<field name="analytic_account_id" select="1"/>
<field name="analytic_account_id" select="1" groups="base.group_extended"/>
<field name="rate"/>
</tree>
</field>
addons/account_analytic_plans/i18n/it.po
+39 -9
View File
@@ -7,27 +7,27 @@ msgstr ""
"Project-Id-Version: OpenERP Server 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-15 12:58+0000\n"
"Last-Translator: eLBati - albatos.com <lorenzo.battistini@albatos.com>\n"
"PO-Revision-Date: 2010-08-16 08:32+0000\n"
"Last-Translator: Nicola Riolini - Micronaet <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-16 06:45+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account4_ids:0
msgid "Account4 Id"
msgstr ""
msgstr "ID Conto4"
#. module: account_analytic_plans
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
"Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
"speciali!"
"Il nome dell'oggetto deve iniziare con x_ e non può contenere caratteri "
"speciali !"
#. module: account_analytic_plans
#: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic
@@ -38,12 +38,12 @@ msgstr ""
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account5_ids:0
msgid "Account5 Id"
msgstr "Identificativo di Account5"
msgstr "ID Conto5"
#. module: account_analytic_plans
#: wizard_field:wizard.crossovered.analytic,init,date2:0
msgid "End Date"
msgstr "Data fine"
msgstr "Data finale"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance.line,rate:0
@@ -257,6 +257,36 @@ msgid ""
"for one account entry.\n"
" "
msgstr ""
"Questo modulo permette di usare molti piani analitici, This module allows to "
"use several analytic plans, in accordo al Giornale Contabile,\n"
"così queste linee multiple analitiche sono create quando una fatture, o la "
"voce, sono confermate.\n"
"\n"
"Per esempio, puoi definire la seguente struttura analitica:\n"
" Progetti\n"
" Progetto 1\n"
" Sotto progetto 1.1\n"
" Sotto progetto 1.2\n"
" Progetto 2\n"
" Venditori\n"
" Eric \n"
" Fabien\n"
"\n"
"Nell'esempio abbiamo due piani: Progetti e Venditori. Una linea dettaglio "
"della fattura deve essere in grado di scrivere voci di conto analitico in "
"due piani: Sotto Progetto 1.1 e Fabien. L'importo può essere anche diviso. "
"Il seguente esempio è relativo ad una fattura che riguarda due sotto "
"progetti ed è assegnata ad un venditore:\n"
"\n"
"Piano conti analitici1:\n"
" Sotto progetto 1.1: 50%\n"
" Sotto progetto 1.2: 50%\n"
"Piano conti analitici 2:\n"
" Eric: 100%\n"
"\n"
"Così, quando le linee/dettagli della fattura sono confermate, verranno "
"generate 3 linee di conto analitico per una voce di conto.\n"
" "
#. module: account_analytic_plans
#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
@@ -369,7 +399,7 @@ msgstr "Data di inizio"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
msgid "at"
msgstr ""
msgstr "a"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
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-15 10:38+0000\n"
"PO-Revision-Date: 2010-08-16 09:40+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-16 06:45+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 07:00+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-15 11:14+0000\n"
"PO-Revision-Date: 2010-08-16 09:38+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-16 06:45+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
addons/account_budget/crossovered_budget_view.xml
+8 -8
View File
@@ -78,14 +78,14 @@
<page string="Budget Lines">
<field name="crossovered_budget_line" widget="one2many_list" colspan="4" nolabel="1" mode="graph,tree">
<graph type="bar" string="Lines">
<field name="analytic_account_id" />
<field name="analytic_account_id" groups="base.group_extended"/>
<!--<field name="general_budget_id" operator="+" />-->
<field name="planned_amount" operator="+"/>
<field group="True" name="general_budget_id"/>
</graph>
<tree string="Budget Lines" editable="top">
<field name="crossovered_budget_id"/>
<field name="analytic_account_id"/>
<field name="analytic_account_id" groups="base.group_extended"/>
<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"/>
<field name="analytic_account_id" groups="base.group_extended"/>
<field name="date_from"/>
<field name="date_to"/>
<field name="paid_date"/>
@@ -126,7 +126,7 @@
<field name="date_to"/>
<field name="crossovered_budget_line" colspan="4" nolabel="1">
<tree string="Budget Lines">
<field name="analytic_account_id"/>
<field name="analytic_account_id" groups="base.group_extended"/>
<field name="general_budget_id"/>
<field name="date_from"/>
<field name="date_to"/>
@@ -137,7 +137,7 @@
<field name="percentage"/>
</tree>
<form string="Budget Lines">
<field name="analytic_account_id" select="1"/>
<field name="analytic_account_id" select="1" groups="base.group_extended"/>
<field name="general_budget_id" select="1"/>
<field name="date_from"/>
<field name="date_to"/>
@@ -163,7 +163,7 @@
<field name="model">crossovered.budget</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree colors="blue:state in ('draft');gray:state in ('done','cancel');black:state in ('confirm','validate')" string="Budget">
<tree colors="blue:state in ('draft');gray:state in ('done','cancel');black:state in ('confirm','validate')" string="Budget">
<field name="name" colspan="1" select="1"/>
<field name="code" colspan="1" select="1" />
<field name="state"/>
@@ -211,7 +211,7 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Budget Lines">
<field name="analytic_account_id"/>
<field name="analytic_account_id" groups="base.group_extended"/>
<field name="general_budget_id"/>
<field name="date_from"/>
<field name="date_to"/>
@@ -230,7 +230,7 @@
<field name="arch" type="xml">
<form string="Budget Lines">
<field name="crossovered_budget_id"/>
<field name="analytic_account_id" select="1"/>
<field name="analytic_account_id" select="1" groups="base.group_extended"/>
<field name="general_budget_id" select="1"/>
<field name="date_from"/>
<field name="date_to"/>
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-15 12:33+0000\n"
"PO-Revision-Date: 2010-08-16 09:43+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-16 06:46+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
addons/account_budget/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-15 12:41+0000\n"
"PO-Revision-Date: 2010-08-16 09: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-16 06:46+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 07:00+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-15 09:24+0000\n"
"PO-Revision-Date: 2010-08-16 09:25+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-16 06:46+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 07:01+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-15 11:26+0000\n"
"PO-Revision-Date: 2010-08-16 09:38+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-16 06:43+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 06:58+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-15 10:27+0000\n"
"PO-Revision-Date: 2010-08-16 09:40+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-16 06:43+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 06:58+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
addons/account_invoice_layout/__init__.py
+3 -2
View File
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@@ -15,12 +15,13 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import account_invoice_layout
import report
import wizard
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/account_invoice_layout/__openerp__.py
+1 -1
View File
@@ -37,7 +37,7 @@
""",
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
'depends': ['base', 'account'],
'depends': ['account'],
'init_xml': [],
'update_xml': [
'security/ir.model.access.csv',
addons/account_invoice_layout/account_invoice_layout.py
+14 -13
View File
@@ -19,22 +19,21 @@
#
##############################################################################
from osv import fields,osv
from osv import fields, osv
class notify_message(osv.osv):
_name = 'notify.message'
_description = 'Notify By Messages'
_columns = {
'name' : fields.char('Title', size=64, required=True),
'msg' : fields.text('Special Message', size=125, required=True, help='This notification will appear at the bottom of the Invoices when printed.', translate=True)
'name': fields.char('Title', size=64, required=True),
'msg': fields.text('Special Message', size=128, required=True, help='This notification will appear at the bottom of the Invoices when printed.', translate=True)
}
notify_message()
class account_invoice_line(osv.osv):
def move_line_get_item(self, cr, uid, line, context={}):
def move_line_get_item(self, cr, uid, line, context=None):
if line.state != 'article':
return None
return super(account_invoice_line, self).move_line_get_item(cr, uid, line, context)
@@ -70,7 +69,7 @@ class account_invoice_line(osv.osv):
res[field]['states'][key] = value
return res
def onchange_invoice_line_view(self, cr, uid, id, type, context={}, *args):
def onchange_invoice_line_view(self, cr, uid, id, type, context=None, *args):
if (not type):
return {}
@@ -131,7 +130,7 @@ class account_invoice_line(osv.osv):
default['state'] = self.browse(cr, uid, id).state
return super(account_invoice_line, self).copy_data(cr, uid, id, default, context)
def _fnct(self, cr, uid, id, name, args, context):
def _fnct(self, cr, uid, id, name, args, context=None):
res = {}
for m in self.browse(cr, uid, id):
if m.state != 'article':
@@ -165,18 +164,19 @@ class account_invoice_line(osv.osv):
def _default_account(self, cr, uid, context=None):
cr.execute("select id from account_account where parent_id IS NULL LIMIT 1")
res=cr.fetchone()
res = cr.fetchone()
return res[0]
_defaults = {
'state': lambda *a: 'article',
'sequence': lambda *a : 0,
'state': 'article',
'sequence': 0,
# 'account_id': _default_account
}
account_invoice_line()
class one2many_mod2(fields.one2many):
def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
if not context:
context = {}
@@ -210,6 +210,7 @@ class account_invoice(osv.osv):
'abstract_line_ids': fields.one2many('account.invoice.line', 'invoice_id', 'Invoice Lines',readonly=True, states={'draft':[('readonly',False)]}),
'invoice_line': one2many_mod2('account.invoice.line', 'invoice_id', 'Invoice Lines',readonly=True, states={'draft':[('readonly',False)]}),
}
account_invoice()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
account_invoice()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/account_invoice_layout/account_invoice_layout_report.xml
-6
View File
@@ -1,12 +1,6 @@
<?xml version="1.0"?>
<openerp>
<data>
<!-- <wizard string="Invoices with Layout and Message"
model="account.invoice"
name="wizard.notify_message"
id="wizard_notify_message"
keyword="client_print_multi"
/> -->
<report id="account_invoices_1"
string="Invoices with Layout"
addons/account_invoice_layout/account_invoice_layout_view.xml
+3 -2
View File
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
<openerp>
<data>
@@ -73,6 +74,7 @@
<form string="Messages">
<separator string="Write a notification or a wishful message." colspan="4"/>
<field name="name" select="1" colspan="2" />
<newline/>
<field name="msg" select="1" colspan="2"/>
</form>
</field>
@@ -83,10 +85,9 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem name="Notification Message" id="menu_finan_config_notify_message" parent="account.menu_finance_configuration"/>
<menuitem name="All Notification Messages" id="menu_notify_mesage_tree_form" action="notify_mesage_tree_form" parent="menu_finan_config_notify_message" groups="base.group_system"/>
</data>
</openerp>
addons/account_invoice_layout/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-15 11:08+0000\n"
"PO-Revision-Date: 2010-08-16 09:38+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-16 06:45+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 07:00+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-15 12:53+0000\n"
"PO-Revision-Date: 2010-08-16 09:42+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-16 06:45+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
addons/account_invoice_layout/report/report_account_invoice_layout.py
+3 -3
View File
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@@ -15,12 +15,12 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import time
import pooler
from report import report_sxw
class account_invoice_1(report_sxw.rml_parse):
addons/account_invoice_layout/report/special_message_invoice.py
+3 -2
View File
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@@ -15,11 +15,12 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import time
from report import report_sxw
import pooler
addons/account_invoice_layout/wizard/__init__.py
+1
View File
@@ -20,5 +20,6 @@
##############################################################################
import account_invoice_special_message
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/account_invoice_layout/wizard/account_invoice_special_message.py
+5 -2
View File
@@ -18,6 +18,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
from osv import osv, fields
class account_invoice_special_msg(osv.osv_memory):
@@ -32,17 +33,19 @@ class account_invoice_special_msg(osv.osv_memory):
datas = {}
if context is None:
context = {}
data = self.read(cr, uid, ids, [])[0]
datas = {
'ids': context.get('active_ids',[]),
'model': 'account.invoice',
'form': data
}
}
return {
'type': 'ir.actions.report.xml',
'report_name': 'notify_account.invoice',
'datas': datas,
}
}
account_invoice_special_msg()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/account_payment/account_payment_view.xml
+1 -1
View File
@@ -299,7 +299,7 @@
<field name="type">form</field>
<field name="inherit_id" ref="account.view_bank_statement_form"/>
<field name="arch" type="xml">
<group col="6" colspan="4" position="inside">
<group col="7" colspan="4" position="inside">
<button colspan="2" name="%(action_account_populate_statement_confirm)d" string="Import payment lines" type="action" icon="gtk-open"/>
</group>
</field>
addons/account_payment/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-15 10:04+0000\n"
"PO-Revision-Date: 2010-08-16 09:46+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-16 06:45+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 07:00+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-15 10:07+0000\n"
"PO-Revision-Date: 2010-08-16 09:47+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-16 06:45+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
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-15 12:58+0000\n"
"PO-Revision-Date: 2010-08-16 09:42+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-16 06:43+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 06:57+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-15 12:14+0000\n"
"PO-Revision-Date: 2010-08-16 09:44+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-16 06:43+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 06:57+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-15 12:00+0000\n"
"PO-Revision-Date: 2010-08-16 09:29+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-16 06:46+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 07:00+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-15 12:08+0000\n"
"PO-Revision-Date: 2010-08-16 09: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-16 06:46+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
addons/account_tax_include/account_tax_include.py
+6 -5
View File
@@ -18,6 +18,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import time
from osv import fields, osv
@@ -28,17 +29,17 @@ class account_invoice(osv.osv):
'price_type': fields.selection([('tax_included','Tax included'),
('tax_excluded','Tax excluded')],
'Price method', required=True, readonly=True,
states={'draft':[('readonly',False)]}),
states={'draft': [('readonly', False)]}),
}
_defaults = {
'price_type': 'tax_excluded',
}
def refund(self, cr, uid, ids, date=None, period_id=None, description=None):
def refund(self, cr, uid, ids, date=None, period_id=None, description=None, journal_id=None):
map_old_new = {}
refund_ids = []
for old_inv_id in ids:
new_id = super(account_invoice,self).refund(cr, uid, ids, date=date, period_id=period_id, description=description)
new_id = super(account_invoice,self).refund(cr, uid, ids, date=date, period_id=period_id, description=description, journal_id=journal_id)
refund_ids += new_id
map_old_new[old_inv_id] = new_id[0]
@@ -96,7 +97,7 @@ class account_invoice_line(osv.osv):
res[line.id]['price_subtotal'] = res[line.id]['price_subtotal_incl']
for tax in tax_obj.compute_inv(cr, uid, line.invoice_line_tax_id, res[line.id]['price_subtotal_incl']/line.quantity, line.quantity):
res[line.id]['price_subtotal'] = res[line.id]['price_subtotal'] - tax['amount']
res[line.id]['data'].append( tax)
res[line.id]['data'].append(tax)
res[line.id]['price_subtotal']= round(res[line.id]['price_subtotal'], dec_obj.precision_get(cr, uid, 'Account'))
res[line.id]['price_subtotal_incl']= round(res[line.id]['price_subtotal_incl'], dec_obj.precision_get(cr, uid, 'Account'))
@@ -164,7 +165,7 @@ class account_invoice_line(osv.osv):
# print "str context:", context
ctx = (context and context.copy()) or {}
ctx.update({'price_type': ctx.get('price_type','tax_excluded')})
ctx.update({'price_type': ctx.get('price_type', 'tax_excluded')})
return super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id=currency_id, context=ctx)
account_invoice_line()
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-15 12:56+0000\n"
"PO-Revision-Date: 2010-08-16 09:42+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-16 06:44+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 06:58+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
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-15 12:49+0000\n"
"PO-Revision-Date: 2010-08-16 09:43+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-16 06:46+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 07:00+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-15 12:55+0000\n"
"PO-Revision-Date: 2010-08-16 09:42+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-16 06:46+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
addons/account_voucher/voucher.py
+140 -86
View File
@@ -91,6 +91,17 @@ class account_voucher(osv.osv):
return res[0]
else:
return False
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)
@@ -105,7 +116,7 @@ class account_voucher(osv.osv):
_rec_name = 'number'
_columns = {
'name':fields.char('Name', size=256, required=False, readonly=True, states={'draft':[('readonly',False)]}),
'name':fields.char('Memo', size=256, required=False, readonly=True, states={'draft':[('readonly',False)]}),
'type': fields.selection([
('payment', 'Payment'),
('receipt', 'Receipt'),
@@ -133,22 +144,26 @@ class account_voucher(osv.osv):
\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),
'reference': fields.char('Reference', 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': 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)]}),
#'move_ids':fields.many2many('account.move.line', 'voucher_id', 'account_id', 'rel_account_move', 'Real Entry', 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.boolean('Pay Now ?', required=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'),
}
_defaults = {
'period_id': _get_period,
'type': _get_type,
'journal_id':_get_journal,
'currency_id': _get_currency,
'state': lambda *a: 'draft',
'pay_now':lambda *a: True,
'name': lambda *a: '/',
'date' : lambda *a: time.strftime('%Y-%m-%d'),
'reference_type': lambda *a: "none",
@@ -191,7 +206,25 @@ class account_voucher(osv.osv):
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}
@@ -208,10 +241,10 @@ class account_voucher(osv.osv):
'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
})
account_id = journal.default_credit_account_id
res.update({
'account_id':account_id.id
})
else:
account_id = journal.default_credit_account_id
res.update({
@@ -244,42 +277,44 @@ class account_voucher(osv.osv):
voucher_line_pool.unlink(dbcr, uid, line_ids)
voucher = voucher_pool.browse(dbcr, uid, ids[0])
if voucher.account_id.tax_ids:
if voucher.type in ('sale', 'purchase'):
if voucher.account_id.tax_ids:
for line in voucher.payment_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 !'))
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
}
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)
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]
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)
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:
@@ -312,12 +347,12 @@ class account_voucher(osv.osv):
# return res
def voucher_recheck(self, cr, uid, ids, context={}):
# self.open_voucher(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.open_voucher(cr, uid, ids, context)
self.action_move_line_create(cr, uid, ids)
self.write(cr, uid, ids, {'state':'posted'})
return True
@@ -450,54 +485,73 @@ class account_voucher(osv.osv):
line_ids = []
line_ids += [move_line_pool.create(cr, uid, move_line)]
rec_ids = []
for line in inv.payment_ids:
amount=0.0
if inv.type in ('payment'):
ref = line.ref
if inv.type == 'sale' and inv.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
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
'name':inv.name,
'debit':inv.pay_amount,
'credit':False,
'account_id':inv.pay_account_id.id or False,
'move_id':move_id ,
'journal_id':inv.pay_journal_id.id,
'period_id':inv.period_id.id,
'partner_id':inv.partner_id.id,
'ref':ref,
'date':inv.date
}
line_ids += [move_line_pool.create(cr, uid, move_line)]
else:
for line in inv.payment_ids:
amount=0.0
if 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 inv.type in ('payment'):
ref = line.ref
if line.account_analytic_id:
move_line.update({
'analytic_account_id':line.account_analytic_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 line.type == 'dr':
move_line.update({
'debit': line.amount or False
})
amount = line.amount
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
})
elif line.type == 'cr':
move_line.update({
'credit': line.amount or False
})
amount = line.amount
if line.account_analytic_id:
move_line.update({
'analytic_account_id':line.account_analytic_id.id
})
move_line_id = move_line_pool.create(cr, uid, move_line)
line_ids += [move_line_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]
rec = {
'move_id': move_id,
@@ -558,12 +612,12 @@ account_voucher()
class account_voucher_line(osv.osv):
_name = 'account.voucher.line'
_description = 'Voucher Line'
_columns = {
'voucher_id':fields.many2one('account.voucher', 'Voucher'),
'name':fields.char('Memo', size=256, required=True),
'name':fields.related('voucher_id', 'name', size=256, type='char', string='Memo'),
'account_id':fields.many2one('account.account','Account', required=True, domain=[('type','<>','view')]),
# 'partner_id': fields.many2one('res.partner', 'Partner', change_default=True),
'partner_id': fields.related('voucher_id','partner_id', type='many2one', relation='res.partner', string='Partner'),
'partner_id':fields.related('voucher_id', 'partner_id', type='many2one', relation='res.partner', string='Partner'),
'amount':fields.float('Amount'),
'type':fields.selection([('dr','Debit'),('cr','Credit')], 'Type'),
'ref':fields.char('Reference', size=32),
addons/account_voucher/voucher_view.xml
+69 -16
View File
@@ -32,13 +32,11 @@
<form string="Accounting Voucher">
<group col="6" colspan="4">
<field name="partner_id"/>
<field name="name"/>
<field name="number"/>
<field name="journal_id" select="1" on_change="onchange_journal(journal_id,type)"/>
<field name="account_id" on_change="onchange_account(account_id)"/>
<field name="name" colspan="4"/>
<field name="journal_id" widget="selection" select="1" on_change="onchange_journal(journal_id,type)"/>
<field name="account_id" widget="selection" on_change="onchange_account(account_id)" readonly="1"/>
<field name="type" on_change="onchange_journal(journal_id,type)"/>
</group>
<notebook colspan="4">
<page string="Voucher Entry">
<field name="payment_ids" colspan="4" nolabel="1" height="180">
@@ -56,10 +54,20 @@
<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'])]}"/>
<group col="2" colspan="1" attrs="{'invisible': [('type','!=','sale')]}">
<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','=',False)], 'required': [('pay_now','=',True)]}"/>
<field name="pay_account_id" attrs="{'readonly': [('pay_now','=',False)], 'required': [('pay_now','=',True)]}"/>
<field name="pay_amount"/>
</group>
<group col="2" colspan="1">
<separator string="Other Information" colspan="2"/>
<field name="number"/>
<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'])]}"/>
</group>
</group>
</page>
<page string="Journal Items">
@@ -74,7 +82,7 @@
</notebook>
<group col="10" colspan="4">
<field name="state"/>
<button name="open_voucher" states="draft" attrs="{'readonly':[('type','not in',['sale', 'purchase'])]}" string="Compute" type="object" icon="terp-stock_format-scientific"/>
<!-- <button name="open_voucher" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>-->
<button name="proforma_voucher" string="Create" states="draft" icon="terp-document-new"/>
<button name="recheck_voucher" string="Approve" states="recheck" icon="terp-check"/>
<!-- <button name="audit_complete" string="Audit Pass" states="posted" icon="terp-check"/>-->
@@ -182,7 +190,7 @@
<!-- Receipt Vouchers -->
<record model="ir.actions.act_window" id="action_receipt_vou_voucher_list">
<field name="name">Receivable Vouchers</field>
<field name="name">Sales Receipt</field>
<field name="res_model">account.voucher</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
@@ -193,10 +201,24 @@
</record>
<menuitem id="menu_action_receipt_vou_voucher_list"
action="action_receipt_vou_voucher_list" parent="account.menu_finance_receivables" sequence="12"/>
<!-- Sale Receipt Vouchers -->
<!-- <record model="ir.actions.act_window" id="action_receipt_vou_voucher_list_pay_now">-->
<!-- <field name="name">Sales Receipt Payment</field>-->
<!-- <field name="res_model">account.voucher</field>-->
<!-- <field name="view_type">form</field>-->
<!-- <field name="view_mode">tree,form,graph</field>-->
<!-- <field name="view_id" eval="view_voucher_tree"/>-->
<!-- <field name="domain">[('journal_id.type','=','sale')]</field>-->
<!-- <field name="context">{'type':'sale', 'pay_new':True}</field>-->
<!-- <field name="search_view_id" ref="view_voucher_filter_new"/>-->
<!-- </record>-->
<!-- <menuitem id="menu_action_receipt_vou_voucher_list_pay_now"-->
<!-- action="action_receipt_vou_voucher_list_pay_now" parent="account.menu_finance_receivables" sequence="12"/>-->
<!-- Purchase Vouchers -->
<record model="ir.actions.act_window" id="action_pay_vou_voucher_list">
<field name="name">Payable Vouchers</field>
<field name="name">Vendor Bills</field>
<field name="res_model">account.voucher</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
@@ -221,19 +243,50 @@
<menuitem action="action_voucher_list" id="menu_encode_entries_by_voucher" parent="account.menu_finance_entries" sequence="6"/>
<record id="action_cheque_register" model="ir.actions.act_window">
<field name="name">Vouchers</field>
<field name="name">Sales Payments</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">account.voucher</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('journal_id.type', '=', 'bank')]</field>
<field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt')]</field>
<field name="context">{'type':'bank'}</field>
<field name="view_id" ref="view_voucher_tree"/>
<field name="search_view_id" ref="view_voucher_filter_new"/>
</record>
<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>
<field name="res_model">account.voucher</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','payment')]</field>
<field name="context">{'type':'bank'}</field>
<field name="view_id" ref="view_voucher_tree"/>
<field name="search_view_id" ref="view_voucher_filter_new"/>
</record>
<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>
<field name="res_model">account.voucher</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('journal_id.type', 'in', ['bank']), ('type','=','payment')]</field>
<field name="context">{'type':'bank'}</field>
<field name="view_id" ref="view_voucher_tree"/>
<field name="search_view_id" ref="view_voucher_filter_new"/>
</record>
<menuitem action="action_cheque_pay_voucher"
id="menu_action_cheque_pay_voucher"
parent="account.menu_finance_bank_and_cash"/>
<menuitem action="action_cheque_register" id="menu_action_cheque_register" 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>
addons/account_voucher_payment/__openerp__.py
+2 -3
View File
@@ -25,8 +25,8 @@
"description": """Extension Account Voucher module includes allows to link payment / receipt
entries with voucher, also automatically reconcile during the payment and receipt entries
""",
"category" : "Generic Modules/Indian Accounting",
"website" : "http://tinyerpindia.com",
"category" : "Generic Modules/Accounting",
"website" : "http://www.openerp.com",
"depends" : [
"base",
"account",
@@ -43,7 +43,6 @@
],
"test" : [
# "test/account_voucher.yml",
"test/account_voucher_payment.yml",
],
addons/account_voucher_payment/account_voucher_payment.py
+97 -54
View File
@@ -25,6 +25,34 @@ from tools.translate import _
class account_move(osv.osv):
_inherit = 'account.move'
def _get_line_ids(self, cr, uid, ids, context=None):
result = {}
for line in self.pool.get('account.move.line').browse(cr, uid, ids, context=context):
result[line.move_id.id] = True
return result.keys()
def _amount_all(self, cr, uid, ids, name, args, context=None):
res = {}
for move in self.browse(cr, uid, ids, context=context):
rs = {
'reconcile_id': False,
}
for line in move.line_id:
if line.reconcile_id:
rs.update({
'reconcile_id': line.reconcile_id.id
})
res[move.id] = rs
return res
_columns = {
'reconcile_id': fields.function(_amount_all, method=True, type="many2one", relation="account.move.line", string='Reconcile',
store={
'account.move.line': (_get_line_ids, [], 20),
},
multi='all'),
}
def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
"""
Returns a list of ids based on search domain {args}
@@ -70,7 +98,7 @@ account_move_line()
class account_voucher(osv.osv):
_inherit = 'account.voucher'
_columns = {
'voucher_line_ids':fields.one2many('account.voucher.line', 'voucher_id', 'Voucher Lines', readonly=True, states={'draft':[('readonly',False)]}),
'payment_ids':fields.one2many('account.voucher.line', 'voucher_id', 'Voucher Lines', readonly=True, states={'draft':[('readonly',False)]}),
}
def action_move_line_create(self, cr, uid, ids, *args):
@@ -153,59 +181,75 @@ class account_voucher(osv.osv):
line_ids += [move_line_pool.create(cr, uid, move_line)]
rec_ids = []
for line in inv.payment_ids:
amount=0.0
if inv.type in ('payment'):
ref = line.ref
if inv.type == 'sale' and inv.pay_now:
#create the payment line manually
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
'name':inv.name,
'debit':inv.pay_amount,
'credit':False,
'account_id':inv.pay_account_id.id or False,
'move_id':move_id ,
'journal_id':inv.pay_journal_id.id,
'period_id':inv.period_id.id,
'partner_id':inv.partner_id.id,
'ref':ref,
'date':inv.date
}
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]
if line.move_id and inv.type in ('payment', 'receipt'):
rec_ids += [move_line_id]
for move_line in line.move_id.line_id:
if line.account_id.id == move_line.account_id.id:
rec_ids += [move_line.id]
line_ids += [move_line_pool.create(cr, uid, move_line)]
else:
for line in inv.payment_ids:
amount=0.0
if inv.type in ('payment'):
ref = line.ref
move_line = {
'name':line.name,
'debit':False,
'credit':False,
'account_id':line.account_id.id or False,
'move_id':move_id ,
'journal_id':inv.journal_id.id,
'period_id':inv.period_id.id,
'partner_id':line.partner_id.id or False,
'ref':ref,
'date':inv.date,
'analytic_account_id':False
}
if diff_currency_p:
amount_currency = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, line.amount)
line.amount = amount_currency
move_line.update({
'amount_currency':amount_currency,
'currency_id':inv.currency_id.id
})
if line.account_analytic_id:
move_line.update({
'analytic_account_id':line.account_analytic_id.id
})
if line.type == 'dr':
move_line.update({
'debit': line.amount or False
})
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]
if line.move_id and inv.type in ('payment', 'receipt'):
rec_ids += [move_line_id]
for move_line in line.move_id.line_id:
if line.account_id.id == move_line.account_id.id:
rec_ids += [move_line.id]
if rec_ids:
move_line_pool.reconcile_partial(cr, uid, rec_ids)
@@ -233,8 +277,7 @@ class account_voucher_line(osv.osv):
return data
_columns = {
# 'invoice_id' : fields.many2one('account.invoice','Invoice'),
'move_id' : fields.many2one('account.move','Journal Entry'),
'move_id' : fields.many2one('account.move','Bill / Invoice'),
}
def move_line_get_item(self, cr, uid, line, context={}):
addons/account_voucher_payment/account_voucher_payment_view.xml
+11 -11
View File
@@ -8,21 +8,21 @@
<field name="inherit_id" ref="account_voucher.view_voucher_form"/>
<field name="arch" type="xml">
<field name="payment_ids" position="replace">
<field name="voucher_line_ids" colspan="4" nolabel="1" height="200">
<field name="payment_ids" colspan="4" nolabel="1" height="200">
<tree string="Voucher Lines" editable="top">
<field name="name" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
<field name="account_id"/>
<field name="type" on_change="onchange_type(parent.partner_id,type,parent.type, parent.currency_id)"/>
<field name="move_id" context="{'ttype':parent.type, 'partner_id':parent.partner_id, 'voucher':True}" on_change="onchange_invoice_id(move_id, parent.currency_id)" domain="[('state','=','posted'), ('partner_id','=',parent.partner_id)]"/>
<!-- <field name="name"/>-->
<field name="ref" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
<field name="move_id" context="{'ttype':parent.type, 'partner_id':parent.partner_id, 'voucher':True}" on_change="onchange_invoice_id(move_id, parent.currency_id)" domain="[('state','=','posted'), ('partner_id','=',parent.partner_id), ('reconcile_id','=', False)]"/>
<field name="amount"/>
<field name="ref"/>
<field name="account_analytic_id"/>
<field name="type" on_change="onchange_type(parent.partner_id,type,parent.type, parent.currency_id)"/>
<field name="account_id"/>
<field name="account_analytic_id" groups="base.group_extended"/>
</tree>
</field>
</field>
</field>
</record>
<record id="view_move_line_form" model="ir.ui.view">
<field name="name">account.move.line.form.inherit</field>
<field name="model">account.move.line</field>
@@ -34,7 +34,7 @@
</field>
</field>
</record>
<record id="view_move_line_tree" model="ir.ui.view">
<field name="name">account.move.line.form.inherit</field>
<field name="model">account.move.line</field>
@@ -46,7 +46,7 @@
</field>
</field>
</record>
<record model="ir.ui.view" id="view_voucher_form_one">
<field name="name">account.voucher.form</field>
<field name="model">account.voucher</field>
@@ -57,6 +57,6 @@
<button name="%(action_view_account_voucher_unreconcile)d" string="Unreconcile" type="action" states="posted" icon="terp-stock_effects-object-colorize"/>
</button>
</field>
</record>
</record>
</data>
</openerp>
addons/analytic/__openerp__.py
+1 -2
View File
@@ -19,7 +19,6 @@
#
##############################################################################
{
"name" : "Analytic Account",
"version": "1.1",
@@ -37,4 +36,4 @@
'installable': True,
'active': False,
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/analytic/analytic.py
+40 -33
View File
@@ -25,19 +25,15 @@ import operator
from osv import fields, osv
import decimal_precision as dp
#
# Object definition
#
class account_analytic_account(osv.osv):
_name = 'account.analytic.account'
_description = 'Analytic Account'
def _compute_currency_for_level_tree(self, cr, uid, ids, ids2, res, context={}):
def _compute_currency_for_level_tree(self, cr, uid, ids, ids2, res, context=None):
# Handle multi-currency on each level of analytic account
# This is a refactoring of _balance_calc computation
cr.execute("SELECT a.id, r.currency_id FROM account_analytic_account a INNER JOIN res_company r ON (a.company_id = r.id) where a.id IN %s" , (tuple(ids2),))
currency= dict(cr.fetchall())
currency = dict(cr.fetchall())
res_currency= self.pool.get('res.currency')
for id in ids:
if id not in ids2:
@@ -50,7 +46,7 @@ class account_analytic_account(osv.osv):
else:
res[id] += res.get(child, 0.0)
cur_obj = res_currency.browse(cr, uid, currency.values(), context)
cur_obj = res_currency.browse(cr, uid, currency.values(), context=context)
cur_obj = dict([(o.id, o) for o in cur_obj])
for id in ids:
if id in ids2:
@@ -58,9 +54,10 @@ class account_analytic_account(osv.osv):
return dict([(i, res[i]) for i in ids ])
def _credit_calc(self, cr, uid, ids, name, arg, context={}):
def _credit_calc(self, cr, uid, ids, name, arg, context=None):
res = {}
if context is None:
context = {}
parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
for i in ids:
res.setdefault(i,0.0)
@@ -69,16 +66,18 @@ class account_analytic_account(osv.osv):
return res
where_date = ''
if context.get('from_date',False):
if context.get('from_date', False):
where_date += " AND l.date >= '" + context['from_date'] + "'"
if context.get('to_date',False):
if context.get('to_date', False):
where_date += " AND l.date <= '" + context['to_date'] + "'"
cr.execute("SELECT a.id, COALESCE(SUM(l.amount_currency),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id "+where_date+") WHERE l.amount_currency<0 and a.id IN %s GROUP BY a.id",(tuple(parent_ids),))
r = dict(cr.fetchall())
return self._compute_currency_for_level_tree(cr, uid, ids, parent_ids, r, context)
def _debit_calc(self, cr, uid, ids, name, arg, context={}):
def _debit_calc(self, cr, uid, ids, name, arg, context=None):
res = {}
if context is None:
context = {}
parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
for i in ids:
res.setdefault(i,0.0)
@@ -92,11 +91,14 @@ class account_analytic_account(osv.osv):
if context.get('to_date',False):
where_date += " AND l.date <= '" + context['to_date'] + "'"
cr.execute("SELECT a.id, COALESCE(SUM(l.amount_currency),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id "+where_date+") WHERE l.amount_currency>0 and a.id IN %s GROUP BY a.id" ,(tuple(parent_ids),))
r= dict(cr.fetchall())
return self._compute_currency_for_level_tree(cr, uid, ids, parent_ids, r, context)
r = dict(cr.fetchall())
return self._compute_currency_for_level_tree(cr, uid, ids, parent_ids, r, context=context)
def _balance_calc(self, cr, uid, ids, name, arg, context={}):
def _balance_calc(self, cr, uid, ids, name, arg, context=None):
res = {}
if context is None:
context = {}
parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
for i in ids:
res.setdefault(i,0.0)
@@ -114,11 +116,14 @@ class account_analytic_account(osv.osv):
for account_id, sum in cr.fetchall():
res[account_id] = sum
return self._compute_currency_for_level_tree(cr, uid, ids, parent_ids, res, context)
return self._compute_currency_for_level_tree(cr, uid, ids, parent_ids, res, context=context)
def _quantity_calc(self, cr, uid, ids, name, arg, context={}):
def _quantity_calc(self, cr, uid, ids, name, arg, context=None):
#XXX must convert into one uom
res = {}
if context is None:
context = {}
parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
for i in ids:
@@ -150,7 +155,7 @@ class account_analytic_account(osv.osv):
res[id] += res.get(child, 0.0)
return dict([(i, res[i]) for i in ids])
def name_get(self, cr, uid, ids, context={}):
def name_get(self, cr, uid, ids, context=None):
if not len(ids):
return []
res = []
@@ -168,13 +173,13 @@ class account_analytic_account(osv.osv):
res = self.name_get(cr, uid, ids)
return dict(res)
def _get_company_currency(self, cr, uid, ids, field_name, arg, context={}):
def _get_company_currency(self, cr, uid, ids, field_name, arg, context=None):
result = {}
for rec in self.browse(cr, uid, ids, context):
result[rec.id] = (rec.company_id.currency_id.id,rec.company_id.currency_id.code) or False
return result
def _get_account_currency(self, cr, uid, ids, field_name, arg, context={}):
def _get_account_currency(self, cr, uid, ids, field_name, arg, context=None):
result=self._get_company_currency(cr, uid, ids, field_name, arg, context={})
return result
@@ -209,19 +214,20 @@ class account_analytic_account(osv.osv):
'currency_id': fields.function(_get_account_currency, method=True, type='many2one', relation='res.currency', string='Account currency', store=True),
}
def _default_company(self, cr, uid, context={}):
def _default_company(self, cr, uid, context=None):
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 : 'normal',
'type' : 'normal',
'company_id': _default_company,
'state' : lambda *a : 'open',
'state' : 'open',
'user_id' : lambda self, cr, uid, ctx : uid,
'partner_id': lambda self, cr, uid, ctx: ctx.get('partner_id', False),
'contact_id': lambda self, cr, uid, ctx: ctx.get('contact_id', False),
'date_start': lambda *a: time.strftime('%Y-%m-%d')
'date_start': time.strftime('%Y-%m-%d')
}
def check_recursion(self, cr, uid, ids, parent=None):
@@ -238,14 +244,13 @@ class account_analytic_account(osv.osv):
vals['code'] = self.pool.get('ir.sequence').get(cr, uid, 'account.analytic.account')
return super(account_analytic_account, self).create(cr, uid, vals, context=context)
def copy(self, cr, uid, id, default=None, context={}):
def copy(self, cr, uid, id, default=None, context=None):
if not default:
default = {}
default['code'] = False
default['line_ids'] = []
return super(account_analytic_account, self).copy(cr, uid, id, default, context=context)
def on_change_parent(self, cr, uid, id, parent_id):
if not parent_id:
return {}
@@ -281,9 +286,9 @@ account_analytic_account()
class account_analytic_line(osv.osv):
_name = 'account.analytic.line'
_description = 'Analytic Line'
def _amount_currency(self, cr, uid, ids, field_name, arg, context={}):
def _amount_currency(self, cr, uid, ids, field_name, arg, context=None):
result = {}
for rec in self.browse(cr, uid, ids, context):
for rec in self.browse(cr, uid, ids, context=context):
cmp_cur_id=rec.company_id.currency_id.id
aa_cur_id=rec.account_id.currency_id.id
# Always provide the amount in currency
@@ -298,14 +303,14 @@ class account_analytic_line(osv.osv):
else:
result[rec.id]=rec.amount
return result
def _get_account_currency(self, cr, uid, ids, field_name, arg, context={}):
def _get_account_currency(self, cr, uid, ids, field_name, arg, context=None):
result = {}
for rec in self.browse(cr, uid, ids, context):
# Always provide second currency
result[rec.id] = (rec.account_id.currency_id.id,rec.account_id.currency_id.code)
return result
def _get_account_line(self, cr, uid, ids, context={}):
def _get_account_line(self, cr, uid, ids, context=None):
aac_ids = {}
for acc in self.pool.get('account.analytic.account').browse(cr, uid, ids):
aac_ids[acc.id] = True
@@ -337,10 +342,12 @@ class account_analytic_line(osv.osv):
}
_defaults = {
'date': lambda *a: time.strftime('%Y-%m-%d'),
'date': time.strftime('%Y-%m-%d'),
'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=c),
}
_order = 'date'
account_analytic_line()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/analytic/i18n/it.po
+284
View File
@@ -0,0 +1,284 @@
# Italian translation for openobject-addons
# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-06-18 10:59+0000\n"
"PO-Revision-Date: 2010-08-16 12:38+0000\n"
"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
"Language-Team: Italian <it@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-17 07:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic
#: field:account.analytic.account,child_ids:0
msgid "Child Accounts"
msgstr "Conto figlio"
#. module: analytic
#: help:account.analytic.line,amount_currency:0
msgid ""
"The amount expressed in the related account currency if not equal to the "
"company one."
msgstr ""
"L'importo espresso nella valuta del conto non è uguale a quella della "
"Compagnia"
#. module: analytic
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
"Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
"speciali!"
#. module: analytic
#: field:account.analytic.account,name:0
msgid "Account Name"
msgstr "Nome del conto"
#. module: analytic
#: help:account.analytic.line,unit_amount:0
msgid "Specifies the amount of quantity to count."
msgstr "Specifica la quantità da sommare"
#. module: analytic
#: help:account.analytic.line,currency_id:0
msgid "The related account currency if not equal to the company one."
msgstr "La relativa valuta del conto non è uguale a quella della Compagnia"
#. module: analytic
#: model:ir.module.module,description:analytic.module_meta_information
msgid ""
"Module for defining analytic accounting object.\n"
" "
msgstr ""
"Modulo per definire gli oggetti dei conti analitici\n"
" "
#. module: analytic
#: field:account.analytic.account,state:0
msgid "State"
msgstr "Stato"
#. module: analytic
#: field:account.analytic.account,user_id:0
msgid "Account Manager"
msgstr "Gestore Conti"
#. module: analytic
#: selection:account.analytic.account,state:0
msgid "Draft"
msgstr "Bozza"
#. module: analytic
#: selection:account.analytic.account,state:0
msgid "Closed"
msgstr "Chiuso"
#. module: analytic
#: field:account.analytic.account,debit:0
msgid "Debit"
msgstr "Debito"
#. module: analytic
#: help:account.analytic.account,state:0
msgid ""
"* When an account is created its in 'Draft' state. "
" \n"
"* If any associated partner is there, it can be in 'Open' state. "
" \n"
"* If any pending balance is there it can be in 'Pending'. "
" \n"
"* And finally when all the transactions are over, it can be in 'Close' "
"state. \n"
"* The project can be in either if the states 'Template' and 'Running'.\n"
" If it is template then we can make projects based on the template projects. "
"If its in 'Running' state it is a normal project. "
" \n"
" If it is to be reviewed then the state is 'Pending'.\n"
" When the project is completed the state is set to 'Done'."
msgstr ""
"* Quando un conto è creato è nello stato \"Draft\". "
" \n"
"* Se c'è qualche partner associato, puà essere nello stato \"Open\".\n"
"* Se c'è qualche pendenza può essere in \"Pending\".\n"
"* E, per conlcudere, quando tutte le transazioni sono finite, può essere "
"nello stato \"Closed\".\n"
"* Il progetto può essere in entrambe gli stati \"Template\" e \"Running\".\n"
"Se è nello stato template, allora possiamo creare progetti basati su di "
"esso. Se è in \"Running\" state è in progetto normale. Se deve essere "
"revisionato allora lo stato è \"Pending\".\n"
"Quando il progetto è completato lo stato è \"Done\"."
#. module: analytic
#: field:account.analytic.account,type:0
msgid "Account Type"
msgstr "Tipo di conto"
#. module: analytic
#: selection:account.analytic.account,state:0
msgid "Template"
msgstr "Modello"
#. module: analytic
#: selection:account.analytic.account,state:0
msgid "Pending"
msgstr "In sospeso"
#. module: analytic
#: model:ir.model,name:analytic.model_account_analytic_line
msgid "Analytic Line"
msgstr "Linea conto analitico"
#. module: analytic
#: field:account.analytic.account,description:0
#: field:account.analytic.line,name:0
msgid "Description"
msgstr "Descrizione"
#. module: analytic
#: help:account.analytic.line,amount:0
msgid ""
"Calculated by multiplying the quantity and the price given in the Product's "
"cost price."
msgstr ""
"Calcolato multiplicando la quantità e il prezzo dato nel campo "
"\"costo/prezzo del prodotto\""
#. module: analytic
#: field:account.analytic.account,company_id:0
#: field:account.analytic.line,company_id:0
msgid "Company"
msgstr "Compagnia"
#. module: analytic
#: field:account.analytic.account,quantity_max:0
msgid "Maximum Quantity"
msgstr "Quantità massima"
#. module: analytic
#: field:account.analytic.line,user_id:0
msgid "User"
msgstr "Utente"
#. module: analytic
#: field:account.analytic.account,parent_id:0
msgid "Parent Analytic Account"
msgstr "Conto Analitico padre"
#. module: analytic
#: field:account.analytic.line,date:0
msgid "Date"
msgstr "Data"
#. module: analytic
#: field:account.analytic.account,currency_id:0
#: field:account.analytic.line,currency_id:0
msgid "Account currency"
msgstr "Valuta del Conto"
#. module: analytic
#: selection:account.analytic.account,type:0
msgid "View"
msgstr "Visualizza"
#. module: analytic
#: help:account.analytic.account,quantity_max:0
msgid "Sets the higher limit of quantity of hours."
msgstr "Imposta il limite superiore della quantità di ore"
#. module: analytic
#: field:account.analytic.account,credit:0
msgid "Credit"
msgstr "Credito"
#. module: analytic
#: field:account.analytic.line,amount:0
msgid "Amount"
msgstr "Importo"
#. module: analytic
#: field:account.analytic.account,contact_id:0
msgid "Contact"
msgstr "Contatto"
#. module: analytic
#: selection:account.analytic.account,state:0
msgid "Cancelled"
msgstr "Cancellato"
#. module: analytic
#: field:account.analytic.account,balance:0
msgid "Balance"
msgstr "Saldo"
#. module: analytic
#: field:account.analytic.account,date_start:0
msgid "Date Start"
msgstr "Data Inizio"
#. module: analytic
#: field:account.analytic.account,quantity:0
#: field:account.analytic.line,unit_amount:0
msgid "Quantity"
msgstr "Quantità"
#. module: analytic
#: field:account.analytic.account,date:0
msgid "Date End"
msgstr "Data Fine"
#. module: analytic
#: field:account.analytic.account,code:0
msgid "Account Code"
msgstr "Codifica Conto"
#. module: analytic
#: selection:account.analytic.account,type:0
msgid "Normal"
msgstr "Normale"
#. module: analytic
#: field:account.analytic.account,complete_name:0
msgid "Full Account Name"
msgstr "Nome Conto completa"
#. module: analytic
#: field:account.analytic.line,account_id:0
#: model:ir.model,name:analytic.model_account_analytic_account
#: model:ir.module.module,shortdesc:analytic.module_meta_information
msgid "Analytic Account"
msgstr "Conto Analitico"
#. module: analytic
#: field:account.analytic.account,company_currency_id:0
msgid "Currency"
msgstr "Valuta"
#. module: analytic
#: field:account.analytic.line,amount_currency:0
msgid "Amount currency"
msgstr "Importo valuta"
#. module: analytic
#: field:account.analytic.account,partner_id:0
msgid "Associated Partner"
msgstr "Partner associato"
#. module: analytic
#: selection:account.analytic.account,state:0
msgid "Open"
msgstr "Aperto"
#. module: analytic
#: field:account.analytic.account,line_ids:0
msgid "Analytic Entries"
msgstr "Voci Conto Analitico"
addons/analytic_journal_billing_rate/i18n/it.po
+11 -11
View File
@@ -7,24 +7,24 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-02-03 08:33+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"PO-Revision-Date: 2010-08-16 10:21+0000\n"
"Last-Translator: Nicola Riolini - Micronaet <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-12 04:04+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "XML non valido per Visualizzazione Architettura!"
msgstr "XML non valido per Visualizzare l'architettura!"
#. module: analytic_journal_billing_rate
#: field:analytic_journal_rate_grid,journal_id:0
msgid "Analytic Journal"
msgstr ""
msgstr "Giornale conti analitici"
#. module: analytic_journal_billing_rate
#: constraint:ir.model:0
@@ -37,29 +37,29 @@ msgstr ""
#. module: analytic_journal_billing_rate
#: view:analytic_journal_rate_grid:0
msgid "Billing Rate per Journal for this Analytic Account"
msgstr ""
msgstr "Tasso di fatturazione per Giornale per questo Conto Analitico"
#. module: analytic_journal_billing_rate
#: field:analytic_journal_rate_grid,account_id:0
msgid "Analytic Account"
msgstr ""
msgstr "Conto analitico"
#. module: analytic_journal_billing_rate
#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
msgid "Relation table between journals and billing rates"
msgstr ""
msgstr "Tabella di relazione tra Giornali e tassi di fatturazione"
#. module: analytic_journal_billing_rate
#: field:account.analytic.account,journal_rate_ids:0
msgid "Invoicing Rate per Journal"
msgstr ""
msgstr "Tasso di fatturazione diviso per Giornale"
#. module: analytic_journal_billing_rate
#: model:ir.module.module,shortdesc:analytic_journal_billing_rate.module_meta_information
msgid "Analytic Journal Billing Rate"
msgstr ""
msgstr "Giornale Conti Analitici Tasso di fatturazione"
#. module: analytic_journal_billing_rate
#: field:analytic_journal_rate_grid,rate_id:0
msgid "Invoicing Rate"
msgstr ""
msgstr "Tasso di fatturazione"
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-15 10:06+0000\n"
"PO-Revision-Date: 2010-08-16 09:25+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-16 06:46+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 07:00+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-15 11:08+0000\n"
"PO-Revision-Date: 2010-08-16 09:29+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-16 06:46+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
addons/auction/auction.py
+1 -1
View File
@@ -618,7 +618,7 @@ class auction_lots(osv.osv):
'price_unit': lot.obj_price,
}
inv_line_obj.create(cr, uid, inv_line, context)
inv_ref.button_compute(cr, uid, invoice.values())
inv_ref.button_compute(cr, uid, invoices.values())
wf_service.trg_validate(uid, 'account.invoice', inv_id, 'invoice_proforma2', cr)
return invoices.values()
addons/auction/auction_view.xml
+91 -91
View File
@@ -5,9 +5,9 @@
<menuitem name="Configuration" parent="auction_menu_root" id="auction_config_menu" sequence="7"/>
<menuitem name="Tools Bar Codes" id="auction_outils_menu" parent="auction_menu_root" sequence="5" />
<menuitem name="Deliveries Management" action="action_auction_taken" id="menu_wizard_emporte" parent="auction_outils_menu"/>
<!-- Auction Management/Configuration/artist -->
<record model="ir.ui.view" id="view_auction_artist_tree">
<field name="name">auction.artists.tree</field>
<field name="model">auction.artists</field>
@@ -42,9 +42,9 @@
</record>
<menuitem name="Artists" parent="auction_config_menu" action="action_auction_artist" id="menu_auction_artist"/>
<!-- Auction Management/Configuration/objectcategories -->
<!-- Auction Management/Configuration/objectcategories -->
<record model="ir.ui.view" id="view_auction_object_categories_tree">
<field name="name">auction.lot.category.tree</field>
<field name="model">auction.lot.category</field>
@@ -55,7 +55,7 @@
</tree>
</field>
</record>
<record model="ir.ui.view" id="view_auction_object_categories_form">
<field name="name">auction.lot.category.form</field>
<field name="model">auction.lot.category</field>
@@ -71,17 +71,17 @@
</form>
</field>
</record>
<record model="ir.actions.act_window" id="action_auction_object_categories">
<field name="res_model">auction.lot.category</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_auction_object_categories_tree"/>
</record>
<menuitem name="Object Categories" parent="auction_config_menu" action="action_auction_object_categories" id="menu_auction_object_cat"/>
<!-- Auction Management/Auction Dates/New Auction Dates -->
<record model="ir.ui.view" id="view_auction_dates_tree">
<field name="name">Auction dates</field>
<field name="model">auction.dates</field>
@@ -95,7 +95,7 @@
</tree>
</field>
</record>
<record model="ir.ui.view" id="view_auction_dates_form">
<field name="name">Auction dates</field>
<field name="model">auction.dates</field>
@@ -122,8 +122,8 @@
<separator string="Analytic" colspan="4"/>
<field name="journal_id"/>
<field name="journal_seller_id"/>
<field name="account_analytic_id"/>
</page>
<field name="account_analytic_id" groups="base.group_extended"/>
</page>
<page string="Commissions">
<group col="4" colspan="4">
<group col="2" colspan="4">
@@ -194,7 +194,7 @@
<field name="name">Auctions</field>
<field name="res_model">auction.dates</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar</field>
<field name="view_mode">tree,form,calendar</field>
<field name="search_view_id" ref="view_auction_dates_filter"/>
<field name="context">{"search_default_draft": "1"}</field>
</record>
@@ -208,8 +208,8 @@
<menuitem name="Auctions" parent="auction_menu_root" id="auction_date_menu" sequence="1"/>
<menuitem name="Auctions" parent="auction_date_menu" id="menu_auction_dates_next1" action="action_auction_dates_next"/>
<record model="ir.ui.view" id="view_auction_lot_tree">
<field name="name">Auction lots</field>
<field name="model">auction.lots</field>
@@ -246,13 +246,13 @@
<newline/>
<field name="auction_id"/>
<field name="lot_type"/>
<field name="lot_local"/>
</group>
<field name="lot_local"/>
</group>
<notebook colspan="4">
<page string="Catalog">
<separator string="Inventory" colspan="2"/>
<group colspan="4" col="6">
<group colspan="2" col="4">
<group colspan="2" col="4">
<field name="product_id" colspan="4"/>
<field name="lot_num" select="1" />
<field name="bord_vnd_id"/>
@@ -295,7 +295,7 @@
<field name="paid_ach"/>
<field name="ach_inv_id"/>
<field name="ach_emp"/>
</group>
</group>
<group colspan="2" col="4">
<separator string="Seller Information" colspan="4"/>
<field name="seller_id"/>
@@ -306,7 +306,7 @@
<field name="paid_vnd"/>
</group>
</group>
<group colspan="4" col="4">
<group colspan="4" col="4">
<separator string="" colspan="4"/>
<field name="state" colspan="1"/>
<group col="8" colspan="2">
@@ -314,8 +314,8 @@
<button name="button_not_bought" string="Not sold" states="draft" type="object" icon="gtk-undo"/>
<button name="button_taken_away" string="Taken away" states="sold" type="object" icon="gtk-goto-last"/>
<button name="button_unpaid" string="Set to draft" states="sold,unsold,paid" type="object" icon="gtk-convert"/>
</group>
</group>
</group>
</group>
</page>
<page string="Bids">
<field name="bid_lines" colspan="4" nolabel="1" editable="top">
@@ -358,7 +358,7 @@
</form>
</field>
</group>
<group colspan="2" col="2">
<group colspan="2" col="2">
<field name="history_ids" colspan="4" readonly="1" nolabel="1">
<tree string="History">
<field name="name"/>
@@ -373,7 +373,7 @@
</form>
</field>
</record>
<record id="view_auction_lots_filter" model="ir.ui.view">
<field name="name">Auction Lots search</field>
<field name="model">auction.lots</field>
@@ -416,9 +416,9 @@
</search>
</field>
</record>
<!-- Graph view for Auction Lots -->
<!-- Graph view for Auction Lots -->
<record model="ir.ui.view" id="auction_lot_graph">
<field name="name">Auction lots</field>
<field name="model">auction.lots</field>
@@ -440,9 +440,9 @@
<field name="search_view_id" ref="view_auction_lots_filter"/>
<field name="context">{"search_default_draft": "1"}</field>
</record>
<!-- Action for Bids -->
<act_window name="Open Bids"
domain="[('lot_id', '=', active_id)]"
res_model="auction.bid_line"
@@ -468,62 +468,62 @@
<newline/>
<notebook colspan="4">
<page string="General Information">
<field name="lot_id" colspan="4" mode="tree,graph" nolabel="1">
<tree string="Objects">
<field name="lot_num"/>
<field name="obj_num"/>
<field name="auction_id"/>
<field name="name"/>
<field name="obj_price"/>
<field name="vnd_lim"/>
<field name="lot_est1"/>
<field name="lot_est2"/>
</tree>
<form string="Objects">
<notebook colspan="4">
<page string="Description">
<field name="auction_id" colspan="4"/>
<field name="lot_num"/>
<field name="obj_num"/>
<newline/>
<field name="name"/>
<field name="lot_type" select="1"/>
<field name="name2"/>
<newline/>
<field name="artist_id"/>
<field name="artist2_id"/>
<separator string="Objects Description" colspan="4"/>
<field name="obj_desc" colspan="4" nolabel="1"/>
<field name="vnd_lim"/>
<field name="vnd_lim_net"/>
<field name="lot_est1"/>
<field name="lot_est2"/>
<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False),('type_tax_use','&lt;&gt;','sale')]"/>
<field name="product_id" domain="[('sale_ok','=',True)]"/>
<field name="state" readonly="1" colspan="4"/>
</page>
<page string="Photos">
<field name="image" colspan="4" widget="image"/>
</page>
</notebook>
</form>
</field>
<field name="lot_id" colspan="4" mode="tree,graph" nolabel="1">
<tree string="Objects">
<field name="lot_num"/>
<field name="obj_num"/>
<field name="auction_id"/>
<field name="name"/>
<field name="obj_price"/>
<field name="vnd_lim"/>
<field name="lot_est1"/>
<field name="lot_est2"/>
</tree>
<form string="Objects">
<notebook colspan="4">
<page string="Description">
<field name="auction_id" colspan="4"/>
<field name="lot_num"/>
<field name="obj_num"/>
<newline/>
<field name="name"/>
<field name="lot_type" select="1"/>
<field name="name2"/>
<newline/>
<field name="artist_id"/>
<field name="artist2_id"/>
<separator string="Objects Description" colspan="4"/>
<field name="obj_desc" colspan="4" nolabel="1"/>
<field name="vnd_lim"/>
<field name="vnd_lim_net"/>
<field name="lot_est1"/>
<field name="lot_est2"/>
<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False),('type_tax_use','&lt;&gt;','sale')]"/>
<field name="product_id" domain="[('sale_ok','=',True)]"/>
<field name="state" readonly="1" colspan="4"/>
</page>
<page string="Photos">
<field name="image" colspan="4" widget="image"/>
</page>
</notebook>
</form>
</field>
</page>
<page string="Extra Costs">
<field name="specific_cost_ids" widget="one2many_list" nolabel="1" colspan="4">
<tree string="Deposit Costs" editable="top">
<field name="name"/>
<field name="amount"/>
<field name="account" domain="[('type','=','income')]"/>
</tree>
<form string="Deposit Costs">
<field name="name"/>
<field name="amount"/>
<field name="account"/>
</form>
</field>
<page string="Extra Costs">
<field name="specific_cost_ids" widget="one2many_list" nolabel="1" colspan="4">
<tree string="Deposit Costs" editable="top">
<field name="name"/>
<field name="amount"/>
<field name="account" domain="[('type','=','income')]"/>
</tree>
<form string="Deposit Costs">
<field name="name"/>
<field name="amount"/>
<field name="account"/>
</form>
</field>
</page>
</notebook>
</notebook>
</form>
</field>
</record>
@@ -543,7 +543,7 @@
</tree>
</field>
</record>
<record id="view_deposit_border_filter" model="ir.ui.view">
<field name="name">Deposit border</field>
<field name="model">auction.deposit</field>
@@ -569,7 +569,7 @@
<filter string="Deposit Date"
icon="terp-go-month"
help="Deposit Date" domain="[]"
context="{'group_by':'date_dep'}"/>
context="{'group_by':'date_dep'}"/>
</group>
</search>
</field>
@@ -603,7 +603,7 @@
<menuitem name="Deposit border" parent="auction_seller_menu" action="action_deposit_border" id="menu_auction_deposit_border"/>
<!-- Bids Lines View -->
<record model="ir.ui.view" id="view_bids_tree">
<field name="name">auction.bid_line.tree1</field>
<field name="model">auction.bid_line</field>
@@ -617,7 +617,7 @@
</tree>
</field>
</record>
<record model="ir.ui.view" id="view_bids_form">
<field name="name">auction.bid_line.form1</field>
<field name="model">auction.bid_line</field>
@@ -708,7 +708,7 @@
<menuitem name="Buyers" id="auction_buyers_menu" parent="auction_menu_root" sequence="4"/>
<menuitem name="Bids" parent="auction_buyers_menu" action="action_bid_open" id="menu_action_bid_open"/>
<menuitem name="Reporting" id="auction_report_menu" parent="auction_menu_root" sequence="6"/>
<act_window name="Deposit slip"
@@ -718,5 +718,5 @@
id="act_auction_lot_open_deposit"/>
</data>
</openerp>
</openerp>
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-15 11:06+0000\n"
"PO-Revision-Date: 2010-08-16 09:38+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-16 06:46+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
addons/auction/i18n/nl.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-15 12:52+0000\n"
"PO-Revision-Date: 2010-08-16 09: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-16 06:45+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
addons/auction/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-15 10:08+0000\n"
"PO-Revision-Date: 2010-08-16 09: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-16 06:46+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
addons/auction/report/lots_list_landscape.py
+1 -1
View File
@@ -23,7 +23,7 @@ import pooler
import time
from report import report_sxw
class lots_list_llandscape(report_sxw.rml_parse):
class lots_list_landscape(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
super(lots_list_landscape, self).__init__(cr, uid, name, context=context)
self.localcontext.update({
addons/auction/wizard/auction_aie_send.py
+7 -6
View File
@@ -22,12 +22,13 @@
#
# Does not properly work concurrently !!!
#
import base64
import mimetypes
import httplib
import threading
from tools.translate import _
from osv import fields,osv
from tools.translate import _
import base64
import httplib
import mimetypes
import netsvc
import threading
class auction_lots_send_aie(osv.osv_memory):
_name = 'auction.lots.send.aie'
@@ -146,7 +147,7 @@ class auction_lots_send_aie(osv.osv_memory):
if len(datas):
bin = base64.decodestring(datas[0]['image'])
fname = datas[0]['name']
_photo_bin_send(uname, passwd, ref, did, fname, bin)
self._photo_bin_send(uname, passwd, ref, did, fname, bin)
def get_dates(self, cr, uid, ids, context={}):
import httplib
addons/auction/wizard/auction_lots_buyer_map.py
+2 -1
View File
@@ -19,9 +19,10 @@
#
##############################################################################
from osv import osv,fields
from tools.translate import _
import netsvc
import sql_db
from osv import osv,fields
class wiz_auc_lots_buyer_map(osv.osv_memory):
_name = 'auction.lots.buyer_map'
addons/auction/wizard/auction_lots_sms_send.py
+1 -1
View File
@@ -48,7 +48,7 @@ class auction_lots_sms_send(osv.osv_memory):
lot_obj = self.pool.get('auction.lots')
partner_obj = self.pool.get('res.partner')
partner_address_obj = self.pool.get('res.partner.address')
for datas in self.read(cr, uid, ids):
for data in self.read(cr, uid, ids):
lots = lot_obj.read(cr, uid, context['active_ids'], ['obj_num','obj_price','ach_uid'])
res = partner_obj.read(cr, uid, [l['ach_uid'][0] for l in lots if l['ach_uid']], ['gsm'], context)
addons/auction/wizard/auction_transfer_unsold_object.py
+9 -9
View File
@@ -28,16 +28,7 @@ class auction_transfer_unsold_object(osv.osv):
'''
_name = 'auction.transfer.unsold.object'
_description = 'To transfer unsold objects'
_columns = {
'auction_id_from':fields.many2one('auction.dates', 'From Auction Date', required=True),
'auction_id_to':fields.many2one('auction.dates', 'To Auction Date', required=True),
}
_defaults = {
'auction_id_from': _start,
}
def _start(self, cr, uid, context):
"""
To initialize auction_id_from
@@ -52,7 +43,16 @@ class auction_transfer_unsold_object(osv.osv):
rec = lots_obj.browse(cr, uid, context['active_id'], context)
auction_from = rec and rec.auction_id.id or False
return auction_from
_columns = {
'auction_id_from':fields.many2one('auction.dates', 'From Auction Date', required=True),
'auction_id_to':fields.many2one('auction.dates', 'To Auction Date', required=True),
}
_defaults = {
'auction_id_from': _start,
}
def transfer_unsold_object(self, cr, uid, ids, context):
"""
To Transfer the unsold object
addons/audittrail/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-15 10:07+0000\n"
"PO-Revision-Date: 2010-08-16 09: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-16 06:46+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 07:00+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-15 10:13+0000\n"
"PO-Revision-Date: 2010-08-16 09:24+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-16 06:46+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 07:00+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-15 12:21+0000\n"
"PO-Revision-Date: 2010-08-16 09:02+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-16 06:46+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
addons/base_calendar/base_calendar.py
+3 -2
View File
@@ -1441,13 +1441,14 @@ true, it will allow you to hide the event alarm information without removing it.
data = self.read(cr, uid, event_id, ['date', 'date_deadline', \
'rrule', 'duration'])
if data.get('rrule'):
vals.update({
data.update({
'recurrent_uid': real_event_id,
'recurrent_id': data.get('date'),
'rrule_type': 'none',
'rrule': ''
})
new_id = self.copy(cr, uid, real_event_id, default=vals, context=context)
data.update(vals)
new_id = self.copy(cr, uid, real_event_id, default=data, context=context)
context.update({'active_id': new_id, 'active_ids': [new_id]})
continue
if not real_event_id in new_ids:
addons/base_calendar/security/ir.model.access.csv
+5 -5
View File
@@ -1,6 +1,6 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_calendar_attendee","calendar.attendee","model_calendar_attendee","base.group_system",1,1,1,1
"access_calendar_alarm","calendar.alarm","model_calendar_alarm","base.group_system",1,1,1,1
"access_res_alarm","res.alarm","model_res_alarm","base.group_system",1,1,1,1
"access_calendar_todo","calendar.todo","model_calendar_todo","base.group_system",1,1,1,1
"access_calendar_event","calendar.event.user","model_calendar_event","base.group_system",1,1,1,1
"access_calendar_attendee","calendar.attendee","model_calendar_attendee","base.group_user",1,1,1,1
"access_calendar_alarm","calendar.alarm","model_calendar_alarm","base.group_user",1,1,1,1
"access_res_alarm","res.alarm","model_res_alarm","base.group_user",1,1,1,1
"access_calendar_todo","calendar.todo","model_calendar_todo","base.group_user",1,1,1,1
"access_calendar_event","calendar.event","model_calendar_event","base.group_user",1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_calendar_attendee calendar.attendee model_calendar_attendee base.group_system base.group_user 1 1 1 1
3 access_calendar_alarm calendar.alarm model_calendar_alarm base.group_system base.group_user 1 1 1 1
4 access_res_alarm res.alarm model_res_alarm base.group_system base.group_user 1 1 1 1
5 access_calendar_todo calendar.todo model_calendar_todo base.group_system base.group_user 1 1 1 1
6 access_calendar_event calendar.event.user calendar.event model_calendar_event base.group_system base.group_user 1 1 1 1
addons/base_contact/i18n/it.po
+7 -7
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-03 01:02+0000\n"
"Last-Translator: mga (Open ERP) <Unknown>\n"
"PO-Revision-Date: 2010-08-16 08:49+0000\n"
"Last-Translator: Nicola Riolini - Micronaet <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-12 03:49+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 06:58+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_contact
@@ -137,7 +137,7 @@ msgstr "Fuinzioni Contatto"
#. module: base_contact
#: model:ir.module.module,shortdesc:base_contact.module_meta_information
msgid "Base Contact"
msgstr ""
msgstr "Contatto base"
#. module: base_contact
#: help:res.partner.job,sequence_partner:0
@@ -199,7 +199,7 @@ msgstr "Categorie"
#. module: base_contact
#: field:res.partner.contact,function_id:0
msgid "Main Function"
msgstr ""
msgstr "Fuzione principale"
#. module: base_contact
#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
@@ -214,7 +214,7 @@ msgstr "XML non valido per Visualizzazione Architettura!"
#. module: base_contact
#: model:process.process,name:base_contact.process_process_basecontactprocess0
msgid "Base Contact Process"
msgstr ""
msgstr "Processo Contatto base"
#. module: base_contact
#: view:res.partner.contact:0
@@ -234,7 +234,7 @@ msgstr "Cellulare"
#. module: base_contact
#: help:res.partner.job,extension:0
msgid "Internal/External extension phone number"
msgstr ""
msgstr "Estensione Interna/Esterna numero di telefono"
#. module: base_contact
#: model:process.node,note:base_contact.process_node_contacts0
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-15 11:18+0000\n"
"PO-Revision-Date: 2010-08-16 09:38+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-16 06:43+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 06:58+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: lt\n"
addons/base_contact/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-15 10:53+0000\n"
"PO-Revision-Date: 2010-08-16 09: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-16 06:43+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 06:58+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-15 11:53+0000\n"
"PO-Revision-Date: 2010-08-16 09:45+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-16 06:43+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 06:58+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-15 11:48+0000\n"
"PO-Revision-Date: 2010-08-16 09: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-16 06:43+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 06:57+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-15 10:58+0000\n"
"PO-Revision-Date: 2010-08-16 09: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-16 06:46+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_module_quality
addons/base_module_record/base_module_record.py
+14 -15
View File
@@ -541,29 +541,28 @@ class base_module_record(osv.osv):
else:
continue
if self.mode == "workflow":
record= self._generate_object_yaml(cr, uid, rec[1],rec[0])
yaml_file+="!comment Performing a workflow action %s on module %s"%(record['action'], record['model']) + '''\n'''
object=yaml.load(unicode('''\n !workflow %s \n'''%record,'iso-8859-1'))
attrs=attrs.replace("''", '"')
record = self._generate_object_yaml(cr, uid, rec[1],rec[0])
yaml_file += "!comment Performing a workflow action %s on module %s"%(record['action'], record['model']) + '''\n'''
object = yaml.load(unicode('''\n !workflow %s \n'''%record,'iso-8859-1'))
yaml_file += str(object) + '''\n\n'''
elif self.mode == 'osv_memory_action':
osv_action= self._generate_function_yaml(cr, uid, rec[1])
yaml_file+="!comment Performing an osv_memory action %s on module %s"%(osv_action['action'], osv_action['model']) + '''\n'''
osv_action=yaml.load(unicode('''\n !python %s \n'''%osv_action,'iso-8859-1'))
osv_action = self._generate_function_yaml(cr, uid, rec[1])
yaml_file += "!comment Performing an osv_memory action %s on module %s"%(osv_action['action'], osv_action['model']) + '''\n'''
osv_action = yaml.load(unicode('''\n !python %s \n'''%osv_action,'iso-8859-1'))
yaml_file += str(osv_action) + '''\n'''
attrs=yaml.dump(osv_action.attrs, default_flow_style=False)
attrs=attrs.replace("''", '"')
attrs=attrs.replace("'", '')
attrs = yaml.dump(osv_action.attrs, default_flow_style=False)
attrs = attrs.replace("''", '"')
attrs = attrs.replace("'", '')
yaml_file += attrs + '''\n\n'''
else:
record= self._generate_object_yaml(cr, uid, rec[1], rec[3])
record = self._generate_object_yaml(cr, uid, rec[1], rec[3])
if self.mode == "create" or self.mode == "copy":
yaml_file+="!comment Creating a %s record"%(record['model']) + '''\n'''
yaml_file += "!comment Creating a %s record"%(record['model']) + '''\n'''
else:
yaml_file+="!comment Modifying a %s record"%(record['model']) + '''\n'''
object= yaml.load(unicode('''\n !record %s \n'''%record,'iso-8859-1'))
yaml_file += "!comment Modifying a %s record"%(record['model']) + '''\n'''
object = yaml.load(unicode('''\n !record %s \n'''%record,'iso-8859-1'))
yaml_file += str(object) + '''\n'''
attrs=yaml.dump(object.attrs, default_flow_style=False)
attrs = yaml.dump(object.attrs, default_flow_style=False)
yaml_file += attrs + '''\n\n'''
yaml_result=''''''
addons/base_module_record/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-15 10:10+0000\n"
"PO-Revision-Date: 2010-08-16 09:24+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-16 06:43+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 06:58+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-15 10:53+0000\n"
"PO-Revision-Date: 2010-08-16 09: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-16 06:46+0000\n"
"X-Launchpad-Export-Date: 2010-08-17 07:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_report_creator

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