Pankita Shah(OpenERP) has proposed merging
lp:~openerp-commiter/openobject-addons/trunk-accounting-view-imp-atp-improve-payment-order-shp
into lp:~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp.
Requested reviews:
Atul Patel(OpenERP) (atp-openerp)
For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-accounting-view-imp-atp-improve-payment-order-shp/+merge/113040
hello,
i am improve payment order,Periodical Processing view
thanks
shp
--
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-accounting-view-imp-atp-improve-payment-order-shp/+merge/113040
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-accounting-view-imp-atp.
=== modified file 'account/account_view.xml'
--- account/account_view.xml 2012-07-02 11:24:35 +0000
+++ account/account_view.xml 2012-07-02 13:32:26 +0000
@@ -108,11 +108,6 @@
<group>
<field name="name"/>
<field name="fiscalyear_id" widget="selection"/>
- <label for="date_start" string="Duration"/>
- <div>
- <field name="date_start"/> -
- <field name="date_stop" nolabel="1"/>
- </div>
</group>
<group>
<field name="code"/>
@@ -120,6 +115,16 @@
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
</group>
+ <group>
+ <group>
+ <label for="date_start" string="Duration" />
+ <div>
+ <field name="date_start" class="oe_inline" nolabel="1"/>
+ <span attr="{'invisible': [('date_stop','=',False)]}"> - </span>
+ <field name="date_stop" nolabel="1" class="oe_inline"/>
+ </div>
+ </group>
+ </group>
</sheet>
</form>
</field>
=== modified file 'account_asset/account_asset.py'
--- account_asset/account_asset.py 2012-06-28 06:51:18 +0000
+++ account_asset/account_asset.py 2012-07-02 13:32:26 +0000
@@ -345,7 +345,7 @@
'asset_id': fields.many2one('account.asset.asset', 'Asset', required=True),
'parent_state': fields.related('asset_id', 'state', type='char', string='State of Asset'),
'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),
'depreciation_date': fields.char('Depreciation Date', size=64, select=1),
'move_id': fields.many2one('account.move', 'Depreciation Entry'),
=== modified file 'account_followup/wizard/account_followup_print_view.xml'
--- account_followup/wizard/account_followup_print_view.xml 2012-07-02 11:24:35 +0000
+++ account_followup/wizard/account_followup_print_view.xml 2012-07-02 13:32:26 +0000
@@ -14,7 +14,6 @@
or
<button string="Cancel" class="oe_link" special="cancel"/>
</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."/>
<group col="4">
<field name="followup_id"/>
=== modified file 'account_payment/account_payment.py'
--- account_payment/account_payment.py 2012-06-26 10:07:49 +0000
+++ account_payment/account_payment.py 2012-07-02 13:32:26 +0000
@@ -98,7 +98,7 @@
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)]}),
'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([
('now', 'Directly'),
('due', 'Due date'),
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
