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

[MERGE] merge with dev-addons3

Browse Source 
bzr revid: psi@tinyerp.co.in-20110111110212-v3j1nuaoukq52xm6
This commit is contained in:
psi (Open ERP)
2011-01-11 16:32:12 +05:30
parent d846432de7 22292bc3e5
commit be0c1c0fbe
5 changed files with 234 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account_view.xml
+1 -65
View File
@@ -603,7 +603,7 @@
</record>
<record id="view_bank_statement_periodic_form" model="ir.ui.view">
<field name="name">account.bank.statement.form</field>
<field name="name">account.bank.statement.reconcile.form</field>
<field name="model">account.bank.statement</field>
<field name="type">form</field>
<field name="arch" type="xml">
@@ -1520,70 +1520,6 @@
<field name="act_window_id" ref="action_move_line_search"/>
</record>
<record id="view_bank_statement_reconcile_form" model="ir.ui.view">
<field name="name">account.bank.statement.form</field>
<field name="model">account.bank.statement</field>
<field eval="30" name="priority"/>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Statement">
<group col="6" colspan="4">
<field name="name" select="1"/>
<field name="date" select="1"/>
<field name="journal_id" on_change="onchange_journal_id(journal_id)" select="1"/>
<field name="currency"/>
<field name="balance_start"/>
<field name="balance_end_real"/>
</group>
<notebook colspan="4">
<page string="Select entries">
<field colspan="4" domain="[('statement_id', '=', False), ('journal_id', '=', journal_id)]" name="move_line_ids" nolabel="1" widget="many2many"/>
</page>
<page string="Entry encoding">
<separator colspan="4" string="Entry Lines"/>
<field name="period_id"/>
<field colspan="4" name="line_ids" nolabel="1">
<tree editable="bottom" string="Statement lines">
<field name="date"/>
<field name="name"/>
<field name="type" on_change="onchange_type(partner_id, type)"/>
<field name="partner_id" on_change="onchange_type(partner_id, type)"/>
<field domain="[('journal_id', '=', parent.journal_id)]" name="account_id"/>
<field name="amount"/>
<field context="{'partner_id': partner_id, 'amount': amount, 'account_id': account_id, 'date':date}" name="reconcile_id"/>
</tree>
<form string="Statement lines">
<field name="date"/>
<field name="name"/>
<field name="type" on_change="onchange_type(partner_id, type)"/>
<field name="partner_id" on_change="onchange_type(partner_id, type)"/>
<field domain="[('journal_id', '=', parent.journal_id)]" name="account_id"/>
<field name="analytic_account_id" groups="analytic.group_analytic_accounting" />
<field name="amount"/>
<field context="{'partner_id': partner_id, 'amount': amount, 'account_id': account_id, 'date':date}" name="reconcile_id"/>
</form>
</field>
</page>
</notebook>
<group col="7" colspan="4">
<field name="state"/>
<field name="balance_end"/>
<button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
<button name="button_dummy" states="draft" string="Compute" icon="terp-stock_format-scientific"/>
<button name="button_confirm" states="draft" string="Confirm" type="object" icon="terp-camera_test"/>
</group>
</form>
</field>
</record>
<record id="action_bank_statement_reconciliation_form" model="ir.actions.act_window">
<field name="name">Statements reconciliation</field>
<field name="res_model">account.bank.statement</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>
<field name="search_view_id" ref="view_bank_statement_search"/>
<field name="view_id" ref="view_bank_statement_reconcile_form"/>
</record>
<act_window
context="{'search_default_next_partner':1,'view_mode':True}"
id="action_account_manual_reconcile" name="Journal Items"
addons/account/report/account_balance.py
+2 -1
View File
@@ -112,7 +112,8 @@ class account_balance(report_sxw.rml_parse, common_report_header):
ctx['fiscalyear'] = form['fiscalyear_id']
if form['filter'] == 'filter_period':
ctx['periods'] = form['periods']
ctx['period_from'] = form['period_from']
ctx['period_to'] = form['period_to']
elif form['filter'] == 'filter_date':
ctx['date_from'] = form['date_from']
ctx['date_to'] = form['date_to']
addons/l10n_de/account_chart_skr04.xml
+34 -34
View File
@@ -603,7 +603,7 @@
<field name="name">Konzessionen- gewerbliche Schutzrechte und ähnliche Rechte und Werte sowie Lizenzen an solchen Rechten und Werten</field>
<field name="parent_id" ref="chart_skr04_K0BA31"/>
<field name="reconcile" eval="False"/>
<field name="type">other</field>
<field name="type">view</field>
<field name="user_type" ref="account.account_type_asset"/>
</record>
@@ -733,7 +733,7 @@
<field name="name">Grundstücke- grundstücksgleiche Rechte und Bauten einschließlich der Bauten auf fremden Grundstücken</field>
<field name="parent_id" ref="chart_skr04_K0BA41"/>
<field name="reconcile" eval="False"/>
<field name="type">other</field>
<field name="type">view</field>
<field name="user_type" ref="account.account_type_asset"/>
</record>
@@ -1011,7 +1011,7 @@
<field name="name">Technische Anlagen und Maschinen</field>
<field name="parent_id" ref="chart_skr04_K0BA42"/>
<field name="reconcile" eval="False"/>
<field name="type">other</field>
<field name="type">view</field>
<field name="user_type" ref="account.account_type_asset"/>
</record>
@@ -1064,7 +1064,7 @@
<field name="name">Andere Anlagen- Betriebs- und Geschäftsaustattung</field>
<field name="parent_id" ref="chart_skr04_K0BA43"/>
<field name="reconcile" eval="False"/>
<field name="type">other</field>
<field name="type">view</field>
<field name="user_type" ref="account.account_type_asset"/>
</record>
@@ -1180,7 +1180,7 @@
<field name="name">Geleistete Anzahlungen und Anlagen im Bau</field>
<field name="parent_id" ref="chart_skr04_K0BA44"/>
<field name="reconcile" eval="False"/>
<field name="type">other</field>
<field name="type">view</field>
<field name="user_type" ref="account.account_type_asset"/>
</record>
@@ -1365,7 +1365,7 @@
<field name="name">Beteiligungen</field>
<field name="parent_id" ref="chart_skr04_K0BA53"/>
<field name="reconcile" eval="False"/>
<field name="type">other</field>
<field name="type">view</field>
<field name="user_type" ref="account.account_type_asset"/>
</record>
@@ -1444,7 +1444,7 @@
<field name="name">Wertpapiere des Anlagevermögens</field>
<field name="parent_id" ref="chart_skr04_K0BA55"/>
<field name="reconcile" eval="False"/>
<field name="type">other</field>
<field name="type">view</field>
<field name="user_type" ref="account.account_type_asset"/>
</record>
@@ -1479,7 +1479,7 @@
<field name="name">Sonstige Ausleihungen</field>
<field name="parent_id" ref="chart_skr04_K0BA56"/>
<field name="reconcile" eval="False"/>
<field name="type">other</field>
<field name="type">view</field>
<field name="user_type" ref="account.account_type_asset"/>
</record>
@@ -3225,7 +3225,7 @@
<field name="name">Geleistete Anzahlungen auf Vorräte</field>
<field name="parent_id" ref="chart_skr04_K1BA16"/>
<field name="reconcile" eval="False"/>
<field name="type">other</field>
<field name="type">view</field>
<field name="user_type" ref="account.account_type_asset"/>
</record>
@@ -3303,7 +3303,7 @@
<field name="name">Forderungen aus Lieferungen und Leistungen </field>
<field name="parent_id" ref="chart_skr04_K1BA21"/>
<field name="reconcile" eval="True"/>
<field name="type">receivable</field>
<field name="type">view</field>
<field name="user_type" ref="account.account_type_asset"/>
</record>
@@ -3321,7 +3321,7 @@
<field name="name">Forderungen aus Lieferungen und Leistungen ohne Kontokorent</field>
<field name="parent_id" ref="chart_skr04_1200"/>
<field name="reconcile" eval="True"/>
<field name="type">other</field>
<field name="type">view</field>
<field name="user_type" ref="account.account_type_asset"/>
</record>
@@ -3606,7 +3606,7 @@
<field name="name">Forderungen gegen verbundene Unternehmen </field>
<field name="parent_id" ref="chart_skr04_K1BA24"/>
<field name="reconcile" eval="True"/>
<field name="type">receivable</field>
<field name="type">view</field>
<field name="user_type" ref="account.account_type_asset"/>
</record>
@@ -3730,7 +3730,7 @@
<field name="name">Forderungen gegen Unternehmen- mit denen ein Beteiligungsverhältnis besteht</field>
<field name="parent_id" ref="chart_skr04_K1BA26"/>
<field name="reconcile" eval="True"/>
<field name="type">receivable</field>
<field name="type">view</field>
<field name="user_type" ref="account.account_type_asset"/>
</record>
@@ -3888,7 +3888,7 @@
<field name="name">Sonstige Vermögensgegenstände</field>
<field name="parent_id" ref="chart_skr04_K1BA2a"/>
<field name="reconcile" eval="False"/>
<field name="type">other</field>
<field name="type">view</field>
<field name="user_type" ref="account.account_type_asset"/>
</record>
@@ -4674,7 +4674,7 @@
<field name="name">Sonstige Wertpapiere</field>
<field name="parent_id" ref="chart_skr04_K1BA33"/>
<field name="reconcile" eval="False"/>
<field name="type">other</field>
<field name="type">view</field>
<field name="user_type" ref="account.account_type_asset"/>
</record>
@@ -4735,7 +4735,7 @@
<field name="name">Kasse </field>
<field name="parent_id" ref="chart_skr04_K1BA41"/>
<field name="reconcile" eval="True"/>
<field name="type">liquidity</field>
<field name="type">view</field>
<field name="user_type" ref="account.account_type_asset"/>
</record>
@@ -4913,7 +4913,7 @@
<field name="name">Aktive Rechnungsabgrenzung</field>
<field name="parent_id" ref="chart_skr04_K1BA51"/>
<field name="reconcile" eval="False"/>
<field name="type">other</field>
<field name="type">view</field>
<field name="user_type" ref="account.account_type_asset"/>
</record>
@@ -5326,7 +5326,7 @@
<field name="name">Kapitalrücklage</field>
<field name="parent_id" ref="chart_skr04_K2BP61"/>
<field name="reconcile" eval="False"/>
<field name="type">other</field>
<field name="type">view</field>
<field name="user_type" ref="account.account_type_liability"/>
</record>
@@ -5447,7 +5447,7 @@
<field name="name">Andere Gewinnrücklagen </field>
<field name="parent_id" ref="chart_skr04_K2BP74"/>
<field name="reconcile" eval="False"/>
<field name="type">other</field>
<field name="type">view</field>
<field name="user_type" ref="account.account_type_liability"/>
</record>
@@ -5744,7 +5744,7 @@
<field name="name">Rückstellungen für Pensionen und ähnliche Verpflichtungen</field>
<field name="parent_id" ref="chart_skr04_K3BP11"/>
<field name="reconcile" eval="False"/>
<field name="type">other</field>
<field name="type">view</field>
<field name="user_type" ref="account.account_type_liability"/>
</record>
@@ -5779,7 +5779,7 @@
<field name="name">Steuerrückstellungen</field>
<field name="parent_id" ref="chart_skr04_K3BP12"/>
<field name="reconcile" eval="False"/>
<field name="type">other</field>
<field name="type">view</field>
<field name="user_type" ref="account.account_type_liability"/>
</record>
@@ -5823,7 +5823,7 @@
<field name="name">Sonstige Rückstellungen</field>
<field name="parent_id" ref="chart_skr04_K3BP13"/>
<field name="reconcile" eval="False"/>
<field name="type">other</field>
<field name="type">view</field>
<field name="user_type" ref="account.account_type_liability"/>
</record>
@@ -5938,7 +5938,7 @@
<field name="name">Anleihen- nicht konvertibel</field>
<field name="parent_id" ref="chart_skr04_K3BP21"/>
<field name="reconcile" eval="False"/>
<field name="type">other</field>
<field name="type">view</field>
<field name="user_type" ref="account.account_type_liability"/>
</record>
@@ -6018,7 +6018,7 @@
<field name="name">Verbindlichkeiten gegenüber Kreditinstituten </field>
<field name="parent_id" ref="chart_skr04_K3BP22"/>
<field name="reconcile" eval="False"/>
<field name="type">other</field>
<field name="type">view</field>
<field name="user_type" ref="account.account_type_liability"/>
</record>
@@ -6124,7 +6124,7 @@
<field name="name">Erhaltene Anzahlungen auf Bestellungen</field>
<field name="parent_id" ref="chart_skr04_K3BP24"/>
<field name="reconcile" eval="False"/>
<field name="type">other</field>
<field name="type">view</field>
<field name="user_type" ref="account.account_type_liability"/>
</record>
@@ -6204,7 +6204,7 @@
<field name="name">Verbindlichkeiten aus Lieferungen und Leistungen </field>
<field name="parent_id" ref="chart_skr04_K3BP25"/>
<field name="reconcile" eval="True"/>
<field name="type">payable</field>
<field name="type">view</field>
<field name="user_type" ref="account.account_type_liability"/>
</record>
@@ -6364,7 +6364,7 @@
<field name="name">Verbindlichkeiten aus der Annahme gezogener Wechsel und aus der Ausstellung eigener Wechsel</field>
<field name="parent_id" ref="chart_skr04_K3BP27"/>
<field name="reconcile" eval="False"/>
<field name="type">other</field>
<field name="type">view</field>
<field name="user_type" ref="account.account_type_liability"/>
</record>
@@ -6408,7 +6408,7 @@
<field name="name">Verbindlichkeiten gegenüber verbundenen Unternehmen</field>
<field name="parent_id" ref="chart_skr04_K3BP28"/>
<field name="reconcile" eval="True"/>
<field name="type">payable</field>
<field name="type">view</field>
<field name="user_type" ref="account.account_type_liability"/>
</record>
@@ -6479,7 +6479,7 @@
<field name="code">K3BP29</field>
<field name="name">Verbindlichkeiten gegenüber Unternehmen- mit denen ein Beteiligungsverhältnis besteht oder Forderungen gegen Unternehmen- mit denen ein Beteiligungsverhältnis besteht</field>
<field name="parent_id" ref="chart_skr04_K3BP2"/>
<field name="type">other</field>
<field name="type">view</field>
<field name="user_type" ref="account.account_type_view"/>
</record>
@@ -6488,7 +6488,7 @@
<field name="name">Verbindlichkeiten gegenüber Unternehmen- mit denen ein Beteiligungsverhältnis besteht </field>
<field name="parent_id" ref="chart_skr04_K3BP29"/>
<field name="reconcile" eval="True"/>
<field name="type">payable</field>
<field name="type">view</field>
<field name="user_type" ref="account.account_type_liability"/>
</record>
@@ -6568,7 +6568,7 @@
<field name="name">Sonstige Verbindlichkeiten</field>
<field name="parent_id" ref="chart_skr04_K3BP2a"/>
<field name="reconcile" eval="False"/>
<field name="type">other</field>
<field name="type">view</field>
<field name="user_type" ref="account.account_type_liability"/>
</record>
@@ -7088,7 +7088,7 @@
<field name="name">Lohn- und Gehaltsverrechnungskonto</field>
<field name="parent_id" ref="chart_skr04_K3BP2b"/>
<field name="reconcile" eval="False"/>
<field name="type">other</field>
<field name="type">view</field>
<field name="user_type" ref="account.account_type_liability"/>
</record>
@@ -7996,7 +7996,7 @@
<field name="code">K4GVE22</field>
<field name="name">Sonstige betriebliche Erträge</field>
<field name="parent_id" ref="chart_skr04_K4GVE2"/>
<field name="type">other</field>
<field name="type">view</field>
<field name="user_type" ref="account.account_type_view"/>
</record>
@@ -10182,7 +10182,7 @@
<field name="name">Soziale Abgaben und Aufwendungen für Altersversorgung und für Unterstützung</field>
<field name="parent_id" ref="chart_skr04_K6GVA12"/>
<field name="reconcile" eval="False"/>
<field name="type">other</field>
<field name="type">view</field>
<field name="user_type" ref="account.account_type_expense"/>
</record>
addons/l10n_ec/account_chart.xml
+12 -12
View File
@@ -1428,7 +1428,7 @@
<field name="code">15.01</field>
<field name="reconcile" eval="False"/>
<field ref="account_type_asset" name="user_type"/>
<field name="type">other</field>
<field name="type">view</field>
<field ref="15" name="parent_id"/>
</record>
<record model="account.account.template" id="150101">
@@ -1452,7 +1452,7 @@
<field name="code">15.02</field>
<field name="reconcile" eval="False"/>
<field ref="account_type_asset" name="user_type"/>
<field name="type">other</field>
<field name="type">view</field>
<field ref="15" name="parent_id"/>
</record>
<record model="account.account.template" id="150201">
@@ -1540,7 +1540,7 @@
<field name="code">17.02</field>
<field name="reconcile" eval="False"/>
<field ref="account_type_view" name="user_type"/>
<field name="type">other</field>
<field name="type">view</field>
<field ref="17" name="parent_id"/>
</record>
<record model="account.account.template" id="170201">
@@ -3854,7 +3854,7 @@
<field name="code">74.01.01</field>
<field name="reconcile" eval="False"/>
<field ref="account_type_asset" name="user_type"/>
<field name="type">other</field>
<field name="type">view</field>
<field ref="7401" name="parent_id"/>
</record>
<record model="account.account.template" id="74010101">
@@ -3886,7 +3886,7 @@
<field name="code">74.01.02</field>
<field name="reconcile" eval="False"/>
<field ref="account_type_asset" name="user_type"/>
<field name="type">other</field>
<field name="type">view</field>
<field ref="7401" name="parent_id"/>
</record>
<record model="account.account.template" id="74010201">
@@ -3926,7 +3926,7 @@
<field name="code">74.02.01</field>
<field name="reconcile" eval="False"/>
<field ref="account_type_asset" name="user_type"/>
<field name="type">other</field>
<field name="type">view</field>
<field ref="7402" name="parent_id"/>
</record>
<record model="account.account.template" id="74020101">
@@ -3934,7 +3934,7 @@
<field name="code">74.02.01.01</field>
<field name="reconcile" eval="False"/>
<field ref="account_type_asset" name="user_type"/>
<field name="type">other</field>
<field name="type">view</field>
<field ref="740201" name="parent_id"/>
</record>
<record model="account.account.template" id="7402010101">
@@ -3958,7 +3958,7 @@
<field name="code">74.02.01.02</field>
<field name="reconcile" eval="False"/>
<field ref="account_type_asset" name="user_type"/>
<field name="type">other</field>
<field name="type">view</field>
<field ref="740201" name="parent_id"/>
</record>
<record model="account.account.template" id="7402010201">
@@ -3990,7 +3990,7 @@
<field name="code">74.02.02.01</field>
<field name="reconcile" eval="False"/>
<field ref="account_type_asset" name="user_type"/>
<field name="type">other</field>
<field name="type">view</field>
<field ref="740202" name="parent_id"/>
</record>
<record model="account.account.template" id="7402020101">
@@ -4038,7 +4038,7 @@
<field name="code">74.02.02.02</field>
<field name="reconcile" eval="False"/>
<field ref="account_type_asset" name="user_type"/>
<field name="type">other</field>
<field name="type">view</field>
<field ref="740202" name="parent_id"/>
</record>
<record model="account.account.template" id="7402020201">
@@ -4078,7 +4078,7 @@
<field name="code">74.02.02.03</field>
<field name="reconcile" eval="False"/>
<field ref="account_type_asset" name="user_type"/>
<field name="type">other</field>
<field name="type">view</field>
<field ref="740202" name="parent_id"/>
</record>
<record model="account.account.template" id="7402020301">
@@ -4118,7 +4118,7 @@
<field name="code">74.02.02.04</field>
<field name="reconcile" eval="False"/>
<field ref="account_type_asset" name="user_type"/>
<field name="type">other</field>
<field name="type">view</field>
<field ref="740202" name="parent_id"/>
</record>
<record model="account.account.template" id="7402020401">
addons/l10n_fr/plan_comptable_general_demo.xml
+185 -185
View File
File diff suppressed because it is too large Load Diff