Foram Katharotiya (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-config-wizard-apa-improvment-fka into
lp:~openerp-dev/openobject-addons/trunk-config-wizard-apa.
Requested reviews:
Amit Patel (OpenERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-config-wizard-apa-improvment-fka/+merge/116473
hello sir,
improve Sales Configuration in sale
change Share repositories(FTP) label in knowledge
change Planning label in project
thanks,
FKA
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-config-wizard-apa-improvment-fka/+merge/116473
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-config-wizard-apa.
=== modified file 'base_setup/res_config_view.xml'
--- base_setup/res_config_view.xml 2012-07-23 06:34:55 +0000
+++ base_setup/res_config_view.xml 2012-07-24 13:31:21 +0000
@@ -72,11 +72,22 @@
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
+ <div name="customer feature">
+ <separator string="Quotations and Sales Orders"/>
+ <group name="Customer">
+ <label for="id" string="Customer Features"/>
+ <div name="Customer Features"/>
+ </group>
+ <group name="Sale">
+ <label for="id" string="Sale Features"/>
+ <div name="Sale Features"/>
+ </group>
+ </div>
<div name="config_sale">
<field name="module_crm" invisible="1"/>
<separator string="Emails Integration" attrs="{'invisible': [('module_crm','=',False)]}"/>
<div style="color:grey" attrs="{'invisible': [('module_crm','=',False)]}">
- The email integration allows ypu to autometically create leads or others documents from an incoming emails account.
+ The email integration allows you to autometically create leads or others documents from an incoming emails account.
Users can do it from the mail client by pressing a button or it can be configured to automatically synchronize from your mail server.
</div>
<group name="On Mail Client" attrs="{'invisible': [('module_crm','=',False)]}">
=== modified file 'crm/res_config_view.xml'
--- crm/res_config_view.xml 2012-07-23 06:34:55 +0000
+++ crm/res_config_view.xml 2012-07-24 13:31:21 +0000
@@ -45,21 +45,17 @@
</div>
</div>
</group>
- <separator string="Customer Form"/>
+ </div>
+ <div name="Customer Features" position="inside">
<div>
- <div>
- <field name="module_google_map" class="oe_inline"/>
- <label for="module_google_map"/>
- </div>
+ <field name="module_google_map" class="oe_inline"/>
+ <label for="module_google_map"/>
</div>
</div>
- <div name="config_sale" position="inside">
- <separator string="Documents and Wiki"/>
+ <div name="Sale Features" position="inside">
<div>
- <div>
- <field name="module_wiki_sale_faq"/>
- <label for="module_wiki_sale_faq"/>
- </div>
+ <field name="module_wiki_sale_faq"/>
+ <label for="module_wiki_sale_faq"/>
</div>
</div>
</field>
=== modified file 'knowledge/res_config.py'
--- knowledge/res_config.py 2012-05-09 13:38:06 +0000
+++ knowledge/res_config.py 2012-07-24 13:31:21 +0000
@@ -33,7 +33,7 @@
help="""This is a complete document management system, with: user authentication,
full document search (but pptx and docx are not supported), and a document dashboard.
This installs the module document."""),
- 'module_document_ftp': fields.boolean('Share repositories (FTP)',
+ 'module_document_ftp': fields.boolean('Share Repositories (FTP)',
help="""Access your documents in OpenERP through an FTP interface.
This installs the module document_ftp."""),
'module_document_webdav': fields.boolean('Share Repositories (WebDAV)',
=== modified file 'project/res_config_view.xml'
--- project/res_config_view.xml 2012-07-20 06:44:13 +0000
+++ project/res_config_view.xml 2012-07-24 13:31:21 +0000
@@ -12,7 +12,7 @@
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
- <separator string="Project and Planing"/>
+ <separator string="Project and Planning"/>
<group>
<label for="id" string="Project"/>
<div>
@@ -47,7 +47,7 @@
</div>
</group>
<group>
- <label for="id" string="Planing"/>
+ <label for="id" string="Planning"/>
<div>
<div>
<field name="module_project_long_term" class="oe_inline"/>
=== modified file 'sale/res_config_view.xml'
--- sale/res_config_view.xml 2012-07-23 11:15:11 +0000
+++ sale/res_config_view.xml 2012-07-24 13:31:21 +0000
@@ -8,7 +8,7 @@
<field name="type">form</field>
<field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
<field name="arch" type="xml">
- <div name="config_sale" position="before">
+ <div name="customer feature" position="before">
<separator string="Invoicing Process"/>
<group>
<label for="id" string="Invoicing Process"/>
@@ -50,28 +50,26 @@
</group>
<field name="module_project_timesheet" invisible="1"/>
<field name="module_project_mrp" invisible="1"/>
- <separator string="Quotations and Sales Orders"/>
- <group>
- <label for="id" string="Customer Features"/>
- <div>
- <div>
- <field name="group_sale_delivery_address" class="oe_inline"/>
- <label for="group_sale_delivery_address"/>
- </div>
- <div>
- <field name="group_sale_pricelist" class="oe_inline"/>
- <label for="group_sale_pricelist"/>
- </div>
- <div>
- <field name="module_sale_journal" class="oe_inline"/>
- <label for="module_sale_journal"/>
- </div>
- <div name="module_warning">
- <field name="module_warning" class="oe_inline"/>
- <label for="module_warning"/>
- </div>
- </div>
- </group>
+ </div>
+ <div name="Customer Features" position="inside">
+ <div>
+ <field name="group_sale_delivery_address" class="oe_inline"/>
+ <label for="group_sale_delivery_address"/>
+ </div>
+ <div>
+ <field name="group_sale_pricelist" class="oe_inline"/>
+ <label for="group_sale_pricelist"/>
+ </div>
+ <div>
+ <field name="module_sale_journal" class="oe_inline"/>
+ <label for="module_sale_journal"/>
+ </div>
+ <div name="module_warning">
+ <field name="module_warning" class="oe_inline"/>
+ <label for="module_warning"/>
+ </div>
+ </div>
+ <group name="Sale" position="before">
<group>
<label for="id" string="Product Features"/>
<div>
@@ -89,23 +87,22 @@
</div>
</div>
</group>
- <group>
- <label for="id" string="Sale Features"/>
- <div>
- <div>
- <field name="group_multiple_shops" class="oe_inline"/>
- <label for="group_multiple_shops"/>
- </div>
- <div attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}">
- <field name="default_picking_policy" class="oe_inline"/>
- <label for="default_picking_policy"/>
- </div>
- <div name="module_sale_margin">
- <field name="module_sale_margin" class="oe_inline"/>
- <label for="module_sale_margin"/>
- </div>
- </div>
- </group>
+ </group>
+ <div name="Sale Features" position="inside">
+ <div>
+ <field name="group_multiple_shops" class="oe_inline"/>
+ <label for="group_multiple_shops"/>
+ </div>
+ <div attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}">
+ <field name="default_picking_policy" class="oe_inline"/>
+ <label for="default_picking_policy"/>
+ </div>
+ <div name="module_sale_margin">
+ <field name="module_sale_margin" class="oe_inline"/>
+ <label for="module_sale_margin"/>
+ </div>
+ </div>
+ <div name="customer feature" position="after">
<separator string="Contracts Management"/>
<div style="color:grey">
Use contract to be able to manage your services with multiple invoicing as part of the same contract with your customer
_______________________________________________
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
