Merge branch 'master' of ssh://ced@dev.tinyerp.com//home/ced/terp

Conflicts:

	server/bin/addons/hr_timesheet_invoice/report/cost_ledger.py

bzr revid: ced-53d5b1eb97f770d60b281ecb4ff118898d110112

addons/account/account.py

@@ -228,6 +228,7 @@ class account_account(osv.osv):
 		'note': fields.text('Note'),
 		'company_currency_id': fields.function(_get_company_currency, method=True, type='many2one', relation='res.currency', string='Company Currency'),
 		'company_id': fields.many2one('res.company', 'Company', required=True),
+		'active': fields.boolean('Active', select=2),
 	}
 
 	def _default_company(self, cr, uid, context={}):
@@ -235,13 +236,16 @@ class account_account(osv.osv):
 		if user.company_id:
 			return user.company_id.id
 		return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
+
 	_defaults = {
 		'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,
 	}
+
 	def _check_recursion(self, cr, uid, ids):
 		level = 100
 		while len(ids):

addons/account/account_analytic_line.py

@@ -99,23 +99,6 @@ class timesheet_invoice(osv.osv):
 	}
 	_order = 'name desc, account_id'
 	def init(self, cr):
-		#cr.execute("""
-		#create or replace view report_hr_timesheet_invoice_journal as (
-		#	select
-		#		min(l.id) as id,
-		#		substring(l.create_date for 7)||'-01' as name,
-		#		sum(greatest(-l.amount,0)) as cost,
-		#		sum(greatest(l.amount,0)) as revenue,
-		#		sum(l.unit_amount*u.factor) as quantity,
-		#		journal_id,
-		#		account_id
-		#	from account_analytic_line l
-		#		left join product_uom u on (u.id=l.product_uom_id)
-		#	group by
-		#		substring(l.create_date for 7),
-		#		journal_id,
-		#		account_id
-		#)""")
 		cr.execute("""
 		create or replace view report_hr_timesheet_invoice_journal as (
 			select
@@ -138,5 +121,6 @@ class timesheet_invoice(osv.osv):
 				substring(l.date for 7),
 				journal_id,
 				account_id
+			limit 12
 		)""")
 timesheet_invoice()

addons/account/account_move_line.py

@@ -192,8 +192,8 @@ class account_move_line(osv.osv):
 		'balance': fields.function(_balance, method=True, string='Balance'),
 		'active': fields.boolean('Active'),
 		'state': fields.selection([('draft','Draft'), ('valid','Valid')], 'State', readonly=True),
-		'tax_code_id': fields.many2one('account.tax.code', 'Tax Account', states={'valid':[('readonly', True)]}),
-		'tax_amount': fields.float('Tax/Base Amount', digits=(16,2), select=True, states={'valid':[('readonly', True)]}),
+		'tax_code_id': fields.many2one('account.tax.code', 'Tax Account'),
+		'tax_amount': fields.float('Tax/Base Amount', digits=(16,2), select=True),
 	}
 	_defaults = {
 		'blocked': lambda *a: False,

addons/account/account_view.xml

@@ -129,6 +129,7 @@
 					<field name="note" colspan="4" nolabel="1"/>
 				</page>
 				</notebook>
+				<field name="active" invisible="1" readonly="1"/>
 			</form>
 		</field>
 	</record>

addons/account/partner.py

@@ -39,7 +39,7 @@ class res_partner(osv.osv):
 		res={}
 		query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
 		for id in ids:
-			cr.execute("select sum(debit-credit) from account_move_line as l where account_id in (select id from account_account where type = %s) and partner_id=%d and reconcile_id is null and "+query, ('receivable', id))
+			cr.execute("select sum(debit-credit) from account_move_line as l where account_id in (select id from account_account where type = %s and active) and partner_id=%d and reconcile_id is null and "+query, ('receivable', id))
 			res[id]=cr.fetchone()[0] or 0.0
 		return res
 
@@ -47,7 +47,7 @@ class res_partner(osv.osv):
 		res={}
 		query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
 		for id in ids:
-			cr.execute("select sum(debit-credit) from account_move_line as l where account_id in (select id from account_account where type = %s) and partner_id=%d and reconcile_id is null and "+query, ('payable', id))
+			cr.execute("select sum(debit-credit) from account_move_line as l where account_id in (select id from account_account where type = %s and active) and partner_id=%d and reconcile_id is null and "+query, ('payable', id))
 			res[id]=cr.fetchone()[0] or 0.0
 		return res
 
@@ -56,7 +56,7 @@ class res_partner(osv.osv):
 			return []
 		where = ' and '.join(map(lambda x: '(sum(debit-credit)'+x[1]+str(x[2])+')',args))
 		query = self.pool.get('account.move.line')._query_get(cr, uid, context={})
-		cr.execute(('select partner_id from account_move_line l where account_id in (select id from account_account where type=%s) and reconcile_id is null and '+query+' and partner_id is not null group by partner_id having '+where), ('receivable',) )
+		cr.execute(('select partner_id from account_move_line l where account_id in (select id from account_account where type=%s and active) and reconcile_id is null and '+query+' and partner_id is not null group by partner_id having '+where), ('receivable',) )
 		res = cr.fetchall()
 		if not len(res):
 			return [('id','=','0')]
@@ -67,7 +67,7 @@ class res_partner(osv.osv):
 			return []
 		query = self.pool.get('account.move.line')._query_get(cr, uid, context={})
 		where = ' and '.join(map(lambda x: '(sum(debit-credit)'+x[1]+str(x[2])+')',args))
-		cr.execute(('select partner_id from account_move_line where account_id in (select id from account_account where type=%s) and reconcile_id is null and '+query+' partner_id is not null group by partner_id having '+where), ('payable',) )
+		cr.execute(('select partner_id from account_move_line where account_id in (select id from account_account where type=%s and active) and reconcile_id is null and '+query+' partner_id is not null group by partner_id having '+where), ('payable',) )
 		res = cr.fetchall()
 		if not len(res):
 			return [('id','=','0')]

addons/account/project/project.py

@@ -140,7 +140,7 @@ class account_analytic_account(osv.osv):
 		'user_id' : fields.many2one('res.users', 'Account Manager'),
 		'date_start': fields.date('Date Start'),
 		'date': fields.date('Date End'),
-		'stats_ids': fields.one2many('report.hr.timesheet.invoice.journal', 'account_id', string='Statistics', readonly=True),
+		'stats_ids': fields.one2many('report.hr.timesheet.invoice.journal', 'account_id', 'Statistics', readonly=True),
 		'company_id': fields.many2one('res.company', 'Company', required=True),
 		'company_currency_id': fields.function(_get_company_currency, method=True, type='many2one', relation='res.currency', string='Currency'),
 		'state': fields.selection([('draft','Draft'), ('open','Open'), ('pending','Pending'), ('close','Close'),], 'State', required=True),

addons/account/project/project_view.xml

@@ -295,7 +295,7 @@
 		<field name="model">report.hr.timesheet.invoice.journal</field>
 		<field name="type">graph</field>
 		<field name="arch" type="xml">
-			<graph type="bar">
+			<graph type="bar" string="Analytic Entries Stats">
 				<field name="name"/>
 				<field name="cost" operator="+"/>
 				<field name="revenue" operator="+"/>

addons/account/project/report/analytic_balance.py

@@ -49,7 +49,7 @@ class account_analytic_balance(report_sxw.rml_parse):
 	def _lines_g(self, account_id, date1, date2):
 		self.cr.execute("SELECT aa.name AS name, aa.code AS code, sum(aal.amount) AS balance, sum(aal.unit_amount) AS quantity \
 				FROM account_analytic_line AS aal, account_account AS aa \
-				WHERE (aal.general_account_id=aa.id) AND (aal.account_id=%d) AND (date>=%s) AND (date<=%s) \
+				WHERE (aal.general_account_id=aa.id) AND (aal.account_id=%d) AND (date>=%s) AND (date<=%s) AND aa.active \
 				GROUP BY aal.general_account_id, aa.name, aa.code, aal.code ORDER BY aal.code", (account_id, date1, date2))
 		res = self.cr.dictfetchall()
 		

addons/account/project/report/cost_ledger.py

@@ -48,7 +48,7 @@ class account_analytic_cost_ledger(report_sxw.rml_parse):
 	def _lines_g(self, account_id, date1, date2):
 		self.cr.execute("SELECT sum(aal.amount) AS balance, aa.code AS code, aa.name AS name, aa.id AS id \
 				FROM account_account AS aa, account_analytic_line AS aal \
-				WHERE (aal.account_id=%d) AND (aal.date>=%s) AND (aal.date<=%s) AND (aal.general_account_id=aa.id) \
+				WHERE (aal.account_id=%d) AND (aal.date>=%s) AND (aal.date<=%s) AND (aal.general_account_id=aa.id) AND aa.active \
 				GROUP BY aa.code, aa.name, aa.id ORDER BY aa.code", (account_id, date1, date2))
 		res = self.cr.dictfetchall()
 

addons/account/project/report/inverted_analytic_balance.py

@@ -47,7 +47,7 @@ class account_inverted_analytic_balance(report_sxw.rml_parse):
 		ids = map(lambda x: x.id, accounts)
 		self.cr.execute("SELECT aa.name AS name, aa.code AS code, sum(aal.amount) AS balance, sum(aal.unit_amount) AS quantity, aa.id AS id \
 				FROM account_analytic_line AS aal, account_account AS aa \
-				WHERE (aal.general_account_id=aa.id) AND (aal.account_id IN ("+','.join(map(str, ids))+")) AND (date>=%s) AND (date<=%s) \
+				WHERE (aal.general_account_id=aa.id) AND (aal.account_id IN ("+','.join(map(str, ids))+")) AND (date>=%s) AND (date<=%s) AND aa.active \
 				GROUP BY aal.general_account_id, aa.name, aa.code, aal.code, aa.id ORDER BY aal.code", (date1, date2))
 		res = self.cr.dictfetchall()
 

addons/account/project/report/quantity_cost_ledger.py

@@ -45,13 +45,13 @@ class account_analytic_quantity_cost_ledger(report_sxw.rml_parse):
 		if not journals or not journals[0][2]:
 			self.cr.execute("SELECT sum(aal.unit_amount) AS quantity, aa.code AS code, aa.name AS name, aa.id AS id \
 					FROM account_account AS aa, account_analytic_line AS aal \
-					WHERE (aal.account_id=%d) AND (aal.date>=%s) AND (aal.date<=%s) AND (aal.general_account_id=aa.id) \
+					WHERE (aal.account_id=%d) AND (aal.date>=%s) AND (aal.date<=%s) AND (aal.general_account_id=aa.id) AND aa.active \
 					GROUP BY aa.code, aa.name, aa.id ORDER BY aa.code", (account_id, date1, date2))
 		else:
 			journal_ids = journals[0][2]
 			self.cr.execute("SELECT sum(aal.unit_amount) AS quantity, aa.code AS code, aa.name AS name, aa.id AS id \
 					FROM account_account AS aa, account_analytic_line AS aal \
-					WHERE (aal.account_id=%d) AND (aal.date>=%s) AND (aal.date<=%s) AND (aal.general_account_id=aa.id) \
+					WHERE (aal.account_id=%d) AND (aal.date>=%s) AND (aal.date<=%s) AND (aal.general_account_id=aa.id) AND aa.active \
 						AND (aal.journal_id IN ("+','.join(map(str, journal_ids))+")) \
 					GROUP BY aa.code, aa.name, aa.id ORDER BY aa.code", (account_id, date1, date2))
 		res = self.cr.dictfetchall()

addons/account/report/aged_trial_balance.py

@@ -52,7 +52,7 @@ class aged_trial_report(report_sxw.rml_parse):
 						WHERE (line.account_id=account_account.id) AND (line.reconcile_id IS NULL) \
 						AND (line.partner_id=res_partner.id) AND (line.state<>'draft') \
 						AND (line.period_id in (SELECT id FROM account_period WHERE fiscalyear_id=%d))\
-						AND (account_account.company_id = %d) \
+						AND (account_account.company_id = %d) AND account_account.active \
 						ORDER BY res_partner.name", (form['fiscalyear'], form['company_id']))
 		partners = self.cr.dictfetchall()
 		for partner in partners:
@@ -63,7 +63,7 @@ class aged_trial_report(report_sxw.rml_parse):
 					AND (date<%s) AND (partner_id=%d) \
 					AND (reconcile_id IS NULL) AND (line.state<>'draft') \
 					AND (line.period_id in (SELECT id FROM account_period WHERE fiscalyear_id=%d)) \
-					AND (account_account.company_id = %d)", (form['0']['start'], partner['id'], form['fiscalyear'], form['company_id']))
+					AND (account_account.company_id = %d) AND account_account.active", (form['0']['start'], partner['id'], form['fiscalyear'], form['company_id']))
 			before = self.cr.fetchone()
 			values['before'] = before and before[0] or ""
 			for i in range(5):
@@ -73,7 +73,7 @@ class aged_trial_report(report_sxw.rml_parse):
 						AND (date >= %s) AND (date <= %s) \
 						AND (partner_id=%d) AND (reconcile_id IS NULL) \
 						AND line.state<>'draft' AND (line.period_id in (SELECT id FROM account_period WHERE fiscalyear_id=%d)) \
-						AND (account_account.company_id = %d)", (form[str(i)]['start'], form[str(i)]['stop'], partner['id'], form['fiscalyear'], form['company_id']))
+						AND (account_account.company_id = %d) AND account_account.active", (form[str(i)]['start'], form[str(i)]['stop'], partner['id'], form['fiscalyear'], form['company_id']))
 				during = self.cr.fetchone()
 				values[str(i)] = during and during[0] or ""
 
@@ -82,7 +82,7 @@ class aged_trial_report(report_sxw.rml_parse):
 					WHERE (line.account_id=account_account.id) AND (account_account.type IN ('payable','receivable')) \
 					AND (partner_id = %d) AND (reconcile_id IS NULL) \
 					AND (line.state <> 'draft') AND (line.period_id in (SELECT id FROM account_period WHERE fiscalyear_id=%d)) \
-					AND (account_account.company_id = %d)", (partner['id'], form['fiscalyear'], form['company_id']))
+					AND (account_account.company_id = %d) AND account_account.active", (partner['id'], form['fiscalyear'], form['company_id']))
 			total = self.cr.fetchone()
 			values['total'] = total and total[0] or 0.0
 			values['name'] = partner['name']
@@ -106,7 +106,7 @@ class aged_trial_report(report_sxw.rml_parse):
 				WHERE (line.account_id=account_account.id) AND (account_account.type IN ('payable','receivable')) \
 				AND reconcile_id IS NULL AND (line.state<>'draft') \
 				AND partner_id is not null AND (line.period_id in (SELECT id FROM account_period WHERE fiscalyear_id=%d)) \
-				AND (account_account.company_id = %d)", (fiscalyear, company_id))
+				AND (account_account.company_id = %d) AND account_account.active", (fiscalyear, company_id))
 		total = self.cr.fetchone()
 		return total and total[0] or 0.0
 	
@@ -117,7 +117,7 @@ class aged_trial_report(report_sxw.rml_parse):
 				AND reconcile_id IS NULL AND (date < %s) \
 				AND (line.state <> 'draft') AND partner_id is not null \
 				AND (line.period_id in (SELECT id FROM account_period WHERE fiscalyear_id = %d)) \
-				AND (account_account.company_id = %d)", (date, fiscalyear, company_id))
+				AND (account_account.company_id = %d) AND account_account.active", (date, fiscalyear, company_id))
 		before = self.cr.fetchone()
 		return before and before[0] or 0.0
 
@@ -128,7 +128,7 @@ class aged_trial_report(report_sxw.rml_parse):
 				AND reconcile_id IS NULL AND (date >= %s) AND (date <= %s) \
 				AND (line.state<>'draft') AND partner_id is not null \
 				AND (line.period_id in (SELECT id FROM account_period WHERE fiscalyear_id = %d)) \
-				AND (account_account.company_id = %d)", (period['start'], period['stop'], fiscalyear, company_id))
+				AND (account_account.company_id = %d) AND account_account.active", (period['start'], period['stop'], fiscalyear, company_id))
 		period = self.cr.fetchone()
 		return period and period[0] or 0.0
 

addons/account/report/partner_balance.py

@@ -51,9 +51,9 @@ class partner_balance(report_sxw.rml_parse):
 				from account_move_line AS line, account_account AS account \
 				where line.partner_id is not null and line.date>=%s and line.date<=%s \
 				and line.period_id in (SELECT id FROM account_period WHERE fiscalyear_id=%d) \
-				AND line.account_id = account.id AND account.company_id = %d', (data['form']['date1'], data['form']['date2'], data['form']['fiscalyear'], data['form']['company_id']))
+				AND line.account_id = account.id AND account.company_id = %d AND account.active', (data['form']['date1'], data['form']['date2'], data['form']['fiscalyear'], data['form']['company_id']))
 		new_ids = [id for (id,) in self.cr.fetchall()]
-		self.cr.execute("SELECT a.id FROM account_account a LEFT JOIN account_account_type t ON (a.type=t.code) WHERE t.partner_account=TRUE AND a.company_id = %d", (data['form']['company_id'],))
+		self.cr.execute("SELECT a.id FROM account_account a LEFT JOIN account_account_type t ON (a.type=t.code) WHERE t.partner_account=TRUE AND a.company_id = %d AND a.active", (data['form']['company_id'],))
 		self.account_ids = ','.join([str(a) for (a,) in self.cr.fetchall()])
 		self.partner_ids = ','.join(map(str, new_ids))
 		objects = self.pool.get('res.partner').browse(self.cr, self.uid, new_ids)

addons/account/report/tax_report.py

@@ -52,7 +52,7 @@ class tax_report(report_sxw.rml_parse):
 		self.cr.execute('select sum(line.tax_amount) as tax_amount, sum(line.debit) as debit, sum(line.credit) as credit, count(*) as count, account.id as account_id \
 				from account_move_line AS line, account_account AS account \
 				where line.state<>%s and line.period_id=%d and line.tax_code_id=%d \
-				AND line.account_id = account.id AND account.company_id = %d \
+				AND line.account_id = account.id AND account.company_id = %d AND account.active \
 				group by account.id', ('draft',period_id, tax_code_id, company_id))
 		res = self.cr.dictfetchall()
 		i = 0

addons/account/report/third_party_ledger.py

@@ -47,14 +47,14 @@ class third_party_ledger(report_sxw.rml_parse):
 		self.cr.execute(
 			"SELECT DISTINCT line.partner_id " \
 			"FROM account_move_line AS line, account_account AS account " \
-			"WHERE line.partner_id IS NOT NULL AND line.date>=%s AND line.date<=%s AND line.state<>'draft' AND line.period_id in (SELECT id FROM account_period WHERE fiscalyear_id=%d)" \
-			"AND line.account_id = account.id AND account.company_id = %d",
+			"WHERE line.partner_id IS NOT NULL AND line.date>=%s AND line.date<=%s AND line.state<>'draft' AND line.period_id in (SELECT id FROM account_period WHERE fiscalyear_id=%d) " \
+			"AND line.account_id = account.id AND account.company_id = %d AND account.active",
 			(data['form']['date1'], data['form']['date2'], data['form']['fiscalyear'], data['form']['company_id']))
 		new_ids = [id for (id,) in self.cr.fetchall()]
 		self.cr.execute(
 			"SELECT a.id " \
 			"FROM account_account a LEFT JOIN account_account_type t ON (a.type=t.code) " \
-			"WHERE t.partner_account=TRUE AND a.company_id = %d", (data['form']['company_id'],))
+			"WHERE t.partner_account=TRUE AND a.company_id = %d AND a.active", (data['form']['company_id'],))
 		self.account_ids = ','.join([str(a) for (a,) in self.cr.fetchall()])
 		self.partner_ids = ','.join(map(str, new_ids))
 		objects = self.pool.get('res.partner').browse(self.cr, self.uid, new_ids)

addons/account/wizard/wizard_fiscalyear_close.py

@@ -64,7 +64,7 @@ def _data_save(self, cr, uid, data, context):
 	fy_id = data['form']['fy_id']
 	if data['form']['report_new']:
 		period = pool.get('account.fiscalyear').browse(cr, uid, data['form']['fy2_id']).period_ids[0]
-		cr.execute('select id from account_account')
+		cr.execute('select id from account_account WHERE active')
 		ids = map(lambda x: x[0], cr.fetchall())
 		for account in pool.get('account.account').browse(cr, uid, ids):
 			if account.close_method=='none' or account.type == 'view':

addons/account_chart/__terp__.py

@@ -0,0 +1,18 @@
+{
+	"name" : "Account Chart",
+	"version" : "0.1",
+	"depends" : ["account"],
+	"author" : "Tiny",
+	"description": """Remove minimal account chart""",
+	"website" : "http://tinyerp.com/module_account.html",
+	"category" : "Generic Modules/Accounting",
+	"init_xml" : [
+	],
+	"demo_xml" : [
+	],
+	"update_xml" : [
+		"account_chart.xml",
+	],
+	"active": False,
+	"installable": True
+}

addons/account_chart/account_chart.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<terp>
+	<data noupdate="True">
+
+		<!-- deactivate minimal account -->
+		<record model="account.account" id="account.minimal_0">
+			<field name="active" eval="False"/>
+		</record>
+		<record model="account.account" id="account.a_recv">
+			<field name="active" eval="False"/>
+		</record>
+		<record model="account.account" id="account.a_pay">
+			<field name="active" eval="False"/>
+		</record>
+		<record model="account.account" id="account.cash">
+			<field name="active" eval="False"/>
+		</record>
+		<record model="account.account" id="account.a_expense">
+			<field name="active" eval="False"/>
+		</record>
+		<record model="account.account" id="account.a_sale">
+			<field name="active" eval="False"/>
+		</record>
+
+	</data>
+</terp>

addons/account_followup/followup_report.py

@@ -31,52 +31,53 @@
 from osv import fields, osv
 
 def _code_get(self, cr, uid, context={}):
-    acc_type_obj = self.pool.get('account.account.type')
-    ids = acc_type_obj.search(cr, uid, [])
-    res = acc_type_obj.read(cr, uid, ids, ['code', 'name'], context)
-    return [(r['code'], r['name']) for r in res]
+	acc_type_obj = self.pool.get('account.account.type')
+	ids = acc_type_obj.search(cr, uid, [])
+	res = acc_type_obj.read(cr, uid, ids, ['code', 'name'], context)
+	return [(r['code'], r['name']) for r in res]
 
 
 class account_followup_stat(osv.osv):
-    _name = "account_followup.stat"
-    _description = "Followup statistics"
-    _auto = False
-    _columns = {
-        'name': fields.many2one('res.partner', 'Partner', readonly=True),
-        'account_type': fields.selection(_code_get, 'Account Type', required=True),
-        'date_move':fields.date('First move', readonly=True),
-        'date_move_last':fields.date('Last move', readonly=True),
-        'date_followup':fields.date('Latest followup', readonly=True),
-        'followup_id': fields.many2one('account_followup.followup.line', 'Follow Ups', required=True, ondelete="cascade"),
-        'balance':fields.float('Balance', readonly=True),
-        'debit':fields.float('Debit', readonly=True),
-        'credit':fields.float('Credit', readonly=True),
-    }
-    _order = 'date_move'
-    def init(self, cr):
-        cr.execute("""
-            create or replace view account_followup_stat as (
-                select
-                    l.partner_id as id,
-                    l.partner_id as name,
-                    min(l.date) as date_move,
-                    max(l.date) as date_move_last,
-                    max(l.followup_date) as date_followup,
-                    max(l.followup_line_id) as followup_id,
-                    sum(l.debit) as debit,
-                    sum(l.credit) as credit,
-                    sum(l.debit - l.credit) as balance,
-                    a.type as account_type
-                from
-                    account_move_line l
-                left join
-                    account_account a on (l.account_id=a.id)
-                where
-                    l.reconcile_id is NULL and
-                    a.type in ('receivable', 'payable')
-                group by
-                    l.partner_id, a.type
-            )""")
+	_name = "account_followup.stat"
+	_description = "Followup statistics"
+	_auto = False
+	_columns = {
+		'name': fields.many2one('res.partner', 'Partner', readonly=True),
+		'account_type': fields.selection(_code_get, 'Account Type', required=True),
+		'date_move':fields.date('First move', readonly=True),
+		'date_move_last':fields.date('Last move', readonly=True),
+		'date_followup':fields.date('Latest followup', readonly=True),
+		'followup_id': fields.many2one('account_followup.followup.line', 'Follow Ups', required=True, ondelete="cascade"),
+		'balance':fields.float('Balance', readonly=True),
+		'debit':fields.float('Debit', readonly=True),
+		'credit':fields.float('Credit', readonly=True),
+	}
+	_order = 'date_move'
+	def init(self, cr):
+		cr.execute("""
+			create or replace view account_followup_stat as (
+				select
+					l.partner_id as id,
+					l.partner_id as name,
+					min(l.date) as date_move,
+					max(l.date) as date_move_last,
+					max(l.followup_date) as date_followup,
+					max(l.followup_line_id) as followup_id,
+					sum(l.debit) as debit,
+					sum(l.credit) as credit,
+					sum(l.debit - l.credit) as balance,
+					a.type as account_type
+				from
+					account_move_line l
+				left join
+					account_account a on (l.account_id=a.id)
+				where
+					l.reconcile_id is NULL and
+					a.type in ('receivable', 'payable')
+					and a.active
+				group by
+					l.partner_id, a.type
+			)""")
 account_followup_stat()
 
 

addons/account_followup/wizard/wizard_followup_print.py

@@ -93,7 +93,8 @@ class followup_all_print(wizard.interface):
 				"AND (a.type='receivable') "\
 				"AND (l.state<>'draft') "\
 				"AND (l.reconcile_id is NULL) "\
-				"AND (l.partner_id is NOT NULL) ")
+				"AND (l.partner_id is NOT NULL) "\
+				"AND a.active ")
 		ids = map(lambda x: x[0], cr.fetchall())
 		return {'partner_ids': ids}
 
@@ -109,6 +110,7 @@ class followup_all_print(wizard.interface):
 					"AND (l.state<>'draft') "\
 					"AND (l.reconcile_id is NULL) "\
 					"AND partner_id in ("+','.join(map(str,partner_ids))+") "\
+					"AND a.active "\
 				"ORDER BY l.date")
 			move_lines = cr.fetchall()
 		else:

addons/base_setup/wizard/wizard_base_setup.py

@@ -74,6 +74,7 @@ view_form_company = """<?xml version="1.0"?>
 		<field name="state_id" align="0.0"/>
 		<field name="email" align="0.0"/>
 		<field name="phone" align="0.0"/>
+		<field name="currency" align="0.0"/>
 		<separator string="Report header" colspan="4"/>
 		<newline/>
 		<field name="rml_header1" align="0.0" colspan="4"/>
@@ -131,6 +132,7 @@ class wizard_base_setup(wizard.interface):
 			return {}
 		company=company_obj.browse(cr, uid, ids)[0]
 		self.fields['name']['default']=company.name
+		self.fields['currency']['default']=company.currency_id.id
 		return {}
 		#self.fields['rml_header1']['default']=company.rml_header1
 		#self.fields['rml_footer1']['default']=company.rml_footer1
@@ -188,6 +190,7 @@ class wizard_base_setup(wizard.interface):
 				'rml_header1': form['rml_header1'],
 				'rml_footer1': form['rml_footer1'],
 				'rml_footer2': form['rml_footer2'],
+				'currency_id': form['currency'],
 			})
 		partner_obj.write(cr, uid, [company.partner_id.id], {
 				'name': form['name'],
@@ -200,7 +203,7 @@ class wizard_base_setup(wizard.interface):
 					'city': form['city'],
 					'email': form['email'],
 					'phone': form['phone'],
-					'country_id': form['country_id']
+					'country_id': form['country_id'],
 				}
 		if form['state_id'] > 0:
 			values['state_id']=form['state_id']
@@ -307,6 +310,12 @@ class wizard_base_setup(wizard.interface):
 			'type': 'char',
 			'size': 64,
 		},
+		'currency': {
+			'string': 'Currency',
+			'type': 'many2one',
+			'relation': 'res.currency',
+			'required': True,
+		},
 		'rml_header1':{
 			'string': 'Report Header',
 			'type': 'char',

addons/hr_timesheet_invoice/report/cost_ledger.py

@@ -55,7 +55,7 @@ class account_analytic_cost_ledger(report_sxw.rml_parse):
 	def _lines_g(self, account_id, date1, date2):
 		self.cr.execute("SELECT sum(aal.amount) AS balance, aa.code AS code, aa.name AS name, aa.id AS id, sum(aal.unit_amount) AS quantity \
 				FROM account_account AS aa, account_analytic_line AS aal \
-				WHERE (aal.account_id=%d) AND (aal.date>=%s) AND (aal.date<=%s) AND (aal.general_account_id=aa.id) \
+				WHERE (aal.account_id=%d) AND (aal.date>=%s) AND (aal.date<=%s) AND (aal.general_account_id=aa.id) AND aa.active \
 				GROUP BY aa.code, aa.name, aa.id ORDER BY aa.code", (account_id, date1, date2))
 		res = self.cr.dictfetchall()
 

addons/hr_timesheet_project/wizard/timesheet_hour_encode.py

@@ -55,9 +55,11 @@ def _action_line_create(self, cr, uid, data, context):
 			res2 = ts.on_change_unit_amount(cr, uid, False, product_id, work.hours or 0.0,unit_id, context)
 			if res2:
 				res.update(res2['value'])
+			if hasattr(ts, 'on_change_account_id'):
+				res2 = ts.on_change_account_id(cr, uid, False, work.task_id.project_id.category_id.id)
+				if res2:
+					res.update(res2['value'])
 			id = ts.create(cr, uid, res, context)
-		else:
-			print 'not found', work.task_id.project_id.name
 
 	value = {
 		'domain': "[('user_id','=',%d),('date','>=','%s'), ('date','<=','%s')]" % (uid, time.strftime('%Y-%m-%d 00:00:00'), time.strftime('%Y-%m-%d 23:59:59')),

addons/l10n_be/__terp__.py

@@ -3,7 +3,7 @@
 	"version" : "1.0",
 	"author" : "Tiny",
 	"category" : "Localisation/Account charts",
-	"depends" : ["base", "account", "account_report", "base_vat", "base_iban"],
+	"depends" : ["base", "account", "account_report", "base_vat", "base_iban", "account_chart"],
 	"init_xml" : [],
 	"demo_xml" : ["account_demo.xml","account.report.report.csv"],
 	"update_xml" : ["account_pcmn_belgium.xml"],

addons/l10n_be/account_pcmn_belgium.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <terp>
 	<data noupdate="True">
+
         <record model="account.account" id="a_root">
 			<field name="name">PLAN COMPTABLE MINIMUM NORMALISE</field>
 			<field name="code">0</field>
 			<field name="type">view</field>
-
 		</record>
 		<record model="account.account" id="a1">
 			<field name="name">CLASSE 1</field>

addons/l10n_ca-qc/__terp__.py

@@ -3,7 +3,7 @@
 	"version" : "1.0",
 	"author" : "Tiny",
 	"category" : "Localisation/Account charts",
-	"depends" : ["base", "account"],
+	"depends" : ["base", "account", "account_chart"],
 	"init_xml" : [],
 	"demo_xml" : ["account_demo.xml"],
 	"update_xml" : ["account_pc_canada.xml"],

addons/l10n_ca-qc/account_pc_canada.xml

@@ -2,6 +2,7 @@
 <terp>
 	<data noupdate="True">
 	
+		<!--
 #***************************************************************************#
 #                              C R É A T I O N                              #
 #***************************************************************************#
@@ -49,17 +50,12 @@
 #  child_id    =  Comptes Enfants / Children
 #  balance     =  Solde / Balance
 #
-
-	<record model="res.currency" id="CAD">
-		<field name="name">CAD</field>
-		<field name="rate">1.0</field>
-		<field name="rounding">0.01</field>
-		<field name="accuracy">4</field>
-	</record>
-
+		-->
+<!--
 #
 #  ***  CHARTE DES COMPTES  (Plan comptable)  ***
 #
+-->
 	<record model="account.account" id="a_root">
 		<field name="type">view</field>
 		<field name="code">0</field>
@@ -67,9 +63,11 @@
 
 	</record>
 
+	<!--
 #
 #  ***  Comptes du BILAN  (10000 à 39999)  ***
 #
+-->
 	<record model="account.account" id="bilan_001">
 		<field name="type">view</field>
 		<field name="code">00001</field>
@@ -77,10 +75,12 @@
 
 		<field name="parent_id" eval="[(6,0,[a_root])]"/>
 	</record>		
-	
+
+	<!--
 #
 #  10000 à 19999 - ACTIF  /  ASSETS
-#
+#	
+-->
 	<record model="account.account" id="actif_10000">
 		<field name="type">view</field>
 		<field name="code">10000</field>
@@ -89,9 +89,11 @@
 		<field name="parent_id" eval="[(6,0,[bilan_001])]"/>
 	</record>
 
+	<!--
 #
 #  11000 à 12999 - Actif COURT TERME  /  Short Term ASSETS
 #
+-->
 	<record model="account.account" id="act_11000">
 		<field name="type">view</field>
 		<field name="code">11000</field>
@@ -303,9 +305,11 @@
 				<field name="parent_id" eval="[(6,0,[stock_inv_11500])]"/>
 			</record>
 
+			<!--
 #
 #  13000 à 14999 - Actif LONG TERME  -  Long Term ASSETS
 #
+-->
 	<record model="account.account" id="alt_13000">
 		<field name="type">view</field>
 		<field name="code">13000</field>
@@ -356,9 +360,11 @@
 				<field name="parent_id" eval="[(6,0,[alt_13300])]"/>
 			</record>
 
+			<!--
 #
 #  15000 à 16999 - Actif IMMOBILISÉ (Corporel ou Installation)  /  Lands and Buildings
 #
+-->
 	<record model="account.account" id="aim_15000">
 		<field name="type">view</field>
 		<field name="code">15000</field>
@@ -514,9 +520,11 @@
 				<field name="parent_id" eval="[(6,0,[aim_16800])]"/>
 			</record>
 
+			<!--
 #
 #  17000 à 19999 - Actif INCORPOREL  /  ???
 #
+-->
 	<record model="account.account" id="aic_17000">
 		<field name="type">view</field>
 		<field name="code">17000</field>
@@ -581,9 +589,11 @@
 			<field name="parent_id" eval="[(6,0,[aic_17000])]"/>
 		</record>
 
+		<!--
 #
 #  20000 à 29999 - PASSIF  /  PAYABLES
 #	
+-->
 	<record model="account.account" id="passif_20000">
 		<field name="type">view</field>
 		<field name="code">20000</field>
@@ -592,9 +602,11 @@
 		<field name="parent_id" eval="[(6,0,[bilan_001])]"/>
 	</record>
 	
+	<!--
 #
 #  21000 à 24999 - Passif à COURT TERME  /  Short Term PAYABLES
 #
+-->
 	<record model="account.account" id="pct_21200">
 		<field name="type">view</field>
 		<field name="code">21000</field>
@@ -862,9 +874,11 @@
 				<field name="parent_id" eval="[(6,0,[tx_imp_21700])]"/>
 			</record>
  
+			<!--
 #
 #  25000 à 29999 - Passif à LONG TERME  /  Long Term PAYABLES
 #
+-->
 	<record model="account.account" id="plt_25000">
 		<field name="type">view</field>
 		<field name="code">25000</field>
@@ -929,9 +943,11 @@
 				<field name="parent_id" eval="[(6,0,[plt_25400])]"/>
 			</record>
 
+			<!--
 #
 #  30000 à 39999 - CAPITAUX PROPRES  (Capital et Action)  /  EQUITY
 #	
+-->
 	<record model="account.account" id="capitaux_30000">
 		<field name="type">view</field>
 		<field name="code">30000</field>
@@ -940,9 +956,11 @@
 		<field name="parent_id" eval="[(6,0,[bilan_001])]"/>
 	</record>
 
+	<!--
 #
 #  31000 à 33999 - CAPITAL - ACTIONS
 #	
+-->
 	<record model="account.account" id="actions_31000">
 		<field name="type">view</field>
 		<field name="code">31000</field>
@@ -979,9 +997,11 @@
 				<field name="parent_id" eval="[(6,0,[privilegiees_33000])]"/>
 			</record>
 
+			<!--
 #
 #  34000 à 36999 - AVOIRS
 #	
+-->
 	<record model="account.account" id="avoirs_34000">
 		<field name="type">view</field>
 		<field name="code">34000</field>
@@ -1024,10 +1044,11 @@
 
 				<field name="parent_id" eval="[(6,0,[associes_36000])]"/>
 			</record>
-
+			<!--
 #
 #  37000 à 39999 - BÉNÉFICES - Résultat de l'exercice (bénéfice ou perte)
 #	
+-->
 	<record model="account.account" id="benefices_37000">
 		<field name="type">view</field>
 		<field name="code">37000</field>
@@ -1057,9 +1078,11 @@
 			<field name="parent_id" eval="[(6,0,[benefices_37000])]"/>
 		</record>
 
+		<!--
 #
 #  ***  Comptes de l'ÉTAT DES RÉSULTATS  (40000 à 69999)  ***
 #
+-->
 	<record model="account.account" id="resultats_002">
 		<field name="type">view</field>
 		<field name="code">00002</field>
@@ -1068,9 +1091,11 @@
 		<field name="parent_id" eval="[(6,0,[a_root])]"/>
 	</record>
 
+	<!--
 #
 #  40000 à 49999 - REVENUS (PRODUITS) D'EXPLOITATION  (Revenus ou Chiffre d'Affaires)  /  INCOME
 #
+-->
 	<record model="account.account" id="rvn_40000">
 		<field name="type">view</field>
 		<field name="code">40000</field>
@@ -1078,10 +1103,11 @@
 
 		<field name="parent_id" eval="[(6,0,[resultats_002])]"/>
 	</record>
-
+	<!--
 #
 #  41000 à 42999 - VENTES de Services  -  Service SALES
 #
+-->
 	<record model="account.account" id="vente_service_41000">
 		<field name="type">view</field>
 		<field name="code">41000</field>
@@ -1103,10 +1129,11 @@
 
 			<field name="parent_id" eval="[(6,0,[vente_service_41000])]"/>
 		</record>
-
+		<!--
 #
 #  43000 à 43999 - VENTES de produits  -  Products SALES
 #
+-->
 	<record model="account.account" id="vente_produits_43000">
 		<field name="type">view</field>
 		<field name="code">43000</field>
@@ -1128,10 +1155,11 @@
 
 			<field name="parent_id" eval="[(6,0,[vente_produits_43000])]"/>
 		</record>
-
+		<!--
 #
 #  44000 à 46999 - VENTES - Débits Divers
 #
+-->
 	<record model="account.account" id="ventes_dt_45000">
 			<field name="type">view</field>
 			<field name="code">44000</field>
@@ -1167,10 +1195,11 @@
 
 			<field name="parent_id" eval="[(6,0,[ventes_dt_45000])]"/>
 		</record>
-
+		<!--
 #
 #  47000 à 49999 - AUTRES Revenus
 #
+-->
 	<record model="account.account" id="autres_revenus_47000">
 		<field name="type">view</field>
 		<field name="code">47000</field>
@@ -1206,10 +1235,11 @@
 
 			<field name="parent_id" eval="[(6,0,[autres_revenus_47000])]"/>
 		</record>
-
+		<!--
 #
 #  50000 à 59999 - (C.M.V)  COÛT DES MARCHANDISES VENDUES  /  EXPENSE
 #
+-->
 	<record model="account.account" id="cmv_50000">
 		<field name="type">view</field>
 		<field name="code">50000</field>
@@ -1280,10 +1310,11 @@
 
 			<field name="parent_id" eval="[(6,0,[cmv_50000])]"/>
 		</record>
-	
+		<!--
 #
 #  60000 à 69999 - DÉPENSES (CHARGES) D'EXPLOITATION  /  EXPENSE
 #
+-->
 	<record model="account.account" id="depenses_60000">
 		<field name="type">view</field>
 		<field name="code">60000</field>
@@ -1291,10 +1322,11 @@
 
 		<field name="parent_id" eval="[(6,0,[resultats_002])]"/>
 	</record>
-
+	<!--
 #
 #  61000 à 64999 - FRAIS D'EXPLOITATION  (de vente)
 #
+-->
 	<record model="account.account" id="frais_expl_61000">
 		<field name="type">view</field>
 		<field name="code">61000</field>
@@ -1358,10 +1390,11 @@
 
 				<field name="parent_id" eval="[(6,0,[fr_exp_61100])]"/>
 			</record>
-
+			<!--
 #
 #  65000 à 69999 - FRAIS D'ADMINIISTRATION
 #
+-->
 	<record model="account.account" id="frais_adm_65000">
 		<field name="type">view</field>
 		<field name="code">65000</field>
@@ -1936,7 +1969,7 @@
 
 				<field name="parent_id" eval="[(6,0,[frais_adm_69000])]"/>
 			</record>
-
+			<!--
 #
 #  ***  Définition des TAXES  ***
 #
@@ -1969,6 +2002,7 @@
 #
 #  TVQ - Taxe de Vente du Québec
 #		
+-->
 		<record model="account.tax" id="TVQ">
 			<field name="type">percent</field>
 			<field name="name">TVQ 7.5 %</field>			
@@ -1977,9 +2011,11 @@
 			<field name="account_paid_id" ref="tvq_payee"/>
 			<field name="sequence">2</field>
 		</record>
+		<!--
 #
 #  TPS - Taxe sur les Produits et Services (Canada)
 #
+-->
 		<record model="account.tax" id="TPS">
 			<field name="type">percent</field>
 			<field name="name">TPS 6.0 %</field>		

addons/l10n_ch/vaudtax_data.xml

@@ -62,15 +62,6 @@
 		<field name="shortcut">Mme,m</field>
 	</record>
 
-	<!--
-	Test
-	-->
-
-		<record model="res.currency" id="base.EUR">
-			<field name="name">CHF</field>
-			<field name="code">CHF</field>
-			<field name="rate">1.0</field>
-		</record>
 	
 	<!-- 
 	Account type 

addons/l10n_ch_pcpbl_association/__terp__.py

@@ -3,7 +3,7 @@
 	"version" : "1.0",
 	"author" : "Camptocamp",
 	"category" : "Localisation/Account charts",
-	"depends" : ["base", "account","l10n_ch"],
+	"depends" : ["base", "account","l10n_ch", "account_chart"],
 	"init_xml" : [],
 	"update_xml" : ["account_ch_association.xml"],
 	"demo_xml" : [],

addons/l10n_ch_pcpbl_association/account_ch_association.xml

@@ -1,5 +1,6 @@
 <terp>
 <data noupdate="True">
+
 <record id="a_root" model="account.account">
 <field name="name">Plan comptable pour associations</field>
 <field name="code">0</field>

addons/l10n_ch_pcpbl_independant/__terp__.py

@@ -3,7 +3,7 @@
 	"version" : "1.0",
 	"author" : "Camptocamp",
 	"category" : "Localisation/Account charts",
-	"depends" : ["base", "account","l10n_ch"],
+	"depends" : ["base", "account","l10n_ch", "account_chart"],
 	"init_xml" : [],
 	"update_xml" : ["account_ch_independant.xml"],
 	"demo_xml" : [],

addons/l10n_ch_pcpbl_menage/__terp__.py

@@ -3,7 +3,7 @@
 	"version" : "1.0",
 	"author" : "Camptocamp",
 	"category" : "Localisation/Account charts",
-	"depends" : ["base", "account","l10n_ch"],
+	"depends" : ["base", "account","l10n_ch", "account_chart"],
 	"init_xml" : [],
 	"update_xml" : ["account_ch_menage.xml"],
 	"demo_xml" : [],

addons/l10n_ch_pcpbl_plangen/__terp__.py

@@ -3,7 +3,7 @@
 	"version" : "1.0",
 	"author" : "Camptocamp",
 	"category" : "Localisation/Account charts",
-	"depends" : ["base", "account","l10n_ch"],
+	"depends" : ["base", "account","l10n_ch", "account_chart"],
 	"init_xml" : [],
 	"update_xml" : ["account_ch_plangen.xml"],
 	"demo_xml" : [],

addons/l10n_ch_pcpbl_plangensimpl/__terp__.py

@@ -3,7 +3,7 @@
 	"version" : "1.0",
 	"author" : "Camptocamp",
 	"category" : "Localisation/Account charts",
-	"depends" : ["base", "account","l10n_ch"],
+	"depends" : ["base", "account","l10n_ch", "account_chart"],
 	"init_xml" : [],
 	"update_xml" : ["account_ch_plangensimpl.xml"],
 	"demo_xml" : [],

addons/l10n_chart_at/__terp__.py

@@ -6,7 +6,7 @@
 	"version" : "1.0",
 	"author" : "Tiny",
 	"category" : "Localisation/Account charts",
-	"depends" : ["account"],
+	"depends" : ["account", "account_chart"],
 	"demo_xml" : [],
 	"update_xml" : ['account_tax_code.xml',"account_chart.xml",'account_tax.xml'],
 	"active": False,

addons/l10n_chart_at/account_chart.xml

@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
 <data noupdate="1">
-<record model="res.currency" id="base.EUR">
-		<field name="name">EUR</field>
-		<field name="code">EUR</field>
-	</record>
 <record id="chart0" model="account.account">
 	<field name="code">0</field>
 	<field name="name">Account Chart</field>

addons/l10n_chart_at/account_tax.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
 <data noupdate="1">
 <record id="tax1" model="account.tax">
@@ -35,4 +35,4 @@
 	<field name="ref_tax_code_id" ref="vat_code_payable"/>
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_au/__terp__.py

@@ -3,7 +3,7 @@
 	"version" : "1.0",
 	"author" : "Tiny",
 	"category" : "Localisation/Account charts",
-	"depends" : ["account", "base_iban"],
+	"depends" : ["account", "base_iban", "account_chart"],
 	"demo_xml" : [],
 	"update_xml" : ['account_tax_code.xml',"account_chart.xml",'account_tax.xml'],
 	"active": False,

addons/l10n_chart_au/account_chart.xml

@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
 <data noupdate="1">
-<record model="res.currency" id="base.EUR">
-		<field name="name">AUD</field>
-		<field name="code">AUD</field>
-	</record>
 <record id="chart0" model="account.account">
 	<field name="code">0</field>
 	<field name="name">Account Chart</field>
@@ -635,4 +631,4 @@
 
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_au/account_tax.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
 <data noupdate="1">
 <record id="tax1" model="account.tax">
@@ -24,4 +24,4 @@
 	<field name="ref_tax_code_id" ref="vat_code_payable"/>
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_be_frnl/__terp__.py

@@ -1,12 +1,9 @@
-#
-#
-#
 {
 	"name" : "Belgium - French & Dutch",
 	"version" : "1.0",
 	"author" : "Tiny",
 	"category" : "Localisation/Account charts",
-	"depends" : ["account", "base_vat", "base_iban"],
+	"depends" : ["account", "base_vat", "base_iban", "account_chart"],
 	"demo_xml" : [],
 	"update_xml" : ['account_tax_code.xml',"account_chart.xml",'account_tax.xml'],
 	"active": False,

addons/l10n_chart_be_frnl/account_chart.xml

@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
 <data noupdate="1">
-<record model="res.currency" id="base.EUR">
-		<field name="name">EUR</field>
-		<field name="code">EUR</field>
-	</record>
 <record id="chart0" model="account.account">
 	<field name="code">0</field>
 	<field name="name">Account Chart</field>
@@ -3803,4 +3799,4 @@
 
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_be_frnl/account_tax.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
 <data noupdate="1">
 <record id="tax1" model="account.tax">
@@ -57,4 +57,4 @@
 	<field name="ref_tax_code_id" ref="vat_code_payable"/>
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_br/__terp__.py

@@ -1,12 +1,9 @@
-#
-#
-#
 {
 	"name" : "Brazil",
 	"version" : "1.0",
 	"author" : "Tiny",
 	"category" : "Localisation/Account charts",
-	"depends" : ["account"],
+	"depends" : ["account", "account_chart"],
 	"demo_xml" : [],
 	"update_xml" : ['account_tax_code.xml',"account_chart.xml",'account_tax.xml'],
 	"active": False,

addons/l10n_chart_br/account_chart.xml

@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
-<data noupdate="1">
-<record model="res.currency" id="base.EUR">
-		<field name="name">R  </field>
-		<field name="code">R  </field>
-	</record>
+	<data noupdate="1">
 <record id="chart0" model="account.account">
 	<field name="code">0</field>
 	<field name="name">Account Chart</field>
@@ -572,4 +568,4 @@
 
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_br/account_tax.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
 <data noupdate="1">
 <record id="tax1" model="account.tax">
@@ -24,4 +24,4 @@
 	<field name="ref_tax_code_id" ref="vat_code_payable"/>
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_ca_en/__terp__.py

@@ -1,12 +1,9 @@
-#
-#
-#
 {
 	"name" : "Canadian - English",
 	"version" : "1.0",
 	"author" : "Tiny",
 	"category" : "Localisation/Account charts",
-	"depends" : ["account"],
+	"depends" : ["account", "account_chart"],
 	"demo_xml" : [],
 	"update_xml" : ['account_tax_code.xml',"account_chart.xml",'account_tax.xml'],
 	"active": False,

addons/l10n_chart_ca_en/account_chart.xml

@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
-<data noupdate="1">
-<record model="res.currency" id="base.EUR">
-		<field name="name">CAD</field>
-		<field name="code">CAD</field>
-	</record>
+	<data noupdate="1">
 <record id="chart0" model="account.account">
 	<field name="code">0</field>
 	<field name="name">Account Chart</field>

addons/l10n_chart_ca_en/account_tax.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
 <data noupdate="1">
 <record id="tax1" model="account.tax">
@@ -24,4 +24,4 @@
 	<field name="ref_tax_code_id" ref="vat_code_payable"/>
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_ca_fr/__terp__.py

@@ -1,12 +1,9 @@
-#
-#
-#
 {
 	"name" : "Canadian - French",
 	"version" : "1.0",
 	"author" : "Tiny",
 	"category" : "Localisation/Account charts",
-	"depends" : ["account"],
+	"depends" : ["account", "account_chart"],
 	"demo_xml" : [],
 	"update_xml" : ['account_tax_code.xml',"account_chart.xml",'account_tax.xml'],
 	"active": False,

addons/l10n_chart_ca_fr/account_chart.xml

@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
-<data noupdate="1">
-<record model="res.currency" id="base.EUR">
-		<field name="name">CAD</field>
-		<field name="code">CAD</field>
-	</record>
+	<data noupdate="1">
 <record id="chart0" model="account.account">
 	<field name="code">0</field>
 	<field name="name">Account Chart</field>

addons/l10n_chart_ca_fr/account_tax.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
 <data noupdate="1">
 <record id="tax1" model="account.tax">
@@ -24,4 +24,4 @@
 	<field name="ref_tax_code_id" ref="vat_code_payable"/>
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_ch_german/__terp__.py

@@ -1,12 +1,9 @@
-#
-#
-#
 {
 	"name" : "Switzerland - German",
 	"version" : "1.0",
 	"author" : "Tiny",
 	"category" : "Localisation/Account charts",
-	"depends" : ["account"],
+	"depends" : ["account", "account_chart"],
 	"demo_xml" : [],
 	"update_xml" : ['account_tax_code.xml',"account_chart.xml",'account_tax.xml'],
 	"active": False,

addons/l10n_chart_ch_german/account_chart.xml

@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
-<data noupdate="1">
-<record model="res.currency" id="base.EUR">
-		<field name="name">CHF</field>
-		<field name="code">CHF</field>
-	</record>
+	<data noupdate="1">
 <record id="chart0" model="account.account">
 	<field name="code">0</field>
 	<field name="name">Account Chart</field>
@@ -1355,4 +1351,4 @@
 
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_ch_german/account_tax.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
 <data noupdate="1">
 <record id="tax1" model="account.tax">
@@ -46,4 +46,4 @@
 	<field name="ref_tax_code_id" ref="vat_code_payable"/>
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_cn/__terp__.py

@@ -1,12 +1,9 @@
-#
-#
-#
 {
 	"name" : "China",
 	"version" : "1.0",
 	"author" : "Tiny",
 	"category" : "Localisation/Account charts",
-	"depends" : ["account"],
+	"depends" : ["account", "account_chart"],
 	"demo_xml" : [],
 	"update_xml" : ['account_tax_code.xml',"account_chart.xml",'account_tax.xml'],
 	"active": False,

addons/l10n_chart_cn/account_chart.xml

@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
-<data noupdate="1">
-<record model="res.currency" id="base.EUR">
-		<field name="name">CAD</field>
-		<field name="code">CAD</field>
-	</record>
+	<data noupdate="1">
 <record id="chart0" model="account.account">
 	<field name="code">0</field>
 	<field name="name">Account Chart</field>
@@ -635,4 +631,4 @@
 
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_cn/account_tax.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
 <data noupdate="1">
 <record id="tax1" model="account.tax">
@@ -24,4 +24,4 @@
 	<field name="ref_tax_code_id" ref="vat_code_payable"/>
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_cn_traditional/__terp__.py

@@ -1,12 +1,9 @@
-#
-#
-#
 {
 	"name" : "China Traditional",
 	"version" : "1.0",
 	"author" : "Tiny",
 	"category" : "Localisation/Account charts",
-	"depends" : ["account"],
+	"depends" : ["account", "account_chart"],
 	"demo_xml" : [],
 	"update_xml" : ['account_tax_code.xml',"account_chart.xml",'account_tax.xml'],
 	"active": False,

addons/l10n_chart_cn_traditional/account_chart.xml

@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
 <data noupdate="1">
-<record model="res.currency" id="base.EUR">
-		<field name="name">USD</field>
-		<field name="code">USD</field>
-	</record>
 <record id="chart0" model="account.account">
 	<field name="code">0</field>
 	<field name="name">Account Chart</field>
@@ -635,4 +631,4 @@
 
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_cn_traditional/account_tax.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
 <data noupdate="1">
 <record id="tax1" model="account.tax">
@@ -24,4 +24,4 @@
 	<field name="ref_tax_code_id" ref="vat_code_payable"/>
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_co/__terp__.py

@@ -1,12 +1,9 @@
-#
-#
-#
 {
 	"name" : "Colombia",
 	"version" : "1.0",
 	"author" : "Tiny",
 	"category" : "Localisation/Account charts",
-	"depends" : ["account"],
+	"depends" : ["account", "account_chart"],
 	"demo_xml" : [],
 	"update_xml" : ['account_tax_code.xml',"account_chart.xml",'account_tax.xml'],
 	"active": False,

addons/l10n_chart_co/account_chart.xml

@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
 <data noupdate="1">
-<record model="res.currency" id="base.EUR">
-		<field name="name">COP</field>
-		<field name="code">COP</field>
-	</record>
 <record id="chart0" model="account.account">
 	<field name="code">0</field>
 	<field name="name">Account Chart</field>
@@ -6593,4 +6589,4 @@
 
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_co/account_tax.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
 <data noupdate="1">
 <record id="tax1" model="account.tax">
@@ -332,4 +332,4 @@
 	<field name="ref_tax_code_id" ref="vat_code_payable"/>
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_cz/__terp__.py

@@ -1,12 +1,9 @@
-#
-#
-#
 {
 	"name" : "Czech Republic",
 	"version" : "1.0",
 	"author" : "Tiny",
 	"category" : "Localisation/Account charts",
-	"depends" : ["account"],
+	"depends" : ["account", "account_chart"],
 	"demo_xml" : [],
 	"update_xml" : ['account_tax_code.xml',"account_chart.xml",'account_tax.xml'],
 	"active": False,

addons/l10n_chart_cz/account_chart.xml

@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
 <data noupdate="1">
-<record model="res.currency" id="base.EUR">
-		<field name="name">Kè </field>
-		<field name="code">Kè </field>
-	</record>
 <record id="chart0" model="account.account">
 	<field name="code">0</field>
 	<field name="name">Account Chart</field>
@@ -2750,4 +2746,4 @@
 
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_cz/account_tax.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
 <data noupdate="1">
 <record id="tax1" model="account.tax">
@@ -46,4 +46,4 @@
 	<field name="ref_tax_code_id" ref="vat_code_payable"/>
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_da/__terp__.py

@@ -1,12 +1,9 @@
-#
-#
-#
 {
 	"name" : "Denmark",
 	"version" : "1.0",
 	"author" : "Tiny",
 	"category" : "Localisation/Account charts",
-	"depends" : ["account", "base_iban"],
+	"depends" : ["account", "base_iban", "account_chart"],
 	"demo_xml" : [],
 	"update_xml" : ['account_tax_code.xml',"account_chart.xml",'account_tax.xml'],
 	"active": False,

addons/l10n_chart_da/account_chart.xml

@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
 <data noupdate="1">
-<record model="res.currency" id="base.EUR">
-		<field name="name">DKK</field>
-		<field name="code">DKK</field>
-	</record>
 <record id="chart0" model="account.account">
 	<field name="code">0</field>
 	<field name="name">Account Chart</field>
@@ -617,4 +613,4 @@
 
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_da/account_tax.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
 <data noupdate="1">
 <record id="tax1" model="account.tax">
@@ -24,4 +24,4 @@
 	<field name="ref_tax_code_id" ref="vat_code_payable"/>
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_de_skr03/__terp__.py

@@ -3,7 +3,7 @@
 	"version" : "1.0",
 	"author" : "Tiny",
 	"category" : "Localisation/Account charts",
-	"depends" : ["account", "base_iban", "base_vat"],
+	"depends" : ["account", "base_iban", "base_vat", "account_chart"],
 	"demo_xml" : [],
 	"update_xml" : ['account_tax_code.xml',"account_chart.xml",'account_tax.xml'],
 	"active": False,

addons/l10n_chart_de_skr03/account_chart.xml

@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
 <data noupdate="1">
-<record model="res.currency" id="base.EUR">
-		<field name="name">EUR</field>
-		<field name="code">EUR</field>
-	</record>
 <record id="chart0" model="account.account">
 	<field name="code">0</field>
 	<field name="name">Account Chart</field>
@@ -2273,4 +2269,4 @@
 
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_de_skr03/account_tax.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
 <data noupdate="1">
 <record id="tax1" model="account.tax">
@@ -79,4 +79,4 @@
 	<field name="ref_tax_code_id" ref="vat_code_payable"/>
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_hu/__terp__.py

@@ -3,7 +3,7 @@
 	"version" : "1.0",
 	"author" : "Tiny",
 	"category" : "Localisation/Account charts",
-	"depends" : ["account", "base_iban"],
+	"depends" : ["account", "base_iban", "account_chart"],
 	"demo_xml" : [],
 	"update_xml" : ['account_tax_code.xml',"account_chart.xml",'account_tax.xml'],
 	"active": False,

addons/l10n_chart_hu/account_chart.xml

@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
-<data noupdate="1">
-<record model="res.currency" id="base.EUR">
-		<field name="name">HUF</field>
-		<field name="code">HUF</field>
-	</record>
+	<data noupdate="1">
 <record id="chart0" model="account.account">
 	<field name="code">0</field>
 	<field name="name">Account Chart</field>
@@ -320,4 +316,4 @@
 
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_hu/account_tax.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
 <data noupdate="1">
 <record id="tax1" model="account.tax">
@@ -90,4 +90,4 @@
 	<field name="ref_tax_code_id" ref="vat_code_payable"/>
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_in/__terp__.py

@@ -3,7 +3,7 @@
 	"version" : "1.0",
 	"author" : "Tiny",
 	"category" : "Localisation/Account charts",
-	"depends" : ["account"],
+	"depends" : ["account", "account_chart"],
 	"demo_xml" : [],
 	"update_xml" : ['account_tax_code.xml',"account_chart.xml",'account_tax.xml'],
 	"active": False,

addons/l10n_chart_in/account_chart.xml

@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
-<data noupdate="1">
-<record model="res.currency" id="base.EUR">
-		<field name="name">IDR</field>
-		<field name="code">IDR</field>
-	</record>
+	<data noupdate="1">
 <record id="chart0" model="account.account">
 	<field name="code">0</field>
 	<field name="name">Account Chart</field>
@@ -545,4 +541,4 @@
 
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_in/account_tax.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
 <data noupdate="1">
 <record id="tax1" model="account.tax">
@@ -13,4 +13,4 @@
 	<field name="ref_tax_code_id" ref="vat_code_payable"/>
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_it/__terp__.py

@@ -3,7 +3,7 @@
 	"version" : "1.0",
 	"author" : "Tiny",
 	"category" : "Localisation/Account charts",
-	"depends" : ["account", "base_vat", "base_iban"],
+	"depends" : ["account", "base_vat", "base_iban", "account_chart"],
 	"demo_xml" : [],
 	"update_xml" : ['account_tax_code.xml',"account_chart.xml",'account_tax.xml'],
 	"active": False,

addons/l10n_chart_it/account_chart.xml

@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
-<data noupdate="1">
-<record model="res.currency" id="base.EUR">
-		<field name="name">EUR</field>
-		<field name="code">EUR</field>
-	</record>
+	<data noupdate="1">
 <record id="chart0" model="account.account">
 	<field name="code">0</field>
 	<field name="name">Account Chart</field>
@@ -1301,4 +1297,4 @@
 
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_it/account_tax.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
 <data noupdate="1">
 <record id="tax1" model="account.tax">
@@ -68,4 +68,4 @@
 	<field name="ref_tax_code_id" ref="vat_code_payable"/>
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_it_cc2424/__terp__.py

@@ -3,7 +3,7 @@
 	"version" : "1.0",
 	"author" : "Tiny",
 	"category" : "Localisation/Account charts",
-	"depends" : ["account", "base_iban", "base_vat"],
+	"depends" : ["account", "base_iban", "base_vat", "account_chart"],
 	"demo_xml" : [],
 	"update_xml" : ['account_tax_code.xml',"account_chart.xml",'account_tax.xml'],
 	"active": False,

addons/l10n_chart_it_cc2424/account_chart.xml

@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
 <data noupdate="1">
-<record model="res.currency" id="base.EUR">
-		<field name="name">EUR</field>
-		<field name="code">EUR</field>
-	</record>
 <record id="chart0" model="account.account">
 	<field name="code">0</field>
 	<field name="name">Account Chart</field>
@@ -2012,4 +2008,4 @@
 
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_it_cc2424/account_tax.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
 <data noupdate="1">
 <record id="tax1" model="account.tax">
@@ -68,4 +68,4 @@
 	<field name="ref_tax_code_id" ref="vat_code_payable"/>
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_lv/__terp__.py

@@ -3,7 +3,7 @@
 	"version" : "1.0",
 	"author" : "Tiny",
 	"category" : "Localisation/Account charts",
-	"depends" : ["account", "base_iban", "base_vat"],
+	"depends" : ["account", "base_iban", "base_vat", "account_chart"],
 	"demo_xml" : [],
 	"update_xml" : ['account_tax_code.xml',"account_chart.xml",'account_tax.xml'],
 	"active": False,

addons/l10n_chart_lv/account_chart.xml

@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
 <data noupdate="1">
-<record model="res.currency" id="base.EUR">
-		<field name="name">LVL</field>
-		<field name="code">LVL</field>
-	</record>
 <record id="chart0" model="account.account">
 	<field name="code">0</field>
 	<field name="name">Account Chart</field>
@@ -2192,4 +2188,4 @@
 
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_lv/account_tax.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
 <data noupdate="1">
 <record id="tax1" model="account.tax">
@@ -24,4 +24,4 @@
 	<field name="ref_tax_code_id" ref="vat_code_payable"/>
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_nl/__terp__.py

@@ -3,7 +3,7 @@
 	"version" : "1.0",
 	"author" : "Tiny",
 	"category" : "Localisation/Account charts",
-	"depends" : ["account", "base_iban", "base_vat"],
+	"depends" : ["account", "base_iban", "base_vat", "account_chart"],
 	"demo_xml" : [],
 	"update_xml" : ['account_tax_code.xml',"account_chart.xml",'account_tax.xml'],
 	"active": False,

addons/l10n_chart_nl/account_chart.xml

@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
 <data noupdate="1">
-<record model="res.currency" id="base.EUR">
-		<field name="name">EUR</field>
-		<field name="code">EUR</field>
-	</record>
 <record id="chart0" model="account.account">
 	<field name="code">0</field>
 	<field name="name">Account Chart</field>
@@ -644,4 +640,4 @@
 
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_nl/account_tax.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
 <data noupdate="1">
 <record id="tax1" model="account.tax">
@@ -24,4 +24,4 @@
 	<field name="ref_tax_code_id" ref="vat_code_payable"/>
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_nl_standard/__terp__.py

@@ -3,7 +3,7 @@
 	"version" : "1.0",
 	"author" : "Tiny",
 	"category" : "Localisation/Account charts",
-	"depends" : ["account", "base_iban", "base_vat"],
+	"depends" : ["account", "base_iban", "base_vat", "account_chart"],
 	"demo_xml" : [],
 	"update_xml" : ['account_tax_code.xml',"account_chart.xml",'account_tax.xml'],
 	"active": False,

addons/l10n_chart_nl_standard/account_chart.xml

@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
 <data noupdate="1">
-<record model="res.currency" id="base.EUR">
-		<field name="name">EUR</field>
-		<field name="code">EUR</field>
-	</record>
 <record id="chart0" model="account.account">
 	<field name="code">0</field>
 	<field name="name">Account Chart</field>
@@ -1841,4 +1837,4 @@
 
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_nl_standard/account_tax.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
 <data noupdate="1">
 <record id="tax1" model="account.tax">
@@ -46,4 +46,4 @@
 	<field name="ref_tax_code_id" ref="vat_code_payable"/>
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_no/__terp__.py

@@ -3,7 +3,7 @@
 	"version" : "1.0",
 	"author" : "Tiny",
 	"category" : "Localisation/Account charts",
-	"depends" : ["account", "base_iban", "base_vat"],
+	"depends" : ["account", "base_iban", "base_vat", "account_chart"],
 	"demo_xml" : [],
 	"update_xml" : ['account_tax_code.xml',"account_chart.xml",'account_tax.xml'],
 	"active": False,

addons/l10n_chart_no/account_chart.xml

@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
-<data noupdate="1">
-<record model="res.currency" id="base.EUR">
-		<field name="name">NOK</field>
-		<field name="code">NOK</field>
-	</record>
+	<data noupdate="1">
 <record id="chart0" model="account.account">
 	<field name="code">0</field>
 	<field name="name">Account Chart</field>
@@ -2552,4 +2548,4 @@
 
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_no/account_tax.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
 <data noupdate="1">
 <record id="tax1" model="account.tax">
@@ -46,4 +46,4 @@
 	<field name="ref_tax_code_id" ref="vat_code_payable"/>
 </record>
 </data>
-</terp>
+</terp>

addons/l10n_chart_pa/__terp__.py

@@ -3,7 +3,7 @@
 	"version" : "1.0",
 	"author" : "Tiny",
 	"category" : "Localisation/Account charts",
-	"depends" : ["account"],
+	"depends" : ["account", "account_chart"],
 	"demo_xml" : [],
 	"update_xml" : ['account_tax_code.xml',"account_chart.xml",'account_tax.xml'],
 	"active": False,

addons/l10n_chart_pa/account_chart.xml

@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="latin1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <terp>
-<data noupdate="1">
-<record model="res.currency" id="base.EUR">
-		<field name="name">PYG</field>
-		<field name="code">PYG</field>
-	</record>
+	<data noupdate="1">
 <record id="chart0" model="account.account">
 	<field name="code">0</field>
 	<field name="name">Account Chart</field>
@@ -2183,4 +2179,4 @@
 
 </record>
 </data>
-</terp>
+</terp>