Skip to content

Commit 9e1ec38

Browse files
OCA-git-botOCA-git-bot
committed
Merge PR OCA#2733 into 17.0
Signed-off-by pedrobaeza
2 parents ed1cd3e + c6bde91 commit 9e1ec38

5 files changed

Lines changed: 64 additions & 54 deletions

File tree

‎purchase_request/data/purchase_request_data.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,18 @@
2727
<field name="default" eval="True" />
2828
<field name="description">Purchase Request is done</field>
2929
</record>
30+
<record id="mt_request_po_confirmed" model="mail.message.subtype">
31+
<field name="name">Purchase Order confirmation</field>
32+
<field name="res_model">purchase.request</field>
33+
<field name="default" eval="True" />
34+
<field name="internal" eval="True" />
35+
<field name="description">Purchase Order is confirmed</field>
36+
</record>
37+
<record id="mt_request_picking_done" model="mail.message.subtype">
38+
<field name="name">Purchase receipt confirmation</field>
39+
<field name="res_model">purchase.request</field>
40+
<field name="default" eval="True" />
41+
<field name="internal" eval="True" />
42+
<field name="description">Receipt is done</field>
43+
</record>
3044
</odoo>

‎purchase_request/i18n/es.po‎

Lines changed: 20 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -825,6 +825,11 @@ msgstr "Línea de compra"
825825
msgid "Purchase Order"
826826
msgstr "Orden de compra"
827827

828+
#. module: purchase_request
829+
#: model:mail.message.subtype,name:purchase_request.mt_request_po_confirmed
830+
msgid "Purchase Order confirmation"
831+
msgstr "Pedido de compra confirmado"
832+
828833
#. module: purchase_request
829834
#: model:ir.model,name:purchase_request.model_purchase_order_line
830835
msgid "Purchase Order Line"
@@ -838,6 +843,11 @@ msgstr "Línea de Orden de Compra"
838843
msgid "Purchase Order Lines"
839844
msgstr "Líneas de Orden de compra"
840845

846+
#. module: purchase_request
847+
#: model:mail.message.subtype,description:purchase_request.mt_request_po_confirmed
848+
msgid "Purchase Order is confirmed"
849+
msgstr "El pedido de compra está confirmado"
850+
841851
#. module: purchase_request
842852
#: model_terms:ir.ui.view,arch_db:purchase_request.view_purchase_request_form
843853
msgid "Purchase Orders"
@@ -1055,6 +1065,11 @@ msgstr "SdP"
10551065
msgid "RFQ/PO Qty"
10561066
msgstr "Cantidad compra"
10571067

1068+
#. module: purchase_request
1069+
#: model:mail.message.subtype,name:purchase_request.mt_request_picking_done
1070+
msgid "Purchase receipt confirmation"
1071+
msgstr "Recepción de compra confirmada"
1072+
10581073
#. module: purchase_request
10591074
#. odoo-python
10601075
#: code:addons/purchase_request/models/stock_move_line.py:0
@@ -1070,6 +1085,11 @@ msgstr ""
10701085
msgid "Receipt confirmation for Request %s"
10711086
msgstr "Confirmación de recepción de la solicitud %s"
10721087

1088+
#. module: purchase_request
1089+
#: model:mail.message.subtype,description:purchase_request.mt_request_picking_done
1090+
msgid "Receipt is done"
1091+
msgstr "Recepción hecha"
1092+
10731093
#. module: purchase_request
10741094
#: model_terms:ir.ui.view,arch_db:purchase_request.view_purchase_request_form
10751095
msgid "Reject"
@@ -1512,52 +1532,3 @@ msgstr "Debe seleccionar líneas del mismo tipo de recogida."
15121532
#, python-format
15131533
msgid "You have to select lines from the same company."
15141534
msgstr "Debe seleccionar líneas de la misma compañía."
1515-
1516-
#~ msgid "SMS Delivery error"
1517-
#~ msgstr "Error en la entrega de SMS"
1518-
1519-
#~ msgid "Analytic"
1520-
#~ msgstr "Analítica"
1521-
1522-
#~ msgid "Last Modified on"
1523-
#~ msgstr "Última modificación en"
1524-
1525-
#~ msgid "Main Attachment"
1526-
#~ msgstr "Archivo adjunto principal"
1527-
1528-
#~ msgid "Number of messages which requires an action"
1529-
#~ msgstr "Número de mensajes que requieren una acción"
1530-
1531-
#~ msgid "<strong>Analytic Account</strong>"
1532-
#~ msgstr "<strong>Cuenta analítica</strong>"
1533-
1534-
#~ msgid "Analytic Account"
1535-
#~ msgstr "Cuenta analítica"
1536-
1537-
#, fuzzy
1538-
#~ msgid "Number of unread messages"
1539-
#~ msgstr "Mensajes no leídos"
1540-
1541-
#, fuzzy
1542-
#~ msgid "Product Template"
1543-
#~ msgstr "Producto"
1544-
1545-
#, fuzzy
1546-
#~ msgid "Unread Messages Counter"
1547-
#~ msgstr "Mensajes no leídos"
1548-
1549-
#~ msgid "<li><b>%s</b>: Ordered quantity %s %s, Planned date %s</li>"
1550-
#~ msgstr "<li><b>%s</b>: Cantidad pedida %s %s, Fecha planificada %s</li>"
1551-
1552-
#~ msgid "<li><b>%s</b>: Received quantity %s %s</li>"
1553-
#~ msgstr "<li><b>%s</b>: Cantidad recibida %s %s</li>"
1554-
1555-
#~ msgid "<li><b>%s</b>: Transferred quantity %s %s</li>"
1556-
#~ msgstr "<li><b>%s</b>: Cantidad transferida %s %s</li>"
1557-
1558-
#~ msgid "Product Unit of Measure"
1559-
#~ msgstr "Unidad de medida"
1560-
1561-
#, fuzzy
1562-
#~ msgid "Procurement Rule"
1563-
#~ msgstr "Abastecimiento"

‎purchase_request/i18n/purchase_request.pot‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -681,6 +681,11 @@ msgstr ""
681681
msgid "Order Reference"
682682
msgstr ""
683683

684+
#. module: purchase_request
685+
#: model:mail.message.subtype,name:purchase_request.mt_request_po_confirmed
686+
msgid "Order confirmation"
687+
msgstr ""
688+
684689
#. module: purchase_request
685690
#. odoo-python
686691
#: code:addons/purchase_request/models/purchase_order.py:0
@@ -797,6 +802,11 @@ msgstr ""
797802
msgid "Purchase Order Lines"
798803
msgstr ""
799804

805+
#. module: purchase_request
806+
#: model:mail.message.subtype,description:purchase_request.mt_request_po_confirmed
807+
msgid "Purchase Order is confirmed"
808+
msgstr ""
809+
800810
#. module: purchase_request
801811
#: model_terms:ir.ui.view,arch_db:purchase_request.view_purchase_request_form
802812
msgid "Purchase Orders"
@@ -1010,6 +1020,11 @@ msgstr ""
10101020
msgid "RFQ/PO Qty"
10111021
msgstr ""
10121022

1023+
#. module: purchase_request
1024+
#: model:mail.message.subtype,name:purchase_request.mt_request_picking_done
1025+
msgid "Receipt confirmation"
1026+
msgstr ""
1027+
10131028
#. module: purchase_request
10141029
#. odoo-python
10151030
#: code:addons/purchase_request/models/stock_move_line.py:0
@@ -1025,6 +1040,11 @@ msgstr ""
10251040
msgid "Receipt confirmation for Request %s"
10261041
msgstr ""
10271042

1043+
#. module: purchase_request
1044+
#: model:mail.message.subtype,description:purchase_request.mt_request_picking_done
1045+
msgid "Receipt is done"
1046+
msgstr ""
1047+
10281048
#. module: purchase_request
10291049
#: model_terms:ir.ui.view,arch_db:purchase_request.view_purchase_request_form
10301050
msgid "Reject"

‎purchase_request/models/purchase_order.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ def _purchase_request_confirm_message(self):
6464
)
6565
request.message_post(
6666
body=message,
67-
subtype_id=self.env.ref("mail.mt_note").id,
67+
subtype_id=self.env.ref(
68+
"purchase_request.mt_request_po_confirmed"
69+
).id,
6870
)
6971
return True
7072

‎purchase_request/models/stock_move_line.py‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,13 @@ def allocate(self):
109109
message = self._purchase_request_confirm_done_message_content(
110110
message_data
111111
)
112-
request.message_post(
113-
body=message,
114-
subtype_id=self.env.ref("mail.mt_note").id,
115-
)
112+
if message:
113+
request.message_post(
114+
body=message,
115+
subtype_id=self.env.ref(
116+
"purchase_request.mt_request_picking_done"
117+
).id,
118+
)
116119

117120
picking_message = self._picking_confirm_done_message_content(
118121
message_data

0 commit comments

Comments
 (0)