Skip to content

Commit 3eca355

Browse files
mtnarjanmtnarjan
committed
[WIP] module installs now
1 parent bead61d commit 3eca355

File tree

7 files changed

+65
-28
lines changed

7 files changed

+65
-28
lines changed

‎__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
# <http://www.gnu.org/licenses/>.
1818
#
1919
##############################################################################
20-
#from . import models
20+
from . import models

‎__openerp__.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@
4343
"data": [
4444
#"data/tax_codes.xml",
4545
"data/new_accounts.xml",
46-
#"data/chart_of_accounts.xml",
47-
#"data/taxes.xml",
48-
#"data/fiscal_positions.xml",
49-
#"views/fiscal_position.xml",
50-
#"views/invoice.xml",
46+
"data/chart_of_accounts.xml",
47+
"data/new_taxes.xml",
48+
"data/fiscal_positions.xml",
49+
"views/fiscal_position.xml",
50+
"views/invoice.xml",
5151
],
5252
"active": False,
5353
"installable": True,

‎data/chart_of_accounts.xml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,18 @@
44

55
<record id="chart_template_fi_rapko" model="account.chart.template">
66
<field name="name">Finnish Chart of Accounts (Raportointikoodisto)</field>
7+
<!--
78
<field name="account_root_id" ref="a0"/>
89
<field name="tax_code_root_id" ref="tax_code_root"/>
910
<field name="bank_account_view_id" ref="a1901"/>
10-
<field name="property_account_receivable" ref="a1700"/>
11-
<field name="property_account_payable" ref="a29060"/>
12-
<field name="property_account_expense_categ" ref="a4000"/>
13-
<field name="property_account_income_categ" ref="a300000"/>
11+
-->
12+
<field name="code_digits">5</field>
13+
<field name="currency_id" ref="base.EUR"/>
14+
<field name="property_account_receivable_id" ref="a1700"/>
15+
<field name="property_account_payable_id" ref="a29060"/>
16+
<field name="property_account_expense_categ_id" ref="a4000"/>
17+
<field name="property_account_income_categ_id" ref="a300000"/>
18+
<field name="transfer_account_id" ref="a10666"/>
1419
</record>
1520

1621
</data>

‎data/new_accounts.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
<openerp>
22
<data noupdate="0">
3+
<record model="account.account.template" id="a10666">
4+
<field name="code">10666</field>
5+
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
6+
<field name="name">Placeholder thingy</field>
7+
</record>
38
<record model="account.account.template" id="a10002">
49
<field name="code">10002</field>
510
<field name="user_type_id" ref="account.data_account_type_current_assets"/>

‎data/new_taxes.xml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
<field name="sequence">34</field>
3636
<field name="chart_template_id" ref="chart_template_fi_rapko"/>
3737
<field name="name">VAT 0 % Export</field>
38-
<field name="amount_type">none</field>
39-
<field name="type_tax_use">sale</field>
38+
<field name="amount_type">fixed</field>
39+
<field name="amount">0</field><field name="type_tax_use">sale</field>
4040
</record>
4141

4242
<record id="purchase_vat24" model="account.tax.template">
@@ -76,12 +76,12 @@
7676
<field name="chart_template_id" ref="chart_template_fi_rapko"/>
7777
<field name="description">YTO 24 %</field>
7878
<field name="name">VAT 24 %, Goods</field>
79-
<field name="amount_type">balance</field>
79+
<field name="amount_type">division</field>
8080
<field name="applicable_type">code</field>
8181
<field name="python_applicable">result = product.type != 'service'
8282
</field>
8383
<field name="child_depend" eval="True"/>
84-
<field name="type_tax_use">purchase</field>
84+
<field name="amount">0.24</field><field name="type_tax_use">purchase</field>
8585
</record>
8686
<record id="purchase_vat_ic_goods_24_carry" model="account.tax.template">
8787
<field name="parent_id" ref="purchase_vat_ic_goods_24"/>
@@ -118,12 +118,12 @@
118118
<field name="chart_template_id" ref="chart_template_fi_rapko"/>
119119
<field name="description">YTO 14 %</field>
120120
<field name="name">VAT 14 %, Goods</field>
121-
<field name="amount_type">balance</field>
121+
<field name="amount_type">division</field>
122122
<field name="applicable_type">code</field>
123123
<field name="python_applicable">result = product.type != 'service'
124124
</field>
125125
<field name="child_depend" eval="True"/>
126-
<field name="type_tax_use">purchase</field>
126+
<field name="amount">0.14</field><field name="type_tax_use">purchase</field>
127127
</record>
128128
<record id="purchase_vat_ic_goods_14_carry" model="account.tax.template">
129129
<field name="parent_id" ref="purchase_vat_ic_goods_14"/>
@@ -160,12 +160,12 @@
160160
<field name="chart_template_id" ref="chart_template_fi_rapko"/>
161161
<field name="description">YTO 10 %</field>
162162
<field name="name">VAT 10 %, Goods</field>
163-
<field name="amount_type">balance</field>
163+
<field name="amount_type">division</field>
164164
<field name="applicable_type">code</field>
165165
<field name="python_applicable">result = product.type != 'service'
166166
</field>
167167
<field name="child_depend" eval="True"/>
168-
<field name="type_tax_use">purchase</field>
168+
<field name="amount">0.10</field><field name="type_tax_use">purchase</field>
169169
</record>
170170
<record id="purchase_vat_ic_goods_10_carry" model="account.tax.template">
171171
<field name="parent_id" ref="purchase_vat_ic_goods_10"/>
@@ -202,12 +202,12 @@
202202
<field name="chart_template_id" ref="chart_template_fi_rapko"/>
203203
<field name="description">YPO 24 %</field>
204204
<field name="name">VAT 24 %, Services</field>
205-
<field name="amount_type">balance</field>
205+
<field name="amount_type">division</field>
206206
<field name="applicable_type">code</field>
207207
<field name="python_applicable">result = product.type == 'service'
208208
</field>
209209
<field name="child_depend" eval="True"/>
210-
<field name="type_tax_use">purchase</field>
210+
<field name="amount">0.24</field><field name="type_tax_use">purchase</field>
211211
</record>
212212
<record id="purchase_vat_ic_services_24_carry" model="account.tax.template">
213213
<field name="parent_id" ref="purchase_vat_ic_services_24"/>
@@ -244,12 +244,12 @@
244244
<field name="chart_template_id" ref="chart_template_fi_rapko"/>
245245
<field name="description">YPO 14 %</field>
246246
<field name="name">VAT 14 %, Services</field>
247-
<field name="amount_type">balance</field>
247+
<field name="amount_type">division</field>
248248
<field name="applicable_type">code</field>
249249
<field name="python_applicable">result = product.type == 'service'
250250
</field>
251251
<field name="child_depend" eval="True"/>
252-
<field name="type_tax_use">purchase</field>
252+
<field name="amount">0.14</field><field name="type_tax_use">purchase</field>
253253
</record>
254254
<record id="purchase_vat_ic_services_14_carry" model="account.tax.template">
255255
<field name="parent_id" ref="purchase_vat_ic_services_14"/>
@@ -286,12 +286,12 @@
286286
<field name="chart_template_id" ref="chart_template_fi_rapko"/>
287287
<field name="description">YPO 10 %</field>
288288
<field name="name">VAT 10 %, Services</field>
289-
<field name="amount_type">balance</field>
289+
<field name="amount_type">division</field>
290290
<field name="applicable_type">code</field>
291291
<field name="python_applicable">result = product.type == 'service'
292292
</field>
293293
<field name="child_depend" eval="True"/>
294-
<field name="type_tax_use">purchase</field>
294+
<field name="amount">0.10</field><field name="type_tax_use">purchase</field>
295295
</record>
296296
<record id="purchase_vat_ic_services_10_carry" model="account.tax.template">
297297
<field name="parent_id" ref="purchase_vat_ic_services_10"/>
@@ -329,13 +329,13 @@
329329
<field name="chart_template_id" ref="chart_template_fi_rapko"/>
330330
<field name="description">YTM 0 %</field>
331331
<field name="name">VAT 0 %, Goods (Intra-Community Supply)</field>
332-
<field name="amount_type">none</field>
332+
<field name="amount_type">fixed</field>
333333
<field name="applicable_type">code</field>
334334
<field name="python_applicable">result = product.type != 'service'
335335
</field>
336336
<field name="ref_base_sign">-1</field>
337337
<field name="ref_tax_sign">-1</field>
338-
<field name="type_tax_use">sale</field>
338+
<field name="amount">0</field><field name="type_tax_use">sale</field>
339339
</record>
340340

341341
<!-- EU Sales Services -->
@@ -344,13 +344,13 @@
344344
<field name="chart_template_id" ref="chart_template_fi_rapko"/>
345345
<field name="description">YPM 0 %</field>
346346
<field name="name">VAT 0 %, Services (Intra-Community Supply)</field>
347-
<field name="amount_type">none</field>
347+
<field name="amount_type">fixed</field>
348348
<field name="applicable_type">code</field>
349349
<field name="python_applicable">result = product.type == 'service'
350350
</field>
351351
<field name="ref_base_sign">-1</field>
352352
<field name="ref_tax_sign">-1</field>
353-
<field name="type_tax_use">sale</field>
353+
<field name="amount">0</field><field name="type_tax_use">sale</field>
354354
</record>
355355

356356

‎data/taxes_pulautin.py‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,29 @@ def parse_rec(rec):
1010
name = field.get('name')
1111
if name == 'type':
1212
field.set('name', 'amount_type')
13+
if field.text == 'none':
14+
field.text = 'fixed'
15+
amount = etree.Element('field', attrib={'name': 'amount'})
16+
amount.text = '0'
17+
rec.insert(-1, amount)
18+
elif field.text == 'balance':
19+
field.text = 'division'
1320
elif name == 'account_collected_id':
1421
rec.remove(field)
1522
elif name == 'account_paid_id':
1623
field.set('name', 'account_id')
1724
elif name in ['base_code_id', 'tax_code_id', 'ref_tax_code_id', 'ref_base_code_id']:
1825
rec.remove(field)
1926
# Todo: use tags
27+
has_amount = False
28+
for field in rec.findall('field'):
29+
if field.get('name') == 'amount':
30+
has_amount = True
31+
break
32+
if not has_amount:
33+
amount = etree.Element('field', attrib={'name': 'amount'})
34+
amount.text = 'fixme'
35+
rec.insert(-1, amount)
2036

2137

2238
def parse():

‎models/account.py‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,17 @@ class FiscalPositionTaxTemplate(models.Model):
7878

7979
class FiscalPosition(models.Model):
8080
_inherit = 'account.fiscal.position'
81+
'''
82+
product_type = fields.Selection(
83+
[
84+
('service', 'Service'),
85+
('goods', 'Goods')
86+
],
87+
string='Product Type',
88+
required=False,
89+
help='The product type this rule only applies to.'
90+
)
91+
'''
8192

8293
# noinspection PyMethodMayBeStatic
8394
def _applies_to_mapping(self, product, mapping):

0 commit comments

Comments
 (0)