Yaltik/flectra
2
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'master-odoo-word-to-flectra' into 'master'

Browse Source 
[FIX] Odoo word to Flectra

See merge request flectra-hq/flectra!124
This commit is contained in:
Parthiv Patel 2018-08-02 10:22:10 +00:00
commit 1a32467888
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/payment/models/payment_acquirer.py
View File

@ -161,7 +161,7 @@ class PaymentAcquirer(models.Model):
payment_icon_ids = fields.Many2many('payment.icon', string='Supported Payment Icons')
payment_flow = fields.Selection(selection=[('form', 'Redirection to the acquirer website'),
('s2s','Payment from Odoo')],
('s2s','Payment from Flectra')],
default='form', required=True, string='Payment Flow',
help="""Note: Subscriptions does not take this field in account, it uses server to server by default.""")

4
addons/website_sale/static/description/index.html
View File

@ -69,14 +69,14 @@
<h2 class="oe_slogan" style=" text-align: left;">Marketplaces integration</h2>
<h3 class="oe_slogan" style="text-align: left;">Amazon &amp; eBay</h3>
<p class="oe_mt16 text-justify">
Get extra exposure and sell more by publishing your products on eBay and Amazon. Import and manage your items straight from your Odoo instance.
Get extra exposure and sell more by publishing your products on eBay and Amazon. Import and manage your items straight from your Flectra instance.
</p>
</div>
<div class="col-md-5">
<h2 class="oe_slogan" style=" text-align: left;">Shippers integration</h2>
<h3 class="oe_slogan" style="text-align: left;">UPS, DHL &amp; FedEx</h3>
<p class="oe_mt16 text-justify">
Speed up your shipment process and track your packages from Odoo. Select between multiple rates by shipping providers.
Speed up your shipment process and track your packages from Flectra. Select between multiple rates by shipping providers.
</p>
</div>
</div>