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

[MERGE] forward port of branch 9.0 up to a2c5fe4

Browse Source
This commit is contained in:
Christophe Simonis
2016-03-24 15:10:36 +01:00
parent b54b888305 a2c5fe4a64
commit 9e4157b648
23 changed files with 463 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account_full_reconcile/__init__.py
+85 -74
View File
@@ -19,79 +19,90 @@ def _migrate_full_reconcile(cr, registry):
WHERE table_name = 'account_move_line'
AND column_name = 'reconcile_id'
""")
if not cr.fetchone():
#if no, it's a fresh v9 database and we cannot migrate anything. Rebuild the whole table based on partial
all_partial_rec_ids = registry['account.partial.reconcile'].search(cr, SUPERUSER_ID, [])
already_processed = {}
for partial in registry['account.partial.reconcile'].browse(cr, SUPERUSER_ID, all_partial_rec_ids):
partial_rec_set = OrderedDict.fromkeys([partial])
aml_set = set()
total_debit = 0
total_credit = 0
for partial_rec in partial_rec_set:
if partial_rec in already_processed:
continue
for aml in [partial_rec.debit_move_id, partial_rec.credit_move_id]:
if aml not in aml_set:
total_debit += aml.debit
total_credit += aml.credit
aml_set |= set([aml])
for x in aml.matched_debit_ids | aml.matched_credit_ids:
partial_rec_set[x] = None
partial_rec_ids = []
for x in partial_rec_set.keys():
partial_rec_ids.append(x.id)
already_processed[x] = None
aml_ids = [x.id for x in aml_set]
if aml_ids and partial_rec_ids:
#then, if the total debit and credit are equal, the reconciliation is full
digits_rounding_precision = aml.company_id.currency_id.rounding
if float_compare(total_debit, total_credit, precision_rounding=digits_rounding_precision) == 0:
#in that case, mark the reference on the partial reconciliations and the entries
registry['account.full.reconcile'].create(cr, SUPERUSER_ID, {
'partial_reconcile_ids': [(6, 0, partial_rec_ids)],
'reconciled_line_ids': [(6, 0, aml_ids)]
}, context={'check_move_validity': False})
return
#otherwise, use the table account_move_reconcile if it exists (not dropped by migration)
cr.execute("SELECT 1 FROM information_schema.tables WHERE table_name = 'account_move_reconcile'")
if cr.fetchone():
#account_move_reconcile exists
#copy old table
cr.execute("""
INSERT INTO account_full_reconcile (id, name, create_date)
SELECT id, name, create_date
FROM account_move_reconcile
WHERE id IN (
SELECT DISTINCT reconcile_id FROM account_move_line WHERE reconcile_id IS NOT NULL)
""")
else:
#account_move_reconcile was dropped during migration, rebuild that table
cr.execute("""
INSERT INTO account_full_reconcile (id, name)
SELECT DISTINCT reconcile_id, reconcile_ref FROM account_move_line WHERE reconcile_id IS NOT NULL
""")
#update the index of account_full_reconcile
cr.execute("SELECT setval('account_full_reconcile_id_seq', (SELECT MAX(id) FROM account_full_reconcile))")
#if yes, use the table account_move_reconcile if it exists (not dropped by migration)
cr.execute("SELECT 1 FROM information_schema.tables WHERE table_name = 'account_move_reconcile'")
if cr.fetchone():
#account_move_reconcile exists
#copy old table
cr.execute("""
INSERT INTO account_full_reconcile (id, name, create_date)
SELECT id, name, create_date
FROM account_move_reconcile
WHERE id IN (
SELECT DISTINCT reconcile_id FROM account_move_line WHERE reconcile_id IS NOT NULL)
""")
else:
#account_move_reconcile was dropped during migration, rebuild that table
cr.execute("""
INSERT INTO account_full_reconcile (id, name)
SELECT DISTINCT reconcile_id, reconcile_ref FROM account_move_line WHERE reconcile_id IS NOT NULL
""")
#update the index of account_full_reconcile
cr.execute("SELECT setval('account_full_reconcile_id_seq', (SELECT MAX(id) FROM account_full_reconcile))")
#copy values on account.move.line
cr.execute("UPDATE account_move_line SET full_reconcile_id = reconcile_id WHERE reconcile_id IS NOT NULL")
#copy the full_reconcile_id existing of account.move.line to their account.partial.reconcile
cr.execute("""
WITH tmp_table AS (
SELECT rec.id AS partial_id, aml.reconcile_id AS full_id
FROM account_move_line aml
RIGHT JOIN account_partial_reconcile rec
ON aml.id = rec.debit_move_id
WHERE aml.reconcile_id IS NOT NULL
UNION
SELECT rec.id AS partial_id, aml.reconcile_id AS full_id
FROM account_move_line aml
RIGHT JOIN account_partial_reconcile rec
ON aml.id = rec.credit_move_id
WHERE aml.reconcile_id IS NOT NULL)
UPDATE account_partial_reconcile p
SET full_reconcile_id = (SELECT full_id FROM tmp_table tmp WHERE p.id = tmp.partial_id)
WHERE p.id IN (SELECT partial_id FROM tmp_table)
""")
#copy the full_reconcile_id existing of account.move.line to their account.partial.reconcile
cr.execute("""
WITH tmp_table AS (
SELECT partial_id, MAX(full_id) AS full_id FROM (
SELECT rec.id AS partial_id, aml.reconcile_id AS full_id
FROM account_move_line aml
RIGHT JOIN account_partial_reconcile rec
ON aml.id = rec.debit_move_id
WHERE aml.reconcile_id IS NOT NULL
UNION
SELECT rec.id AS partial_id, aml.reconcile_id AS full_id
FROM account_move_line aml
RIGHT JOIN account_partial_reconcile rec
ON aml.id = rec.credit_move_id
WHERE aml.reconcile_id IS NOT NULL) tmp_table_with_duplicated_recs
GROUP BY partial_id HAVING COUNT(partial_id) = 1)
UPDATE account_partial_reconcile p
SET full_reconcile_id = tmp.full_id FROM tmp_table tmp WHERE p.id = tmp.partial_id
""")
#if it's a fresh v9 database, or it has been used after the migration, we need to fill the table based on partial
all_partial_rec_ids = registry['account.partial.reconcile'].search(cr, SUPERUSER_ID, [('full_reconcile_id', '=', False)])
already_processed = {}
for partial in registry['account.partial.reconcile'].browse(cr, SUPERUSER_ID, all_partial_rec_ids):
partial_rec_set = OrderedDict.fromkeys([partial])
aml_set = set()
total_debit = 0
total_credit = 0
for partial_rec in partial_rec_set:
if partial_rec in already_processed:
continue
for aml in [partial_rec.debit_move_id, partial_rec.credit_move_id]:
if aml not in aml_set:
total_debit += aml.debit
total_credit += aml.credit
aml_set |= set([aml])
for x in aml.matched_debit_ids | aml.matched_credit_ids:
partial_rec_set[x] = None
partial_rec_ids = []
for x in partial_rec_set.keys():
partial_rec_ids.append(x.id)
already_processed[x] = None
aml_ids = [x.id for x in aml_set]
if aml_ids and partial_rec_ids:
#then, if the total debit and credit are equal, the reconciliation is full
digits_rounding_precision = aml.company_id.currency_id.rounding
if float_compare(total_debit, total_credit, precision_rounding=digits_rounding_precision) == 0:
#in that case, mark the reference on the partial reconciliations and the entries
registry['account.full.reconcile'].create(cr, SUPERUSER_ID, {
'partial_reconcile_ids': [(6, 0, partial_rec_ids)],
}, context={'check_move_validity': False})
#copy values on account.move.line: rely on partial reconciliations only, as the reconcile_id column may not be
#up-to-date, as unreconciliations/new reconciliations may have been done after migration
cr.execute("""
WITH tmp_table AS (
SELECT debit_move_id AS aml_id, full_reconcile_id
FROM account_partial_reconcile rec
WHERE rec.full_reconcile_id IS NOT NULL
UNION ALL
SELECT credit_move_id AS aml_id, full_reconcile_id
FROM account_partial_reconcile rec
WHERE rec.full_reconcile_id IS NOT NULL)
UPDATE account_move_line aml
SET full_reconcile_id = tmp.full_reconcile_id FROM tmp_table tmp WHERE aml.id = tmp.aml_id
""")
return
addons/crm/crm_lead.py
+2
View File
@@ -290,6 +290,8 @@ class crm_lead(format_address, osv.osv):
def on_change_user(self, cr, uid, ids, user_id, context=None):
""" When changing the user, also set a team_id or restrict team id
to the ones user_id is member of. """
if not context:
context = {}
if user_id and context.get('team_id'):
team = self.pool['crm.team'].browse(cr, uid, context['team_id'], context=context)
if user_id in team.member_ids.ids:
addons/crm/views/crm_action_views.xml
+1
View File
@@ -25,6 +25,7 @@
<field name="team_id"/>
<field name="description"/>
<field name="days"/>
<field name="default"/>
</group>
<group>
<field name="activity_1_id"/>
addons/gamification/models/badge.py
+4 -4
View File
@@ -21,9 +21,9 @@ class gamification_badge_user(osv.Model):
_rec_name = "badge_name"
_columns = {
'user_id': fields.many2one('res.users', string="User", required=True, ondelete="cascade"),
'user_id': fields.many2one('res.users', string="User", required=True, ondelete="cascade", select=True),
'sender_id': fields.many2one('res.users', string="Sender", help="The user who has send the badge"),
'badge_id': fields.many2one('gamification.badge', string='Badge', required=True, ondelete="cascade"),
'badge_id': fields.many2one('gamification.badge', string='Badge', required=True, ondelete="cascade", select=True),
'challenge_id': fields.many2one('gamification.challenge', string='Challenge originating', help="If this badge was rewarded through a challenge"),
'comment': fields.text('Comment'),
'badge_name': fields.related('badge_id', 'name', type="char", string="Badge Name"),
@@ -182,12 +182,12 @@ class gamification_badge(osv.Model):
'stat_count': fields.function(_get_owners_info, string='Total',
type="integer",
multi='unique_users',
multi='stat_users',
help="The number of time this badge has been received."),
'stat_count_distinct': fields.function(_get_owners_info,
type="integer",
string='Number of users',
multi='unique_users',
multi='stat_users',
help="The number of time this badge has been received by unique users."),
'stat_this_month': fields.function(_get_badge_user_stats,
type="integer",
addons/l10n_et/__openerp__.py
+1 -1
View File
@@ -5,7 +5,7 @@
{
'name': 'Ethiopia - Accounting',
'version': '1.0',
'version': '2.0',
'category': 'Localization/Account Charts',
'description': """
Base Module for Ethiopian Localization
addons/l10n_et/data/account.tax.template.csv
+13 -13
View File
@@ -1,14 +1,14 @@
id,description,chart_template_id:id,type_tax_use,name,amount,amount_type,tag_ids:id,account_id:id,refund_account_id:id
id_tax03,tax03,l10n_et,sale,VAT 15% rated sales,15,percent,tax_tax03,l10n_et3007,l10n_et3007
id_tax04,tax04,l10n_et,sale,VAT 0% rated sales,,percent,tax_tax04,l10n_et3007,l10n_et3007
id_tax06,tax06,l10n_et,sale,VAT Exempt rated sales,,percent,tax_tax06,l10n_et3007,l10n_et3007
id_tax11,tax11,l10n_et,sale,VAT Out of Scope rated sales,,percent,tax_tax11,l10n_et3007,l10n_et3007
id_tax02,tax02,l10n_et,sale,Withholding 2% rated sales,-2,percent,tax_tax02,l10n_et3006,l10n_et3006
id_tax13,tax13,l10n_et,sale,Withholding 35% rated sales,-35,percent,tax_tax13,l10n_et3006,l10n_et3006
id_tax14,tax14,l10n_et,sale,Withholding VAT 15% rated sales,-15,percent,tax_tax14,l10n_et3006,l10n_et3006
id_tax08,tax08,l10n_et,purchase,VAT 15% rated purchases,15,percent,tax_tax08,l10n_et2212,l10n_et2212
id_tax07,tax07,l10n_et,purchase,VAT 0% rated purchases,,percent,tax_tax07,l10n_et2212,l10n_et2212
id_tax10,tax10,l10n_et,purchase,VAT Exempt rated purchases,,percent,tax_tax10,l10n_et2212,l10n_et2212
id_tax09,tax09,l10n_et,purchase,VAT Out of Scope rated purchases,,percent,tax_tax09,l10n_et2212,l10n_et2212
id_tax05,tax05,l10n_et,purchase,Withholding 2% rated purchases,-2,percent,tax_tax05,l10n_et2213,l10n_et2213
id_tax12,tax12,l10n_et,purchase,Withholding 35% rated purchases,-35,percent,tax_tax12,l10n_et2213,l10n_et2213
id_tax03,tax03,l10n_et,sale,VAT 15% rated sales,15,percent,"tag_et_13,tag_et_22",l10n_et3007,l10n_et3007
id_tax04,tax04,l10n_et,sale,VAT 0% rated sales,,percent,tag_et_12,l10n_et3007,l10n_et3007
id_tax06,tax06,l10n_et,sale,VAT Exempt rated sales,,percent,tag_et_11,l10n_et3007,l10n_et3007
id_tax11,tax11,l10n_et,sale,VAT Out of Scope rated sales,,percent,tag_et_10,l10n_et3007,l10n_et3007
id_tax02,tax02,l10n_et,sale,Withholding 2% rated sales,-2,percent,"tag_et_15,tag_et_27",l10n_et3006,l10n_et3006
id_tax13,tax13,l10n_et,sale,Withholding 35% rated sales,-35,percent,"tag_et_16,tag_et_28",l10n_et3006,l10n_et3006
id_tax14,tax14,l10n_et,sale,Withholding VAT 15% rated sales,-15,percent,"tag_et_17,tag_et_29",l10n_et3006,l10n_et3006
id_tax08,tax08,l10n_et,purchase,VAT 15% rated purchases,15,percent,"tag_et_05,tag_et_20",l10n_et2212,l10n_et2212
id_tax07,tax07,l10n_et,purchase,VAT 0% rated purchases,,percent,tag_et_04,l10n_et2212,l10n_et2212
id_tax10,tax10,l10n_et,purchase,VAT Exempt rated purchases,,percent,tag_et_03,l10n_et2212,l10n_et2212
id_tax09,tax09,l10n_et,purchase,VAT Out of Scope rated purchases,,percent,tag_et_02,l10n_et2212,l10n_et2212
id_tax05,tax05,l10n_et,purchase,Withholding 2% rated purchases,-2,percent,"tag_et_07,tag_et_24",l10n_et2213,l10n_et2213
id_tax12,tax12,l10n_et,purchase,Withholding 35% rated purchases,-35,percent,"tag_et_08,tag_et_25",l10n_et2213,l10n_et2213
1 id description chart_template_id:id type_tax_use name amount amount_type tag_ids:id account_id:id refund_account_id:id
2 id_tax03 tax03 l10n_et sale VAT 15% rated sales 15 percent tax_tax03 tag_et_13,tag_et_22 l10n_et3007 l10n_et3007
3 id_tax04 tax04 l10n_et sale VAT 0% rated sales percent tax_tax04 tag_et_12 l10n_et3007 l10n_et3007
4 id_tax06 tax06 l10n_et sale VAT Exempt rated sales percent tax_tax06 tag_et_11 l10n_et3007 l10n_et3007
5 id_tax11 tax11 l10n_et sale VAT Out of Scope rated sales percent tax_tax11 tag_et_10 l10n_et3007 l10n_et3007
6 id_tax02 tax02 l10n_et sale Withholding 2% rated sales -2 percent tax_tax02 tag_et_15,tag_et_27 l10n_et3006 l10n_et3006
7 id_tax13 tax13 l10n_et sale Withholding 35% rated sales -35 percent tax_tax13 tag_et_16,tag_et_28 l10n_et3006 l10n_et3006
8 id_tax14 tax14 l10n_et sale Withholding VAT 15% rated sales -15 percent tax_tax14 tag_et_17,tag_et_29 l10n_et3006 l10n_et3006
9 id_tax08 tax08 l10n_et purchase VAT 15% rated purchases 15 percent tax_tax08 tag_et_05,tag_et_20 l10n_et2212 l10n_et2212
10 id_tax07 tax07 l10n_et purchase VAT 0% rated purchases percent tax_tax07 tag_et_04 l10n_et2212 l10n_et2212
11 id_tax10 tax10 l10n_et purchase VAT Exempt rated purchases percent tax_tax10 tag_et_03 l10n_et2212 l10n_et2212
12 id_tax09 tax09 l10n_et purchase VAT Out of Scope rated purchases percent tax_tax09 tag_et_02 l10n_et2212 l10n_et2212
13 id_tax05 tax05 l10n_et purchase Withholding 2% rated purchases -2 percent tax_tax05 tag_et_07,tag_et_24 l10n_et2213 l10n_et2213
14 id_tax12 tax12 l10n_et purchase Withholding 35% rated purchases -35 percent tax_tax12 tag_et_08,tag_et_25 l10n_et2213 l10n_et2213
addons/l10n_et/data/account_account_tag.xml
+117 -68
View File
@@ -1,71 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<!-- Account Tags -->
<record id="tax_tax03" model="account.account.tag">
<field name="name">tax03</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tax04" model="account.account.tag">
<field name="name">tax04</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tax06" model="account.account.tag">
<field name="name">tax06</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tax11" model="account.account.tag">
<field name="name">tax11</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tax02" model="account.account.tag">
<field name="name">tax02</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tax13" model="account.account.tag">
<field name="name">tax13</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tax14" model="account.account.tag">
<field name="name">tax14</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tax08" model="account.account.tag">
<field name="name">tax08</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tax07" model="account.account.tag">
<field name="name">tax07</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tax10" model="account.account.tag">
<field name="name">tax10</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tax09" model="account.account.tag">
<field name="name">tax09</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tax05" model="account.account.tag">
<field name="name">tax05</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tax12" model="account.account.tag">
<field name="name">tax12</field>
<field name="applicability">taxes</field>
</record>
</odoo>
<record id="tag_et_01" model="account.account.tag">
<field name="name">Taxable Purchases - VAT</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_et_02" model="account.account.tag">
<field name="name">Taxable Purchase VAT Out of Scope</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_et_03" model="account.account.tag">
<field name="name">Taxable Purchase VAT Exempt</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_et_04" model="account.account.tag">
<field name="name">Taxable Purchase VAT Rated 0%</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_et_05" model="account.account.tag">
<field name="name">Taxable Purchase VAT Rated 15%</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_et_06" model="account.account.tag">
<field name="name">Taxable Purchases - Witholding</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_et_07" model="account.account.tag">
<field name="name">Taxable 2% Withholding on Purchases</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_et_08" model="account.account.tag">
<field name="name">Taxable 35% Withholding on Purchases</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_et_09" model="account.account.tag">
<field name="name">Taxable Sales - VAT</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_et_10" model="account.account.tag">
<field name="name">Taxable Sales VAT Out of Scope (Sales)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_et_11" model="account.account.tag">
<field name="name">Taxable Sales VAT Exempt</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_et_12" model="account.account.tag">
<field name="name">Taxable Sales VAT Rated 0%</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_et_13" model="account.account.tag">
<field name="name">Taxable Sales VAT Rated 15%</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_et_14" model="account.account.tag">
<field name="name">Taxable Sales - Withholding</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_et_15" model="account.account.tag">
<field name="name">Taxable 2% Withholding on Sales</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_et_16" model="account.account.tag">
<field name="name">Taxable 35% Withholding on Sales</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_et_17" model="account.account.tag">
<field name="name">Taxable VAT Withholding on Sales</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_et_18" model="account.account.tag">
<field name="name">Net VAT to be Paid/Reclaimed</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_et_19" model="account.account.tag">
<field name="name">Purchase VAT</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_et_20" model="account.account.tag">
<field name="name">Purchase VAT Rated 15%</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_et_21" model="account.account.tag">
<field name="name">Sales VAT</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_et_22" model="account.account.tag">
<field name="name">Sales VAT Rated 15%</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_et_23" model="account.account.tag">
<field name="name">Withholding on Purchases</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_et_24" model="account.account.tag">
<field name="name">2% Withholding on Purchases</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_et_25" model="account.account.tag">
<field name="name">35% Withholding on Purchases</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_et_26" model="account.account.tag">
<field name="name">Withholding on Sales</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_et_27" model="account.account.tag">
<field name="name">2% Withheld on Sales</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_et_28" model="account.account.tag">
<field name="name">35% Withheld on Sales</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_et_29" model="account.account.tag">
<field name="name">VAT Withheld on Sales</field>
<field name="applicability">taxes</field>
</record>
</odoo>
addons/l10n_et/migrations/2.0/post-migrate_tags_on_taxes.py
+6
View File
@@ -0,0 +1,6 @@
from openerp.modules.registry import RegistryManager
def migrate(cr, version):
registry = RegistryManager.get(cr.dbname)
from openerp.addons.account.models.chart_template import migrate_tags_on_taxes
migrate_tags_on_taxes(cr, registry)
addons/l10n_nl/__openerp__.py
+1 -1
View File
@@ -65,7 +65,7 @@
{
'name' : 'Netherlands - Accounting',
'version' : '1.5',
'version' : '2.0',
'category': 'Localization/Account Charts',
'description': """
This is the module to manage the accounting chart for Netherlands in Odoo.
addons/l10n_nl/account_chart_netherlands.xml
+189 -161
View File
@@ -2,7 +2,7 @@
<openerp>
<menuitem id="account_reports_nl_statements_menu" name="Dutch Statements" parent="account.menu_finance_reports" sequence="3" groups="account.group_account_user"/>
<data noupdate="True">
<data>
<record id="transfer_account_id" model="account.account.template">
<field name="name">Overschrijvingen</field>
@@ -3135,134 +3135,162 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
-->
<!-- Account Tags -->
<record id="tax_tag_1" model="account.account.tag">
<field name="name">0% BTW</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tag_2" model="account.account.tag">
<field name="name">6% BTW verkopen</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tag_3" model="account.account.tag">
<field name="name">21% BTW verkopen</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tag_4" model="account.account.tag">
<field name="name">variabel BTW verkopen</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tag_5" model="account.account.tag">
<field name="name">6% BTW inkopen</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tag_6" model="account.account.tag">
<field name="name">21% BTW inkopen</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tag_7" model="account.account.tag">
<field name="name">variabel BTW inkopen</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tag_8" model="account.account.tag">
<field name="name">0% BTW verlegd</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tag_9" model="account.account.tag">
<field name="name">BTW te vorderen verlegd (inkopen1)</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tag_10" model="account.account.tag">
<field name="name">BTW af te dragen verlegd (inkopen2)</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tag_11" model="account.account.tag">
<field name="name">21% BTW verlegd</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tag_12" model="account.account.tag">
<field name="name">Inkopen import binnen EU laag(1)</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tag_13" model="account.account.tag">
<field name="name">Inkopen import binnen EU laag(2)</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tag_14" model="account.account.tag">
<field name="name">6% BTW import binnen EU</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tag_15" model="account.account.tag">
<field name="name">Inkopen import binnen EU hoog(1)</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tag_16" model="account.account.tag">
<field name="name">Inkopen import binnen EU hoog(2)</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tag_17" model="account.account.tag">
<field name="name">21% BTW import binnen EU</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tag_18" model="account.account.tag">
<field name="name">Inkopen import binnen EU overig(1)</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tag_19" model="account.account.tag">
<field name="name">Inkopen import binnen EU overig(2)</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tag_20" model="account.account.tag">
<field name="name">0% BTW import binnen EU</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tag_21" model="account.account.tag">
<field name="name">BTW export binnen EU</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tag_22" model="account.account.tag">
<field name="name">Inst./afst.verkopen binnen EU</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tag_23" model="account.account.tag">
<field name="name">Inkopen import buiten EU laag(1)</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tag_24" model="account.account.tag">
<field name="name">Inkopen import buiten EU laag(2)</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tag_25" model="account.account.tag">
<field name="name">BTW import buiten EU laag inkopen</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tag_26" model="account.account.tag">
<field name="name">Inkopen import buiten EU hoog(1)</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tag_27" model="account.account.tag">
<field name="name">Inkopen import buiten EU hoog(2)</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tag_28" model="account.account.tag">
<field name="name">BTW import buiten EU hoog inkopen</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tag_29" model="account.account.tag">
<field name="name">Inkopen import buiten EU overig(1)</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tag_30" model="account.account.tag">
<field name="name">Inkopen import buiten EU overig(2)</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tag_31" model="account.account.tag">
<field name="name">BTW import buiten EU overig inkopen</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_tag_32" model="account.account.tag">
<field name="name">BTW export buiten EU</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_01" model="account.account.tag">
<field name="name">Gegevens omzet</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_02" model="account.account.tag">
<field name="name">Rubriek 1: Prestaties binnenland</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_03" model="account.account.tag">
<field name="name">1a. Leveringen/diensten belast met hoog tarief (omzet)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_04" model="account.account.tag">
<field name="name">Leveringen/diensten belast met hoog tarief (omzet)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_05" model="account.account.tag">
<field name="name">1b. Leveringen/diensten belast met laag tarief (omzet)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_06" model="account.account.tag">
<field name="name">1c. Leveringen/diensten belast met overige tarieven behalve 0% (omzet)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_07" model="account.account.tag">
<field name="name">1d. Privégebruik (omzet)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_08" model="account.account.tag">
<field name="name">1e. Leveringen/diensten belast met 0% of niet bij u belast (omzet)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_09" model="account.account.tag">
<field name="name">Rubriek 2: Verleggingsregelingen binnenland (omzet)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_10" model="account.account.tag">
<field name="name">2a. Leveringen/diensten waarbij de heffing van omzetbelasting naar u is verlegd (omzet)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_11" model="account.account.tag">
<field name="name">Rubriek 3: Prestaties naar of in het buitenland (omzet)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_12" model="account.account.tag">
<field name="name">3a. Leveringen naar landen buiten de EU (uitvoer) (omzet)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_13" model="account.account.tag">
<field name="name">3b. Leveringen naar/diensten in landen binnen de EU (omzet)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_14" model="account.account.tag">
<field name="name">3c. Installatie/afstandsverkopen binnen de EU (omzet)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_15" model="account.account.tag">
<field name="name">Rubriek 4: Prestaties vanuit het buitenland aan u verricht (omzet)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_16" model="account.account.tag">
<field name="name">4a. Leveringen/diensten uit landen buiten de EU (invoer) (omzet)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_17" model="account.account.tag">
<field name="name">4b. Leveringen/diensten uit landen binnen de EU (omzet)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_18" model="account.account.tag">
<field name="name">Gegevens omzetbelasting (BTW)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_19" model="account.account.tag">
<field name="name">Rubriek 1: Prestaties binnenland (BTW)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_20" model="account.account.tag">
<field name="name">1a. Leveringen/diensten belast met 21% (BTW)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_21" model="account.account.tag">
<field name="name">Leveringen/diensten belast met hoog tarief (BTW)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_22" model="account.account.tag">
<field name="name">1b. Leveringen/diensten belast met laag tarief (BTW)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_23" model="account.account.tag">
<field name="name">1c. Leveringen/diensten belast met overige tarieven behalve 0% (BTW)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_24" model="account.account.tag">
<field name="name">1d. Privégebruik (BTW)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_25" model="account.account.tag">
<field name="name">1e. Leveringen/diensten belast met 0% of niet bij u belast (BTW)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_26" model="account.account.tag">
<field name="name">Rubriek 2: Verleggingsregelingen binnenland (BTW)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_27" model="account.account.tag">
<field name="name">2a. Leveringen/diensten waarbij de heffing van Heffing van omzetbelasting naar u is verlegd (BTW)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_28" model="account.account.tag">
<field name="name">Rubriek 4: Prestaties vanuit het buitenland aan u verricht (BTW)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_29" model="account.account.tag">
<field name="name">4a. Leveringen/diensten uit landen buiten de EU (BTW)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_30" model="account.account.tag">
<field name="name">4b. Leveringen/diensten uit landen binnen de EU (BTW)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_31" model="account.account.tag">
<field name="name">Rubriek 5: Voorbelasting, kleineondernemersregeling en totaal (BTW)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_32" model="account.account.tag">
<field name="name">5a. Verschuldigde omzetbelasting (rubrieken 1a t/m 4b) (BTW)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_33" model="account.account.tag">
<field name="name">5b. Voorbelasting (BTW)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_34" model="account.account.tag">
<field name="name">Voorbelasting (BTW) bis</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_35" model="account.account.tag">
<field name="name">5c. Subtotaal (rubriek 5a min 5b) (BTW)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_36" model="account.account.tag">
<field name="name">5d. Vermindering volgens de kleineondernemersregeling (BTW)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_37" model="account.account.tag">
<field name="name">5e. Schatting vorige aangifte(n) (BTW)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_38" model="account.account.tag">
<field name="name">5f. Schatting deze aangifte (BTW)</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_nl_39" model="account.account.tag">
<field name="name">5g. Totaal te betalen/terug te vragen (BTW)</field>
<field name="applicability">taxes</field>
</record>
<!-- Binnen Nederland -->
<!-- Verkoop BTW -->
@@ -3276,7 +3304,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
<field name="refund_account_id" ref="vat_payable0"/>
<field name="account_id" ref="vat_payable0"/>
<field name="type_tax_use">sale</field>
<field name="tag_ids" eval="[(6,0,[ref('tax_tag_1')])]"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_nl_08')])]"/>
</record>
<record id="btw_6" model="account.tax.template">
<field name="sequence">10</field>
@@ -3288,7 +3316,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
<field name="refund_account_id" ref="vat_payable_low"/>
<field name="account_id" ref="vat_payable_low"/>
<field name="type_tax_use">sale</field>
<field name="tag_ids" eval="[(6,0,[ref('tax_tag_2')])]"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_nl_05'),ref('tag_nl_22')])]"/>
</record>
<record id="btw_21" model="account.tax.template">
<field name="sequence">5</field>
@@ -3300,7 +3328,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
<field name="refund_account_id" ref="vat_payable_high"/>
<field name="account_id" ref="vat_payable_high"/>
<field name="type_tax_use">sale</field>
<field name="tag_ids" eval="[(6,0,[ref('tax_tag_3')])]"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_nl_03'),ref('tag_nl_20')])]"/>
</record>
<!-- TODO - nakijken btw overig op percentage-->
<record id="btw_overig" model="account.tax.template">
@@ -3313,7 +3341,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
<field name="refund_account_id" ref="vat_payable_high"/>
<field name="account_id" ref="vat_payable_high"/>
<field name="type_tax_use">sale</field>
<field name="tag_ids" eval="[(6,0,[ref('tax_tag_4')])]"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_nl_04'),ref('tag_nl_06'),ref('tag_nl_21'),ref('tag_nl_23')])]"/>
</record>
<!--Inkoop BTW -->
@@ -3327,7 +3355,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
<field name="refund_account_id" ref="vat_refund_low"/>
<field name="account_id" ref="vat_refund_low"/>
<field name="type_tax_use">purchase</field>
<field name="tag_ids" eval="[(6,0,[ref('tax_tag_5')])]"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
</record>
<record id="btw_6_buy_incl" model="account.tax.template">
<field name="sequence">10</field>
@@ -3352,7 +3380,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
<field name="refund_account_id" ref="vat_refund_high"/>
<field name="account_id" ref="vat_refund_high"/>
<field name="type_tax_use">purchase</field>
<field name="tag_ids" eval="[(6,0,[ref('tax_tag_6')])]"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
</record>
<record id="btw_21_buy_incl" model="account.tax.template">
<field name="sequence">5</field>
@@ -3377,7 +3405,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
<field name="refund_account_id" ref="vat_refund_high"/>
<field name="account_id" ref="vat_refund_high"/>
<field name="type_tax_use">purchase</field>
<field name="tag_ids" eval="[(6,0,[ref('tax_tag_7')])]"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
</record>
<!--BTW verlegd-->
<record id="btw_verk_0" model="account.tax.template">
@@ -3390,7 +3418,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
<field name="refund_account_id" ref="vat_payable_verlegd"/>
<field name="account_id" ref="vat_payable_verlegd"/>
<field name="type_tax_use">sale</field>
<field name="tag_ids" eval="[(6,0,[ref('tax_tag_8')])]"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_nl_08')])]"/>
</record>
<record id="btw_ink_0_1" model="account.tax.template">
<field name="sequence">98</field>
@@ -3402,7 +3430,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
<field name="refund_account_id" ref="vat_payable_verlegd"/>
<field name="account_id" ref="vat_payable_verlegd"/>
<field name="type_tax_use">none</field>
<field name="tag_ids" eval="[(6,0,[ref('tax_tag_9')])]"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_nl_27')])]"/>
</record>
<record id="btw_ink_0_2" model="account.tax.template">
<field name="sequence">99</field>
@@ -3414,7 +3442,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
<field name="refund_account_id" ref="vat_payable_verlegd"/>
<field name="account_id" ref="vat_payable_verlegd"/>
<field name="type_tax_use">none</field>
<field name="tag_ids" eval="[(6,0,[ref('tax_tag_10')])]"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_nl_34')])]"/>
</record>
<record id="btw_ink_0" model="account.tax.template">
<field name="sequence">15</field>
@@ -3426,7 +3454,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
<field name="refund_account_id" ref="vat_payable_verlegd"/>
<field name="account_id" ref="vat_payable_verlegd"/>
<field name="type_tax_use">purchase</field>
<field name="tag_ids" eval="[(6,0,[ref('tax_tag_11')])]"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_nl_10')])]"/>
<field name="children_tax_ids" eval="[(6, 0, [ref('btw_ink_0_1'), ref('btw_ink_0_2')])]"/>
</record>
<!-- Binnen de EU -->
@@ -3441,7 +3469,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
<field name="refund_account_id" ref="vat_payable_low"/>
<field name="account_id" ref="vat_payable_low"/>
<field name="type_tax_use">none</field>
<field name="tag_ids" eval="[(6,0,[ref('tax_tag_12')])]"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_nl_30')])]"/>
</record>
<record id="btw_I_6_2" model="account.tax.template">
<field name="chart_template_id" ref="l10nnl_chart_template"/>
@@ -3453,7 +3481,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
<field name="refund_account_id" ref="vat_refund_low"/>
<field name="account_id" ref="vat_refund_low"/>
<field name="type_tax_use">none</field>
<field name="tag_ids" eval="[(6,0,[ref('tax_tag_13')])]"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
</record>
<record id="btw_I_6" model="account.tax.template">
<field name="sequence">20</field>
@@ -3463,7 +3491,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
<field eval="6" name="amount"/>
<field name="amount_type">group</field>
<field name="type_tax_use">purchase</field>
<field name="tag_ids" eval="[(6,0,[ref('tax_tag_14')])]"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_nl_17')])]"/>
<field name="children_tax_ids" eval="[(6, 0, [ref('btw_I_6_1'), ref('btw_I_6_2')])]"/>
</record>
<record id="btw_I_21_1" model="account.tax.template">
@@ -3476,7 +3504,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
<field name="refund_account_id" ref="vat_payable_high"/>
<field name="account_id" ref="vat_payable_high"/>
<field name="type_tax_use">none</field>
<field name="tag_ids" eval="[(6,0,[ref('tax_tag_15')])]"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_nl_30')])]"/>
</record>
<record id="btw_I_21_2" model="account.tax.template">
<field name="chart_template_id" ref="l10nnl_chart_template"/>
@@ -3488,7 +3516,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
<field name="refund_account_id" ref="vat_refund_high"/>
<field name="account_id" ref="vat_refund_high"/>
<field name="type_tax_use">none</field>
<field name="tag_ids" eval="[(6,0,[ref('tax_tag_16')])]"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
</record>
<record id="btw_I_21" model="account.tax.template">
<field name="chart_template_id" ref="l10nnl_chart_template"/>
@@ -3498,7 +3526,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
<field eval="21" name="amount"/>
<field name="amount_type">group</field>
<field name="type_tax_use">purchase</field>
<field name="tag_ids" eval="[(6,0,[ref('tax_tag_17')])]"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_nl_17')])]"/>
<field name="children_tax_ids" eval="[(6, 0, [ref('btw_I_21_1'), ref('btw_I_21_2')])]"/>
</record>
<record id="btw_I_overig_1" model="account.tax.template">
@@ -3511,7 +3539,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
<field name="refund_account_id" ref="vat_payable_high"/>
<field name="account_id" ref="vat_payable_high"/>
<field name="type_tax_use">none</field>
<field name="tag_ids" eval="[(6,0,[ref('tax_tag_18')])]"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_nl_30')])]"/>
</record>
<record id="btw_I_overig_2" model="account.tax.template">
<field name="chart_template_id" ref="l10nnl_chart_template"/>
@@ -3523,7 +3551,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
<field name="account_id" ref="vat_refund_high"/>
<field name="sequence">98</field>
<field name="type_tax_use">none</field>
<field name="tag_ids" eval="[(6,0,[ref('tax_tag_19')])]"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
</record>
<record id="btw_I_overig" model="account.tax.template">
<field name="sequence">20</field>
@@ -3533,7 +3561,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
<field eval="0" name="amount"/>
<field name="amount_type">group</field>
<field name="type_tax_use">purchase</field>
<field name="tag_ids" eval="[(6,0,[ref('tax_tag_20')])]"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_nl_17')])]"/>
<field name="children_tax_ids" eval="[(6, 0, [ref('btw_I_overig_1'), ref('btw_I_overig_2')])]"/>
</record>
<!-- BTW verkoop -->
@@ -3547,7 +3575,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
<field name="refund_account_id" ref="vat_payable0"/>
<field name="account_id" ref="vat_payable0"/>
<field name="type_tax_use">sale</field>
<field name="tag_ids" eval="[(6,0,[ref('tax_tag_21')])]"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_nl_13')])]"/>
</record>
<record id="btw_X2" model="account.tax.template">
<field name="sequence">20</field>
@@ -3559,7 +3587,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
<field name="refund_account_id" ref="vat_payable0"/>
<field name="account_id" ref="vat_payable0"/>
<field name="type_tax_use">sale</field>
<field name="tag_ids" eval="[(6,0,[ref('tax_tag_22')])]"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_nl_14')])]"/>
</record>
<!-- Buiten de EU -->
@@ -3574,7 +3602,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
<field name="account_id" ref="vat_payable_low"/>
<field name="sequence">21</field>
<field name="type_tax_use">none</field>
<field name="tag_ids" eval="[(6,0,[ref('tax_tag_23')])]"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_nl_29')])]"/>
</record>
<record id="btw_E1_2" model="account.tax.template">
<field name="chart_template_id" ref="l10nnl_chart_template"/>
@@ -3586,7 +3614,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
<field name="account_id" ref="vat_refund_low"/>
<field name="sequence">22</field>
<field name="type_tax_use">none</field>
<field name="tag_ids" eval="[(6,0,[ref('tax_tag_24')])]"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
</record>
<record id="btw_E1" model="account.tax.template">
<field name="sequence">20</field>
@@ -3596,7 +3624,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
<field eval="6" name="amount"/>
<field name="amount_type">group</field>
<field name="type_tax_use">purchase</field>
<field name="tag_ids" eval="[(6,0,[ref('tax_tag_25')])]"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_nl_16')])]"/>
<field name="children_tax_ids" eval="[(6, 0, [ref('btw_E1_1'), ref('btw_E1_2')])]"/>
</record>
<record id="btw_E2_1" model="account.tax.template">
@@ -3609,7 +3637,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
<field name="sequence">21</field>
<field name="account_id" ref="vat_payable_high"/>
<field name="type_tax_use">none</field>
<field name="tag_ids" eval="[(6,0,[ref('tax_tag_26')])]"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_nl_29')])]"/>
</record>
<record id="btw_E2_2" model="account.tax.template">
<field name="chart_template_id" ref="l10nnl_chart_template"/>
@@ -3621,7 +3649,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
<field name="refund_account_id" ref="vat_refund_high"/>
<field name="account_id" ref="vat_refund_high"/>
<field name="type_tax_use">none</field>
<field name="tag_ids" eval="[(6,0,[ref('tax_tag_27')])]"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_nl_34')])]"/>
</record>
<record id="btw_E2" model="account.tax.template">
<field name="sequence">20</field>
@@ -3631,7 +3659,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
<field eval="21" name="amount"/>
<field name="amount_type">group</field>
<field name="type_tax_use">purchase</field>
<field name="tag_ids" eval="[(6,0,[ref('tax_tag_28')])]"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_nl_16')])]"/>
<field name="children_tax_ids" eval="[(6, 0, [ref('btw_E2_1'), ref('btw_E2_2')])]"/>
</record>
<record id="btw_E_overig_1" model="account.tax.template">
@@ -3644,7 +3672,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
<field name="account_id" ref="vat_payable_high"/>
<field name="type_tax_use">none</field>
<field name="sequence">21</field>
<field name="tag_ids" eval="[(6,0,[ref('tax_tag_29')])]"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_nl_29')])]"/>
</record>
<record id="btw_E_overig_2" model="account.tax.template">
<field name="chart_template_id" ref="l10nnl_chart_template"/>
@@ -3656,7 +3684,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
<field name="account_id" ref="vat_refund_high"/>
<field name="type_tax_use">none</field>
<field name="sequence">22</field>
<field name="tag_ids" eval="[(6,0,[ref('tax_tag_30')])]"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_nl_33')])]"/>
</record>
<record id="btw_E_overig" model="account.tax.template">
<field name="sequence">20</field>
@@ -3666,7 +3694,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
<field eval="21" name="amount"/>
<field name="amount_type">group</field>
<field name="type_tax_use">purchase</field>
<field name="tag_ids" eval="[(6,0,[ref('tax_tag_31')])]"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_nl_16')])]"/>
<field name="children_tax_ids" eval="[(6, 0, [ref('btw_E_overig_1'), ref('btw_E_overig_2')])]"/>
</record>
<!-- BTW Verkoop -->
@@ -3680,7 +3708,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
<field name="refund_account_id" ref="vat_payable0"/>
<field name="account_id" ref="vat_payable0"/>
<field name="type_tax_use">sale</field>
<field name="tag_ids" eval="[(6,0,[ref('tax_tag_32')])]"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_nl_12')])]"/>
</record>
</data>
</openerp>
addons/l10n_nl/migrations/2.0/post-migrate_tags_on_taxes.py
+7
View File
@@ -0,0 +1,7 @@
from openerp.modules.registry import RegistryManager
def migrate(cr, version):
registry = RegistryManager.get(cr.dbname)
from openerp.addons.account.models.chart_template import migrate_tags_on_taxes
migrate_tags_on_taxes(cr, registry)
addons/l10n_nl/migrations/2.0/pre-set_tags_and_taxes_updatable.py
+7
View File
@@ -0,0 +1,7 @@
from openerp.modules.registry import RegistryManager
def migrate(cr, version):
registry = RegistryManager.get(cr.dbname)
from openerp.addons.account.models.chart_template import migrate_set_tags_and_taxes_updatable
migrate_set_tags_and_taxes_updatable(cr, registry, 'l10n_nl')
addons/pos_mercury/models/pos_mercury.py
+1 -1
View File
@@ -36,7 +36,7 @@ class account_bank_statement_line(models.Model):
mercury_card_owner_name = fields.Char(string='Card Owner Name', help='The name of the card owner')
mercury_ref_no = fields.Char(string='Mercury reference number', help='Payment reference number from Mercury Pay')
mercury_record_no = fields.Char(string='Mercury record number', help='Payment record number from Mercury Pay')
mercury_invoice_no = fields.Integer(string='Mercury invoice number', help='Invoice number from Mercury Pay')
mercury_invoice_no = fields.Float(string='Mercury invoice number', help='Invoice number from Mercury Pay')
@api.one
def _compute_prefixed_card_number(self):
addons/product/pricelist.py
+1 -1
View File
@@ -319,7 +319,7 @@ class product_pricelist_item(osv.osv):
'date_start': fields.date('Start Date', help="Starting date for the pricelist item validation"),
'date_end': fields.date('End Date', help="Ending valid for the pricelist item validation"),
'compute_price': fields.selection([('fixed', 'Fix Price'), ('percentage', 'Percentage (discount)'), ('formula', 'Formula')], select=True, default='fixed'),
'fixed_price': fields.float('Fixed Price'),
'fixed_price': fields.float('Fixed Price', digits_compute=dp.get_precision('Product Price')),
'percent_price': fields.float('Percentage Price'),
}
addons/stock/stock.py
-2
View File
@@ -2452,8 +2452,6 @@ class stock_move(osv.osv):
move_qty -= qty
for move in todo_moves:
if move.linked_move_operation_ids:
continue
#then if the move isn't totally assigned, try to find quants without any specific domain
if move.state != 'assigned':
qty_already_assigned = move.reserved_availability
addons/web/static/src/js/views/form_widgets.js
+1
View File
@@ -1362,6 +1362,7 @@ var FieldBinaryImage = FieldBinary.extend({
$img.css("max-height", "" + self.options.size[1] + "px");
});
$img.on('error', function() {
self.on_clear();
$img.attr('src', self.placeholder);
self.do_warn(_t("Image"), _t("Could not display the selected image."));
});
addons/website/controllers/main.py
-1
View File
@@ -379,7 +379,6 @@ class Website(openerp.addons.web.controllers.main.Home):
#------------------------------------------------------
class WebsiteBinary(openerp.http.Controller):
@http.route([
'/website/image',
'/website/image/<xmlid>',
'/website/image/<xmlid>/<int:width>x<int:height>',
'/website/image/<xmlid>/<field>',
addons/website_portal_sale/controllers/main.py
+3
View File
@@ -17,12 +17,15 @@ class website_account(website_account):
res_sale_order = request.env['sale.order']
res_invoices = request.env['account.invoice']
quotations = res_sale_order.search([
('message_partner_ids', 'child_of', [partner.commercial_partner_id.id]),
('state', 'in', ['sent', 'cancel'])
])
orders = res_sale_order.search([
('message_partner_ids', 'child_of', [partner.commercial_partner_id.id]),
('state', 'in', ['sale', 'done'])
])
invoices = res_invoices.search([
('message_partner_ids', 'child_of', [partner.commercial_partner_id.id]),
('state', 'in', ['open', 'paid', 'cancelled'])
])
addons/website_quote/static/src/js/website_quotation.js
+2 -1
View File
@@ -212,7 +212,8 @@ odoo.define('website_quote.payment_method', function (require) {
var token = href.match(/quote\/[0-9]+\/([^\/?]*)/);
token = token ? token[1] : '';
ajax.jsonRpc('/quote/' + order_id +'/transaction/' + acquirer_id + (token ? '/' + token : ''), 'call', {}).then(function (data) {
$(data).submit();
$form.html(data);
$form.submit();
});
});
});
addons/website_sale/controllers/main.py
+1 -3
View File
@@ -810,9 +810,7 @@ class website_sale(http.Controller):
tx = False
tx_id = False
elif tx.state == 'draft': # button cliked but no more info -> rewrite on tx or create a new one ?
tx.write({
'amount': order.amount_total,
})
tx.write(dict(transaction_obj.on_change_partner_id(cr, uid, None, order.partner_id.id, context=context).get('value', {}), amount=order.amount_total))
if not tx:
tx_id = transaction_obj.create(cr, SUPERUSER_ID, {
'acquirer_id': acquirer_id,
addons/website_sale/models/payment.py
+13 -7
View File
@@ -1,8 +1,11 @@
# -*- coding: utf-8 -*-
import logging
from openerp import SUPERUSER_ID
from openerp.osv import orm, fields
_logger = logging.getLogger(__name__)
class PaymentTransaction(orm.Model):
_inherit = 'payment.transaction'
@@ -19,12 +22,15 @@ class PaymentTransaction(orm.Model):
res = super(PaymentTransaction, self).form_feedback(cr, uid, data, acquirer_name, context=context)
# fetch the tx, check its state, confirm the potential SO
tx_find_method_name = '_%s_form_get_tx_from_data' % acquirer_name
if hasattr(self, tx_find_method_name):
tx = getattr(self, tx_find_method_name)(cr, uid, data, context=context)
if tx and tx.state == 'done' and tx.acquirer_id.auto_confirm == 'at_pay_confirm' and tx.sale_order_id and tx.sale_order_id.state in ['draft', 'sent']:
self.pool['sale.order'].action_confirm(cr, SUPERUSER_ID, [tx.sale_order_id.id], context=dict(context, send_email=True))
elif tx and tx.state not in ['cancel', 'error'] and tx.sale_order_id and tx.sale_order_id.state in ['draft']:
self.pool['sale.order'].force_quotation_send(cr, SUPERUSER_ID, [tx.sale_order_id.id], context=context)
try:
tx_find_method_name = '_%s_form_get_tx_from_data' % acquirer_name
if hasattr(self, tx_find_method_name):
tx = getattr(self, tx_find_method_name)(cr, uid, data, context=context)
if tx and tx.state == 'done' and tx.acquirer_id.auto_confirm == 'at_pay_confirm' and tx.sale_order_id and tx.sale_order_id.state in ['draft', 'sent']:
self.pool['sale.order'].action_confirm(cr, SUPERUSER_ID, [tx.sale_order_id.id], context=dict(context, send_email=True))
elif tx and tx.state not in ['cancel', 'error'] and tx.sale_order_id and tx.sale_order_id.state in ['draft']:
self.pool['sale.order'].force_quotation_send(cr, SUPERUSER_ID, [tx.sale_order_id.id], context=context)
except Exception:
_logger.exception('Fail to confirm the order or send the confirmation email%s', tx and ' for the transaction %s' % tx.reference or '')
return res
addons/website_sale/static/src/js/website_sale_payment.js
+2 -1
View File
@@ -30,7 +30,8 @@ $(document).ready(function () {
return false;
}
ajax.jsonRpc('/shop/payment/transaction/' + acquirer_id, 'call', {}).then(function (data) {
$(data).submit();
$form.html(data);
$form.submit();
});
});
addons/website_sale/views/templates.xml
+6 -3
View File
@@ -1376,7 +1376,7 @@
<t t-if="tx_ids and state == 'cancel'">
<p>The payment seems to have been canceled.</p>
</t>
<t t-if="tx_ids and state == 'pending' and validation == 'manual'">
<t t-if="tx_ids and state == 'pending' and validation">
<p>Your transaction is waiting a manual confirmation.</p><br />
<t t-if="tx_post_msg">
<div class="hidden-print"><t t-raw="tx_post_msg"/></div>
@@ -1426,8 +1426,11 @@
<!-- payment acquirer information -->
<template id="payment_confirmation_status">
<t t-if="order.payment_acquirer_id.auto_confirm == 'none'">
<div class="alert alert-info" role="alert">
<t t-raw="order.payment_acquirer_id.pending_msg"/>
<div class="panel panel-info">
<div class="panel-heading" t-raw="order.payment_acquirer_id.pending_msg" />
<div class="panel-body" t-if="order.payment_acquirer_id.post_msg">
<t t-raw="order.payment_acquirer_id.post_msg"/>
</div>
</div>
</t>
<t t-if="order.payment_acquirer_id.auto_confirm == 'at_pay_confirm'">