diff --git a/pos_picking_load/__init__.py b/pos_picking_load/__init__.py index 042e239e..0650744f 100644 --- a/pos_picking_load/__init__.py +++ b/pos_picking_load/__init__.py @@ -1,2 +1 @@ -# coding: utf-8 from . import models diff --git a/pos_picking_load/__manifest__.py b/pos_picking_load/__manifest__.py index 03e1df52..22dd40cf 100644 --- a/pos_picking_load/__manifest__.py +++ b/pos_picking_load/__manifest__.py @@ -1,22 +1,20 @@ -# coding: utf-8 # Copyright (C) 2017 - Today: GRAP (http://www.grap.coop) # @author: Sylvain LE GAL (https://twitter.com/legalsylvain) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - { 'name': 'Point Of Sale - Picking Load', 'summary': "Load and confirm stock pickings via Point Of Sale", - 'version': '10.0.1.0.0', - 'author': 'GRAP,Odoo Community Association (OCA)', + 'version': '12.0.1.0.0', 'category': 'Point Of Sale', + 'author': 'GRAP,Odoo Community Association (OCA)', + 'website': 'https://www.github.com/OCA/pos', 'license': 'AGPL-3', 'maintainers': ['legalsylvain'], 'development_status': 'Beta', 'depends': [ - 'sale', + 'sale_stock', 'point_of_sale', ], - 'website': 'https://odoo-community.org/', 'data': [ 'views/view_pos_config.xml', 'views/view_sale_order.xml', @@ -26,6 +24,7 @@ ], 'demo': [ 'demo/res_groups.xml', + 'demo/res_partner.xml', 'demo/product_template.xml', 'demo/sale_order.xml', 'demo/stock_picking_type.xml', diff --git a/pos_picking_load/demo/product_template.xml b/pos_picking_load/demo/product_template.xml index a8da3db8..e0ab1af6 100644 --- a/pos_picking_load/demo/product_template.xml +++ b/pos_picking_load/demo/product_template.xml @@ -1,4 +1,4 @@ - + @@ -28,4 +28,4 @@ - + diff --git a/pos_picking_load/demo/res_groups.xml b/pos_picking_load/demo/res_groups.xml index 158b505f..536f8277 100644 --- a/pos_picking_load/demo/res_groups.xml +++ b/pos_picking_load/demo/res_groups.xml @@ -1,7 +1,7 @@ - + - + - + diff --git a/pos_picking_load/demo/res_partner.xml b/pos_picking_load/demo/res_partner.xml new file mode 100644 index 00000000..003186de --- /dev/null +++ b/pos_picking_load/demo/res_partner.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/pos_picking_load/demo/sale_order.xml b/pos_picking_load/demo/sale_order.xml index 13ce0f98..b66fe72f 100644 --- a/pos_picking_load/demo/sale_order.xml +++ b/pos_picking_load/demo/sale_order.xml @@ -1,4 +1,4 @@ - + @@ -50,4 +50,4 @@ - + diff --git a/pos_picking_load/demo/stock_picking_type.xml b/pos_picking_load/demo/stock_picking_type.xml index e4c35380..b4db6e5b 100644 --- a/pos_picking_load/demo/stock_picking_type.xml +++ b/pos_picking_load/demo/stock_picking_type.xml @@ -1,7 +1,7 @@ - + - + diff --git a/pos_picking_load/i18n/fr.po b/pos_picking_load/i18n/fr.po index dacf7c40..3809398d 100644 --- a/pos_picking_load/i18n/fr.po +++ b/pos_picking_load/i18n/fr.po @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.0\n" +"Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-06 18:33+0000\n" -"PO-Revision-Date: 2019-01-06 18:33+0000\n" +"POT-Creation-Date: 2019-07-11 09:49+0000\n" +"PO-Revision-Date: 2019-07-11 09:49+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -17,109 +17,129 @@ msgstr "" #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/js/widget.js:242 +#: code:addons/pos_picking_load/static/src/js/widget.js:274 #, python-format msgid "A picking is still loaded. You can not load another picking. Please create a new order." msgstr "Un BL est déjà chargé. Vous ne pouvez pas en charger un autre. Veuillez créer une nouvelle commande." #. module: pos_picking_load -#: model:ir.model.fields,field_description:pos_picking_load.field_stock_picking_type_available_in_pos +#: model:ir.model.fields,field_description:pos_picking_load.field_stock_picking_type__available_in_pos msgid "Available in Point Of Sale" msgstr "Disponible dans le point de vente" #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/js/widget.js:211 +#: code:addons/pos_picking_load/static/src/js/widget.js:243 #, python-format msgid "Can not execute this action because the POS is currently offline" -msgstr "" -"Impossible de réaliser cette action car le point de vente est actuellement " -"hors ligne" +msgstr "Impossible de réaliser cette action car le point de vente est actuellement hors ligne" #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:27 +#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:25 #, python-format msgid "Cancel" msgstr "Annuler" #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/js/widget.js:210 +#: code:addons/pos_picking_load/static/src/js/widget.js:242 #, python-format msgid "Connection error" msgstr "Erreur de connexion" #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:53 +#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:51 #, python-format msgid "Customer" msgstr "Client" #. module: pos_picking_load -#: model:ir.model.fields,field_description:pos_picking_load.field_sale_order_final_pos_order_id -#: model:ir.model.fields,field_description:pos_picking_load.field_stock_picking_final_pos_order_id +#: model_terms:ir.ui.view,arch_db:pos_picking_load.view_pos_config_form +msgid "Enable the possibility to load pickings in the Point of Sale" +msgstr "Activer la possibilité de charger des bons de livraison dans le point de vente" + +#. module: pos_picking_load +#: model:ir.model.fields,field_description:pos_picking_load.field_sale_order__final_pos_order_id +#: model:ir.model.fields,field_description:pos_picking_load.field_stock_picking__final_pos_order_id msgid "Final PoS Order" msgstr "Commande Finale" #. module: pos_picking_load -#: model:ir.model.fields,help:pos_picking_load.field_stock_picking_type_available_in_pos +#: model:ir.model.fields,help:pos_picking_load.field_stock_picking_type__available_in_pos msgid "If checked, associated pickings will be available in the point of sale, to be changed and paid in it" msgstr "Si la case est cochée, toutes les bons de livraisons associés seront disponible dans le point de vente, pour ere changé et payé au sein de celui-ci" #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/js/widget.js:253 +#: code:addons/pos_picking_load/static/src/js/widget.js:285 #, python-format msgid "Load Picking" msgstr "Charger un bon de livraison" #. module: pos_picking_load -#: model:ir.model.fields,field_description:pos_picking_load.field_pos_config_iface_load_picking +#: model:ir.model.fields,field_description:pos_picking_load.field_pos_config__iface_load_picking +#: model_terms:ir.ui.view,arch_db:pos_picking_load.view_pos_config_form msgid "Load Pickings" msgstr "Charger des bons de livraison" #. module: pos_picking_load -#: model:ir.model.fields,field_description:pos_picking_load.field_pos_config_iface_load_picking_max_qty +#: model:ir.model.fields,field_description:pos_picking_load.field_pos_config__iface_load_picking_max_qty +#: model_terms:ir.ui.view,arch_db:pos_picking_load.view_pos_config_form msgid "Max Picking Quantity To Load" msgstr "Quantité maximum de BL à charger" #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:52 +#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:50 #, python-format msgid "Name" msgstr "Nom" #. module: pos_picking_load -#: model:ir.model.fields,field_description:pos_picking_load.field_pos_order_origin_picking_id +#: model:ir.model.fields,field_description:pos_picking_load.field_pos_order__origin_picking_id msgid "Origin Picking" msgstr "Livraison d'origine" #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:74 -#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:82 +#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:72 +#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:80 #, python-format msgid "Origin Picking:" msgstr "BL d'origine:" #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/js/widget.js:241 +#: code:addons/pos_picking_load/static/src/js/widget.js:273 #, python-format msgid "Pending Picking" -msgstr "BL en cours +msgstr "BL en cours" + +#. module: pos_picking_load +#: model_terms:ir.ui.view,arch_db:pos_picking_load.view_pos_config_form +msgid "Picking Load" +msgstr "Chargement de bon de livraison" #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/js/widget.js:131 -#: code:addons/pos_picking_load/static/src/js/widget.js:147 +#: code:addons/pos_picking_load/static/src/js/widget.js:150 +#: code:addons/pos_picking_load/static/src/js/widget.js:166 #, python-format msgid "Picking Still Loaded" msgstr "Bon de livraison déjà chargé" +#. module: pos_picking_load +#: model:ir.model,name:pos_picking_load.model_stock_picking_type +msgid "Picking Type" +msgstr "Type de préparation" + +#. module: pos_picking_load +#: model:ir.model,name:pos_picking_load.model_pos_config +msgid "Point of Sale Configuration" +msgstr "Paramétrage du point de vente" + #. module: pos_picking_load #: model:ir.model,name:pos_picking_load.model_pos_order msgid "Point of Sale Orders" @@ -127,63 +147,58 @@ msgstr "Commandes du point de vente" #. module: pos_picking_load #: model:ir.model,name:pos_picking_load.model_sale_order -msgid "Sales Order" +msgid "Sale Order" msgstr "Bon de commande" #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:54 +#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:52 #, python-format msgid "Scheduled Date" msgstr "Date prévue" #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:35 +#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:33 #, python-format msgid "Search Picking" msgstr "Chercher un bon de livraison" #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:31 +#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:29 #, python-format msgid "Select" msgstr "Sélectionner" #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/js/widget.js:203 +#: code:addons/pos_picking_load/static/src/js/widget.js:235 #, python-format msgid "Server Error" msgstr "Erreur serveur" #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:55 +#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:53 #, python-format msgid "Source Document" msgstr "Document d'origine" -#. module: pos_picking_load -#: model:ir.model,name:pos_picking_load.model_stock_picking_type -msgid "The picking type determines the picking view" -msgstr "Le type de préparation détermine la vue de préparation" - #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/js/widget.js:204 +#: code:addons/pos_picking_load/static/src/js/widget.js:236 #, python-format msgid "The server encountered an error while receiving your order." msgstr "Le serveur a rencontré une erreur lors de la réception de votre commande." #. module: pos_picking_load -#: model:ir.model.fields,help:pos_picking_load.field_sale_order_final_pos_order_id +#: model:ir.model.fields,help:pos_picking_load.field_sale_order__final_pos_order_id msgid "This Sale Order has beend replaced by this PoS Order" msgstr "Ce bon de commande a été remplacé par cette commande via le point de vente" #. module: pos_picking_load -#: model:ir.model.fields,help:pos_picking_load.field_stock_picking_final_pos_order_id +#: model:ir.model.fields,help:pos_picking_load.field_stock_picking__final_pos_order_id msgid "This picking has been canceled, because it has been replaced by this PoS Order" msgstr "Ce bon de livraison a été annulé, car il a été remplacé par cette commande via le point de vente" @@ -194,15 +209,14 @@ msgstr "Transfert" #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/js/widget.js:100 +#: code:addons/pos_picking_load/static/src/js/widget.js:119 #, python-format msgid "Unable to load some picking lines because the products are not available in the POS cache.\n" "\n" "Please check that lines :\n" "\n" " * " -msgstr "Impossible de charger certaines lignes du bon de livraison car certains " -"produits ne sont pas disponibles dans le point de vente.\n" +msgstr "Impossible de charger certaines lignes du bon de livraison car certains produits ne sont pas disponibles dans le point de vente.\n" "\n" "Merci de vérifier les lignes suivantes :\n" "\n" @@ -210,7 +224,7 @@ msgstr "Impossible de charger certaines lignes du bon de livraison car certains #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/js/widget.js:148 +#: code:addons/pos_picking_load/static/src/js/widget.js:167 #, python-format msgid "Unable to load this picking because it has been loaded in another confirmed PoS Order :\n" "\n" @@ -221,7 +235,7 @@ msgstr "Impossible de charger ce bon de livraison car il a déjà été chargé #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/js/widget.js:132 +#: code:addons/pos_picking_load/static/src/js/widget.js:151 #, python-format msgid "Unable to load this picking because it has been loaded in another draft PoS Order :\n" "\n" @@ -232,28 +246,22 @@ msgstr "Impossible de charger ce bon de livraison car il a déjà été chargé #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/js/widget.js:118 +#: code:addons/pos_picking_load/static/src/js/widget.js:137 #, python-format msgid "Unable to load this picking because the partner is not known in the Point Of Sale as a customer" -msgstr "Impossible de charger ce bon de livraison car ce partenaire n'est pas " -"reconnu dans le point de vente comme un client" +msgstr "Impossible de charger ce bon de livraison car ce partenaire n'est pas reconnu dans le point de vente comme un client" #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/js/widget.js:117 +#: code:addons/pos_picking_load/static/src/js/widget.js:136 #, python-format msgid "Unknown Partner" msgstr "Partenaire inconnu" #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/js/widget.js:99 +#: code:addons/pos_picking_load/static/src/js/widget.js:118 #, python-format msgid "Unknown Products" msgstr "Produits inconnus" -#. module: pos_picking_load -#: model:ir.model,name:pos_picking_load.model_pos_config -msgid "pos.config" -msgstr "pos.config" - diff --git a/pos_picking_load/i18n/pos_picking_load.pot b/pos_picking_load/i18n/pos_picking_load.pot index a911a1c7..57d7f20b 100644 --- a/pos_picking_load/i18n/pos_picking_load.pot +++ b/pos_picking_load/i18n/pos_picking_load.pot @@ -1,11 +1,13 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * pos_picking_load +# * pos_picking_load # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0\n" +"Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-07-11 09:48+0000\n" +"PO-Revision-Date: 2019-07-11 09:48+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -15,155 +17,199 @@ msgstr "" #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:70 +#: code:addons/pos_picking_load/static/src/js/widget.js:274 #, python-format -msgid "--------------------------------" +msgid "A picking is still loaded. You can not load another picking. Please create a new order." msgstr "" #. module: pos_picking_load -#: field:stock.picking.type,available_in_pos:0 +#: model:ir.model.fields,field_description:pos_picking_load.field_stock_picking_type__available_in_pos msgid "Available in Point Of Sale" msgstr "" #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/js/pos_picking_load.js:264 -#: code:addons/pos_picking_load/static/src/js/pos_picking_load.js:290 +#: code:addons/pos_picking_load/static/src/js/widget.js:243 #, python-format msgid "Can not execute this action because the POS is currently offline" msgstr "" #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:22 +#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:25 #, python-format msgid "Cancel" msgstr "" #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/js/pos_picking_load.js:263 -#: code:addons/pos_picking_load/static/src/js/pos_picking_load.js:289 +#: code:addons/pos_picking_load/static/src/js/widget.js:242 #, python-format msgid "Connection error" msgstr "" #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:50 +#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:51 #, python-format msgid "Customer" msgstr "" #. module: pos_picking_load -#: field:sale.order,final_pos_order_id:0 -#: field:stock.picking,final_pos_order_id:0 +#: model_terms:ir.ui.view,arch_db:pos_picking_load.view_pos_config_form +msgid "Enable the possibility to load pickings in the Point of Sale" +msgstr "" + +#. module: pos_picking_load +#: model:ir.model.fields,field_description:pos_picking_load.field_sale_order__final_pos_order_id +#: model:ir.model.fields,field_description:pos_picking_load.field_stock_picking__final_pos_order_id msgid "Final PoS Order" msgstr "" #. module: pos_picking_load -#: help:stock.picking.type,available_in_pos:0 +#: model:ir.model.fields,help:pos_picking_load.field_stock_picking_type__available_in_pos msgid "If checked, associated pickings will be available in the point of sale, to be changed and paid in it" msgstr "" #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:5 +#: code:addons/pos_picking_load/static/src/js/widget.js:285 #, python-format msgid "Load Picking" msgstr "" #. module: pos_picking_load -#: field:pos.config,iface_load_picking:0 +#: model:ir.model.fields,field_description:pos_picking_load.field_pos_config__iface_load_picking +#: model_terms:ir.ui.view,arch_db:pos_picking_load.view_pos_config_form msgid "Load Pickings" msgstr "" #. module: pos_picking_load -#: field:pos.config,iface_load_picking_max_qty:0 +#: model:ir.model.fields,field_description:pos_picking_load.field_pos_config__iface_load_picking_max_qty +#: model_terms:ir.ui.view,arch_db:pos_picking_load.view_pos_config_form msgid "Max Picking Quantity To Load" msgstr "" #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:49 +#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:50 #, python-format msgid "Name" msgstr "" #. module: pos_picking_load -#: field:pos.order,origin_picking_id:0 +#: model:ir.model.fields,field_description:pos_picking_load.field_pos_order__origin_picking_id msgid "Origin Picking" msgstr "" #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:71 -#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:79 +#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:72 +#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:80 #, python-format msgid "Origin Picking:" msgstr "" #. module: pos_picking_load -#: model:ir.model,name:pos_picking_load.model_stock_picking -msgid "Picking List" +#. openerp-web +#: code:addons/pos_picking_load/static/src/js/widget.js:273 +#, python-format +msgid "Pending Picking" +msgstr "" + +#. module: pos_picking_load +#: model_terms:ir.ui.view,arch_db:pos_picking_load.view_pos_config_form +msgid "Picking Load" +msgstr "" + +#. module: pos_picking_load +#. openerp-web +#: code:addons/pos_picking_load/static/src/js/widget.js:150 +#: code:addons/pos_picking_load/static/src/js/widget.js:166 +#, python-format +msgid "Picking Still Loaded" +msgstr "" + +#. module: pos_picking_load +#: model:ir.model,name:pos_picking_load.model_stock_picking_type +msgid "Picking Type" +msgstr "" + +#. module: pos_picking_load +#: model:ir.model,name:pos_picking_load.model_pos_config +msgid "Point of Sale Configuration" msgstr "" #. module: pos_picking_load #: model:ir.model,name:pos_picking_load.model_pos_order -msgid "Point of Sale" +msgid "Point of Sale Orders" msgstr "" #. module: pos_picking_load #: model:ir.model,name:pos_picking_load.model_sale_order -msgid "Sales Order" +msgid "Sale Order" msgstr "" #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:51 +#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:52 #, python-format msgid "Scheduled Date" msgstr "" #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:30 +#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:33 #, python-format msgid "Search Picking" msgstr "" #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:26 +#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:29 #, python-format msgid "Select" msgstr "" #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:52 +#: code:addons/pos_picking_load/static/src/js/widget.js:235 +#, python-format +msgid "Server Error" +msgstr "" + +#. module: pos_picking_load +#. openerp-web +#: code:addons/pos_picking_load/static/src/xml/pos_picking_load.xml:53 #, python-format msgid "Source Document" msgstr "" #. module: pos_picking_load -#: model:ir.model,name:pos_picking_load.model_stock_picking_type -msgid "The picking type determines the picking view" +#. openerp-web +#: code:addons/pos_picking_load/static/src/js/widget.js:236 +#, python-format +msgid "The server encountered an error while receiving your order." msgstr "" #. module: pos_picking_load -#: help:sale.order,final_pos_order_id:0 +#: model:ir.model.fields,help:pos_picking_load.field_sale_order__final_pos_order_id msgid "This Sale Order has beend replaced by this PoS Order" msgstr "" #. module: pos_picking_load -#: help:stock.picking,final_pos_order_id:0 +#: model:ir.model.fields,help:pos_picking_load.field_stock_picking__final_pos_order_id msgid "This picking has been canceled, because it has been replaced by this PoS Order" msgstr "" +#. module: pos_picking_load +#: model:ir.model,name:pos_picking_load.model_stock_picking +msgid "Transfer" +msgstr "" + #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/js/pos_picking_load.js:228 +#: code:addons/pos_picking_load/static/src/js/widget.js:119 #, python-format msgid "Unable to load some picking lines because the products are not available in the POS cache.\n" "\n" @@ -174,21 +220,39 @@ msgstr "" #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/js/pos_picking_load.js:239 +#: code:addons/pos_picking_load/static/src/js/widget.js:167 +#, python-format +msgid "Unable to load this picking because it has been loaded in another confirmed PoS Order :\n" +"\n" +"" +msgstr "" + +#. module: pos_picking_load +#. openerp-web +#: code:addons/pos_picking_load/static/src/js/widget.js:151 +#, python-format +msgid "Unable to load this picking because it has been loaded in another draft PoS Order :\n" +"\n" +"" +msgstr "" + +#. module: pos_picking_load +#. openerp-web +#: code:addons/pos_picking_load/static/src/js/widget.js:137 #, python-format msgid "Unable to load this picking because the partner is not known in the Point Of Sale as a customer" msgstr "" #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/js/pos_picking_load.js:238 +#: code:addons/pos_picking_load/static/src/js/widget.js:136 #, python-format msgid "Unknown Partner" msgstr "" #. module: pos_picking_load #. openerp-web -#: code:addons/pos_picking_load/static/src/js/pos_picking_load.js:227 +#: code:addons/pos_picking_load/static/src/js/widget.js:118 #, python-format msgid "Unknown Products" msgstr "" diff --git a/pos_picking_load/models/__init__.py b/pos_picking_load/models/__init__.py index 09985a88..d4ab9e61 100644 --- a/pos_picking_load/models/__init__.py +++ b/pos_picking_load/models/__init__.py @@ -1,4 +1,3 @@ -# coding: utf-8 from . import sale_order from . import stock_picking from . import stock_picking_type diff --git a/pos_picking_load/models/pos_config.py b/pos_picking_load/models/pos_config.py index 6806ad27..77e05857 100644 --- a/pos_picking_load/models/pos_config.py +++ b/pos_picking_load/models/pos_config.py @@ -1,4 +1,3 @@ -# coding: utf-8 # Copyright (C) 2017 - Today: GRAP (http://www.grap.coop) # @author: Sylvain LE GAL (https://twitter.com/legalsylvain) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). diff --git a/pos_picking_load/models/pos_order.py b/pos_picking_load/models/pos_order.py index 415b2029..6cefc915 100644 --- a/pos_picking_load/models/pos_order.py +++ b/pos_picking_load/models/pos_order.py @@ -1,4 +1,3 @@ -# coding: utf-8 # Copyright (C) 2017 - Today: GRAP (http://www.grap.coop) # @author: Sylvain LE GAL (https://twitter.com/legalsylvain) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). @@ -17,27 +16,25 @@ class PosOrder(models.Model): # Overloadable Section @api.multi def _handle_orders_with_original_picking(self): - """By default, the module cancel original stock picking and sale - order. Overload / Overwrite this function if you want another + """By default, the module cancel the original stock picking and + set the original sale order as invoiced. + Overload / Overwrite this function if you want another behaviour""" - sale_order_obj = self.env['sale.order'] for order in self: # Cancel Picking order.origin_picking_id.action_cancel() order.origin_picking_id.write({'final_pos_order_id': order.id}) - # Ignore Delivery exception of the Sale Order - sale_orders = sale_order_obj.search([ - ('procurement_group_id', '=', - order.origin_picking_id.group_id.id)]) - sale_orders.signal_workflow('ship_corrected') - sale_orders.write({'final_pos_order_id': order.id}) + # Set Sale Order as fully invoiced + order.origin_picking_id.mapped('group_id.sale_id').write({ + 'invoice_status': 'invoiced', + }) # Overload Section @api.model def create_from_ui(self, orders): """Cancel the original picking, when the pos order is done""" - res = super(PosOrder, self).create_from_ui(orders) + res = super().create_from_ui(orders) orders_with_original_picking = self.search([ ('id', 'in', res), ('origin_picking_id', '!=', False), ('state', '!=', 'draft')]) @@ -48,7 +45,7 @@ class PosOrder(models.Model): @api.model def _order_fields(self, ui_order): - res = super(PosOrder, self)._order_fields(ui_order) + res = super()._order_fields(ui_order) if 'origin_picking_id' in ui_order: res['origin_picking_id'] = ui_order['origin_picking_id'] return res diff --git a/pos_picking_load/models/sale_order.py b/pos_picking_load/models/sale_order.py index dc0b9014..be8134df 100644 --- a/pos_picking_load/models/sale_order.py +++ b/pos_picking_load/models/sale_order.py @@ -1,4 +1,3 @@ -# coding: utf-8 # Copyright (C) 2017 - Today: GRAP (http://www.grap.coop) # @author: Sylvain LE GAL (https://twitter.com/legalsylvain) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). diff --git a/pos_picking_load/models/stock_picking.py b/pos_picking_load/models/stock_picking.py index 8562fd8d..9f00dde3 100644 --- a/pos_picking_load/models/stock_picking.py +++ b/pos_picking_load/models/stock_picking.py @@ -1,4 +1,3 @@ -# coding: utf-8 # Copyright (C) 2017 - Today: GRAP (http://www.grap.coop) # @author: Sylvain LE GAL (https://twitter.com/legalsylvain) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). @@ -37,7 +36,7 @@ class StockPicking(models.Model): @api.model def _prepare_fields_for_pos_list(self): - return ['name', 'partner_id', 'min_date', 'origin'] + return ['name', 'partner_id', 'scheduled_date', 'origin'] @api.model def search_pickings_for_pos(self, query, pos_session_id): @@ -57,8 +56,7 @@ class StockPicking(models.Model): 'product_id': move.product_id.id, 'quantity': move.product_uom_qty, } - sale_order_line =\ - move.procurement_id and move.procurement_id.sale_line_id + sale_order_line = move.sale_line_id if sale_order_line: # Get price and discount of the order if available picking_line_data['price_unit'] = sale_order_line.price_unit @@ -90,4 +88,4 @@ class StockPicking(models.Model): if self.env.context.get('origin_picking_id'): self.update_from_origin_picking( self.browse(self.env.context['origin_picking_id'])) - return super(StockPicking, self).action_confirm() + return super().action_confirm() diff --git a/pos_picking_load/models/stock_picking_type.py b/pos_picking_load/models/stock_picking_type.py index b1fc4fb9..8e299366 100644 --- a/pos_picking_load/models/stock_picking_type.py +++ b/pos_picking_load/models/stock_picking_type.py @@ -1,4 +1,3 @@ -# coding: utf-8 # Copyright (C) 2017 - Today: GRAP (http://www.grap.coop) # @author: Sylvain LE GAL (https://twitter.com/legalsylvain) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). diff --git a/pos_picking_load/static/description/pos_config_form.png b/pos_picking_load/static/description/pos_config_form.png index 27052b91..42a01b59 100644 Binary files a/pos_picking_load/static/description/pos_config_form.png and b/pos_picking_load/static/description/pos_config_form.png differ diff --git a/pos_picking_load/static/description/stock_picking_type_form.png b/pos_picking_load/static/description/stock_picking_type_form.png index 6f3849de..f93fbfca 100644 Binary files a/pos_picking_load/static/description/stock_picking_type_form.png and b/pos_picking_load/static/description/stock_picking_type_form.png differ diff --git a/pos_picking_load/static/src/js/widget.js b/pos_picking_load/static/src/js/widget.js index 87627e50..4a4ad813 100644 --- a/pos_picking_load/static/src/js/widget.js +++ b/pos_picking_load/static/src/js/widget.js @@ -9,7 +9,7 @@ odoo.define('pos_picking_load.widget', function (require) { var core = require('web.core'); var framework = require('web.framework'); - var Model = require('web.DataModel'); + var rpc = require('web.rpc'); var gui = require('point_of_sale.gui'); var screens = require('point_of_sale.screens'); @@ -52,6 +52,20 @@ odoo.define('pos_picking_load.widget', function (require) { self.select_picking(event); }); + // Handle search + var search_timeout = null; + this.$('.searchbox input').on('keyup', function () { + clearTimeout(search_timeout); + var query = this.value; + search_timeout = setTimeout(function () { + self.perform_search(query); + }, 70); + }); + + this.$('.searchbox .search-clear').click(function () { + self.clear_search(); + }); + }, select_picking: function (event) { @@ -63,8 +77,12 @@ odoo.define('pos_picking_load.widget', function (require) { this.$('.picking-list .highlight').removeClass('highlight'); framework.blockUI(); - new Model('stock.picking').call( - 'load_picking_for_pos', [origin_picking_id]) + var params = { + model: 'stock.picking', + method: 'load_picking_for_pos', + args: [origin_picking_id], + }; + rpc.query(params) .then(function (picking_data) { framework.unblockUI(); if (self.check_picking(picking_data)) { @@ -72,9 +90,9 @@ odoo.define('pos_picking_load.widget', function (require) { $(event.target.parentNode).addClass('highlight'); self.$('span.button.validate').show(); } - }).fail(function (error, event) { + }).fail(function (error, fail_event) { framework.unblockUI(); - self.handle_errors(error, event); + self.handle_errors(error, fail_event); }); }, @@ -158,11 +176,24 @@ odoo.define('pos_picking_load.widget', function (require) { return picking_selectable; }, + perform_search: function (query) { + this.search_pickings(query); + }, + + clear_search: function () { + this.search_pickings(); + this.$('.searchbox input')[0].value = ''; + this.$('.searchbox input').focus(); + }, + search_pickings: function (query) { var self = this; - return new Model('stock.picking').call( - 'search_pickings_for_pos', - [query || '', this.pos.pos_session.id]) + var params = { + model: 'stock.picking', + method: 'search_pickings_for_pos', + args: [query || '', this.pos.pos_session.id], + }; + rpc.query(params) .then(function (result) { self.render_list(result); }).fail(function (error, event) { diff --git a/pos_picking_load/static/src/xml/pos_picking_load.xml b/pos_picking_load/static/src/xml/pos_picking_load.xml index 822bccd7..da4c1368 100644 --- a/pos_picking_load/static/src/xml/pos_picking_load.xml +++ b/pos_picking_load/static/src/xml/pos_picking_load.xml @@ -8,13 +8,11 @@ - - - + @@ -38,7 +36,7 @@