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

[MERGE]merged with trunk-survey-layout-tta

Browse Source 
bzr revid: vba@tinyerp.com-20120709130113-3lchipgil9oqpglg
This commit is contained in:
Vijaykumar Baladaniya
2012-07-09 18:31:13 +05:30
parent b982ea278b 3925f76ce8
commit be2e95656a
1383 changed files with 76988 additions and 94491 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account.py
+5 -9
View File
@@ -24,11 +24,12 @@ from datetime import datetime
from dateutil.relativedelta import relativedelta from dateutil.relativedelta import relativedelta
from operator import itemgetter from operator import itemgetter
import netsvc import logging
import pooler import pooler
from osv import fields, osv from osv import fields, osv
import decimal_precision as dp import decimal_precision as dp
from tools.translate import _ from tools.translate import _
_logger = logging.getLogger(__name__)
def check_cycle(self, cr, uid, ids, context=None): def check_cycle(self, cr, uid, ids, context=None):
""" climbs the ``self._table.parent_id`` chains for 100 levels or """ climbs the ``self._table.parent_id`` chains for 100 levels or
@@ -212,7 +213,6 @@ class account_account(osv.osv):
_name = "account.account" _name = "account.account"
_description = "Account" _description = "Account"
_parent_store = True _parent_store = True
logger = netsvc.Logger()
def search(self, cr, uid, args, offset=0, limit=None, order=None, def search(self, cr, uid, args, offset=0, limit=None, order=None,
context=None, count=False): context=None, count=False):
@@ -295,8 +295,7 @@ class account_account(osv.osv):
if aml_query.strip(): if aml_query.strip():
wheres.append(aml_query.strip()) wheres.append(aml_query.strip())
filters = " AND ".join(wheres) filters = " AND ".join(wheres)
self.logger.notifyChannel('addons.'+self._name, netsvc.LOG_DEBUG, _logger.debug('Filters: %s',(filters))
'Filters: %s'%filters)
# IN might not work ideally in case there are too many # IN might not work ideally in case there are too many
# children_and_consolidated, in that case join on a # children_and_consolidated, in that case join on a
# values() e.g.: # values() e.g.:
@@ -312,8 +311,7 @@ class account_account(osv.osv):
" GROUP BY l.account_id") " GROUP BY l.account_id")
params = (tuple(children_and_consolidated),) + query_params params = (tuple(children_and_consolidated),) + query_params
cr.execute(request, params) cr.execute(request, params)
self.logger.notifyChannel('addons.'+self._name, netsvc.LOG_DEBUG, _logger.debug('Status: %s',(cr.statusmessage))
'Status: %s'%cr.statusmessage)
for res in cr.dictfetchall(): for res in cr.dictfetchall():
accounts[res['id']] = res accounts[res['id']] = res
@@ -2095,9 +2093,7 @@ class account_tax(osv.osv):
} }
def compute(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None): def compute(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None):
logger = netsvc.Logger() _logger.warning("Deprecated, use compute_all(...)['taxes'] instead of compute(...) to manage prices with tax included")
logger.notifyChannel("warning", netsvc.LOG_WARNING,
"Deprecated, use compute_all(...)['taxes'] instead of compute(...) to manage prices with tax included")
return self._compute(cr, uid, taxes, price_unit, quantity, product, partner) return self._compute(cr, uid, taxes, price_unit, quantity, product, partner)
def _compute(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None): def _compute(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None):
addons/account/account_installer.xml
+1 -3
View File
@@ -9,13 +9,11 @@
<form position="attributes" version="7.0"> <form position="attributes" version="7.0">
<attribute name="string">Accounting Application Configuration</attribute> <attribute name="string">Accounting Application Configuration</attribute>
</form> </form>
<button name="action_skip" position="replace"/>
<button name="action_next" position="attributes"> <button name="action_next" position="attributes">
<attribute name="string">Continue</attribute> <attribute name="string">Continue</attribute>
</button> </button>
<separator string="title" position="replace"> <separator string="title" position="replace">
<group string="Select an Accounting Setup"> <group>
<label colspan="2" string="This will automatically configure your taxes and accounts."/>
<field name="charts"/> <field name="charts"/>
</group> </group>
<group string="Configure your Fiscal Year" groups="account.group_account_user"> <group string="Configure your Fiscal Year" groups="account.group_account_user">
addons/account/account_invoice_view.xml
+90 -58
View File
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<!--
Invoices <!-- Invoices -->
-->
<record id="view_invoice_line_calendar" model="ir.ui.view"> <record id="view_invoice_line_calendar" model="ir.ui.view">
<field name="name">account.invoice.calendar</field> <field name="name">account.invoice.calendar</field>
<field name="model">account.invoice</field> <field name="model">account.invoice</field>
@@ -39,7 +38,7 @@
<field name="quantity"/> <field name="quantity"/>
<field name="uos_id" groups="product.group_uom"/> <field name="uos_id" groups="product.group_uom"/>
<field name="price_unit"/> <field name="price_unit"/>
<field name="discount"/> <field name="discount" groups="sale.group_discount_per_so_line"/>
<field name="price_subtotal"/> <field name="price_subtotal"/>
</tree> </tree>
</field> </field>
@@ -61,8 +60,8 @@
on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/> on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
</div> </div>
<field name="price_unit"/> <field name="price_unit"/>
<field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_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(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)" groups="account.group_account_user"/>
<field name="discount"/> <field name="discount" groups="sale.group_discount_per_so_line"/>
<field name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]" widget="many2many_tags"/> <field name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]" widget="many2many_tags"/>
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/> <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
<field name="company_id" groups="base.group_multi_company" readonly="1"/> <field name="company_id" groups="base.group_multi_company" readonly="1"/>
@@ -98,7 +97,7 @@
<group col="4"> <group col="4">
<field name="name"/> <field name="name"/>
<field name="sequence"/> <field name="sequence"/>
<field name="account_id"/> <field name="account_id" groups="account.group_account_user"/>
<field name="manual"/> <field name="manual"/>
<field name="amount"/> <field name="amount"/>
<field name="base" readonly="0"/> <field name="base" readonly="0"/>
@@ -148,41 +147,49 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form version="7.0"> <form version="7.0">
<header> <header>
<button name="invoice_open" states="draft,proforma2" string="Validate"/> <span groups="base.group_user">
<button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid'/> <button name="invoice_open" states="draft,proforma2" string="Validate" class="oe_highlight"/>
<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/> <button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid' />
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/> <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
<button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/> <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
<button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
</span>
<field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/> <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
</header> </header>
<sheet string="Supplier Invoice"> <sheet string="Supplier Invoice">
<group> <div class="oe_title">
<group> <h1>
<field string="Supplier" name="partner_id" <label string="Draft Invoice" attrs="{'invisible': [('state', '&lt;&gt;', 'draft')]}"/>
<label for="number" class="oe_edit_only" attrs="{'invisible': [('state', '=', 'draft')]}"/>
<field name="number" class="oe_inline" attrs="{'invisible': [('state', '=', 'draft')]}"/>
</h1>
<h2>
<label for="origin" string="Concerns" class="oe_inline"/>
<field name="origin" placeholder="PO0025" class="oe_inline"/>
<label string=" from " attrs="{'invisible': [('origin', '=', False)]}" class='oe_inline'/>
<field string="Supplier" name="partner_id" class="oe_inline"
on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"
domain="[('supplier', '=', True)]"/> domain="[('supplier', '=', True)]"/>
<field name="fiscal_position" widget="selection"/> </h2>
</div>
<group>
<group>
<field name="date_invoice"/>
<field name="date_due"/>
<field name="type" invisible="1"/>
<field name="period_id" domain="[('state', '=', 'draft')]" groups="account.group_account_user" widget="selection"/>
</group> </group>
<group> <group>
<field name="number"/> <field name="fiscal_position" widget="selection"/>
<field name="date_invoice"/>
<field name="period_id" domain="[('state', '=', 'draft')]"
groups="account.group_account_user" widget="selection"/>
<field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"
groups="account.group_account_user"/>
<field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]"
name="account_id" groups="account.group_account_user"/>
<field name="currency_id"/> <field name="currency_id"/>
<field name="type" invisible="1"/> <field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]" name="account_id" groups="account.group_account_user" invisible="1"/>
</group> </group>
<group> <group>
<label for="reference"/> <label for="reference"/>
<div> <div>
<field name="reference_type"/>
<field name="reference" placeholder="Payment Reference"/> <field name="reference" placeholder="Payment Reference"/>
</div> </div>
<field name="date_due"/>
</group> </group>
</group> </group>
<notebook> <notebook>
@@ -190,15 +197,16 @@
<field context="{'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False, 'type': type}" name="invoice_line"> <field context="{'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False, 'type': type}" name="invoice_line">
<tree string="Invoice lines"> <tree string="Invoice lines">
<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.currency_id, context, parent.company_id)"/> <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.currency_id, context, 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(product_id,parent.partner_id,parent.type,parent.fiscal_position,account_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(product_id,parent.partner_id,parent.type,parent.fiscal_position,account_id)" groups="base.group_account_user"/>
<field name="invoice_line_tax_id" view_mode="2" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/> <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), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/> <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
<field name="quantity"/> <field name="quantity"/>
<field name="price_unit"/> <field name="price_unit"/>
<!-- Removed if subtotal is set -->
<field name="price_subtotal"/> <field name="price_subtotal"/>
<field invisible="True" name="name"/> <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id,parent.partner_id,parent.type,parent.fiscal_position,account_id)" invisible="1"/>
<field invisible="True" name="uos_id"/> <!-- Removed if subtotal is set -->
<field name="name" invisible="1"/>
<field name="uos_id" invisible="1"/>
</tree> </tree>
</field> </field>
<group> <group>
@@ -231,16 +239,17 @@
<field name="comment"/> <field name="comment"/>
</page> </page>
<page string="Other Info"> <page string="Other Info">
<group col="4"> <group>
<group>
<field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/> <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
<field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
<newline/>
<field name="payment_term" widget="selection"/> <field name="payment_term" widget="selection"/>
<field name="name"/> </group>
<newline/> <group>
<field name="origin" placeholder="PO0025"/>
<field name="user_id"/> <field name="user_id"/>
<field name="name" invisible="1"/>
<field name="move_id" groups="account.group_account_user"/> <field name="move_id" groups="account.group_account_user"/>
<field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
</group>
</group> </group>
</page> </page>
<page string="Payments"> <page string="Payments">
@@ -261,7 +270,7 @@
</notebook> </notebook>
</sheet> </sheet>
<footer> <footer>
<field name="message_ids" widget="ThreadView"/> <field name="message_ids" widget="mail_thread"/>
</footer> </footer>
</form> </form>
</field> </field>
@@ -274,15 +283,18 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form version="7.0"> <form version="7.0">
<header> <header>
<button name="action_invoice_sent" type="object" string="Send by Email" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/> <span groups="base.group_user">
<button name="invoice_print" string="Print Invoice" type="object" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/> <button name="action_invoice_sent" type="object" string="Send by Email" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}" class="oe_highlight"/>
<button name="invoice_open" states="draft,proforma2" string="Validate"/> <button name="invoice_print" string="Print Invoice" type="object" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}" class="oe_highlight"/>
<button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices"/> <button name="invoice_open" states="draft" string="Validate" class="oe_highlight"/>
<button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='paid'/> <button name="invoice_open" states="proforma2" string="Validate"/>
<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/> <button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices"/>
<button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object"/> <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='paid'/>
<button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/> <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
<!--button name="%(account_invoices)d" string="Print Invoice" type="action" states="open,paid,proforma,sale,proforma2"/--> <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object"/>
<button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
<!--button name="%(account_invoices)d" string="Print Invoice" type="action" states="open,paid,proforma,sale,proforma2"/-->
</span>
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/> <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
</header> </header>
<sheet string="Invoice"> <sheet string="Invoice">
@@ -304,7 +316,7 @@
on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
groups="base.group_user" context="{'search_default_customer': 1}" groups="base.group_user" context="{'search_default_customer': 1}"
domain="[('customer', '=', True)]"/> domain="[('customer', '=', True)]"/>
<field name="fiscal_position" widget="selection" options='{"quick_create": false}'/> <field name="fiscal_position" widget="selection" />
<field name="payment_term" widget="selection"/> <field name="payment_term" widget="selection"/>
</group> </group>
@@ -339,7 +351,7 @@
<field name="tax_line" nolabel="1"> <field name="tax_line" nolabel="1">
<tree editable="bottom" string="Taxes"> <tree editable="bottom" string="Taxes">
<field name="name"/> <field name="name"/>
<field name="account_id" groups="account.group_account_invoice"/> <field name="account_id" groups="account.group_account_user"/>
<field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/> <field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/>
<field name="amount" on_change="amount_change(amount,parent.currency_id,parent.company_id,parent.date_invoice)"/> <field name="amount" on_change="amount_change(amount,parent.currency_id,parent.company_id,parent.date_invoice)"/>
<field invisible="True" name="base_amount"/> <field invisible="True" name="base_amount"/>
@@ -357,7 +369,7 @@
<field name="amount_tax"/> <field name="amount_tax"/>
<field name="amount_total" class="oe_subtotal_footer_separator"/> <field name="amount_total" class="oe_subtotal_footer_separator"/>
<field name="residual" style="margin-top: 10px"/> <field name="residual" style="margin-top: 10px" groups="account.group_account_user"/>
<field name="reconciled" invisible="1"/> <field name="reconciled" invisible="1"/>
</group> </group>
</group> </group>
@@ -367,15 +379,15 @@
<field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/> <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
<newline/> <newline/>
<field name="date_due"/> <field name="date_due"/>
<field name="user_id"/> <field name="user_id" groups="base.group_user"/>
<newline/> <newline/>
<field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id"/> <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id"/>
<field name="origin" placeholder="SO0032"/> <field name="origin" placeholder="SO0032" groups="base.group_user"/>
<field name="move_id" groups="account.group_account_user"/> <field name="move_id" groups="account.group_account_user"/>
</group> </group>
<field name="comment" placeholder="Add an additional information in the invoice..."/> <field name="comment" placeholder="Add an additional information in the invoice..."/>
</page> </page>
<page string="Payments"> <page string="Payments" groups="base.group_user">
<field name="payment_ids"> <field name="payment_ids">
<tree string="Payments"> <tree string="Payments">
<field name="date"/> <field name="date"/>
@@ -393,7 +405,7 @@
</notebook> </notebook>
</sheet> </sheet>
<footer> <footer>
<field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/> <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
</footer> </footer>
</form> </form>
</field> </field>
@@ -482,7 +494,12 @@
<field name="domain">[('type','=','out_invoice')]</field> <field name="domain">[('type','=','out_invoice')]</field>
<field name="context">{'default_type':'out_invoice', 'type':'out_invoice', 'journal_type': 'sale'}</field> <field name="context">{'default_type':'out_invoice', 'type':'out_invoice', 'journal_type': 'sale'}</field>
<field name="search_view_id" ref="view_account_invoice_filter"/> <field name="search_view_id" ref="view_account_invoice_filter"/>
<field name="help">With Customer Invoices you can create and manage sales invoices issued to your customers. OpenERP can also generate draft invoices automatically from sales orders or deliveries. You should only confirm them before sending them to your customers.</field> <field name="help">
Click here to create a new Invoice.
&lt;p&gt;
An invoice can be generated automatically from a sale order or a delivery order.
The invoice can be send by email.
</field>
</record> </record>
@@ -510,7 +527,12 @@
<field name="domain">[('type','=','in_invoice')]</field> <field name="domain">[('type','=','in_invoice')]</field>
<field name="context">{'default_type': 'in_invoice', 'type': 'in_invoice', 'journal_type': 'purchase'}</field> <field name="context">{'default_type': 'in_invoice', 'type': 'in_invoice', 'journal_type': 'purchase'}</field>
<field name="search_view_id" ref="view_account_invoice_filter"/> <field name="search_view_id" ref="view_account_invoice_filter"/>
<field name="help">With Supplier Invoices you can enter and manage invoices issued by your suppliers. OpenERP can also generate draft invoices automatically from purchase orders or receipts. This way, you can control the invoice from your supplier according to what you purchased or received.</field> <field name="help">
Click here to create Supplier invoice.
&lt;p&gt;
You can control the invoice from your supplier according to what you purchased or received.
OpenERP can also generate draft invoices automatically from purchase orders or receipts.
</field>
</record> </record>
<menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="menu_finance_payables"/> <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="menu_finance_payables"/>
@@ -523,7 +545,12 @@
<field name="domain">[('type','=','out_refund')]</field> <field name="domain">[('type','=','out_refund')]</field>
<field name="context">{'default_type':'out_refund', 'type':'out_refund', 'journal_type': 'sale_refund'}</field> <field name="context">{'default_type':'out_refund', 'type':'out_refund', 'journal_type': 'sale_refund'}</field>
<field name="search_view_id" ref="view_account_invoice_filter"/> <field name="search_view_id" ref="view_account_invoice_filter"/>
<field name="help">With Customer Refunds you can manage the credit notes for your customers. A refund is a document that credits an invoice completely or partially. You can easily generate refunds and reconcile them directly from the invoice form.</field> <field name="help">
Click here to create a new customer refund.
&lt;p&gt;
A refund is a document that credits an invoice completely or partially.
You can also generate refunds and reconcile them directly from the invoice form.
</field>
</record> </record>
<record id="action_invoice_tree3_view1" model="ir.actions.act_window.view"> <record id="action_invoice_tree3_view1" model="ir.actions.act_window.view">
@@ -549,7 +576,12 @@
<field name="domain">[('type','=','in_refund')]</field> <field name="domain">[('type','=','in_refund')]</field>
<field name="context">{'default_type': 'in_refund', 'type': 'in_refund', 'journal_type': 'purchase_refund'}</field> <field name="context">{'default_type': 'in_refund', 'type': 'in_refund', 'journal_type': 'purchase_refund'}</field>
<field name="search_view_id" ref="view_account_invoice_filter"/> <field name="search_view_id" ref="view_account_invoice_filter"/>
<field name="help">With Supplier Refunds you can manage the credit notes you receive from your suppliers. A refund is a document that credits an invoice completely or partially. You can easily generate refunds and reconcile them directly from the invoice form.</field> <field name="help">
Click here to create a new supplier refund.
&lt;p&gt;
Track refunds you receive from your suppliers.
You can also generate refunds and reconcile them directly from the invoice form.
</field>
</record> </record>
<menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="menu_finance_payables"/> <menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="menu_finance_payables"/>
addons/account/account_menuitem.xml
-1
View File
@@ -41,7 +41,6 @@
sequence="25"/> sequence="25"/>
<menuitem id="menu_finance_periodical_processing_billing" name="Billing" parent="menu_finance_periodical_processing" sequence="35"/> <menuitem id="menu_finance_periodical_processing_billing" name="Billing" parent="menu_finance_periodical_processing" sequence="35"/>
<menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300"/>
<menuitem id="next_id_22" name="Partners" parent="menu_finance_generic_reporting" sequence="1"/> <menuitem id="next_id_22" name="Partners" parent="menu_finance_generic_reporting" sequence="1"/>
<menuitem id="menu_multi_currency" name="Multi-Currencies" parent="menu_finance_generic_reporting" sequence="10"/> <menuitem id="menu_multi_currency" name="Multi-Currencies" parent="menu_finance_generic_reporting" sequence="10"/>
<menuitem <menuitem
addons/account/account_view.xml
+16 -19
View File
@@ -13,11 +13,11 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form version="7.0"> <form version="7.0">
<header> <header>
<button name="create_period" states="draft" string="Create Monthly Periods" type="object"/> <button name="create_period" states="draft" string="Create Monthly Periods" type="object" class="oe_highlight"/>
<button name="create_period3" states="draft" string="Create 3 Months Periods" type="object"/> <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object" class="oe_highlight"/>
<field name="state" widget="statusbar" nolabel="1" /> <field name="state" widget="statusbar" nolabel="1" />
</header> </header>
<sheet string="Fiscalyear" layout="auto"> <sheet string="Fiscalyear" >
<group> <group>
<group> <group>
<field name="name"/> <field name="name"/>
@@ -171,7 +171,7 @@
<form string="Account" version="7.0"> <form string="Account" version="7.0">
<label for="name" class="oe_edit_only" string="Account Name and Code:"/> <label for="name" class="oe_edit_only" string="Account Name and Code:"/>
<h1> <h1>
<field name="name"/> - <field name="name"/> -
<field name="code"/> <field name="code"/>
</h1> </h1>
<label for="company_id"/> <label for="company_id"/>
@@ -592,8 +592,8 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Bank Statement" version="7.0"> <form string="Bank Statement" version="7.0">
<header> <header>
<button name="button_confirm_bank" states="draft" string="Confirm" type="object" /> <button name="button_confirm_bank" states="draft" string="Confirm" type="object" class="oe_highlight"/>
<button name="button_dummy" states="draft" string="Compute" type="object"/> <button name="button_dummy" states="draft" string="Compute" type="object" class="oe_highlight"/>
<button name="button_cancel" states="confirm" string="Cancel" type="object"/> <button name="button_cancel" states="confirm" string="Cancel" type="object"/>
<field name="state" widget="statusbar" statusbar_visible="draft,confirm"/> <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
</header> </header>
@@ -1268,11 +1268,11 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form version="7.0"> <form version="7.0">
<header> <header>
<button name="button_validate" states="draft" string="Post" type="object"/> <button name="button_validate" states="draft" string="Post" type="object" class="oe_highlight"/>
<button name="button_cancel" states="posted" string="Cancel" type="object"/> <button name="button_cancel" states="posted" string="Cancel" type="object"/>
<field name="state" widget="statusbar"/> <field name="state" widget="statusbar"/>
</header> </header>
<sheet string="Journal Entries" layout="auto"> <sheet string="Journal Entries" >
<group col="4"> <group col="4">
<field name="name" readonly="True"/> <field name="name" readonly="True"/>
<field name="ref"/> <field name="ref"/>
@@ -1284,10 +1284,10 @@
<field name="partner_id" invisible="1"/> <field name="partner_id" invisible="1"/>
<field name="amount" invisible="1"/> <field name="amount" invisible="1"/>
</group> </group>
<notebook colspan="4"> <notebook>
<page string="Journal Items"> <page string="Journal Items">
<field name="balance" invisible="1"/> <field name="balance" invisible="1"/>
<field colspan="4" name="line_id" widget="one2many_list" <field name="line_id" widget="one2many_list"
on_change="onchange_line_id(line_id)" on_change="onchange_line_id(line_id)"
context="{'balance': balance , 'journal': journal_id }"> context="{'balance': balance , 'journal': journal_id }">
<form string="Journal Item" version="7.0"> <form string="Journal Item" version="7.0">
@@ -1824,8 +1824,8 @@
<form string="Recurring" version="7.0"> <form string="Recurring" version="7.0">
<header> <header>
<button name="state_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert" /> <button name="state_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert" />
<button name="compute" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/> <button name="compute" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific" class="oe_highlight"/>
<button name="remove_line" states="running" string="Remove Lines" type="object" icon="gtk-remove"/> <button name="remove_line" states="running" string="Remove Lines" type="object" icon="gtk-remove" class="oe_highlight"/>
<field name="state" widget="statusbar" statusbar_visible="draft,running,done"/> <field name="state" widget="statusbar" statusbar_visible="draft,running,done"/>
</header> </header>
<sheet> <sheet>
@@ -1983,8 +1983,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Create Account" version="7.0"> <form string="Create Account" version="7.0">
<header> <header>
<button icon="gtk-ok" name="action_create" string="Add" type="object"/> <button icon="gtk-ok" name="action_create" string="Add" type="object" class="oe_highlight" />
<button icon="gtk-cancel" special="cancel" string="Cancel" name="action_cancel" type="object"/>
</header> </header>
<separator col="4" colspan="4" string="Create an Account Based on this Template"/> <separator col="4" colspan="4" string="Create an Account Based on this Template"/>
<field name="cparent_id"/> <field name="cparent_id"/>
@@ -2355,16 +2354,14 @@
<form position="attributes" version="7.0"> <form position="attributes" version="7.0">
<attribute name="string">Accounting Application Configuration</attribute> <attribute name="string">Accounting Application Configuration</attribute>
</form> </form>
<button name="action_skip" position="replace"/>
<group string="res_config_contents" position="replace"> <group string="res_config_contents" position="replace">
<field name="only_one_chart_template" invisible="1"/> <field name="only_one_chart_template" invisible="1"/>
<field name="complete_tax_set" invisible="1"/> <field name="complete_tax_set" invisible="1"/>
<p>This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template.</p>
<div groups="base.group_multi_company"> <div groups="base.group_multi_company">
<label for="company_id"/> <label for="company_id"/>
<field name="company_id" widget="selection"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it --> <field name="company_id" widget="selection"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
</div> </div>
<group string="Set Your Accounting Options"> <group>
<div attrs="{'invisible': [('only_one_chart_template','=',True)]}"> <div attrs="{'invisible': [('only_one_chart_template','=',True)]}">
<label for="chart_template_id"/> <label for="chart_template_id"/>
<field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/> <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
@@ -2544,8 +2541,8 @@ action = pool.get('res.config').next(cr, uid, [], context)
<field name="arch" type="xml"> <field name="arch" type="xml">
<form version="7.0"> <form version="7.0">
<header> <header>
<button name="button_confirm_cash" states="open" string="Close CashBox" type="object"/> <button name="button_confirm_cash" states="open" string="Close CashBox" type="object" class="oe_highlight"/>
<button name="button_open" states="draft" string="Open CashBox" type="object"/> <button name="button_open" states="draft" string="Open CashBox" type="object" class="oe_highlight"/>
<button name="button_cancel" states="confirm,open" string="Cancel" type="object" groups="base.group_extended"/> <button name="button_cancel" states="confirm,open" string="Cancel" type="object" groups="base.group_extended"/>
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/> <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
</header> </header>
addons/account/data/account_data.xml
-13
View File
@@ -555,19 +555,6 @@
<field eval="1" name="number_increment"/> <field eval="1" name="number_increment"/>
</record> </record>
<!--
Sequence for analytic account
-->
<record id="seq_type_analytic_account" model="ir.sequence.type">
<field name="name">Analytic account</field>
<field name="code">account.analytic.account</field>
</record>
<record id="seq_analytic_account" model="ir.sequence">
<field name="name">Analytic account sequence</field>
<field name="code">account.analytic.account</field>
<field eval="3" name="padding"/>
<field eval="2708" name="number_next"/>
</record>
<!-- <!--
Invoice requests (deprecated) Invoice requests (deprecated)
addons/account/demo/account_invoice_demo.xml
+45 -45
View File
@@ -1,48 +1,48 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<openerp> <openerp>
<data noupdate="1"> <data noupdate="1">
<record id="demo_invoice_0" model="account.invoice"> <record id="demo_invoice_0" model="account.invoice">
<field name="date_due" eval="time.strftime('%Y')+'-01-30'"/> <field name="date_due" eval="time.strftime('%Y')+'-01-30'"/>
<field name="payment_term" ref="account.account_payment_term"/> <field name="payment_term" ref="account.account_payment_term"/>
<field name="journal_id" ref="account.expenses_journal"/> <field name="journal_id" ref="account.expenses_journal"/>
<field name="currency_id" ref="base.EUR"/> <field name="currency_id" ref="base.EUR"/>
<field name="user_id" ref="base.user_demo"/> <field name="user_id" ref="base.user_demo"/>
<field name="reference_type">none</field> <field name="reference_type">none</field>
<field name="company_id" ref="base.main_company"/> <field name="company_id" ref="base.main_company"/>
<field name="state">draft</field> <field name="state">draft</field>
<field name="type">in_invoice</field> <field name="type">in_invoice</field>
<field name="account_id" ref="account.a_pay"/> <field name="account_id" ref="account.a_pay"/>
<field eval="0" name="reconciled"/> <field eval="0" name="reconciled"/>
<field name="date_invoice" eval="time.strftime('%Y')+'-01-01'"/> <field name="date_invoice" eval="time.strftime('%Y')+'-01-01'"/>
<field eval="14.0" name="amount_untaxed"/> <field eval="14.0" name="amount_untaxed"/>
<field eval="14.0" name="amount_total"/> <field eval="14.0" name="amount_total"/>
<field name="partner_id" ref="base.res_partner_maxtor"/> <field name="partner_id" ref="base.res_partner_maxtor"/>
</record> </record>
<record id="demo_invoice_0_line_rpanrearpanelshe0" model="account.invoice.line"> <record id="demo_invoice_0_line_rpanrearpanelshe0" model="account.invoice.line">
<field name="invoice_id" ref="demo_invoice_0"/> <field name="invoice_id" ref="demo_invoice_0"/>
<field name="account_id" ref="account.a_expense"/> <field name="account_id" ref="account.a_expense"/>
<field name="uos_id" ref="product.product_uom_unit"/> <field name="uos_id" ref="product.product_uom_unit"/>
<field name="price_unit" eval="10.0" /> <field name="price_unit" eval="10.0" />
<field name="price_subtotal" eval="10.0" /> <field name="price_subtotal" eval="10.0" />
<field name="company_id" ref="base.main_company"/> <field name="company_id" ref="base.main_company"/>
<field name="invoice_line_tax_id" eval="[(6,0,[])]"/> <field name="invoice_line_tax_id" eval="[(6,0,[])]"/>
<field name="product_id" ref="product.product_product_rearpanelarm0"/> <field name="product_id" ref="product.product_product_rearpanelarm0"/>
<field name="quantity" eval="1.0" /> <field name="quantity" eval="1.0" />
<field name="partner_id" ref="base.res_partner_maxtor"/> <field name="partner_id" ref="base.res_partner_maxtor"/>
<field name="name">[RPAN100] Rear Panel SHE100</field> <field name="name">[RPAN100] Rear Panel SHE100</field>
</record> </record>
<record id="demo_invoice_0_line_rckrackcm0" model="account.invoice.line"> <record id="demo_invoice_0_line_rckrackcm0" model="account.invoice.line">
<field name="invoice_id" ref="demo_invoice_0"/> <field name="invoice_id" ref="demo_invoice_0"/>
<field name="account_id" ref="account.a_expense"/> <field name="account_id" ref="account.a_expense"/>
<field name="uos_id" ref="product.product_uom_unit"/> <field name="uos_id" ref="product.product_uom_unit"/>
<field name="price_unit" eval="4.0"/> <field name="price_unit" eval="4.0"/>
<field name="price_subtotal" eval="4.0"/> <field name="price_subtotal" eval="4.0"/>
<field name="company_id" ref="base.main_company"/> <field name="company_id" ref="base.main_company"/>
<field name="invoice_line_tax_id" eval="[(6,0,[])]"/> <field name="invoice_line_tax_id" eval="[(6,0,[])]"/>
<field name="product_id" ref="product.product_product_shelf1"/> <field name="product_id" ref="product.product_product_shelf1"/>
<field name="quantity" eval="1.0" /> <field name="quantity" eval="1.0" />
<field name="partner_id" ref="base.res_partner_maxtor"/> <field name="partner_id" ref="base.res_partner_maxtor"/>
<field name="name">[RCK200] Rack 200cm</field> <field name="name">[RCK200] Rack 200cm</field>
</record> </record>
</data> </data>
</openerp> </openerp>
addons/account/i18n/de.po
+5 -5
View File
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n" "Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n" "Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n" "POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-06-20 16:08+0000\n" "PO-Revision-Date: 2012-06-25 09:07+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n" "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:37+0000\n" "X-Launchpad-Export-Date: 2012-06-26 05:22+0000\n"
"X-Generator: Launchpad (build 15461)\n" "X-Generator: Launchpad (build 15482)\n"
#. module: account #. module: account
#: view:account.invoice.report:0 #: view:account.invoice.report:0
@@ -5437,7 +5437,7 @@ msgstr "Standardauswertung Finanzen"
#: field:account.bank.statement.line,name:0 #: field:account.bank.statement.line,name:0
#: field:account.invoice,reference:0 #: field:account.invoice,reference:0
msgid "Communication" msgid "Communication"
msgstr "Buchungstext" msgstr "Kommunikation"
#. module: account #. module: account
#: model:ir.ui.menu,name:account.menu_analytic_accounting #: model:ir.ui.menu,name:account.menu_analytic_accounting
addons/account/i18n/es_DO.po
+10387
View File
File diff suppressed because it is too large Load Diff
addons/account/i18n/nl.po
+16 -12
View File
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n" "Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n" "Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n" "POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-06-20 16:17+0000\n" "PO-Revision-Date: 2012-06-28 12:47+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n" "Last-Translator: Erwin <Unknown>\n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-22 04:36+0000\n" "X-Launchpad-Export-Date: 2012-06-29 04:38+0000\n"
"X-Generator: Launchpad (build 15461)\n" "X-Generator: Launchpad (build 15505)\n"
#. module: account #. module: account
#: code:addons/account/account.py:1307 #: code:addons/account/account.py:1307
@@ -2374,7 +2374,7 @@ msgid ""
"There is no default default credit account defined \n" "There is no default default credit account defined \n"
"on journal \"%s\"" "on journal \"%s\""
msgstr "" msgstr ""
"Er is geen default krediet rekening beschikbaar \n" "Er is geen standaard credit rekening beschikbaar \n"
"voor journaal \"%s\"" "voor journaal \"%s\""
#. module: account #. module: account
@@ -2969,8 +2969,8 @@ msgid ""
"You can not delete an invoice which is open or paid. We suggest you to " "You can not delete an invoice which is open or paid. We suggest you to "
"refund it instead." "refund it instead."
msgstr "" msgstr ""
"Een factuur die open of betaald is kan u niet verwijderen. In plaats daarvan " "Een factuur die open of betaald is kunt u niet verwijderen. In plaats "
"stellen we voor dat u ze terugbetaald." "daarvan kunt u een creditfactuur maken.."
#. module: account #. module: account
#: field:wizard.multi.charts.accounts,sale_tax:0 #: field:wizard.multi.charts.accounts,sale_tax:0
@@ -4486,6 +4486,10 @@ msgid ""
"you want to generate accounts of this template only when loading its child " "you want to generate accounts of this template only when loading its child "
"template." "template."
msgstr "" msgstr ""
"Vink deze optie uit indien u niet wilt dat dit sjabloon actief wordt "
"gebruikt in de wizard, welke het grootboekrekeningschema genereerd van "
"sjablonen. Gebruik dit alleen indien u rekeningen wilt genereren van dit "
"sjabloon bij het laden van het onderliggende sjaboon."
#. module: account #. module: account
#: view:account.use.model:0 #: view:account.use.model:0
@@ -4578,7 +4582,7 @@ msgstr "Journaalposten boeken"
#: selection:account.invoice.report,state:0 #: selection:account.invoice.report,state:0
#: selection:report.invoice.created,state:0 #: selection:report.invoice.created,state:0
msgid "Cancelled" msgid "Cancelled"
msgstr "Afgebroken" msgstr "Geannuleerd"
#. module: account #. module: account
#: help:account.bank.statement,balance_end_cash:0 #: help:account.bank.statement,balance_end_cash:0
@@ -4711,7 +4715,7 @@ msgstr "Opbrengsten rekening op product sjabloon"
#: code:addons/account/account.py:3120 #: code:addons/account/account.py:3120
#, python-format #, python-format
msgid "MISC" msgid "MISC"
msgstr "DIV" msgstr "MEM"
#. module: account #. module: account
#: model:email.template,subject:account.email_template_edi_invoice #: model:email.template,subject:account.email_template_edi_invoice
@@ -5312,7 +5316,7 @@ msgstr "Sjabloon belasting fiscale positie"
#. module: account #. module: account
#: field:account.journal,update_posted:0 #: field:account.journal,update_posted:0
msgid "Allow Cancelling Entries" msgid "Allow Cancelling Entries"
msgstr "Maak verwijderen boekingen mogelijk" msgstr "Maak het annuleren boekingen mogelijk"
#. module: account #. module: account
#: field:account.tax.code,sign:0 #: field:account.tax.code,sign:0
@@ -5748,7 +5752,7 @@ msgstr "Aanmaakdatum"
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_form #: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
#: model:ir.ui.menu,name:account.account_def_analytic_journal #: model:ir.ui.menu,name:account.account_def_analytic_journal
msgid "Analytic Journals" msgid "Analytic Journals"
msgstr "Kostenplaatsen" msgstr "Kostenplaats dagboeken"
#. module: account #. module: account
#: field:account.account,child_id:0 #: field:account.account,child_id:0
@@ -6896,7 +6900,7 @@ msgstr ""
#: view:account.move:0 #: view:account.move:0
#: field:account.move,to_check:0 #: field:account.move,to_check:0
msgid "To Review" msgid "To Review"
msgstr "Na te kijken" msgstr "Ter controle"
#. module: account #. module: account
#: help:account.partner.ledger,initial_balance:0 #: help:account.partner.ledger,initial_balance:0
addons/account/installer.py
+2 -2
View File
@@ -30,11 +30,11 @@ from tools.translate import _
from osv import fields, osv from osv import fields, osv
import netsvc import netsvc
import tools import tools
_logger = logging.getLogger(__name__)
class account_installer(osv.osv_memory): class account_installer(osv.osv_memory):
_name = 'account.installer' _name = 'account.installer'
_inherit = 'res.config.installer' _inherit = 'res.config.installer'
__logger = logging.getLogger(_name)
def _get_charts(self, cr, uid, context=None): def _get_charts(self, cr, uid, context=None):
modules = self.pool.get('ir.module.module') modules = self.pool.get('ir.module.module')
@@ -149,7 +149,7 @@ class account_installer(osv.osv_memory):
cr, uid, ids, context=context) cr, uid, ids, context=context)
chart = self.read(cr, uid, ids, ['charts'], chart = self.read(cr, uid, ids, ['charts'],
context=context)[0]['charts'] context=context)[0]['charts']
self.__logger.debug('Installing chart of accounts %s', chart) _logger.debug('Installing chart of accounts %s', chart)
return modules | set([chart]) return modules | set([chart])
account_installer() account_installer()
addons/account/partner_view.xml
+1 -1
View File
@@ -65,7 +65,7 @@
<!-- <!--
Partners Extension Partners Extension
--> -->
<record id="view_partner_property_form" model="ir.ui.view"> <record id="view_partner_property_form" model="ir.ui.view">
<field name="name">res.partner.property.form.inherit</field> <field name="name">res.partner.property.form.inherit</field>
addons/account/process/customer_invoice_process.xml
+1 -1
View File
@@ -69,7 +69,7 @@
<field name="subflow_id" ref="process_process_statementprocess0"/> <field name="subflow_id" ref="process_process_statementprocess0"/>
<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/> <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
<field eval="1" name="flow_start"/> <field eval="1" name="flow_start"/>
</record> </record>
<record id="process_node_paymententries0" model="process.node"> <record id="process_node_paymententries0" model="process.node">
<field name="menu_id" ref="account.menu_action_move_journal_line_form"/> <field name="menu_id" ref="account.menu_action_move_journal_line_form"/>
addons/account/process/statement_process.xml
+1 -1
View File
@@ -64,7 +64,7 @@
Process Transition Process Transition
--> -->
<record id="process_transition_filestatement0" model="process.transition"> <record id="process_transition_filestatement0" model="process.transition">
<field eval="[(6,0,[])]" name="transition_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/>
<field eval="&quot;&quot;&quot;Automatic import of the bank statement&quot;&quot;&quot;" name="name"/> <field eval="&quot;&quot;&quot;Automatic import of the bank statement&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;Import of the statement in the system from an electronic file&quot;&quot;&quot;" name="note"/> <field eval="&quot;&quot;&quot;Import of the statement in the system from an electronic file&quot;&quot;&quot;" name="note"/>
addons/account/process/supplier_invoice_process.xml
+1 -1
View File
@@ -106,7 +106,7 @@
Process Transition Process Transition
--> -->
<record id="process_transition_supplieranalyticcost0" model="process.transition"> <record id="process_transition_supplieranalyticcost0" model="process.transition">
<field eval="[(6,0,[])]" name="transition_ids"/> <field eval="[(6,0,[])]" name="transition_ids"/>
<field eval="&quot;&quot;&quot;From analytic accounts&quot;&quot;&quot;" name="name"/> <field eval="&quot;&quot;&quot;From analytic accounts&quot;&quot;&quot;" name="name"/>
<field eval="&quot;&quot;&quot;Analytic costs (timesheets, some purchased products, ...) come from analytic accounts. These generate draft supplier invoices.&quot;&quot;&quot;" name="note"/> <field eval="&quot;&quot;&quot;Analytic costs (timesheets, some purchased products, ...) come from analytic accounts. These generate draft supplier invoices.&quot;&quot;&quot;" name="note"/>
addons/account/product_view.xml
+5 -5
View File
@@ -8,7 +8,7 @@
<field name="inherit_id" ref="product.product_normal_form_view"/> <field name="inherit_id" ref="product.product_normal_form_view"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<notebook position="inside"> <notebook position="inside">
<page string="Accounting"> <page string="Accounting" groups="base.group_user">
<group name="properties"> <group name="properties">
<group> <group>
<field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}"/> <field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}"/>
@@ -51,12 +51,12 @@
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="product.product_category_form_view"/> <field name="inherit_id" ref="product.product_category_form_view"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form position="inside"> <data>
<group string="Accounting Properties"> <xpath expr="/form/sheet//group[@name='account_property']" position="inside">
<field name="property_account_income_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/> <field name="property_account_income_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<field name="property_account_expense_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/> <field name="property_account_expense_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
</group> </xpath>
</form> </data>
</field> </field>
</record> </record>
addons/account/project/analytic_account_demo.xml
+3 -43
View File
@@ -3,102 +3,85 @@
<data noupdate="1"> <data noupdate="1">
<record id="analytic_root" model="account.analytic.account"> <record id="analytic_root" model="account.analytic.account">
<field name="name" model="res.company" use="name" search="[]"/> <field name="name" model="res.company" use="name" search="[]"/>
<field name="code">0</field>
</record> </record>
<record id="analytic_absences" model="account.analytic.account"> <record id="analytic_absences" model="account.analytic.account">
<field name="name">Leaves</field> <field name="name">Leaves</field>
<field name="code">1</field>
<field name="type">view</field> <field name="type">view</field>
<field name="parent_id" ref="analytic_root"/> <field name="parent_id" ref="analytic_root"/>
</record> </record>
<record id="analytic_internal" model="account.analytic.account"> <record id="analytic_internal" model="account.analytic.account">
<field name="name">Internal</field> <field name="name">Internal</field>
<field name="code">2</field>
<field name="type">view</field> <field name="type">view</field>
<field name="parent_id" ref="analytic_root"/> <field name="parent_id" ref="analytic_root"/>
</record> </record>
<record id="analytic_our_super_product" model="account.analytic.account"> <record id="analytic_our_super_product" model="account.analytic.account">
<field name="name">Our Super Product</field> <field name="name">Our Super Product</field>
<field name="code">100</field>
<field name="state">open</field> <field name="state">open</field>
<field name="type">view</field> <field name="type">view</field>
<field name="parent_id" ref="analytic_root"/> <field name="parent_id" ref="analytic_root"/>
</record> </record>
<record id="analytic_project_1" model="account.analytic.account"> <record id="analytic_project_1" model="account.analytic.account">
<field name="name">Project 1</field> <field name="name">Project 1</field>
<field name="code">101</field>
<field name="type">view</field> <field name="type">view</field>
<field name="parent_id" ref="analytic_root"/> <field name="parent_id" ref="analytic_root"/>
</record> </record>
<record id="analytic_project_2" model="account.analytic.account"> <record id="analytic_project_2" model="account.analytic.account">
<field name="name">Project 2</field> <field name="name">Project 2</field>
<field name="code">102</field>
<field name="type">view</field> <field name="type">view</field>
<field name="parent_id" ref="analytic_root"/> <field name="parent_id" ref="analytic_root"/>
</record> </record>
<record id="analytic_journal_trainings" model="account.analytic.account"> <record id="analytic_journal_trainings" model="account.analytic.account">
<field name="name">Training</field> <field name="name">Training</field>
<field name="code">4</field>
<field name="type">view</field> <field name="type">view</field>
<field name="parent_id" ref="analytic_internal"/> <field name="parent_id" ref="analytic_internal"/>
</record> </record>
<record id="analytic_in_house" model="account.analytic.account"> <record id="analytic_in_house" model="account.analytic.account">
<field name="name">In House</field> <field name="name">In House</field>
<field name="code">1</field>
<field name="type">normal</field> <field name="type">normal</field>
<field name="parent_id" ref="analytic_journal_trainings"/> <field name="parent_id" ref="analytic_journal_trainings"/>
</record> </record>
<record id="analytic_online" model="account.analytic.account"> <record id="analytic_online" model="account.analytic.account">
<field name="name">Online</field> <field name="name">Online</field>
<field name="code">2</field>
<field name="type">normal</field> <field name="type">normal</field>
<field name="parent_id" ref="analytic_journal_trainings"/> <field name="parent_id" ref="analytic_journal_trainings"/>
</record> </record>
<record id="analytic_support" model="account.analytic.account"> <record id="analytic_support" model="account.analytic.account">
<field name="name">Support</field> <field name="name">Support</field>
<field name="code">support</field>
<field name="type">view</field> <field name="type">view</field>
<field name="parent_id" ref="analytic_our_super_product"/> <field name="parent_id" ref="analytic_our_super_product"/>
</record> </record>
<record id="analytic_partners" model="account.analytic.account"> <record id="analytic_partners" model="account.analytic.account">
<field name="name">Partners</field> <field name="name">Partners</field>
<field name="code">partners</field>
<field name="type">view</field> <field name="type">view</field>
<field name="parent_id" ref="analytic_support"/> <field name="parent_id" ref="analytic_support"/>
</record> </record>
<record id="analytic_customers" model="account.analytic.account"> <record id="analytic_customers" model="account.analytic.account">
<field name="name">Customers</field> <field name="name">Customers</field>
<field name="code">customers</field>
<field name="type">view</field> <field name="type">view</field>
<field name="parent_id" ref="analytic_support"/> <field name="parent_id" ref="analytic_support"/>
</record> </record>
<record id="analytic_support_internal" model="account.analytic.account"> <record id="analytic_support_internal" model="account.analytic.account">
<field name="name">Internal</field> <field name="name">Internal</field>
<field name="code">3</field> <field name="type">contract</field>
<field name="type">normal</field>
<field name="parent_id" ref="analytic_support"/> <field name="parent_id" ref="analytic_support"/>
</record> </record>
<record id="analytic_integration" model="account.analytic.account"> <record id="analytic_integration" model="account.analytic.account">
<field name="name">Integration</field> <field name="name">Integration</field>
<field name="code">integration</field>
<field name="type">view</field> <field name="type">view</field>
<field name="parent_id" ref="analytic_our_super_product"/> <field name="parent_id" ref="analytic_our_super_product"/>
</record> </record>
<record id="analytic_consultancy" model="account.analytic.account"> <record id="analytic_consultancy" model="account.analytic.account">
<field name="name">Consultancy</field> <field name="name">Consultancy</field>
<field name="code">4</field> <field name="type">contract</field>
<field name="type">normal</field>
<field name="parent_id" ref="analytic_our_super_product"/> <field name="parent_id" ref="analytic_our_super_product"/>
</record> </record>
<record id="analytic_super_product_trainings" model="account.analytic.account"> <record id="analytic_super_product_trainings" model="account.analytic.account">
<field name="name">Training</field> <field name="name">Training</field>
<field name="code">5</field> <field name="type">contract</field>
<field name="type">normal</field>
<field name="parent_id" ref="analytic_our_super_product"/> <field name="parent_id" ref="analytic_our_super_product"/>
</record> </record>
<record id="analytic_seagate_p1" model="account.analytic.account"> <record id="analytic_seagate_p1" model="account.analytic.account">
<field name="name">Seagate P1</field> <field name="name">Seagate P1</field>
<field name="code">1</field>
<field name="parent_id" ref="analytic_integration"/> <field name="parent_id" ref="analytic_integration"/>
<field name="type">normal</field> <field name="type">normal</field>
<field name="state">open</field> <field name="state">open</field>
@@ -106,7 +89,6 @@
</record> </record>
<record id="analytic_seagate_p2" model="account.analytic.account"> <record id="analytic_seagate_p2" model="account.analytic.account">
<field name="name">Seagate P2</field> <field name="name">Seagate P2</field>
<field name="code">2</field>
<field name="type">normal</field> <field name="type">normal</field>
<field name="parent_id" ref="analytic_integration"/> <field name="parent_id" ref="analytic_integration"/>
<field name="state">open</field> <field name="state">open</field>
@@ -114,14 +96,12 @@
</record> </record>
<record id="analytic_magasin_bml_1" model="account.analytic.account"> <record id="analytic_magasin_bml_1" model="account.analytic.account">
<field name="name">Magasin BML 1</field> <field name="name">Magasin BML 1</field>
<field name="code">3</field>
<field name="parent_id" ref="analytic_integration"/> <field name="parent_id" ref="analytic_integration"/>
<field name="type">normal</field> <field name="type">normal</field>
<field name="partner_id" ref="base.res_partner_15"/> <field name="partner_id" ref="base.res_partner_15"/>
</record> </record>
<record id="analytic_integration_c2c" model="account.analytic.account"> <record id="analytic_integration_c2c" model="account.analytic.account">
<field name="name">CampToCamp</field> <field name="name">CampToCamp</field>
<field name="code">7</field>
<field name="type">normal</field> <field name="type">normal</field>
<field eval="str(time.localtime()[0] - 1) + '-08-07'" name="date_start"/> <field eval="str(time.localtime()[0] - 1) + '-08-07'" name="date_start"/>
<field eval="time.strftime('%Y-12-31')" name="date"/> <field eval="time.strftime('%Y-12-31')" name="date"/>
@@ -131,28 +111,24 @@
</record> </record>
<record id="analytic_agrolait" model="account.analytic.account"> <record id="analytic_agrolait" model="account.analytic.account">
<field name="name">Agrolait</field> <field name="name">Agrolait</field>
<field name="code">3</field>
<field name="parent_id" ref="analytic_customers"/> <field name="parent_id" ref="analytic_customers"/>
<field name="type">normal</field> <field name="type">normal</field>
<field name="partner_id" ref="base.res_partner_agrolait"/> <field name="partner_id" ref="base.res_partner_agrolait"/>
</record> </record>
<record id="analytic_asustek" model="account.analytic.account"> <record id="analytic_asustek" model="account.analytic.account">
<field name="name">Asustek</field> <field name="name">Asustek</field>
<field name="code">4</field>
<field name="type">normal</field> <field name="type">normal</field>
<field name="parent_id" ref="analytic_customers"/> <field name="parent_id" ref="analytic_customers"/>
<field name="partner_id" ref="base.res_partner_asus"/> <field name="partner_id" ref="base.res_partner_asus"/>
</record> </record>
<record id="analytic_distripc" model="account.analytic.account"> <record id="analytic_distripc" model="account.analytic.account">
<field name="name">DistriPC</field> <field name="name">DistriPC</field>
<field name="code">7</field>
<field name="parent_id" ref="analytic_customers"/> <field name="parent_id" ref="analytic_customers"/>
<field name="type">normal</field> <field name="type">normal</field>
<field name="partner_id" ref="base.res_partner_4"/> <field name="partner_id" ref="base.res_partner_4"/>
</record> </record>
<record id="analytic_sednacom" model="account.analytic.account"> <record id="analytic_sednacom" model="account.analytic.account">
<field name="name">Sednacom</field> <field name="name">Sednacom</field>
<field name="code">2</field>
<field eval="str(time.localtime()[0] - 1) + '-05-09'" name="date_start"/> <field eval="str(time.localtime()[0] - 1) + '-05-09'" name="date_start"/>
<field eval="time.strftime('%Y-05-08')" name="date"/> <field eval="time.strftime('%Y-05-08')" name="date"/>
<field name="parent_id" ref="analytic_partners"/> <field name="parent_id" ref="analytic_partners"/>
@@ -162,7 +138,6 @@
</record> </record>
<record id="analytic_thymbra" model="account.analytic.account"> <record id="analytic_thymbra" model="account.analytic.account">
<field name="name">Thymbra</field> <field name="name">Thymbra</field>
<field name="code">3</field>
<field eval="time.strftime('%Y-02-01')" name="date_start"/> <field eval="time.strftime('%Y-02-01')" name="date_start"/>
<field eval="time.strftime('%Y-07-01')" name="date"/> <field eval="time.strftime('%Y-07-01')" name="date"/>
<field name="type">normal</field> <field name="type">normal</field>
@@ -172,7 +147,6 @@
</record> </record>
<record id="analytic_leclerc" model="account.analytic.account"> <record id="analytic_leclerc" model="account.analytic.account">
<field name="name">Leclerc</field> <field name="name">Leclerc</field>
<field name="code">10</field>
<field eval="time.strftime('%Y-04-24')" name="date_start"/> <field eval="time.strftime('%Y-04-24')" name="date_start"/>
<field eval="str(time.localtime()[0] + 1) + '-04-24'" name="date"/> <field eval="str(time.localtime()[0] + 1) + '-04-24'" name="date"/>
<field name="type">normal</field> <field name="type">normal</field>
@@ -181,7 +155,6 @@
</record> </record>
<record id="analytic_desertic_hispafuentes" model="account.analytic.account"> <record id="analytic_desertic_hispafuentes" model="account.analytic.account">
<field name="name">Desertic - Hispafuentes</field> <field name="name">Desertic - Hispafuentes</field>
<field name="code">12</field>
<field eval="time.strftime('%Y-02-01')" name="date_start"/> <field eval="time.strftime('%Y-02-01')" name="date_start"/>
<field eval="str(time.localtime()[0] + 1) + '-02-01'" name="date"/> <field eval="str(time.localtime()[0] + 1) + '-02-01'" name="date"/>
<field name="type">normal</field> <field name="type">normal</field>
@@ -190,14 +163,12 @@
</record> </record>
<record id="analytic_tiny_at_work" model="account.analytic.account"> <record id="analytic_tiny_at_work" model="account.analytic.account">
<field name="name">OpenERP SA AT Work</field> <field name="name">OpenERP SA AT Work</field>
<field name="code">15</field>
<field name="type">normal</field> <field name="type">normal</field>
<field name="parent_id" ref="analytic_partners"/> <field name="parent_id" ref="analytic_partners"/>
<field name="partner_id" ref="base.res_partner_tinyatwork"/> <field name="partner_id" ref="base.res_partner_tinyatwork"/>
</record> </record>
<record id="analytic_partners_camp_to_camp" model="account.analytic.account"> <record id="analytic_partners_camp_to_camp" model="account.analytic.account">
<field name="name">Camp to Camp</field> <field name="name">Camp to Camp</field>
<field name="code">21</field>
<field eval="time.strftime('%Y-%m-%d', time.localtime(time.time() - 365 * 86400))" name="date_start"/> <field eval="time.strftime('%Y-%m-%d', time.localtime(time.time() - 365 * 86400))" name="date_start"/>
<field eval="time.strftime('%Y-%m-%d')" name="date"/> <field eval="time.strftime('%Y-%m-%d')" name="date"/>
<field name="type">normal</field> <field name="type">normal</field>
@@ -207,67 +178,56 @@
</record> </record>
<record id="analytic_project_2_support" model="account.analytic.account"> <record id="analytic_project_2_support" model="account.analytic.account">
<field name="name">Support</field> <field name="name">Support</field>
<field name="code">1</field>
<field name="type">normal</field> <field name="type">normal</field>
<field name="parent_id" ref="analytic_project_2"/> <field name="parent_id" ref="analytic_project_2"/>
</record> </record>
<record id="analytic_project_2_development" model="account.analytic.account"> <record id="analytic_project_2_development" model="account.analytic.account">
<field name="name">Development</field> <field name="name">Development</field>
<field name="code">2</field>
<field name="type">normal</field> <field name="type">normal</field>
<field name="parent_id" ref="analytic_project_2"/> <field name="parent_id" ref="analytic_project_2"/>
</record> </record>
<record id="analytic_project_1_trainings" model="account.analytic.account"> <record id="analytic_project_1_trainings" model="account.analytic.account">
<field name="name">Training</field> <field name="name">Training</field>
<field name="code">1</field>
<field name="type">normal</field> <field name="type">normal</field>
<field name="parent_id" ref="analytic_project_1"/> <field name="parent_id" ref="analytic_project_1"/>
</record> </record>
<record id="analytic_project_1_development" model="account.analytic.account"> <record id="analytic_project_1_development" model="account.analytic.account">
<field name="name">Development</field> <field name="name">Development</field>
<field name="code">2</field>
<field name="type">normal</field> <field name="type">normal</field>
<field name="parent_id" ref="analytic_project_1"/> <field name="parent_id" ref="analytic_project_1"/>
</record> </record>
<record id="analytic_administratif" model="account.analytic.account"> <record id="analytic_administratif" model="account.analytic.account">
<field name="name">Administrative</field> <field name="name">Administrative</field>
<field name="code">1</field>
<field name="type">normal</field> <field name="type">normal</field>
<field name="parent_id" ref="analytic_internal"/> <field name="parent_id" ref="analytic_internal"/>
</record> </record>
<record id="analytic_commercial_marketing" model="account.analytic.account"> <record id="analytic_commercial_marketing" model="account.analytic.account">
<field name="name">Commercial &amp; Marketing</field> <field name="name">Commercial &amp; Marketing</field>
<field name="code">2</field>
<field name="type">normal</field> <field name="type">normal</field>
<field name="parent_id" ref="analytic_internal"/> <field name="parent_id" ref="analytic_internal"/>
</record> </record>
<record id="analytic_our_super_product_development" model="account.analytic.account"> <record id="analytic_our_super_product_development" model="account.analytic.account">
<field name="name">Our Super Product Development</field> <field name="name">Our Super Product Development</field>
<field name="code">3</field>
<field name="type">view</field> <field name="type">view</field>
<field name="parent_id" ref="analytic_internal"/> <field name="parent_id" ref="analytic_internal"/>
</record> </record>
<record id="analytic_stable" model="account.analytic.account"> <record id="analytic_stable" model="account.analytic.account">
<field name="name">Stable</field> <field name="name">Stable</field>
<field name="code">1</field>
<field name="type">normal</field> <field name="type">normal</field>
<field name="parent_id" ref="analytic_our_super_product_development"/> <field name="parent_id" ref="analytic_our_super_product_development"/>
</record> </record>
<record id="analytic_trunk" model="account.analytic.account"> <record id="analytic_trunk" model="account.analytic.account">
<field name="name">Trunk</field> <field name="name">Trunk</field>
<field name="code">2</field>
<field name="type">normal</field> <field name="type">normal</field>
<field name="parent_id" ref="analytic_our_super_product_development"/> <field name="parent_id" ref="analytic_our_super_product_development"/>
</record> </record>
<record id="analytic_paid" model="account.analytic.account"> <record id="analytic_paid" model="account.analytic.account">
<field name="name">Paid</field> <field name="name">Paid</field>
<field name="code">1</field>
<field name="type">normal</field> <field name="type">normal</field>
<field name="parent_id" ref="analytic_absences"/> <field name="parent_id" ref="analytic_absences"/>
</record> </record>
<record id="analytic_unpaid" model="account.analytic.account"> <record id="analytic_unpaid" model="account.analytic.account">
<field name="name">Unpaid</field> <field name="name">Unpaid</field>
<field name="code">2</field>
<field name="type">normal</field> <field name="type">normal</field>
<field name="parent_id" ref="analytic_absences"/> <field name="parent_id" ref="analytic_absences"/>
</record> </record>
addons/account/project/project_view.xml
+4 -41
View File
@@ -19,6 +19,7 @@
<field name="partner_id" invisible="1"/> <field name="partner_id" invisible="1"/>
<field name="state" invisible="1"/> <field name="state" invisible="1"/>
<field name="type" invisible="1"/> <field name="type" invisible="1"/>
<field name="company_id" groups="base.group_multi_company"/>
</tree> </tree>
</field> </field>
</record> </record>
@@ -59,7 +60,7 @@
<field name="field_parent">child_complete_ids</field> <field name="field_parent">child_complete_ids</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree colors="blue:state=='pending';grey:state in ('close','cancelled');blue:type=='view'" string="Analytic account" toolbar="1"> <tree colors="blue:state=='pending';grey:state in ('close','cancelled');blue:type=='view'" string="Analytic account" toolbar="1">
<field name="name"/> <field name="complete_name"/>
<field name="code"/> <field name="code"/>
<field name="debit"/> <field name="debit"/>
<field name="credit"/> <field name="credit"/>
@@ -71,50 +72,11 @@
<field name="partner_id" invisible="1"/> <field name="partner_id" invisible="1"/>
<field name="parent_id" invisible="1"/> <field name="parent_id" invisible="1"/>
<field name="type"/> <field name="type"/>
<field name="company_id" groups="base.group_multi_company"/>
</tree> </tree>
</field> </field>
</record> </record>
<record id="view_account_analytic_account_form" model="ir.ui.view">
<field name="name">account.analytic.account.form</field>
<field name="model">account.analytic.account</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Analytic Account" version="7.0">
<sheet>
<group>
<group>
<field name="name" colspan="4"/>
<field name="parent_id" on_change="on_change_parent(parent_id)"/>
<field name="company_id" on_change="on_change_company(company_id)" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
</group>
<group>
<field name="type"/>
<field name="code"/>
</group>
</group>
<notebook>
<page string="Account Data">
<group>
<group string="Contacts">
<field name="partner_id"/>
<field name="user_id"/>
</group>
<group name="contract" string="Contract Data">
<field name="date_start"/>
<field name="date"/>
<field name="quantity_max"/>
</group>
</group>
</page>
<page string="Description">
<field name="description"/>
</page>
</notebook>
</sheet>
</form>
</field>
</record>
<record id="action_account_analytic_account_form" model="ir.actions.act_window"> <record id="action_account_analytic_account_form" model="ir.actions.act_window">
<field name="name">Analytic Accounts</field> <field name="name">Analytic Accounts</field>
@@ -210,6 +172,7 @@
<field domain="[('type','=','normal')]" name="account_id"/> <field domain="[('type','=','normal')]" name="account_id"/>
<field name="general_account_id" invisible="context.get('to_invoice', False)"/> <field name="general_account_id" invisible="context.get('to_invoice', False)"/>
<field name="user_id" invisible="1" /> <field name="user_id" invisible="1" />
<field name="company_id" groups="base.group_multi_company"/>
</tree> </tree>
</field> </field>
</record> </record>
addons/account/project/report/cost_ledger.py
+2 -2
View File
@@ -75,10 +75,10 @@ class account_analytic_cost_ledger(report_sxw.rml_parse):
return res return res
def _account_sum_debit(self, account, date1, date2): def _account_sum_debit(self, account, date1, date2):
return self._sum_debit(self, [account], date1, date2) return self._sum_debit([account], date1, date2)
def _account_sum_credit(self, account, date1, date2): def _account_sum_credit(self, account, date1, date2):
return self._sum_credit(self, [account], date1, date2) return self._sum_credit([account], date1, date2)
def _account_sum_balance(self, account, date1, date2): def _account_sum_balance(self, account, date1, date2):
debit = self._account_sum_debit(account, date1, date2) debit = self._account_sum_debit(account, date1, date2)
addons/account/project/wizard/account_analytic_balance_report_view.xml
+3 -2
View File
@@ -9,8 +9,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Select Period" version="7.0"> <form string="Select Period" version="7.0">
<header> <header>
<button name="check_report" string="Print" type="object" icon="gtk-print"/> <button name="check_report" string="Print" type="object" class="oe_highlight"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<group col="4"> <group col="4">
<field name="date1"/> <field name="date1"/>
addons/account/project/wizard/account_analytic_chart_view.xml
+3 -2
View File
@@ -9,8 +9,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Analytic Account Charts" version="7.0"> <form string="Analytic Account Charts" version="7.0">
<header> <header>
<button name="analytic_account_chart_open_window" string="Open Charts" type="object" icon="gtk-ok"/> <button name="analytic_account_chart_open_window" string="Open Charts" type="object" class="oe_highlight"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<group string="Select the Period for Analysis" col="4"> <group string="Select the Period for Analysis" col="4">
<field name="from_date"/> <field name="from_date"/>
addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml
+3 -2
View File
@@ -9,8 +9,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Select period" version="7.0"> <form string="Select period" version="7.0">
<header> <header>
<button special="cancel" string="Cancel" icon="gtk-cancel"/> <button name="check_report" string="Print" type="object" class="oe_highlight"/>
<button name="check_report" string="Print" type="object" icon="gtk-print"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<group string="Cost Ledger for Period" col="4"> <group string="Cost Ledger for Period" col="4">
<field name="date1"/> <field name="date1"/>
addons/account/project/wizard/account_analytic_cost_ledger_view.xml
+3 -2
View File
@@ -9,8 +9,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Select Period" version="7.0"> <form string="Select Period" version="7.0">
<header> <header>
<button name="check_report" string="Print" type="object" icon="gtk-print"/> <button name="check_report" string="Print" type="object" class="oe_highlight"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<group col="4"> <group col="4">
<field name="date1"/> <field name="date1"/>
addons/account/project/wizard/account_analytic_inverted_balance_report.xml
+3 -2
View File
@@ -9,8 +9,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Select Period" version="7.0"> <form string="Select Period" version="7.0">
<header> <header>
<button name="check_report" string="Print" type="object" icon="gtk-print"/> <button name="check_report" string="Print" type="object" class="oe_highlight"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<group col="4"> <group col="4">
<field name="date1"/> <field name="date1"/>
addons/account/project/wizard/account_analytic_journal_report_view.xml
+3 -2
View File
@@ -9,8 +9,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Select Period" version="7.0"> <form string="Select Period" version="7.0">
<header> <header>
<button name="check_report" string="Print" type="object" icon="gtk-print"/> <button name="check_report" string="Print" type="object" class="oe_highlight"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<group col="4"> <group col="4">
<field name="date1"/> <field name="date1"/>
addons/account/project/wizard/project_account_analytic_line_view.xml
+3 -2
View File
@@ -9,8 +9,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="View Account Analytic Lines" version="7.0"> <form string="View Account Analytic Lines" version="7.0">
<header> <header>
<button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object"/> <button string="Open Entries" name="action_open_window" type="object" class="oe_highlight"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<group col="4"> <group col="4">
<field name="from_date"/> <field name="from_date"/>
addons/account/report/account_analytic_entries_report_view.xml
+1 -1
View File
@@ -91,7 +91,7 @@
<menuitem action="action_analytic_entries_report" <menuitem action="action_analytic_entries_report"
id="menu_action_analytic_entries_report" id="menu_action_analytic_entries_report"
groups="analytic.group_analytic_accounting" groups="analytic.group_analytic_accounting"
parent="account.menu_finance_statistic_report_statement" sequence="4"/> parent="account.menu_finance_reporting" sequence="4"/>
</data> </data>
</openerp> </openerp>
addons/account/report/account_entries_report_view.xml
+1 -1
View File
@@ -133,7 +133,7 @@
<field name="help">From this view, have an analysis of your different financial accounts. The document shows your debit and credit taking in consideration some criteria you can choose by using the search tool.</field> <field name="help">From this view, have an analysis of your different financial accounts. The document shows your debit and credit taking in consideration some criteria you can choose by using the search tool.</field>
</record> </record>
<menuitem action="action_account_entries_report_all" id="menu_action_account_entries_report_all" <menuitem action="action_account_entries_report_all" id="menu_action_account_entries_report_all"
parent="account.menu_finance_statistic_report_statement" parent="account.menu_finance_reporting"
groups="group_account_manager" groups="group_account_manager"
sequence="2"/> sequence="2"/>
</data> </data>
addons/account/report/account_general_ledger.rml
+2 -2
View File
@@ -497,7 +497,7 @@
<para style="terp_default_8">[[ strip_name(line['partner_name'],10) ]]</para> <para style="terp_default_8">[[ strip_name(line['partner_name'],10) ]]</para>
</td> </td>
<td> <td>
<para style="terp_default_8">[[ strip_name(line['lref'],9) ]]</para> <para style="terp_default_8">[[ line['lref'] and strip_name(line['lref'],9) ]]</para>
</td> </td>
<td> <td>
<para style="terp_default_8">[[ strip_name(line['move'],9) ]]</para> <para style="terp_default_8">[[ strip_name(line['move'],9) ]]</para>
@@ -590,7 +590,7 @@
<para style="terp_default_8">[[ strip_name(line['partner_name'],20) ]]</para> <para style="terp_default_8">[[ strip_name(line['partner_name'],20) ]]</para>
</td> </td>
<td> <td>
<para style="terp_default_8">[[ strip_name(line['lref'],9) ]]</para> <para style="terp_default_8">[[ line['lref'] and strip_name(line['lref'],9) ]]</para>
</td> </td>
<td> <td>
<para style="terp_default_8">[[ strip_name(line['move'],9) ]]</para> <para style="terp_default_8">[[ strip_name(line['move'],9) ]]</para>
addons/account/report/account_general_ledger_landscape.rml
+2 -2
View File
@@ -505,7 +505,7 @@
<para style="terp_default_Bold_7_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para> <para style="terp_default_Bold_7_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
</td> </td>
<td> <td>
<para style="terp_default_Bold_7_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account'), currency = company.currency_id) ]]</para> <para style="terp_default_Bold_7_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account'), currency_obj= company.currency_id) ]]</para>
</td> </td>
<td> <td>
<para style="terp_default_Bold_7_Right">[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account'),currency_obj=o.currency_id) or '' ]]</para> <para style="terp_default_Bold_7_Right">[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account'),currency_obj=o.currency_id) or '' ]]</para>
@@ -529,7 +529,7 @@
<para style="terp_default_7">[[ strip_name(line['partner_name'],20) ]]</para> <para style="terp_default_7">[[ strip_name(line['partner_name'],20) ]]</para>
</td> </td>
<td> <td>
<para style="terp_default_7">[[ strip_name(line['lref'],17) ]]</para> <para style="terp_default_7">[[ line['lref'] and strip_name(line['lref'],17) ]]</para>
</td> </td>
<td> <td>
<para style="terp_default_7">[[ line['move'] ]]</para> <para style="terp_default_7">[[ line['move'] ]]</para>
addons/account/report/account_invoice_report_view.xml
+10 -5
View File
@@ -56,6 +56,11 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Invoices Analysis"> <search string="Invoices Analysis">
<group> <group>
<filter icon="terp-go-year" string="Year"
name="year"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
help="year"/>
<separator orientation="vertical"/>
<field name="date"/> <field name="date"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter string="Draft" <filter string="Draft"
@@ -98,6 +103,9 @@
<filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id','residual_visible':True}"/> <filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id','residual_visible':True}"/>
<filter string="Salesperson" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/> <filter string="Salesperson" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter string="Due Date" icon="terp-go-today" context="{'group_by':'date_due'}"/>
<filter string="Period" icon="terp-go-month" context="{'group_by':'period_id'}" name="period"/>
<separator orientation="vertical"/>
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True,'residual_invisible':True}"/> <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True,'residual_invisible':True}"/>
<filter string="Category of Product" name="category_product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id','residual_invisible':True}"/> <filter string="Category of Product" name="category_product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id','residual_invisible':True}"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
@@ -106,15 +114,12 @@
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/> <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
<filter string="Account" icon="terp-folder-orange" context="{'group_by':'account_line_id'}"/> <filter string="Account" icon="terp-folder-orange" context="{'group_by':'account_line_id'}"/>
<separator orientation="vertical"/>
<filter string="Due Date" icon="terp-go-today" context="{'group_by':'date_due'}"/>
<filter string="Period" icon="terp-go-month" context="{'group_by':'period_id'}" name="period"/>
<separator orientation="vertical" groups="base.group_multi_company"/> <separator orientation="vertical" groups="base.group_multi_company"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter string="Day" name="day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by Invoice Date"/> <filter string="Day" name="day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by Invoice Date"/>
<filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of Invoice Date"/> <filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of Invoice Date"/>
<filter string="Year" name="year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Invoice Date"/> <filter string="Year" name="group_year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of Invoice Date"/>
</group> </group>
</search> </search>
</field> </field>
@@ -131,7 +136,7 @@
</record> </record>
<menuitem action="action_account_invoice_report_all" id="menu_action_account_invoice_report_all" parent="account.menu_finance_statistic_report_statement" sequence="0"/> <menuitem action="action_account_invoice_report_all" id="menu_action_account_invoice_report_all" parent="account.menu_finance_reporting" sequence="0"/>
<act_window <act_window
id="act_account_invoice_partner_relation" id="act_account_invoice_partner_relation"
addons/account/report/account_partner_ledger.rml
+1 -1
View File
@@ -519,7 +519,7 @@
<para style="terp_default_8">[[ line['a_code'] ]]</para> <para style="terp_default_8">[[ line['a_code'] ]]</para>
</td> </td>
<td> <td>
<para style="terp_default_8">[[ strip_name(line['ref'],10) ]] - [[ strip_name(line['name'],15) ]]</para> <para style="terp_default_8">[[ line['ref'] and strip_name(line['ref'],10) ]] - [[ strip_name(line['name'],15) ]]</para>
</td> </td>
<td> <td>
<para style="terp_default_Right_8">[[ formatLang((line['debit'])) ]]</para> <para style="terp_default_Right_8">[[ formatLang((line['debit'])) ]]</para>
addons/account/report/account_partner_ledger_other.rml
+1 -1
View File
@@ -524,7 +524,7 @@
<para style="terp_default_8">[[ line['a_code'] ]]</para> <para style="terp_default_8">[[ line['a_code'] ]]</para>
</td> </td>
<td> <td>
<para style="terp_default_8">[[ strip_name(line['ref'],10) ]] - [[ strip_name(line['name'],15) ]]</para> <para style="terp_default_8">[[ line['ref'] and strip_name(line['ref'],10) ]] - [[ strip_name(line['name'],15) ]]</para>
</td> </td>
<td> <td>
<para style="terp_default_Right_8">[[ formatLang((line['debit'])) ]]</para> <para style="terp_default_Right_8">[[ formatLang((line['debit'])) ]]</para>
addons/account/report/account_print_invoice.rml
+1 -1
View File
@@ -162,7 +162,7 @@
</td> </td>
<td> <td>
<para style="terp_default_8">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para> <para style="terp_default_8">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
<para style="terp_default_8">[[ display_address(o.partner_id,'invoice') ]]</para> <para style="terp_default_8">[[ display_address(o.partner_id) ]]</para>
<para style="terp_default_8"> <para style="terp_default_8">
<font color="white"> </font> <font color="white"> </font>
</para> </para>
addons/account/report/account_treasury_report_view.xml
+1 -1
View File
@@ -56,7 +56,7 @@
<field name="help">From this view, have an analysis of your treasury. It sums the balance of every accounting entries made on liquidity accounts per period.</field> <field name="help">From this view, have an analysis of your treasury. It sums the balance of every accounting entries made on liquidity accounts per period.</field>
</record> </record>
<menuitem action="action_account_treasury_report_all" id="menu_action_account_treasury_report_all" <menuitem action="action_account_treasury_report_all" id="menu_action_account_treasury_report_all"
parent="account.menu_finance_statistic_report_statement" parent="account.menu_finance_reporting"
groups="group_account_manager" groups="group_account_manager"
sequence="2"/> sequence="2"/>
</data> </data>
addons/account/res_config.py
+13 -19
View File
@@ -37,14 +37,14 @@ class account_config_settings(osv.osv_memory):
'company_id': fields.many2one('res.company', 'Company', required=True), 'company_id': fields.many2one('res.company', 'Company', required=True),
'has_default_company': fields.boolean('Has default company', readonly=True), 'has_default_company': fields.boolean('Has default company', readonly=True),
'expects_chart_of_accounts': fields.related('company_id', 'expects_chart_of_accounts', type='boolean', 'expects_chart_of_accounts': fields.related('company_id', 'expects_chart_of_accounts', type='boolean',
string='Chart of Accounts for this Company', string='This Company Has its Own Chart of Accounts',
help="""Check this box if this company is a legal entity."""), help="""Check this box if this company is a legal entity."""),
'currency_id': fields.related('company_id', 'currency_id', type='many2one', relation='res.currency', required=True, 'currency_id': fields.related('company_id', 'currency_id', type='many2one', relation='res.currency', required=True,
string='Default Company Currency', help="Main currency of the company."), string='Default Company Currency', help="Main currency of the company."),
'paypal_account': fields.related('company_id', 'paypal_account', type='char', size=128, 'paypal_account': fields.related('company_id', 'paypal_account', type='char', size=128,
string='Paypal Account', help="Paypal account (email) for receiving online payments (credit card, etc.)"), string='Paypal Account', help="Paypal account (email) for receiving online payments (credit card, etc.) If you set a paypal account, the customer will be able to pay your invoices or quotations with a button \"Pay with Paypal\" in automated emails or through the OpenERP portal."),
'company_footer': fields.related('company_id', 'rml_footer2', type='char', size=250, readonly=True, 'company_footer': fields.related('company_id', 'rml_footer2', type='char', size=250, readonly=True,
string='Bank Accounts on Reports', help="Bank accounts as printed on footer of reports."), string='Bank Accounts on Reports', help="Bank accounts as printed in the footer of each customer document. This is for information purpose only, you should configure these bank accounts through the above button \"Configure Bank Accounts\"."),
'has_chart_of_accounts': fields.boolean('Company has a chart of accounts'), 'has_chart_of_accounts': fields.boolean('Company has a chart of accounts'),
'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', domain="[('visible','=', True)]"), 'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', domain="[('visible','=', True)]"),
@@ -77,12 +77,12 @@ class account_config_settings(osv.osv_memory):
help="""This allows you to check writing and printing. help="""This allows you to check writing and printing.
This installs the module account_check_writing."""), This installs the module account_check_writing."""),
'module_account_accountant': fields.boolean('Accountant Features', 'module_account_accountant': fields.boolean('Accountant Features',
help="""If you do not check this box, you will be able to do Invoicing & Payments, but not accounting (Journal Items, Chart of Accounts, ...)."""), help="""If you do not check this box, you will be able to do invoicing & payments, but not accounting (Journal Items, Chart of Accounts, ...)"""),
'module_account_asset': fields.boolean('Assets Management', 'module_account_asset': fields.boolean('Assets Management',
help="""This allows you to manage the assets owned by a company or a person. help="""This allows you to manage the assets owned by a company or a person.
It keeps track of the depreciation occurred on those assets, and creates account move for those depreciation lines. It keeps track of the depreciation occurred on those assets, and creates account move for those depreciation lines.
This installs the module account_asset. If you do not check this box, you will be able to do invoicing & payments, This installs the module account_asset. If you do not check this box, you will be able to do invoicing & payments,
but not accounting (Journal Items, Chart of Accounts, ...) """), but not accounting (Journal Items, Chart of Accounts, ...)"""),
'module_account_budget': fields.boolean('Budget Management', 'module_account_budget': fields.boolean('Budget Management',
help="""This allows accountants to manage analytic and crossovered budgets. help="""This allows accountants to manage analytic and crossovered budgets.
Once the master budgets and the budgets are defined, Once the master budgets and the budgets are defined,
@@ -96,24 +96,18 @@ class account_config_settings(osv.osv_memory):
'module_account_voucher': fields.boolean('Manage Customer Payments', 'module_account_voucher': fields.boolean('Manage Customer Payments',
help="""This includes all the basic requirements of voucher entries for bank, cash, sales, purchase, expense, contra, etc. help="""This includes all the basic requirements of voucher entries for bank, cash, sales, purchase, expense, contra, etc.
This installs the module account_voucher."""), This installs the module account_voucher."""),
'module_account_followup': fields.boolean('Manage Customer Payment Follow-Ups', 'module_account_followup': fields.boolean('Manage Customer Payment Follow-ups',
help="""This allows to automate letters for unpaid invoices, with multi-level recalls. help="""This allows to automate letters for unpaid invoices, with multi-level recalls.
This installs the module account_followup."""), This installs the module account_followup."""),
'module_account_invoice_layout': fields.boolean('Allow Notes and Subtotals',
help="""This provides some features to improve the layout of invoices.
It gives you the possibility to:
* order all the lines of an invoice
* add titles, comment lines, sub total lines
* draw horizontal lines and put page breaks.
This installs the module account_invoice_layout."""),
'group_proforma_invoices': fields.boolean('Allow Pro-forma Invoices', 'group_proforma_invoices': fields.boolean('Allow Pro-forma Invoices',
implied_group='account.group_proforma_invoices', implied_group='account.group_proforma_invoices',
help="Allows you to put invoices in pro-forma state."), help="Allows you to put invoices in pro-forma state."),
'default_sale_tax': fields.many2one('account.tax', 'Default Sale Tax'), 'default_sale_tax': fields.many2one('account.tax', 'Default Sale Tax',
'default_purchase_tax': fields.many2one('account.tax', 'Default Purchase Tax'), help="This sale tax will be assigned by default on new products."),
'decimal_precision': fields.integer('Decimal Precision', 'default_purchase_tax': fields.many2one('account.tax', 'Default Purchase Tax',
help="""Set the decimal precision for rounding results in accounting."""), help="This purchase tax will be assigned by default on new products."),
'decimal_precision': fields.integer('Decimal Precision on Journal Entries',
help="""As an example, a decimal precision of 2 will allow journal entries like: 9.99 EUR, whereas a decimal precision of 4 will allow journal entries like: 0.0231 EUR."""),
} }
def _default_company(self, cr, uid, context=None): def _default_company(self, cr, uid, context=None):
addons/account/res_config_view.xml
+75 -53
View File
@@ -17,52 +17,67 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Configure Accounting" version="7.0"> <form string="Configure Accounting" version="7.0">
<header> <header>
<button string="Apply" type="object" name="execute"/> <button string="Apply" type="object" name="execute" class="oe_highlight"/>
<button string="Cancel" special="cancel"/> or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header> </header>
<group col="4"> <sheet>
<field name="has_default_company" invisible="1" /> <field name="has_default_company" invisible="1" />
<field name="has_chart_of_accounts" invisible="1"/> <field name="has_chart_of_accounts" invisible="1"/>
<field name="company_id" widget="selection" on_change="onchange_company_id(company_id)" <field name="complete_tax_set" invisible="1"/>
<field name="has_fiscal_year" invisible="1"/>
<group groups="base.group_multi_company">
<field name="company_id" string="Select Company" widget="selection"
on_change="onchange_company_id(company_id)"
attrs="{'invisible': [('has_default_company', '=', True)]}"/> attrs="{'invisible': [('has_default_company', '=', True)]}"/>
<field name="expects_chart_of_accounts"/> <field name="expects_chart_of_accounts"/>
</group> </group>
<group string="Select a Chart of Accounts to Install" col="4" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}"> <div class="oe_form_button_save_dirty">
<field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/> <group string="Select a Chart of Accounts to Install"
attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}">
<group>
<field name="chart_template_id" widget="selection" domain="[('visible','=', True)]"
on_change="onchange_chart_template_id(chart_template_id)"/>
<field name="code_digits" groups="account.group_account_user"/>
<field name="sale_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
<field name="purchase_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
<field name="sale_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}" on_change="onchange_tax_rate(sale_tax_rate)"/>
<field name="purchase_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}"/>
</group>
<button string="Install More Chart Templates" icon="gtk-go-forward" <button string="Install More Chart Templates" icon="gtk-go-forward"
name="%(open_account_charts_modules)d" type="action"/> name="%(open_account_charts_modules)d" type="action"/>
<newline/>
<field name="code_digits" groups="account.group_account_user"/>
<newline/>
<field name="complete_tax_set" invisible="1"/>
<field name="sale_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
<field name="purchase_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
<field name="sale_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}" on_change="onchange_tax_rate(sale_tax_rate)"/>
<field name="purchase_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}"/>
</group> </group>
</div>
<field name="has_fiscal_year" invisible="1"/> <div class="oe_form_button_save_dirty">
<group string="No Fiscal Year Defined for this Company" col="4" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_fiscal_year','=',True)]}"> <group string="No Fiscal Year Defined for This Company"
<field name="date_start" on_change="onchange_start_date(date_start)"/> attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_fiscal_year','=',True)]}">
<field name="date_stop"/> <label for="date_start" string="Date Range"/>
<field name="period" colspan="4"/> <div>
<field name="date_start" on_change="onchange_start_date(date_start)" class="oe_inline"/> -
<field name="date_stop" class="oe_inline"/>
</div>
<field name="period"/>
</group> </group>
</div>
<field name="complete_tax_set" invisible="1"/>
<group string="Accounting Configuration"> <group string="Accounting Configuration">
<group> <group>
<field name="default_sale_tax" domain="[('type_tax_use','=','sale'), ('company_id','=',company_id)]" attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/> <field name="default_sale_tax" domain="[('type_tax_use','=','sale'), ('company_id','=',company_id)]"
attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/>
<field name="module_account_accountant"/> <field name="module_account_accountant"/>
<field name="module_account_asset"/> <field name="currency_id"/>
<field name="decimal_precision"/>
</group> </group>
<group> <group>
<field name="default_purchase_tax" domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]" attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/> <field name="default_purchase_tax" domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]"
<field name="currency_id"/> attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/>
<field name="module_account_asset"/>
<field name="module_account_budget"/> <field name="module_account_budget"/>
<field name="decimal_precision"/>
</group> </group>
</group> </group>
@@ -72,47 +87,54 @@
<field name="purchase_refund_journal_id" invisible="1"/> <field name="purchase_refund_journal_id" invisible="1"/>
<group> <group>
<group string="Customer Invoices"> <group string="Customer Invoices">
<label string="Invoice Sequence" for="sale_sequence_prefix"/> <label for="sale_sequence_next"/>
<div> <group>
<field name="sale_sequence_prefix" class="oe_inline"/> <field name="sale_sequence_prefix" class="oe_inline" nolabel="1"
<field name="sale_sequence_next" class="oe_inline" attrs="{'readonly': [('sale_journal_id','=',False)]}"/> help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
</div> <field name="sale_sequence_next" class="oe_inline" nolabel="1" attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
</group>
<label string="Credit Note Sequence" for="sale_refund_sequence_prefix"/> <label for="sale_refund_sequence_next"/>
<div> <group>
<field name="sale_refund_sequence_prefix" class="oe_inline"/> <field name="sale_refund_sequence_prefix" class="oe_inline" nolabel="1"
<field name="sale_refund_sequence_next" class="oe_inline" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/> help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
</div> <field name="sale_refund_sequence_next" class="oe_inline" nolabel="1" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
<field name="module_account_invoice_layout"/> </group>
<field name="module_account_voucher"/> <field name="module_account_voucher"/>
<field name="module_account_followup"/> <field name="module_account_followup"/>
<field name="group_proforma_invoices"/> <field name="group_proforma_invoices"/>
</group> </group>
<group string="Supplier Invoices"> <group string="Supplier Invoices">
<label string="Supplier Invoice Sequence" for="purchase_sequence_prefix"/> <label for="purchase_sequence_next"/>
<div> <group>
<field name="purchase_sequence_prefix" class="oe_inline"/> <field name="purchase_sequence_prefix" class="oe_inline" nolabel="1"
<field name="purchase_sequence_next" class="oe_inline" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/> help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
</div> <field name="purchase_sequence_next" class="oe_inline" nolabel="1" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
<label string="Supplier Credit Note Sequence" for="purchase_refund_sequence_prefix"/> </group>
<div> <label for="purchase_refund_sequence_next"/>
<field name="purchase_refund_sequence_prefix" class="oe_inline"/> <group>
<field name="purchase_refund_sequence_next" class="oe_inline" <field name="purchase_refund_sequence_prefix" class="oe_inline" nolabel="1"
help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
<field name="purchase_refund_sequence_next" class="oe_inline" nolabel="1"
attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}"/> attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}"/>
</div> </group>
<field name="module_account_payment"/> <field name="module_account_payment"/>
</group> </group>
<group string="Electronic Payments"> <group string="Electronic Payments">
<field name="paypal_account"/> <field name="paypal_account" placeholder="sales@openerp.com"/>
</group> </group>
<group string="Bank &amp; Cash"> <group string="Bank &amp; Cash">
<label string="Configure Bank Accounts :"/> <label for="id" string="Configure Bank Accounts"/>
<button name="%(action_bank_tree)d" string="Configure Bank Accounts" icon="gtk-go-forward" type="action"/> <button name="%(action_bank_tree)d" string="Configure Bank Accounts" icon="gtk-go-forward" type="action"/>
<field name="company_footer"/> <field name="company_footer"/>
<field name="module_account_check_writing"/> <field name="module_account_check_writing"/>
</group> </group>
<group name="analytic_accounting" invisible="1" string="Analytic Accounting"/> <group name="analytic_accounting" invisible="1" string="Analytic Accounting"/>
</group> </group>
</sheet>
</form> </form>
</field> </field>
</record> </record>
addons/account/wizard/account_automatic_reconcile_view.xml
+3 -5
View File
@@ -9,8 +9,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Reconciliation" version="7.0"> <form string="Reconciliation" version="7.0">
<header> <header>
<button name="reconcile" string="Reconcile" type="object" icon="terp-stock_effects-object-colorize"/> <button name="reconcile" string="Reconcile" type="object" class="oe_highlight"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<separator string="Reconciliation"/> <separator string="Reconciliation"/>
<label string="For an invoice to be considered as paid, the invoice entries must be reconciled with counterparts, usually payments. With the automatic reconciliation functionality, OpenERP makes its own search for entries to reconcile in a series of accounts. It finds entries for each partner where the amounts correspond."/> <label string="For an invoice to be considered as paid, the invoice entries must be reconciled with counterparts, usually payments. With the automatic reconciliation functionality, OpenERP makes its own search for entries to reconcile in a series of accounts. It finds entries for each partner where the amounts correspond."/>
@@ -53,9 +54,6 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Reconciliation Result" version="7.0"> <form string="Reconciliation Result" version="7.0">
<header>
<button special="cancel" string="Ok" icon="terp-dialog-close" default_focus="1"/>
</header>
<group> <group>
<field name="reconciled"/> <field name="reconciled"/>
<field name="unreconciled"/> <field name="unreconciled"/>
addons/account/wizard/account_change_currency_view.xml
+3 -2
View File
@@ -8,8 +8,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Invoice Currency" version="7.0"> <form string="Invoice Currency" version="7.0">
<header> <header>
<button name="change_currency" string="Change Currency" type="object" icon="terp-stock_effects-object-colorize"/> <button name="change_currency" string="Change Currency" type="object" class="oe_highlight"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<group string="This wizard will change the currency of the invoice"> <group string="This wizard will change the currency of the invoice">
<field name="currency_id"/> <field name="currency_id"/>
addons/account/wizard/account_chart_view.xml
+3 -2
View File
@@ -8,8 +8,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Account charts" version="7.0"> <form string="Account charts" version="7.0">
<header> <header>
<button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_chart_open_window" type="object"/> <button string="Open Charts" name="account_chart_open_window" type="object" class="oe_highlight"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<group colspan="4"> <group colspan="4">
<field name="fiscalyear" on_change="onchange_fiscalyear(fiscalyear)"/> <field name="fiscalyear" on_change="onchange_fiscalyear(fiscalyear)"/>
addons/account/wizard/account_fiscalyear_close_state.py
+1 -4
View File
@@ -20,6 +20,7 @@
############################################################################## ##############################################################################
from osv import fields, osv from osv import fields, osv
from tools.translate import _
class account_fiscalyear_close_state(osv.osv_memory): class account_fiscalyear_close_state(osv.osv_memory):
""" """
@@ -53,10 +54,6 @@ class account_fiscalyear_close_state(osv.osv_memory):
cr.execute('UPDATE account_fiscalyear ' \ cr.execute('UPDATE account_fiscalyear ' \
'SET state = %s WHERE id = %s', ('done', fy_id)) 'SET state = %s WHERE id = %s', ('done', fy_id))
# Log message for Fiscalyear
fy_pool = self.pool.get('account.fiscalyear')
fy_code = fy_pool.browse(cr, uid, fy_id, context=context).code
fy_pool.log(cr, uid, fy_id, "Fiscal year '%s' is closed, no more modification allowed." % (fy_code))
return {'type': 'ir.actions.act_window_close'} return {'type': 'ir.actions.act_window_close'}
account_fiscalyear_close_state() account_fiscalyear_close_state()
addons/account/wizard/account_fiscalyear_close_state.xml
+8 -9
View File
@@ -7,15 +7,14 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Close states of Fiscal year and periods" version="7.0"> <form string="Close states of Fiscal year and periods" version="7.0">
<header> <header>
<button icon="gtk-cancel" special="cancel" string="Cancel"/> <button icon="terp-locked" string="Close Fiscalyear" name="data_save" type="object" class="oe_highlight" />
<button icon="terp-locked" string="Close Fiscalyear" name="data_save" type="object"/> </header>
</header> <separator string="Close states of Fiscal year and periods"/>
<separator string="Close states of Fiscal year and periods"/> <label string ="If no additional entries should be recorded on a fiscal year, you can close it from here. It will close all opened periods in this year that will make impossible any new entry record. Close a fiscal year when you need to finalize your end of year results definitive "/>
<label string ="If no additional entries should be recorded on a fiscal year, you can close it from here. It will close all opened periods in this year that will make impossible any new entry record. Close a fiscal year when you need to finalize your end of year results definitive "/> <group>
<group> <field name="fy_id" domain="[('state','=','draft')]"/>
<field name="fy_id" domain="[('state','=','draft')]"/> </group>
</group>
</form> </form>
</field> </field>
</record> </record>
addons/account/wizard/account_fiscalyear_close_view.xml
+3 -2
View File
@@ -8,8 +8,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Generate Fiscal Year Opening Entries" version="7.0"> <form string="Generate Fiscal Year Opening Entries" version="7.0">
<header> <header>
<button icon="gtk-execute" string="Create" name="data_save" type="object"/> <button string="Create" name="data_save" type="object" class="oe_highlight"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<separator string="Generate Fiscal Year Opening Entries"/> <separator string="Generate Fiscal Year Opening Entries"/>
<label string="This wizard will generate the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year: it will simply replace the old opening entries with the new ones."/> <label string="This wizard will generate the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year: it will simply replace the old opening entries with the new ones."/>
addons/account/wizard/account_invoice_refund_view.xml
+3 -2
View File
@@ -9,8 +9,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Credit Note" version="7.0"> <form string="Credit Note" version="7.0">
<header> <header>
<button icon="gtk-cancel" special="cancel" string="Cancel"/> <button string='Refund' name="invoice_refund" type="object" class="oe_highlight"/>
<button string='Refund' icon="gtk-execute" name="invoice_refund" type="object"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<separator string="Credit Note Options"/> <separator string="Credit Note Options"/>
<group col="4"> <group col="4">
addons/account/wizard/account_invoice_state_view.xml
+16 -14
View File
@@ -6,13 +6,14 @@
<field name="model">account.invoice.confirm</field> <field name="model">account.invoice.confirm</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Confirm Draft Invoices" version="7.0"> <form string="Confirm Draft Invoices" version="7.0">
<separator string="Confirm Draft Invoices" colspan="4"/> <header>
<group colspan="4" col="6"> <button string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1" class="oe_highlight"/>
<button icon="gtk-cancel" special="cancel" string="Close"/> or
<button icon="terp-camera_test" string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1"/> <button string="Cancel" class="oe_link" special="cancel"/>
</group> </header>
</form> <separator string="Confirm Draft Invoices"/>
</form>
</field> </field>
</record> </record>
@@ -27,13 +28,14 @@
<field name="model">account.invoice.cancel</field> <field name="model">account.invoice.cancel</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Cancel Selected Invoices" version="7.0"> <form string="Cancel Selected Invoices" version="7.0">
<separator string="Cancel Selected Invoices" colspan="4"/> <header>
<group colspan="4" col="6"> <button string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1" class="oe_highlight"/>
<button icon="gtk-cancel" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1"/> or
<button icon="terp-dialog-close" special="cancel" string="Close"/> <button string="Cancel" class="oe_link" special="cancel"/>
</group> </header>
</form> <separator string="Cancel Selected Invoices"/>
</form>
</field> </field>
</record> </record>
addons/account/wizard/account_journal_select_view.xml
+8 -7
View File
@@ -7,13 +7,14 @@
<field name="model">account.journal.select</field> <field name="model">account.journal.select</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Journal Select" version="7.0"> <form string="Journal Select" version="7.0">
<header> <header>
<button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object"/> <button string="Open Entries" name="action_open_window" type="object" class="oe_highlight"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/> or
</header> <button string="Cancel" class="oe_link" special="cancel"/>
<label string="Are you sure you want to open Journal Entries?"/> </header>
</form> <label string="Are you sure you want to open Journal Entries?"/>
</form>
</field> </field>
</record> </record>
addons/account/wizard/account_move_bank_reconcile_view.xml
+3 -2
View File
@@ -8,8 +8,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Bank reconciliation" version="7.0"> <form string="Bank reconciliation" version="7.0">
<header> <header>
<button icon="terp-gtk-go-back-rtl" string="Open for Bank Reconciliation" name="action_open_window" type="object"/> <button string="Open for Bank Reconciliation" name="action_open_window" type="object" class="oe_highlight"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<group> <group>
<field name="journal_id"/> <field name="journal_id"/>
addons/account/wizard/account_move_journal.py
+9 -11
View File
@@ -103,23 +103,21 @@ class account_move_journal(osv.osv_memory):
period_string = _("Period: %s") % tools.ustr(period) period_string = _("Period: %s") % tools.ustr(period)
separator_string = _("Open Journal Items !") separator_string = _("Open Journal Items !")
cancel_string = _("Cancel")
open_string = _("Open") open_string = _("Open")
view = """<?xml version="1.0" encoding="utf-8"?> view = """<?xml version="1.0" encoding="utf-8"?>
<form string="Standard entries"> <form string="Standard entries" version="7.0">
<header> <header>
<button icon="terp-gtk-go-back-rtl" string="%s" name="action_open_window" default_focus="1" type="object"/> <button string="%s" name="action_open_window" default_focus="1" type="object" class="oe_highlight"/>
<button icon="gtk-cancel" special="cancel" string="%s"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<group string="%s" colspan="4"> <group string="%s">
<field name="target_move" /> <field name="target_move" />
</group> </group>
<group colspan="4" > <label width="300" string="%s"/>
<label width="300" string="%s"/> <newline/>
<newline/> <label width="300" string="%s"/>
<label width="300" string="%s"/> </form>""" % (open_string, separator_string, journal_string, period_string)
</group>
</form>""" % (open_string, cancel_string, separator_string, journal_string, period_string)
view = etree.fromstring(view.encode('utf8')) view = etree.fromstring(view.encode('utf8'))
xarch, xfields = self._view_look_dom_arch(cr, uid, view, view_id, context=context) xarch, xfields = self._view_look_dom_arch(cr, uid, view, view_id, context=context)
addons/account/wizard/account_move_line_reconcile_select_view.xml
+3 -2
View File
@@ -8,8 +8,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Reconciliation" version="7.0"> <form string="Reconciliation" version="7.0">
<header> <header>
<button icon="terp-gtk-go-back-rtl" string="Open for Reconciliation" name="action_open_window" type="object" /> <button string="Open for Reconciliation" name="action_open_window" type="object" class="oe_highlight"/>
<button icon="gtk-cancel" special="cancel" string="Cancel" /> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<group> <group>
<field name="account_id"/> <field name="account_id"/>
addons/account/wizard/account_move_line_select_view.xml
+4 -3
View File
@@ -9,10 +9,11 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Account Select" version="7.0"> <form string="Account Select" version="7.0">
<header> <header>
<button icon="gtk-cancel" special="cancel" string="Cancel"/> <button string="Open Entries" name="open_window" type="object" default_focus="1" class="oe_highlight"/>
<button icon="terp-gtk-go-back-rtl" string="Open Entries" name="open_window" type="object" default_focus="1"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<label string="Are you sure you want to open Account move line entries!"/> <label string="Are you sure you want to open Account move line entries?"/>
</form> </form>
</field> </field>
</record> </record>
addons/account/wizard/account_move_line_unreconcile_select_view.xml
+3 -2
View File
@@ -8,8 +8,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Unreconciliation" version="7.0"> <form string="Unreconciliation" version="7.0">
<header> <header>
<button icon="terp-gtk-go-back-rtl" string="Open for Unreconciliation" name="action_open_window" type="object" /> <button string="Open for Unreconciliation" name="action_open_window" type="object" class="oe_highlight"/>
<button icon="gtk-cancel" special="cancel" string="Cancel" /> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<group> <group>
<field name="account_id"/> <field name="account_id"/>
addons/account/wizard/account_open_closed_fiscalyear_view.xml
+3 -2
View File
@@ -8,8 +8,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Choose Fiscal Year " version="7.0"> <form string="Choose Fiscal Year " version="7.0">
<header> <header>
<button icon="gtk-cancel" special="cancel" string="Cancel"/> <button string="Open" name="remove_entries" type="object" class="oe_highlight"/>
<button icon="terp-gtk-go-back-rtl" string="Open" name="remove_entries" type="object"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<group> <group>
<field name="fyear_id" domain="[('state','=','draft')]"/> <field name="fyear_id" domain="[('state','=','draft')]"/>
addons/account/wizard/account_period_close.py
+1 -4
View File
@@ -53,11 +53,8 @@ class account_period_close(osv.osv_memory):
cr.execute('update account_journal_period set state=%s where period_id=%s', (mode, id)) cr.execute('update account_journal_period set state=%s where period_id=%s', (mode, id))
cr.execute('update account_period set state=%s where id=%s', (mode, id)) cr.execute('update account_period set state=%s where id=%s', (mode, id))
# Log message for Period
for period_id, name in period_pool.name_get(cr, uid, [id]):
period_pool.log(cr, uid, period_id, "Period '%s' is closed, no more modification allowed for this period." % (name))
return {'type': 'ir.actions.act_window_close'} return {'type': 'ir.actions.act_window_close'}
account_period_close() account_period_close()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/account/wizard/account_period_close_view.xml
+4 -4
View File
@@ -9,11 +9,11 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Close Period" version="7.0"> <form string="Close Period" version="7.0">
<header> <header>
<button icon="gtk-cancel" special="cancel" string="Cancel"/> <button string="Close Period" name="data_save" type="object" class="oe_highlight"/>
<button icon="terp-gtk-go-back-rtl" string="Close Period" name="data_save" type="object"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<separator string="Are you sure?" colspan="4"/> <group string="Are you sure?">
<group>
<field name="sure"/> <field name="sure"/>
</group> </group>
</form> </form>
addons/account/wizard/account_reconcile_partner_process_view.xml
+2 -3
View File
@@ -8,8 +8,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Partner Reconciliation" version="7.0"> <form string="Partner Reconciliation" version="7.0">
<header> <header>
<button name="next_partner" icon="terp-gtk-jump-to-ltr" type="object" string="Go to Next Partner" /> <button name="next_partner" icon="terp-gtk-jump-to-ltr" type="object" string="Go to Next Partner" class="oe_highlight" />
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
</header> </header>
<group col="4"> <group col="4">
<field name="next_partner_id"/> <field name="next_partner_id"/>
@@ -40,5 +39,5 @@
<field name="model">account.move.line</field> <field name="model">account.move.line</field>
</record> </record>
</data> </data>
</openerp> </openerp>
addons/account/wizard/account_reconcile_view.xml
+8 -6
View File
@@ -9,10 +9,11 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Reconciliation" version="7.0"> <form string="Reconciliation" version="7.0">
<header> <header>
<button icon="gtk-cancel" special="cancel" string="Cancel"/> <button string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}" class="oe_highlight"/>
<button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}"/> <button string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
<button icon="gtk-ok" string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/> <button string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
<button icon="gtk-ok" string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<group col="4" string="Reconciliation Transactions"> <group col="4" string="Reconciliation Transactions">
<field name="trans_nbr"/> <field name="trans_nbr"/>
@@ -51,8 +52,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Information addendum" version="7.0"> <form string="Information addendum" version="7.0">
<header> <header>
<button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile" type="object" default_focus="1"/> <button string="Reconcile" name="trans_rec_reconcile" type="object" default_focus="1" class="oe_highlight"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<group string="Write-Off Move" col="4"> <group string="Write-Off Move" col="4">
<field name="journal_id"/> <field name="journal_id"/>
addons/account/wizard/account_report_aged_partner_balance_view.xml
+3 -2
View File
@@ -10,8 +10,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Report Options" version="7.0"> <form string="Report Options" version="7.0">
<header> <header>
<button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2" default_focus="1"/> <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
<button icon="gtk-cancel" special="cancel" string="Cancel" colspan="2"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<separator string="Aged Partner Balance"/> <separator string="Aged Partner Balance"/>
<label string="Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, OpenERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). OpenERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. "/> <label string="Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, OpenERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). OpenERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. "/>
addons/account/wizard/account_report_common_view.xml
+3 -2
View File
@@ -9,8 +9,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Report Options" version="7.0"> <form string="Report Options" version="7.0">
<header> <header>
<button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2" default_focus="1" /> <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
<button icon="gtk-cancel" special="cancel" string="Cancel" colspan="2"/> or
<button string="Cancel" class="oe_link" special="cancel" />
</header> </header>
<label string=""/> <!-- binding for inherited views --> <label string=""/> <!-- binding for inherited views -->
<group col="4"> <group col="4">
addons/account/wizard/account_report_general_journal_view.xml
+2 -2
View File
@@ -14,8 +14,8 @@
<label nolabel="1" colspan="4" string="This report gives you an overview of the situation of your general journals"/> <label nolabel="1" colspan="4" string="This report gives you an overview of the situation of your general journals"/>
</xpath> </xpath>
<xpath expr="//field[@name='target_move']" position="after"> <xpath expr="//field[@name='target_move']" position="after">
<field name="amount_currency"/> <field name="amount_currency"/>
<newline/> <newline/>
</xpath> </xpath>
</data> </data>
</field> </field>
addons/account/wizard/account_report_print_journal_view.xml
+1 -1
View File
@@ -67,5 +67,5 @@
sequence="1"/> sequence="1"/>
</data> </data>
</openerp> </openerp>
addons/account/wizard/account_state_open_view.xml
+4 -2
View File
@@ -9,10 +9,12 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Open Invoice" version="7.0"> <form string="Open Invoice" version="7.0">
<header> <header>
<button name="change_inv_state" string="Yes" type="object" icon="terp-camera_test"/> <button name="change_inv_state" string="Yes" type="object" class="oe_highlight"/>
<button special="cancel" string="No" icon="terp-gtk-stop"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<label string="Are you sure you want to open this invoice ?"/> <label string="Are you sure you want to open this invoice ?"/>
<newline/>
<label string="(Invoice should be unreconciled if you want to open it)"/> <label string="(Invoice should be unreconciled if you want to open it)"/>
</form> </form>
</field> </field>
addons/account/wizard/account_subscription_generate_view.xml
+3 -3
View File
@@ -9,9 +9,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Subscription Compute" version="7.0"> <form string="Subscription Compute" version="7.0">
<header> <header>
<button icon="gtk-cancel" special="cancel" string="Cancel" /> <button string="Generate Entries" name="action_generate" type="object" class="oe_highlight"/>
<button icon="gtk-execute" string="Generate Entries" or
name="action_generate" type="object" /> <button string="Cancel" class="oe_link" special="cancel" />
</header> </header>
<separator string="Generate Entries before:"/> <separator string="Generate Entries before:"/>
<label string ="Automatically generate entries based on what has been entered in the system before a specific date."/> <label string ="Automatically generate entries based on what has been entered in the system before a specific date."/>
addons/account/wizard/account_tax_chart_view.xml
+3 -2
View File
@@ -9,8 +9,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Account tax charts" version="7.0"> <form string="Account tax charts" version="7.0">
<header> <header>
<button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_tax_chart_open_window" type="object" /> <button string="Open Charts" name="account_tax_chart_open_window" type="object" class="oe_highlight"/>
<button icon="gtk-cancel" special="cancel" string="Cancel" /> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<group> <group>
<field name="period_id"/> <field name="period_id"/>
addons/account/wizard/account_unreconcile_view.xml
+4 -4
View File
@@ -9,8 +9,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Unreconciliation" version="7.0"> <form string="Unreconciliation" version="7.0">
<header> <header>
<button icon="gtk-ok" string="Unreconcile" name="trans_unrec" type="object" default_focus="1"/> <button string="Unreconcile" name="trans_unrec" type="object" default_focus="1" class="oe_highlight"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<separator string="Unreconciliate Transactions"/> <separator string="Unreconciliate Transactions"/>
<label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled"/> <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled"/>
@@ -43,8 +44,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Unreconciliation" version="7.0"> <form string="Unreconciliation" version="7.0">
<header> <header>
<button icon="gtk-ok" string="Unreconcile" name="trans_unrec_reconcile" type="object" default_focus="1"/> <button icon="gtk-ok" string="Unreconcile" name="trans_unrec_reconcile" type="object" default_focus="1" class="oe_highlight" />
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
</header> </header>
<separator string="Unreconciliation Transactions"/> <separator string="Unreconciliation Transactions"/>
<label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"/> <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"/>
addons/account/wizard/account_use_model_view.xml
+15 -13
View File
@@ -7,17 +7,18 @@
<field name="model">account.use.model</field> <field name="model">account.use.model</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Create Entries From Models" version="7.0"> <form string="Create Entries From Models" version="7.0">
<header> <header>
<button icon="gtk-execute" string="Create Entries" name="create_entries" type="object"/> <button string="Create Entries" name="create_entries" type="object" class="oe_highlight"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/> or
</header> <button string="Cancel" class="oe_link" special="cancel"/>
<separator string="This wizard will create recurring accounting entries"/> </header>
<label string="Create manual recurring entries in a chosen journal."/> <separator string="This wizard will create recurring accounting entries"/>
<group> <label string="Create manual recurring entries in a chosen journal."/>
<field name="model"/> <group>
</group> <field name="model"/>
</form> </group>
</form>
</field> </field>
</record> </record>
@@ -40,8 +41,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Use Model" version="7.0"> <form string="Use Model" version="7.0">
<header> <header>
<button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1'/> <button string="Ok" name="create_entries" type="object" default_focus='1' class="oe_highlight"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<label string = "Are you sure you want to create entries?"/> <label string = "Are you sure you want to create entries?"/>
</form> </form>
addons/account/wizard/account_validate_move_view.xml
+22 -20
View File
@@ -8,18 +8,19 @@
<field name="model">validate.account.move</field> <field name="model">validate.account.move</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Post Journal Entries" version="7.0"> <form string="Post Journal Entries" version="7.0">
<header> <header>
<button icon="terp-camera_test" string="Approve" name="validate_move" type="object"/> <button string="Approve" name="validate_move" type="object" class="oe_highlight"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/> or
</header> <button string="Cancel" class="oe_link" special="cancel"/>
<separator string="Post Journal Entries of a Journal"/> </header>
<label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accounting fields anymore."/> <separator string="Post Journal Entries of a Journal"/>
<group> <label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accounting fields anymore."/>
<field name="journal_id"/> <group>
<field name="period_id"/> <field name="journal_id"/>
</group> <field name="period_id"/>
</form> </group>
</form>
</field> </field>
</record> </record>
@@ -46,14 +47,15 @@
<field name="model">validate.account.move.lines</field> <field name="model">validate.account.move.lines</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Post Journal Entries" version="7.0"> <form string="Post Journal Entries" version="7.0">
<header> <header>
<button icon="gtk-cancel" special="cancel" string="Cancel"/> <button string="Approve" name="validate_move_lines" type="object" default_focus="1" class="oe_highlight"/>
<button icon="terp-camera_test" string="Approve" name="validate_move_lines" type="object" default_focus="1"/> or
</header> <button string="Cancel" class="oe_link" special="cancel"/>
<separator string="Post Journal Entries"/> </header>
<label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore." colspan="2"/> <separator string="Post Journal Entries"/>
</form> <label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore."/>
</form>
</field> </field>
</record> </record>
addons/account/wizard/account_vat_view.xml
+3 -2
View File
@@ -9,8 +9,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Taxes Report" version="7.0"> <form string="Taxes Report" version="7.0">
<header> <header>
<button name="create_vat" string="Print Tax Statement" type="object" icon="gtk-ok"/> <button name="create_vat" string="Print Tax Statement" type="object" class="oe_highlight"/>
<button icon='gtk-cancel' special="cancel" string="Cancel" /> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<label colspan="4" string="This menu prints a VAT declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."/> <label colspan="4" string="This menu prints a VAT declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."/>
<group string="Taxes Report" col="4"> <group string="Taxes Report" col="4">
addons/account_accountant/account_accountant_demo.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<record id="base.user_demo" model="res.users"> <record id="base.user_demo" model="res.users">
<field name="groups_id" eval="[(4, ref('account.group_account_user'))]"/> <field name="groups_id" eval="[(4, ref('account.group_account_user'))]"/>
</record> </record>
</data> </data>
addons/account_analytic_analysis/account_analytic_analysis.py
+122 -9
View File
@@ -98,7 +98,7 @@ class account_analytic_account(osv.osv):
WHERE account_analytic_account.id IN %s \ WHERE account_analytic_account.id IN %s \
AND account_analytic_line.invoice_id IS NULL \ AND account_analytic_line.invoice_id IS NULL \
AND account_analytic_line.to_invoice IS NOT NULL \ AND account_analytic_line.to_invoice IS NOT NULL \
AND account_analytic_journal.type IN ('purchase','general') \ AND account_analytic_journal.type = 'general' \
GROUP BY account_analytic_account.id;""", (parent_ids,)) GROUP BY account_analytic_account.id;""", (parent_ids,))
for account_id, sum in cr.fetchall(): for account_id, sum in cr.fetchall():
if account_id not in res: if account_id not in res:
@@ -257,6 +257,12 @@ class account_analytic_account(osv.osv):
res[id] = round(res.get(id, 0.0),2) res[id] = round(res.get(id, 0.0),2)
return res return res
def _remaining_hours_to_invoice_calc(self, cr, uid, ids, name, arg, context=None):
res = {}
for account in self.browse(cr, uid, ids, context=context):
res[account.id] = max(account.hours_qtt_est - account.timesheet_ca_invoiced, account.ca_to_invoice)
return res
def _hours_qtt_invoiced_calc(self, cr, uid, ids, name, arg, context=None): def _hours_qtt_invoiced_calc(self, cr, uid, ids, name, arg, context=None):
res = {} res = {}
for account in self.browse(cr, uid, ids, context=context): for account in self.browse(cr, uid, ids, context=context):
@@ -291,15 +297,34 @@ class account_analytic_account(osv.osv):
res[id] = round(res.get(id, 0.0),2) res[id] = round(res.get(id, 0.0),2)
return res return res
def _fix_price_to_invoice_calc(self, cr, uid, ids, name, arg, context=None):
sale_obj = self.pool.get('sale.order')
res = {}
for account in self.browse(cr, uid, ids, context=context):
res[account.id] = 0.0
sale_ids = sale_obj.search(cr, uid, [('project_id','=', account.id), ('partner_id', '=', account.partner_id.id)], context=context)
for sale in sale_obj.browse(cr, uid, sale_ids, context=context):
if not sale.invoiced:
res[account.id] += sale.amount_untaxed
for invoice in sale.invoice_ids:
if invoice.state not in ('draft', 'cancel'):
res[account.id] -= invoice.amount_untaxed
return res
def _timesheet_ca_invoiced_calc(self, cr, uid, ids, name, arg, context=None):
lines_obj = self.pool.get('account.analytic.line')
res = {}
for account in self.browse(cr, uid, ids, context=context):
res[account.id] = 0.0
line_ids = lines_obj.search(cr, uid, [('account_id','=', account.id), ('invoice_id','!=',False), ('to_invoice','!=', False), ('journal_id.type', '=', 'general')], context=context)
for line in lines_obj.browse(cr, uid, line_ids, context=context):
res[account.id] += line.invoice_id.amount_untaxed
return res
def _remaining_ca_calc(self, cr, uid, ids, name, arg, context=None): def _remaining_ca_calc(self, cr, uid, ids, name, arg, context=None):
res = {} res = {}
for account in self.browse(cr, uid, ids, context=context): for account in self.browse(cr, uid, ids, context=context):
if account.amount_max != 0: res[account.id] = max(account.amount_max - account.ca_invoiced, account.fix_price_to_invoice)
res[account.id] = account.amount_max - account.ca_invoiced
else:
res[account.id]=0.0
for id in ids:
res[id] = round(res.get(id, 0.0),2)
return res return res
def _real_margin_calc(self, cr, uid, ids, name, arg, context=None): def _real_margin_calc(self, cr, uid, ids, name, arg, context=None):
@@ -333,6 +358,47 @@ class account_analytic_account(osv.osv):
result.add(line.account_id.id) result.add(line.account_id.id)
return list(result) return list(result)
def _get_total_estimation(self, account):
tot_est = 0.0
if account.fix_price_invoices:
tot_est += account.amount_max
if account.invoice_on_timesheets:
tot_est += account.hours_qtt_est
return tot_est
def _get_total_invoiced(self, account):
total_invoiced = 0.0
if account.fix_price_invoices:
total_invoiced += account.ca_invoiced
if account.invoice_on_timesheets:
total_invoiced += account.timesheet_ca_invoiced
return total_invoiced
def _get_total_remaining(self, account):
total_remaining = 0.0
if account.fix_price_invoices:
total_remaining += account.remaining_ca
if account.invoice_on_timesheets:
total_remaining += account.remaining_hours_to_invoice
return total_remaining
def _get_total_toinvoice(self, account):
total_toinvoice = 0.0
if account.fix_price_invoices:
total_toinvoice += account.fix_price_to_invoice
if account.invoice_on_timesheets:
total_toinvoice += account.ca_to_invoice
return total_toinvoice
def _sum_of_fields(self, cr, uid, ids, name, arg, context=None):
res = dict([(i, {}) for i in ids])
for account in self.browse(cr, uid, ids, context=context):
res[account.id]['est_total'] = self._get_total_estimation(account)
res[account.id]['invoiced_total'] = self._get_total_invoiced(account)
res[account.id]['remaining_total'] = self._get_total_remaining(account)
res[account.id]['toinvoice_total'] = self._get_total_toinvoice(account)
return res
_columns = { _columns = {
'is_overdue_quantity' : fields.function(_is_overdue_quantity, method=True, type='boolean', string='Overdue Quantity', 'is_overdue_quantity' : fields.function(_is_overdue_quantity, method=True, type='boolean', string='Overdue Quantity',
store={ store={
@@ -350,7 +416,7 @@ class account_analytic_account(osv.osv):
'ca_theorical': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Theoretical Revenue', 'ca_theorical': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Theoretical Revenue',
help="Based on the costs you had on the project, what would have been the revenue if all these costs have been invoiced at the normal sale price provided by the pricelist.", help="Based on the costs you had on the project, what would have been the revenue if all these costs have been invoiced at the normal sale price provided by the pricelist.",
digits_compute=dp.get_precision('Account')), digits_compute=dp.get_precision('Account')),
'hours_quantity': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Total Time', 'hours_quantity': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Total Worked Time',
help="Number of time you spent on the analytic account (from timesheet). It computes quantities on all journal of type 'general'."), help="Number of time you spent on the analytic account (from timesheet). It computes quantities on all journal of type 'general'."),
'last_invoice_date': fields.function(_analysis_all, multi='analytic_analysis', type='date', string='Last Invoice Date', 'last_invoice_date': fields.function(_analysis_all, multi='analytic_analysis', type='date', string='Last Invoice Date',
help="If invoice from the costs, this is the date of the latest invoiced."), help="If invoice from the costs, this is the date of the latest invoiced."),
@@ -363,7 +429,13 @@ class account_analytic_account(osv.osv):
'hours_qtt_invoiced': fields.function(_hours_qtt_invoiced_calc, type='float', string='Invoiced Time', 'hours_qtt_invoiced': fields.function(_hours_qtt_invoiced_calc, type='float', string='Invoiced Time',
help="Number of time (hours/days) that can be invoiced plus those that already have been invoiced."), help="Number of time (hours/days) that can be invoiced plus those that already have been invoiced."),
'remaining_hours': fields.function(_remaining_hours_calc, type='float', string='Remaining Time', 'remaining_hours': fields.function(_remaining_hours_calc, type='float', string='Remaining Time',
help="Computed using the formula: Maximum Time - Total Time"), help="Computed using the formula: Maximum Time - Total Worked Time"),
'remaining_hours_to_invoice': fields.function(_remaining_hours_to_invoice_calc, type='float', string='Remaining Time',
help="Computed using the formula: Maximum Time - Total Invoiced Time"),
'fix_price_to_invoice': fields.function(_fix_price_to_invoice_calc, type='float', string='Remaining Time',
help="Sum of quotations for this contract."),
'timesheet_ca_invoiced': fields.function(_timesheet_ca_invoiced_calc, type='float', string='Remaining Time',
help="Sum of timesheet lines invoiced for this contract."),
'remaining_ca': fields.function(_remaining_ca_calc, type='float', string='Remaining Revenue', 'remaining_ca': fields.function(_remaining_ca_calc, type='float', string='Remaining Revenue',
help="Computed using the formula: Max Invoice Price - Invoiced Amount.", help="Computed using the formula: Max Invoice Price - Invoiced Amount.",
digits_compute=dp.get_precision('Account')), digits_compute=dp.get_precision('Account')),
@@ -379,10 +451,51 @@ class account_analytic_account(osv.osv):
'real_margin_rate': fields.function(_real_margin_rate_calc, type='float', string='Real Margin Rate (%)', 'real_margin_rate': fields.function(_real_margin_rate_calc, type='float', string='Real Margin Rate (%)',
help="Computes using the formula: (Real Margin / Total Costs) * 100.", help="Computes using the formula: (Real Margin / Total Costs) * 100.",
digits_compute=dp.get_precision('Account')), digits_compute=dp.get_precision('Account')),
'fix_price_invoices' : fields.boolean('Fix Price Invoices'),
'invoice_on_timesheets' : fields.boolean("Invoice On Timesheets"),
'month_ids': fields.function(_analysis_all, multi='analytic_analysis', type='many2many', relation='account_analytic_analysis.summary.month', string='Month'), 'month_ids': fields.function(_analysis_all, multi='analytic_analysis', type='many2many', relation='account_analytic_analysis.summary.month', string='Month'),
'user_ids': fields.function(_analysis_all, multi='analytic_analysis', type="many2many", relation='account_analytic_analysis.summary.user', string='User'), 'user_ids': fields.function(_analysis_all, multi='analytic_analysis', type="many2many", relation='account_analytic_analysis.summary.user', string='User'),
'template_id': fields.many2one('account.analytic.account', 'Template of Contract'),
'hours_qtt_est': fields.float('Estimation of Hours to Invoice'),
'est_total' : fields.function(_sum_of_fields, type="float",multi="sum_of_all", string="Total Estimation"),
'invoiced_total' : fields.function(_sum_of_fields, type="float",multi="sum_of_all", string="Total Invoiced"),
'remaining_total' : fields.function(_sum_of_fields, type="float",multi="sum_of_all", string="Total Remaining", help="Expectation of remaining income for this contract. Computed as the sum of remaining subtotals which, in turn, are computed as the maximum between '(Estimation - Invoiced)' and 'To Invoice' amounts"),
'toinvoice_total' : fields.function(_sum_of_fields, type="float",multi="sum_of_all", string="Total to Invoice", help=" Sum of everything that could be invoiced for this contract."),
} }
def open_sale_order_lines(self,cr,uid,ids,context=None):
if context is None:
context = {}
sale_ids = self.pool.get('sale.order').search(cr,uid,[('project_id','=',context.get('search_default_project_id',False)),('partner_id','=',context.get('search_default_partner_id',False))])
names = [record.name for record in self.browse(cr, uid, ids, context=context)]
name = _('Sale Order Lines of %s') % ','.join(names)
return {
'type': 'ir.actions.act_window',
'name': name,
'view_type': 'form',
'view_mode': 'tree,form',
'context': context,
'domain' : [('order_id','in',sale_ids)],
'res_model': 'sale.order.line',
'nodestroy': True,
}
def on_change_template(self, cr, uid, ids, template_id, context=None):
if not template_id:
return {}
res = {'value':{}}
template = self.browse(cr, uid, template_id, context=context)
res['value']['date_start'] = template.date_start
res['value']['date'] = template.date
res['value']['fix_price_invoices'] = template.fix_price_invoices
res['value']['invoice_on_timesheets'] = template.invoice_on_timesheets
res['value']['quantity_max'] = template.quantity_max
res['value']['hours_qtt_est'] = template.hours_qtt_est
res['value']['amount_max'] = template.amount_max
res['value']['to_invoice'] = template.to_invoice.id
res['value']['pricelist_id'] = template.pricelist_id.id
res['value']['description'] = template.description
return res
account_analytic_account() account_analytic_account()
class account_analytic_account_summary_user(osv.osv): class account_analytic_account_summary_user(osv.osv):
addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+5 -5
View File
@@ -58,8 +58,8 @@
<field name="res_model">account.analytic.account</field> <field name="res_model">account.analytic.account</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field> <field name="view_mode">tree,form,graph</field>
<field name="context">{'search_default_has_partner':1, 'search_default_user_id':uid, 'search_default_draft':1, 'search_default_pending':1, 'search_default_open':1, 'search_default_renew':1}</field> <field name="context">{'search_default_user_id':uid, 'search_default_draft':1, 'search_default_pending':1, 'search_default_open':1, 'search_default_renew':1}</field>
<field name="domain">[('type','=','normal')]</field> <field name="domain">[('type','=','contract')]</field>
<field name="search_view_id" ref="view_account_analytic_account_overdue_search"/> <field name="search_view_id" ref="view_account_analytic_account_overdue_search"/>
<field name="help">You will find here the contracts to be renewed because the deadline is passed or the working hours are higher than the allocated hours. OpenERP automatically sets these analytic accounts to the pending state, in order to raise a warning during the timesheets recording. Salesmen should review all pending accounts and reopen or close the according to the negotiation with the customer.</field> <field name="help">You will find here the contracts to be renewed because the deadline is passed or the working hours are higher than the allocated hours. OpenERP automatically sets these analytic accounts to the pending state, in order to raise a warning during the timesheets recording. Salesmen should review all pending accounts and reopen or close the according to the negotiation with the customer.</field>
</record> </record>
@@ -70,14 +70,14 @@
<field name="res_model">account.analytic.account</field> <field name="res_model">account.analytic.account</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field> <field name="view_mode">tree,form,graph</field>
<field name="context">{'search_default_has_partner':1, 'search_default_user_id':uid, 'search_default_draft':1, 'search_default_pending':1, 'search_default_open':1}</field> <field name="context">{'default_type':'contract'}</field>
<field name="domain">[('type','=','normal')]</field> <field name="domain">[('type','=','contract')]</field>
<field name="search_view_id" ref="view_account_analytic_account_overdue_search"/> <field name="search_view_id" ref="view_account_analytic_account_overdue_search"/>
</record> </record>
<menuitem id="base.menu_sales" name="Sales" <menuitem id="base.menu_sales" name="Sales"
parent="base.menu_base_partner" parent="base.menu_base_partner"
sequence="1"/> sequence="1"/>
<menuitem action="action_account_analytic_overdue_all" id="menu_action_account_analytic_overdue_all" sequence="6" parent="base.menu_sales"/> <menuitem action="action_account_analytic_overdue_all" id="menu_action_account_analytic_overdue_all" sequence="7" parent="base.menu_sales"/>
</data> </data>
addons/account_analytic_analysis/account_analytic_analysis_view.xml
+97 -85
View File
@@ -4,97 +4,99 @@
<!-- <!--
Analytic Account form Analytic Account form
Remove information on Account data => because they move on analysis sheet
create a page with invoicing informations
--> -->
<record id="account_analytic_account_invoice_stat_form" model="ir.ui.view">
<field name="name">account.analytic.account.invoice.stat.form.inherit</field> <act_window
<field name="model">account.analytic.account</field> id="action_sales_order"
<field name="type">form</field> name="Sales Orders"
<field name="inherit_id" ref="hr_timesheet_invoice.account_analytic_account_form_form"/> res_model="sale.order"
<field eval="18" name="priority"/> src_model="account.analytic.account"
<field name="arch" type="xml"> />
<group name="invoice_stats" position="inside">
<field name="hours_qtt_non_invoiced" attrs="{'invisible': [('to_invoice','=',0)]}"/>
<field name="ca_to_invoice" attrs="{'invisible': [('to_invoice','=',0)]}"/>
<label string="" colspan="1"/>
<button
name="%(hr_timesheet_invoice.action_hr_timesheet_invoice_create_final)d"
string="Create Invoice"
type="action"
attrs="{'readonly':[('ca_to_invoice','=',0.0)], 'invisible': [('to_invoice','=',0)]}"
icon="gtk-go-forward"/>
</group>
</field>
</record>
<record id="account_analytic_account_form_form" model="ir.ui.view"> <record id="account_analytic_account_form_form" model="ir.ui.view">
<field name="name">account.analytic.account.invoice.form.inherit</field> <field name="name">account.analytic.account.invoice.form.inherit</field>
<field name="model">account.analytic.account</field> <field name="model">account.analytic.account</field>
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="account.view_account_analytic_account_form"/> <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
<field eval="18" name="priority"/> <field eval="40" name="priority"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<notebook position="inside"> <xpath expr='//field[@name="type"]' position='after'>
<page string="Invoice Analysis"> <field name="template_id" on_change="on_change_template(template_id,context)" domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
<separator colspan="4" string="Work Done Stats"/> </xpath>
<xpath expr='//div[@name="duration"]' position="after" version="7.0">
<field name="total_cost"/> <label for="quantity_max"/>
<field name="remaining_ca"/> <div>
<field name="ca_invoiced"/> <field name="quantity_max" class="oe_inline"/> / Remaining: <field name="remaining_hours" class="oe_inline"/>
<field name="ca_theorical"/> </div>
<newline/> </xpath>
<field name="hours_quantity"/> <xpath expr='//group[@name="invoice_on_timesheets"]' position="replace">
<field name="hours_qtt_invoiced"/> <group name='invoice_on_timesheets' string="Invoice on Timesheets Options" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}" col="4">
<field name="remaining_hours"/> <field name="pricelist_id" attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
<newline/> <field name="to_invoice" widget="selection" attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
<separator colspan="4" string="Analysis Stats"/> </group>
</xpath>
<field name="revenue_per_hour"/> <xpath expr='//group[@name="master"]' position='after'>
<field name="real_margin"/> <separator name="toinvoice" string="Invoicing"/>
<field name="real_margin_rate"/> <table width="100%%">
<field name="theorical_margin"/> <tr>
<separator colspan="4" string="Key Dates"/> <th></th>
<th></th>
<field name="last_invoice_date"/> <th><label string="Est.Tot"/></th>
<field name="last_worked_invoiced_date"/> <th><label string="Invoiced"/></th>
<field name="last_worked_date"/> <th><label string="Remaining"/></th>
</page> <th><label string="To Invoice"/></th>
<page string="Stats by month"> <th></th>
<field colspan="4" name="month_ids" nolabel="1"> </tr><tr>
<tree string="Month"> <td>
<field name="month"/> <label for="fix_price_invoices"/>
<field name="unit_amount" widget="float_time"/> </td><td>
</tree> <field name="fix_price_invoices" class="oe_inline"/>
</field> </td><td>
</page> <field class="oe_inline" name="amount_max" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
<page string="Stats by user"> </td><td>
<field colspan="4" name="user_ids" nolabel="1"> <field class="oe_inline" name="ca_invoiced" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
<tree string="Users"> </td><td>
<field name="user"/> <field class="oe_inline" name="remaining_ca" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
<field name="unit_amount" widget="float_time"/> </td><td>
</tree> <field class="oe_inline" name="fix_price_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
</field> </td><td>
</page> <button name="%(action_sales_order)d" string="All Sales" type="action" context="{'default_partner_id': [partner_id], 'search_default_partner_id': [partner_id],'search_default_project_id': [active_id],'default_project_id': [active_id]}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
</notebook> <button name="open_sale_order_lines" string="Lines To Invoice" type="object" context="{'default_partner_id': [partner_id],'default_project_id': active_id,'search_default_uninvoiced': 1,'search_default_project_id': active_id,'search_default_partner_id': [partner_id]}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
</td>
</field> </tr><tr attrs="{'invisible':[('use_timesheets','=',False)]}">
</record> <td>
<label for="invoice_on_timesheets"/>
<!-- Add information on Account analytic list for the project management --> </td><td>
<record id="view_account_analytic_account_tree_c2c_2" model="ir.ui.view"> <field name="invoice_on_timesheets"/>
<field name="name">account.analytic.account.tree</field> </td><td>
<field name="model">account.analytic.account</field> <field class="oe_inline" name="hours_qtt_est" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
<field name="inherit_id" ref="account.view_account_analytic_account_list"/> </td><td>
<field name="type">tree</field> <field class="oe_inline" name="timesheet_ca_invoiced" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
<field name="arch" type="xml"> </td><td>
<field name="quantity" position="replace"> <field class="oe_inline" name="remaining_hours_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
<field name="hours_quantity"/> </td><td>
<field name="hours_qtt_non_invoiced"/> <field class="oe_inline" name="ca_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
<field name="remaining_hours"/> </td><td>
<field name="quantity_max"/> <button name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="All Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}" context="{'default_account_id': active_id,'search_default_account_id': active_id}"/>
</field> <button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Timesheets to Invoice" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
</td>
</tr><tr name='total'>
<th>
<label string="Total"/>
</th><td>
</td><td>
<field name="est_total" class="oe_inline" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
</td><td>
<field name="invoiced_total" class="oe_inline"/>
</td><td>
<field name="remaining_total" class="oe_inline"/>
</td><td>
<field name="toinvoice_total" class="oe_inline"/>
</td><td>
</td>
</tr>
</table>
</xpath>
</field> </field>
</record> </record>
@@ -106,10 +108,20 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="date" position="before"> <field name="date" position="before">
<field name="last_invoice_date"/> <field name="last_invoice_date"/>
<field name="ca_to_invoice"/> <field name="toinvoice_total"/>
</field> </field>
</field> </field>
</record> </record>
<record id="template_of_contract_action" model="ir.actions.act_window">
<field name="name">Template of Contract</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">account.analytic.account</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('type','=','template')]</field>
<field name="context">{'search_default_type':'template','default_type' : 'template'}</field>
</record>
<menuitem action="template_of_contract_action" id="menu_template_of_contract_action" parent="base.menu_base_config"/>
</data> </data>
</openerp> </openerp>
addons/account_analytic_plans/account_analytic_plans_report.xml
+10 -10
View File
@@ -1,16 +1,16 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<openerp> <openerp>
<data> <data>
<report <report
id="account_analytic_account_crossovered_analytic" id="account_analytic_account_crossovered_analytic"
string="Crossovered Analytic" string="Crossovered Analytic"
model="account.analytic.account" model="account.analytic.account"
name="account.analytic.account.crossovered.analytic" name="account.analytic.account.crossovered.analytic"
rml="account_analytic_plans/report/crossovered_analytic.rml" rml="account_analytic_plans/report/crossovered_analytic.rml"
auto="False" auto="False"
menu="False"/> menu="False"/>
</data> </data>
</openerp> </openerp>
addons/account_analytic_plans/report/crossovered_analytic.py
-1
View File
@@ -109,7 +109,6 @@ class crossovered_analytic(report_sxw.rml_parse):
res['ref_qty'] = info[0]['qty'] res['ref_qty'] = info[0]['qty']
res['ref_amt'] = info[0]['amt'] res['ref_amt'] = info[0]['amt']
self.base_amount = info[0]['amt'] self.base_amount = info[0]['amt']
result.append(res) result.append(res)
return result return result
addons/account_analytic_plans/report/crossovered_analytic.rml
+2 -2
View File
@@ -237,10 +237,10 @@
<para style="terp_default_Centre_9">[[ a['ref_code'] ]]</para> <para style="terp_default_Centre_9">[[ a['ref_code'] ]]</para>
</td> </td>
<td> <td>
<para style="terp_default_Right_9">[[ formatLang(a['ref_qty']) ]]</para> <para style="terp_default_Right_9">[[ a['ref_qty'] and formatLang(a['ref_qty']) ]]</para>
</td> </td>
<td> <td>
<para style="terp_default_Right_9">[[ formatLang(a['ref_amt'], currency_obj=company.currency_id) ]]</para> <para style="terp_default_Right_9">[[ a['ref_amt'] and formatLang(a['ref_amt'], currency_obj=company.currency_id) ]]</para>
</td> </td>
<td> <td>
<para style="terp_default_Right_9">100.00%</para> <para style="terp_default_Right_9">100.00%</para>
addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
+3 -2
View File
@@ -9,8 +9,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Crossovered Analytic" version="7.0"> <form string="Crossovered Analytic" version="7.0">
<header> <header>
<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/> <button name="print_report" string="Print" type="object" class="oe_highlight"/>
<button special="cancel" string="Cancel" icon='gtk-cancel'/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<group col="4"> <group col="4">
<field name="date1"/> <field name="date1"/>
addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
+3 -5
View File
@@ -8,8 +8,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Distribution Model Saved" version="7.0"> <form string="Distribution Model Saved" version="7.0">
<header> <header>
<button string="Ok" icon='gtk-execute' type="object" name="activate" default_focus="1"/> <button string="Ok" type="object" name="activate" default_focus="1" class="oe_highlight"/>
<button special="cancel" string="Cancel" icon='gtk-ok' /> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<label string="Save This Distribution as a Model"/> <label string="Save This Distribution as a Model"/>
</form> </form>
@@ -22,9 +23,6 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Distribution Model Saved" version="7.0"> <form string="Distribution Model Saved" version="7.0">
<header>
<button special="cancel" string="Ok" icon='gtk-ok'/>
</header>
<label string="This distribution model has been saved.You will be able to reuse it later."/> <label string="This distribution model has been saved.You will be able to reuse it later."/>
</form> </form>
</field> </field>
addons/account_anglo_saxon/product_view.xml
+4 -5
View File
@@ -34,12 +34,11 @@
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="product.product_category_form_view"/> <field name="inherit_id" ref="product.product_category_form_view"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form position="inside"> <data>
<group> <xpath expr="/form/sheet//group[@name='account_property']" position="inside">
<separator string="Accounting Property" colspan="2"/>
<field name="property_account_creditor_price_difference_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/> <field name="property_account_creditor_price_difference_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
</group> </xpath>
</form> </data>
</field> </field>
</record> </record>
addons/account_asset/account_asset_view.xml
+3 -3
View File
@@ -82,9 +82,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Asset" version="7.0"> <form string="Asset" version="7.0">
<header> <header>
<button name="validate" states="draft" string="Confirm Asset" type="object"/> <button name="validate" states="draft" string="Confirm Asset" type="object" class="oe_highlight"/>
<button name="set_to_close" states="open" string="Set to Close" type="object"/> <button name="set_to_close" states="open" string="Set to Close" type="object" class="oe_highlight"/>
<button name="set_to_draft" states="open" string="Set to Draft" type="object"/> <button name="set_to_draft" states="open" string="Set to Draft" type="object" />
<field name="state" widget="statusbar" statusbar_visible="draft,open"/> <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
</header> </header>
<sheet> <sheet>
addons/account_asset/i18n/nl.po
+7 -7
View File
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n" "Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n" "POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2012-01-15 12:39+0000\n" "PO-Revision-Date: 2012-06-28 12:49+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: Erwin <Unknown>\n"
"Language-Team: Dutch <nl@li.org>\n" "Language-Team: Dutch <nl@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n" "X-Launchpad-Export-Date: 2012-06-29 04:38+0000\n"
"X-Generator: Launchpad (build 15225)\n" "X-Generator: Launchpad (build 15505)\n"
#. module: account_asset #. module: account_asset
#: view:account.asset.asset:0 #: view:account.asset.asset:0
@@ -440,12 +440,12 @@ msgstr "Tijdmethode"
#. module: account_asset #. module: account_asset
#: view:account.asset.category:0 #: view:account.asset.category:0
msgid "Analytic Information" msgid "Analytic Information"
msgstr "" msgstr "Kostenplaats informatie"
#. module: account_asset #. module: account_asset
#: view:asset.modify:0 #: view:asset.modify:0
msgid "Asset Durations to Modify" msgid "Asset Durations to Modify"
msgstr "" msgstr "Activa duur aan te passen"
#. module: account_asset #. module: account_asset
#: constraint:account.move.line:0 #: constraint:account.move.line:0
@@ -623,7 +623,7 @@ msgstr "Prorata Temporis"
#. module: account_asset #. module: account_asset
#: view:account.asset.category:0 #: view:account.asset.category:0
msgid "Accounting Information" msgid "Accounting Information"
msgstr "" msgstr "Boekhoudinformatie"
#. module: account_asset #. module: account_asset
#: model:ir.model,name:account_asset.model_account_invoice #: model:ir.model,name:account_asset.model_account_invoice
addons/account_asset/report/account_asset_report_view.xml
+7 -7
View File
@@ -69,16 +69,16 @@
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<separator orientation="vertical" /> <separator orientation="vertical" />
<filter string="Purchase Date" icon="terp-go-month" <filter string="Purchase Date" icon="terp-go-month"
domain="[]" context="{'group_by':'purchase_date'}" help="Date of asset purchase"/> domain="[]" context="{'group_by':'purchase_date'}" help="Date of asset purchase"/>
<separator orientation="vertical" /> <separator orientation="vertical" />
<filter string="Depreciation Date" icon="terp-go-today" <filter string="Depreciation Date" icon="terp-go-today"
domain="[]" context="{'group_by':'depreciation_date'}" help="Date of depreciation"/> domain="[]" context="{'group_by':'depreciation_date'}" help="Date of depreciation"/>
</group> </group>
</search> </search>
</field> </field>
</record> </record>
<record model="ir.actions.act_window" id="action_asset_asset_report"> <record model="ir.actions.act_window" id="action_asset_asset_report">
<field name="name">Assets Analysis</field> <field name="name">Assets Analysis</field>
<field name="res_model">asset.asset.report</field> <field name="res_model">asset.asset.report</field>
<field name="view_type">form</field> <field name="view_type">form</field>
@@ -89,7 +89,7 @@
</record> </record>
<menuitem action="action_asset_asset_report" <menuitem action="action_asset_asset_report"
id="menu_action_asset_asset_report" id="menu_action_asset_asset_report"
parent="account.menu_finance_statistic_report_statement"/> parent="account.menu_finance_reporting"/>
</data> </data>
</openerp> </openerp>
addons/account_asset/wizard/account_asset_change_duration_view.xml
+5 -4
View File
@@ -9,8 +9,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Modify Asset" version="7.0"> <form string="Modify Asset" version="7.0">
<header> <header>
<button name="modify" string="Modify" type="object" icon="terp-camera_test"/> <button name="modify" string="Modify" type="object" class="oe_highlight"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<group string="Asset Durations to Modify" col="4"> <group string="Asset Durations to Modify" col="4">
<field name="name" colspan="4"/> <field name="name" colspan="4"/>
@@ -25,7 +26,7 @@
</form> </form>
</field> </field>
</record> </record>
<record id="action_asset_modify" model="ir.actions.act_window"> <record id="action_asset_modify" model="ir.actions.act_window">
<field name="name">Modify Asset</field> <field name="name">Modify Asset</field>
<field name="res_model">asset.modify</field> <field name="res_model">asset.modify</field>
@@ -35,6 +36,6 @@
<field name="view_id" ref="asset_modify_form"/> <field name="view_id" ref="asset_modify_form"/>
<field name="target">new</field> <field name="target">new</field>
</record> </record>
</data> </data>
</openerp> </openerp>
addons/account_asset/wizard/wizard_asset_compute_view.xml
+3 -2
View File
@@ -8,8 +8,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Compute Asset" version="7.0"> <form string="Compute Asset" version="7.0">
<header> <header>
<button icon="gtk-execute" string="Compute" name="asset_compute" type="object"/> <button string="Compute" name="asset_compute" type="object" class="oe_highlight"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<separator string="Post Depreciation Lines"/> <separator string="Post Depreciation Lines"/>
<label string="This wizard will post the depreciation lines of running assets that belong to the selected period."/> <label string="This wizard will post the depreciation lines of running assets that belong to the selected period."/>
addons/account_bank_statement_extensions/account_bank_statement.py
-1
View File
@@ -23,7 +23,6 @@
import time import time
from osv import osv, fields from osv import osv, fields
import decimal_precision as dp import decimal_precision as dp
import netsvc
from tools.translate import _ from tools.translate import _
class account_bank_statement(osv.osv): class account_bank_statement(osv.osv):
addons/account_bank_statement_extensions/i18n/sv.po
+44 -37
View File
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n" "Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n" "POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-04-25 10:49+0000\n" "PO-Revision-Date: 2012-07-03 09:17+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
"Language-Team: Swedish <sv@li.org>\n" "Language-Team: Swedish <sv@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-04-26 04:41+0000\n" "X-Launchpad-Export-Date: 2012-07-04 04:39+0000\n"
"X-Generator: Launchpad (build 15149)\n" "X-Generator: Launchpad (build 15544)\n"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0 #: view:account.bank.statement.line:0
@@ -42,7 +42,7 @@ msgstr "CODA"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,parent_id:0 #: field:account.bank.statement.line.global,parent_id:0
msgid "Parent Code" msgid "Parent Code"
msgstr "Förälderns kod" msgstr "Överliggande kod"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0 #: view:account.bank.statement.line:0
@@ -54,7 +54,7 @@ msgstr "Debet"
#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_cancel_statement_line #: model:ir.actions.act_window,name:account_bank_statement_extensions.action_cancel_statement_line
#: model:ir.model,name:account_bank_statement_extensions.model_cancel_statement_line #: model:ir.model,name:account_bank_statement_extensions.model_cancel_statement_line
msgid "Cancel selected statement lines" msgid "Cancel selected statement lines"
msgstr "" msgstr "Avbryt valda utdragsrader"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: constraint:res.partner.bank:0 #: constraint:res.partner.bank:0
@@ -118,6 +118,8 @@ msgid ""
"Delete operation not allowed ! Please go to the associated bank " "Delete operation not allowed ! Please go to the associated bank "
"statement in order to delete and/or modify this bank statement line" "statement in order to delete and/or modify this bank statement line"
msgstr "" msgstr ""
"Radering inte tillåten ! Vänligen använd associerat bankuttdrag för att "
"radera och/eller ändra utdragsrader"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,type:0 #: field:account.bank.statement.line.global,type:0
@@ -134,27 +136,27 @@ msgstr "Journal"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0 #: view:account.bank.statement.line:0
msgid "Confirmed Statement Lines." msgid "Confirmed Statement Lines."
msgstr "" msgstr "Bekräfta utdragsrader"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0 #: view:account.bank.statement.line:0
msgid "Credit Transactions." msgid "Credit Transactions."
msgstr "" msgstr "Kredittransaktioner"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line #: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line
msgid "cancel selected statement lines." msgid "cancel selected statement lines."
msgstr "" msgstr "avbryt valda utdragsrader."
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: field:account.bank.statement.line,counterparty_number:0 #: field:account.bank.statement.line,counterparty_number:0
msgid "Counterparty Number" msgid "Counterparty Number"
msgstr "" msgstr "Motpartens nummer"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: view:account.bank.statement.line.global:0 #: view:account.bank.statement.line.global:0
msgid "Transactions" msgid "Transactions"
msgstr "" msgstr "Transaktioner"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130 #: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
@@ -200,6 +202,9 @@ msgid ""
"Please define BIC/Swift code on bank for bank type IBAN Account to make " "Please define BIC/Swift code on bank for bank type IBAN Account to make "
"valid payments" "valid payments"
msgstr "" msgstr ""
"\n"
"Vänligen ange BIC/Swift-kod på bank för banktyp IBAN-konto för korrekta "
"utbetalningar"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: field:account.bank.statement.line,val_date:0 #: field:account.bank.statement.line,val_date:0
@@ -214,7 +219,7 @@ msgstr "Bekräfta valda rader från kontoutdraget."
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: view:cancel.statement.line:0 #: view:cancel.statement.line:0
msgid "Are you sure you want to cancel the selected Bank Statement lines ?" msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
msgstr "" msgstr "Är du säker på att du vill avbryta valda bankutdragsrader ?"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: report:bank.statement.balance.report:0 #: report:bank.statement.balance.report:0
@@ -234,42 +239,42 @@ msgstr "Anteckningar"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: selection:account.bank.statement.line.global,type:0 #: selection:account.bank.statement.line.global,type:0
msgid "Manual" msgid "Manual"
msgstr "" msgstr "Manuell"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0 #: view:account.bank.statement.line:0
msgid "Credit" msgid "Credit"
msgstr "" msgstr "Kredit"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,amount:0 #: field:account.bank.statement.line.global,amount:0
msgid "Amount" msgid "Amount"
msgstr "" msgstr "Belopp"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0 #: view:account.bank.statement.line:0
msgid "Fin.Account" msgid "Fin.Account"
msgstr "" msgstr "Fin.konto"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: field:account.bank.statement.line,counterparty_currency:0 #: field:account.bank.statement.line,counterparty_currency:0
msgid "Counterparty Currency" msgid "Counterparty Currency"
msgstr "" msgstr "Motpartsvaluta"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: field:account.bank.statement.line,counterparty_bic:0 #: field:account.bank.statement.line,counterparty_bic:0
msgid "Counterparty BIC" msgid "Counterparty BIC"
msgstr "" msgstr "Motpartens BIC"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,child_ids:0 #: field:account.bank.statement.line.global,child_ids:0
msgid "Child Codes" msgid "Child Codes"
msgstr "" msgstr "Barnkoder"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: view:confirm.statement.line:0 #: view:confirm.statement.line:0
msgid "Are you sure you want to confirm the selected Bank Statement lines ?" msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
msgstr "" msgstr "Är du säker på att du vill bekräfta valda bankutdragsrader?"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: constraint:account.bank.statement.line:0 #: constraint:account.bank.statement.line:0
@@ -277,6 +282,7 @@ msgid ""
"The amount of the voucher must be the same amount as the one on the " "The amount of the voucher must be the same amount as the one on the "
"statement line" "statement line"
msgstr "" msgstr ""
"Beloppet på bokföringsordern måste överenstämma med beloppet på kontoutdraget"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: help:account.bank.statement.line,globalisation_id:0 #: help:account.bank.statement.line,globalisation_id:0
@@ -284,91 +290,92 @@ msgid ""
"Code to identify transactions belonging to the same globalisation level " "Code to identify transactions belonging to the same globalisation level "
"within a batch payment" "within a batch payment"
msgstr "" msgstr ""
"Kod för att identifiera transaktioner som tillhör samma batchbetalning"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0 #: view:account.bank.statement.line:0
msgid "Draft Statement Lines." msgid "Draft Statement Lines."
msgstr "" msgstr "Preleminära utdragsrader."
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0 #: view:account.bank.statement.line:0
msgid "Glob. Am." msgid "Glob. Am."
msgstr "" msgstr "Glob. Am."
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line #: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
msgid "Bank Statement Line" msgid "Bank Statement Line"
msgstr "" msgstr "Kontoutdragsrad"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,code:0 #: field:account.bank.statement.line.global,code:0
msgid "Code" msgid "Code"
msgstr "" msgstr "Kod"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: field:account.bank.statement.line,counterparty_name:0 #: field:account.bank.statement.line,counterparty_name:0
msgid "Counterparty Name" msgid "Counterparty Name"
msgstr "" msgstr "Motpartsnamn"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,name:0 #: field:account.bank.statement.line.global,name:0
msgid "Communication" msgid "Communication"
msgstr "" msgstr "Kommunikation"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank #: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
msgid "Bank Accounts" msgid "Bank Accounts"
msgstr "" msgstr "Bankkonton"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: constraint:account.bank.statement:0 #: constraint:account.bank.statement:0
msgid "The journal and period chosen have to belong to the same company." msgid "The journal and period chosen have to belong to the same company."
msgstr "" msgstr "Journalen och perioden måste tillhöra samma bolag."
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement #: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
msgid "Bank Statement" msgid "Bank Statement"
msgstr "" msgstr "Bankkontoutdrag"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0 #: view:account.bank.statement.line:0
msgid "Statement Line" msgid "Statement Line"
msgstr "" msgstr "Utdragsrad"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: sql_constraint:account.bank.statement.line.global:0 #: sql_constraint:account.bank.statement.line.global:0
msgid "The code must be unique !" msgid "The code must be unique !"
msgstr "" msgstr "Koden måste vara unik !"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,bank_statement_line_ids:0 #: field:account.bank.statement.line.global,bank_statement_line_ids:0
#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line #: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line
#: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line #: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line
msgid "Bank Statement Lines" msgid "Bank Statement Lines"
msgstr "" msgstr "Bankutdragsrad"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: view:account.bank.statement.line.global:0 #: view:account.bank.statement.line.global:0
msgid "Child Batch Payments" msgid "Child Batch Payments"
msgstr "" msgstr "Barnbatchbetalningar"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: view:cancel.statement.line:0 #: view:cancel.statement.line:0
#: view:confirm.statement.line:0 #: view:confirm.statement.line:0
msgid "Cancel" msgid "Cancel"
msgstr "" msgstr "Avbryt"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0 #: view:account.bank.statement.line:0
msgid "Statement Lines" msgid "Statement Lines"
msgstr "" msgstr "Utdragsrader"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0 #: view:account.bank.statement.line:0
msgid "Total Amount" msgid "Total Amount"
msgstr "" msgstr "Totalsumma"
#. module: account_bank_statement_extensions #. module: account_bank_statement_extensions
#: field:account.bank.statement.line,globalisation_id:0 #: field:account.bank.statement.line,globalisation_id:0
msgid "Globalisation ID" msgid "Globalisation ID"
msgstr "" msgstr "Globalt ID"
addons/account_bank_statement_extensions/report/bank_statement_balance_report.py
+3 -3
View File
@@ -23,13 +23,13 @@
import time import time
from report import report_sxw from report import report_sxw
import pooler import pooler
import netsvc import logging
logger=netsvc.Logger() _logger = logging.getLogger(__name__)
class bank_statement_balance_report(report_sxw.rml_parse): class bank_statement_balance_report(report_sxw.rml_parse):
def set_context(self, objects, data, ids, report_type=None): def set_context(self, objects, data, ids, report_type=None):
#logger.notifyChannel('addons.'+__name__, netsvc.LOG_WARNING, 'set_context, objects = %s, data = %s, ids = %s' % (objects, data, ids)) #_logger.warning('addons.'+__name__, 'set_context, objects = %s, data = %s, ids = %s' % (objects, data, ids))
cr = self.cr cr = self.cr
uid = self.uid uid = self.uid
context = self.context context = self.context
addons/account_bank_statement_extensions/wizard/cancel_statement_line_wizard.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<openerp> <openerp>
<data> <data>
<!-- Cancel selected statement lines --> <!-- Cancel selected statement lines -->
addons/account_bank_statement_extensions/wizard/confirm_statement_line_wizard.xml
+4 -3
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<openerp> <openerp>
<data> <data>
<!-- Confirm selected statement lines --> <!-- Confirm selected statement lines -->
@@ -11,8 +11,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Confirm selected statement lines" version="7.0"> <form string="Confirm selected statement lines" version="7.0">
<header> <header>
<button icon="gtk-cancel" special="cancel" string="Cancel"/> <button string="Confirm Lines" name="confirm_lines" type="object" class="oe_highlight"/>
<button icon="gtk-execute" string="Confirm Lines" name="confirm_lines" type="object"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<label string="Are you sure you want to confirm the selected Bank Statement lines ?"/> <label string="Are you sure you want to confirm the selected Bank Statement lines ?"/>
<label string="Confirmed lines cannot be changed anymore."/> <label string="Confirmed lines cannot be changed anymore."/>
addons/account_budget/account_budget_report.xml
+18 -18
View File
@@ -1,24 +1,24 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<openerp> <openerp>
<data> <data>
<!-- Reports on crossovered.budget --> <!-- Reports on crossovered.budget -->
<report id="report_crossovered_budget" <report id="report_crossovered_budget"
string="Budgets" string="Budgets"
model="crossovered.budget" model="crossovered.budget"
name="crossovered.budget.report" name="crossovered.budget.report"
rml="account_budget/report/crossovered_budget_report.rml" rml="account_budget/report/crossovered_budget_report.rml"
auto="False" auto="False"
menu="False" /> menu="False" />
<!-- moved from account module --> <!-- moved from account module -->
<report auto="False" <report auto="False"
id="account_budget" id="account_budget"
menu="False" menu="False"
model="account.budget.post" model="account.budget.post"
name="account.budget" name="account.budget"
rml="account_budget/report/budget_report.rml" rml="account_budget/report/budget_report.rml"
string="Budget"/> string="Budget"/>
</data> </data>
</openerp> </openerp>
addons/account_budget/account_budget_view.xml
+5 -5
View File
@@ -109,10 +109,10 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form version="7.0"> <form version="7.0">
<header> <header>
<button string="Confirm" name="confirm" states="draft" type="workflow" /> <button string="Confirm" name="confirm" states="draft" type="workflow" class="oe_highlight"/>
<button string="Approve" name="validate" states="confirm" type="workflow"/> <button string="Approve" name="validate" states="confirm" type="workflow" class="oe_highlight"/>
<button string="Done" name="done" states="validate" type="workflow" /> <button string="Done" name="done" states="validate" type="workflow" class="oe_highlight"/>
<button name="draft" states="cancel" string="Reset to Draft" type="workflow"/> <button name="draft" states="cancel" string="Reset to Draft" type="workflow" />
<button string="Cancel" name="cancel" states="confirm,validate" type="workflow"/> <button string="Cancel" name="cancel" states="confirm,validate" type="workflow"/>
<field name="state" widget="statusbar" statusbar_visible="draft,confirm"/> <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
</header> </header>
@@ -274,7 +274,7 @@
<field name="name">account.analytic.account.form.inherot.budget</field> <field name="name">account.analytic.account.form.inherot.budget</field>
<field name="type">form</field> <field name="type">form</field>
<field name="model">account.analytic.account</field> <field name="model">account.analytic.account</field>
<field name="inherit_id" ref="account.view_account_analytic_account_form"/> <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<notebook position="inside"> <notebook position="inside">
<page string="Budget Lines"> <page string="Budget Lines">
addons/account_budget/account_budget_workflow.xml
+69 -69
View File
@@ -2,89 +2,89 @@
<openerp> <openerp>
<data> <data>
<!-- Workflow definition --> <!-- Workflow definition -->
<record model="workflow" id="wkf_crossovered_budget"> <record model="workflow" id="wkf_crossovered_budget">
<field name="name">wkf.crossovered.budget</field> <field name="name">wkf.crossovered.budget</field>
<field name="osv">crossovered.budget</field> <field name="osv">crossovered.budget</field>
<field name="on_create">True</field> <field name="on_create">True</field>
</record> </record>
<record model="workflow.activity" id="act_draft"> <record model="workflow.activity" id="act_draft">
<field name="wkf_id" ref="wkf_crossovered_budget" /> <field name="wkf_id" ref="wkf_crossovered_budget" />
<field name="flow_start">True</field> <field name="flow_start">True</field>
<field name="name">draft</field> <field name="name">draft</field>
<field name="action">write({'state':'draft'})</field> <field name="action">write({'state':'draft'})</field>
<field name="kind">function</field> <field name="kind">function</field>
</record> </record>
<record model="workflow.activity" id="act_confirm"> <record model="workflow.activity" id="act_confirm">
<field name="wkf_id" ref="wkf_crossovered_budget" /> <field name="wkf_id" ref="wkf_crossovered_budget" />
<field name="name">confirm</field> <field name="name">confirm</field>
<field name="kind">function</field> <field name="kind">function</field>
<field name="action">budget_confirm()</field> <field name="action">budget_confirm()</field>
<field name="split_mode">OR</field> <field name="split_mode">OR</field>
</record> </record>
<record model="workflow.activity" id="act_validate"> <record model="workflow.activity" id="act_validate">
<field name="wkf_id" ref="wkf_crossovered_budget" /> <field name="wkf_id" ref="wkf_crossovered_budget" />
<field name="name">validate</field> <field name="name">validate</field>
<field name="kind">function</field> <field name="kind">function</field>
<field name="action">budget_validate()</field> <field name="action">budget_validate()</field>
</record> </record>
<record model="workflow.activity" id="act_cancel"> <record model="workflow.activity" id="act_cancel">
<field name="wkf_id" ref="wkf_crossovered_budget" /> <field name="wkf_id" ref="wkf_crossovered_budget" />
<field name="name">cancel</field> <field name="name">cancel</field>
<field name="kind">function</field> <field name="kind">function</field>
<field name="action">budget_cancel()</field> <field name="action">budget_cancel()</field>
</record> </record>
<record model="workflow.activity" id="act_done"> <record model="workflow.activity" id="act_done">
<field name="wkf_id" ref="wkf_crossovered_budget" /> <field name="wkf_id" ref="wkf_crossovered_budget" />
<field name="name">done</field> <field name="name">done</field>
<field name="flow_stop">True</field> <field name="flow_stop">True</field>
<field name="kind">stopall</field> <field name="kind">stopall</field>
<field name="action">budget_done()</field> <field name="action">budget_done()</field>
<field name="join_mode">XOR</field> <field name="join_mode">XOR</field>
</record> </record>
<record model="workflow.transition" id="t1"> <record model="workflow.transition" id="t1">
<field name="act_from" ref="act_draft" /> <field name="act_from" ref="act_draft" />
<field name="act_to" ref="act_confirm" /> <field name="act_to" ref="act_confirm" />
<field name="signal">confirm</field> <field name="signal">confirm</field>
</record> </record>
<record model="workflow.transition" id="t2"> <record model="workflow.transition" id="t2">
<field name="act_from" ref="act_confirm" /> <field name="act_from" ref="act_confirm" />
<field name="act_to" ref="act_validate" /> <field name="act_to" ref="act_validate" />
<field name="signal">validate</field> <field name="signal">validate</field>
</record> </record>
<record model="workflow.transition" id="t3"> <record model="workflow.transition" id="t3">
<field name="act_from" ref="act_confirm" /> <field name="act_from" ref="act_confirm" />
<field name="act_to" ref="act_cancel" /> <field name="act_to" ref="act_cancel" />
<field name="signal">cancel</field> <field name="signal">cancel</field>
</record> </record>
<record model="workflow.transition" id="t4"> <record model="workflow.transition" id="t4">
<field name="act_from" ref="act_validate" /> <field name="act_from" ref="act_validate" />
<field name="act_to" ref="act_cancel" /> <field name="act_to" ref="act_cancel" />
<field name="signal">cancel</field> <field name="signal">cancel</field>
</record> </record>
<record model="workflow.transition" id="t5"> <record model="workflow.transition" id="t5">
<field name="act_from" ref="act_validate" /> <field name="act_from" ref="act_validate" />
<field name="act_to" ref="act_done" /> <field name="act_to" ref="act_done" />
<field name="signal">done</field> <field name="signal">done</field>
</record> </record>
<record model="workflow.transition" id="t6"> <record model="workflow.transition" id="t6">
<field name="act_from" ref="act_cancel" /> <field name="act_from" ref="act_cancel" />
<field name="act_to" ref="act_draft" /> <field name="act_to" ref="act_draft" />
<field name="signal">draft</field> <field name="signal">draft</field>
</record> </record>
</data> </data>
</openerp> </openerp>
addons/account_budget/wizard/account_budget_analytic_view.xml
+3 -2
View File
@@ -9,8 +9,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Select Dates Period" version="7.0"> <form string="Select Dates Period" version="7.0">
<header> <header>
<button special="cancel" string="Cancel" icon="gtk-cancel"/> <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<group string="This wizard is used to print budget" col="4"> <group string="This wizard is used to print budget" col="4">
<field name="date_from"/> <field name="date_from"/>
addons/account_budget/wizard/account_budget_crossovered_report_view.xml
+3 -2
View File
@@ -9,8 +9,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Select Dates Period" version="7.0"> <form string="Select Dates Period" version="7.0">
<header> <header>
<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/> <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<group string="This wizard is used to print budget" col="4"> <group string="This wizard is used to print budget" col="4">
<field name="date_from"/> <field name="date_from"/>
addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
+3 -2
View File
@@ -9,8 +9,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Select Dates Period" version="7.0"> <form string="Select Dates Period" version="7.0">
<header> <header>
<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/> <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<group string="This wizard is used to print summary of budgets"> <group string="This wizard is used to print summary of budgets">
<field name="date_from"/> <field name="date_from"/>
addons/account_budget/wizard/account_budget_report_view.xml
+3 -2
View File
@@ -9,8 +9,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Select Dates Period" version="7.0"> <form string="Select Dates Period" version="7.0">
<header> <header>
<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/> <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<group string="Print Budgets" col="4"> <group string="Print Budgets" col="4">
<field name="date_from"/> <field name="date_from"/>
addons/account_cancel/account_cancel_view.xml
+2 -2
View File
@@ -20,7 +20,7 @@
<field name="inherit_id" ref="account.invoice_form"/> <field name="inherit_id" ref="account.invoice_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//button[@name='invoice_cancel']" position="replace"> <xpath expr="//button[@name='invoice_cancel']" position="replace">
<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="account.group_account_invoice"/> <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="account.group_account_invoice"/>
</xpath> </xpath>
</field> </field>
</record> </record>
@@ -32,7 +32,7 @@
<field name="inherit_id" ref="account.invoice_supplier_form"/> <field name="inherit_id" ref="account.invoice_supplier_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//button[@name='invoice_cancel']" position="replace"> <xpath expr="//button[@name='invoice_cancel']" position="replace">
<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="account.group_account_invoice"/> <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="account.group_account_invoice"/>
</xpath> </xpath>
</field> </field>
</record> </record>
addons/account_check_writing/account_voucher_view.xml
+2 -2
View File
@@ -3,7 +3,7 @@
<data> <data>
<!-- Supplier voucher view --> <!-- Supplier voucher view -->
<record model="ir.ui.view" id="view_vendor_payment_check_form"> <record model="ir.ui.view" id="view_vendor_payment_check_form">
<field name="name">account.voucher.payment.check.form</field> <field name="name">account.voucher.payment.check.form</field>
<field name="model">account.voucher</field> <field name="model">account.voucher</field>
@@ -20,7 +20,7 @@
<field name="number" attrs="{'readonly':[('allow_check','!=',1)]}" /> <field name="number" attrs="{'readonly':[('allow_check','!=',1)]}" />
</field> </field>
<button name="proforma_voucher" position="after"> <button name="proforma_voucher" position="after">
<button name="print_check" icon="gtk-print" string="Print Check" type="object" attrs="{'invisible':['|',('allow_check','!=',1),('state','!=','posted') ]}"/> <button name="print_check" icon="gtk-print" string="Print Check" type="object" attrs="{'invisible':['|',('allow_check','!=',1),('state','!=','posted') ]}" class="oe_highlight"/>
</button> </button>
</field> </field>
</record> </record>
addons/account_coda/account_coda.py
-2
View File
@@ -22,9 +22,7 @@
from osv import osv, fields from osv import osv, fields
import decimal_precision as dp import decimal_precision as dp
import netsvc
from tools.translate import _ from tools.translate import _
logger=netsvc.Logger()
class coda_bank_account(osv.osv): class coda_bank_account(osv.osv):
_name= 'coda.bank.account' _name= 'coda.bank.account'
addons/account_coda/account_coda_wizard.xml
+8 -6
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<openerp> <openerp>
<data> <data>
<record id="account_coda_import_view" model="ir.ui.view"> <record id="account_coda_import_view" model="ir.ui.view">
<field name="name">Import CODA File</field> <field name="name">Import CODA File</field>
@@ -10,8 +10,9 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Import CODA File" version="7.0"> <form string="Import CODA File" version="7.0">
<header> <header>
<button name="coda_parsing" string="_Import" type="object" icon="gtk-ok"/> <button name="coda_parsing" string="_Import" type="object" class="oe_highlight"/>
<button special="cancel" string="_Cancel" icon="gtk-cancel"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<group col="2" string="Select Your File :"> <group col="2" string="Select Your File :">
<field name="coda_data" filename="coda_fname"/> <field name="coda_data" filename="coda_fname"/>
@@ -29,9 +30,10 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Import CODA File" version="7.0"> <form string="Import CODA File" version="7.0">
<header> <header>
<button name="action_open_coda_statements" string="View CODA Bank Statement(s)" type="object" icon="gtk-apply"/> <button name="action_open_coda_statements" string="View CODA Bank Statement(s)" type="object" class="oe_highlight"/>
<button name="action_open_bank_statements" string="View Bank Statement(s)" type="object" icon="gtk-apply"/> <button name="action_open_bank_statements" string="View Bank Statement(s)" type="object" class="oe_highlight"/>
<button special="cancel" string="Close" icon="gtk-cancel"/> or
<button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<group string="Results :"> <group string="Results :">
<field name="note" nolabel="1" colspan="2"/> <field name="note" nolabel="1" colspan="2"/>
addons/account_coda/wizard/account_coda_import.py
+6 -9
View File
@@ -24,11 +24,11 @@ import time
import base64 import base64
from osv import fields,osv from osv import fields,osv
from tools.translate import _ from tools.translate import _
import netsvc import logging
import re import re
from traceback import format_exception from traceback import format_exception
from sys import exc_info from sys import exc_info
logger=netsvc.Logger() _logger = logging.getLogger(__name__)
class account_coda_import(osv.osv_memory): class account_coda_import(osv.osv_memory):
_name = 'account.coda.import' _name = 'account.coda.import'
@@ -816,7 +816,7 @@ class account_coda_import(osv.osv_memory):
ttype = line['type'] == 'supplier' and 'payment' or 'receipt', ttype = line['type'] == 'supplier' and 'payment' or 'receipt',
date = line['val_date'], date = line['val_date'],
context = context) context = context)
#logger.notifyChannel('addons.'+self._name, netsvc.LOG_WARNING, 'voucher_dict = %s' % voucher_dict) #_logger.warning('voucher_dict = %s' % voucher_dict)
voucher_line_vals = False voucher_line_vals = False
if voucher_dict['value']['line_ids']: if voucher_dict['value']['line_ids']:
for line_dict in voucher_dict['value']['line_ids']: for line_dict in voucher_dict['value']['line_ids']:
@@ -889,22 +889,19 @@ class account_coda_import(osv.osv_memory):
nb_err += 1 nb_err += 1
err_string += _('\nError ! ') + str(e) err_string += _('\nError ! ') + str(e)
tb = ''.join(format_exception(*exc_info())) tb = ''.join(format_exception(*exc_info()))
logger.notifyChannel('addons.'+self._name, netsvc.LOG_ERROR, _logger.error('Application Error while processing Statement %s\n%s' % (statement.get('name', '/'),tb))
'Application Error while processing Statement %s\n%s' % (statement.get('name', '/'),tb))
except Exception, e: except Exception, e:
cr.rollback() cr.rollback()
nb_err += 1 nb_err += 1
err_string += _('\nSystem Error : ') + str(e) err_string += _('\nSystem Error : ') + str(e)
tb = ''.join(format_exception(*exc_info())) tb = ''.join(format_exception(*exc_info()))
logger.notifyChannel('addons.'+self._name, netsvc.LOG_ERROR, _logger.error('System Error while processing Statement %s\n%s' % (statement.get('name', '/'),tb))
'System Error while processing Statement %s\n%s' % (statement.get('name', '/'),tb))
except : except :
cr.rollback() cr.rollback()
nb_err += 1 nb_err += 1
err_string = _('\nUnknown Error : ') + str(e) err_string = _('\nUnknown Error : ') + str(e)
tb = ''.join(format_exception(*exc_info())) tb = ''.join(format_exception(*exc_info()))
logger.notifyChannel('addons.'+self._name, netsvc.LOG_ERROR, _logger.error('Unknown Error while processing Statement %s\n%s' % (statement.get('name', '/'),tb))
'Unknown Error while processing Statement %s\n%s' % (statement.get('name', '/'),tb))
# end 'for statement in coda_statements' # end 'for statement in coda_statements'
addons/account_followup/__openerp__.py
+4 -4
View File
@@ -20,7 +20,7 @@
############################################################################## ##############################################################################
{ {
'name': 'Followup Management', 'name': 'Follow-up Management',
'version': '1.0', 'version': '1.0',
'category': 'Accounting & Finance', 'category': 'Accounting & Finance',
'description': """ 'description': """
@@ -28,16 +28,16 @@ Module to automate letters for unpaid invoices, with multi-level recalls.
========================================================================== ==========================================================================
You can define your multiple levels of recall through the menu: You can define your multiple levels of recall through the menu:
Accounting/Configuration/Miscellaneous/Follow-Ups Accounting/Configuration/Miscellaneous/Follow-ups
Once it is defined, you can automatically print recalls every day through simply clicking on the menu: Once it is defined, you can automatically print recalls every day through simply clicking on the menu:
Accounting/Periodical Processing/Billing/Send followups Accounting/Periodical Processing/Billing/Send follow-ups
It will generate a PDF with all the letters according to the the It will generate a PDF with all the letters according to the the
different levels of recall defined. You can define different policies different levels of recall defined. You can define different policies
for different companies. You can also send mail to the customer. for different companies. You can also send mail to the customer.
Note that if you want to check the followup level for a given partner/account entry, you can do from in the menu: Note that if you want to check the follow-up level for a given partner/account entry, you can do from in the menu:
Accounting/Reporting/Generic Reporting/Partners/Follow-ups Sent Accounting/Reporting/Generic Reporting/Partners/Follow-ups Sent
""", """,

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