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

remove defferal method from account object

Browse Source 
- modify close fiscal year wizard
- modify chars : l10n_fr,l10n_chart_uk_minimal
- modify membership

bzr revid: mra@tinyerp.com-20080901094924-vi1df639wpcxf3ci
This commit is contained in:
Mustufa Rangwala
2008-09-01 15:19:24 +05:30
parent cdc4a1018f
commit 7343ac0a5c
8 changed files with 32 additions and 2003 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account.py
-2
View File
@@ -243,7 +243,6 @@ class account_account(osv.osv):
'debit': fields.function(__compute, digits=(16,2), method=True, string='Debit', multi='balance'),
'reconcile': fields.boolean('Reconcile', help="Check this account if the user can make a reconciliation of the entries in this account."),
'shortcut': fields.char('Shortcut', size=12),
'close_method': fields.selection([('none','None'), ('balance','Balance'), ('detail','Detail'),('unreconciled','Unreconciled')], 'Deferral Method', required=True, help="Tell Tiny ERP how to process the entries of this account when you close a fiscal year. None removes all entries to start with an empty account for the new fiscal year. Balance creates only one entry to keep the balance for the new fiscal year. Detail keeps the detail of all entries of the preceeding years. Unreconciled keeps the detail of unreconciled entries only."),
'tax_ids': fields.many2many('account.tax', 'account_account_tax_default_rel',
'account_id','tax_id', 'Default Taxes'),
'note': fields.text('Note'),
@@ -265,7 +264,6 @@ class account_account(osv.osv):
'sign': lambda *a: 1,
'type' : lambda *a :'view',
'reconcile': lambda *a: False,
'close_method': lambda *a: 'balance',
'company_id': _default_company,
'active': lambda *a: True,
}
addons/account/account_view.xml
-1
View File
@@ -125,7 +125,6 @@
<field name="sign"/>
<field name="currency_id" select="2"/>
<field name="close_method"/>
<field name="reconcile"/>
<newline/>
<newline/>
addons/account/data/account_minimal.xml
-1
View File
@@ -9,7 +9,6 @@
<record id="minimal_0" model="account.account">
<field name="code">0</field>
<field name="name">Minimal account chart</field>
<field name="close_method">none</field>
<field eval="0" name="parent_id"/>
<field name="type">view</field>
</record>
addons/account/wizard/wizard_fiscalyear_close.py
+7 -4
View File
@@ -88,11 +88,14 @@ def _data_save(self, cr, uid, data, context):
obj='account_move_line', context={'fiscalyear': fy_id})
cr.execute('select id from account_account WHERE active')
ids = map(lambda x: x[0], cr.fetchall())
accnt_type_obj = pool.get('account.account.type')
for account in pool.get('account.account').browse(cr, uid, ids,
context={'fiscalyear': fy_id}):
if account.close_method=='none' or account.type == 'view':
accnt_type_ids = accnt_type_obj.search(cr, uid, [('code','=',account.type)])
accnt_type_data = accnt_type_obj.browse(cr, uid, accnt_type_ids[0])
if accnt_type_data.close_method=='none' or account.type == 'view':
continue
if account.close_method=='balance':
if accnt_type_data.close_method=='balance':
if abs(account.balance)>0.0001:
pool.get('account.move.line').create(cr, uid, {
'debit': account.balance>0 and account.balance,
@@ -103,7 +106,7 @@ def _data_save(self, cr, uid, data, context):
'period_id': period.id,
'account_id': account.id
}, {'journal_id': new_journal.id, 'period_id':period.id})
if account.close_method=='unreconciled':
if accnt_type_data.close_method=='unreconciled':
offset = 0
limit = 100
while True:
@@ -130,7 +133,7 @@ def _data_save(self, cr, uid, data, context):
'period_id': period.id,
})
offset += limit
if account.close_method=='detail':
if accnt_type_data.close_method=='detail':
offset = 0
limit = 100
while True:
addons/l10n_chart_uk_minimal/account_chart.xml
+1 -43
View File
@@ -17,8 +17,6 @@
<field name="name">Account Chart UK</field>
<field name="close_method">none</field>
<field eval="0" name="parent_id"/>
<field name="type">view</field>
@@ -36,8 +34,6 @@
<field name="name">Balance Sheet</field>
<field name="close_method">none</field>
<field ref="chart0" name="parent_id"/>
<field name="type">view</field>
@@ -51,8 +47,6 @@
<field name="name">Fixed Assets</field>
<field name="close_method">none</field>
<field ref="bal" name="parent_id"/>
<field name="type">view</field>
@@ -66,8 +60,6 @@
<field name="name">Fixed Asset Account</field>
<field name="close_method">balance</field>
<field ref="fas" name="parent_id"/>
<field name="type">asset</field>
@@ -81,8 +73,6 @@
<field name="name">Net Current Assets</field>
<field name="close_method">none</field>
<field ref="bal" name="parent_id"/>
<field name="type">view</field>
@@ -96,9 +86,7 @@
<field name="name">Current Assets</field>
<field name="close_method">none</field>
<field ref="nca" name="parent_id"/>
<field ref="nca" name="parent_id"/>
<field name="type">view</field>
@@ -113,8 +101,6 @@
<field name="name">Purchased Stocks</field>
<field name="close_method">unreconciled</field>
<field ref="cas" name="parent_id"/>
<field name="type">asset</field>
@@ -130,8 +116,6 @@
<field name="name">Debtors</field>
<field name="close_method">balance</field>
<field ref="cas" name="parent_id"/>
<field name="type">receivable</field>
@@ -153,8 +137,6 @@
<field name="name">Output VAT</field>
<field name="close_method">balance</field>
<field ref="cas" name="parent_id"/>
<field name="type">tax</field>
@@ -168,8 +150,6 @@
<field name="name">Bank Current Account</field>
<field name="close_method">balance</field>
<field ref="cas" name="parent_id"/>
<field name="type">cash</field>
@@ -185,8 +165,6 @@
<field name="name">Cash</field>
<field name="close_method">balance</field>
<field ref="cas" name="parent_id"/>
<field name="type">cash</field>
@@ -200,8 +178,6 @@
<field name="name">Current Liabilities</field>
<field name="close_method">none</field>
<field ref="nca" name="parent_id"/>
<field name="type">view</field>
@@ -217,8 +193,6 @@
<field name="name">Creditors</field>
<field name="close_method">balance</field>
<field ref="cli" name="parent_id"/>
<field name="type">payable</field>
@@ -240,8 +214,6 @@
<field name="name">Input VAT</field>
<field name="close_method">balance</field>
<field ref="cli" name="parent_id"/>
<field name="type">tax</field>
@@ -259,8 +231,6 @@
<field name="name">Profit and Loss</field>
<field name="close_method">none</field>
<field ref="chart0" name="parent_id"/>
<field name="type">view</field>
@@ -274,8 +244,6 @@
<field name="name">Revenue</field>
<field name="close_method">none</field>
<field ref="gpf" name="parent_id"/>
<field name="type">view</field>
@@ -291,8 +259,6 @@
<field name="name">Product Sales</field>
<field name="close_method">unreconciled</field>
<field ref="rev" name="parent_id"/>
<field name="type">income</field>
@@ -312,8 +278,6 @@
<field name="name">Cost of Sales</field>
<field name="close_method">none</field>
<field ref="gpf" name="parent_id"/>
<field name="type">view</field>
@@ -329,8 +293,6 @@
<field name="name">Cost of Goods Sold</field>
<field name="close_method">unreconciled</field>
<field ref="cos" name="parent_id"/>
<field name="type">expense</field>
@@ -344,8 +306,6 @@
<field name="name">Overheads</field>
<field name="close_method">none</field>
<field ref="gpf" name="parent_id"/>
<field name="type">view</field>
@@ -361,8 +321,6 @@
<field name="name">Expenses</field>
<field name="close_method">unreconciled</field>
<field ref="ovr" name="parent_id"/>
<field name="type">expense</field>
addons/l10n_fr/plan-99-03_societe.xml
+8 -1939
View File
File diff suppressed because it is too large Load Diff
addons/l10n_fr/types.xml
+16 -12
View File
@@ -3,40 +3,44 @@
<data noupdate="True">
<!--
#
# Plan comptable général pour la France, conforme au
# Plan comptable général pour la France, conforme au
# Règlement n° 99-03 du 29 avril 1999
# Version applicable au 1er janvier 2005.
# Règlement disponible sur http://erp-libre.info
# Mise en forme et paramétrage par http://sisalp.fr et http://nbconseil.net
# version du fichier : 01-01-2007
-->
<!-- Nouveaux types de comptes -->
<record id="account_type_dettes" model="account.account.type">
<field name="name">dettes long terme</field>
<field name="code">dettes</field>
<field name="close_method">balance</field>
</record>
<record id="account_type_immobilisations" model="account.account.type">
<field name="name">immobilisations</field>
<field name="code">immobilisations</field>
<field name="close_method">balance</field>
</record>
<record id="account_type_stocks" model="account.account.type">
<field name="name">stocks</field>
<field name="code">stocks</field>
<field name="close_method">balance</field>
</record>
<record id="account_type_cloture" model="account.account.type">
<field name="name">Cloture</field>
<field name="code">cloture</field>
<field name="close_method">none</field>
</record>
<!-- Journaux de saisie -->
<record id="operations_journal" model="account.journal">
<field name="name">Journal des opérations diverses</field>
@@ -55,6 +59,6 @@
<field name="view_id" ref="account.account_journal_view"/>
<field name="sequence_id" ref="account.sequence_journal"/>
</record>
</data>
</terp>
addons/membership/membership_demo.xml
-1
View File
@@ -51,7 +51,6 @@
<field name="name">membership account</field>
<field name="code">1254</field>
<field name="company_id" ref="base.main_company"/>
<field name="close_method">balance</field>
<field eval="1" name="sign"/>
<field eval="1" name="active"/>
<field name="type">asset</field>