Foram Katharotiya (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-config-wizard-sales-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-sales-fka/+merge/115688
hello sir,
Fix Error of External id : sale.view_sales_config
Thanks
Fka
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-config-wizard-sales-fka/+merge/115688
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-16 13:43:14 +0000
+++ base_setup/res_config_view.xml 2012-07-19 10:16:32 +0000
@@ -30,7 +30,6 @@
<button type="action" name="%(base.action_ir_mail_server_list)d"
string="Configure" icon="gtk-execute"/>
</group>
-
</group>
</form>
</field>
@@ -51,22 +50,29 @@
<field name="model">sale.config.settings</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Configure Sales" version="7.0">
+ <form string="Configure Sales" version="7.0" class="oe_form_configuration">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
- <group>
- <group name="config_sale">
+ <group name="config_sale" col="1">
<field name="module_crm" invisible="1"/>
- <separator string="Emails" colspan="2" attrs="{'invisible': [('module_crm','=',False)]}"/>
- <field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}"/>
- <field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
- </group>
- <group name="config_other">
- </group>
- </group>
+ <separator string="Emails Integration" col="1" 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.
+ 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)]}"><label for="id" string="On Mail Client"/>
+ <div>
+ <div name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}" class="oe_inline"><field name="module_plugin_thunderbird"/>
+ <label for="module_plugin_thunderbird" string="Thunderbird"/>plugin</div>
+ <div name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"><field name="module_plugin_outlook" class="oe_inline"/>
+ <label for="module_plugin_outlook" string="Outlook"/>plugin</div>
+ </div>
+ </group>
+ </group>
+ <group name="config_other" col="1">
+ </group>
+
</form>
</field>
</record>
=== modified file 'crm/res_config_view.xml'
--- crm/res_config_view.xml 2012-07-16 13:43:14 +0000
+++ crm/res_config_view.xml 2012-07-19 10:16:32 +0000
@@ -8,29 +8,50 @@
<field name="type">form</field>
<field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
<field name="arch" type="xml">
- <separator string="Emails" version="7.0" position="after">
- <label for="fetchmail_lead"/>
+ <group name="On Mail Client" version="7.0" position="after">
+ <group>
+ <label for="id" string="On Mail Server"/>
<div>
- <field name="fetchmail_lead"/>
+ <div name="fetchmail_lead"><field name="fetchmail_lead" class="oe_inline"/>
+ Create<label for="fetchmail_lead" string="Leads"/>from Incoming Mails
<button name="configure_fetchmail_lead" type="object" string="Configure" icon="gtk-go-forward"
- attrs="{'invisible': [('fetchmail_lead','=',False)]}"/>
+ attrs="{'invisible': [('fetchmail_lead','=',False)]}" class="oe_link"/>
+ </div>
</div>
- </separator>
+ </group>
+ </group>
<group name="config_other" version="7.0" position="inside">
<separator string="Import and Synchronize Data from an Other Application" colspan="2"/>
- <field name="module_import_sugarcrm"/>
- <field name="module_crm_caldav"/>
- <field name="module_import_google"/>
- <separator string="Customer Form" colspan="2"/>
- <field name="module_google_map"/>
+ <group>
+ <label for="id" string="Import From"/>
+ <div>
+ <div><field name="module_import_sugarcrm"/>SugarCRM</div>
+ </div>
+ </group>
+ <group>
+ <label for="id" string="Synchronize with"/>
+ <div>
+ <div><field name="module_import_google"/>
+ <label for="module_import_google" string="Google"/>(Contact and Calendar)</div>
+ <div><field name="module_crm_caldav"/>
+ Application with<label for="module_crm_caldav" string="Caldav"/>Protocol</div>
+ </div>
+ </group>
+ <separator string="Customer Form"/>
+ <div>
+ <div><field name="module_google_map"/>Add Google Maps on Customer</div>
+ </div>
</group>
<group name="config_sale" position="inside">
<separator string="Documents and Wiki" colspan="2"/>
- <field name="module_wiki_sale_faq"/>
+ <div>
+ <div><field name="module_wiki_sale_faq"/>
+ Share Information with<label for="module_wiki_sale_faq" string="Sales FAQ"/></div>
+ </div>
</group>
</field>
</record>
-
+
<menuitem id="base.menu_sale_config" name="Sales" parent="base.menu_config"
sequence="1" action="base_setup.action_sale_config"/>
=== modified file 'crm_claim/res_config_view.xml'
--- crm_claim/res_config_view.xml 2012-07-16 13:43:14 +0000
+++ crm_claim/res_config_view.xml 2012-07-19 10:16:32 +0000
@@ -9,14 +9,12 @@
<field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
<field name="priority" eval="20"/> <!-- to put fetchmail_lead before fetchmail_claim -->
<field name="arch" type="xml">
- <separator string="Emails" version="7.0" position="after">
- <label for="fetchmail_claim"/>
- <div>
- <field name="fetchmail_claim"/>
+ <div name="fetchmail_lead" position="after">
+ <div><field name="fetchmail_claim" class="oe_inline"/>
+ Create<label for="fetchmail_claim" string="Claims"/>from Incoming Mails
<button type="object" name="configure_fetchmail_claim" string="Configure" icon="gtk-go-forward"
- attrs="{'invisible': [('fetchmail_claim','=',False)]}"/>
- </div>
- </separator>
+ attrs="{'invisible': [('fetchmail_claim','=',False)]}" class="oe_link"/></div>
+ </div>
</field>
</record>
=== modified file 'plugin_outlook/plugin_outlook.xml'
--- plugin_outlook/plugin_outlook.xml 2012-07-18 13:08:22 +0000
+++ plugin_outlook/plugin_outlook.xml 2012-07-19 10:16:32 +0000
@@ -52,14 +52,12 @@
<field name="type">form</field>
<field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
<field name="arch" type="xml">
- <field name="module_plugin_outlook" version="7.0" position="replace">
- <label for="module_plugin_outlook"/>
- <div>
- <field name="module_plugin_outlook"/>
+ <div name="module_plugin_outlook" version="7.0" position="replace">
+ <div><field name="module_plugin_outlook" class="oe_inline"/>
+ <label for="module_plugin_outlook" string="Outlook"/>plugin
<button name="%(action_outlook_installer)d" type="action" string="Configure" icon="gtk-execute"
- attrs="{'invisible': [('module_plugin_outlook','=',False)]}"/>
- </div>
- </field>
+ attrs="{'invisible': [('module_plugin_outlook','=',False)]}" class="oe_link"/></div>
+ </div>
</field>
</record>
=== modified file 'plugin_thunderbird/plugin_thunderbird.xml'
--- plugin_thunderbird/plugin_thunderbird.xml 2012-07-18 13:08:22 +0000
+++ plugin_thunderbird/plugin_thunderbird.xml 2012-07-19 10:16:32 +0000
@@ -58,14 +58,12 @@
<field name="type">form</field>
<field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
<field name="arch" type="xml">
- <field name="module_plugin_thunderbird" version="7.0" position="replace">
- <label for="module_plugin_thunderbird"/>
- <div>
- <field name="module_plugin_thunderbird"/>
- <button name="%(action_thunderbird_installer)d" type="action" string="Configure" icon="gtk-execute"
- attrs="{'invisible': [('module_plugin_thunderbird','=',False)]}"/>
- </div>
- </field>
+ <div name="module_plugin_thunderbird" version="7.0" position="replace">
+ <div><field name="module_plugin_thunderbird" class="oe_inline"/>
+ <label for="module_plugin_thunderbird" string="Thunderbird"/>plugin
+ <button name="%(action_thunderbird_installer)d" type="action" string="Download and install the plugin" icon="gtk-execute"
+ attrs="{'invisible': [('module_plugin_thunderbird','=',False)]}" class="oe_link"/></div>
+ </div>
</field>
</record>
=== modified file 'sale/res_config_view.xml'
--- sale/res_config_view.xml 2012-07-16 13:43:14 +0000
+++ sale/res_config_view.xml 2012-07-19 10:16:32 +0000
@@ -8,34 +8,88 @@
<field name="type">form</field>
<field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
<field name="arch" type="xml">
- <group name="config_sale" position="inside">
+ <group name="config_sale" position="before">
+ <div>
+ <separator string="Invoicing Process"/>
+ <group>
+ <label for="id" string="Invoicing Process"/>
+ <div>
+ <div><field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)" class="oe_inline"/>
+ Genrate Invoices<label for="group_invoice_so_lines" string="Based On The Sale Order"/></div>
+ <div><field name="group_invoice_deli_orders" class="oe_inline" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
+ Genrate Invoices After and<label for="group_invoice_deli_orders" string="Based on Delivery Orders"/></div>
+ <div><field name="task_work" class="oe_inline" on_change="onchange_task_work(task_work)"/>
+ Prepare Invoices<label for="task_work" string="Based On Task's Activities"/></div>
+ <div><field name="timesheet" class="oe_inline" on_change="onchange_timesheet(timesheet)"/>
+ Prepare Invoices<label for="timesheet" string="Based On Timesheets"/></div>
+ </div>
+ </group>
+ <group>
+ <label for="id" string="Default Process"/>
+ <div>
+ <div attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)],'required': ['|',('group_invoice_so_lines','=',True),('group_invoice_deli_orders','=',True)]}">
+ The<label for="default_order_policy" string="Default"/>Invocing method is
+ <field name="default_order_policy" class="oe_inline"/>
+ </div>
+ <div attrs="{'invisible':[('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False)]}"><field name="module_delivery" class="oe_inline"/>
+ Allow Adding Shipping Costs</div>
+ <div attrs="{'invisible': [('task_work','=',False), ('module_account_analytic_analysis','=',False)],'required': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}">
+ The Default<label for="time_unit" string="Working Time Unit"/>For Service is
+ <field name="time_unit" domain="[('category_id.name','=','Working Time')]" class="oe_inline"/>
+ </div>
+ </div>
+ </group>
+ </div>
+
<field name="module_project_timesheet" invisible="1"/>
<field name="module_project_mrp" invisible="1"/>
- <separator string="Sale Order" colspan="2"/>
- <field name="group_uom"/>
- <field name="group_sale_delivery_address"/>
- <field name="group_sale_pricelist"/>
- <field name="group_multiple_shops"/>
- <field name="module_warning"/>
- <field name="decimal_precision"/>
- <field name="default_picking_policy" attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}"/>
- <field name="group_discount_per_so_line"/>
- <field name="module_sale_margin"/>
- <field name="module_sale_journal"/>
- </group>
- <group name="config_other" position="inside">
- <separator string="Invoicing Policy" colspan="2" />
- <field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
- <field name="group_invoice_deli_orders" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
- <field name="task_work" on_change="onchange_task_work(task_work)"/>
- <field name="timesheet" on_change="onchange_timesheet(timesheet)"/>
- <field name="default_order_policy" attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)],'required': ['|',('group_invoice_so_lines','=',True),('group_invoice_deli_orders','=',True)]}"/>
- <field name="module_delivery" attrs="{'invisible':[('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False)]}"/>
- <field name="time_unit" domain="[('category_id.name','=','Working Time')]"
- attrs="{'invisible': [('task_work','=',False), ('module_account_analytic_analysis','=',False)],'required': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}"/>
- <separator string="Contracts" colspan="2"/>
- <field name="module_account_analytic_analysis" on_change="onchange_timesheet(module_account_analytic_analysis)"/>
- <field name="module_analytic_user_function" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"/>
+ <separator string="Quotations and Sales Orders" col="1"/>
+ <group>
+ <label for="id" string="Customer Features"/>
+ <div>
+ <div><field name="group_sale_delivery_address" class="oe_inline"/>
+ Allow a<label for="group_sale_delivery_address" string="Different Address"/>For Delivery and Invoicing</div>
+ <div><field name="group_sale_pricelist" class="oe_inline"/>
+ <label for="group_sale_pricelist" string="Use Pricelists"/>to Adapt your Price Per Customers</div>
+ <div><field name="module_sale_journal" class="oe_inline"/>
+ Allow Batch<label for="module_sale_journal" string="Invoicing through Journals"/></div>
+ <div name="module_warning"><field name="module_warning" class="oe_inline"/>
+ Allow Configuring<label for="module_warning" string="alert"/>by Customer or Products</div>
+ </div>
+ </group>
+ <group>
+ <label for="id" string="Product Features"/>
+ <div>
+ <div><field name="group_uom" class="oe_inline"/>
+ Allow Different<label for="group_uom" string="Units of Measure"/></div>
+ <div><field name="group_discount_per_so_line" class="oe_inline"/>
+ Allow Setting a<label for="group_discount_per_so_line" string="discount"/>on the Sale Order Lines</div>
+ <div>What's the decimal precision on prices:
+ <field name="decimal_precision" class="oe_inline"/></div>
+ </div>
+ </group>
+ <group>
+ <label for="id" string="Sale Features"/>
+ <div>
+ <div><field name="group_multiple_shops" class="oe_inline"/>
+ Manage<label for="group_multiple_shops" string="Multiple Shops"/></div>
+ <div attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}"><field name="default_picking_policy" class="oe_inline"/>
+ Configure Per Order if yoy<label for="default_picking_policy" string="Deliver in One Pack or each Product"/>when Available</div>
+ <div name="module_sale_margin"><field name="module_sale_margin" class="oe_inline"/>
+ <label for="module_sale_margin" string="Display Margins"/>on Sale Orders</div>
+ </div>
+ </group>
+ <separator string="Contracts Management" colspan="2"/>
+ <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</div>
+ <group>
+ <label for="id" string="Contract Feature"/>
+ <div>
+ <div><field name="module_account_analytic_analysis" on_change="onchange_timesheet(module_account_analytic_analysis)" class="oe_inline"/>
+ Use Contract Management</div>
+ <div attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"><field name="module_analytic_user_function" class="oe_inline"/>
+ Assign User Roles per Contract</div>
+ </div>
+ </group>
</group>
</field>
</record>
_______________________________________________
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
