audrius/contract
1
0
Fork 1
mirror of https://github.com/OCA/contract.git synced 2025-02-13 17:57:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

[REF] Contract Sale Invoicing: split from analytic account

Browse Source 
[REF] Contract Sale Invoicing: update translations

[IMP] - Assert that the predecessor is available for new link at uncancel

[RMV] - remove usless changes

[RMV] - Remove usless field recurring_invoices

after the total isolation between contract model and account analytic one.
recurring_invoices which was used to mark analytic account as contract became usless

[IMP] - P3 syntax

[IMP] - use @openupgrade.migrate() and openupgrade.logged_query

[IMP] - drop transient table in migration script
This commit is contained in:
Thomas Binsfeld
2019-05-29 15:33:45 +02:00
committed by Juanjo
parent 2e505ee271
commit 896c9746a7
28 changed files with 246 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
contract_sale_invoicing/i18n/ca.po
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-17 02:41+0000\n"
"POT-Creation-Date: 2019-05-29 14:59+0000\n"
"PO-Revision-Date: 2018-04-17 02:41+0000\n"
"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
"Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n"
@@ -19,18 +19,21 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. module: contract_sale_invoicing
#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account
msgid "Analytic Account"
msgstr "Compte analític"
#: model:ir.model,name:contract_sale_invoicing.model_contract_contract
msgid "Contract"
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid ""
"If checked include sales with same analytic account to invoice in contract "
"invoice creation."
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid "Invoice Pending Sales Orders"
msgstr ""
#~ msgid "Analytic Account"
#~ msgstr "Compte analític"

8
contract_sale_invoicing/i18n/contract_sale_invoicing.pot
View File

@@ -14,17 +14,17 @@ msgstr ""
"Plural-Forms: \n"
#. module: contract_sale_invoicing
#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account
msgid "Analytic Account"
#: model:ir.model,name:contract_sale_invoicing.model_contract_contract
msgid "Contract"
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid "If checked include sales with same analytic account to invoice in contract invoice creation."
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid "Invoice Pending Sales Orders"
msgstr ""

27
contract_sale_invoicing/i18n/de.po
View File

@@ -8,33 +8,32 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-17 02:41+0000\n"
"PO-Revision-Date: 2019-06-28 13:42+0000\n"
"Last-Translator: Maria Sparenberg <maria.sparenberg@gmx.net>\n"
"POT-Creation-Date: 2019-05-29 14:59+0000\n"
"PO-Revision-Date: 2018-04-17 02:41+0000\n"
"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
"Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 3.6.1\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. module: contract_sale_invoicing
#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account
msgid "Analytic Account"
msgstr "Kostenstelle"
#: model:ir.model,name:contract_sale_invoicing.model_contract_contract
msgid "Contract"
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid ""
"If checked include sales with same analytic account to invoice in contract "
"invoice creation."
msgstr ""
"Wenn der Haken gesetzt ist, dann werden alle noch abzurechnenden "
"Verkaufsaufträge mit derselben Kostenstelle bei der Rechnungserstellung für "
"den Vertrag einbezogen."
#. module: contract_sale_invoicing
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid "Invoice Pending Sales Orders"
msgstr "Ausstehende Verkaufsaufträge abrechnen"
msgstr ""
#~ msgid "Analytic Account"
#~ msgstr "Kostenstelle"

15
contract_sale_invoicing/i18n/el_GR.po
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-17 02:41+0000\n"
"POT-Creation-Date: 2019-05-29 14:59+0000\n"
"PO-Revision-Date: 2018-04-17 02:41+0000\n"
"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
"Language-Team: Greek (Greece) (https://www.transifex.com/oca/teams/23907/"
@@ -20,18 +20,21 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. module: contract_sale_invoicing
#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account
msgid "Analytic Account"
msgstr "Αναλυτικός Λογαριασμός"
#: model:ir.model,name:contract_sale_invoicing.model_contract_contract
msgid "Contract"
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid ""
"If checked include sales with same analytic account to invoice in contract "
"invoice creation."
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid "Invoice Pending Sales Orders"
msgstr ""
#~ msgid "Analytic Account"
#~ msgstr "Αναλυτικός Λογαριασμός"

15
contract_sale_invoicing/i18n/es.po
View File

@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-06 17:36+0200\n"
"POT-Creation-Date: 2019-05-29 14:59+0000\n"
"PO-Revision-Date: 2018-04-06 17:38+0200\n"
"Last-Translator: Carlos Dauden <carlos.dauden@tecnativa.com>\n"
"Language-Team: \n"
@@ -18,12 +18,12 @@ msgstr ""
"X-Generator: Poedit 1.8.7.1\n"
#. module: contract_sale_invoicing
#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account
msgid "Analytic Account"
msgstr "Cuenta analítica"
#: model:ir.model,name:contract_sale_invoicing.model_contract_contract
msgid "Contract"
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid ""
"If checked include sales with same analytic account to invoice in contract "
"invoice creation."
@@ -32,6 +32,9 @@ msgstr ""
"cuenta analítica en la creación de la factura del contrato"
#. module: contract_sale_invoicing
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid "Invoice Pending Sales Orders"
msgstr "Facturar pedidos pendientes"
#~ msgid "Analytic Account"
#~ msgstr "Cuenta analítica"

15
contract_sale_invoicing/i18n/es_MX.po
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-17 02:41+0000\n"
"POT-Creation-Date: 2019-05-29 14:59+0000\n"
"PO-Revision-Date: 2018-04-17 02:41+0000\n"
"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
"Language-Team: Spanish (Mexico) (https://www.transifex.com/oca/teams/23907/"
@@ -20,18 +20,21 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. module: contract_sale_invoicing
#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account
msgid "Analytic Account"
msgstr "Cuenta analítica"
#: model:ir.model,name:contract_sale_invoicing.model_contract_contract
msgid "Contract"
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid ""
"If checked include sales with same analytic account to invoice in contract "
"invoice creation."
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid "Invoice Pending Sales Orders"
msgstr ""
#~ msgid "Analytic Account"
#~ msgstr "Cuenta analítica"

15
contract_sale_invoicing/i18n/fi.po
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-17 02:41+0000\n"
"POT-Creation-Date: 2019-05-29 14:59+0000\n"
"PO-Revision-Date: 2018-04-17 02:41+0000\n"
"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
"Language-Team: Finnish (https://www.transifex.com/oca/teams/23907/fi/)\n"
@@ -19,18 +19,21 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. module: contract_sale_invoicing
#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account
msgid "Analytic Account"
msgstr "Analyyttinen tili"
#: model:ir.model,name:contract_sale_invoicing.model_contract_contract
msgid "Contract"
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid ""
"If checked include sales with same analytic account to invoice in contract "
"invoice creation."
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid "Invoice Pending Sales Orders"
msgstr ""
#~ msgid "Analytic Account"
#~ msgstr "Analyyttinen tili"

15
contract_sale_invoicing/i18n/fr.po
View File

@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-05 02:28+0000\n"
"POT-Creation-Date: 2019-05-29 14:59+0000\n"
"PO-Revision-Date: 2018-05-05 02:28+0000\n"
"Last-Translator: Quentin THEURET <odoo@kerpeo.com>, 2018\n"
"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n"
@@ -20,12 +20,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. module: contract_sale_invoicing
#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account
msgid "Analytic Account"
msgstr "Compte analytique"
#: model:ir.model,name:contract_sale_invoicing.model_contract_contract
msgid "Contract"
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid ""
"If checked include sales with same analytic account to invoice in contract "
"invoice creation."
@@ -34,6 +34,9 @@ msgstr ""
"de la création de facture du contrat."
#. module: contract_sale_invoicing
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid "Invoice Pending Sales Orders"
msgstr "Commandes avec une facture en attente"
#~ msgid "Analytic Account"
#~ msgstr "Compte analytique"

15
contract_sale_invoicing/i18n/gl.po
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-17 02:41+0000\n"
"POT-Creation-Date: 2019-05-29 14:59+0000\n"
"PO-Revision-Date: 2018-04-17 02:41+0000\n"
"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
"Language-Team: Galician (https://www.transifex.com/oca/teams/23907/gl/)\n"
@@ -19,18 +19,21 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. module: contract_sale_invoicing
#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account
msgid "Analytic Account"
msgstr "Conta analítica"
#: model:ir.model,name:contract_sale_invoicing.model_contract_contract
msgid "Contract"
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid ""
"If checked include sales with same analytic account to invoice in contract "
"invoice creation."
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid "Invoice Pending Sales Orders"
msgstr ""
#~ msgid "Analytic Account"
#~ msgstr "Conta analítica"

15
contract_sale_invoicing/i18n/hi_IN.po
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-17 02:41+0000\n"
"POT-Creation-Date: 2019-05-29 14:59+0000\n"
"PO-Revision-Date: 2018-04-17 02:41+0000\n"
"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
"Language-Team: Hindi (India) (https://www.transifex.com/oca/teams/23907/"
@@ -20,18 +20,21 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. module: contract_sale_invoicing
#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account
msgid "Analytic Account"
msgstr "विश्लेषणात्मक खाता"
#: model:ir.model,name:contract_sale_invoicing.model_contract_contract
msgid "Contract"
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid ""
"If checked include sales with same analytic account to invoice in contract "
"invoice creation."
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid "Invoice Pending Sales Orders"
msgstr ""
#~ msgid "Analytic Account"
#~ msgstr "विश्लेषणात्मक खाता"

15
contract_sale_invoicing/i18n/hr.po
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-17 02:41+0000\n"
"POT-Creation-Date: 2019-05-29 14:59+0000\n"
"PO-Revision-Date: 2018-04-17 02:41+0000\n"
"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n"
@@ -20,18 +20,21 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
#. module: contract_sale_invoicing
#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account
msgid "Analytic Account"
msgstr "Analitički konto"
#: model:ir.model,name:contract_sale_invoicing.model_contract_contract
msgid "Contract"
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid ""
"If checked include sales with same analytic account to invoice in contract "
"invoice creation."
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid "Invoice Pending Sales Orders"
msgstr ""
#~ msgid "Analytic Account"
#~ msgstr "Analitički konto"

15
contract_sale_invoicing/i18n/hr_HR.po
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-17 02:41+0000\n"
"POT-Creation-Date: 2019-05-29 14:59+0000\n"
"PO-Revision-Date: 2018-04-17 02:41+0000\n"
"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/"
@@ -21,18 +21,21 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
#. module: contract_sale_invoicing
#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account
msgid "Analytic Account"
msgstr "Konto analitike"
#: model:ir.model,name:contract_sale_invoicing.model_contract_contract
msgid "Contract"
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid ""
"If checked include sales with same analytic account to invoice in contract "
"invoice creation."
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid "Invoice Pending Sales Orders"
msgstr ""
#~ msgid "Analytic Account"
#~ msgstr "Konto analitike"

15
contract_sale_invoicing/i18n/hu.po
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-17 02:41+0000\n"
"POT-Creation-Date: 2019-05-29 14:59+0000\n"
"PO-Revision-Date: 2018-04-17 02:41+0000\n"
"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
"Language-Team: Hungarian (https://www.transifex.com/oca/teams/23907/hu/)\n"
@@ -19,18 +19,21 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. module: contract_sale_invoicing
#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account
msgid "Analytic Account"
msgstr "Analitikus gyűjtőkód könyvelés"
#: model:ir.model,name:contract_sale_invoicing.model_contract_contract
msgid "Contract"
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid ""
"If checked include sales with same analytic account to invoice in contract "
"invoice creation."
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid "Invoice Pending Sales Orders"
msgstr ""
#~ msgid "Analytic Account"
#~ msgstr "Analitikus gyűjtőkód könyvelés"

26
contract_sale_invoicing/i18n/it.po
View File

@@ -8,32 +8,32 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-17 02:41+0000\n"
"PO-Revision-Date: 2019-06-26 15:42+0000\n"
"Last-Translator: Sergio Zanchetta <primes2h@gmail.com>\n"
"POT-Creation-Date: 2019-05-29 14:59+0000\n"
"PO-Revision-Date: 2018-04-17 02:41+0000\n"
"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
"Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 3.6.1\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. module: contract_sale_invoicing
#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account
msgid "Analytic Account"
msgstr "Conto analitico"
#: model:ir.model,name:contract_sale_invoicing.model_contract_contract
msgid "Contract"
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid ""
"If checked include sales with same analytic account to invoice in contract "
"invoice creation."
msgstr ""
"Se selezionato, in fase di creazione del contratto aggiunge alla fattura le "
"vendite con lo stesso conto analitico."
#. module: contract_sale_invoicing
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid "Invoice Pending Sales Orders"
msgstr "Ordini di vendita in sospeso della fattura"
msgstr ""
#~ msgid "Analytic Account"
#~ msgstr "Conto Analitico"

15
contract_sale_invoicing/i18n/nl.po
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-17 02:41+0000\n"
"POT-Creation-Date: 2019-05-29 14:59+0000\n"
"PO-Revision-Date: 2018-04-17 02:41+0000\n"
"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
"Language-Team: Dutch (https://www.transifex.com/oca/teams/23907/nl/)\n"
@@ -19,18 +19,21 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. module: contract_sale_invoicing
#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account
msgid "Analytic Account"
msgstr "Kostenplaats"
#: model:ir.model,name:contract_sale_invoicing.model_contract_contract
msgid "Contract"
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid ""
"If checked include sales with same analytic account to invoice in contract "
"invoice creation."
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid "Invoice Pending Sales Orders"
msgstr ""
#~ msgid "Analytic Account"
#~ msgstr "Kostenplaats"

16
contract_sale_invoicing/i18n/pt.po
View File

@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-17 02:41+0000\n"
"PO-Revision-Date: 2019-08-14 13:44+0000\n"
"Last-Translator: Pedro Castro Silva <pedrocs@exo.pt>\n"
"POT-Creation-Date: 2019-05-29 14:59+0000\n"
"PO-Revision-Date: 2018-04-17 02:41+0000\n"
"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
"Language-Team: Portuguese (https://www.transifex.com/oca/teams/23907/pt/)\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
@@ -20,12 +20,12 @@ msgstr ""
"X-Generator: Weblate 3.7.1\n"
#. module: contract_sale_invoicing
#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account
msgid "Analytic Account"
msgstr "Conta Analítica"
#: model:ir.model,name:contract_sale_invoicing.model_contract_contract
msgid "Contract"
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid ""
"If checked include sales with same analytic account to invoice in contract "
"invoice creation."
@@ -34,6 +34,6 @@ msgstr ""
"faturas do contrato."
#. module: contract_sale_invoicing
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid "Invoice Pending Sales Orders"
msgstr "Faturar Encomendas de Venda Pendentes"

17
contract_sale_invoicing/i18n/pt_BR.po
View File

@@ -9,8 +9,8 @@ msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-17 02:41+0000\n"
"PO-Revision-Date: 2019-09-03 03:23+0000\n"
"Last-Translator: Rodrigo Macedo <rmsolucoeseminformatic4@gmail.com>\n"
"PO-Revision-Date: 2019-10-10 20:36+0000\n"
"Last-Translator: Eder Brito <britoederr@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/"
"23907/pt_BR/)\n"
"Language: pt_BR\n"
@@ -21,12 +21,12 @@ msgstr ""
"X-Generator: Weblate 3.8\n"
#. module: contract_sale_invoicing
#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account
msgid "Analytic Account"
msgstr "Conta Analítica"
#: model:ir.model,name:contract_sale_invoicing.model_contract_contract
msgid "Contract"
msgstr "Contrato"
#. module: contract_sale_invoicing
#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid ""
"If checked include sales with same analytic account to invoice in contract "
"invoice creation."
@@ -35,6 +35,9 @@ msgstr ""
"criação da fatura do contrato."
#. module: contract_sale_invoicing
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid "Invoice Pending Sales Orders"
msgstr "Ordens de venda pendentes da fatura"
#~ msgid "Analytic Account"
#~ msgstr "Conta Analítica"

15
contract_sale_invoicing/i18n/pt_PT.po
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-17 02:41+0000\n"
"POT-Creation-Date: 2019-05-29 14:59+0000\n"
"PO-Revision-Date: 2018-04-17 02:41+0000\n"
"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/"
@@ -20,18 +20,21 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. module: contract_sale_invoicing
#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account
msgid "Analytic Account"
msgstr "Conta Analítica"
#: model:ir.model,name:contract_sale_invoicing.model_contract_contract
msgid "Contract"
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid ""
"If checked include sales with same analytic account to invoice in contract "
"invoice creation."
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid "Invoice Pending Sales Orders"
msgstr ""
#~ msgid "Analytic Account"
#~ msgstr "Conta Analítica"

15
contract_sale_invoicing/i18n/ro.po
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-17 02:41+0000\n"
"POT-Creation-Date: 2019-05-29 14:59+0000\n"
"PO-Revision-Date: 2018-04-17 02:41+0000\n"
"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
"Language-Team: Romanian (https://www.transifex.com/oca/teams/23907/ro/)\n"
@@ -20,18 +20,21 @@ msgstr ""
"2:1));\n"
#. module: contract_sale_invoicing
#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account
msgid "Analytic Account"
msgstr "Cont analitic"
#: model:ir.model,name:contract_sale_invoicing.model_contract_contract
msgid "Contract"
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid ""
"If checked include sales with same analytic account to invoice in contract "
"invoice creation."
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid "Invoice Pending Sales Orders"
msgstr ""
#~ msgid "Analytic Account"
#~ msgstr "Cont analitic"

15
contract_sale_invoicing/i18n/sk_SK.po
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-17 02:41+0000\n"
"POT-Creation-Date: 2019-05-29 14:59+0000\n"
"PO-Revision-Date: 2018-04-17 02:41+0000\n"
"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
"Language-Team: Slovak (Slovakia) (https://www.transifex.com/oca/teams/23907/"
@@ -20,18 +20,21 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
#. module: contract_sale_invoicing
#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account
msgid "Analytic Account"
msgstr "Analytický účet"
#: model:ir.model,name:contract_sale_invoicing.model_contract_contract
msgid "Contract"
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid ""
"If checked include sales with same analytic account to invoice in contract "
"invoice creation."
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid "Invoice Pending Sales Orders"
msgstr ""
#~ msgid "Analytic Account"
#~ msgstr "Analytický účet"

15
contract_sale_invoicing/i18n/sl.po
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-17 02:41+0000\n"
"POT-Creation-Date: 2019-05-29 14:59+0000\n"
"PO-Revision-Date: 2018-04-17 02:41+0000\n"
"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
"Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n"
@@ -20,18 +20,21 @@ msgstr ""
"%100==4 ? 2 : 3);\n"
#. module: contract_sale_invoicing
#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account
msgid "Analytic Account"
msgstr "Analitični konto"
#: model:ir.model,name:contract_sale_invoicing.model_contract_contract
msgid "Contract"
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid ""
"If checked include sales with same analytic account to invoice in contract "
"invoice creation."
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid "Invoice Pending Sales Orders"
msgstr ""
#~ msgid "Analytic Account"
#~ msgstr "Analitični konto"

15
contract_sale_invoicing/i18n/tr.po
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-17 02:41+0000\n"
"POT-Creation-Date: 2019-05-29 14:59+0000\n"
"PO-Revision-Date: 2018-04-17 02:41+0000\n"
"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
"Language-Team: Turkish (https://www.transifex.com/oca/teams/23907/tr/)\n"
@@ -19,18 +19,21 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. module: contract_sale_invoicing
#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account
msgid "Analytic Account"
msgstr "Analitik Hesap"
#: model:ir.model,name:contract_sale_invoicing.model_contract_contract
msgid "Contract"
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid ""
"If checked include sales with same analytic account to invoice in contract "
"invoice creation."
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid "Invoice Pending Sales Orders"
msgstr ""
#~ msgid "Analytic Account"
#~ msgstr "Analitik Hesap"

15
contract_sale_invoicing/i18n/tr_TR.po
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-17 02:41+0000\n"
"POT-Creation-Date: 2019-05-29 14:59+0000\n"
"PO-Revision-Date: 2018-04-17 02:41+0000\n"
"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
"Language-Team: Turkish (Turkey) (https://www.transifex.com/oca/teams/23907/"
@@ -20,18 +20,21 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. module: contract_sale_invoicing
#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account
msgid "Analytic Account"
msgstr "Analitik Hesap"
#: model:ir.model,name:contract_sale_invoicing.model_contract_contract
msgid "Contract"
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid ""
"If checked include sales with same analytic account to invoice in contract "
"invoice creation."
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid "Invoice Pending Sales Orders"
msgstr ""
#~ msgid "Analytic Account"
#~ msgstr "Analitik Hesap"

15
contract_sale_invoicing/i18n/zh.po
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-27 01:12+0000\n"
"POT-Creation-Date: 2019-05-29 14:59+0000\n"
"PO-Revision-Date: 2018-04-27 01:12+0000\n"
"Last-Translator: DIT INTL <ditintlgroup@gmail.com>, 2018\n"
"Language-Team: Chinese (https://www.transifex.com/oca/teams/23907/zh/)\n"
@@ -19,18 +19,21 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#. module: contract_sale_invoicing
#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account
msgid "Analytic Account"
msgstr "分析会计"
#: model:ir.model,name:contract_sale_invoicing.model_contract_contract
msgid "Contract"
msgstr ""
#. module: contract_sale_invoicing
#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid ""
"If checked include sales with same analytic account to invoice in contract "
"invoice creation."
msgstr "如果选中，则在销售发票中包含分析帐户。"
#. module: contract_sale_invoicing
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid "Invoice Pending Sales Orders"
msgstr "发票挂起的销售订单"
#~ msgid "Analytic Account"
#~ msgstr "分析会计"

15
contract_sale_invoicing/i18n/zh_CN.po
View File

@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-17 02:41+0000\n"
"PO-Revision-Date: 2019-09-05 19:23+0000\n"
"PO-Revision-Date: 2019-09-17 18:24+0000\n"
"Last-Translator: 黎伟杰 <674416404@qq.com>\n"
"Language-Team: Chinese (China) (https://www.transifex.com/oca/teams/23907/"
"zh_CN/)\n"
@@ -21,18 +21,21 @@ msgstr ""
"X-Generator: Weblate 3.8\n"
#. module: contract_sale_invoicing
#: model:ir.model,name:contract_sale_invoicing.model_account_analytic_account
msgid "Analytic Account"
msgstr "分析账户"
#: model:ir.model,name:contract_sale_invoicing.model_contract_contract
msgid "Contract"
msgstr "合同"
#. module: contract_sale_invoicing
#: model:ir.model.fields,help:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,help:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid ""
"If checked include sales with same analytic account to invoice in contract "
"invoice creation."
msgstr "如果选中，则在合同发票创建中包含具有相同分析帐户的销售。"
#. module: contract_sale_invoicing
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_account_analytic_account__invoicing_sales
#: model:ir.model.fields,field_description:contract_sale_invoicing.field_contract_contract__invoicing_sales
msgid "Invoice Pending Sales Orders"
msgstr "待处理销售订单的发票"
#~ msgid "Analytic Account"
#~ msgstr "分析账户"

15
contract_sale_invoicing/models/contract.py
View File

@@ -4,8 +4,8 @@
from odoo import api, fields, models
class AccountAnalyticAccount(models.Model):
_inherit = 'account.analytic.account'
class ContractContract(models.Model):
_inherit = 'contract.contract'
invoicing_sales = fields.Boolean(
string='Invoice Pending Sales Orders',
@@ -14,11 +14,12 @@ class AccountAnalyticAccount(models.Model):
)
@api.multi
def _create_invoice(self, invoice=False):
def _recurring_create_invoice(self, date_ref=False):
invoices = super()._recurring_create_invoice(date_ref)
if not self.invoicing_sales:
return super(AccountAnalyticAccount, self)._create_invoice()
return invoices
sales = self.env['sale.order'].search([
('analytic_account_id', '=', self.id),
('analytic_account_id', '=', self.analytic_account_id.id),
('partner_invoice_id', 'child_of',
self.partner_id.commercial_partner_id.ids),
('invoice_status', '=', 'to invoice'),
@@ -27,6 +28,4 @@ class AccountAnalyticAccount(models.Model):
])
if sales:
invoice_ids = sales.action_invoice_create()
invoice = self.env['account.invoice'].browse(invoice_ids)[:1]
return super(AccountAnalyticAccount, self)._create_invoice(
invoice=invoice)
invoices |= self.env['account.invoice'].browse(invoice_ids)[:1]

4
contract_sale_invoicing/tests/test_contract_sale_invoicing.py
View File

@@ -8,6 +8,8 @@ class TestContractSaleInvoicing(TestContractBase):
@classmethod
def setUpClass(cls):
super(TestContractSaleInvoicing, cls).setUpClass()
cls.contract.analytic_account_id = \
cls.env['account.analytic.account'].search([], limit=1)
cls.product_so = cls.env.ref(
'product.product_product_1')
cls.product_so.invoice_policy = 'order'
@@ -21,7 +23,7 @@ class TestContractSaleInvoicing(TestContractBase):
'product_uom': cls.product_so.uom_id.id,
'price_unit': cls.product_so.list_price})],
'pricelist_id': cls.partner.property_product_pricelist.id,
'analytic_account_id': cls.contract.id,
'analytic_account_id': cls.contract.analytic_account_id.id,
'date_order': '2016-02-15',
})

6
contract_sale_invoicing/views/contract_view.xml
View File

@@ -4,9 +4,9 @@
<odoo>
<record id="account_analytic_account_recurring_form_form" model="ir.ui.view">
<field name="model">account.analytic.account</field>
<field name="inherit_id" ref="contract.account_analytic_account_recurring_form_form"/>
<record id="contract_contract_form_view" model="ir.ui.view">
<field name="model">contract.contract</field>
<field name="inherit_id" ref="contract.contract_contract_form_view"/>
<field name="arch" type="xml">
<field name="recurring_next_date" position="after">
<field name="invoicing_sales"/>