[IMP] usability, clean several screens
bzr revid: fp@tinyerp.com-20120912171636-53vgvm34u579cmjv
This commit is contained in:
Fabien Pinckaers
parent
5a5feab65b
commit
5d3f9a09d1
|
|
@ -14,8 +14,12 @@
|
|||
</footer>
|
||||
</footer>
|
||||
<separator string="title" position="replace">
|
||||
<p class="oe_grey">
|
||||
Select a configuration package to setup automatically your
|
||||
taxes and chart of accounts.
|
||||
</p>
|
||||
<group>
|
||||
<field name="charts"/>
|
||||
<field name="charts" class="oe_inline"/>
|
||||
</group>
|
||||
<group string="Configure your Fiscal Year" groups="account.group_account_user">
|
||||
<field name="has_default_company" invisible="1" />
|
||||
|
|
@ -32,7 +36,7 @@
|
|||
</record>
|
||||
|
||||
<record id="action_account_configuration_installer" model="ir.actions.act_window">
|
||||
<field name="name">Configure your Chart of Accounts</field>
|
||||
<field name="name">Configure Invoicing Data</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">account.installer</field>
|
||||
<field name="view_id" ref="view_account_configuration_installer"/>
|
||||
|
|
|
|||
|
|
@ -45,12 +45,12 @@ class account_installer(osv.osv_memory):
|
|||
sorted(((m.name, m.shortdesc)
|
||||
for m in modules.browse(cr, uid, ids, context=context)),
|
||||
key=itemgetter(1)))
|
||||
charts.insert(0, ('configurable', 'Generic Chart Of Accounts'))
|
||||
charts.insert(0, ('configurable', _('Custom')))
|
||||
return charts
|
||||
|
||||
_columns = {
|
||||
# Accounting
|
||||
'charts': fields.selection(_get_charts, 'Chart of Accounts',
|
||||
'charts': fields.selection(_get_charts, 'Accounting Package',
|
||||
required=True,
|
||||
help="Installs localized accounting charts to match as closely as "
|
||||
"possible the accounting needs of your company based on your "
|
||||
|
|
|
|||
|
|
@ -183,7 +183,7 @@
|
|||
</h1>
|
||||
<group>
|
||||
<group>
|
||||
<field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": true, "highlight_first_line": true}'/>
|
||||
<field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": true}'/>
|
||||
<field domain="[('parent_id','=',partner_id)]" name="partner_invoice_id" groups="sale.group_delivery_invoice_address"/>
|
||||
<field domain="[('parent_id','=',partner_id)]" name="partner_shipping_id" groups="sale.group_delivery_invoice_address"/>
|
||||
<field name="project_id" context="{'partner_id':partner_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="sale.group_analytic_accounting" domain="[('type','in',['view','normal','contract'])]"/>
|
||||
|
|
|
|||
|
|
@ -28,9 +28,9 @@ class sale_advance_payment_inv(osv.osv_memory):
|
|||
|
||||
_columns = {
|
||||
'advance_payment_method':fields.selection(
|
||||
[('all', 'Invoice all the Sale Order'), ('percentage','Percentage'), ('fixed','Fixed Price'),
|
||||
('lines', 'Some Order Lines')],
|
||||
'Type', required=True,
|
||||
[('all', 'Invoice the whole sale order'), ('percentage','Percentage'), ('fixed','Fixed price (deposit)'),
|
||||
('lines', 'Some order lines')],
|
||||
'Invoice Method', required=True,
|
||||
help="""Use All to create the final invoice.
|
||||
Use Percentage to invoice a percentage of the total amount.
|
||||
Use Fixed Price to invoice a specific amound in advance.
|
||||
|
|
|
|||
|
|
@ -2,12 +2,17 @@
|
|||
<openerp>
|
||||
<data>
|
||||
<record id="view_sale_advance_payment_inv" model="ir.ui.view">
|
||||
<field name="name">Advance Invoice</field>
|
||||
<field name="name">Invoice Order</field>
|
||||
<field name="model">sale.advance.payment.inv</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Advance Invoice" version="7.0">
|
||||
<form string="Invoice Sale Order" version="7.0">
|
||||
<p class="oe_grey">
|
||||
Select how you want to invoice this order. This
|
||||
will create a draft invoice that can be modified
|
||||
before validation.
|
||||
</p>
|
||||
<group>
|
||||
<field name="advance_payment_method"
|
||||
<field name="advance_payment_method" class="oe_inline"
|
||||
on_change="onchange_method(advance_payment_method, product_id)"/>
|
||||
<field name="qtty" invisible="1"/>
|
||||
<field name="product_id"
|
||||
|
|
@ -23,15 +28,15 @@
|
|||
</div>
|
||||
</group>
|
||||
<div>
|
||||
<b><label string="After clicking 'Show Lines to Invoice' button, select lines to invoice and make invoice from the 'More' button." attrs="{'invisible': [('advance_payment_method', '!=', 'lines')]}"/></b>
|
||||
<b><label string="After clicking 'Show Lines to Invoice', select lines to invoice and create the invoice from the 'More' dropdown menu." attrs="{'invisible': [('advance_payment_method', '!=', 'lines')]}"/></b>
|
||||
</div>
|
||||
<footer>
|
||||
<button name="create_invoices" string="Create and View Invoice" type="object"
|
||||
context="{'open_invoices': True}" class="oe_highlight"
|
||||
attrs="{'invisible': [('advance_payment_method', '=', 'lines')]}"/>
|
||||
<button name="create_invoices" string="Create Invoice" type="object"
|
||||
class="oe_highlight"
|
||||
attrs="{'invisible': [('advance_payment_method', '=', 'lines')]}"/>
|
||||
<button name="create_invoices" string="Create and view Invoice" type="object"
|
||||
context="{'open_invoices': True}" class="oe_highlight"
|
||||
attrs="{'invisible': [('advance_payment_method', '=', 'lines')]}"/>
|
||||
<button name="create_invoices" string="Show Lines to Invoice" type="object"
|
||||
class="oe_highlight"
|
||||
attrs="{'invisible': [('advance_payment_method', '!=', 'lines')]}"/>
|
||||
|
|
@ -43,7 +48,7 @@
|
|||
</record>
|
||||
|
||||
<record id="action_view_sale_advance_payment_inv" model="ir.actions.act_window">
|
||||
<field name="name">Advance Invoice</field>
|
||||
<field name="name">Invoice Order</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">sale.advance.payment.inv</field>
|
||||
<field name="view_type">form</field>
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ class stock_change_product_qty(osv.osv_memory):
|
|||
_description = "Change Product Quantity"
|
||||
_columns = {
|
||||
'product_id' : fields.many2one('product.product', 'Product'),
|
||||
'new_quantity': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True, help='This quantity is expressed in the Default Unit of Measure of the product.'),
|
||||
'new_quantity': fields.float('New Quantity on Hand', digits_compute=dp.get_precision('Product Unit of Measure'), required=True, help='This quantity is expressed in the Default Unit of Measure of the product.'),
|
||||
'prodlot_id': fields.many2one('stock.production.lot', 'Serial Number', domain="[('product_id','=',product_id)]"),
|
||||
'location_id': fields.many2one('stock.location', 'Location', required=True, domain="[('usage', '=', 'internal')]"),
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<field name="model">stock.change.product.qty</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Change Product Quantity" version="7.0">
|
||||
<group string="Select Quantity">
|
||||
<group>
|
||||
<field name="new_quantity" />
|
||||
<field name="product_id" invisible="1"/>
|
||||
<field name="location_id" groups="stock.group_locations"/>
|
||||
|
|
|
|||
Loading…
Reference in New Issue