Better chart of account and tax statement
Product
	Better packaging types
Account
	name_get on account.tax.codes

bzr revid: fp@tinyerp.com-9f576ee0bac35ac49dc06c4187038f9c794b0a73
This commit is contained in:
Fabien Pinckaers 2007-08-06 12:46:10 +00:00
parent 647938e705
commit 2b9ec4d5c0
3 changed files with 184 additions and 53 deletions

View File

@ -858,6 +858,12 @@ class account_tax_code(osv.osv):
'line_ids': fields.one2many('account.move.line', 'tax_code_id', 'Lines'),
'company_id': fields.many2one('res.company', 'Company', required=True),
}
def name_get(self, cr, uid, ids, context={}):
if not len(ids):
return []
reads = self.read(cr, uid, ids, ['name','code'], context)
return map(lambda x: (x['id'],x['code'] or x['name']), reads)
def _default_company(self, cr, uid, context={}):
user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
if user.company_id:
@ -879,7 +885,7 @@ class account_tax_code(osv.osv):
_constraints = [
(_check_recursion, 'Error ! You can not create recursive accounts.', ['parent_id'])
]
_order = 'name'
_order = 'code,name'
account_tax_code()
class account_tax(osv.osv):

View File

@ -6367,56 +6367,170 @@
#
# Tax Code Configuration
#
<record model="account.tax.code" id="vat_code_a82">
<field name="name">A82</field>
</record>
<record model="account.tax.code" id="vat_code_a86">
<field name="name">A86</field>
</record>
<record model="account.tax.code" id="vat_code_a84">
<field name="name">A84</field>
</record>
<record model="account.tax.code" id="vat_code_a85">
<field name="name">A85</field>
</record>
<record model="account.tax.code" id="vat_code_a87">
<field name="name">A87</field>
</record>
<record model="account.tax.code" id="vat_code_a64">
<field name="name">A64</field>
</record>
<record model="account.tax.code" id="vat_code_a58">
<field name="name">A58</field>
</record>
<record model="account.tax.code" id="vat_code_a59">
<field name="name">A59</field>
</record>
<record model="account.tax.code" id="vat_code_a54">
<field name="name">A54</field>
</record>
<record model="account.tax.code" id="vat_code_a55">
<field name="name">A55</field>
</record>
<record model="account.tax.code" id="vat_code_a56">
<field name="name">A56</field>
</record>
<record model="account.tax.code" id="vat_code_a49">
<field name="name">A49</field>
</record>
<record model="account.tax.code" id="vat_code_a45">
<field name="name">A45</field>
</record>
<record model="account.tax.code" id="vat_code_a03">
<field name="name">A03</field>
<record model="account.tax.code" id="vat_code_out">
<field name="name">II. Operations a la sortie</field>
</record>
<record model="account.tax.code" id="vat_code_a00">
<field name="name">A00</field>
<field name="code">00</field>
<field name="parent_id" ref="vat_code_out"/>
<field name="name">Operations soumises a un regime particulier</field>
</record>
<record model="account.tax.code" id="vat_code_a01">
<field name="name">A01</field>
<field name="code">01</field>
<field name="parent_id" ref="vat_code_out"/>
<field name="name">Operations avec TVA a 6%</field>
</record>
<record model="account.tax.code" id="vat_code_a02">
<field name="name">A02</field>
<field name="code">02</field>
<field name="parent_id" ref="vat_code_out"/>
<field name="name">Operations avec TVA a 12%</field>
</record>
<record model="account.tax.code" id="vat_code_a03">
<field name="code">03</field>
<field name="parent_id" ref="vat_code_out"/>
<field name="name">Operations avec TVA a 21%</field>
</record>
<record model="account.tax.code" id="vat_code_a45">
<field name="code">45</field>
<field name="name">Operations avec TVA due par le concotractant</field>
<field name="parent_id" ref="vat_code_out"/>
</record>
<record model="account.tax.code" id="vat_code_a46">
<field name="code">46</field>
<field name="name">Livraisons intra-communautaire exemptees</field>
<field name="parent_id" ref="vat_code_out"/>
</record>
<record model="account.tax.code" id="vat_code_a47">
<field name="code">47</field>
<field name="name">Autres operations exemptees</field>
<field name="parent_id" ref="vat_code_out"/>
</record>
<record model="account.tax.code" id="vat_code_a4X">
<field name="name">Notes de credit et corrections negatives</field>
<field name="parent_id" ref="vat_code_out"/>
</record>
<record model="account.tax.code" id="vat_code_a48">
<field name="name">Notes de credit aux operations grille 46</field>
<field name="code">48</field>
<field name="parent_id" ref="vat_code_a4X"/>
</record>
<record model="account.tax.code" id="vat_code_a49">
<field name="name">Notes de credit aux operations du point II</field>
<field name="code">49</field>
<field name="parent_id" ref="vat_code_a4X"/>
</record>
<record model="account.tax.code" id="vat_code_tax_balance">
<field name="name">V. Solde des taxes dues a l'Etat</field>
</record>
<record model="account.tax.code" id="vat_code_tax_out">
<field name="name">IV. Taxes dues</field>
<field name="code">xx</field>
<field name="parent_id" ref="vat_code_tax_balance"/>
</record>
<record model="account.tax.code" id="vat_code_a54">
<field name="code">54</field>
<field name="name">TVA sur operations des grilles 01,02,03</field>
<field name="parent_id" ref="vat_code_tax_out"/>
</record>
<record model="account.tax.code" id="vat_code_a55">
<field name="code">55</field>
<field name="name">TVA sur operations des grilles 86</field>
<field name="parent_id" ref="vat_code_tax_out"/>
</record>
<record model="account.tax.code" id="vat_code_a56">
<field name="code">56</field>
<field name="name">TVA sur operations des grilles 87</field>
<field name="parent_id" ref="vat_code_tax_out"/>
</record>
<record model="account.tax.code" id="vat_code_a57">
<field name="code">57</field>
<field name="name">TVA relatives aux importations</field>
<field name="parent_id" ref="vat_code_tax_out"/>
</record>
<record model="account.tax.code" id="vat_code_a61">
<field name="code">61</field>
<field name="name">Diverses regularisations en faveur de l'Etat</field>
<field name="parent_id" ref="vat_code_tax_out"/>
</record>
<record model="account.tax.code" id="vat_code_a63">
<field name="code">63</field>
<field name="name">TVA a reverser sur notes de credit recues</field>
<field name="parent_id" ref="vat_code_tax_out"/>
</record>
<record model="account.tax.code" id="vat_code_tax_in">
<field name="name">V. Taxes deductibles</field>
<field name="code">yy</field>
<field name="parent_id" ref="vat_code_tax_balance"/>
</record>
<record model="account.tax.code" id="vat_code_a59">
<field name="code">59</field>
<field name="name">T.V.A. deductible</field>
<field name="parent_id" ref="vat_code_tax_in"/>
</record>
<record model="account.tax.code" id="vat_code_a62">
<field name="code">62</field>
<field name="name">Regularisations TVA en faveur du declarant</field>
<field name="parent_id" ref="vat_code_tax_in"/>
</record>
<record model="account.tax.code" id="vat_code_a64">
<field name="code">64</field>
<field name="name">TVA a recuperer sur notes de credit delivrees</field>
<field name="parent_id" ref="vat_code_tax_in"/>
</record>
<record model="account.tax.code" id="vat_code_in">
<field name="name">III. Operations a l'entree</field>
</record>
<record model="account.tax.code" id="vat_code_a81">
<field name="code">81</field>
<field name="name">Marchandises, matieres premieres et auxiliaires</field>
<field name="parent_id" ref="vat_code_in"/>
</record>
<record model="account.tax.code" id="vat_code_a82">
<field name="code">82</field>
<field name="name">Services et biens divers</field>
<field name="parent_id" ref="vat_code_in"/>
</record>
<record model="account.tax.code" id="vat_code_a83">
<field name="code">83</field>
<field name="name">Biens d'investissement</field>
<field name="parent_id" ref="vat_code_in"/>
</record>
<record model="account.tax.code" id="vat_code_a84">
<field name="code">84</field>
<field name="name">Notes de credits sur operations case 86</field>
<field name="parent_id" ref="vat_code_in"/>
</record>
<record model="account.tax.code" id="vat_code_a85">
<field name="code">85</field>
<field name="name">Notes de credits autres operations</field>
<field name="parent_id" ref="vat_code_in"/>
</record>
<record model="account.tax.code" id="vat_code_a86">
<field name="code">86</field>
<field name="name">Acquisition intra-communautaires et ventes ABC</field>
<field name="parent_id" ref="vat_code_in"/>
</record>
<record model="account.tax.code" id="vat_code_a87">
<field name="code">87</field>
<field name="name">Autres operations</field>
<field name="parent_id" ref="vat_code_in"/>
</record>
@ -6433,7 +6547,7 @@
<field name="base_code_id" ref="vat_code_a01"/>
<field name="tax_code_id" ref="vat_code_a49"/>
<field name="ref_base_code_id" ref="vat_code_a54"/>
<field name="ref_tax_code_id" ref="vat_code_a64"/>
<field name="ref_tax_code_id" ref="vat_code_a63"/>
</record>
<record model="account.tax" id="vat_12">
@ -6445,17 +6559,28 @@
</record>
<record model="account.tax" id="vat_21">
<field name="name">VAT 21%</field>
<field name="name">VAT 21% - Ventes</field>
<field name="amount" eval="0.21"/>
<field name="type">percent</field>
<field name="account_collected_id" ref="vat_payable21"/>
<field name="account_paid_id" ref="vat_refund21"/>
<field name="base_code_id" ref="vat_code_a03"/>
<field name="tax_code_id" ref="vat_code_a49"/>
<field name="ref_base_code_id" ref="vat_code_a54"/>
<field name="ref_tax_code_id" ref="vat_code_a64"/>
<field name="base_code_id" ref="vat_code_a03"/>
<field name="tax_code_id" ref="vat_code_a54"/>
<field name="ref_base_code_id" ref="vat_code_a49"/>
<field name="ref_tax_code_id" ref="vat_code_a64"/>
</record>
<record model="account.tax" id="vat_21_buy">
<field name="name">VAT 21% - Achats</field>
<field name="amount" eval="0.21"/>
<field name="type">percent</field>
<field name="account_collected_id" ref="vat_refund21"/>
<field name="account_paid_id" ref="vat_payable21"/>
<field name="base_code_id" ref="vat_code_a81"/>
<field name="tax_code_id" ref="vat_code_a59"/>
<field name="ref_base_code_id" ref="vat_code_a85"/>
<field name="ref_tax_code_id" ref="vat_code_a63"/>
</record>
<record model="account.tax" id="vat_0">
<field name="name">VAT 0%</field>
<field name="amount" eval="0.00"/>

View File

@ -95,7 +95,7 @@ class product_ul(osv.osv):
_description = "Shipping Unit"
_columns = {
'name' : fields.char('Name', size=64),
'type' : fields.selection([('box', 'Box'), ('carton', 'Carton')], 'Type', required=True),
'type' : fields.selection([('unit','Unit'),('pack','Pack'),('box', 'Box'), ('palet', 'Palet')], 'Type', required=True),
}
product_ul()