odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

merge 

bzr revid: fp@tinyerp.com-20090121190503-xxbwpp4limmjutxy
This commit is contained in:
Fabien Pinckaers 2009-01-21 20:05:03 +01:00
parent a25ff87c99 2d76b47316
commit a42e24d08a
15 changed files with 264 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
addons/account/account.py
View File

@ -21,6 +21,7 @@
##############################################################################
import time
import netsvc
from osv import fields, osv
from tools.misc import currency
@ -1175,8 +1176,10 @@ class account_tax_code(osv.osv):
'line_ids': fields.one2many('account.move.line', 'tax_code_id', 'Lines'),
'company_id': fields.many2one('res.company', 'Company', required=True),
'sign': fields.float('Sign for parent', required=True),
'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want that any vat related to this Tax Code appears on invoices"),
}
def name_get(self, cr, uid, ids, context=None):
if not len(ids):
return []
@ -1194,6 +1197,7 @@ class account_tax_code(osv.osv):
_defaults = {
'company_id': _default_company,
'sign': lambda *args: 1.0,
'notprintable': lambda *a: False,
}
def _check_recursion(self, cr, uid, ids):
level = 100
@ -1262,8 +1266,18 @@ class account_tax(osv.osv):
'include_base_amount': fields.boolean('Include in base amount', help="Indicate if the amount of tax must be included in the base amount for the computation of the next taxes"),
'company_id': fields.many2one('res.company', 'Company', required=True),
'description': fields.char('Tax Code',size=32),
'price_include': fields.boolean('Tax Included in Price', help="Check this is the price you use on the product and invoices is including this tax.")
'price_include': fields.boolean('Tax Included in Price', help="Check this is the price you use on the product and invoices is including this tax."),
'type_tax_use': fields.selection([('sale','Sale'),('purchase','Purchase')], 'Tax Use in')
}
def search(self, cr, uid, args, offset=0, limit=None, order=None,
context=None, count=False):
if context and context.has_key('type'):
if context['type'] in ('out_invoice','out_refund'):
args.append(('type_tax_use','=','sale'))
elif context['type'] in ('in_invoice','in_refund'):
args.append(('type_tax_use','=','purchase'))
return super(account_tax, self).search(cr, uid, args, offset, limit, order, context, count)
def name_get(self, cr, uid, ids, context={}):
if not len(ids):
@ -1802,10 +1816,12 @@ class account_tax_code_template(osv.osv):
'parent_id': fields.many2one('account.tax.code.template', 'Parent Code', select=True),
'child_ids': fields.one2many('account.tax.code.template', 'parent_id', 'Childs Codes'),
'sign': fields.float('Sign for parent', required=True),
'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want that any vat related to this Tax Code appears on invoices"),
}
_defaults = {
'sign': lambda *args: 1.0,
'notprintable': lambda *a: False,
}
def name_get(self, cr, uid, ids, context=None):
@ -1892,6 +1908,7 @@ class account_tax_template(osv.osv):
'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
'include_base_amount': fields.boolean('Include in base amount', help="Indicate if the amount of tax must be included in the base amount for the computation of the next taxes."),
'description': fields.char('Internal Name', size=32),
'type_tax_use': fields.selection([('sale','Sale'),('purchase','Purchase')], 'Tax Use in')
}
def name_get(self, cr, uid, ids, context={}):
@ -1990,6 +2007,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
'chart_template_id': fields.many2one('account.chart.template','Chart Template',required=True),
'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Bank Accounts',required=True),
'code_digits':fields.integer('# of Digits',required=True,help="No. of Digits to use for account code"),
'seq_journal':fields.boolean('Separated Journal Sequences',help="Check this box if you want to use a different sequence for each created journal. Otherwise, all will use the same sequence."),
}
def _get_chart(self, cr, uid, context={}):
@ -2008,6 +2026,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
obj_acc = self.pool.get('account.account')
obj_acc_tax = self.pool.get('account.tax')
obj_journal = self.pool.get('account.journal')
obj_sequence = self.pool.get('ir.sequence')
obj_acc_template = self.pool.get('account.account.template')
obj_fiscal_position_template = self.pool.get('account.fiscal.position.template')
obj_fiscal_position = self.pool.get('account.fiscal.position')
@ -2065,6 +2084,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
'include_base_amount': tax.include_base_amount,
'description':tax.description,
'company_id': company_id,
'type_tax_use': tax.type_tax_use
}
new_tax = obj_acc_tax.create(cr,uid,vals_tax)
#as the accounts have not been created yet, we have to wait before filling these fields
@ -2120,16 +2140,22 @@ class wizard_multi_charts_accounts(osv.osv_memory):
# Creating Journals
vals_journal={}
view_id = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Journal View')])[0]
seq_id = self.pool.get('ir.sequence').search(cr,uid,[('code','=','account.journal')])[0]
seq_code = self.pool.get('ir.sequence').get(cr, uid, 'account.journal')
seq_id = obj_sequence.search(cr,uid,[('name','=','Account Journal')])[0]
if obj_multi.seq_journal:
seq_id_sale = obj_sequence.search(cr,uid,[('name','=','Sale Journal')])[0]
seq_id_purchase = obj_sequence.search(cr,uid,[('name','=','Purchase Journal')])[0]
else:
seq_id_sale = seq_id
seq_id_purchase = seq_id
vals_journal['view_id']=view_id
vals_journal['sequence_id']=seq_id
vals_journal['view_id'] = view_id
#Sales Journal
vals_journal['name'] = _('Sales Journal')
vals_journal['type'] = 'sale'
vals_journal['code'] = _('SAJ')
vals_journal['sequence_id'] = seq_id_sale
if obj_multi.chart_template_id.property_account_receivable:
vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id]
@ -2138,9 +2164,10 @@ class wizard_multi_charts_accounts(osv.osv_memory):
obj_journal.create(cr,uid,vals_journal)
# Purchase Journal
vals_journal['name']=_('Purchase Journal')
vals_journal['type']='purchase'
vals_journal['code']=_('EXJ')
vals_journal['name'] = _('Purchase Journal')
vals_journal['type'] = 'purchase'
vals_journal['code'] = _('EXJ')
vals_journal['sequence_id'] = seq_id_purchase
if obj_multi.chart_template_id.property_account_payable:
vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_expense_categ.id]
@ -2158,7 +2185,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
#create the account_account for this bank journal
tmp = self.pool.get('res.partner.bank').name_get(cr, uid, [line.acc_no.id])[0][1]
dig = obj_multi.code_digits
vals={
vals = {
'name': line.acc_no.bank and line.acc_no.bank.name+' '+tmp or tmp,
'currency_id': line.currency_id and line.currency_id.id or False,
'code': str(ref_acc_bank.code.ljust(dig,'0') + str(current_num)),
@ -2170,6 +2197,13 @@ class wizard_multi_charts_accounts(osv.osv_memory):
}
acc_cash_id = obj_acc.create(cr,uid,vals)
if obj_multi.seq_journal:
vals_seq={
'name': _('Bank Journal ') + vals['name'],
'code': 'account.journal',
}
seq_id = obj_sequence.create(cr,uid,vals_seq)
#create the bank journal
vals_journal['name']= vals['name']
vals_journal['code']= _('BNK') + str(current_num)
@ -2181,7 +2215,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
else:
vals_journal['view_id'] = view_id_cash
vals_journal['default_credit_account_id'] = acc_cash_id
vals_journal['default_debit_account_id']= acc_cash_id
vals_journal['default_debit_account_id'] = acc_cash_id
obj_journal.create(cr,uid,vals_journal)
current_num += 1

8
addons/account/account_invoice_view.xml
View File

@ -63,7 +63,7 @@
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id"/>
<newline/>
<field name="price_subtotal"/>
<field colspan="4" name="invoice_line_tax_id" domain="[('parent_id','=',False)]"/>
<field colspan="4" name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/>
</page>
<page string="Notes">
<field colspan="4" name="note" nolabel="1"/>
@ -156,7 +156,7 @@
<tree string="Invoice lines" editable="top">
<field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id)"/>
<field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(parent.fiscal_position,account_id)"/>
<field name="invoice_line_tax_id" view_mode="2" domain="[('parent_id','=',False)]"/>
<field name="invoice_line_tax_id" view_mode="2" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/>
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id"/>
<field name="quantity"/>
<field name="price_unit"/>
@ -197,7 +197,7 @@
</page>
<page string="Other Info">
<field name="company_id"/>
<field name="fiscal_position"/>
<field name="fiscal_position" groups="base.group_extended"/>
<newline/>
<field name="payment_term" on_change="onchange_payment_term_date_invoice(payment_term, date_invoice)"/>
<field name="name" select="2"/>
@ -284,7 +284,7 @@
</page>
<page string="Other Info">
<field name="company_id"/>
<field name="fiscal_position"/>
<field name="fiscal_position" groups="base.group_extended"/>
<newline/>
<field name="date_due" select="1"/>
<newline/>

7
addons/account/account_report.xml
View File

@ -18,13 +18,6 @@
string="Invoices"
attachment="(object.state in ('open','paid')) and ('INV'+(object.number or '').replace('/',''))"
attachment_use="1"/>
<report
auto="False"
id="account_invoices_preview"
model="account.invoice"
name="account.invoice.preview"
rml="account/report/invoice.rml"
string="Print Preview"/>
<report id="account_transfers" model="account.transfer" name="account.transfer" string="Transfers" xml="account/report/transfer.xml" xsl="account/report/transfer.xsl"/>
<report auto="False" id="account_intracom" menu="False" model="account.move.line" name="account.intracom" string="IntraCom"/>

9
addons/account/account_view.xml
View File

@ -461,6 +461,7 @@
<field name="code" select="1"/>
<field name="sequence"/>
<field name="sign"/>
<field name="close_method"/>
<field name="partner_account"/>
</form>
@ -539,8 +540,9 @@
<field name="arch" type="xml">
<form string="Account Tax Code">
<field name="name" select="1"/>
<field name="company_id"/>
<field name="code" select="1"/>
<field name="company_id"/>
<field name="notprintable"/>
<field name="parent_id" select="1"/>
<field name="sign"/>
<newline/>
@ -606,6 +608,7 @@
<field groups="base.group_extended" name="child_depend"/>
<field groups="base.group_extended" name="sequence"/>
<field groups="base.group_extended" name="price_include"/>
<field name="type_tax_use"/>
<newline/>
<field colspan="4" groups="base.group_extended" name="child_ids"/>
</page>
@ -1548,6 +1551,7 @@
<field name="chart_template_id" select="1"/>
<field name="tax_group" select="1"/>
<field name="type" select="2"/>
<field name="type_tax_use" select="2"/>
</group>
<notebook colspan="4">
<page string="Tax Definition">
@ -1659,7 +1663,8 @@
<label align="0.0" string="This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template" colspan="4"/>
<field name="company_id" />
<field name ="code_digits" />
<field name="chart_template_id" colspan="4"/>
<field name="chart_template_id"/>
<field name ="seq_journal" />
<field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list">
<form string="Bank Information">
<field name="acc_no"/>

6
addons/account/product.py
View File

@ -1,7 +1,7 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# $Id$
#
@ -54,10 +54,10 @@ class product_template(osv.osv):
_columns = {
'taxes_id': fields.many2many('account.tax', 'product_taxes_rel',
'prod_id', 'tax_id', 'Customer Taxes',
domain=[('parent_id','=',False)]),
domain=[('parent_id','=',False),('type_tax_use','=','sale')]),
'supplier_taxes_id': fields.many2many('account.tax',
'product_supplier_taxes_rel', 'prod_id', 'tax_id',
'Supplier Taxes', domain=[('parent_id', '=', False)]),
'Supplier Taxes', domain=[('parent_id', '=', False),('type_tax_use','=','purchase')]),
'property_account_income': fields.property(
'account.account',
type='many2one',

7
addons/account/report/invoice.py
View File

@ -35,10 +35,3 @@ report_sxw.report_sxw(
'addons/account/report/invoice.rml',
parser=account_invoice
)
report_sxw.report_sxw(
'report.account.invoice.preview',
'account.invoice',
'addons/account/report/invoice.rml',
parser=account_invoice
)

60
addons/account/report/invoice.rml
View File

@ -287,7 +287,7 @@
<para style="terp_default_Centre_9">[[ o.name ]]</para>
</td>
<td>
<para style="terp_default_Centre_9">[[ o.date_invoice ]]</para>
<para style="terp_default_Centre_9">[[ o.date_invoice or '' ]]</para>
</td>
<td>
<para style="terp_default_Centre_9">[[ o.address_invoice_id.partner_id.ref or '' ]]</para>
@ -327,22 +327,22 @@
<para style="terp_default_9">[[ l.name ]]</para>
</td>
<td>
<para style="terp_default_9">[[ ', '.join([lt.name for lt in l.invoice_line_tax_id]) or '' ]]</para>
<para style="terp_default_9">[[ ', '.join([ lt.description or '' for lt in l.invoice_line_tax_id ]) ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(l.quantity) or '0.00' ]]</para>
<para style="terp_default_Right_9">[[ l.quantity or 0.00 ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ (l.uos_id and l.uos_id.name) or '' ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(l.price_unit) or '0.00' ]]</para>
<para style="terp_default_Right_9">[[ l.price_unit or 0.00 ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ l.discount and formatLang (l.discount) or '0.00' ]]</para>
<para style="terp_default_Right_9">[[ l.discount and l.discount or 0.00 ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(l.price_subtotal) or '0.00' ]]</para>
<para style="terp_default_Right_9">[[ l.price_subtotal or 0.00 ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
@ -418,7 +418,7 @@
<para style="P1">Net Total:</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) or '0.00' ]]</para>
<para style="terp_default_Right_9">[[ o.amount_untaxed or 0.00 ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
@ -434,7 +434,7 @@
<para style="P1">Taxes:</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(o.amount_tax) or '0.00']]</para>
<para style="terp_default_Right_9">[[ o.amount_tax or 0.00 ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
@ -450,7 +450,7 @@
<para style="P1">Total:</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(o.amount_total) or '0.00' ]]</para>
<para style="terp_default_Right_9">[[ o.amount_total or 0.00]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
@ -464,8 +464,8 @@
<tr>
<td>
<!-- <para style="terp_default_8">[[ format(o.amount_tax) or removeParentNode('blockTable') ]]</para> -->
<blockTable colWidths="54.0,58.0,67.0" style="Table_Tax_Header">
<tr>
<blockTable colWidths="85.0,58.0,67.0" style="Table_Tax_Header">
<tr >
<td>
<para style="terp_tblheader_Details_Centre">Tax</para>
</td>
@ -476,33 +476,39 @@
<para style="terp_tblheader_Details_Right">Amount</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
</para>
</td>
</tr>
<tr>
<td>
<para style="terp_default_8">[[ repeatIn(o.tax_line,'t') ]]</para>
<blockTable colWidths="53.0,60.0,65.0" style="Table_Tax_Content">
<tr>
</blockTable>
<blockTable colWidths="85.0,60.0,65.0" style="Table_Tax_Content">
<tr>
<td>
<para style="terp_default_Centre_8">[[ t.name ]]</para>
<para style="terp_default_Centre_8"> </para>
</td>
<td>
<para style="terp_default_Right_8">[[ formatLang(t.base) or '0.00' ]]</para>
<para style="terp_default_Right_8"></para>
</td>
<td>
<para style="terp_default_Right_8">[[ formatLang(t.amount) or '0.00' ]]</para>
<para style="terp_default_Right_8"></para>
</td>
</tr>
</tr>
<tr>
<para style="terp_default_8">[[ repeatIn(o.tax_line,'t') ]]</para>
<td>
<para style="terp_default_Centre_8">[[ lt.description and t.name + ' - ' + lt.description or t.name ]] </para>
</td>
<td>
<para style="terp_default_Right_8">[[ t.base or 0.00 ]] </para>
</td>
<td>
<para style="terp_default_Right_8">[[ t.amount or 0.00 ]] [[ t.tax_code_id.notprintable and removeParentNode('tr') or '' ]]</para>
</td>
</tr>
</blockTable>
</td>
</tr>
<tr>
<td>
<blockTable colWidths="53.0,60.0,65.0" style="Table_Table_Border_White">
<blockTable colWidths="85.0,60.0,65.0" style="Table_Table_Border_White">
<tr>
<td>
<para style="terp_default_2">

36
addons/account/wizard/wizard_statement_from_invoice.py
View File

@ -40,7 +40,7 @@ FIELDS = {
START_FIELD = {
'date': {'string': 'Date payment', 'type': 'date','required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
'journal_id': {'string': 'Journal', 'type': 'many2many', 'relation': 'account.journal', 'domain': '[("type","in",["sale","purchase"])]', 'help': 'This field allow you to choose the accounting journals you want for filtering the invoices. If you left this field empty, it will search on all sale and purchase journals.'},
'journal_id': {'string': 'Journal', 'type': 'many2many', 'relation': 'account.journal', 'domain': '[("type","in",["sale","purchase","cash"])]', 'help': 'This field allow you to choose the accounting journals you want for filtering the invoices. If you left this field empty, it will search on all sale, purchase and cash journals.'},
}
START_FORM = '''<?xml version="1.0"?>
@ -60,26 +60,12 @@ def _search_invoices(obj, cr, uid, data, context):
journal_ids = data['form']['journal_id'][0][2]
if journal_ids == []:
sale_journal_ids = journal_obj.search(cr, uid, [('type', '=', 'sale')], context=context)
pur_journal_ids = journal_obj.search(cr, uid, [('type', '=', 'purchase')], context=context)
else:
pur_journal_ids = sale_journal_ids = []
for journal in pool.get('account.journal').browse(cr, uid, journal_ids):
if journal.type == 'sale':
sale_journal_ids.append(journal.id)
else:
pur_journal_ids.append(journal.id)
journal_ids = journal_obj.search(cr, uid, [('type', 'in', ('sale','cash','purchase'))], context=context)
line_ids = line_obj.search(cr, uid, [
('reconcile_id', '=', False),
('journal_id', 'in', sale_journal_ids),
('account_id.type', '=', 'receivable')],
#order='date DESC, id DESC', #doesn't work
context=context)
line_ids += line_obj.search(cr, uid, [
('reconcile_id', '=', False),
('journal_id', 'in', pur_journal_ids),
('account_id.type', '=', 'payable')],
('journal_id', 'in', journal_ids),
('account_id.reconcile', '=', True)],
#order='date DESC, id DESC', #doesn't work
context=context)
@ -88,8 +74,7 @@ def _search_invoices(obj, cr, uid, data, context):
<field name="lines" colspan="4" height="300" width="800" nolabel="1"
domain="[('id', 'in', [%s])]"/>
</form>''' % (','.join([str(x) for x in line_ids]))
return {'type':'customer'}
# return {'lines': line_ids,'type':'customer'}
return {}
def _populate_statement(obj, cursor, user, data, context):
line_ids = data['form']['lines'][0][2]
@ -124,10 +109,17 @@ def _populate_statement(obj, cursor, user, data, context):
reconcile_id = statement_reconcile_obj.create(cursor, user, {
'line_ids': [(6, 0, [line.id])]
}, context=context)
if line.journal_id.type == 'sale':
type = 'customer'
elif line.journal_id.type == 'purchase':
type = 'supplier'
else:
type = 'general'
statement_line_obj.create(cursor, user, {
'name': line.name or '?',
'amount': amount,
'type': data['form']['type'],
'type': type,
'partner_id': line.partner_id.id,
'account_id': line.account_id.id,
'statement_id': statement.id,

14
addons/auction/auction_view.xml
View File

@ -103,8 +103,8 @@ Auction Management/Auction Dates/New Auction Dates
<field name="auction1" select="1"/>
<field name="auction2" select="1"/>
<separator string="Commissions" colspan="4"/>
<field name="seller_costs" domain="[('parent_id','=',False),('domain','=','auction')]"/>
<field name="buyer_costs" domain="[('parent_id','=',False),('domain','=','auction')]"/>
<field name="seller_costs" domain="[('parent_id','=',False),('domain','=','auction'),('type_tax_use','=','sale')]"/>
<field name="buyer_costs" domain="[('parent_id','=',False),('domain','=','auction'),('type_tax_use','=','purchase')]"/>
<separator string="Accounting" colspan="4"/>
<field name="acc_expense"/>
<field name="acc_income"/>
@ -208,7 +208,7 @@ Auction Management/Auction Dates/Reporting
<field name="vnd_lim"/>
<field name="vnd_lim_net"/>
<field name="lot_est1"/>
<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False)]"/>
<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False),('type_tax_use','=','purchase')]"/>
<field name="lot_est2"/>
<field name="product_id"/>
<field name="state" readonly="1"/>
@ -319,7 +319,7 @@ Auction Management/Auction Dates/Reporting
<field name="obj_comm" select="2"/>
<field name="obj_ret"/>
<field name="ach_emp"/>
<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False)]"/>
<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False),('type_tax_use','=','purchase')]"/>
<field name="buyer_price"/>
<field name="seller_price"/>
<field name="gross_revenue"/>
@ -430,7 +430,7 @@ Auction Management/Auction Dates/Reporting
<field name="name" readonly="1" select="1"/>
<field name="name2" readonly="2" select="1"/>
<field name="artist_id" readonly="1"/>
<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False)]"/>
<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False),('type_tax_use','=','purchase')]"/>
<newline/>
<field name="buyer_price"/>
<field name="is_ok" select="1"/>
@ -510,7 +510,7 @@ Auction Management/Auction Dates/Reporting
<field name="partner_id" select="1" on_change="partner_id_change(partner_id)"/>
<field name="method"/>
<newline/>
<field name="tax_id" domain="[('domain','=','auction'),('parent_id','=',False)]"/>
<field name="tax_id" domain="[('domain','=','auction'),('parent_id','=',False),('type_tax_use','=','sale')]"/>
<field name="transfer"/>
<newline/>
<field name="lot_id" colspan="4" mode="tree,graph" nolabel="1">
@ -545,7 +545,7 @@ Auction Management/Auction Dates/Reporting
<field name="lot_est1"/>
<field name="lot_est2"/>
<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False)]"/>
<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False),('type_tax_use','=','purchase')]"/>
<field name="product_id" domain="[('sale_ok','=',True)]"/>
<field name="state" readonly="1"/>
</page><page string="Photos">

20
addons/l10n_be/account_pcmn_belgium.xml
View File

@ -6637,6 +6637,7 @@
<field name="tax_code_id" ref="vat_code_a49"/>
<field name="ref_base_code_id" ref="vat_code_a54"/>
<field name="ref_tax_code_id" ref="vat_code_a63"/>
<field name="type_tax_use">sale</field>
</record>
<record id="vat_6_buy" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6645,6 +6646,7 @@
<field name="type">percent</field>
<field name="account_collected_id" ref="vat_refund06"/>
<field name="account_paid_id" ref="vat_payable06"/>
<field name="type_tax_use">purchase</field>
</record>
<record id="vat_12" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6653,6 +6655,7 @@
<field name="type">percent</field>
<field name="account_collected_id" ref="vat_payable12"/>
<field name="account_paid_id" ref="vat_refund12"/>
<field name="type_tax_use">sale</field>
</record>
<record id="vat_12_buy" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6661,6 +6664,7 @@
<field name="type">percent</field>
<field name="account_collected_id" ref="vat_refund12"/>
<field name="account_paid_id" ref="vat_payable12"/>
<field name="type_tax_use">purchase</field>
</record>
<record id="vat_21" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6673,6 +6677,7 @@
<field name="tax_code_id" ref="vat_code_a54"/>
<field name="ref_base_code_id" ref="vat_code_a49"/>
<field name="ref_tax_code_id" ref="vat_code_a64"/>
<field name="type_tax_use">sale</field>
</record>
<record id="vat_21_buy" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6680,6 +6685,7 @@
<field eval="1.0" name="amount"/>
<field name="type">percent</field>
<field eval="1" name="child_depend"/>
<field name="type_tax_use">purchase</field>
</record>
<record id="vat_21_buy_1" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6693,6 +6699,8 @@
<field name="tax_code_id" ref="vat_code_a59"/>
<field name="ref_base_code_id" ref="vat_code_a85"/>
<field name="ref_tax_code_id" ref="vat_code_a63"/>
<field name="type_tax_use">purchase</field>
</record>
<record id="vat_21_buy_2" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6702,6 +6710,7 @@
<field name="type">percent</field>
<field name="ref_base_code_id" ref="vat_code_a82"/>
<field eval="-1" name="ref_base_sign"/>
<field name="type_tax_use">purchase</field>
</record>
<record id="vat_0" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6710,6 +6719,7 @@
<field name="type">percent</field>
<field name="account_collected_id" ref="vat_payable0"/>
<field name="account_paid_id" ref="vat_refund0"/>
<field name="type_tax_use">sale</field>
</record>
<record id="vat_CO" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6721,6 +6731,7 @@
<field eval="vat_code_a82" name="base_code_id"/>
<field eval="vat_code_a82" name="ref_base_code_id"/>
<field eval="True" name="child_depend"/>
<field name="type_tax_use">purchase</field>
</record>
<record id="vat_CO_0" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6732,6 +6743,7 @@
<field name="account_paid_id" ref="vat_refund0"/>
<field eval="vat_code_a59" name="tax_code_id"/>
<field eval="vat_code_a59" name="ref_tax_code_id"/>
<field name="type_tax_use">purchase</field>
</record>
<record id="vat_CO_1" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6743,6 +6755,7 @@
<field name="account_paid_id" ref="vat_refund0"/>
<field eval="vat_code_a56" name="tax_code_id"/>
<field eval="vat_code_a56" name="ref_tax_code_id"/>
<field name="type_tax_use">purchase</field>
</record>
<record id="vat_Ex" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6751,6 +6764,7 @@
<field name="type">percent</field>
<field name="account_collected_id" ref="vat_payable0"/>
<field name="account_paid_id" ref="vat_refund0"/>
<field name="type_tax_use">sale</field>
</record>
<record id="vat_I0" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6760,6 +6774,7 @@
<field eval="True" name="child_depend"/>
<field eval="vat_code_a81" name="base_code_id"/>
<field eval="vat_code_a81" name="ref_base_code_id"/>
<field name="type_tax_use">sale</field>
</record>
<record id="vat_I0_1" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6771,6 +6786,7 @@
<field name="account_paid_id" ref="vat_refund0"/>
<field eval="vat_code_a59" name="tax_code_id"/>
<field eval="vat_code_a59" name="ref_tax_code_id"/>
<field name="type_tax_use">sale</field>
</record>
<record id="vat_I0_2" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6782,6 +6798,7 @@
<field name="account_paid_id" ref="vat_payable0"/>
<field eval="vat_code_a55" name="tax_code_id"/>
<field eval="vat_code_a55" name="ref_tax_code_id"/>
<field name="type_tax_use">sale</field>
</record>
<record id="vat_XO" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6791,6 +6808,7 @@
<field name="account_collected_id" ref="vat_payable0"/>
<field name="account_paid_id" ref="vat_refund0"/>
<field eval="True" name="child_depend"/>
<field name="type_tax_use">sale</field>
</record>
<record id="vat_XO_1" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6802,6 +6820,7 @@
<field name="account_paid_id" ref="vat_refund0"/>
<field eval="vat_code_a59" name="tax_code_id"/>
<field eval="vat_code_a59" name="ref_tax_code_id"/>
<field name="type_tax_use">sale</field>
</record>
<record id="vat_XO_2" model="account.tax.template">
<field name="chart_template_id" ref="l10nbe_chart_template"/>
@ -6813,6 +6832,7 @@
<field name="account_paid_id" ref="vat_payable0"/>
<field eval="vat_code_a57" name="tax_code_id"/>
<field eval="vat_code_a57" name="ref_tax_code_id"/>
<field name="type_tax_use">sale</field>
</record>
</data>

96
addons/l10n_chart_uk_minimal/account_tax.xml
View File

@ -1,128 +1,128 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="True">
<!-- VAT Code Definitions -->
<!-- Invoiced VAT -->
<!-- Input VAT -->
<record id="vat_code_chart_root" model="account.tax.code.template">
<field name="name">Plan Fees UK</field>
</record>
<record id="vat_code_balance_net" model="account.tax.code.template">
<field name="name">VAT Balance to Pay</field>
<field name="parent_id" ref="vat_code_chart_root"/>
</record>
<record id="vat_code_input" model="account.tax.code.template">
<field name="name">Input VAT</field>
<field name="parent_id" ref="vat_code_balance_net"/>
</record>
<record id="vat_code_input_S" model="account.tax.code.template">
<field name="name">Input VAT Rate S (15%)</field>
<field name="parent_id" ref="vat_code_input"/>
</record>
<record id="vat_code_input_R" model="account.tax.code.template">
<field name="name">Input VAT Rate R (5%)</field>
<field name="parent_id" ref="vat_code_input"/>
</record>
<!-- Output VAT -->
<record id="vat_code_output" model="account.tax.code.template">
<field name="name">Output VAT</field>
<field name="parent_id" ref="vat_code_balance_net"/>
</record>
<record id="vat_code_output_S" model="account.tax.code.template">
<field name="name">Output VAT Rate S (15%)</field>
<field name="parent_id" ref="vat_code_output"/>
</record>
<record id="vat_code_output_R" model="account.tax.code.template">
<field name="name">Output VAT Rate R (5%)</field>
<field name="parent_id" ref="vat_code_output"/>
</record>
<!-- Invoiced Base of VAT -->
<!-- Purchases -->
<record id="vat_code_base_net" model="account.tax.code.template">
<field name="name">Tax Bases</field>
<field name="parent_id" ref="vat_code_chart_root"/>
</record>
<record id="vat_code_base_purchases" model="account.tax.code.template">
<field name="name">Taxable Purchases Base</field>
<field name="parent_id" ref="vat_code_base_net"/>
</record>
<record id="vat_code_purch_S" model="account.tax.code.template">
<field name="name">Taxable Purchases Rated S (15%)</field>
<field name="parent_id" ref="vat_code_base_purchases"/>
</record>
<record id="vat_code_purch_R" model="account.tax.code.template">
<field name="name">Taxable Purchases Rated R (5%)</field>
<field name="parent_id" ref="vat_code_base_purchases"/>
</record>
<record id="vat_code_purch_Z" model="account.tax.code.template">
<field name="name">Taxable Purchases Rated Z (0%)</field>
<field name="parent_id" ref="vat_code_base_purchases"/>
</record>
<record id="vat_code_purch_X" model="account.tax.code.template">
<field name="name">Taxable Purchases Type X (Exempt)</field>
<field name="parent_id" ref="vat_code_base_purchases"/>
</record>
<record id="vat_code_purch_O" model="account.tax.code.template">
<field name="name">Taxable Purchases Type O (Out of scope)</field>
<field name="parent_id" ref="vat_code_base_purchases"/>
</record>
<!-- Sales -->
<record id="vat_code_base_sales" model="account.tax.code.template">
<field name="name">Base of Taxable Sales</field>
<field name="parent_id" ref="vat_code_base_net"/>
</record>
<record id="vat_code_sales_S" model="account.tax.code.template">
<field name="name">Taxable Sales Rated S (15%)</field>
<field name="parent_id" ref="vat_code_base_sales"/>
</record>
<record id="vat_code_sales_R" model="account.tax.code.template">
<field name="name">Taxable Sales Rated R (5%)</field>
<field name="parent_id" ref="vat_code_base_sales"/>
</record>
<record id="vat_code_sales_Z" model="account.tax.code.template">
<field name="name">Taxable Sales Rated Z (0%)</field>
<field name="parent_id" ref="vat_code_base_sales"/>
</record>
<record id="vat_code_sales_X" model="account.tax.code.template">
<field name="name">Taxable Sales Type X (Exempt)</field>
<field name="parent_id" ref="vat_code_base_sales"/>
</record>
<record id="vat_code_sales_O" model="account.tax.code.template">
<field name="name">Taxable Sales Type O (Out of scope)</field>
<field name="parent_id" ref="vat_code_base_sales"/>
</record>
<!-- Chart Template -->
<record id="l10n_uk_chart_template" model="account.chart.template">
<field name="name">UK Minimal Account Chart Template</field>
<field name="account_root_id" ref="l10n_chart_uk_minimal.chart0"/>
@ -133,10 +133,10 @@
<field name="property_account_expense_categ" ref="l10n_chart_uk_minimal.a_expense"/>
<field name="property_account_income_categ" ref="l10n_chart_uk_minimal.a_sale"/>
</record>
<!-- VAT Codes -->
<!-- Purchases + Input VAT -->
<record id="ivats" model="account.tax.template">
<field name="chart_template_id" ref="l10n_uk_chart_template"/>
<field name="name">IVAT S</field>
@ -148,8 +148,9 @@
<field name="tax_code_id" ref="vat_code_input_S"/>
<field name="ref_base_code_id" ref="vat_code_purch_S"/>
<field name="ref_tax_code_id" ref="vat_code_input_S"/>
<field name="type_tax_use">purchase</field>
</record>
<record id="ivatr" model="account.tax.template">
<field name="chart_template_id" ref="l10n_uk_chart_template"/>
<field name="name">IVAT R</field>
@ -161,8 +162,9 @@
<field name="tax_code_id" ref="vat_code_input_R"/>
<field name="ref_base_code_id" ref="vat_code_purch_R"/>
<field name="ref_tax_code_id" ref="vat_code_input_R"/>
<field name="type_tax_use">purchase</field>
</record>
<record id="ivatz" model="account.tax.template">
<field name="chart_template_id" ref="l10n_uk_chart_template"/>
<field name="name">IVAT Z</field>
@ -170,8 +172,9 @@
<field name="type">percent</field>
<field name="base_code_id" ref="vat_code_purch_Z"/>
<field name="ref_base_code_id" ref="vat_code_purch_Z"/>
<field name="type_tax_use">purchase</field>
</record>
<record id="ivatx" model="account.tax.template">
<field name="chart_template_id" ref="l10n_uk_chart_template"/>
<field name="name">IVAT X</field>
@ -179,8 +182,9 @@
<field name="type">percent</field>
<field name="base_code_id" ref="vat_code_purch_X"/>
<field name="ref_base_code_id" ref="vat_code_purch_X"/>
<field name="type_tax_use">purchase</field>
</record>
<record id="ivato" model="account.tax.template">
<field name="chart_template_id" ref="l10n_uk_chart_template"/>
<field name="name">IVAT O</field>
@ -188,10 +192,11 @@
<field name="type">percent</field>
<field name="base_code_id" ref="vat_code_purch_O"/>
<field name="ref_base_code_id" ref="vat_code_purch_O"/>
<field name="type_tax_use">purchase</field>
</record>
<!-- Sales + Output VAT -->
<record id="ovats" model="account.tax.template">
<field name="chart_template_id" ref="l10n_uk_chart_template"/>
<field name="name">OVAT S</field>
@ -203,8 +208,9 @@
<field name="tax_code_id" ref="vat_code_output_S"/>
<field name="ref_base_code_id" ref="vat_code_sales_S"/>
<field name="ref_tax_code_id" ref="vat_code_output_S"/>
<field name="type_tax_use">sale</field>
</record>
<record id="ovatr" model="account.tax.template">
<field name="chart_template_id" ref="l10n_uk_chart_template"/>
<field name="name">OVAT R</field>
@ -216,8 +222,9 @@
<field name="tax_code_id" ref="vat_code_output_R"/>
<field name="ref_base_code_id" ref="vat_code_sales_R"/>
<field name="ref_tax_code_id" ref="vat_code_output_R"/>
<field name="type_tax_use">sale</field>
</record>
<record id="ovatz" model="account.tax.template">
<field name="chart_template_id" ref="l10n_uk_chart_template"/>
<field name="name">OVAT Z</field>
@ -225,8 +232,9 @@
<field name="type">percent</field>
<field name="base_code_id" ref="vat_code_sales_Z"/>
<field name="ref_base_code_id" ref="vat_code_sales_Z"/>
<field name="type_tax_use">sale</field>
</record>
<record id="ovatx" model="account.tax.template">
<field name="chart_template_id" ref="l10n_uk_chart_template"/>
<field name="name">OVAT X</field>
@ -234,8 +242,9 @@
<field name="type">percent</field>
<field name="base_code_id" ref="vat_code_sales_X"/>
<field name="ref_base_code_id" ref="vat_code_sales_X"/>
<field name="type_tax_use">sale</field>
</record>
<record id="ovato" model="account.tax.template">
<field name="chart_template_id" ref="l10n_uk_chart_template"/>
<field name="name">OVAT O</field>
@ -243,7 +252,8 @@
<field name="type">percent</field>
<field name="base_code_id" ref="vat_code_sales_O"/>
<field name="ref_base_code_id" ref="vat_code_sales_O"/>
<field name="type_tax_use">sale</field>
</record>
</data>
</openerp>

70
addons/mrp_repair/mrp_repair_view.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="view_repair_order_form" model="ir.ui.view">
<field name="name">mrp.repair.form</field>
<field name="model">mrp.repair</field>
@ -26,25 +26,25 @@
<field name="guarantee_limit" />
<newline/>
<field colspan="4" mode="tree,form" name="operations" nolabel="1" widget="one2many_list">
<form string="Operations">
<form string="Operations">
<notebook>
<page string="Repair Line">
<field name="name" colspan="4"/>
<field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id)" colspan="4"/>
<page string="Repair Line">
<field name="name" colspan="4"/>
<field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id)" colspan="4"/>
<field name="product_uom_qty" string="Qty" />
<field name="product_uom" string="UoM"/>
<field name="price_unit"/>
<field name="price_subtotal"/>
<field name="price_unit"/>
<field name="price_subtotal"/>
<field name="location_id"/>
<field name="location_dest_id"/>
<newline/>
<field name="type" on_change="onchange_operation_type(type,parent.guarantee_limit)"/>
<group colspan="2">
<field name="to_invoice"/>
<field name="invoiced"/>
<field name="invoiced"/>
</group>
<newline/>
<field colspan="4" name="tax_id" domain="[('parent_id','=',False)]"/>
<field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','=','sale')]"/>
<separator colspan="4" string="States"/>
<field name="state"/>
</page>
@ -52,7 +52,7 @@
<field colspan="4" name="move_id" />
<field colspan="4" name="invoice_line_id"/>
</page>
</notebook>
</form>
<tree string="Operations" editable="bottom">
@ -88,7 +88,7 @@
<button name="action_invoice_create" states="2binvoiced" string="Make Invoice"/>
<button name="%(action_cancel_repair)d" states="invoice_except" string="Cancel Repair" type="action"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
<button name="cancel" states="draft" string="Cancel Repair"/>
<button name="cancel" states="draft" string="Cancel Repair"/>
<button name="%(action_cancel_repair)d" states="confirmed,2binvoiced,ready,under_repair" string="Cancel Repair" type="action"/>
</group>
</page>
@ -100,25 +100,25 @@
<field colspan="4" mode="tree,form" name="fees_lines" nolabel="1" widget="one2many_list">
<form string="Fees">
<notebook>
<page string="Fees Line">
<field name='name'/>
<page string="Fees Line">
<field name='name'/>
<field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id,parent.guarantee_limit)" colspan="4"/>
<field name="product_uom_qty" string="Qty"/>
<field name="product_uom" string="UoM" />
<field name="price_unit"/>
<field name="price_subtotal"/>
<field name="product_uom" string="UoM" />
<field name="price_unit"/>
<field name="price_subtotal"/>
<newline/>
<group colspan="2">
<group colspan="2">
<field name="to_invoice"/>
<field name="invoiced"/>
<field name="invoiced"/>
</group>
<newline/>
<field colspan="4" name="tax_id" domain="[('parent_id','=',False)]"/>
<field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','=','sale')]"/>
</page>
<page string="History" groups="base.group_extended">
<field colspan="4" name="invoice_line_id" />
</page>
</notebook>
<page string="History" groups="base.group_extended">
<field colspan="4" name="invoice_line_id" />
</page>
</notebook>
</form>
<tree string="Fees" editable="bottom">
<field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id,parent.guarantee_limit)"/>
@ -137,7 +137,7 @@
<separator colspan="4" string="Quotation Notes"/>
<field colspan="4" name="quotation_notes" nolabel="1"/>
</page>
<page string="Extra Info" groups="base.group_extended">
<page string="Extra Info" groups="base.group_extended">
<field name="invoice_id"/>
<field name="picking_id"/>
<field name="location_id"/>
@ -147,7 +147,7 @@
</form>
</field>
</record>
<record id="view_repair_order_tree" model="ir.ui.view">
<field name="name">mrp.repair.tree</field>
<field name="model">mrp.repair</field>
@ -167,7 +167,7 @@
</tree>
</field>
</record>
<record id="action_repair_order_form" model="ir.actions.act_window">
<field name="name">New Repair</field>
<field name="type">ir.actions.act_window</field>
@ -175,7 +175,7 @@
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>
</record>
<record id="action_repair_order_tree" model="ir.actions.act_window">
<field name="name">Repair Orders</field>
<field name="type">ir.actions.act_window</field>
@ -183,7 +183,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<record id="action_repair_quotation_tree" model="ir.actions.act_window">
<field name="name">Repairs in quotation</field>
<field name="type">ir.actions.act_window</field>
@ -192,7 +192,7 @@
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','draft')]</field>
</record>
<record id="action_repair_progress_tree" model="ir.actions.act_window">
<field name="name">Repairs in progress</field>
<field name="type">ir.actions.act_window</field>
@ -219,19 +219,19 @@
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','2binvoiced')]</field>
</record>
<menuitem action="action_repair_order_tree" id="menu_repair_order" parent="mrp.menu_mrp_root" name="Repairs"/>
<menuitem action="action_repair_quotation_tree" id="menu_repair_quotation" parent="menu_repair_order"/>
<menuitem action="action_repair_progress_tree" id="menu_repair_progress" parent="menu_repair_order"/>
<menuitem action="action_repair_ready_tree" id="menu_repair_ready" parent="menu_repair_order"/>
<menuitem action="action_repair_2binvoiced_tree" id="menu_repair_2binvoiced" parent="menu_repair_order"/>
<menuitem action="action_repair_order_form" id="menu_repair_form" parent="menu_repair_order" sequence = "50"/>
</data>
</openerp>

4
addons/purchase/purchase_view.xml
View File

@ -82,7 +82,7 @@
<separator string="Invoice Control" colspan="2"/>
<field name="invoice_method"/>
<field name="invoice_id" readonly="1"/>
<field name="fiscal_position"/>
<field name="fiscal_position" groups="base.group_extended"/>
</group>
<newline/>
<separator string="Purchase Control" colspan="4"/>
@ -180,7 +180,7 @@
<field name="price_unit"/>
<field name="account_analytic_id"/>
<field name="price_subtotal" readonly="1"/>
<field colspan="4" name="taxes_id" domain="[('parent_id','=',False)]"/>
<field colspan="4" name="taxes_id" domain="[('parent_id','=',False),('type_tax_use','=','purchase')]"/>
</page>
<page string="Notes">
<field colspan="4" name="notes" nolabel="1"/>

84
addons/purchase/report/order.rml
View File

@ -98,12 +98,6 @@
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" rightIndent="0.0" leftIndent="12.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P2" rightIndent="0.0" leftIndent="12.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P3" rightIndent="0.0" leftIndent="15.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P4" fontName="Times-Bold" fontSize="10.0" leading="13"/>
<paraStyle name="P5" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P6" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Standard" fontName="Times-Roman"/>
<paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
@ -141,7 +135,7 @@
<story>
<para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
<para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
<para style="P5">
<para style="terp_default_9">
<font color="white"> </font>
</para>
<blockTable colWidths="253.0,59.0,223.0" style="Tableau1">
@ -150,61 +144,61 @@
<blockTable colWidths="253.0" style="Tableau2">
<tr>
<td>
<para style="P5">
<para style="terp_default_9">
<font color="white"> </font>
</para>
</td>
</tr>
<tr>
<td>
<para style="P5">[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]</para>
<para style="P4">Shipping address :</para>
<para style="P5">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
<para style="P5">[[ addr.title or '' ]] [[ addr.name ]]</para>
<para style="P5">[[ addr.street ]]</para>
<para style="P5">[[ addr.street2 or '' ]]</para>
<para style="P5">[[ addr.zip or '' ]] [[ addr.city or '' ]]</para>
<para style="P5">[[ addr.state_id and addr.state_id.name or '' ]]</para>
<para style="P5">[[ addr.country_id and addr.country_id.name or '' ]]</para>
<para style="terp_default_9">[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]</para>
<para style="terp_default_Bold_9">Shipping address :</para>
<para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
<para style="terp_default_9">[[ addr.title or '' ]] [[ addr.name ]]</para>
<para style="terp_default_9">[[ addr.street ]]</para>
<para style="terp_default_9">[[ addr.street2 or '' ]]</para>
<para style="terp_default_9">[[ addr.zip or '' ]] [[ addr.city or '' ]]</para>
<para style="terp_default_9">[[ addr.state_id and addr.state_id.name or '' ]]</para>
<para style="terp_default_9">[[ addr.country_id and addr.country_id.name or '' ]]</para>
</td>
</tr>
</blockTable>
<para style="P5">
<para style="terp_default_9">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P5">
<para style="terp_default_9">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P5">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
<para style="P5">[[ o.partner_address_id.title or '' ]] [[ o.partner_address_id.name ]]</para>
<para style="P5">[[ o.partner_address_id.street ]]</para>
<para style="P5">[[ o.partner_address_id.street2 or '' ]]</para>
<para style="P5">[[ o.partner_address_id.zip or '' ]] [[ o.partner_address_id.city or '' ]]</para>
<para style="P5">[[ o.partner_address_id.state_id and o.partner_address_id.state_id.name or '' ]]</para>
<para style="P5">[[ o.partner_address_id.country_id and o.partner_address_id.country_id.name or '' ]]</para>
<para style="P5">
<para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
<para style="terp_default_9">[[ o.partner_address_id.title or '' ]] [[ o.partner_address_id.name ]]</para>
<para style="terp_default_9">[[ o.partner_address_id.street ]]</para>
<para style="terp_default_9">[[ o.partner_address_id.street2 or '' ]]</para>
<para style="terp_default_9">[[ o.partner_address_id.zip or '' ]] [[ o.partner_address_id.city or '' ]]</para>
<para style="terp_default_9">[[ o.partner_address_id.state_id and o.partner_address_id.state_id.name or '' ]]</para>
<para style="terp_default_9">[[ o.partner_address_id.country_id and o.partner_address_id.country_id.name or '' ]]</para>
<para style="terp_default_9">
<font color="white"> </font>
</para>
<para style="P5">Tél. : [[ o.partner_address_id.phone or '' ]]</para>
<para style="P5">Fax : [[ o.partner_address_id.fax or '' ]]</para>
<para style="P5">TVA : [[ o.partner_id.vat or '' ]]</para>
<para style="terp_default_9">Tél. : [[ o.partner_address_id.phone or '' ]]</para>
<para style="terp_default_9">Fax : [[ o.partner_address_id.fax or '' ]]</para>
<para style="terp_default_9">TVA : [[ o.partner_id.vat or '' ]]</para>
</td>
</tr>
</blockTable>
<para style="P5">
<para style="terp_default_9">
<font color="white"> </font>
</para>
<para style="terp_default_8">
<para style="terp_default_9">
<font color="white"> </font>
</para>
<para style="Standard">
<para style="terp_default_9">
<font color="white"> </font>
</para>
<para style="P6">[[ (o.state=='draft' or removeParentNode('font')) and 'Request for Quotation' ]] [[ (o.state&lt;&gt;'draft' or removeParentNode('font')) and 'Purchase Order Confirmation' ]] N° [[ o.name ]]</para>
<para style="terp_header">[[ (o.state=='draft' or removeParentNode('font')) and 'Request for Quotation' ]] [[ (o.state&lt;&gt;'draft' or removeParentNode('font')) and 'Purchase Order Confirmation' ]] N° [[ o.name ]]</para>
<para style="terp_default_8">
<font color="white"> </font>
</para>
@ -267,33 +261,33 @@
</blockTable>
<section>
<para style="terp_default_8">[[ repeatIn(o.order_line,'line') ]]</para>
<blockTable colWidths="252.0,52.0,61.0,29.0,20.0,59.0,63.0" style="Table_Order_Pur_line_Content">
<blockTable colWidths="251.0,52.0,61.0,29.0,20.0,59.0,63.0" style="Table_Order_Pur_line_Content">
<tr>
<td>
<para style="terp_default_9">[[ line.name ]]</para>
</td>
<td>
<para style="terp_default_9">[[ ', '.join(map(lambda x: x.name, line.taxes_id)) or formatLang(0.00) ]]</para>
<para style="terp_default_9">[[ formatLang(', '.join(map(lambda x: x.name, line.taxes_id)) or 0.00) ]]</para>
</td>
<td>
<para style="terp_default_9">[[ formatLang( line.date_planned, date=True) ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ line.product_qty or formatLang(0.00) ]] </para>
<para style="terp_default_Right_9">[[ formatLang(line.product_qty or 0.00) ]] </para>
</td>
<td>
<para style="terp_default_Right_9">[[ line.product_uom.name ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ line.price_unit or formatLang(0.00) ]]</para>
<para style="terp_default_Right_9">[[ formatLang(line.price_unit or 0.00) ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ line.price_subtotal or formatLang(0.00) ]]</para>
<para style="terp_default_Right_9">[[ formatLang(line.price_subtotal or 0.00) ]]</para>
</td>
</tr>
<tr>
<td>
<para style="P2">[[ line.notes or removeParentNode('tr') ]]</para>
<para style="terp_default_8_Italic">[[ line.notes or removeParentNode('tr') ]]</para>
</td>
<td>
<para style="terp_default_9">
@ -339,7 +333,7 @@
<para style="terp_default_9">Net Total :</para>
</td>
<td>
<para style="terp_default_Right_9">[[ o.amount_untaxed or formatLang(0.00) ]]</para>
<para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed or 0.00) ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name ]]</para>
@ -352,10 +346,10 @@
</para>
</td>
<td>
<para style="P1">Taxes :</para>
<para style="terp_default_9">Taxes :</para>
</td>
<td>
<para style="terp_default_Right_9">[[ o.amount_tax or formatLang(0.00) ]]</para>
<para style="terp_default_Right_9">[[ formatLang(o.amount_tax or 0.00) ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name ]]</para>
@ -368,10 +362,10 @@
</para>
</td>
<td>
<para style="P3">Total :</para>
<para style="terp_default_Bold_9">Total :</para>
</td>
<td>
<para style="terp_default_Bold_9_Right">[[ o.amount_total or formatLang(0.00) ]]</para>
<para style="terp_default_Bold_9_Right">[[ formatLang(o.amount_total or 0.00) ]]</para>
</td>
<td>
<para style="terp_default_Bold_9_Right">[[ o.pricelist_id.currency_id.name ]]</para>

6
addons/sale/sale_view.xml
View File

@ -140,7 +140,7 @@
<field name="type"/>
<field name="delay" select="2"/>
<newline/>
<field colspan="4" name="tax_id" domain="[('parent_id','=',False)]"/>
<field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','=','sale')]"/>
<separator colspan="4" string="States"/>
<field name="state" select="2"/>
<group col="3" colspan="2">
@ -206,7 +206,7 @@
<field groups="base.group_extended" name="origin"/>
<field groups="base.group_extended" name="invoice_quantity" attrs="{'readonly':[('order_policy','=','prepaid'),('order_policy','=','picking')]}"/>
<field name="payment_term"/>
<field name="fiscal_position"/>
<field name="fiscal_position" groups="base.group_extended"/>
<separator colspan="4" string="Notes"/>
<field colspan="4" name="note" nolabel="1"/>
</page>
@ -398,7 +398,7 @@
<field name="type"/>
<field name="delay" select="2"/>
<field name="price_subtotal"/>
<field colspan="4" name="tax_id" domain="[('parent_id','=',False)]"/>
<field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','=','sale')]"/>
<separator colspan="4" string="States"/>
<field name="state" select="2"/>
<group col="2" colspan="2">