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

[MERGE]: Merged lp:~openerp-commiter/openobject-addons/trunk-accounting-view-imp-atp-improve-payment-order-shp 

bzr revid: atp@tinyerp.com-20120702162303-dnik902ltij5uoog
This commit is contained in:
Atul Patel (OpenERP) 2012-07-02 21:53:03 +05:30
parent 7f6a3c4336 6f89909496
commit 8f20ec1f69
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addons/account/account_view.xml
View File

@ -104,15 +104,16 @@
<field name="state" widget="statusbar" nolabel="1"/> <field name="state" widget="statusbar" nolabel="1"/>
</header> </header>
<sheet> <sheet>
<group> <group col="4">
<group> <group>
<field name="name"/> <field name="name"/>
<field name="fiscalyear_id" widget="selection"/> <field name="fiscalyear_id" widget="selection"/>
<label for="date_start" string="Duration"/> <label for="date_start" string="Duration" />
<div> <div>
<field name="date_start"/> - <field name="date_start" class="oe_inline" nolabel="1"/>
<field name="date_stop" nolabel="1"/> <span attr="{'invisible': [('date_stop','=',False)]}"> - </span>
</div> <field name="date_stop" nolabel="1" class="oe_inline"/>
</div>
</group> </group>
<group> <group>
<field name="code"/> <field name="code"/>

2
addons/account_asset/account_asset.py
View File

@ -345,7 +345,7 @@ class account_asset_depreciation_line(osv.osv):
'asset_id': fields.many2one('account.asset.asset', 'Asset', required=True), 'asset_id': fields.many2one('account.asset.asset', 'Asset', required=True),
'parent_state': fields.related('asset_id', 'state', type='char', string='State of Asset'), 'parent_state': fields.related('asset_id', 'state', type='char', string='State of Asset'),
'amount': fields.float('Depreciation Amount', required=True), 'amount': fields.float('Depreciation Amount', required=True),
'remaining_value': fields.float('Amount To Depreciate', required=True), 'remaining_value': fields.float('Amount to Depreciate', required=True),
'depreciated_value': fields.float('Amount Already Depreciated', required=True), 'depreciated_value': fields.float('Amount Already Depreciated', required=True),
'depreciation_date': fields.char('Depreciation Date', size=64, select=1), 'depreciation_date': fields.char('Depreciation Date', size=64, select=1),
'move_id': fields.many2one('account.move', 'Depreciation Entry'), 'move_id': fields.many2one('account.move', 'Depreciation Entry'),

1
addons/account_followup/wizard/account_followup_print_view.xml
View File

@ -14,7 +14,6 @@
or or
<button string="Cancel" class="oe_link" special="cancel"/> <button string="Cancel" class="oe_link" special="cancel"/>
</header> </header>
<separator string="Send Follow-ups"/>
<label string ="This feature allows you to send reminders to partners with pending invoices. You can send them the default message for unpaid invoices or manually enter a message should you need to remind them of a specific information."/> <label string ="This feature allows you to send reminders to partners with pending invoices. You can send them the default message for unpaid invoices or manually enter a message should you need to remind them of a specific information."/>
<group col="4"> <group col="4">
<field name="followup_id"/> <field name="followup_id"/>

2
addons/account_payment/account_payment.py
View File

@ -98,7 +98,7 @@ class payment_order(osv.osv):
help='When an order is placed the state is \'Draft\'.\n Once the bank is confirmed the state is set to \'Confirmed\'.\n Then the order is paid the state is \'Done\'.'), help='When an order is placed the state is \'Draft\'.\n Once the bank is confirmed the state is set to \'Confirmed\'.\n Then the order is paid the state is \'Done\'.'),
'line_ids': fields.one2many('payment.line', 'order_id', 'Payment lines', states={'done': [('readonly', True)]}), 'line_ids': fields.one2many('payment.line', 'order_id', 'Payment lines', states={'done': [('readonly', True)]}),
'total': fields.function(_total, string="Total", type='float'), 'total': fields.function(_total, string="Total", type='float'),
'user_id': fields.many2one('res.users', 'User', required=True, states={'done': [('readonly', True)]}), 'user_id': fields.many2one('res.users', 'Responsible', required=True, states={'done': [('readonly', True)]}),
'date_prefered': fields.selection([ 'date_prefered': fields.selection([
('now', 'Directly'), ('now', 'Directly'),
('due', 'Due date'), ('due', 'Due date'),