[REM]Remove Enterprise Tags
This commit is contained in:
Chinmayi Vyas
parent
822889a722
commit
58e83ab178
@ -45,9 +45,6 @@
|
||||
</div>
|
||||
<div style="padding:0px;width:600px;margin:auto; margin-top: 10px; background: #fff repeat top /100%;color:#777777">
|
||||
${user.signature | safe}
|
||||
<p style="font-size: 11px; margin-top: 10px;">
|
||||
<strong>Sent by ${user.company_id.name} using <a href="www.flectrahq.com" style="text-decoration:none; color: #875A7B;">Flectra</a></strong>
|
||||
</p>
|
||||
</div>]]></field>
|
||||
<field name="user_signature" eval="False"/>
|
||||
</record>
|
||||
@ -84,9 +81,6 @@
|
||||
</div>
|
||||
<div style="padding:0px;width:600px;margin:auto; margin-top: 10px; background: #fff repeat top /100%;color:#777777">
|
||||
${user.signature | safe}
|
||||
<p style="font-size: 11px; margin-top: 10px;">
|
||||
<strong>Sent by ${user.company_id.name} using <a href="www.flectrahq.com" style="text-decoration:none; color: #875A7B;">Flectra</a></strong>
|
||||
</p>
|
||||
</div>]]></field>
|
||||
<field name="user_signature" eval="False"/>
|
||||
</record>
|
||||
@ -128,9 +122,6 @@
|
||||
</div>
|
||||
<div style="padding:0px;width:600px;margin:auto; margin-top: 10px; background: #fff repeat top /100%;color:#777777">
|
||||
${user.signature | safe}
|
||||
<p style="font-size: 11px; margin-top: 10px;">
|
||||
<strong>Sent by ${user.company_id.name} using <a href="www.flectrahq.com" style="text-decoration:none; color: #875A7B;">Flectra</a></strong>
|
||||
</p>
|
||||
</div></field>
|
||||
<field name="user_signature" eval="False"/>
|
||||
</record>
|
||||
|
||||
@ -178,7 +178,6 @@
|
||||
<tbody>
|
||||
<tr>
|
||||
<td style="padding-top:10px;font-size: 12px;">
|
||||
<div>Sent by ${object.company_id.name}</div>
|
||||
% if 'website_url' in object.event_id and object.event_id.website_url:
|
||||
<div>
|
||||
Discover <a href="/event" style="text-decoration:none;color:#717188;">all our events</a>.
|
||||
@ -346,7 +345,6 @@
|
||||
<tbody>
|
||||
<tr>
|
||||
<td style="padding-top:10px;font-size: 12px;">
|
||||
<p style="margin:0px 0px 9px 0px;padding-top:10px;">Sent by ${object.company_id.name}</p>
|
||||
% if 'website_url' in object.event_id and object.event_id.website_url:
|
||||
<div>
|
||||
Discover <a href="/event" style="text-decoration:none;color:#717188;">all our events</a>.
|
||||
|
||||
@ -8,5 +8,4 @@ class ResConfigSettings(models.TransientModel):
|
||||
module_event_sale = fields.Boolean("Tickets")
|
||||
module_website_event_track = fields.Boolean("Tracks and Agenda")
|
||||
module_website_event_questions = fields.Boolean("Registration Survey")
|
||||
module_event_barcode = fields.Boolean("Barcode")
|
||||
module_website_event_sale = fields.Boolean("Online Ticketing")
|
||||
|
||||
@ -48,20 +48,6 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<h2>Attendance</h2>
|
||||
<div class="row mt16 o_settings_container">
|
||||
<div class="col-xs-12 col-md-6 o_setting_box">
|
||||
<div class="o_setting_left_pane">
|
||||
<field name="module_event_barcode" widget="upgrade_boolean"/>
|
||||
</div>
|
||||
<div class="o_setting_right_pane">
|
||||
<label for="module_event_barcode"/>
|
||||
<div class="text-muted">
|
||||
Scan badges to confirm attendances
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</xpath>
|
||||
</field>
|
||||
|
||||
@ -243,11 +243,11 @@
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<!-- <tr>
|
||||
<td align="center">
|
||||
Powered by <a target="_blank" href="https://www.flectra.com">Flectra</a>.
|
||||
</td>
|
||||
</tr>
|
||||
</tr> -->
|
||||
</table>
|
||||
</td></tr>
|
||||
</table>
|
||||
|
||||
@ -7,7 +7,6 @@ from flectra import fields, models
|
||||
class ResConfigSettings(models.TransientModel):
|
||||
_inherit = 'res.config.settings'
|
||||
|
||||
module_account_accountant = fields.Boolean(string='Account Accountant')
|
||||
module_l10n_fr_hr_payroll = fields.Boolean(string='French Payroll')
|
||||
module_l10n_be_hr_payroll = fields.Boolean(string='Belgium Payroll')
|
||||
module_l10n_in_hr_payroll = fields.Boolean(string='Indian Payroll')
|
||||
|
||||
@ -33,20 +33,6 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<h2>Accounting</h2>
|
||||
<div class="row mt16 o_settings_container" id="hr_payroll_accountant">
|
||||
<div class="col-md-6 col-xs-12 o_setting_box">
|
||||
<div class="o_setting_left_pane">
|
||||
<field name="module_account_accountant" widget="upgrade_boolean"/>
|
||||
</div>
|
||||
<div class="o_setting_right_pane">
|
||||
<label for="module_account_accountant" string="Payroll Entries"/>
|
||||
<div class="text-muted">
|
||||
Post payroll slips in accounting
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</xpath>
|
||||
</field>
|
||||
|
||||
@ -82,7 +82,6 @@
|
||||
<tbody>
|
||||
<tr>
|
||||
<td style="padding-top:10px;font-size: 12px;">
|
||||
<div>Sent by ${object.company_id.name}</div>
|
||||
% if 'website_url' in object.job_id and object.job_id.website_url:
|
||||
<div>
|
||||
Discover <a href="/jobs" style="text-decoration:none;color:#717188;">our others jobs</a>.
|
||||
@ -229,7 +228,6 @@
|
||||
<tbody>
|
||||
<tr>
|
||||
<td style="padding-top:10px;font-size: 12px;">
|
||||
<div>Sent by ${object.company_id.name}</div>
|
||||
% if 'website_url' in object.job_id and object.job_id.website_url:
|
||||
<div>
|
||||
Discover <a href="/jobs" style="text-decoration:none;color:#717188;">all our jobs</a>.
|
||||
@ -368,7 +366,6 @@
|
||||
<tbody>
|
||||
<tr>
|
||||
<td style="padding-top:10px;font-size: 12px;">
|
||||
<div>Sent by ${object.company_id.name}</div>
|
||||
% if 'website_url' in object.job_id and object.job_id.website_url:
|
||||
<div>
|
||||
Discover <a href="/jobs" style="text-decoration:none;color:#717188;">all our jobs</a>.
|
||||
|
||||
@ -7,6 +7,5 @@ from flectra import fields, models
|
||||
class ResConfigSettings(models.TransientModel):
|
||||
_inherit = 'res.config.settings'
|
||||
|
||||
module_project_timesheet_synchro = fields.Boolean("Awesome Timesheet")
|
||||
module_sale_timesheet = fields.Boolean("Time Billing")
|
||||
module_project_timesheet_holidays = fields.Boolean("Leaves")
|
||||
|
||||
@ -11,39 +11,6 @@
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//div[hasclass('settings')]" position="inside">
|
||||
<div class="app_settings_block" data-string="Timesheets" string="Timesheets" data-key="hr_timesheet" groups="hr_timesheet.group_timesheet_manager">
|
||||
<h2>Timesheet Apps</h2>
|
||||
<div class="row mt16 o_settings_container">
|
||||
<div class="col-xs-12 col-md-6 o_setting_box">
|
||||
<div class="o_setting_left_pane">
|
||||
<field name="module_project_timesheet_synchro" widget="upgrade_boolean"/>
|
||||
</div>
|
||||
<div class="o_setting_right_pane">
|
||||
<label for="module_project_timesheet_synchro"/>
|
||||
<div class="text-muted">
|
||||
Synchronize time spent with web/mobile app
|
||||
</div>
|
||||
<div class="content-group">
|
||||
<div class="row mt16 oe_center">
|
||||
<div class="col-md-4">
|
||||
<a href="http://www.odoo.com/page/timesheet?platform=chrome">
|
||||
<img alt="Google Chrome Store" class="img img-responsive" src="project/static/src/img/chrome_store.png"/>
|
||||
</a>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<a href="http://www.odoo.com/page/timesheet?platform=ios">
|
||||
<img alt="Apple App Store" class="img img-responsive" src="project/static/src/img/app_store.png"/>
|
||||
</a>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<a href="http://www.odoo.com/page/timesheet?platform=android">
|
||||
<img alt="Google Play Store" class="img img-responsive" src="project/static/src/img/play_store.png"/>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<h2>Billing</h2>
|
||||
<div name="timesheet_billing" class="row mt16 o_settings_container" title="Sell services (e.g. project, maintenance), record time spent using Timesheets app and invoice them based on a fixed price (ordered quantity) or on the time spent (delivered quantity)">
|
||||
<div class="col-xs-12 col-md-6 o_setting_box">
|
||||
|
||||
@ -40,6 +40,5 @@ With this module you will have:
|
||||
"data/account_tax_data.xml",
|
||||
"data/fiscal_position_data.xml",
|
||||
"data/account_chart_template_data.yml",
|
||||
"views/res_config_settings_views.xml",
|
||||
],
|
||||
}
|
||||
|
||||
@ -3,5 +3,4 @@
|
||||
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
|
||||
|
||||
from . import account
|
||||
from . import res_config_settings
|
||||
from . import chart_template
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from flectra import fields, models
|
||||
|
||||
|
||||
class ResConfigSettings(models.TransientModel):
|
||||
_inherit = 'res.config.settings'
|
||||
|
||||
module_l10n_mx_edi = fields.Boolean('Mexican Electronic Invoicing')
|
||||
@ -1,23 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<flectra>
|
||||
<record id="res_config_settings_view_form" model="ir.ui.view">
|
||||
<field name="name">res.config.settings.view.form.inherit.l10n.mx</field>
|
||||
<field name="model">res.config.settings</field>
|
||||
<field name="inherit_id" ref="account.res_config_settings_view_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr=".//div[@id='invoicing_settings']" position="inside">
|
||||
<div class="col-xs-12 col-md-6 o_setting_box">
|
||||
<div class="o_setting_left_pane">
|
||||
<field name="module_l10n_mx_edi" class="oe_inline" widget="upgrade_boolean"/>
|
||||
</div>
|
||||
<div class="o_setting_right_pane">
|
||||
<label for="module_l10n_mx_edi"/>
|
||||
<div class="text-muted">
|
||||
Create your electronic invoices automatically (CFDI format)
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
</flectra>
|
||||
@ -10,13 +10,9 @@ class ResConfigSettings(models.TransientModel):
|
||||
manufacturing_lead = fields.Float(related='company_id.manufacturing_lead', string="Manufacturing Lead Time")
|
||||
use_manufacturing_lead = fields.Boolean(string="Default Manufacturing Lead Time", oldname='default_use_manufacturing_lead')
|
||||
module_mrp_byproduct = fields.Boolean("By-Products")
|
||||
module_mrp_mps = fields.Boolean("Master Production Schedule")
|
||||
module_mrp_plm = fields.Boolean("Product Lifecycle Management (PLM)")
|
||||
module_mrp_maintenance = fields.Boolean("Maintenance")
|
||||
module_quality_mrp = fields.Boolean("Quality")
|
||||
module_mrp_repair = fields.Boolean("Repair")
|
||||
group_mrp_routings = fields.Boolean("Work Orders & Quality",
|
||||
implied_group='mrp.group_mrp_routings')
|
||||
|
||||
@api.model
|
||||
def get_values(self):
|
||||
@ -35,7 +31,3 @@ class ResConfigSettings(models.TransientModel):
|
||||
def _onchange_use_manufacturing_lead(self):
|
||||
if not self.use_manufacturing_lead:
|
||||
self.manufacturing_lead = 0.0
|
||||
|
||||
@api.onchange('group_mrp_routings')
|
||||
def _onchange_group_mrp_routings(self):
|
||||
self.module_quality_mrp = self.group_mrp_routings
|
||||
|
||||
@ -11,29 +11,6 @@
|
||||
<div class="app_settings_block" data-string="Manufacturing" string="Manufacturing" data-key="mrp" groups="mrp.group_mrp_manager">
|
||||
<h2>Operations</h2>
|
||||
<div class="row mt16 o_settings_container">
|
||||
<div class="col-md-6 col-xs-12 o_setting_box" id="work_order" title="Work Order Operations allow you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials.">
|
||||
<div class="o_setting_left_pane">
|
||||
<field name="group_mrp_routings" widget="upgrade_boolean"/>
|
||||
<field name="module_quality_mrp" invisible="1"/>
|
||||
</div>
|
||||
<div class="o_setting_right_pane">
|
||||
<label for="group_mrp_routings"/>
|
||||
<div class="text-muted">
|
||||
Process operations at specific work centers based on the routing
|
||||
and carry out quality checks.
|
||||
</div>
|
||||
<div class="content-group" attrs="{'invisible': [('group_mrp_routings','=',False)]}">
|
||||
<div class="mt16">
|
||||
<div>
|
||||
<button name="%(mrp.mrp_routing_action)d" icon="fa-arrow-right" type="action" string="Routings" class="btn-link"/>
|
||||
</div>
|
||||
<div>
|
||||
<button name="%(mrp.mrp_workcenter_action)d" icon="fa-arrow-right" type="action" string="Work Centers" class="btn-link"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6 col-xs-12 o_setting_box" id="mrp_repair">
|
||||
<div class="o_setting_left_pane">
|
||||
<field name="module_mrp_repair"/>
|
||||
@ -45,17 +22,6 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6 col-xs-12 o_setting_box" id="mrp_maintenance">
|
||||
<div class="o_setting_left_pane">
|
||||
<field name="module_mrp_maintenance" widget="upgrade_boolean"/>
|
||||
</div>
|
||||
<div class="o_setting_right_pane">
|
||||
<label for="module_mrp_maintenance"/>
|
||||
<div class="text-muted">
|
||||
Schedule the maintenance of your equipment
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<h2>Products</h2>
|
||||
<div class="row mt16 o_settings_container">
|
||||
@ -73,18 +39,6 @@
|
||||
</div>
|
||||
<h2>Planning</h2>
|
||||
<div class="row mt16 o_settings_container">
|
||||
<div class="col-md-6 col-xs-12 o_setting_box" id="mrp_mps" title="Using a MPS report to schedule your reordering and manufacturing operations is useful if you have long lead time and if you produce based on sales forecasts.">
|
||||
<div class="o_setting_left_pane">
|
||||
<field name="module_mrp_mps" widget="upgrade_boolean"/>
|
||||
</div>
|
||||
<div class="o_setting_right_pane">
|
||||
<label for="module_mrp_mps"/>
|
||||
<div class="text-muted">
|
||||
Plan manufacturing or purchase orders based on forecasts
|
||||
</div>
|
||||
<div class="content-group" id="content_mrp_mps"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6 col-xs-12 o_setting_box" id="security_lead_time">
|
||||
<div class="o_setting_left_pane">
|
||||
<field name="use_manufacturing_lead"/>
|
||||
|
||||
@ -158,7 +158,6 @@ class PosConfig(models.Model):
|
||||
start_category = fields.Boolean("Set Start Category")
|
||||
module_pos_restaurant = fields.Boolean("Is a Bar/Restaurant")
|
||||
module_pos_discount = fields.Boolean("Global Discounts")
|
||||
module_pos_loyalty = fields.Boolean("Loyalty Program")
|
||||
module_pos_mercury = fields.Boolean(string="Integrated Card Payments")
|
||||
module_pos_reprint = fields.Boolean(string="Reprint Receipt")
|
||||
is_posbox = fields.Boolean("PosBox")
|
||||
|
||||
@ -265,22 +265,6 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-md-6 o_setting_box">
|
||||
<div class="o_setting_left_pane">
|
||||
<field name="module_pos_loyalty" widget="upgrade_boolean"/>
|
||||
</div>
|
||||
<div class="o_setting_right_pane" title="Loyalty program to use for this point of sale. ">
|
||||
<label for="module_pos_loyalty"/>
|
||||
<div class="text-muted" id="loyalty_program">
|
||||
Give customer rewards, free samples, etc.
|
||||
</div>
|
||||
<div class="content-group" attrs="{'invisible': [('module_pos_loyalty', '=', False)]}">
|
||||
<div class="mt16" id="btn_use_pos_loyalty">
|
||||
<button string="Save" type="object" name="execute" class="oe_highlight"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-md-6 o_setting_box" title="Only users with Manager access rights for PoS app can modify the product prices on orders.">
|
||||
<div class="o_setting_left_pane">
|
||||
<field name="restrict_price_control"/>
|
||||
|
||||
@ -9,7 +9,6 @@ class ResConfigSettings(models.TransientModel):
|
||||
|
||||
module_hr_timesheet = fields.Boolean("Timesheets")
|
||||
module_rating_project = fields.Boolean(string="Rating on Tasks")
|
||||
module_project_forecast = fields.Boolean(string="Forecasts")
|
||||
group_subtask_project = fields.Boolean("Sub-tasks", implied_group="project.group_subtask_project")
|
||||
project_time_mode_id = fields.Many2one(
|
||||
'product.uom', related='company_id.project_time_mode_id', string='Project Time Unit',
|
||||
|
||||
@ -62,17 +62,6 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-md-6 o_setting_box">
|
||||
<div class="o_setting_left_pane">
|
||||
<field name="module_project_forecast" widget="upgrade_boolean"/>
|
||||
</div>
|
||||
<div class="o_setting_right_pane">
|
||||
<label for="module_project_forecast"/>
|
||||
<div class="text-muted">
|
||||
Manage your resources with Gantt charts
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</xpath>
|
||||
|
||||
@ -25,7 +25,6 @@ class ResConfigSettings(models.TransientModel):
|
||||
module_stock_dropshipping = fields.Boolean("Dropshipping")
|
||||
group_manage_vendor_price = fields.Boolean("Vendor Pricelists",
|
||||
implied_group="purchase.group_manage_vendor_price")
|
||||
module_account_3way_match = fields.Boolean("3-way matching: purchases, receptions and bills")
|
||||
is_installed_sale = fields.Boolean(string="Is the Sale Module Installed")
|
||||
group_analytic_account_for_purchases = fields.Boolean('Analytic accounting for purchases',
|
||||
implied_group='purchase.group_analytic_accounting')
|
||||
|
||||
@ -85,17 +85,6 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-md-6 o_setting_box" title="If enabled, activates 3-way matching on vendor bills : the items must be received in order to pay the invoice.">
|
||||
<div class="o_setting_left_pane">
|
||||
<field name="module_account_3way_match" string="3-way matching" widget="upgrade_boolean"/>
|
||||
</div>
|
||||
<div class="o_setting_right_pane">
|
||||
<label for="module_account_3way_match"/>
|
||||
<div class="text-muted">
|
||||
Make sure you only pay bills for which you received the goods you ordered
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<h2>Products</h2>
|
||||
<div class="row mt16 o_settings_container">
|
||||
|
||||
@ -100,7 +100,6 @@
|
||||
% if object.project_id.rating_status == 'periodic':
|
||||
<p>This customer survey is sent <b>${object.project_id.rating_status_period}</b> as long as the task is in the <b>${object.stage_id.name}</b> stage.</p>
|
||||
% endif
|
||||
<p>Email automatically sent by <a target="_blank" href="https://www.flectra.com/page/project-management" style="color:#875A7B;text-decoration:none;">Flectra Project</a> for <a href="${object.project_id.company_id.website}" style="color:#875A7B;text-decoration:none;">${object.project_id.company_id.name}</a></p>
|
||||
</td></tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
@ -30,12 +30,6 @@ class ResConfigSettings(models.TransientModel):
|
||||
oldname='default_new_propagation_minimum_delta',
|
||||
help="Rescheduling applies to any chain of operations (e.g. Make To Order, Pick Pack Ship). In the case of MTO sales, a vendor delay (updated incoming date) impacts the expected delivery date to the customer. \n This option allows to not propagate the rescheduling if the change is not critical.")
|
||||
module_stock_picking_batch = fields.Boolean("Batch Pickings", oldname="module_stock_picking_wave")
|
||||
module_stock_barcode = fields.Boolean("Barcode Scanner")
|
||||
module_delivery_dhl = fields.Boolean("DHL USA")
|
||||
module_delivery_fedex = fields.Boolean("FedEx")
|
||||
module_delivery_ups = fields.Boolean("UPS")
|
||||
module_delivery_usps = fields.Boolean("USPS")
|
||||
module_delivery_bpost = fields.Boolean("bpost")
|
||||
group_stock_multi_locations = fields.Boolean('Storage Locations', implied_group='stock.group_stock_multi_locations',
|
||||
help="Store products in specific locations of your warehouse (e.g. bins, racks) and to track inventory accordingly.")
|
||||
group_stock_multi_warehouses = fields.Boolean('Multi-Warehouses', implied_group='stock.group_stock_multi_warehouses')
|
||||
|
||||
@ -11,20 +11,6 @@
|
||||
<div class="app_settings_block" data-string="Inventory" string="Inventory" data-key="stock" groups="stock.group_stock_manager">
|
||||
<h2>Operations</h2>
|
||||
<div class="row mt16 o_settings_container">
|
||||
<div class="col-xs-12 col-md-6 o_setting_box">
|
||||
<div class="o_setting_left_pane">
|
||||
<field name="module_stock_barcode" widget="upgrade_boolean"/>
|
||||
</div>
|
||||
<div class="o_setting_right_pane">
|
||||
<label for="module_stock_barcode"/>
|
||||
<div class="text-muted">
|
||||
Process operations faster with barcodes
|
||||
</div>
|
||||
<div class="content-group">
|
||||
<div id="use_product_barcode"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-md-6 o_setting_box" title="Put your products in packs (e.g. parcels, boxes) and track them">
|
||||
<div class="o_setting_left_pane">
|
||||
<field name="group_stock_tracking_lot"/>
|
||||
@ -59,79 +45,6 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<h2>Shipping Connectors</h2>
|
||||
<div class="row mt16 o_settings_container" title="Shipping connectors allow to compute accurate shipping costs, print shipping labels and request carrier picking at your warehouse to ship to the customer. Apply shipping connector from delivery methods.">
|
||||
<div class="col-xs-12 col-md-6 o_setting_box">
|
||||
<div class="o_setting_left_pane">
|
||||
<field name="module_delivery_ups" widget="upgrade_boolean"/>
|
||||
</div>
|
||||
<div class="o_setting_right_pane">
|
||||
<label for="module_delivery_ups"/>
|
||||
<div class="text-muted">
|
||||
Compute shipping costs and ship with UPS
|
||||
</div>
|
||||
<div class="content-group">
|
||||
<div id="stock_delivery_ups"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-md-6 o_setting_box">
|
||||
<div class="o_setting_left_pane">
|
||||
<field name="module_delivery_dhl" widget="upgrade_boolean"/>
|
||||
</div>
|
||||
<div class="o_setting_right_pane">
|
||||
<label for="module_delivery_dhl"/>
|
||||
<div class="text-muted">
|
||||
Compute shipping costs and ship with DHL
|
||||
</div>
|
||||
<div class="content-group">
|
||||
<div id="stock_delivery_dhl"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-md-6 o_setting_box">
|
||||
<div class="o_setting_left_pane">
|
||||
<field name="module_delivery_fedex" widget="upgrade_boolean"/>
|
||||
</div>
|
||||
<div class="o_setting_right_pane">
|
||||
<label for="module_delivery_fedex"/>
|
||||
<div class="text-muted">
|
||||
Compute shipping costs and ship with FedEx
|
||||
</div>
|
||||
<div class="content-group">
|
||||
<div id="stock_delivery_fedex"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-md-6 o_setting_box">
|
||||
<div class="o_setting_left_pane">
|
||||
<field name="module_delivery_usps" widget="upgrade_boolean"/>
|
||||
</div>
|
||||
<div class="o_setting_right_pane">
|
||||
<label for="module_delivery_usps"/>
|
||||
<div class="text-muted">
|
||||
Compute shipping costs and ship with USPS
|
||||
</div>
|
||||
<div class="content-group">
|
||||
<div id="stock_delivery_usps"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-md-6 o_setting_box">
|
||||
<div class="o_setting_left_pane">
|
||||
<field name="module_delivery_bpost" widget="upgrade_boolean"/>
|
||||
</div>
|
||||
<div class="o_setting_right_pane">
|
||||
<label for="module_delivery_bpost"/>
|
||||
<div class="text-muted">
|
||||
Compute shipping costs and ship with bpost
|
||||
</div>
|
||||
<div class="content-group">
|
||||
<div id="stock_delivery_bpost"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<h2>Products</h2>
|
||||
<div class="row mt16 o_settings_container">
|
||||
<div class="col-xs-12 col-md-6 o_setting_box">
|
||||
|
||||
@ -30,7 +30,6 @@ class ResConfigSettings(models.TransientModel):
|
||||
cdn_activated = fields.Boolean('Use a Content Delivery Network (CDN)', related='website_id.cdn_activated')
|
||||
cdn_url = fields.Char(related='website_id.cdn_url')
|
||||
cdn_filters = fields.Text(related='website_id.cdn_filters')
|
||||
module_website_version = fields.Boolean("A/B Testing")
|
||||
|
||||
favicon = fields.Binary('Favicon', related='website_id.favicon')
|
||||
# Set as global config parameter since methods using it are not website-aware. To be changed
|
||||
|
||||
@ -132,17 +132,6 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-md-6 o_setting_box">
|
||||
<div class="o_setting_left_pane">
|
||||
<field name="module_website_version" widget="upgrade_boolean"/>
|
||||
</div>
|
||||
<div class="o_setting_right_pane">
|
||||
<label for="module_website_version"/>
|
||||
<div class="text-muted">
|
||||
Create several versions of your website pages
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-md-6 o_setting_box">
|
||||
<div class="o_setting_left_pane">
|
||||
</div>
|
||||
|
||||
@ -137,10 +137,6 @@
|
||||
<p style="font-size: 14px;">${user.signature | safe}
|
||||
</p>
|
||||
% endif
|
||||
<p style="font-size: 11px;"><strong>Sent by
|
||||
<a href="${user.company_id.website}" style="text-decoration:none; color: #875A7B;">
|
||||
<strong>${user.company_id.name}</strong>
|
||||
</a> using <a href="www.odoo.com" style="text-decoration:none; color: #875A7B;"><strong>Odoo</strong></a>
|
||||
</strong></p>
|
||||
</td>
|
||||
</tr></tbody>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user