Skip to content

Commit

Permalink
Recreate pickings doesn't show View Delivery Orders button
Browse files Browse the repository at this point in the history
* Fix OCA#264
* Fix : Can't create delivery from shipping exception
  • Loading branch information
Kinner Vachhani authored and MiquelRForgeFlow committed Dec 10, 2018
1 parent e0eea29 commit 79f6541
Show file tree
Hide file tree
Showing 6 changed files with 148 additions and 4 deletions.
33 changes: 33 additions & 0 deletions sale_procurement_group_by_line/i18n/ca.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * sale_procurement_group_by_line
#
# Translators:
msgid ""
msgstr ""
"Project-Id-Version: sale-workflow (8.0)\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-01-14 06:38+0000\n"
"PO-Revision-Date: 2015-09-03 07:09+0000\n"
"Last-Translator: <>\n"
"Language-Team: Catalan (http://www.transifex.com/oca/OCA-sale-workflow-8-0/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#. module: sale_procurement_group_by_line
#: field:sale.order.line,procurement_group_id:0
msgid "Procurement group"
msgstr ""

#. module: sale_procurement_group_by_line
#: model:ir.model,name:sale_procurement_group_by_line.model_sale_order
msgid "Sales Order"
msgstr "Comandes de venda"

#. module: sale_procurement_group_by_line
#: model:ir.model,name:sale_procurement_group_by_line.model_sale_order_line
msgid "Sales Order Line"
msgstr "Línia de comanda de vendes"
33 changes: 33 additions & 0 deletions sale_procurement_group_by_line/i18n/hu.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * sale_procurement_group_by_line
#
# Translators:
msgid ""
msgstr ""
"Project-Id-Version: sale-workflow (8.0)\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-12-10 05:55+0000\n"
"PO-Revision-Date: 2015-09-03 07:09+0000\n"
"Last-Translator: <>\n"
"Language-Team: Hungarian (http://www.transifex.com/oca/OCA-sale-workflow-8-0/language/hu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Language: hu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#. module: sale_procurement_group_by_line
#: field:sale.order.line,procurement_group_id:0
msgid "Procurement group"
msgstr ""

#. module: sale_procurement_group_by_line
#: model:ir.model,name:sale_procurement_group_by_line.model_sale_order
msgid "Sales Order"
msgstr "Vevői megrendelés"

#. module: sale_procurement_group_by_line
#: model:ir.model,name:sale_procurement_group_by_line.model_sale_order_line
msgid "Sales Order Line"
msgstr ""
33 changes: 33 additions & 0 deletions sale_procurement_group_by_line/i18n/pt_BR.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * sale_procurement_group_by_line
#
# Translators:
msgid ""
msgstr ""
"Project-Id-Version: sale-workflow (8.0)\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-12-10 05:55+0000\n"
"PO-Revision-Date: 2015-09-03 07:09+0000\n"
"Last-Translator: <>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-sale-workflow-8-0/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"

#. module: sale_procurement_group_by_line
#: field:sale.order.line,procurement_group_id:0
msgid "Procurement group"
msgstr ""

#. module: sale_procurement_group_by_line
#: model:ir.model,name:sale_procurement_group_by_line.model_sale_order
msgid "Sales Order"
msgstr "Pedido de Venda"

#. module: sale_procurement_group_by_line
#: model:ir.model,name:sale_procurement_group_by_line.model_sale_order_line
msgid "Sales Order Line"
msgstr ""
12 changes: 8 additions & 4 deletions sale_procurement_group_by_line/i18n/tr.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@
# * sale_procurement_group_by_line
#
# Translators:
# Ahmet Altinisik <[email protected]>, 2017
# Hotellook, 2014
# Matjaž Mozetič <[email protected]>, 2015
# Thomas A. Jaeger, 2015
msgid ""
msgstr ""
"Project-Id-Version: sale-workflow (8.0)\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-12-05 23:35+0000\n"
"PO-Revision-Date: 2015-09-03 07:09+0000\n"
"Last-Translator: <>\n"
"POT-Creation-Date: 2017-01-14 06:38+0000\n"
"PO-Revision-Date: 2017-01-16 19:28+0000\n"
"Last-Translator: Ahmet Altinisik <[email protected]>\n"
"Language-Team: Turkish (http://www.transifex.com/oca/OCA-sale-workflow-8-0/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand All @@ -30,4 +34,4 @@ msgstr "Sipariş Emri"
#. module: sale_procurement_group_by_line
#: model:ir.model,name:sale_procurement_group_by_line.model_sale_order_line
msgid "Sales Order Line"
msgstr ""
msgstr "Sipariş Kalemi"
34 changes: 34 additions & 0 deletions sale_procurement_group_by_line/i18n/tr_TR.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * sale_procurement_group_by_line
#
# Translators:
# Ozge Altinisik <[email protected]>, 2017
msgid ""
msgstr ""
"Project-Id-Version: sale-workflow (8.0)\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-01-04 10:48+0000\n"
"PO-Revision-Date: 2017-01-06 08:11+0000\n"
"Last-Translator: Ozge Altinisik <[email protected]>\n"
"Language-Team: Turkish (Turkey) (http://www.transifex.com/oca/OCA-sale-workflow-8-0/language/tr_TR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Language: tr_TR\n"
"Plural-Forms: nplurals=1; plural=0;\n"

#. module: sale_procurement_group_by_line
#: field:sale.order.line,procurement_group_id:0
msgid "Procurement group"
msgstr "Satınalma grubu"

#. module: sale_procurement_group_by_line
#: model:ir.model,name:sale_procurement_group_by_line.model_sale_order
msgid "Sales Order"
msgstr "Satış emri"

#. module: sale_procurement_group_by_line
#: model:ir.model,name:sale_procurement_group_by_line.model_sale_order_line
msgid "Sales Order Line"
msgstr "Sipariş emri satırı "
7 changes: 7 additions & 0 deletions sale_procurement_group_by_line/model/sale.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,12 @@ def action_ship_create(self, cr, uid, ids, context=None):
groups = {}

for line in order.order_line:
if order.state == 'shipping_except':
groups[line._get_procurement_group_key()] = \
line.procurement_group_id.id

group_id = groups.get(line._get_procurement_group_key())

if not group_id:
vals = self._prepare_procurement_group_by_line(
cr, uid, line, context=context)
Expand All @@ -70,6 +75,8 @@ def action_ship_create(self, cr, uid, ids, context=None):
# trigger another move
proc_ids += [x.id for x in line.procurement_ids
if x.state in ('exception', 'cancel')]
procurement_obj.reset_to_confirmed(cr, uid, proc_ids,
context=context)
elif sale_line_obj.need_procurement(cr, uid, [line.id],
context=context):
if (line.state == 'done') or not line.product_id:
Expand Down

0 comments on commit 79f6541

Please sign in to comment.