Skip to content

Commit

Permalink
Corrections of more typos
Browse files Browse the repository at this point in the history
  • Loading branch information
guewen committed May 13, 2015
1 parent 1732c87 commit 628e030
Show file tree
Hide file tree
Showing 10 changed files with 61 additions and 61 deletions.
2 changes: 1 addition & 1 deletion connector_ecommerce/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Events
ConnectorUnit

A piece of code which allows to play all the ``onchanges`` required
when we create a sale order.
when we create a sales order.

Another one which allows to add special lines in imported sales orders
such as Shipping fees, Cash on Delivery or Discounts.
Expand Down
10 changes: 5 additions & 5 deletions connector_ecommerce/i18n/connector_ecommerce.pot
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ msgstr ""

#. module: connector_ecommerce
#: field:sale.order,parent_need_cancel:0
msgid "A parent sales orders needs cancel"
msgid "A parent sales order needs cancel"
msgstr ""

#. module: connector_ecommerce
Expand Down Expand Up @@ -215,7 +215,7 @@ msgstr ""

#. module: connector_ecommerce
#: help:sale.order,parent_need_cancel:0
msgid "A parent sales orders has been canceled on the backend and needs to be canceled."
msgid "A parent sales order has been canceled on the backend and needs to be canceled."
msgstr ""

#. module: connector_ecommerce
Expand Down Expand Up @@ -251,7 +251,7 @@ msgstr ""

#. module: connector_ecommerce
#: help:payment.method,days_before_cancel:0
msgid "After 'n' days, if the 'Import Rule' is not fulfilled, the import of the sale order will be canceled."
msgid "After 'n' days, if the 'Import Rule' is not fulfilled, the import of the sales order will be canceled."
msgstr ""

#. module: connector_ecommerce
Expand Down Expand Up @@ -281,7 +281,7 @@ msgstr ""

#. module: connector_ecommerce
#: help:account.invoice,sale_order_ids:0
msgid "This is the list of sale orders related to this invoice."
msgid "This is the list of sales orders related to this invoice."
msgstr ""

#. module: connector_ecommerce
Expand Down Expand Up @@ -329,7 +329,7 @@ msgstr ""

#. module: connector_ecommerce
#: field:account.invoice,sale_order_ids:0
msgid "Sale Orders"
msgid "Sales Orders"
msgstr ""

#. module: connector_ecommerce
Expand Down
10 changes: 5 additions & 5 deletions connector_ecommerce/i18n/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ msgstr "Preislistenartikel"

#. module: connector_ecommerce
#: field:sale.order,parent_need_cancel:0
msgid "A parent sales orders needs cancel"
msgid "A parent sales order needs cancel"
msgstr "Eine übergeordnete"

#. module: connector_ecommerce
Expand Down Expand Up @@ -246,7 +246,7 @@ msgstr ""
#. module: connector_ecommerce
#: help:sale.order,parent_need_cancel:0
msgid ""
"A parent sales orders has been canceled on the backend and needs to be "
"A parent sales order has been canceled on the backend and needs to be "
"canceled."
msgstr ""
"Ein übergeordneter VK-Auftrag wurde im Backend abgebrochen und muss "
Expand Down Expand Up @@ -287,7 +287,7 @@ msgstr "VK-Auftrag"
#: help:payment.method,days_before_cancel:0
msgid ""
"After 'n' days, if the 'Import Rule' is not fulfilled, the import of the "
"sale order will be canceled."
"sales order will be canceled."
msgstr ""
"Nach 'n' Tagen, wenn die 'Import Regel' nicht erfüllt ist, wird der Import "
"abgebrochen."
Expand Down Expand Up @@ -319,7 +319,7 @@ msgstr "Im Backend abgebrochen"

#. module: connector_ecommerce
#: help:account.invoice,sale_order_ids:0
msgid "This is the list of sale orders related to this invoice."
msgid "This is the list of sales orders related to this invoice."
msgstr ""
"Dies ist die Liste der VK-Aufträge welche mit dieser Rechnung in beziehung "
"stehen."
Expand Down Expand Up @@ -369,7 +369,7 @@ msgstr "Name"

#. module: connector_ecommerce
#: field:account.invoice,sale_order_ids:0
msgid "Sale Orders"
msgid "Sales Orders"
msgstr "VK-Aufträge"

#. module: connector_ecommerce
Expand Down
10 changes: 5 additions & 5 deletions connector_ecommerce/i18n/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ msgstr "Listado de Precios de Artículos"

#. module: connector_ecommerce
#: field:sale.order,parent_need_cancel:0
msgid "A parent sales orders needs cancel"
msgid "A parent sales order needs cancel"
msgstr "Una orden de venta padre debe cancelar"

#. module: connector_ecommerce
Expand Down Expand Up @@ -248,7 +248,7 @@ msgstr "Debe ser cancelado"
#. module: connector_ecommerce
#: help:sale.order,parent_need_cancel:0
msgid ""
"A parent sales orders has been canceled on the backend and needs to be "
"A parent sales order has been canceled on the backend and needs to be "
"canceled."
msgstr ""
"Una orden de venta padre ha sido cancelada en el área de administración y "
Expand Down Expand Up @@ -289,7 +289,7 @@ msgstr "Pedidos de venta"
#: help:payment.method,days_before_cancel:0
msgid ""
"After 'n' days, if the 'Import Rule' is not fulfilled, the import of the "
"sale order will be canceled."
"sales order will be canceled."
msgstr ""
"Después de 'n' días, si la 'Regla de Importación' no está realizada, la "
"importación de la orden de venta será cancelada."
Expand Down Expand Up @@ -321,7 +321,7 @@ msgstr "Cancelado en el área de administración"

#. module: connector_ecommerce
#: help:account.invoice,sale_order_ids:0
msgid "This is the list of sale orders related to this invoice."
msgid "This is the list of sales orders related to this invoice."
msgstr "Esta es la lista de pedidos de venta relacionados con esta factura."

#. module: connector_ecommerce
Expand Down Expand Up @@ -370,7 +370,7 @@ msgstr "Nombre"

#. module: connector_ecommerce
#: field:account.invoice,sale_order_ids:0
msgid "Sale Orders"
msgid "Sales Orders"
msgstr "Pedido de Venta"

#. module: connector_ecommerce
Expand Down
10 changes: 5 additions & 5 deletions connector_ecommerce/i18n/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ msgstr "Lignes de liste de prix"

#. module: connector_ecommerce
#: field:sale.order,parent_need_cancel:0
msgid "A parent sales orders needs cancel"
msgid "A parent sales order needs cancel"
msgstr "Une commande parente doit être annulée"

#. module: connector_ecommerce
Expand Down Expand Up @@ -248,7 +248,7 @@ msgstr "Doit être annulée"
#. module: connector_ecommerce
#: help:sale.order,parent_need_cancel:0
msgid ""
"A parent sales orders has been canceled on the backend and needs to be "
"A parent sales order has been canceled on the backend and needs to be "
"canceled."
msgstr ""
"Une commande parente a été annulée sur le backend et doit être annulée."
Expand Down Expand Up @@ -288,7 +288,7 @@ msgstr "Bon de commande"
#: help:payment.method,days_before_cancel:0
msgid ""
"After 'n' days, if the 'Import Rule' is not fulfilled, the import of the "
"sale order will be canceled."
"sales order will be canceled."
msgstr ""
"Après \"n\" jours, si la règle d'import n'est pas satisfaite, l'import de la "
"commande sera annulé."
Expand Down Expand Up @@ -320,7 +320,7 @@ msgstr "Annulée dans le backend"

#. module: connector_ecommerce
#: help:account.invoice,sale_order_ids:0
msgid "This is the list of sale orders related to this invoice."
msgid "This is the list of sales orders related to this invoice."
msgstr "Liste des commandes liées à cette facture."

#. module: connector_ecommerce
Expand Down Expand Up @@ -368,7 +368,7 @@ msgstr "Nom"

#. module: connector_ecommerce
#: field:account.invoice,sale_order_ids:0
msgid "Sale Orders"
msgid "Sales Orders"
msgstr "Bons de commande"

#. module: connector_ecommerce
Expand Down
10 changes: 5 additions & 5 deletions connector_ecommerce/i18n/nl.po
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ msgstr "Prijslijst items"

#. module: connector_ecommerce
#: field:sale.order,parent_need_cancel:0
msgid "A parent sales orders needs cancel"
msgid "A parent sales order needs cancel"
msgstr "Een bovenliggende verkooporder dient te worden geannuleerd"

#. module: connector_ecommerce
Expand Down Expand Up @@ -246,7 +246,7 @@ msgstr "Dient te worden geannuleerd"
#. module: connector_ecommerce
#: help:sale.order,parent_need_cancel:0
msgid ""
"A parent sales orders has been canceled on the backend and needs to be "
"A parent sales order has been canceled on the backend and needs to be "
"canceled."
msgstr ""
"Een bovenliggende verkooporder is geannuleerd in de backend en dient te "
Expand Down Expand Up @@ -287,7 +287,7 @@ msgstr "Verkooporder"
#: help:payment.method,days_before_cancel:0
msgid ""
"After 'n' days, if the 'Import Rule' is not fulfilled, the import of the "
"sale order will be canceled."
"sales order will be canceled."
msgstr ""
"Als na 'n' dagen niet aan de 'import regel' is voldaan, wordt de import van "
"de verkooporder geannuleerd."
Expand Down Expand Up @@ -319,7 +319,7 @@ msgstr "Geannuleerd in backend"

#. module: connector_ecommerce
#: help:account.invoice,sale_order_ids:0
msgid "This is the list of sale orders related to this invoice."
msgid "This is the list of sales orders related to this invoice."
msgstr ""
"Dit is een lijst met alle verkooporders gerelateerd aan deze factuur."

Expand Down Expand Up @@ -370,7 +370,7 @@ msgstr "Naam"

#. module: connector_ecommerce
#: field:account.invoice,sale_order_ids:0
msgid "Sale Orders"
msgid "Sales Orders"
msgstr "Verkooporders"

#. module: connector_ecommerce
Expand Down
2 changes: 1 addition & 1 deletion connector_ecommerce/payment_method.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def _get_import_rules(self):
string='Days before cancel',
default=30,
help="After 'n' days, if the 'Import Rule' is not fulfilled, the "
"import of the sale order will be canceled.",
"import of the sales order will be canceled.",
)
import_rule = fields.Selection(selection='_get_import_rules',
string="Import Rule",
Expand Down
24 changes: 12 additions & 12 deletions connector_ecommerce/sale.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
class SaleOrder(models.Model):
""" Add a cancellation mecanism in the sales orders
When a sale order is canceled in a backend, the connectors can flag
When a sales order is canceled in a backend, the connectors can flag
the 'canceled_in_backend' flag. It will:
* try to automatically cancel the sales order
Expand All @@ -42,9 +42,9 @@ class SaleOrder(models.Model):
to 'keep it open', the flag 'cancellation_resolved' is set to True.
The second axe which can be used by the connectors is the 'parent'
sale order. When a sales order has a parent sales order (logic to
sales order. When a sales order has a parent sales order (logic to
link with the parent to be defined by each connector), it will be
blocked until the cancellation of the sale order is resolved.
blocked until the cancellation of the sales order is resolved.
This is used by, for instance, the magento connector, when one
modifies a sales order, Magento cancels it and create a new one with
Expand All @@ -56,7 +56,7 @@ class SaleOrder(models.Model):
readonly=True)
# set to True when the cancellation from the backend is
# resolved, either because the SO has been canceled or
# because the user manually chosed to keep it open
# because the user manually chose to keep it open
cancellation_resolved = fields.Boolean(string='Cancellation from the '
'backend resolved')
parent_id = fields.Many2one(comodel_name='sale.order',
Expand All @@ -70,8 +70,8 @@ class SaleOrder(models.Model):
', need to be canceled.')
parent_need_cancel = fields.Boolean(
compute='_parent_need_cancel',
string='A parent sales orders needs cancel',
help='A parent sales orders has been canceled on the backend'
string='A parent sales order needs cancel',
help='A parent sales order has been canceled on the backend'
' and needs to be canceled.',
)

Expand Down Expand Up @@ -190,7 +190,7 @@ def write(self, values):
def action_cancel(self):
res = super(SaleOrder, self).action_cancel()
for sale in self:
# the sale order is canceled => considered as resolved
# the sales order is canceled => considered as resolved
if (sale.canceled_in_backend and
not sale.cancellation_resolved):
sale.write({'cancellation_resolved': True})
Expand All @@ -200,8 +200,8 @@ def action_cancel(self):
def ignore_cancellation(self, reason):
""" Manually set the cancellation from the backend as resolved.
The user can choose to keep the sale order active for some reason,
so it just push a button to keep it alive.
The user can choose to keep the sales order active for some reason,
it only requires to push a button to keep it alive.
"""
message = (_("Despite the cancellation of the sales order on the "
"backend, it should stay open.<br/><br/>Reason: %s") %
Expand All @@ -212,7 +212,7 @@ def ignore_cancellation(self, reason):

@api.multi
def action_view_parent(self):
""" Return an action to display the parent sale order """
""" Return an action to display the parent sales order """
self.ensure_one()

parent = self.parent_id
Expand All @@ -234,9 +234,9 @@ def action_view_parent(self):


class SpecialOrderLineBuilder(ConnectorUnit):
""" Base class to build a sale order line for a sale order
""" Base class to build a sales order line for a sales order
Used when extra order lines have to be added in a sale order
Used when extra order lines have to be added in a sales order
but we only know some parameters (product, price, ...), for instance,
a line for the shipping costs or the gift coupons.
Expand Down
4 changes: 2 additions & 2 deletions connector_ecommerce/tests/test_onchange.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@


class TestOnchange(common.TransactionCase):
""" Test if the onchanges are applied correctly on a sale order"""
""" Test if the onchanges are applied correctly on a sales order"""

def setUp(self):
super(TestOnchange, self).setUp()
self.session = ConnectorSession(self.cr, self.uid)

def test_play_onchange(self):
""" Play the onchange ConnectorUnit on a sale order """
""" Play the onchange ConnectorUnit on a sales order """
product_model = self.env['product.product']
partner_model = self.env['res.partner']
tax_model = self.env['account.tax']
Expand Down

0 comments on commit 628e030

Please sign in to comment.