Fabien Pinckaers
@@ -1321,49 +1321,6 @@ class account_tax(osv.osv):
|
||||
return res
|
||||
account_tax()
|
||||
|
||||
# ---------------------------------------------------------
|
||||
# Budgets
|
||||
# ---------------------------------------------------------
|
||||
|
||||
class account_budget_post(osv.osv):
|
||||
_name = 'account.budget.post'
|
||||
_description = 'Budget item'
|
||||
_columns = {
|
||||
'code': fields.char('Code', size=64, required=True),
|
||||
'name': fields.char('Name', size=256, required=True),
|
||||
'dotation_ids': fields.one2many('account.budget.post.dotation', 'post_id', 'Expenses'),
|
||||
'account_ids': fields.many2many('account.account', 'account_budget_rel', 'budget_id', 'account_id', 'Accounts'),
|
||||
}
|
||||
_defaults = {
|
||||
}
|
||||
|
||||
def spread(self, cr, uid, ids, fiscalyear_id=False, amount=0.0):
|
||||
dobj = self.pool.get('account.budget.post.dotation')
|
||||
for o in self.browse(cr, uid, ids):
|
||||
# delete dotations for this post
|
||||
dobj.unlink(cr, uid, dobj.search(cr, uid, [('post_id','=',o.id)]))
|
||||
|
||||
# create one dotation per period in the fiscal year, and spread the total amount/quantity over those dotations
|
||||
fy = self.pool.get('account.fiscalyear').browse(cr, uid, [fiscalyear_id])[0]
|
||||
num = len(fy.period_ids)
|
||||
for p in fy.period_ids:
|
||||
dobj.create(cr, uid, {'post_id': o.id, 'period_id': p.id, 'amount': amount/num})
|
||||
return True
|
||||
account_budget_post()
|
||||
|
||||
class account_budget_post_dotation(osv.osv):
|
||||
_name = 'account.budget.post.dotation'
|
||||
_description = "Budget item endowment"
|
||||
_columns = {
|
||||
'name': fields.char('Name', size=64),
|
||||
'post_id': fields.many2one('account.budget.post', 'Item', select=True),
|
||||
'period_id': fields.many2one('account.period', 'Period'),
|
||||
# 'quantity': fields.float('Quantity', digits=(16,2)),
|
||||
'amount': fields.float('Amount', digits=(16,2)),
|
||||
}
|
||||
account_budget_post_dotation()
|
||||
|
||||
|
||||
# ---------------------------------------------------------
|
||||
# Account Entries Models
|
||||
# ---------------------------------------------------------
|
||||
@@ -1565,8 +1522,6 @@ class account_config_fiscalyear(osv.osv_memory):
|
||||
|
||||
account_config_fiscalyear()
|
||||
|
||||
|
||||
|
||||
# ---------------------------------------------------------------
|
||||
# Account Templates : Account, Tax, Tax Code and chart. + Wizard
|
||||
# ---------------------------------------------------------------
|
||||
@@ -1789,7 +1744,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
|
||||
Create a new account chart for a company.
|
||||
Wizards ask:
|
||||
* a company
|
||||
* an account chart template
|
||||
* an account chart template
|
||||
* a number of digits for formatting code of non-view accounts
|
||||
* a list of bank account owned by the company
|
||||
Then, the wizard:
|
||||
@@ -1886,11 +1841,13 @@ class wizard_multi_charts_accounts(osv.osv_memory):
|
||||
for tax in account_template.tax_ids:
|
||||
tax_ids.append(tax_template_ref[tax.id])
|
||||
#create the account_account
|
||||
|
||||
dig = obj_multi.code_digits
|
||||
code_main = len(account_template.code)
|
||||
code_acc = account_template.code
|
||||
if code_main<=dig and account_template.type != 'view':
|
||||
code_acc=str(code_acc) + (str('0'*(dig-code_main)))
|
||||
|
||||
vals={
|
||||
'name': (obj_acc_root.id == account_template.id) and obj_multi.company_id.name or account_template.name,
|
||||
#'sign': account_template.sign,
|
||||
@@ -1967,7 +1924,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
|
||||
vals={
|
||||
'name': line.acc_no.bank and line.acc_no.bank.name+' '+tmp or tmp,
|
||||
'currency_id': line.currency_id and line.currency_id.id or False,
|
||||
'code': code_acc[:dig],
|
||||
'code': ref_acc_bank.code+str(current_num),
|
||||
'type': 'other',
|
||||
'user_type': account_template.user_type and account_template.user_type.id or False,
|
||||
'reconcile': True,
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
<data>
|
||||
|
||||
<!--
|
||||
Invoices
|
||||
-->
|
||||
Invoices
|
||||
-->
|
||||
|
||||
<record id="view_invoice_line_calendar" model="ir.ui.view">
|
||||
<field name="name">account.invoice.calendar</field>
|
||||
@@ -17,17 +17,17 @@
|
||||
</calendar>
|
||||
</field>
|
||||
</record>
|
||||
<record model="ir.ui.view" id="view_invoice_graph">
|
||||
<field name="name">account.invoice.graph</field>
|
||||
<field name="model">account.invoice</field>
|
||||
<field name="type">graph</field>
|
||||
<field name="arch" type="xml">
|
||||
<graph string="Invoices" type="bar">
|
||||
<field name="partner_id"/>
|
||||
<field name="amount_total" operator="+"/>
|
||||
</graph>
|
||||
</field>
|
||||
</record>
|
||||
<record model="ir.ui.view" id="view_invoice_graph">
|
||||
<field name="name">account.invoice.graph</field>
|
||||
<field name="model">account.invoice</field>
|
||||
<field name="type">graph</field>
|
||||
<field name="arch" type="xml">
|
||||
<graph string="Invoices" type="bar">
|
||||
<field name="partner_id"/>
|
||||
<field name="amount_total" operator="+"/>
|
||||
</graph>
|
||||
</field>
|
||||
</record>
|
||||
<record id="view_invoice_line_tree" model="ir.ui.view">
|
||||
<field name="name">account.invoice.line.tree</field>
|
||||
<field name="model">account.invoice.line</field>
|
||||
@@ -122,6 +122,7 @@
|
||||
<field name="currency_id"/>
|
||||
<field name="date_invoice"/>
|
||||
<field name="date_due" select="1"/>
|
||||
<field name="residual"/>
|
||||
<field name="state"/>
|
||||
</tree>
|
||||
</field>
|
||||
@@ -181,6 +182,7 @@
|
||||
<button colspan="2" name="button_compute" states="draft" string="Compute" type="object"/>
|
||||
<field name="amount_total"/>
|
||||
<field name="reconciled"/>
|
||||
<field name="residual"/>
|
||||
<field name="state" select="2"/>
|
||||
<group col="3" colspan="4">
|
||||
<button name="invoice_open" states="draft,proforma" string="Validate"/>
|
||||
@@ -206,6 +208,9 @@
|
||||
<separator colspan="4" string="Additionnal Information"/>
|
||||
<field colspan="4" name="comment" nolabel="1"/>
|
||||
</page>
|
||||
<page string="Payments">
|
||||
<field name="move_lines" colspan="4"/>
|
||||
</page>
|
||||
</notebook>
|
||||
</form>
|
||||
</field>
|
||||
@@ -251,6 +256,7 @@
|
||||
<button colspan="2" name="button_compute" states="draft" string="Compute" type="object"/>
|
||||
<field name="amount_total"/>
|
||||
<field name="reconciled"/>
|
||||
<field name="residual"/>
|
||||
<field name="state" select="2"/>
|
||||
<group col="3" colspan="4">
|
||||
<button name="invoice_proforma" states="draft" string="PRO-FORMA"/>
|
||||
@@ -276,6 +282,9 @@
|
||||
<separator colspan="4" string="Additionnal Information"/>
|
||||
<field colspan="4" name="comment" nolabel="1"/>
|
||||
</page>
|
||||
<page string="Payments">
|
||||
<field name="move_lines" colspan="4" nolabel="1"/>
|
||||
</page>
|
||||
</notebook>
|
||||
</form>
|
||||
</field>
|
||||
|
||||
@@ -70,6 +70,33 @@ class account_move_line(osv.osv):
|
||||
# Compute simple values
|
||||
data = super(account_move_line, self).default_get(cr, uid, fields, context)
|
||||
|
||||
# Starts: Manual entry from account.move form
|
||||
if context.get('lines',[]):
|
||||
|
||||
total_new=0.00
|
||||
for i in context['lines']:
|
||||
total_new +=(i[2]['debit'] or 0.00)- (i[2]['credit'] or 0.00)
|
||||
for item in i[2]:
|
||||
data[item]=i[2][item]
|
||||
if context['journal']:
|
||||
journal_obj=self.pool.get('account.journal').browse(cr,uid,context['journal'])
|
||||
if journal_obj.type == 'purchase':
|
||||
if total_new>0:
|
||||
account = journal_obj.default_credit_account_id
|
||||
else:
|
||||
account = journal_obj.default_debit_account_id
|
||||
else:
|
||||
if total_new>0:
|
||||
account = journal_obj.default_credit_account_id
|
||||
else:
|
||||
account = journal_obj.default_debit_account_id
|
||||
data['account_id'] = account.id
|
||||
s = -total_new
|
||||
data['debit'] = s>0 and s or 0.0
|
||||
data['credit'] = s<0 and -s or 0.0
|
||||
return data
|
||||
# Ends: Manual entry from account.move form
|
||||
|
||||
if not 'move_id' in fields: #we are not in manual entry
|
||||
return data
|
||||
|
||||
@@ -342,11 +369,13 @@ class account_move_line(osv.osv):
|
||||
def onchange_partner_id(self, cr, uid, ids, move_id, partner_id, account_id=None, debit=0, credit=0, date=False, journal=False):
|
||||
val = {}
|
||||
val['date_maturity'] = False
|
||||
|
||||
if not partner_id:
|
||||
return {'value':val}
|
||||
if not date:
|
||||
date = now().strftime('%Y-%m-%d')
|
||||
part = self.pool.get('res.partner').browse(cr, uid, partner_id)
|
||||
|
||||
if part.property_payment_term and part.property_payment_term.line_ids:# Compute Maturity Date in val !
|
||||
line = part.property_payment_term.line_ids[0]
|
||||
next_date = mx.DateTime.strptime(date, '%Y-%m-%d') + RelativeDateTime(days=line.days)
|
||||
@@ -647,7 +676,6 @@ class account_move_line(osv.osv):
|
||||
def create(self, cr, uid, vals, context=None, check=True):
|
||||
if not context:
|
||||
context={}
|
||||
|
||||
account_obj = self.pool.get('account.account')
|
||||
tax_obj=self.pool.get('account.tax')
|
||||
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
<report auto="False" id="account_3rdparty_ledger" menu="False" model="res.partner" name="account.third_party_ledger" rml="account/report/third_party_ledger.rml" string="Partner ledger"/>
|
||||
<report auto="False" id="account_account_balance" menu="False" model="account.account" name="account.account.balance" rml="account/report/account_balance.rml" string="Account balance"/>
|
||||
<report auto="False" id="account_3rdparty_account_balance" menu="False" model="account.account" name="account.partner.balance" rml="account/report/partner_balance.rml" string="Partner balance"/>
|
||||
<report auto="False" id="account_budget" menu="False" model="account.budget.post" name="account.budget" rml="account/report/budget_report.rml" string="Print Budget"/>
|
||||
<report auto="False" id="account_central_journal" model="account.journal.period" name="account.central.journal" rml="account/report/central_journal.rml" string="Print Central Journal"/>
|
||||
<report auto="False" id="account_general_journal" model="account.journal.period" name="account.general.journal" rml="account/report/general_journal.rml" string="Print General Journal"/>
|
||||
<report auto="False" id="account_journal" model="account.journal.period" name="account.journal.period.print" rml="account/report/account_journal.rml" string="Print Journal"/>
|
||||
|
||||
@@ -802,13 +802,13 @@
|
||||
<field name="to_check" select="2"/>
|
||||
|
||||
<separator colspan="4" string="Entry Lines"/>
|
||||
<field colspan="4" name="line_id" nolabel="1" readonly="1" widget="one2many_list">
|
||||
<field colspan="4" name="line_id" nolabel="1" widget="one2many_list" default_get="{'lines':line_id ,'journal':journal_id }">
|
||||
<form string="Account Entry Line">
|
||||
<separator colspan="4" string="General Information"/>
|
||||
<field name="name" select="1"/>
|
||||
<field name="date"/>
|
||||
<field name="account_id"/>
|
||||
<field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
|
||||
<field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date,parent.journal_id)"/>
|
||||
|
||||
<field name="debit" select="1"/>
|
||||
<field name="credit" select="1"/>
|
||||
@@ -830,7 +830,7 @@
|
||||
<tree editable="top" string="Account Entry Line">
|
||||
<field name="date"/>
|
||||
<field name="name"/>
|
||||
<field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
|
||||
<field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date,parent.journal_id)"/>
|
||||
<field name="account_id"/>
|
||||
<field name="date_maturity"/>
|
||||
<field name="ref"/>
|
||||
@@ -856,7 +856,18 @@
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_move_tree"/>
|
||||
</record>
|
||||
<menuitem id="next_id_29" name="Search Entries" parent="account.menu_finance_accounting"/><menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/>
|
||||
<menuitem id="next_id_29" name="Search Entries" parent="account.menu_finance_accounting"/>
|
||||
<menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/>
|
||||
|
||||
<record id="action_move_line_form_encode_by_move" model="ir.actions.act_window">
|
||||
<field name="name">Entries Encoding by Move</field>
|
||||
<field name="res_model">account.move</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="view_id" ref="view_move_tree"/>
|
||||
</record>
|
||||
|
||||
<menuitem action="action_move_line_form_encode_by_move" id="menu_encode_entries_by_move" parent="menu_finance_entries"/>
|
||||
|
||||
<record id="action_move_line_search" model="ir.actions.act_window">
|
||||
<field name="name">Entry lines</field>
|
||||
@@ -982,80 +993,6 @@
|
||||
</record>
|
||||
<menuitem action="action_account_journal_period_tree" id="menu_action_account_journal_period_tree" parent="account.menu_finance_reporting"/>
|
||||
|
||||
<record id="action_account_budget_post_tree" model="ir.actions.act_window">
|
||||
<field name="name">Budgets</field>
|
||||
<field name="res_model">account.budget.post</field>
|
||||
<field name="view_type">tree</field>
|
||||
</record>
|
||||
<menuitem action="action_account_budget_post_tree" id="menu_action_account_budget_post_tree" parent="account.menu_finance_reporting"/>
|
||||
|
||||
<!--
|
||||
Budgets
|
||||
-->
|
||||
<record id="view_budget_post_form" model="ir.ui.view">
|
||||
<field name="name">account.budget.post.form</field>
|
||||
<field name="model">account.budget.post</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Master Budget">
|
||||
<notebook>
|
||||
<page string="Definition">
|
||||
<field name="code" select="1"/>
|
||||
<field name="name" select="1"/>
|
||||
</page>
|
||||
<page string="Dotations">
|
||||
<button name="%(wizard_budget_spread)d" string="Spread" type="action"/>
|
||||
<field colspan="4" name="dotation_ids" nolabel="1"/>
|
||||
</page>
|
||||
<page string="Accounts">
|
||||
<field colspan="4" name="account_ids" nolabel="1"/>
|
||||
</page>
|
||||
</notebook>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
<record id="view_budget_post_tree" model="ir.ui.view">
|
||||
<field name="name">account.budget.post.tree</field>
|
||||
<field name="model">account.budget.post</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Master Budget">
|
||||
<field name="code"/>
|
||||
<field name="name"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
<record id="view_budget_post_dotation_form" model="ir.ui.view">
|
||||
<field name="name">account.budget.post.dotation.form</field>
|
||||
<field name="model">account.budget.post.dotation</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Master Budget Expenses">
|
||||
<field name="period_id"/>
|
||||
<field name="amount"/>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
<record id="view_budget_post_dotation_tree" model="ir.ui.view">
|
||||
<field name="name">account.budget.post.dotation.tree</field>
|
||||
<field name="model">account.budget.post.dotation</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Master Budget Expenses">
|
||||
<field name="period_id"/>
|
||||
<field name="amount"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="open_budget_post_form" model="ir.actions.act_window">
|
||||
<field name="name">Master Budgets</field>
|
||||
<field name="res_model">account.budget.post</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_budget_post_tree"/>
|
||||
</record>
|
||||
<menuitem id="next_id_31" name="Budgets" parent="account.menu_finance_accounting"/><menuitem action="open_budget_post_form" id="menu_budget_post_form" parent="next_id_31"/>
|
||||
|
||||
|
||||
<!--
|
||||
# Account Models
|
||||
@@ -1416,7 +1353,6 @@
|
||||
<field name="target">new</field>
|
||||
</record>
|
||||
|
||||
|
||||
|
||||
<!-- register configuration wizard -->
|
||||
|
||||
|
||||
@@ -6,8 +6,6 @@
|
||||
|
||||
<wizard id="wizard_invoice_pay" model="account.invoice" name="account.invoice.pay" string="Pay invoice"/>
|
||||
|
||||
<wizard id="wizard_budget_spread" menu="False" model="account.budget.post" name="account.budget.spread" string="Spread amount"/>
|
||||
|
||||
<!-- close year, period, journal -->
|
||||
<wizard id="wizard_fiscalyear_close" menu="False" model="account.fiscalyear" name="account.fiscalyear.close" string="Close a Fiscal Year"/>
|
||||
<menuitem id="menu_finance" name="Financial Management"/><menuitem action="wizard_fiscalyear_close" id="menu_wizard_fy_close" parent="menu_account_end_year_treatments" sequence="11" type="wizard"/>
|
||||
@@ -26,8 +24,8 @@
|
||||
<wizard
|
||||
string="Import invoices"
|
||||
model="account.bank.statement"
|
||||
name="populate_statement_from_inv"
|
||||
menu="False"
|
||||
name="populate_statement_from_inv"
|
||||
menu="False"
|
||||
id="wizard_populate_statement_from_inv"/>
|
||||
|
||||
<!-- manual reconcile -->
|
||||
@@ -61,7 +59,6 @@
|
||||
<wizard id="wizard_third_party_ledger" menu="False" model="res.partner" name="account.third_party_ledger.report" string="Partner ledger"/>
|
||||
<menuitem icon="STOCK_PRINT" action="wizard_third_party_ledger" id="menu_third_party_ledger" parent="account.next_id_22" type="wizard"/>
|
||||
|
||||
<wizard id="wizard_budget_report" keyword="client_print_multi" model="account.budget.post" name="account.budget.report" string="Budget"/>
|
||||
<wizard id="wizard_balance_report" keyword="client_print_multi" model="account.account" name="account.account.balance.report" string="Account balance"/>
|
||||
<wizard id="wizard_general_ledger_report" keyword="client_print_multi" model="account.account" name="account.general.ledger.report" string="General ledger"/>
|
||||
|
||||
|
||||
+145
-247
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:47:16+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:47:16+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:45:09+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:45:09+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
@@ -15,11 +15,6 @@ msgstr ""
|
||||
"Content-Transfer-Encoding: "
|
||||
"Plural-Forms: "
|
||||
|
||||
#. module: account
|
||||
#: rml:account.budget:0
|
||||
msgid "% performance"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#, python-format
|
||||
#: code:addons/account/account.py:0
|
||||
@@ -38,13 +33,8 @@ msgid "Internal Name"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_cash_moves
|
||||
msgid "Cash Moves"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_budget_post
|
||||
msgid "Budget item"
|
||||
#: view:account.tax.code:0
|
||||
msgid "Account Tax Code"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
@@ -125,7 +115,6 @@ msgstr ""
|
||||
#: rml:account.analytic.account.cost_ledger:0
|
||||
#: rml:account.analytic.account.inverted.balance:0
|
||||
#: rml:account.analytic.account.quantity_cost_ledger:0
|
||||
#: rml:account.budget:0
|
||||
#: rml:account.analytic.account.journal:0
|
||||
msgid "to"
|
||||
msgstr ""
|
||||
@@ -237,11 +226,9 @@ msgstr ""
|
||||
#. module: account
|
||||
#: rml:account.invoice:0
|
||||
#: xsl:account.transfer:0
|
||||
#: wizard_field:account.budget.spread,init,amount:0
|
||||
#: field:account.analytic.line,amount:0
|
||||
#: field:account.bank.statement.line,amount:0
|
||||
#: field:account.bank.statement.reconcile.line,amount:0
|
||||
#: field:account.budget.post.dotation,amount:0
|
||||
#: field:account.invoice.tax,amount:0
|
||||
#: field:account.tax,amount:0
|
||||
#: field:account.tax.template,amount:0
|
||||
@@ -287,7 +274,6 @@ msgstr ""
|
||||
#: wizard_view:account.analytic.account.inverted.balance.report,init:0
|
||||
#: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
|
||||
#: wizard_view:account.account.balance.report,init:0
|
||||
#: wizard_view:account.budget.report,init:0
|
||||
#: wizard_view:account.general.ledger.report,init:0
|
||||
#: wizard_view:account.partner.balance.report,init:0
|
||||
#: wizard_view:account.third_party_ledger.report,init:0
|
||||
@@ -342,9 +328,8 @@ msgid "Analytic Account"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: field:account.budget.post,account_ids:0
|
||||
#: view:account.budget.post:0
|
||||
msgid "Accounts"
|
||||
#: wizard_button:populate_statement_from_inv,init,customer:0
|
||||
msgid "C_ustomer invoices"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
@@ -354,11 +339,6 @@ msgstr ""
|
||||
msgid "Unreconciliation"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: view:account.tax.code:0
|
||||
msgid "Account Tax Code"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_invoice_tree1
|
||||
#: model:ir.ui.menu,name:account.menu_action_invoice_tree1
|
||||
@@ -523,14 +503,8 @@ msgid "True"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_account_period_form
|
||||
#: wizard_field:account.account.balance.report,init,periods:0
|
||||
#: wizard_field:account.general.ledger.report,init,periods:0
|
||||
#: field:account.fiscalyear,period_ids:0
|
||||
#: model:ir.ui.menu,name:account.menu_action_account_period_form
|
||||
#: model:ir.ui.menu,name:account.next_id_23
|
||||
#: view:account.fiscalyear:0
|
||||
msgid "Periods"
|
||||
#: model:ir.model,name:account.model_account_tax
|
||||
msgid "account.tax"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
@@ -588,11 +562,6 @@ msgstr ""
|
||||
msgid "Open for bank reconciliation"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: rml:account.budget:0
|
||||
msgid "Budget item detail"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: wizard_field:account.analytic.account.analytic.check.report,init,date1:0
|
||||
#: wizard_field:account.analytic.account.balance.report,init,date1:0
|
||||
@@ -601,7 +570,6 @@ msgstr ""
|
||||
#: wizard_field:account.analytic.account.journal.report,init,date1:0
|
||||
#: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,date1:0
|
||||
#: wizard_field:account.automatic.reconcile,init,date1:0
|
||||
#: wizard_field:account.budget.report,init,date1:0
|
||||
#: wizard_field:account.partner.balance.report,init,date1:0
|
||||
#: wizard_field:account.third_party_ledger.report,init,date1:0
|
||||
#: field:account.period,date_start:0
|
||||
@@ -673,6 +641,11 @@ msgstr ""
|
||||
msgid "Customer Refund"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: wizard_view:populate_statement_from_inv,init:0
|
||||
msgid "Import invoices in statement"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: field:account.tax,ref_tax_sign:0
|
||||
#: field:account.tax,tax_sign:0
|
||||
@@ -715,7 +688,6 @@ msgstr ""
|
||||
#: rml:account.analytic.account.cost_ledger:0
|
||||
#: rml:account.analytic.account.inverted.balance:0
|
||||
#: rml:account.analytic.account.quantity_cost_ledger:0
|
||||
#: rml:account.budget:0
|
||||
#: rml:account.central.journal:0
|
||||
#: rml:account.general.journal:0
|
||||
#: rml:account.general.ledger:0
|
||||
@@ -733,6 +705,11 @@ msgstr ""
|
||||
msgid "Tax codes"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: wizard_button:account.invoice.pay,init,reconcile:0
|
||||
msgid "Partial Payment"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: wizard_view:account_use_models,create:0
|
||||
msgid "Move Lines Created."
|
||||
@@ -800,8 +777,9 @@ msgid "Account cost and revenue by journal"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: rml:account.budget:0
|
||||
msgid "Period Budget"
|
||||
#: model:ir.actions.act_window,name:account.action_subscription_form
|
||||
#: model:ir.ui.menu,name:account.menu_action_subscription_form
|
||||
msgid "Subscription Entries"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
@@ -901,16 +879,10 @@ msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_bank_statement_tree
|
||||
#: model:ir.actions.act_window,name:account.wizard_populate_payment_from_inv
|
||||
#: model:ir.ui.menu,name:account.menu_bank_statement_tree
|
||||
msgid "Entries by Statements"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: field:account.analytic.line,move_id:0
|
||||
msgid "Move Line"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: rml:account.general.journal:0
|
||||
#: wizard_field:account.move.journal,init,period_id:0
|
||||
@@ -919,7 +891,6 @@ msgstr ""
|
||||
#: wizard_field:account.move.validate,init,period_id:0
|
||||
#: wizard_field:wizard.account.vat.declaration,init,period:0
|
||||
#: field:account.bank.statement,period_id:0
|
||||
#: field:account.budget.post.dotation,period_id:0
|
||||
#: field:account.journal.period,period_id:0
|
||||
#: field:account.move.line,period_id:0
|
||||
#: field:account.move,period_id:0
|
||||
@@ -957,6 +928,11 @@ msgstr ""
|
||||
msgid "Analytic Entries"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: wizard_button:wizard.account.vat.declaration,init,go:0
|
||||
msgid "Create XML"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
|
||||
#: model:ir.ui.menu,name:account.menu_action_invoice_tree2_new
|
||||
@@ -1075,8 +1051,8 @@ msgid "Bank account"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_budget_post_dotation
|
||||
msgid "Budget item endowment"
|
||||
#: field:account.chart.template,tax_template_ids:0
|
||||
msgid "Tax Template List"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
@@ -1171,6 +1147,7 @@ msgid "Create subscription entries"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_root
|
||||
#: selection:account.account.template,type:0
|
||||
#: selection:account.account,type:0
|
||||
#: selection:account.analytic.account,type:0
|
||||
@@ -1185,8 +1162,9 @@ msgid "Analytic lines"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: rml:account.budget:0
|
||||
msgid "Results"
|
||||
#: wizard_view:account.reconcile.unreconcile,init:0
|
||||
#: wizard_view:account.move.line.unreconcile,init:0
|
||||
msgid "If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
@@ -1251,11 +1229,6 @@ msgstr ""
|
||||
msgid "Write-Off"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: field:account.chart.template,tax_template_ids:0
|
||||
msgid "Tax Template List"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: field:account.analytic.account,date:0
|
||||
msgid "Date End"
|
||||
@@ -1363,11 +1336,6 @@ msgstr ""
|
||||
msgid "Partner Ref."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_wizard_account_chart_duplicate
|
||||
msgid "wizard.account.chart.duplicate"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: field:account.subscription,lines_id:0
|
||||
#: view:account.subscription:0
|
||||
@@ -1481,7 +1449,6 @@ msgid "Costs & Revenues"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: rml:account.budget:0
|
||||
#: rml:account.journal.period.print:0
|
||||
#: rml:account.tax.code.entries:0
|
||||
msgid "Account Number"
|
||||
@@ -1492,6 +1459,11 @@ msgstr ""
|
||||
msgid "VAT:"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: wizard_button:populate_statement_from_inv,init,supplier:0
|
||||
msgid "_Supplier invoices"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: field:account.invoice,period_id:0
|
||||
msgid "Force Period"
|
||||
@@ -1508,9 +1480,10 @@ msgid "Third party (Country)"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: field:account.tax,include_base_amount:0
|
||||
#: field:account.tax.template,include_base_amount:0
|
||||
msgid "Include in base amount"
|
||||
#: wizard_button:populate_statement_from_inv,customer,end:0
|
||||
#: wizard_button:populate_statement_from_inv,supplier,end:0
|
||||
#: wizard_button:populate_statement_from_inv,init,end:0
|
||||
msgid "_Cancel"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
@@ -1534,7 +1507,6 @@ msgstr ""
|
||||
#. module: account
|
||||
#: rml:account.partner.balance:0
|
||||
#: rml:account.third_party_ledger:0
|
||||
#: rml:account.budget:0
|
||||
msgid "From"
|
||||
msgstr ""
|
||||
|
||||
@@ -1609,7 +1581,6 @@ msgstr ""
|
||||
#: wizard_button:account.analytic.account.journal.report,init,report:0
|
||||
#: wizard_button:account.analytic.account.quantity_cost_ledger.report,init,report:0
|
||||
#: wizard_button:account.account.balance.report,init,report:0
|
||||
#: wizard_button:account.budget.report,init,report:0
|
||||
#: wizard_button:account.general.ledger.report,init,report:0
|
||||
#: wizard_button:account.partner.balance.report,init,report:0
|
||||
#: wizard_button:account.third_party_ledger.report,init,report:0
|
||||
@@ -2005,14 +1976,33 @@ msgstr ""
|
||||
msgid "Liability"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: rml:account.overdue:0
|
||||
msgid "Customer Ref:"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: rml:account.analytic.account.analytic.check:0
|
||||
msgid "Delta"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: rml:account.budget:0
|
||||
msgid "Budget Analysis"
|
||||
#: rml:account.third_party_ledger:0
|
||||
#: rml:account.analytic.account.cost_ledger:0
|
||||
#: rml:account.analytic.account.quantity_cost_ledger:0
|
||||
#: rml:account.general.ledger:0
|
||||
#: rml:account.journal.period.print:0
|
||||
#: rml:account.tax.code.entries:0
|
||||
#: rml:account.overdue:0
|
||||
#: xsl:account.transfer:0
|
||||
#: rml:account.analytic.account.journal:0
|
||||
#: wizard_field:account.subscription.generate,init,date:0
|
||||
#: field:account.analytic.line,date:0
|
||||
#: field:account.bank.statement,date:0
|
||||
#: field:account.bank.statement.line,date:0
|
||||
#: field:account.bank.statement.reconcile,name:0
|
||||
#: field:account.subscription.line,date:0
|
||||
msgid "Date"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
@@ -2081,6 +2071,11 @@ msgstr ""
|
||||
msgid "Automatic reconciliation"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: view:account.bank.statement:0
|
||||
msgid "Import Invoice"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#, python-format
|
||||
#: code:addons/account/account_move_line.py:0
|
||||
@@ -2098,29 +2093,8 @@ msgid "The optionnal quantity expressed by this line, eg: number of product sold
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: rml:account.third_party_ledger:0
|
||||
#: rml:account.analytic.account.cost_ledger:0
|
||||
#: rml:account.analytic.account.quantity_cost_ledger:0
|
||||
#: rml:account.general.ledger:0
|
||||
#: rml:account.journal.period.print:0
|
||||
#: rml:account.tax.code.entries:0
|
||||
#: rml:account.overdue:0
|
||||
#: xsl:account.transfer:0
|
||||
#: rml:account.analytic.account.journal:0
|
||||
#: wizard_field:account.subscription.generate,init,date:0
|
||||
#: field:account.analytic.line,date:0
|
||||
#: field:account.bank.statement,date:0
|
||||
#: field:account.bank.statement.line,date:0
|
||||
#: field:account.bank.statement.reconcile,name:0
|
||||
#: field:account.subscription.line,date:0
|
||||
msgid "Date"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_account_budget_post_tree
|
||||
#: model:ir.ui.menu,name:account.menu_action_account_budget_post_tree
|
||||
#: model:ir.ui.menu,name:account.next_id_31
|
||||
msgid "Budgets"
|
||||
#: field:account.analytic.line,move_id:0
|
||||
msgid "Move Line"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
@@ -2165,7 +2139,6 @@ msgstr ""
|
||||
#: field:account.account.template,code:0
|
||||
#: field:account.account.type,code:0
|
||||
#: field:account.analytic.line,code:0
|
||||
#: field:account.budget.post,code:0
|
||||
#: field:account.config.fiscalyear,code:0
|
||||
#: field:account.fiscalyear,code:0
|
||||
#: field:account.journal,code:0
|
||||
@@ -2179,11 +2152,6 @@ msgstr ""
|
||||
msgid "Entry Lines"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: view:account.budget.post.dotation:0
|
||||
msgid "Master Budget Expenses"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#, python-format
|
||||
#: code:addons/account/invoice.py:0
|
||||
@@ -2252,12 +2220,6 @@ msgstr ""
|
||||
msgid "Fiscal year"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: selection:account.model.line,date:0
|
||||
#: selection:account.model.line,date_maturity:0
|
||||
msgid "Date of the day"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: wizard_button:account.analytic.account.analytic.check.report,init,end:0
|
||||
#: wizard_button:account.analytic.account.balance.report,init,end:0
|
||||
@@ -2272,8 +2234,6 @@ msgstr ""
|
||||
#: wizard_button:account.aged.trial.balance,init,end:0
|
||||
#: wizard_button:account.automatic.reconcile,init,end:0
|
||||
#: wizard_button:account.account.balance.report,init,end:0
|
||||
#: wizard_button:account.budget.report,init,end:0
|
||||
#: wizard_button:account.budget.spread,init,end:0
|
||||
#: wizard_button:account.fiscalyear.close,init,end:0
|
||||
#: wizard_button:account.general.ledger.report,init,end:0
|
||||
#: wizard_button:account.subscription.generate,init,end:0
|
||||
@@ -2364,12 +2324,6 @@ msgstr ""
|
||||
msgid "Account balance"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: wizard_view:account.reconcile.unreconcile,init:0
|
||||
#: wizard_view:account.move.line.unreconcile,init:0
|
||||
msgid "If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: rml:account.analytic.account.analytic.check:0
|
||||
#: rml:account.analytic.account.journal:0
|
||||
@@ -2426,8 +2380,17 @@ msgid "-"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: wizard_field:account.invoice.pay,init,date:0
|
||||
msgid "Payment date"
|
||||
#: field:account.tax,include_base_amount:0
|
||||
#: field:account.tax.template,include_base_amount:0
|
||||
msgid "Include in base amount"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
|
||||
#: model:ir.ui.menu,name:account.account_analytic_chart
|
||||
#: model:ir.ui.menu,name:account.account_analytic_chart_balance
|
||||
#: model:ir.ui.menu,name:account.account_analytic_def_chart
|
||||
msgid "Analytic Chart of Accounts"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
@@ -2436,8 +2399,9 @@ msgid "Invoice Number"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:account.journal,name:account.stock_journal
|
||||
msgid "Stock Journal"
|
||||
#: wizard_button:populate_statement_from_inv,customer,finish:0
|
||||
#: wizard_button:populate_statement_from_inv,supplier,finish:0
|
||||
msgid "O_k"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
@@ -2469,8 +2433,6 @@ msgstr ""
|
||||
#: field:account.account.template,name:0
|
||||
#: field:account.bank.statement.line,name:0
|
||||
#: field:account.bank.statement,name:0
|
||||
#: field:account.budget.post.dotation,name:0
|
||||
#: field:account.budget.post,name:0
|
||||
#: field:account.chart.template,name:0
|
||||
#: field:account.config.fiscalyear,name:0
|
||||
#: field:account.model.line,name:0
|
||||
@@ -2480,11 +2442,6 @@ msgstr ""
|
||||
msgid "Name"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: view:account.budget.post:0
|
||||
msgid "Dotations"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: wizard_view:account.move.line.reconcile,init_partial:0
|
||||
#: wizard_view:account.move.line.reconcile,init_full:0
|
||||
@@ -2626,11 +2583,6 @@ msgstr ""
|
||||
msgid "Account No."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: view:account.budget.post:0
|
||||
msgid "Master Budget"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_invoice_tree10
|
||||
#: model:ir.ui.menu,name:account.menu_action_invoice_tree10
|
||||
@@ -2913,11 +2865,6 @@ msgstr ""
|
||||
msgid "Fax :"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_tax
|
||||
msgid "account.tax"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: selection:account.tax,applicable_type:0
|
||||
#: field:account.tax,python_applicable:0
|
||||
@@ -2946,13 +2893,13 @@ msgid "Default Tax on Partner"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: view:account.bank.statement:0
|
||||
msgid "Real Entries"
|
||||
#: help:account.model.line,sequence:0
|
||||
msgid "The sequence field is used to order the resources from the lowest sequences to the higher ones"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: view:account.bank.statement:0
|
||||
msgid "Import invoice"
|
||||
msgid "Real Entries"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
@@ -2985,21 +2932,14 @@ msgid "All draft account entries in this journal and period will be validated. I
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: rml:account.budget:0
|
||||
#: wizard_view:account.budget.spread,init:0
|
||||
#: wizard_button:account.budget.spread,init,spread:0
|
||||
#: view:account.budget.post:0
|
||||
msgid "Spread"
|
||||
#: selection:account.model.line,date:0
|
||||
#: selection:account.model.line,date_maturity:0
|
||||
msgid "Date of the day"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: help:account.model.line,sequence:0
|
||||
msgid "The sequence field is used to order the resources from the lowest sequences to the higher ones"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: rml:account.budget:0
|
||||
msgid "Performance"
|
||||
#: help:account.journal,centralisation:0
|
||||
msgid "Check this box if you want that each entry doesn't create a counterpart but share the same counterpart for each entry of this journal."
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
@@ -3110,14 +3050,8 @@ msgid "Manual"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: rml:account.overdue:0
|
||||
msgid "Customer Ref:"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: rml:account.budget:0
|
||||
#: model:ir.actions.wizard,name:account.wizard_budget_report
|
||||
msgid "Budget"
|
||||
#: model:account.journal,name:account.stock_journal
|
||||
msgid "Stock Journal"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
@@ -3169,11 +3103,6 @@ msgstr ""
|
||||
msgid "Entry Subscription"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: view:account.budget.post:0
|
||||
msgid "Budget Lines"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: wizard_button:account.wizard_paid_open,init,yes:0
|
||||
msgid "Yes"
|
||||
@@ -3262,6 +3191,12 @@ msgstr ""
|
||||
msgid "Journal name"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.report.xml,name:account.account_analytic_account_quantity_cost_ledger
|
||||
#: model:ir.actions.wizard,name:account.account_analytic_account_quantity_cost_ledger_report
|
||||
msgid "Cost Ledger (Only quantities)"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: rml:account.overdue:0
|
||||
msgid "Balance:"
|
||||
@@ -3344,16 +3279,6 @@ msgstr ""
|
||||
msgid "Customer Accounting Properties"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: view:account.budget.post:0
|
||||
msgid "Definition"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_move_reconcile
|
||||
msgid "Account Reconciliation"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: field:account.invoice.tax,name:0
|
||||
msgid "Tax Description"
|
||||
@@ -3517,8 +3442,14 @@ msgid "Third party balance"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: xsl:account.transfer:0
|
||||
msgid "Change"
|
||||
#: model:ir.actions.act_window,name:account.action_account_period_form
|
||||
#: wizard_field:account.account.balance.report,init,periods:0
|
||||
#: wizard_field:account.general.ledger.report,init,periods:0
|
||||
#: field:account.fiscalyear,period_ids:0
|
||||
#: model:ir.ui.menu,name:account.menu_action_account_period_form
|
||||
#: model:ir.ui.menu,name:account.next_id_23
|
||||
#: view:account.fiscalyear:0
|
||||
msgid "Periods"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
@@ -3577,7 +3508,6 @@ msgstr ""
|
||||
#: rml:account.analytic.account.cost_ledger:0
|
||||
#: rml:account.analytic.account.inverted.balance:0
|
||||
#: rml:account.analytic.account.quantity_cost_ledger:0
|
||||
#: rml:account.budget:0
|
||||
#: rml:account.central.journal:0
|
||||
#: rml:account.general.journal:0
|
||||
#: rml:account.general.ledger:0
|
||||
@@ -3588,8 +3518,8 @@ msgid "Printing date:"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: wizard_button:wizard.account.vat.declaration,init,go:0
|
||||
msgid "Create XML"
|
||||
#: wizard_view:populate_statement_from_inv,init:0
|
||||
msgid "Choose invoice type and payment date"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
@@ -3713,7 +3643,6 @@ msgstr ""
|
||||
#. module: account
|
||||
#: field:account.analytic.journal,line_ids:0
|
||||
#: field:account.tax.code,line_ids:0
|
||||
#: view:account.budget.post:0
|
||||
msgid "Lines"
|
||||
msgstr ""
|
||||
|
||||
@@ -3722,11 +3651,6 @@ msgstr ""
|
||||
msgid "End of Year Treatments"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: field:account.budget.post.dotation,post_id:0
|
||||
msgid "Item"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: rml:account.analytic.account.cost_ledger:0
|
||||
#: rml:account.analytic.account.quantity_cost_ledger:0
|
||||
@@ -3818,7 +3742,6 @@ msgstr ""
|
||||
#: rml:account.analytic.account.balance:0
|
||||
#: rml:account.analytic.account.cost_ledger:0
|
||||
#: rml:account.analytic.account.quantity_cost_ledger:0
|
||||
#: rml:account.budget:0
|
||||
#: rml:account.general.journal:0
|
||||
#: field:account.invoice,amount_total:0
|
||||
#: field:account.invoice,check_total:0
|
||||
@@ -3881,14 +3804,6 @@ msgstr ""
|
||||
msgid "):"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
|
||||
#: model:ir.ui.menu,name:account.account_analytic_chart
|
||||
#: model:ir.ui.menu,name:account.account_analytic_chart_balance
|
||||
#: model:ir.ui.menu,name:account.account_analytic_def_chart
|
||||
msgid "Analytic Chart of Accounts"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: field:account.bank.statement.line,statement_id:0
|
||||
#: field:account.move.line,statement_id:0
|
||||
@@ -3897,8 +3812,9 @@ msgid "Statement"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: help:account.journal,centralisation:0
|
||||
msgid "Check this box if you want that each entry doesn't create a counterpart but share the same counterpart for each entry of this journal."
|
||||
#: model:ir.actions.act_window,name:account.action_move_line_form_encode_by_move
|
||||
#: model:ir.ui.menu,name:account.menu_encode_entries_by_move
|
||||
msgid "Entries Encoding by Move"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
@@ -3961,9 +3877,8 @@ msgid "Reconcile entries"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.open_budget_post_form
|
||||
#: model:ir.ui.menu,name:account.menu_budget_post_form
|
||||
msgid "Master Budgets"
|
||||
#: xsl:account.transfer:0
|
||||
msgid "Change"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
@@ -4015,6 +3930,11 @@ msgstr ""
|
||||
msgid "Draft statements"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: wizard_field:populate_statement_from_inv,init,date:0
|
||||
msgid "Date payment"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree_month
|
||||
#: model:ir.ui.menu,name:account.report_account_analytic_journal_print_month
|
||||
@@ -4055,10 +3975,13 @@ msgid "Account Balance"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: rml:account.analytic.account.analytic.check:0
|
||||
#: model:ir.actions.report.xml,name:account.account_analytic_account_analytic_check
|
||||
#: model:ir.actions.wizard,name:account.account_analytic_account_analytic_check_report
|
||||
msgid "Analytic Check"
|
||||
#: wizard_field:account.chart,init,target_move:0
|
||||
#: wizard_field:account.aged.trial.balance,init,state:0
|
||||
#: wizard_field:account.account.balance.report,init,state:0
|
||||
#: wizard_field:account.general.ledger.report,init,state:0
|
||||
#: wizard_field:account.partner.balance.report,init,state:0
|
||||
#: wizard_field:account.third_party_ledger.report,init,state:0
|
||||
msgid "Target Moves"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
@@ -4071,11 +3994,6 @@ msgstr ""
|
||||
msgid "No. of Digits for Account Code"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.report.xml,name:account.account_budget
|
||||
msgid "Print Budget"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#, python-format
|
||||
#: code:addons/account/wizard/wizard_open_closed_fiscalyear.py:0
|
||||
@@ -4098,8 +4016,8 @@ msgid "Indicate if the amount of tax must be included in the base amount for the
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.wizard,name:account.wizard_budget_spread
|
||||
msgid "Spread amount"
|
||||
#: model:ir.model,name:account.model_account_move_reconcile
|
||||
msgid "Account Reconciliation"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
@@ -4177,6 +4095,13 @@ msgstr ""
|
||||
msgid "All Months"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: rml:account.analytic.account.analytic.check:0
|
||||
#: model:ir.actions.report.xml,name:account.account_analytic_account_analytic_check
|
||||
#: model:ir.actions.wizard,name:account.account_analytic_account_analytic_check_report
|
||||
msgid "Analytic Check"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: field:account.invoice,invoice_line:0
|
||||
msgid "Invoice Lines"
|
||||
@@ -4313,8 +4238,8 @@ msgid "New Customer Refund"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: wizard_button:account.invoice.pay,init,reconcile:0
|
||||
msgid "Partial Payment"
|
||||
#: model:ir.actions.wizard,name:account.wizard_populate_statement_from_inv
|
||||
msgid "Import invoices"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
@@ -4342,6 +4267,8 @@ msgstr ""
|
||||
#: model:ir.actions.act_window,name:account.action_invoice_tree
|
||||
#: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
|
||||
#: model:ir.actions.report.xml,name:account.account_invoices
|
||||
#: wizard_field:populate_statement_from_inv,customer,lines:0
|
||||
#: wizard_field:populate_statement_from_inv,supplier,lines:0
|
||||
#: model:ir.ui.menu,name:account.menu_finance_invoice
|
||||
#: view:account.tax.template:0
|
||||
#: view:account.invoice:0
|
||||
@@ -4481,12 +4408,6 @@ msgstr ""
|
||||
msgid "Normal"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: rml:account.general.ledger:0
|
||||
#: model:ir.actions.wizard,name:account.wizard_general_ledger_report
|
||||
msgid "General ledger"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: rml:account.third_party_ledger:0
|
||||
msgid "J. code"
|
||||
@@ -4543,12 +4464,6 @@ msgstr ""
|
||||
msgid "End of Month"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_subscription_form
|
||||
#: model:ir.ui.menu,name:account.menu_action_subscription_form
|
||||
msgid "Subscription Entries"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: selection:account.tax,tax_group:0
|
||||
#: selection:account.tax.template,tax_group:0
|
||||
@@ -4582,7 +4497,6 @@ msgstr ""
|
||||
#: wizard_field:account.analytic.account.journal.report,init,date2:0
|
||||
#: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,date2:0
|
||||
#: wizard_field:account.automatic.reconcile,init,date2:0
|
||||
#: wizard_field:account.budget.report,init,date2:0
|
||||
#: wizard_field:account.partner.balance.report,init,date2:0
|
||||
#: wizard_field:account.third_party_ledger.report,init,date2:0
|
||||
#: field:account.period,date_stop:0
|
||||
@@ -4697,9 +4611,8 @@ msgid "List of Accounts"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.report.xml,name:account.account_analytic_account_quantity_cost_ledger
|
||||
#: model:ir.actions.wizard,name:account.account_analytic_account_quantity_cost_ledger_report
|
||||
msgid "Cost Ledger (Only quantities)"
|
||||
#: wizard_field:account.invoice.pay,init,date:0
|
||||
msgid "Payment date"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
@@ -4725,7 +4638,6 @@ msgstr ""
|
||||
#: rml:account.analytic.account.cost_ledger:0
|
||||
#: rml:account.analytic.account.inverted.balance:0
|
||||
#: rml:account.analytic.account.quantity_cost_ledger:0
|
||||
#: rml:account.budget:0
|
||||
#: rml:account.central.journal:0
|
||||
#: rml:account.general.journal:0
|
||||
#: rml:account.general.ledger:0
|
||||
@@ -4767,11 +4679,6 @@ msgstr ""
|
||||
msgid "This account will be used, instead of the default one, as the receivable account for the current partner"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: rml:account.budget:0
|
||||
msgid "%"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: rml:account.invoice:0
|
||||
#: rml:account.overdue:0
|
||||
@@ -4863,13 +4770,9 @@ msgid "Account Model"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: wizard_field:account.chart,init,target_move:0
|
||||
#: wizard_field:account.aged.trial.balance,init,state:0
|
||||
#: wizard_field:account.account.balance.report,init,state:0
|
||||
#: wizard_field:account.general.ledger.report,init,state:0
|
||||
#: wizard_field:account.partner.balance.report,init,state:0
|
||||
#: wizard_field:account.third_party_ledger.report,init,state:0
|
||||
msgid "Target Moves"
|
||||
#: rml:account.general.ledger:0
|
||||
#: model:ir.actions.wizard,name:account.wizard_general_ledger_report
|
||||
msgid "General ledger"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
@@ -4917,6 +4820,7 @@ msgid "Models Definition"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_cash_moves
|
||||
#: selection:account.analytic.journal,type:0
|
||||
#: selection:account.journal,type:0
|
||||
msgid "Cash"
|
||||
@@ -4928,7 +4832,6 @@ msgid "Maturity"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: wizard_field:account.budget.spread,init,fiscalyear:0
|
||||
#: model:ir.model,name:account.model_account_fiscalyear
|
||||
#: field:account.fiscalyear,name:0
|
||||
#: field:account.period,fiscalyear_id:0
|
||||
@@ -5006,11 +4909,6 @@ msgstr ""
|
||||
msgid "Amount Currency"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: field:account.budget.post,dotation_ids:0
|
||||
msgid "Expenses"
|
||||
msgstr ""
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_bank_statement_reconcile
|
||||
msgid "Statement reconcile"
|
||||
|
||||
+171
-273
File diff suppressed because it is too large
Load Diff
+291
-393
File diff suppressed because it is too large
Load Diff
+374
-476
File diff suppressed because it is too large
Load Diff
+289
-391
File diff suppressed because it is too large
Load Diff
+650
-752
File diff suppressed because it is too large
Load Diff
+173
-275
File diff suppressed because it is too large
Load Diff
+371
-473
File diff suppressed because it is too large
Load Diff
+289
-391
File diff suppressed because it is too large
Load Diff
+180
-282
File diff suppressed because it is too large
Load Diff
+286
-388
File diff suppressed because it is too large
Load Diff
+179
-281
File diff suppressed because it is too large
Load Diff
+192
-294
File diff suppressed because it is too large
Load Diff
+183
-285
File diff suppressed because it is too large
Load Diff
+513
-615
File diff suppressed because it is too large
Load Diff
+185
-287
File diff suppressed because it is too large
Load Diff
@@ -98,6 +98,35 @@ class account_invoice(osv.osv):
|
||||
def _get_reference_type(self, cursor, user, context=None):
|
||||
return [('none', 'Free Reference')]
|
||||
|
||||
def _amount_residual(self, cr, uid, ids, name, args, context={}):
|
||||
res = {}
|
||||
data_inv = self.browse(cr, uid, ids)
|
||||
for inv in data_inv:
|
||||
paid_amt = 0.0
|
||||
to_pay = inv.amount_total
|
||||
for lines in inv.move_lines:
|
||||
paid_amt = paid_amt + lines.credit
|
||||
res[inv.id] = to_pay - paid_amt
|
||||
return res
|
||||
|
||||
def _get_lines(self, cr, uid, ids, name, arg, context=None):
|
||||
res = {}
|
||||
for id in ids:
|
||||
move_lines = self.move_line_id_payment_get(cr,uid,[id])
|
||||
if not move_lines:
|
||||
res[id] = []
|
||||
continue
|
||||
data_lines = self.pool.get('account.move.line').browse(cr,uid,move_lines)
|
||||
for line in data_lines:
|
||||
ids_line = []
|
||||
if line.reconcile_id:
|
||||
ids_line = line.reconcile_id.line_id
|
||||
elif line.reconcile_partial_id:
|
||||
ids_line = line.reconcile_partial_id.line_partial_ids
|
||||
l = map(lambda x: x.id, ids_line)
|
||||
res[id]=[x for x in l if x <> line.id]
|
||||
return res
|
||||
|
||||
_name = "account.invoice"
|
||||
_description = 'Invoice'
|
||||
_order = "number"
|
||||
@@ -151,6 +180,9 @@ class account_invoice(osv.osv):
|
||||
'reconciled': fields.function(_reconciled, method=True, string='Paid/Reconciled', type='boolean'),
|
||||
'partner_bank': fields.many2one('res.partner.bank', 'Bank Account',
|
||||
help='The bank account to pay to or to be paid from'),
|
||||
'move_lines':fields.function(_get_lines , method=True,type='many2many' , relation='account.move.line',string='Move Lines'),
|
||||
'residual': fields.function(_amount_residual, method=True, digits=(16,2),string='Residual', store=True),
|
||||
|
||||
}
|
||||
_defaults = {
|
||||
'type': _get_type,
|
||||
@@ -804,11 +836,10 @@ class account_invoice_line(osv.osv):
|
||||
context.update({'lang': lang})
|
||||
res = self.pool.get('product.product').browse(cr, uid, product, context=context)
|
||||
taxep=None
|
||||
if partner_id:
|
||||
lang=self.pool.get('res.partner').read(cr, uid, [partner_id])[0]['lang']
|
||||
lang=self.pool.get('res.partner').read(cr, uid, [partner_id])[0]['lang']
|
||||
tax_obj = self.pool.get('account.tax')
|
||||
if type in ('out_invoice', 'out_refund'):
|
||||
taxep = self.pool.get('res.partner').browse(cr, uid, partner_id).property_account_supplier_tax
|
||||
taxep = self.pool.get('res.partner').browse(cr, uid, partner_id).property_account_tax
|
||||
if not taxep or not taxep.id:
|
||||
tax_id = map(lambda x: x.id, res.taxes_id)
|
||||
else:
|
||||
@@ -817,7 +848,7 @@ class account_invoice_line(osv.osv):
|
||||
if not t.tax_group==taxep.tax_group:
|
||||
tax_id.append(t.id)
|
||||
else:
|
||||
taxep = self.pool.get('res.partner').browse(cr, uid, partner_id).property_account_tax
|
||||
taxep = self.pool.get('res.partner').browse(cr, uid, partner_id).property_account_supplier_tax
|
||||
if not taxep or not taxep.id:
|
||||
tax_id = map(lambda x: x.id, res.supplier_taxes_id)
|
||||
else:
|
||||
|
||||
@@ -9,8 +9,8 @@
|
||||
<field name="arch" type="xml">
|
||||
<notebook position="inside">
|
||||
<page string="Accounting">
|
||||
<separator string="Sales" colspan="2"/>
|
||||
<separator string="Purchases" colspan="2"/>
|
||||
<separator string="Sales Properties" colspan="2"/>
|
||||
<separator string="Purchases Properties" colspan="2"/>
|
||||
<field name="property_account_income"/>
|
||||
<field name="property_account_expense"/>
|
||||
|
||||
@@ -31,8 +31,8 @@
|
||||
<field name="arch" type="xml">
|
||||
<notebook position="inside">
|
||||
<page string="Accounting">
|
||||
<separator string="Sales" colspan="2"/>
|
||||
<separator string="Purchases" colspan="2"/>
|
||||
<separator string="Sales Properties" colspan="2"/>
|
||||
<separator string="Purchases Properties" colspan="2"/>
|
||||
<field name="property_account_income"/>
|
||||
<field name="property_account_expense"/>
|
||||
<field name="supplier_taxes_id"/>
|
||||
|
||||
@@ -245,51 +245,5 @@ class account_journal(osv.osv):
|
||||
}
|
||||
account_journal()
|
||||
|
||||
|
||||
# ---------------------------------------------------------
|
||||
# Budgets
|
||||
# ---------------------------------------------------------
|
||||
|
||||
#class account_analytic_budget_post(osv.osv):
|
||||
# _name = 'account.analytic.budget.post'
|
||||
# _description = 'Budget item'
|
||||
# _columns = {
|
||||
# 'code': fields.char('Code', size=64, required=True),
|
||||
# 'name': fields.char('Name', size=256, required=True),
|
||||
# 'sens': fields.selection( [('charge','Charge'), ('produit','Product')], 'Direction', required=True),
|
||||
# 'dotation_ids': fields.one2many('account.analytic.budget.post.dotation', 'post_id', 'Expenses'),
|
||||
# 'account_ids': fields.many2many('account.analytic.account', 'account_analytic_budget_rel', 'budget_id', 'account_id', 'Accounts'),
|
||||
# }
|
||||
# _defaults = {
|
||||
# 'sens': lambda *a: 'produit',
|
||||
# }
|
||||
#
|
||||
# def spread(self, cr, uid, ids, fiscalyear_id=False, quantity=0.0, amount=0.0):
|
||||
#
|
||||
# dobj = self.pool.get('account.analytic.budget.post.dotation')
|
||||
# for o in self.browse(cr, uid, ids):
|
||||
# # delete dotations for this post
|
||||
# dobj.unlink(cr, uid, dobj.search(cr, uid, [('post_id','=',o.id)]))
|
||||
#
|
||||
# # create one dotation per period in the fiscal year, and spread the total amount/quantity over those dotations
|
||||
# fy = self.pool.get('account.fiscalyear').browse(cr, uid, [fiscalyear_id])[0]
|
||||
# num = len(fy.period_ids)
|
||||
# for p in fy.period_ids:
|
||||
# dobj.create(cr, uid, {'post_id': o.id, 'period_id': p.id, 'quantity': quantity/num, 'amount': amount/num})
|
||||
# return True
|
||||
#account_analytic_budget_post()
|
||||
#
|
||||
#class account_analytic_budget_post_dotation(osv.osv):
|
||||
# _name = 'account.analytic.budget.post.dotation'
|
||||
# _description = "Budget item endowment"
|
||||
# _columns = {
|
||||
# 'name': fields.char('Name', size=64),
|
||||
# 'post_id': fields.many2one('account.analytic.budget.post', 'Item', select=True),
|
||||
# 'period_id': fields.many2one('account.period', 'Period'),
|
||||
# 'quantity': fields.float('Quantity', digits=(16,2)),
|
||||
# 'amount': fields.float('Amount', digits=(16,2)),
|
||||
# }
|
||||
#account_analytic_budget_post_dotation()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
|
||||
@@ -2,43 +2,33 @@
|
||||
<openerp>
|
||||
<data>
|
||||
<report auto="False" id="analytic_journal_print" menu="False" model="account.analytic.journal" name="account.analytic.account.journal" rml="account/project/report/analytic_journal.rml" string="Analytic Journal"/>
|
||||
|
||||
|
||||
<wizard id="account_analytic_account_journal_report" keyword="client_print_multi" model="account.analytic.journal" name="account.analytic.account.journal.report" string="Analytic Journal"/>
|
||||
|
||||
|
||||
|
||||
|
||||
<report auto="False" id="account_analytic_account_balance" menu="False" model="account.analytic.account" name="account.analytic.account.balance" rml="account/project/report/analytic_balance.rml" string="Analytic Balance"/>
|
||||
|
||||
|
||||
<wizard id="account_analytic_account_balance_report" keyword="client_print_multi" model="account.analytic.account" name="account.analytic.account.balance.report" string="Analytic Balance"/>
|
||||
|
||||
|
||||
|
||||
|
||||
<report auto="False" id="account_analytic_account_inverted_balance" menu="False" model="account.analytic.account" name="account.analytic.account.inverted.balance" rml="account/project/report/inverted_analytic_balance.rml" string="Inverted Analytic Balance"/>
|
||||
|
||||
|
||||
<wizard id="account_analytic_account_inverted_balance_report" keyword="client_print_multi" model="account.analytic.account" name="account.analytic.account.inverted.balance.report" string="Inverted Analytic Balance"/>
|
||||
|
||||
|
||||
|
||||
|
||||
<report auto="False" id="account_analytic_account_cost_ledger" menu="False" model="account.analytic.account" name="account.analytic.account.cost_ledger" rml="account/project/report/cost_ledger.rml" string="Cost Ledger"/>
|
||||
|
||||
|
||||
<wizard id="account_analytic_account_cost_ledger_report" keyword="client_print_multi" model="account.analytic.account" name="account.analytic.account.cost_ledger.report" string="Cost Ledger"/>
|
||||
|
||||
|
||||
|
||||
|
||||
<report auto="False" id="account_analytic_account_quantity_cost_ledger" menu="False" model="account.analytic.account" name="account.analytic.account.quantity_cost_ledger" rml="account/project/report/quantity_cost_ledger.rml" string="Cost Ledger (Only quantities)"/>
|
||||
|
||||
|
||||
<wizard id="account_analytic_account_quantity_cost_ledger_report" keyword="client_print_multi" model="account.analytic.account" name="account.analytic.account.quantity_cost_ledger.report" string="Cost Ledger (Only quantities)"/>
|
||||
|
||||
|
||||
|
||||
|
||||
<report auto="False" id="account_analytic_account_analytic_check" menu="False" model="account.account" name="account.analytic.account.analytic.check" rml="account/project/report/analytic_check.rml" string="Analytic Check"/>
|
||||
|
||||
|
||||
<wizard id="account_analytic_account_analytic_check_report" keyword="client_print_multi" model="account.account" name="account.analytic.account.analytic.check.report" string="Analytic Check"/>
|
||||
|
||||
<!--Budget -->
|
||||
<!--<report
|
||||
id="account_analytic_budget_print"
|
||||
string="Print Budget"
|
||||
model="account.analytic.budget.post"
|
||||
name="account.analytic.budget.print"
|
||||
rml="account/project/report/account_analytic_budget_report.rml"
|
||||
auto="False"
|
||||
menu="False"/>-->
|
||||
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
||||
@@ -28,7 +28,6 @@
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
import budget_report
|
||||
import central_journal
|
||||
import general_journal
|
||||
import account_journal
|
||||
|
||||
@@ -1,67 +1,65 @@
|
||||
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
|
||||
access_account_payment_term,account.payment.term,model_account_payment_term,account.group_account_user,1,0,0,0
|
||||
access_account_payment_term_line,account.payment.term.line,model_account_payment_term_line,account.group_account_user,1,0,0,0
|
||||
access_account_account_type,account.account.type,model_account_account_type,account.group_account_user,1,0,0,0
|
||||
access_account_tax,account.tax,model_account_tax,account.group_account_user,1,0,0,0
|
||||
access_account_account,account.account,model_account_account,account.group_account_user,1,0,0,0
|
||||
access_account_journal_view,account.journal.view,model_account_journal_view,account.group_account_user,1,0,0,0
|
||||
access_account_journal_column,account.journal.column,model_account_journal_column,account.group_account_user,1,0,0,0
|
||||
access_account_journal,account.journal,model_account_journal,account.group_account_user,1,0,0,0
|
||||
access_account_period,account.period,model_account_period,account.group_account_user,1,0,0,0
|
||||
access_account_journal_period,account.journal.period,model_account_journal_period,account.group_account_user,1,1,1,1
|
||||
access_account_move,account.move,model_account_move,account.group_account_user,1,1,1,1
|
||||
access_account_move_reconcile,account.move.reconcile,model_account_move_reconcile,account.group_account_user,1,1,1,1
|
||||
access_account_tax_code,account.tax.code,model_account_tax_code,account.group_account_user,1,0,0,0
|
||||
access_account_tax,account.tax,model_account_tax,account.group_account_user,1,0,0,0
|
||||
access_account_budget_post,account.budget.post,model_account_budget_post,account.group_account_manager,1,1,1,1
|
||||
access_account_budget_post_dotation,account.budget.post.dotation,model_account_budget_post_dotation,account.group_account_manager,1,1,1,1
|
||||
access_account_model,account.model,model_account_model,account.group_account_user,1,1,1,1
|
||||
access_account_model_line,account.model.line,model_account_model_line,account.group_account_user,1,1,1,1
|
||||
access_account_subscription,account.subscription,model_account_subscription,account.group_account_user,1,1,1,1
|
||||
access_account_subscription_line,account.subscription.line,model_account_subscription_line,account.group_account_user,1,1,1,1
|
||||
access_account_config_fiscalyear,account.config.fiscalyear,model_account_config_fiscalyear,account.group_account_manager,1,1,1,1
|
||||
access_account_tax_template,account.tax.template,model_account_tax_template,account.group_account_manager,1,1,1,1
|
||||
access_account_account_template,account.account.template,model_account_account_template,account.group_account_manager,1,1,1,1
|
||||
access_account_tax_code_template,account.tax.code.template,model_account_tax_code_template,account.group_account_manager,1,1,1,1
|
||||
access_account_chart_template,account.chart.template,model_account_chart_template,account.group_account_manager,1,1,1,1
|
||||
access_account_tax_template,account.tax.template,model_account_tax_template,account.group_account_manager,1,1,1,1
|
||||
access_wizard_multi_charts_accounts,wizard.multi.charts.accounts,model_wizard_multi_charts_accounts,account.group_account_manager,1,1,1,1
|
||||
access_account_bank_accounts_wizard,account.bank.accounts.wizard,model_account_bank_accounts_wizard,account.group_account_manager,1,1,1,1
|
||||
access_account_move_line,account.move.line,model_account_move_line,account.group_account_user,1,1,1,1
|
||||
access_account_bank_statement,account.bank.statement,model_account_bank_statement,account.group_account_user,1,1,1,1
|
||||
access_account_bank_statement_reconcile,account.bank.statement.reconcile,model_account_bank_statement_reconcile,account.group_account_user,1,1,1,1
|
||||
access_account_bank_statement_reconcile_line,account.bank.statement.reconcile.line,model_account_bank_statement_reconcile_line,account.group_account_user,1,1,1,1
|
||||
access_account_bank_statement_line,account.bank.statement.line,model_account_bank_statement_line,account.group_account_user,1,1,1,1
|
||||
access_account_analytic_line,account.analytic.line,model_account_analytic_line,account.group_account_user,1,1,1,1
|
||||
access_report_hr_timesheet_invoice_journal,report.hr.timesheet.invoice.journal,model_report_hr_timesheet_invoice_journal,account.group_account_manager,1,0,0,0
|
||||
access_account_invoice,account.invoice,model_account_invoice,account.group_account_user,1,0,0,0
|
||||
access_account_invoice_line,account.invoice.line,model_account_invoice_line,account.group_account_user,1,0,0,0
|
||||
access_account_invoice_tax,account.invoice.tax,model_account_invoice_tax,account.group_account_user,1,0,0,0
|
||||
access_account_analytic_account,account.analytic.account,model_account_analytic_account,account.group_account_user,1,0,0,0
|
||||
access_account_analytic_journal,account.analytic.journal,model_account_analytic_journal,account.group_account_user,1,0,0,0
|
||||
access_account_invoice_uinvoice,account.invoice,model_account_invoice,account.group_account_user,1,1,1,1
|
||||
access_account_invoice_line_uinvoice,account.invoice.line,model_account_invoice_line,account.group_account_user,1,1,1,1
|
||||
access_account_invoice_tax_uinvoice,account.invoice.tax,model_account_invoice_tax,account.group_account_user,1,1,1,1
|
||||
access_account_analytic_line_uinvoice,account.analytic.line,model_account_analytic_line,account.group_account_user,1,1,1,1
|
||||
access_account_move_uinvoice,account.move,model_account_move,account.group_account_user,1,1,1,1
|
||||
access_account_move_reconcile_uinvoice,account.move.reconcile,model_account_move_reconcile,account.group_account_user,1,1,1,1
|
||||
access_account_journal_period_uinvoice,account.journal.period,model_account_journal_period,account.group_account_user,1,1,1,1
|
||||
access_account_payment_term_manager,account.payment.term,model_account_payment_term,account.group_account_manager,1,1,1,1
|
||||
access_account_payment_term_line_manager,account.payment.term.line,model_account_payment_term_line,account.group_account_manager,1,1,1,1
|
||||
access_account_account_type_manager,account.account.type,model_account_account_type,account.group_account_manager,1,1,1,1
|
||||
access_account_tax_manager,account.tax,model_account_tax,account.group_account_manager,1,1,1,1
|
||||
access_account_account_manager,account.account,model_account_account,account.group_account_manager,1,1,1,1
|
||||
access_account_journal_view_manager,account.journal.view,model_account_journal_view,account.group_account_manager,1,1,1,1
|
||||
access_account_journal_column_manager,account.journal.column,model_account_journal_column,account.group_account_manager,1,1,1,1
|
||||
access_account_journal_manager,account.journal,model_account_journal,account.group_account_manager,1,1,1,1
|
||||
access_account_period_manager,account.period,model_account_period,account.group_account_manager,1,1,1,1
|
||||
access_account_tax_code_manager,account.tax.code,model_account_tax_code,account.group_account_manager,1,1,1,1
|
||||
access_account_tax_manager,account.tax,model_account_tax,account.group_account_manager,1,1,1,1
|
||||
access_account_invoice_manager,account.invoice,model_account_invoice,account.group_account_manager,1,1,1,1
|
||||
access_account_invoice_line_manager,account.invoice.line,model_account_invoice_line,account.group_account_manager,1,1,1,1
|
||||
access_account_invoice_tax_manager,account.invoice.tax,model_account_invoice_tax,account.group_account_manager,1,1,1,1
|
||||
access_account_analytic_account_manager,account.analytic.account,model_account_analytic_account,account.group_account_manager,1,1,1,1
|
||||
access_account_analytic_journal_manager,account.analytic.journal,model_account_analytic_journal,account.group_account_manager,1,1,1,1
|
||||
access_account_fiscalyear,account.fiscalyear,model_account_fiscalyear,account.group_account_manager,1,1,1,1
|
||||
access_account_fiscalyear_user,account.fiscalyear.user,model_account_fiscalyear,account.group_account_user,1,0,0,0
|
||||
access_account_fiscalyear_invoice,account.fiscalyear.invoice,model_account_fiscalyear,account.group_account_invoice,1,0,0,0
|
||||
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
|
||||
"access_account_payment_term","account.payment.term","model_account_payment_term","account.group_account_user",1,0,0,0
|
||||
"access_account_payment_term_line","account.payment.term.line","model_account_payment_term_line","account.group_account_user",1,0,0,0
|
||||
"access_account_account_type","account.account.type","model_account_account_type","account.group_account_user",1,0,0,0
|
||||
"access_account_tax","account.tax","model_account_tax","account.group_account_user",1,0,0,0
|
||||
"access_account_account","account.account","model_account_account","account.group_account_user",1,0,0,0
|
||||
"access_account_journal_view","account.journal.view","model_account_journal_view","account.group_account_user",1,0,0,0
|
||||
"access_account_journal_column","account.journal.column","model_account_journal_column","account.group_account_user",1,0,0,0
|
||||
"access_account_journal","account.journal","model_account_journal","account.group_account_user",1,0,0,0
|
||||
"access_account_period","account.period","model_account_period","account.group_account_user",1,0,0,0
|
||||
"access_account_journal_period","account.journal.period","model_account_journal_period","account.group_account_user",1,1,1,1
|
||||
"access_account_move","account.move","model_account_move","account.group_account_user",1,1,1,1
|
||||
"access_account_move_reconcile","account.move.reconcile","model_account_move_reconcile","account.group_account_user",1,1,1,1
|
||||
"access_account_tax_code","account.tax.code","model_account_tax_code","account.group_account_user",1,0,0,0
|
||||
"access_account_tax","account.tax","model_account_tax","account.group_account_user",1,0,0,0
|
||||
"access_account_model","account.model","model_account_model","account.group_account_user",1,1,1,1
|
||||
"access_account_model_line","account.model.line","model_account_model_line","account.group_account_user",1,1,1,1
|
||||
"access_account_subscription","account.subscription","model_account_subscription","account.group_account_user",1,1,1,1
|
||||
"access_account_subscription_line","account.subscription.line","model_account_subscription_line","account.group_account_user",1,1,1,1
|
||||
"access_account_config_fiscalyear","account.config.fiscalyear","model_account_config_fiscalyear","account.group_account_manager",1,1,1,1
|
||||
"access_account_tax_template","account.tax.template","model_account_tax_template","account.group_account_manager",1,1,1,1
|
||||
"access_account_account_template","account.account.template","model_account_account_template","account.group_account_manager",1,1,1,1
|
||||
"access_account_tax_code_template","account.tax.code.template","model_account_tax_code_template","account.group_account_manager",1,1,1,1
|
||||
"access_account_chart_template","account.chart.template","model_account_chart_template","account.group_account_manager",1,1,1,1
|
||||
"access_account_tax_template","account.tax.template","model_account_tax_template","account.group_account_manager",1,1,1,1
|
||||
"access_wizard_multi_charts_accounts","wizard.multi.charts.accounts","model_wizard_multi_charts_accounts","account.group_account_manager",1,1,1,1
|
||||
"access_account_bank_accounts_wizard","account.bank.accounts.wizard","model_account_bank_accounts_wizard","account.group_account_manager",1,1,1,1
|
||||
"access_account_move_line","account.move.line","model_account_move_line","account.group_account_user",1,1,1,1
|
||||
"access_account_bank_statement","account.bank.statement","model_account_bank_statement","account.group_account_user",1,1,1,1
|
||||
"access_account_bank_statement_reconcile","account.bank.statement.reconcile","model_account_bank_statement_reconcile","account.group_account_user",1,1,1,1
|
||||
"access_account_bank_statement_reconcile_line","account.bank.statement.reconcile.line","model_account_bank_statement_reconcile_line","account.group_account_user",1,1,1,1
|
||||
"access_account_bank_statement_line","account.bank.statement.line","model_account_bank_statement_line","account.group_account_user",1,1,1,1
|
||||
"access_account_analytic_line","account.analytic.line","model_account_analytic_line","account.group_account_user",1,1,1,1
|
||||
"access_report_hr_timesheet_invoice_journal","report.hr.timesheet.invoice.journal","model_report_hr_timesheet_invoice_journal","account.group_account_manager",1,0,0,0
|
||||
"access_account_invoice","account.invoice","model_account_invoice","account.group_account_user",1,0,0,0
|
||||
"access_account_invoice_line","account.invoice.line","model_account_invoice_line","account.group_account_user",1,0,0,0
|
||||
"access_account_invoice_tax","account.invoice.tax","model_account_invoice_tax","account.group_account_user",1,0,0,0
|
||||
"access_account_analytic_account","account.analytic.account","model_account_analytic_account","account.group_account_user",1,0,0,0
|
||||
"access_account_analytic_journal","account.analytic.journal","model_account_analytic_journal","account.group_account_user",1,0,0,0
|
||||
"access_account_invoice_uinvoice","account.invoice","model_account_invoice","account.group_account_user",1,1,1,1
|
||||
"access_account_invoice_line_uinvoice","account.invoice.line","model_account_invoice_line","account.group_account_user",1,1,1,1
|
||||
"access_account_invoice_tax_uinvoice","account.invoice.tax","model_account_invoice_tax","account.group_account_user",1,1,1,1
|
||||
"access_account_analytic_line_uinvoice","account.analytic.line","model_account_analytic_line","account.group_account_user",1,1,1,1
|
||||
"access_account_move_uinvoice","account.move","model_account_move","account.group_account_user",1,1,1,1
|
||||
"access_account_move_reconcile_uinvoice","account.move.reconcile","model_account_move_reconcile","account.group_account_user",1,1,1,1
|
||||
"access_account_journal_period_uinvoice","account.journal.period","model_account_journal_period","account.group_account_user",1,1,1,1
|
||||
"access_account_payment_term_manager","account.payment.term","model_account_payment_term","account.group_account_manager",1,1,1,1
|
||||
"access_account_payment_term_line_manager","account.payment.term.line","model_account_payment_term_line","account.group_account_manager",1,1,1,1
|
||||
"access_account_account_type_manager","account.account.type","model_account_account_type","account.group_account_manager",1,1,1,1
|
||||
"access_account_tax_manager","account.tax","model_account_tax","account.group_account_manager",1,1,1,1
|
||||
"access_account_account_manager","account.account","model_account_account","account.group_account_manager",1,1,1,1
|
||||
"access_account_journal_view_manager","account.journal.view","model_account_journal_view","account.group_account_manager",1,1,1,1
|
||||
"access_account_journal_column_manager","account.journal.column","model_account_journal_column","account.group_account_manager",1,1,1,1
|
||||
"access_account_journal_manager","account.journal","model_account_journal","account.group_account_manager",1,1,1,1
|
||||
"access_account_period_manager","account.period","model_account_period","account.group_account_manager",1,1,1,1
|
||||
"access_account_tax_code_manager","account.tax.code","model_account_tax_code","account.group_account_manager",1,1,1,1
|
||||
"access_account_tax_manager","account.tax","model_account_tax","account.group_account_manager",1,1,1,1
|
||||
"access_account_invoice_manager","account.invoice","model_account_invoice","account.group_account_manager",1,1,1,1
|
||||
"access_account_invoice_line_manager","account.invoice.line","model_account_invoice_line","account.group_account_manager",1,1,1,1
|
||||
"access_account_invoice_tax_manager","account.invoice.tax","model_account_invoice_tax","account.group_account_manager",1,1,1,1
|
||||
"access_account_analytic_account_manager","account.analytic.account","model_account_analytic_account","account.group_account_manager",1,1,1,1
|
||||
"access_account_analytic_journal_manager","account.analytic.journal","model_account_analytic_journal","account.group_account_manager",1,1,1,1
|
||||
"access_account_fiscalyear","account.fiscalyear","model_account_fiscalyear","account.group_account_manager",1,1,1,1
|
||||
"access_account_fiscalyear_user","account.fiscalyear.user","model_account_fiscalyear","account.group_account_user",1,0,0,0
|
||||
"access_account_fiscalyear_invoice","account.fiscalyear.invoice","model_account_fiscalyear","account.group_account_invoice",1,0,0,0
|
||||
|
||||
|
@@ -39,11 +39,9 @@ import wizard_pay_invoice
|
||||
import wizard_journal
|
||||
import wizard_journal_select
|
||||
import wizard_bank_reconcile
|
||||
import wizard_budget_spread
|
||||
import wizard_subscription_generate
|
||||
|
||||
import wizard_aged_trial_balance
|
||||
import wizard_budget_report
|
||||
import wizard_general_ledger_report
|
||||
import wizard_third_party_ledger
|
||||
import wizard_account_balance_report
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:47:16+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:47:16+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:45:09+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:45:09+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:47:51+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:47:51+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:40:34+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:40:34+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:48:25+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:48:25+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:38:50+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:38:50+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
@@ -122,7 +122,7 @@ msgstr ""
|
||||
#. module: account_analytic_analysis
|
||||
#: model:ir.ui.menu,name:account_analytic_analysis.next_id_71
|
||||
msgid "Analytic Accounts"
|
||||
msgstr ""
|
||||
msgstr "Kostenstellenkonten"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#, python-format
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:49:00+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:49:00+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:44:00+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:44:00+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
@@ -122,7 +122,7 @@ msgstr ""
|
||||
#. module: account_analytic_analysis
|
||||
#: model:ir.ui.menu,name:account_analytic_analysis.next_id_71
|
||||
msgid "Analytic Accounts"
|
||||
msgstr ""
|
||||
msgstr "Contabilidad Analítica"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#, python-format
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:49:34+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:49:34+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:41:08+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:41:08+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:50:09+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:50:09+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:41:42+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:41:42+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
@@ -23,13 +23,13 @@ msgstr ""
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,remaining_ca:0
|
||||
msgid "Remaining revenue"
|
||||
msgstr ""
|
||||
msgstr "Revenus restants"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all
|
||||
#: model:ir.ui.menu,name:account_analytic_analysis.next_id_72
|
||||
msgid "All Analytic Accounts"
|
||||
msgstr ""
|
||||
msgstr "Tous les comptes analytiques"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: constraint:ir.ui.view:0
|
||||
@@ -39,7 +39,7 @@ msgstr ""
|
||||
#. module: account_analytic_analysis
|
||||
#: model:ir.ui.menu,name:account_analytic_analysis.menu_main
|
||||
msgid "Project Management"
|
||||
msgstr ""
|
||||
msgstr "Gestion de projet"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#, python-format
|
||||
@@ -50,79 +50,79 @@ msgstr ""
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,last_worked_date:0
|
||||
msgid "Last worked date"
|
||||
msgstr ""
|
||||
msgstr "Date dernière tâche"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
|
||||
msgid "Hours summary by user"
|
||||
msgstr ""
|
||||
msgstr "Résumé des heures par utilisateur"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_open
|
||||
#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_open
|
||||
msgid "Open Analytic Accounts"
|
||||
msgstr ""
|
||||
msgstr "Ouvrir les comptes analytiques"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,hours_quantity:0
|
||||
msgid "Hours tot"
|
||||
msgstr ""
|
||||
msgstr "Total des heures"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,last_worked_invoiced_date:0
|
||||
msgid "Last invoiced worked date"
|
||||
msgstr ""
|
||||
msgstr "Date dernière tâche facturée"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_open
|
||||
#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_open
|
||||
msgid "My Open Managed Accounts"
|
||||
msgstr ""
|
||||
msgstr "Mes comptes gérés ouverts"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account_analytic_analysis.summary.month,unit_amount:0
|
||||
#: field:account_analytic_analysis.summary.user,unit_amount:0
|
||||
msgid "Total Time"
|
||||
msgstr ""
|
||||
msgstr "Temps Total"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed
|
||||
#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_managed
|
||||
msgid "My managed accounts"
|
||||
msgstr ""
|
||||
msgstr "Mes comptes"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,real_margin:0
|
||||
msgid "Real margin"
|
||||
msgstr ""
|
||||
msgstr "Marge réelle"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_pending
|
||||
#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_pending
|
||||
msgid "My Pending Managed Accounts"
|
||||
msgstr ""
|
||||
msgstr "Mes comptes en attente"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_draft
|
||||
#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_draft
|
||||
msgid "Draft Analytic Accounts"
|
||||
msgstr ""
|
||||
msgstr "Compte analytique brouiilon"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,total_cost:0
|
||||
msgid "Total cost"
|
||||
msgstr ""
|
||||
msgstr "Coûts totaux"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,user_ids:0
|
||||
#: field:account_analytic_analysis.summary.user,user:0
|
||||
msgid "User"
|
||||
msgstr ""
|
||||
msgstr "Utilisateur"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: model:ir.ui.menu,name:account_analytic_analysis.next_id_71
|
||||
msgid "Analytic Accounts"
|
||||
msgstr ""
|
||||
msgstr "Comptabilité analytique"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#, python-format
|
||||
@@ -133,96 +133,96 @@ msgstr ""
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,revenue_per_hour:0
|
||||
msgid "Revenue per hours (real)"
|
||||
msgstr ""
|
||||
msgstr "Revenus par heure"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_pending
|
||||
#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_pending
|
||||
msgid "Pending Analytic Accounts"
|
||||
msgstr ""
|
||||
msgstr "Comptes analytiques en attente"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,real_margin_rate:0
|
||||
msgid "Real margin rate (%)"
|
||||
msgstr ""
|
||||
msgstr "Taux de marge réel"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,last_invoice_date:0
|
||||
msgid "Last invoice date"
|
||||
msgstr ""
|
||||
msgstr "Date dernière facture"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,ca_to_invoice:0
|
||||
msgid "Uninvoiced amount"
|
||||
msgstr ""
|
||||
msgstr "Montants non-facturés"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month
|
||||
msgid "Hours summary by month"
|
||||
msgstr ""
|
||||
msgstr "Résumé des heures par mois"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_my
|
||||
#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_my
|
||||
msgid "Uninvoiced entries of my accounts"
|
||||
msgstr ""
|
||||
msgstr "Entrées de mes comptes non-facturées"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,hours_qtt_non_invoiced:0
|
||||
msgid "Uninvoiced hours"
|
||||
msgstr ""
|
||||
msgstr "Heures non-facturées"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_overpassed
|
||||
#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_managed_overpassed
|
||||
msgid "Overpassed accounts"
|
||||
msgstr ""
|
||||
msgstr "Comptes expirés"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: view:account.analytic.account:0
|
||||
msgid "Analytic accounts"
|
||||
msgstr ""
|
||||
msgstr "Compte Analytique "
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,remaining_hours:0
|
||||
msgid "Remaining hours"
|
||||
msgstr ""
|
||||
msgstr "Heures restantes"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,ca_invoiced:0
|
||||
msgid "Invoiced amount"
|
||||
msgstr ""
|
||||
msgstr "Montants facturés"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_simplified
|
||||
#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_simplified
|
||||
msgid "Simplified View Analytic Accounts"
|
||||
msgstr ""
|
||||
msgstr "Vue simplifiée des comptes analytiques"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,ca_theorical:0
|
||||
msgid "Theorical revenue"
|
||||
msgstr ""
|
||||
msgstr "Revenus théoriques"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,month_ids:0
|
||||
#: field:account_analytic_analysis.summary.month,month:0
|
||||
msgid "Month"
|
||||
msgstr ""
|
||||
msgstr "Mois"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account_analytic_analysis.summary.month,account_id:0
|
||||
#: field:account_analytic_analysis.summary.user,account_id:0
|
||||
msgid "Analytic Account"
|
||||
msgstr ""
|
||||
msgstr "Compte Analytique "
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,hours_qtt_invoiced:0
|
||||
msgid "Invoiced hours"
|
||||
msgstr ""
|
||||
msgstr "Heures facturées"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,theorical_margin:0
|
||||
msgid "Theorical margin"
|
||||
msgstr ""
|
||||
msgstr "Marge théorique"
|
||||
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:50:44+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:50:44+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:44:35+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:44:35+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:51:17+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:51:17+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:36:31+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:36:31+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
@@ -122,7 +122,7 @@ msgstr ""
|
||||
#. module: account_analytic_analysis
|
||||
#: model:ir.ui.menu,name:account_analytic_analysis.next_id_71
|
||||
msgid "Analytic Accounts"
|
||||
msgstr ""
|
||||
msgstr "Conti Analitici"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#, python-format
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:51:52+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:51:52+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:40:00+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:40:00+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:52:27+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:52:27+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:38:15+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:38:15+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:53:02+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:53:02+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:42:17+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:42:17+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:53:38+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:53:38+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:43:25+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:43:25+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:54:13+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:54:13+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:42:52+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:42:52+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:54:47+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:54:47+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:39:25+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:39:25+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:55:22+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:55:22+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:37:41+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:37:41+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
@@ -122,7 +122,7 @@ msgstr ""
|
||||
#. module: account_analytic_analysis
|
||||
#: model:ir.ui.menu,name:account_analytic_analysis.next_id_71
|
||||
msgid "Analytic Accounts"
|
||||
msgstr ""
|
||||
msgstr "分析科目"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#, python-format
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:55:56+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:55:56+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:37:06+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:37:06+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Analytic Defaults" editable="bottom">
|
||||
<field name="sequence" string="Seq"/>
|
||||
<field name="analytic_id" select="1" required="True"/>
|
||||
<field name="analytic_id" select="1" required="1"/>
|
||||
<field name="product_id" select="2"/>
|
||||
<field name="partner_id" select="2"/>
|
||||
<field name="user_id" select="2"/>
|
||||
@@ -24,7 +24,7 @@
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Analytic Defaults">
|
||||
<field name="analytic_id" select="1" required="True"/>
|
||||
<field name="analytic_id" select="1" required="1"/>
|
||||
<field name="sequence"/>
|
||||
<separator string="Conditions" colspan="4"/>
|
||||
<field name="product_id" select="2"/>
|
||||
@@ -42,9 +42,9 @@
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
</record>
|
||||
<menuitem
|
||||
action="action_analytic_default_form"
|
||||
id="menu_analytic_defaul_form"
|
||||
<menuitem
|
||||
action="action_analytic_default_form"
|
||||
id="menu_analytic_defaul_form"
|
||||
parent="account.menu_analytic_accounting"/>
|
||||
|
||||
<act_window
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:47:16+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:47:16+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:45:09+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:45:09+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:47:51+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:47:51+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:40:34+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:40:34+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:48:25+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:48:25+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:38:50+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:38:50+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:49:00+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:49:00+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:44:00+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:44:00+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:49:35+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:49:35+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:41:08+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:41:08+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:50:09+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:50:09+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:41:42+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:41:42+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:50:44+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:50:44+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:44:35+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:44:35+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:51:18+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:51:18+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:36:31+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:36:31+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:51:52+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:51:52+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:40:00+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:40:00+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:52:27+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:52:27+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:38:15+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:38:15+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:53:02+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:53:02+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:42:17+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:42:17+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:53:38+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:53:38+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:43:25+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:43:25+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:54:13+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:54:13+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:42:52+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:42:52+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:54:47+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:54:47+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:39:25+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:39:25+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:55:22+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:55:22+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:37:41+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:37:41+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:55:56+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:55:56+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:37:06+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:37:06+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -203,12 +203,12 @@ class account_analytic_plan_instance(osv.osv):
|
||||
self.pool.get('account.invoice.line').write(cr, uid, list, {'analytics_id':temp_id}, context)
|
||||
|
||||
#and finally modify the old model to be not a model anymore
|
||||
vals['plan_id'] = False
|
||||
if not vals.has_key['name']:
|
||||
vals['plan_id'] = False
|
||||
if not vals.has_key('name'):
|
||||
vals['name'] = this.name+'*'
|
||||
if not vals.has_key['code']:
|
||||
if not vals.has_key('code'):
|
||||
vals['code'] = this.code+'*'
|
||||
return self.write(cr, uid, [this.id],vals, context)
|
||||
return self.write(cr, uid, [this.id],vals, context)
|
||||
else:
|
||||
#this plan instance isn't a model, so a simple write is fine
|
||||
return super(account_analytic_plan_instance, self).write(cr, uid, ids, vals, context)
|
||||
@@ -268,47 +268,57 @@ class account_invoice_line(osv.osv):
|
||||
account_invoice_line()
|
||||
|
||||
class account_move_line(osv.osv):
|
||||
|
||||
_inherit='account.move.line'
|
||||
_name='account.move.line'
|
||||
_columns = {
|
||||
'analytics_id':fields.many2one('account.analytic.plan.instance','Analytic Distribution'),
|
||||
}
|
||||
# def _analytic_update(self, cr, uid, ids, context):
|
||||
# for line in self.browse(cr, uid, ids, context):
|
||||
# if line.analytics_id:
|
||||
# print "line.analytics_id",line,"now",line.analytics_id
|
||||
# toremove = self.pool.get('account.analytic.line').search(cr, uid, [('move_id','=',line.id)], context=context)
|
||||
# print "toremove",toremove
|
||||
# if toremove:
|
||||
# obj_line=self.pool.get('account.analytic.line')
|
||||
# self.pool.get('account.analytic.line').unlink(cr, uid, toremove, context=context)
|
||||
# for line2 in line.analytics_id.account_ids:
|
||||
# val = (line.debit or 0.0) - (line.credit or 0.0)
|
||||
# amt=val * (line2.rate/100)
|
||||
# al_vals={
|
||||
# 'name': line.name,
|
||||
# 'date': line.date,
|
||||
# 'unit_amount':1,
|
||||
# 'product_id':12,
|
||||
# 'account_id': line2.analytic_account_id.id,
|
||||
# 'amount': amt,
|
||||
# 'general_account_id': line.account_id.id,
|
||||
# 'move_id': line.id,
|
||||
# 'journal_id': line.analytics_id.journal_id.id,
|
||||
# 'ref': line.ref,
|
||||
# }
|
||||
# ali_id=self.pool.get('account.analytic.line').create(cr,uid,al_vals)
|
||||
# return True
|
||||
#
|
||||
# def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
|
||||
# result = super(account_move_line, self).write(cr, uid, ids, vals, context, check, update_check)
|
||||
# self._analytic_update(cr, uid, ids, context)
|
||||
# return result
|
||||
#
|
||||
# def create(self, cr, uid, vals, context=None, check=True):
|
||||
# result = super(account_move_line, self).create(cr, uid, vals, context, check)
|
||||
# self._analytic_update(cr, uid, [result], context)
|
||||
# return result
|
||||
|
||||
def _analytic_update(self, cr, uid, ids, context):
|
||||
if self.called:
|
||||
self.called=False
|
||||
return False
|
||||
|
||||
obj_line=self.pool.get('account.analytic.line')
|
||||
|
||||
for line in self.browse(cr, uid, ids, context):
|
||||
if line.analytics_id:
|
||||
toremove = obj_line.search(cr, uid, [('move_id','=',line.id)], context=context)
|
||||
if toremove:
|
||||
obj_line.unlink(cr, uid, toremove, context=context)
|
||||
|
||||
for line2 in line.analytics_id.account_ids:
|
||||
val = (line.debit or 0.0) - (line.credit or 0.0)
|
||||
amt=val * (line2.rate/100)
|
||||
al_vals={
|
||||
'name': line.name,
|
||||
'date': line.date,
|
||||
'unit_amount':1,
|
||||
'product_id':12,
|
||||
'account_id': line2.analytic_account_id.id,
|
||||
'amount': amt,
|
||||
'general_account_id': line.account_id.id,
|
||||
'move_id': line.id,
|
||||
'journal_id': line.analytics_id.journal_id.id,
|
||||
'ref': line.ref,
|
||||
}
|
||||
ali_id=self.pool.get('account.analytic.line').create(cr,uid,al_vals)
|
||||
self.called=True
|
||||
return True
|
||||
|
||||
def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
|
||||
self.called=False
|
||||
result = super(account_move_line, self).write(cr, uid, ids, vals, context, check, update_check)
|
||||
self._analytic_update(cr, uid, ids, context)
|
||||
return result
|
||||
|
||||
def create(self, cr, uid, vals, context=None, check=True):
|
||||
self.called=False
|
||||
result = super(account_move_line, self).create(cr, uid, vals, context, check)
|
||||
self._analytic_update(cr, uid, [result], context)
|
||||
return result
|
||||
|
||||
account_move_line()
|
||||
|
||||
class account_invoice(osv.osv):
|
||||
|
||||
@@ -227,8 +227,8 @@
|
||||
<field name="model">account.analytic.default</field>
|
||||
<field name="inherit_id" ref="account_analytic_default.view_account_analytic_default_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="analytic_id" position="replace">
|
||||
<field name="analytics_id" select="1" required="True"/>
|
||||
<field name="analytic_id" select="1" required="1" position="replace">
|
||||
<field name="analytics_id" select="1" required="1"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
@@ -236,10 +236,10 @@
|
||||
<field name="name">account.analytic.default.tree.plans</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="model">account.analytic.default</field>
|
||||
<field name="inherit_id" ref="account_analytic_default.view_account_analytic_default_form"/>
|
||||
<field name="inherit_id" ref="account_analytic_default.view_account_analytic_default_tree"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="analytic_id" position="replace">
|
||||
<field name="analytics_id" select="1" required="True"/>
|
||||
<field name="analytic_id" select="1" required="1" position="replace">
|
||||
<field name="analytics_id" select="1" required="1"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:47:16+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:47:16+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:45:09+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:45:09+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:47:51+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:47:51+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:40:34+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:40:34+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:48:25+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:48:25+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:38:50+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:38:50+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:49:00+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:49:00+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:44:00+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:44:00+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:49:34+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:49:34+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:41:08+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:41:08+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:50:09+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:50:09+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:41:42+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:41:42+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:50:44+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:50:44+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:44:35+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:44:35+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:51:17+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:51:17+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:36:31+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:36:31+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:51:52+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:51:52+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:40:00+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:40:00+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:52:27+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:52:27+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:38:15+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:38:15+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:53:02+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:53:02+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:42:17+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:42:17+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:53:38+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:53:38+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:43:25+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:43:25+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:54:13+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:54:13+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:42:52+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:42:52+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:54:47+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:54:47+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:39:25+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:39:25+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:55:22+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:55:22+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:37:41+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:37:41+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:55:56+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:55:56+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:37:06+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:37:06+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:47:16+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:47:16+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:45:09+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:45:09+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:47:51+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:47:51+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:40:34+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:40:34+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:48:25+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:48:25+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:38:50+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:38:50+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
@@ -36,7 +36,7 @@ msgstr ""
|
||||
#: rml:account.account.balance.landscape:0
|
||||
#: model:ir.actions.report.xml,name:account_balance.account_account_balance_landscape
|
||||
msgid "Account balance"
|
||||
msgstr ""
|
||||
msgstr "Kontensaldo"
|
||||
|
||||
#. module: account_balance
|
||||
#: wizard_button:account.balance.account.balance.report,init,checkyear:0
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:49:00+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:49:00+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:44:00+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:44:00+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
@@ -36,7 +36,7 @@ msgstr ""
|
||||
#: rml:account.account.balance.landscape:0
|
||||
#: model:ir.actions.report.xml,name:account_balance.account_account_balance_landscape
|
||||
msgid "Account balance"
|
||||
msgstr ""
|
||||
msgstr "Balance Contable"
|
||||
|
||||
#. module: account_balance
|
||||
#: wizard_button:account.balance.account.balance.report,init,checkyear:0
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:49:35+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:49:35+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:41:08+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:41:08+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
@@ -36,7 +36,7 @@ msgstr ""
|
||||
#: rml:account.account.balance.landscape:0
|
||||
#: model:ir.actions.report.xml,name:account_balance.account_account_balance_landscape
|
||||
msgid "Account balance"
|
||||
msgstr ""
|
||||
msgstr "Balance Contable"
|
||||
|
||||
#. module: account_balance
|
||||
#: wizard_button:account.balance.account.balance.report,init,checkyear:0
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:50:10+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:50:10+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:41:43+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:41:43+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
@@ -36,7 +36,7 @@ msgstr ""
|
||||
#: rml:account.account.balance.landscape:0
|
||||
#: model:ir.actions.report.xml,name:account_balance.account_account_balance_landscape
|
||||
msgid "Account balance"
|
||||
msgstr ""
|
||||
msgstr "Balance des comptes"
|
||||
|
||||
#. module: account_balance
|
||||
#: wizard_button:account.balance.account.balance.report,init,checkyear:0
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:50:44+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:50:44+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:44:35+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:44:35+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:51:18+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:51:18+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:36:31+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:36:31+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
@@ -36,7 +36,7 @@ msgstr ""
|
||||
#: rml:account.account.balance.landscape:0
|
||||
#: model:ir.actions.report.xml,name:account_balance.account_account_balance_landscape
|
||||
msgid "Account balance"
|
||||
msgstr ""
|
||||
msgstr "Saldo del conto"
|
||||
|
||||
#. module: account_balance
|
||||
#: wizard_button:account.balance.account.balance.report,init,checkyear:0
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:51:53+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:51:53+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:40:00+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:40:00+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
@@ -36,7 +36,7 @@ msgstr ""
|
||||
#: rml:account.account.balance.landscape:0
|
||||
#: model:ir.actions.report.xml,name:account_balance.account_account_balance_landscape
|
||||
msgid "Account balance"
|
||||
msgstr ""
|
||||
msgstr "Balansrekening"
|
||||
|
||||
#. module: account_balance
|
||||
#: wizard_button:account.balance.account.balance.report,init,checkyear:0
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:52:27+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:52:27+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:38:15+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:38:15+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:53:02+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:53:02+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:42:18+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:42:18+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
@@ -36,7 +36,7 @@ msgstr ""
|
||||
#: rml:account.account.balance.landscape:0
|
||||
#: model:ir.actions.report.xml,name:account_balance.account_account_balance_landscape
|
||||
msgid "Account balance"
|
||||
msgstr ""
|
||||
msgstr "Balanço"
|
||||
|
||||
#. module: account_balance
|
||||
#: wizard_button:account.balance.account.balance.report,init,checkyear:0
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:53:38+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:53:38+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:43:26+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:43:26+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:54:14+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:54:14+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:42:52+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:42:52+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:54:48+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:54:48+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:39:25+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:39:25+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:55:22+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:55:22+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:37:41+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:37:41+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
@@ -36,7 +36,7 @@ msgstr ""
|
||||
#: rml:account.account.balance.landscape:0
|
||||
#: model:ir.actions.report.xml,name:account_balance.account_account_balance_landscape
|
||||
msgid "Account balance"
|
||||
msgstr ""
|
||||
msgstr "科目余额"
|
||||
|
||||
#. module: account_balance
|
||||
#: wizard_button:account.balance.account.balance.report,init,checkyear:0
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 4.3.0"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com"
|
||||
"POT-Creation-Date: 2008-09-10 12:55:56+0000"
|
||||
"PO-Revision-Date: 2008-09-10 12:55:56+0000"
|
||||
"POT-Creation-Date: 2008-09-11 15:37:06+0000"
|
||||
"PO-Revision-Date: 2008-09-11 15:37:06+0000"
|
||||
"Last-Translator: <>"
|
||||
"Language-Team: "
|
||||
"MIME-Version: 1.0"
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
"category" : "Generic Modules/Accounting",
|
||||
"description": """This module allow accountants to manage analytic and crossovered budgets.
|
||||
|
||||
Once the Master Budgets and the Budgets defined (in Financial Management/Configuration/Budgets/), the Project Managers can set the planned amount on each Analytic Account.
|
||||
Once the Master Budgets and the Budgets defined (in Financial Management/Configuration/Budgets/), the Project Managers can set the planned amount on each Analytic Account.
|
||||
|
||||
The accountant has the possibility to see the total of amount planned for each Budget and Master Budget in order to ensure the total planned is not greater/lower than what he planned for this Budget/Master Budget. Each list of record can also be switched to a graphical view of it.
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
"init_xml" : [],
|
||||
"demo_xml" : [],
|
||||
"update_xml" : [
|
||||
"security/ir.model.access.csv",
|
||||
"security/ir.model.access.csv","account_budget_wizard.xml",
|
||||
"crossovered_budget_view.xml","crossovered_budget_report.xml","crossovered_budget_workflow.xml"
|
||||
],
|
||||
"active": False,
|
||||
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0"?>
|
||||
<openerp>
|
||||
<data>
|
||||
<wizard id="wizard_budget_spread" menu="False" model="account.budget.post" name="account.budget.spread" string="Spread amount"/>
|
||||
|
||||
<wizard id="wizard_budget_report" keyword="client_print_multi" model="account.budget.post" name="account.budget.report" string="Budget"/>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
+158
-40
@@ -10,6 +10,76 @@ import datetime
|
||||
def strToDate(dt):
|
||||
dt_date=datetime.date(int(dt[0:4]),int(dt[5:7]),int(dt[8:10]))
|
||||
return dt_date
|
||||
#moved from account/account.py
|
||||
# ---------------------------------------------------------
|
||||
# Budgets
|
||||
# ---------------------------------------------------------
|
||||
class account_budget_post(osv.osv):
|
||||
_name = 'account.budget.post'
|
||||
_description = 'Budget item'
|
||||
_columns = {
|
||||
'code': fields.char('Code', size=64, required=True),
|
||||
'name': fields.char('Name', size=256, required=True),
|
||||
'dotation_ids': fields.one2many('account.budget.post.dotation', 'post_id', 'Expenses'),
|
||||
'account_ids': fields.many2many('account.account', 'account_budget_rel', 'budget_id', 'account_id', 'Accounts'),
|
||||
'crossovered_budget_line': fields.one2many('crossovered.budget.lines', 'general_budget_id', 'Budget Lines'),
|
||||
}
|
||||
_defaults = {
|
||||
}
|
||||
|
||||
def spread(self, cr, uid, ids, fiscalyear_id=False, amount=0.0):
|
||||
dobj = self.pool.get('account.budget.post.dotation')
|
||||
for o in self.browse(cr, uid, ids):
|
||||
# delete dotations for this post
|
||||
dobj.unlink(cr, uid, dobj.search(cr, uid, [('post_id','=',o.id)]))
|
||||
|
||||
# create one dotation per period in the fiscal year, and spread the total amount/quantity over those dotations
|
||||
fy = self.pool.get('account.fiscalyear').browse(cr, uid, [fiscalyear_id])[0]
|
||||
num = len(fy.period_ids)
|
||||
for p in fy.period_ids:
|
||||
dobj.create(cr, uid, {'post_id': o.id, 'period_id': p.id, 'amount': amount/num})
|
||||
return True
|
||||
account_budget_post()
|
||||
|
||||
class account_budget_post_dotation(osv.osv):
|
||||
def _tot_planned(self, cr, uid, ids,name,args,context):
|
||||
res={}
|
||||
for line in self.browse(cr, uid, ids):
|
||||
if line.period_id:
|
||||
obj_period=self.pool.get('account.period').browse(cr, uid,line.period_id.id)
|
||||
|
||||
total_days=strToDate(obj_period.date_stop) - strToDate(obj_period.date_start)
|
||||
budget_id=line.post_id and line.post_id.id or False
|
||||
query="select id from crossovered_budget_lines where general_budget_id= '"+ str(budget_id) + "' AND (date_from >='" +obj_period.date_start +"' and date_from <= '"+obj_period.date_stop + "') OR (date_to >='" +obj_period.date_start +"' and date_to <= '"+obj_period.date_stop + "') OR (date_from <'" +obj_period.date_start +"' and date_to > '"+obj_period.date_stop + "')"
|
||||
cr.execute(query)
|
||||
res1=cr.fetchall()
|
||||
|
||||
tot_planned=0.00
|
||||
for record in res1:
|
||||
obj_lines = self.pool.get('crossovered.budget.lines').browse(cr, uid,record[0])
|
||||
count_days = min(strToDate(obj_period.date_stop),strToDate(obj_lines.date_to)) - max(strToDate(obj_period.date_start), strToDate(obj_lines.date_from))
|
||||
days_in_period = count_days.days +1
|
||||
count_days = strToDate(obj_lines.date_to) - strToDate(obj_lines.date_from)
|
||||
total_days_of_rec = count_days.days +1
|
||||
tot_planned += obj_lines.planned_amount/total_days_of_rec* days_in_period
|
||||
res[line.id]=tot_planned
|
||||
else:
|
||||
res[line.id]=0.00
|
||||
return res
|
||||
|
||||
_name = 'account.budget.post.dotation'
|
||||
_description = "Budget item endowment"
|
||||
_columns = {
|
||||
'name': fields.char('Name', size=64),
|
||||
'post_id': fields.many2one('account.budget.post', 'Item', select=True),
|
||||
'period_id': fields.many2one('account.period', 'Period'),
|
||||
# 'quantity': fields.float('Quantity', digits=(16,2)),
|
||||
'amount': fields.float('Amount', digits=(16,2)),
|
||||
'tot_planned':fields.function(_tot_planned,method=True, string='Total Planned Amount',type='float',store=True),
|
||||
}
|
||||
|
||||
account_budget_post_dotation()
|
||||
#===
|
||||
|
||||
class crossovered_budget(osv.osv):
|
||||
_name = "crossovered.budget"
|
||||
@@ -138,48 +208,50 @@ class crossovered_budget_lines(osv.osv):
|
||||
}
|
||||
crossovered_budget_lines()
|
||||
|
||||
class account_budget_post(osv.osv):
|
||||
_name = 'account.budget.post'
|
||||
_inherit = 'account.budget.post'
|
||||
_columns = {
|
||||
'crossovered_budget_line': fields.one2many('crossovered.budget.lines', 'general_budget_id', 'Budget Lines'),
|
||||
}
|
||||
account_budget_post()
|
||||
|
||||
class account_budget_post_dotation(osv.osv):
|
||||
_name = 'account.budget.post.dotation'
|
||||
_inherit = 'account.budget.post.dotation'
|
||||
|
||||
def _tot_planned(self, cr, uid, ids,name,args,context):
|
||||
res={}
|
||||
for line in self.browse(cr, uid, ids):
|
||||
if line.period_id:
|
||||
obj_period=self.pool.get('account.period').browse(cr, uid,line.period_id.id)
|
||||
|
||||
total_days=strToDate(obj_period.date_stop) - strToDate(obj_period.date_start)
|
||||
budget_id=line.post_id and line.post_id.id or False
|
||||
query="select id from crossovered_budget_lines where general_budget_id= '"+ str(budget_id) + "' AND (date_from >='" +obj_period.date_start +"' and date_from <= '"+obj_period.date_stop + "') OR (date_to >='" +obj_period.date_start +"' and date_to <= '"+obj_period.date_stop + "') OR (date_from <'" +obj_period.date_start +"' and date_to > '"+obj_period.date_stop + "')"
|
||||
cr.execute(query)
|
||||
res1=cr.fetchall()
|
||||
|
||||
tot_planned=0.00
|
||||
for record in res1:
|
||||
obj_lines = self.pool.get('crossovered.budget.lines').browse(cr, uid,record[0])
|
||||
count_days = min(strToDate(obj_period.date_stop),strToDate(obj_lines.date_to)) - max(strToDate(obj_period.date_start), strToDate(obj_lines.date_from))
|
||||
days_in_period = count_days.days +1
|
||||
count_days = strToDate(obj_lines.date_to) - strToDate(obj_lines.date_from)
|
||||
total_days_of_rec = count_days.days +1
|
||||
tot_planned += obj_lines.planned_amount/total_days_of_rec* days_in_period
|
||||
res[line.id]=tot_planned
|
||||
else:
|
||||
res[line.id]=0.00
|
||||
return res
|
||||
|
||||
_columns = {
|
||||
'tot_planned':fields.function(_tot_planned,method=True, string='Total Planned Amount',type='float',store=True),
|
||||
}
|
||||
|
||||
account_budget_post_dotation()
|
||||
#class account_budget_post(osv.osv): #old code
|
||||
# _name = 'account.budget.post'
|
||||
# _inherit = 'account.budget.post'
|
||||
# _columns = {
|
||||
# 'crossovered_budget_line': fields.one2many('crossovered.budget.lines', 'general_budget_id', 'Budget Lines'),
|
||||
# }
|
||||
#account_budget_post()
|
||||
#
|
||||
#class account_budget_post_dotation(osv.osv):
|
||||
# _name = 'account.budget.post.dotation'
|
||||
# _inherit = 'account.budget.post.dotation'
|
||||
#
|
||||
# def _tot_planned(self, cr, uid, ids,name,args,context):
|
||||
# res={}
|
||||
# for line in self.browse(cr, uid, ids):
|
||||
# if line.period_id:
|
||||
# obj_period=self.pool.get('account.period').browse(cr, uid,line.period_id.id)
|
||||
#
|
||||
# total_days=strToDate(obj_period.date_stop) - strToDate(obj_period.date_start)
|
||||
# budget_id=line.post_id and line.post_id.id or False
|
||||
# query="select id from crossovered_budget_lines where general_budget_id= '"+ str(budget_id) + "' AND (date_from >='" +obj_period.date_start +"' and date_from <= '"+obj_period.date_stop + "') OR (date_to >='" +obj_period.date_start +"' and date_to <= '"+obj_period.date_stop + "') OR (date_from <'" +obj_period.date_start +"' and date_to > '"+obj_period.date_stop + "')"
|
||||
# cr.execute(query)
|
||||
# res1=cr.fetchall()
|
||||
#
|
||||
# tot_planned=0.00
|
||||
# for record in res1:
|
||||
# obj_lines = self.pool.get('crossovered.budget.lines').browse(cr, uid,record[0])
|
||||
# count_days = min(strToDate(obj_period.date_stop),strToDate(obj_lines.date_to)) - max(strToDate(obj_period.date_start), strToDate(obj_lines.date_from))
|
||||
# days_in_period = count_days.days +1
|
||||
# count_days = strToDate(obj_lines.date_to) - strToDate(obj_lines.date_from)
|
||||
# total_days_of_rec = count_days.days +1
|
||||
# tot_planned += obj_lines.planned_amount/total_days_of_rec* days_in_period
|
||||
# res[line.id]=tot_planned
|
||||
# else:
|
||||
# res[line.id]=0.00
|
||||
# return res
|
||||
#
|
||||
# _columns = {
|
||||
# 'tot_planned':fields.function(_tot_planned,method=True, string='Total Planned Amount',type='float',store=True),
|
||||
# }
|
||||
#
|
||||
#account_budget_post_dotation()
|
||||
|
||||
class account_analytic_account(osv.osv):
|
||||
_name = 'account.analytic.account'
|
||||
@@ -191,6 +263,52 @@ class account_analytic_account(osv.osv):
|
||||
|
||||
account_analytic_account()
|
||||
|
||||
#--------------------------------------------------------------
|
||||
# moved from account/project/project.py
|
||||
# ---------------------------------------------------------
|
||||
# Budgets
|
||||
# ---------------------------------------------------------
|
||||
|
||||
#class account_analytic_budget_post(osv.osv):
|
||||
# _name = 'account.analytic.budget.post'
|
||||
# _description = 'Budget item'
|
||||
# _columns = {
|
||||
# 'code': fields.char('Code', size=64, required=True),
|
||||
# 'name': fields.char('Name', size=256, required=True),
|
||||
# 'sens': fields.selection( [('charge','Charge'), ('produit','Product')], 'Direction', required=True),
|
||||
# 'dotation_ids': fields.one2many('account.analytic.budget.post.dotation', 'post_id', 'Expenses'),
|
||||
# 'account_ids': fields.many2many('account.analytic.account', 'account_analytic_budget_rel', 'budget_id', 'account_id', 'Accounts'),
|
||||
# }
|
||||
# _defaults = {
|
||||
# 'sens': lambda *a: 'produit',
|
||||
# }
|
||||
#
|
||||
# def spread(self, cr, uid, ids, fiscalyear_id=False, quantity=0.0, amount=0.0):
|
||||
#
|
||||
# dobj = self.pool.get('account.analytic.budget.post.dotation')
|
||||
# for o in self.browse(cr, uid, ids):
|
||||
# # delete dotations for this post
|
||||
# dobj.unlink(cr, uid, dobj.search(cr, uid, [('post_id','=',o.id)]))
|
||||
#
|
||||
# # create one dotation per period in the fiscal year, and spread the total amount/quantity over those dotations
|
||||
# fy = self.pool.get('account.fiscalyear').browse(cr, uid, [fiscalyear_id])[0]
|
||||
# num = len(fy.period_ids)
|
||||
# for p in fy.period_ids:
|
||||
# dobj.create(cr, uid, {'post_id': o.id, 'period_id': p.id, 'quantity': quantity/num, 'amount': amount/num})
|
||||
# return True
|
||||
#account_analytic_budget_post()
|
||||
#
|
||||
#class account_analytic_budget_post_dotation(osv.osv):
|
||||
# _name = 'account.analytic.budget.post.dotation'
|
||||
# _description = "Budget item endowment"
|
||||
# _columns = {
|
||||
# 'name': fields.char('Name', size=64),
|
||||
# 'post_id': fields.many2one('account.analytic.budget.post', 'Item', select=True),
|
||||
# 'period_id': fields.many2one('account.period', 'Period'),
|
||||
# 'quantity': fields.float('Quantity', digits=(16,2)),
|
||||
# 'amount': fields.float('Amount', digits=(16,2)),
|
||||
# }
|
||||
#account_analytic_budget_post_dotation()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user