Khushboo Bhatt(openerp) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons9-contract-apa-contract-kbh into
lp:~openerp-dev/openobject-addons/trunk-addons9-contract-apa.
Requested reviews:
Amit Patel (OpenERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons9-contract-apa-contract-kbh/+merge/124103
Hello,
account_analytic_analysis::
I have done following changes
- menu tip added for "Sales/Sales/Contracts".
- menu tip added for "Sale/Configuration/Template of Contract"
- added the start date in contract view, because for now all contract starts
on current date.
- Prepaid Unit field renamed into "Prepaid Time Unit".
Thank you,
KBH.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons9-contract-apa-contract-kbh/+merge/124103
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons9-contract-apa.
=== modified file 'account_analytic_analysis/account_analytic_analysis_menu.xml'
--- account_analytic_analysis/account_analytic_analysis_menu.xml 2012-08-08 10:59:07 +0000
+++ account_analytic_analysis/account_analytic_analysis_menu.xml 2012-09-13 05:52:21 +0000
@@ -73,9 +73,18 @@
<field name="res_model">account.analytic.account</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
- <field name="context">{'default_type':'contract'}</field>
+ <field name="context">{'default_type':'contract', 'search_default_draft':1, 'search_default_pending':1, 'search_default_open':1, 'search_default_renew':1}</field>
<field name="domain">[('type','=','contract')]</field>
<field name="search_view_id" ref="view_account_analytic_account_overdue_search"/>
+ <field name="help" type="html">
+ <p class="oe_view_nocontent_create">
+ Click to create a new contract.
+ </p><p>
+ You can use the way you invoice each contract (timesheet, fixed price, charge employees expenses).
+ </p><p>
+ A template can be used to set automatically all invoicing information.
+ </p>
+ </field>
</record>
<menuitem id="base.menu_sales" name="Sales"
parent="base.menu_base_partner"
=== modified file 'account_analytic_analysis/account_analytic_analysis_view.xml'
--- account_analytic_analysis/account_analytic_analysis_view.xml 2012-09-01 07:21:37 +0000
+++ account_analytic_analysis/account_analytic_analysis_view.xml 2012-09-13 05:52:21 +0000
@@ -18,8 +18,18 @@
<field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
<field eval="40" name="priority"/>
<field name="arch" type="xml">
+ <xpath expr='//field[@name="name"]' position="after" version="7.0">
+ <h4>
+ <label for="date_start" string="Start Date"/>
+ </h4>
+ <div>
+ <h1>
+ <field name="date_start" class="oe_inline"/>
+ </h1>
+ </div>
+ </xpath>
<xpath expr='//div[@name="duration"]' position="after" version="7.0">
- <label for="quantity_max"/>
+ <label for="quantity_max" string="Prepaid Time Unit"/>
<div>
<field name="quantity_max" class="oe_inline"/>
</div>
@@ -140,6 +150,16 @@
<field name="view_mode">tree,form</field>
<field name="domain">[('type','=','template')]</field>
<field name="context">{'search_default_type':'template','default_type' : 'template'}</field>
+ <field name="help" type="html">
+ <p class="oe_view_nocontent_create">
+ Click here to create a Template of contract.
+ </p><p>
+ Templates are used to prefigure contract/project that
+ can be selected by the salespoeple to create their customer
+ contract/project from the menu Sales/Contracts.
+ </p>
+ </field>
+
</record>
<menuitem action="template_of_contract_action" id="menu_template_of_contract_action" parent="base.menu_base_config"/>
</data>
_______________________________________________
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
