From dff837ccc4f3f2453ae28fd50fc4268805cd0b1f Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Sat, 10 Dec 2016 22:45:36 +0100 Subject: [PATCH 01/27] [ADD] delivery_multi_destination ================================================== Multiple destinations for the same delivery method ================================================== Module `delivery` in version 8 allows to set different price rules depending on the destination. This is what is called a delivery grid. In version 9, for simplifying delivery methods, Odoo has plained the structure, lowering destinations at delivery method level, and removing delivery grid model. This is not usable when you have different prices according the destination of your delivery. This module restores the same concept, reusing the same model for nesting several "children" delivery methods, one per possible destination. It has been designed to reuse all possible extensions to the base delivery, without the need to create a glue module for having multiple destinations. This module also handles if you're migrating from version 8 and you had `delivery` module installed, to keep the delivery grids. Installation ============ If you installed the module on a version 8 migrated database, some operations will be done for recovering delivery grids. If so, you need to have **openupgradelib** library installed. Configuration ============= To configure delivery methods with multiple destinations: * Go to Inventory > Configuration > Delivery > Delivery Methods * Create or edit an existing record. * Select "Destination type" = "Multiple destinations". * Introduce a line for each destination in the new tab "Destinations" * Lines have priority, so you have to put first the lines with more restricted destinations. Usage ===== * When using the delivery method in a Sales order, delivery address will be used for computing the delivery price according introduced destinations. --- delivery_multi_destination/README.rst | 90 ++++++++++++++++++ delivery_multi_destination/__init__.py | 6 ++ delivery_multi_destination/__openerp__.py | 22 +++++ delivery_multi_destination/hooks.py | 76 +++++++++++++++ delivery_multi_destination/models/__init__.py | 4 + .../models/delivery_carrier.py | 35 +++++++ .../static/description/icon.png | Bin 0 -> 9455 bytes delivery_multi_destination/tests/__init__.py | 4 + .../tests/test_delivery_multi_destination.py | 84 ++++++++++++++++ .../views/delivery_carrier_view.xml | 69 ++++++++++++++ 10 files changed, 390 insertions(+) create mode 100644 delivery_multi_destination/README.rst create mode 100644 delivery_multi_destination/__init__.py create mode 100644 delivery_multi_destination/__openerp__.py create mode 100644 delivery_multi_destination/hooks.py create mode 100644 delivery_multi_destination/models/__init__.py create mode 100644 delivery_multi_destination/models/delivery_carrier.py create mode 100644 delivery_multi_destination/static/description/icon.png create mode 100644 delivery_multi_destination/tests/__init__.py create mode 100644 delivery_multi_destination/tests/test_delivery_multi_destination.py create mode 100644 delivery_multi_destination/views/delivery_carrier_view.xml diff --git a/delivery_multi_destination/README.rst b/delivery_multi_destination/README.rst new file mode 100644 index 0000000000..93ab093c1c --- /dev/null +++ b/delivery_multi_destination/README.rst @@ -0,0 +1,90 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +================================================== +Multiple destinations for the same delivery method +================================================== + +Module `delivery` in version 8 allows to set different price rules depending +on the destination. This is what is called a delivery grid. + +In version 9, for simplifying delivery methods, Odoo has plained the structure, +lowering destinations at delivery method level, and removing delivery grid +model. + +This is not usable when you have different prices according the destination +of your delivery. + +This module restores the same concept, reusing the same model for nesting +several "children" delivery methods, one per possible destination. It has been +designed to reuse all possible extensions to the base delivery, without the +need to create a glue module for having multiple destinations. + +This module also handles if you're migrating from version 8 and you had +`delivery` module installed, to keep the delivery grids. + +Installation +============ + +If you installed the module on a version 8 migrated database, some operations +will be done for recovering delivery grids. If so, you need to have +**openupgradelib** library installed. + +Configuration +============= + +To configure delivery methods with multiple destinations: + +#. Go to Inventory > Configuration > Delivery > Delivery Methods +#. Create or edit an existing record. +#. Select "Destination type" = "Multiple destinations". +#. Introduce a line for each destination in the new tab "Destinations" +#. Lines have priority, so you have to put first the lines with more restricted + destinations. + +Usage +===== + +#. When using the delivery method in a Sales order, delivery address will be + used for computing the delivery price according introduced destinations. + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/99/9.0 + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues +`_. In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smashing it by providing a detailed and welcomed feedback. + +Credits +======= + +Images +------ + +* Odoo Community Association: `Icon `_. + +Contributors +------------ + +* Pedro M. Baeza + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/delivery_multi_destination/__init__.py b/delivery_multi_destination/__init__.py new file mode 100644 index 0000000000..79adc6aa13 --- /dev/null +++ b/delivery_multi_destination/__init__.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import models +from .hooks import post_init_hook +from .hooks import uninstall_hook diff --git a/delivery_multi_destination/__openerp__.py b/delivery_multi_destination/__openerp__.py new file mode 100644 index 0000000000..08d04d38fb --- /dev/null +++ b/delivery_multi_destination/__openerp__.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 Pedro M. Baeza +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + "name": "Multiple destinations for the same delivery method", + "version": "9.0.1.0.0", + "category": "Delivery", + "website": "https://www.tecnativa.com/", + "author": "Tecnativa, " + "Odoo Community Association (OCA)", + "license": "AGPL-3", + "installable": True, + "depends": [ + "delivery", + ], + "data": [ + "views/delivery_carrier_view.xml", + ], + "uninstall_hook": "uninstall_hook", + "post_init_hook": "post_init_hook", +} diff --git a/delivery_multi_destination/hooks.py b/delivery_multi_destination/hooks.py new file mode 100644 index 0000000000..646f902d62 --- /dev/null +++ b/delivery_multi_destination/hooks.py @@ -0,0 +1,76 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 Pedro M. Baeza +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from openerp import api, SUPERUSER_ID +try: + from openupgradelib import openupgrade +except ImportError: + openupgrade = False + + +def migrate_from_v8(cr): + """Reconvert delivery carriers that were the grids from the same + v8 carrier again on childs with this new structure. + """ + cr.execute( + """ + SELECT COUNT({0}), {0} + FROM carrier_delivery + GROUP BY {0} + """.format(openupgrade.get_legacy_name('carrier_id')) + ) + rows = cr.fetchall() + with api.Environment.manage(): + env = api.Environment(cr, SUPERUSER_ID, {}) + carrier_obj = env['delivery.carrier'] + for count, old_carrier_id in rows: + if count <= 1: + continue + # Get children ids + cr.execute( + """ + SELECT id + FROM carrier_delivery + WHERE {0} = %s + """.format(openupgrade.get_legacy_name('carrier_id')), + (old_carrier_id, ) + ) + child_ids = [x[0] for x in cr.fetchall()] + # Get old carrier data + cr.execute( + """ + SELECT name, partner_id + FROM carrier_delivery + WHERE {0} = %s + """.format(openupgrade.get_legacy_name('carrier_id')), + (old_carrier_id, ) + ) + old_carrier_vals = cr.fetchone() + # Create new carrier and put the rest of the carriers as children + carrier = carrier_obj.create({ + 'name': old_carrier_vals[0], + 'partner_id': old_carrier_vals[1], + 'destination_type': 'multi', + }) + cr.execute( + """ + UPDATE carrier_delivery + SET parent_id = %s + WHERE ids = %s + """, (carrier.id, tuple(child_ids)) + ) + + +def post_init_hook(cr, registry): # pragma: no cover + if openupgrade and openupgrade.column_exists( + 'delivery_carrier', openupgrade.get_legacy_name('carrier_id')): + migrate_from_v8(cr) + + +def uninstall_hook(cr, registry): + with api.Environment.manage(): + env = api.Environment(cr, SUPERUSER_ID, {}) + act_window = env.ref('delivery.action_delivery_carrier_form') + if act_window: + act_window.domain = False diff --git a/delivery_multi_destination/models/__init__.py b/delivery_multi_destination/models/__init__.py new file mode 100644 index 0000000000..add727a8de --- /dev/null +++ b/delivery_multi_destination/models/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import delivery_carrier diff --git a/delivery_multi_destination/models/delivery_carrier.py b/delivery_multi_destination/models/delivery_carrier.py new file mode 100644 index 0000000000..133ede270a --- /dev/null +++ b/delivery_multi_destination/models/delivery_carrier.py @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +# Copyright 2016 Pedro M. Baeza +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from openerp import api, fields, models +from openerp.tools import config + + +class DeliveryCarrier(models.Model): + _inherit = "delivery.carrier" + + child_ids = fields.One2many( + comodel_name="delivery.carrier", inverse_name="parent_id", + string="Destination grid", + ) + parent_id = fields.Many2one( + comodel_name="delivery.carrier", string="Parent carrier", + ) + destination_type = fields.Selection( + selection=[ + ('one', 'One destination'), + ('multi', 'Multiple destinations'), + ], + default="one", required=True, + ) + + @api.multi + def verify_carrier(self, contact): + test_condition = (config['test_enable'] and + not self.env.context.get('test_delivery_multi')) + if test_condition or self.destination_type == 'one': + return super(DeliveryCarrier, self).verify_carrier(contact) + for subcarrier in self.child_ids: + if super(DeliveryCarrier, subcarrier).verify_carrier(contact): + return subcarrier diff --git a/delivery_multi_destination/static/description/icon.png b/delivery_multi_destination/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 zcmW++2RxMjAAjx~&dlBk9S+%}OXg)AGE&Cb*&}d0jUxM@u(PQx^-s)697TX`ehR4?GS^qbkof1cslKgkU)h65qZ9Oc=ml_0temigYLJfnz{IDzUf>bGs4N!v3=Z3jMq&A#7%rM5eQ#dc?k~! zVpnB`o+K7|Al`Q_U;eD$B zfJtP*jH`siUq~{KE)`jP2|#TUEFGRryE2`i0**z#*^6~AI|YzIWy$Cu#CSLW3q=GA z6`?GZymC;dCPk~rBS%eCb`5OLr;RUZ;D`}um=H)BfVIq%7VhiMr)_#G0N#zrNH|__ zc+blN2UAB0=617@>_u;MPHN;P;N#YoE=)R#i$k_`UAA>WWCcEVMh~L_ zj--gtp&|K1#58Yz*AHCTMziU1Jzt_jG0I@qAOHsk$2}yTmVkBp_eHuY$A9)>P6o~I z%aQ?!(GqeQ-Y+b0I(m9pwgi(IIZZzsbMv+9w{PFtd_<_(LA~0H(xz{=FhLB@(1&qHA5EJw1>>=%q2f&^X>IQ{!GJ4e9U z&KlB)z(84HmNgm2hg2C0>WM{E(DdPr+EeU_N@57;PC2&DmGFW_9kP&%?X4}+xWi)( z;)z%wI5>D4a*5XwD)P--sPkoY(a~WBw;E~AW`Yue4kFa^LM3X`8x|}ZUeMnqr}>kH zG%WWW>3ml$Yez?i%)2pbKPI7?5o?hydokgQyZsNEr{a|mLdt;X2TX(#B1j35xPnPW z*bMSSOauW>o;*=kO8ojw91VX!qoOQb)zHJ!odWB}d+*K?#sY_jqPdg{Sm2HdYzdEx zOGVPhVRTGPtv0o}RfVP;Nd(|CB)I;*t&QO8h zFfekr30S!-LHmV_Su-W+rEwYXJ^;6&3|L$mMC8*bQptyOo9;>Qb9Q9`ySe3%V$A*9 zeKEe+b0{#KWGp$F+tga)0RtI)nhMa-K@JS}2krK~n8vJ=Ngm?R!9G<~RyuU0d?nz# z-5EK$o(!F?hmX*2Yt6+coY`6jGbb7tF#6nHA zuKk=GGJ;ZwON1iAfG$E#Y7MnZVmrY|j0eVI(DN_MNFJmyZ|;w4tf@=CCDZ#5N_0K= z$;R~bbk?}TpfDjfB&aiQ$VA}s?P}xPERJG{kxk5~R`iRS(SK5d+Xs9swCozZISbnS zk!)I0>t=A<-^z(cmSFz3=jZ23u13X><0b)P)^1T_))Kr`e!-pb#q&J*Q`p+B6la%C zuVl&0duN<;uOsB3%T9Fp8t{ED108<+W(nOZd?gDnfNBC3>M8WE61$So|P zVvqH0SNtDTcsUdzaMDpT=Ty0pDHHNL@Z0w$Y`XO z2M-_r1S+GaH%pz#Uy0*w$Vdl=X=rQXEzO}d6J^R6zjM1u&c9vYLvLp?W7w(?np9x1 zE_0JSAJCPB%i7p*Wvg)pn5T`8k3-uR?*NT|J`eS#_#54p>!p(mLDvmc-3o0mX*mp_ zN*AeS<>#^-{S%W<*mz^!X$w_2dHWpcJ6^j64qFBft-o}o_Vx80o0>}Du;>kLts;$8 zC`7q$QI(dKYG`Wa8#wl@V4jVWBRGQ@1dr-hstpQL)Tl+aqVpGpbSfN>5i&QMXfiZ> zaA?T1VGe?rpQ@;+pkrVdd{klI&jVS@I5_iz!=UMpTsa~mBga?1r}aRBm1WS;TT*s0f0lY=JBl66Upy)-k4J}lh=P^8(SXk~0xW=T9v*B|gzIhN z>qsO7dFd~mgxAy4V?&)=5ieYq?zi?ZEoj)&2o)RLy=@hbCRcfT5jigwtQGE{L*8<@Yd{zg;CsL5mvzfDY}P-wos_6PfprFVaeqNE%h zKZhLtcQld;ZD+>=nqN~>GvROfueSzJD&BE*}XfU|H&(FssBqY=hPCt`d zH?@s2>I(|;fcW&YM6#V#!kUIP8$Nkdh0A(bEVj``-AAyYgwY~jB zT|I7Bf@%;7aL7Wf4dZ%VqF$eiaC38OV6oy3Z#TER2G+fOCd9Iaoy6aLYbPTN{XRPz z;U!V|vBf%H!}52L2gH_+j;`bTcQRXB+y9onc^wLm5wi3-Be}U>k_u>2Eg$=k!(l@I zcCg+flakT2Nej3i0yn+g+}%NYb?ta;R?(g5SnwsQ49U8Wng8d|{B+lyRcEDvR3+`O{zfmrmvFrL6acVP%yG98X zo&+VBg@px@i)%o?dG(`T;n*$S5*rnyiR#=wW}}GsAcfyQpE|>a{=$Hjg=-*_K;UtD z#z-)AXwSRY?OPefw^iI+ z)AXz#PfEjlwTes|_{sB?4(O@fg0AJ^g8gP}ex9Ucf*@_^J(s_5jJV}c)s$`Myn|Kd z$6>}#q^n{4vN@+Os$m7KV+`}c%4)4pv@06af4-x5#wj!KKb%caK{A&Y#Rfs z-po?Dcb1({W=6FKIUirH&(yg=*6aLCekcKwyfK^JN5{wcA3nhO(o}SK#!CINhI`-I z1)6&n7O&ZmyFMuNwvEic#IiOAwNkR=u5it{B9n2sAJV5pNhar=j5`*N!Na;c7g!l$ z3aYBqUkqqTJ=Re-;)s!EOeij=7SQZ3Hq}ZRds%IM*PtM$wV z@;rlc*NRK7i3y5BETSKuumEN`Xu_8GP1Ri=OKQ$@I^ko8>H6)4rjiG5{VBM>B|%`&&s^)jS|-_95&yc=GqjNo{zFkw%%HHhS~e=s zD#sfS+-?*t|J!+ozP6KvtOl!R)@@-z24}`9{QaVLD^9VCSR2b`b!KC#o;Ki<+wXB6 zx3&O0LOWcg4&rv4QG0)4yb}7BFSEg~=IR5#ZRj8kg}dS7_V&^%#Do==#`u zpy6{ox?jWuR(;pg+f@mT>#HGWHAJRRDDDv~@(IDw&R>9643kK#HN`!1vBJHnC+RM&yIh8{gG2q zA%e*U3|N0XSRa~oX-3EAneep)@{h2vvd3Xvy$7og(sayr@95+e6~Xvi1tUqnIxoIH zVWo*OwYElb#uyW{Imam6f2rGbjR!Y3`#gPqkv57dB6K^wRGxc9B(t|aYDGS=m$&S!NmCtrMMaUg(c zc2qC=2Z`EEFMW-me5B)24AqF*bV5Dr-M5ig(l-WPS%CgaPzs6p_gnCIvTJ=Y<6!gT zVt@AfYCzjjsMEGi=rDQHo0yc;HqoRNnNFeWZgcm?f;cp(6CNylj36DoL(?TS7eU#+ z7&mfr#y))+CJOXQKUMZ7QIdS9@#-}7y2K1{8)cCt0~-X0O!O?Qx#E4Og+;A2SjalQ zs7r?qn0H044=sDN$SRG$arw~n=+T_DNdSrarmu)V6@|?1-ZB#hRn`uilTGPJ@fqEy zGt(f0B+^JDP&f=r{#Y_wi#AVDf-y!RIXU^0jXsFpf>=Ji*TeqSY!H~AMbJdCGLhC) zn7Rx+sXw6uYj;WRYrLd^5IZq@6JI1C^YkgnedZEYy<&4(z%Q$5yv#Boo{AH8n$a zhb4Y3PWdr269&?V%uI$xMcUrMzl=;w<_nm*qr=c3Rl@i5wWB;e-`t7D&c-mcQl7x! zZWB`UGcw=Y2=}~wzrfLx=uet<;m3~=8I~ZRuzvMQUQdr+yTV|ATf1Uuomr__nDf=X zZ3WYJtHp_ri(}SQAPjv+Y+0=fH4krOP@S&=zZ-t1jW1o@}z;xk8 z(Nz1co&El^HK^NrhVHa-_;&88vTU>_J33=%{if;BEY*J#1n59=07jrGQ#IP>@u#3A z;!q+E1Rj3ZJ+!4bq9F8PXJ@yMgZL;>&gYA0%_Kbi8?S=XGM~dnQZQ!yBSgcZhY96H zrWnU;k)qy`rX&&xlDyA%(a1Hhi5CWkmg(`Gb%m(HKi-7Z!LKGRP_B8@`7&hdDy5n= z`OIxqxiVfX@OX1p(mQu>0Ai*v_cTMiw4qRt3~NBvr9oBy0)r>w3p~V0SCm=An6@3n)>@z!|o-$HvDK z|3D2ZMJkLE5loMKl6R^ez@Zz%S$&mbeoqH5`Bb){Ei21q&VP)hWS2tjShfFtGE+$z zzCR$P#uktu+#!w)cX!lWN1XU%K-r=s{|j?)Akf@q#3b#{6cZCuJ~gCxuMXRmI$nGtnH+-h z+GEi!*X=AP<|fG`1>MBdTb?28JYc=fGvAi2I<$B(rs$;eoJCyR6_bc~p!XR@O-+sD z=eH`-ye})I5ic1eL~TDmtfJ|8`0VJ*Yr=hNCd)G1p2MMz4C3^Mj?7;!w|Ly%JqmuW zlIEW^Ft%z?*|fpXda>Jr^1noFZEwFgVV%|*XhH@acv8rdGxeEX{M$(vG{Zw+x(ei@ zmfXb22}8-?Fi`vo-YVrTH*C?a8%M=Hv9MqVH7H^J$KsD?>!SFZ;ZsvnHr_gn=7acz z#W?0eCdVhVMWN12VV^$>WlQ?f;P^{(&pYTops|btm6aj>_Uz+hqpGwB)vWp0Cf5y< zft8-je~nn?W11plq}N)4A{l8I7$!ks_x$PXW-2XaRFswX_BnF{R#6YIwMhAgd5F9X zGmwdadS6(a^fjHtXg8=l?Rc0Sm%hk6E9!5cLVloEy4eh(=FwgP`)~I^5~pBEWo+F6 zSf2ncyMurJN91#cJTy_u8Y}@%!bq1RkGC~-bV@SXRd4F{R-*V`bS+6;W5vZ(&+I<9$;-V|eNfLa5n-6% z2(}&uGRF;p92eS*sE*oR$@pexaqr*meB)VhmIg@h{uzkk$9~qh#cHhw#>O%)b@+(| z^IQgqzuj~Sk(J;swEM-3TrJAPCq9k^^^`q{IItKBRXYe}e0Tdr=Huf7da3$l4PdpwWDop%^}n;dD#K4s#DYA8SHZ z&1!riV4W4R7R#C))JH1~axJ)RYnM$$lIR%6fIVA@zV{XVyx}C+a-Dt8Y9M)^KU0+H zR4IUb2CJ{Hg>CuaXtD50jB(_Tcx=Z$^WYu2u5kubqmwp%drJ6 z?Fo40g!Qd<-l=TQxqHEOuPX0;^z7iX?Ke^a%XT<13TA^5`4Xcw6D@Ur&VT&CUe0d} z1GjOVF1^L@>O)l@?bD~$wzgf(nxX1OGD8fEV?TdJcZc2KoUe|oP1#=$$7ee|xbY)A zDZq+cuTpc(fFdj^=!;{k03C69lMQ(|>uhRfRu%+!k&YOi-3|1QKB z z?n?eq1XP>p-IM$Z^C;2L3itnbJZAip*Zo0aw2bs8@(s^~*8T9go!%dHcAz2lM;`yp zD=7&xjFV$S&5uDaiScyD?B-i1ze`+CoRtz`Wn+Zl&#s4&}MO{@N!ufrzjG$B79)Y2d3tBk&)TxUTw@QS0TEL_?njX|@vq?Uz(nBFK5Pq7*xj#u*R&i|?7+6# z+|r_n#SW&LXhtheZdah{ZVoqwyT{D>MC3nkFF#N)xLi{p7J1jXlmVeb;cP5?e(=f# zuT7fvjSbjS781v?7{)-X3*?>tq?)Yd)~|1{BDS(pqC zC}~H#WXlkUW*H5CDOo<)#x7%RY)A;ShGhI5s*#cRDA8YgqG(HeKDx+#(ZQ?386dv! zlXCO)w91~Vw4AmOcATuV653fa9R$fyK8ul%rG z-wfS zihugoZyr38Im?Zuh6@RcF~t1anQu7>#lPpb#}4cOA!EM11`%f*07RqOVkmX{p~KJ9 z^zP;K#|)$`^Rb{rnHGH{~>1(fawV0*Z#)}M`m8-?ZJV<+e}s9wE# z)l&az?w^5{)`S(%MRzxdNqrs1n*-=jS^_jqE*5XDrA0+VE`5^*p3CuM<&dZEeCjoz zR;uu_H9ZPZV|fQq`Cyw4nscrVwi!fE6ciMmX$!_hN7uF;jjKG)d2@aC4ropY)8etW=xJvni)8eHi`H$%#zn^WJ5NLc-rqk|u&&4Z6fD_m&JfSI1Bvb?b<*n&sfl0^t z=HnmRl`XrFvMKB%9}>PaA`m-fK6a0(8=qPkWS5bb4=v?XcWi&hRY?O5HdulRi4?fN zlsJ*N-0Qw+Yic@s0(2uy%F@ib;GjXt01Fmx5XbRo6+n|pP(&nodMoap^z{~q ziEeaUT@Mxe3vJSfI6?uLND(CNr=#^W<1b}jzW58bIfyWTDle$mmS(|x-0|2UlX+9k zQ^EX7Nw}?EzVoBfT(-LT|=9N@^hcn-_p&sqG z&*oVs2JSU+N4ZD`FhCAWaS;>|wH2G*Id|?pa#@>tyxX`+4HyIArWDvVrX)2WAOQff z0qyHu&-S@i^MS-+j--!pr4fPBj~_8({~e1bfcl0wI1kaoN>mJL6KUPQm5N7lB(ui1 zE-o%kq)&djzWJ}ob<-GfDlkB;F31j-VHKvQUGQ3sp`CwyGJk_i!y^sD0fqC@$9|jO zOqN!r!8-p==F@ZVP=U$qSpY(gQ0)59P1&t@y?5rvg<}E+GB}26NYPp4f2YFQrQtot5mn3wu_qprZ=>Ig-$ zbW26Ws~IgY>}^5w`vTB(G`PTZaDiGBo5o(tp)qli|NeV( z@H_=R8V39rt5J5YB2Ky?4eJJ#b`_iBe2ot~6%7mLt5t8Vwi^Jy7|jWXqa3amOIoRb zOr}WVFP--DsS`1WpN%~)t3R!arKF^Q$e12KEqU36AWwnCBICpH4XCsfnyrHr>$I$4 z!DpKX$OKLWarN7nv@!uIA+~RNO)l$$w}p(;b>mx8pwYvu;dD_unryX_NhT8*Tj>BTrTTL&!?O+%Rv;b?B??gSzdp?6Uug9{ zd@V08Z$BdI?fpoCS$)t4mg4rT8Q_I}h`0d-vYZ^|dOB*Q^S|xqTV*vIg?@fVFSmMpaw0qtTRbx} z({Pg?#{2`sc9)M5N$*N|4;^t$+QP?#mov zGVC@I*lBVrOU-%2y!7%)fAKjpEFsgQc4{amtiHb95KQEwvf<(3T<9-Zm$xIew#P22 zc2Ix|App^>v6(3L_MCU0d3W##AB0M~3D00EWoKZqsJYT(#@w$Y_H7G22M~ApVFTRHMI_3be)Lkn#0F*V8Pq zc}`Cjy$bE;FJ6H7p=0y#R>`}-m4(0F>%@P|?7fx{=R^uFdISRnZ2W_xQhD{YuR3t< z{6yxu=4~JkeA;|(J6_nv#>Nvs&FuLA&PW^he@t(UwFFE8)|a!R{`E`K`i^ZnyE4$k z;(749Ix|oi$c3QbEJ3b~D_kQsPz~fIUKym($a_7dJ?o+40*OLl^{=&oq$<#Q(yyrp z{J-FAniyAw9tPbe&IhQ|a`DqFTVQGQ&Gq3!C2==4x{6EJwiPZ8zub-iXoUtkJiG{} zPaR&}_fn8_z~(=;5lD-aPWD3z8PZS@AaUiomF!G8I}Mf>e~0g#BelA-5#`cj;O5>N Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/delivery_multi_destination/tests/__init__.py b/delivery_multi_destination/tests/__init__.py new file mode 100644 index 0000000000..3a4ea32c6b --- /dev/null +++ b/delivery_multi_destination/tests/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import test_delivery_multi_destination diff --git a/delivery_multi_destination/tests/test_delivery_multi_destination.py b/delivery_multi_destination/tests/test_delivery_multi_destination.py new file mode 100644 index 0000000000..14d775faf8 --- /dev/null +++ b/delivery_multi_destination/tests/test_delivery_multi_destination.py @@ -0,0 +1,84 @@ +# -*- coding: utf-8 -*- +# Copyright +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from openerp.tests import common +from ..hooks import uninstall_hook + + +class TestDeliveryMultiDestination(common.SavepointCase): + @classmethod + def setUpClass(cls): + super(TestDeliveryMultiDestination, cls).setUpClass() + cls.country_1 = cls.env['res.country'].create({ + 'name': 'Test country 1', + }) + cls.country_2 = cls.env['res.country'].create({ + 'name': 'Test country 2', + }) + cls.partner_1 = cls.env['res.partner'].create({ + 'name': 'Test partner 1', + 'country_id': cls.country_1.id, + }) + cls.partner_2 = cls.env['res.partner'].create({ + 'name': 'Test partner 2', + 'country_id': cls.country_2.id, + }) + cls.carrier_multi = cls.env['delivery.carrier'].create({ + 'name': 'Test carrier multi', + 'partner_id': cls.partner_1.id, + 'destination_type': 'multi', + 'delivery_type': 'fixed', + 'fixed_price': 100, + 'child_ids': [ + (0, 0, { + 'sequence': 1, + 'partner_id': cls.partner_1.id, + 'country_ids': [(6, 0, cls.country_1.ids)], + 'delivery_type': 'fixed', + 'fixed_price': 50, + }), + (0, 0, { + 'sequence': 2, + 'partner_id': cls.partner_1.id, + 'country_ids': [(6, 0, cls.country_2.ids)], + 'delivery_type': 'fixed', + 'fixed_price': 150, + }) + ] + }) + cls.carrier_single = cls.carrier_multi.copy({ + 'name': 'Test carrier single', + 'destination_type': 'one', + 'child_ids': False, + }) + cls.product = cls.env['product.product'].create({ + 'name': 'Test product', + }) + cls.sale_order = cls.env['sale.order'].create({ + 'partner_id': cls.partner_1.id, + 'order_line': [ + (0, 0, { + 'name': 'Test', + 'product_id': cls.product.id, + 'product_uom_qty': 1, + }), + ] + }) + + def test_delivery_multi_destination(self): + order = self.sale_order.with_context(test_delivery_multi=True) + order.carrier_id = self.carrier_single.id + self.assertAlmostEqual(order.delivery_price, 100, 2) + order.carrier_id = self.carrier_multi.id + self.assertAlmostEqual(order.delivery_price, 50, 2) + # HACK: Needed as Odoo doesn't recompute non stored fields in tests + order.invalidate_cache() + order.partner_shipping_id = self.partner_2.id + order.partner_id = self.partner_2.id + self.assertAlmostEqual(order.delivery_price, 150, 2) + + def test_uninstall_hook(self): + uninstall_hook(self.env.cr, self.env.registry) + act_window = self.env.ref('delivery.action_delivery_carrier_form') + self.assertFalse(act_window.domain) diff --git a/delivery_multi_destination/views/delivery_carrier_view.xml b/delivery_multi_destination/views/delivery_carrier_view.xml new file mode 100644 index 0000000000..2c5c2d3a2e --- /dev/null +++ b/delivery_multi_destination/views/delivery_carrier_view.xml @@ -0,0 +1,69 @@ + + + + + + + delivery.carrier + + + + + + + {'invisible': [('destination_type', '=', 'multi')]} + + + {'invisible': [('destination_type', '=', 'multi')]} + + + context.get('show_children_carriers', False) + + + + + + + + + + + delivery.carrier + + + + context.get('show_children_carriers', False) + + + context.get('show_children_carriers', False) + + + + + + + + + + + + [('parent_id', '=', False)] + + + From 9fdf547bdb7a78a361e02251b4910e88ea68de23 Mon Sep 17 00:00:00 2001 From: "Luis M. Ontalba" Date: Tue, 26 Sep 2017 14:15:49 +0200 Subject: [PATCH 02/27] [10.0][ADD] delivery_multi_destination OCA Transbot updated translations from Transifex --- delivery_multi_destination/README.rst | 33 ++------ delivery_multi_destination/__init__.py | 2 - .../{__openerp__.py => __manifest__.py} | 9 +-- delivery_multi_destination/hooks.py | 76 ------------------- delivery_multi_destination/i18n/de.po | 54 +++++++++++++ delivery_multi_destination/i18n/es.po | 54 +++++++++++++ delivery_multi_destination/i18n/fr.po | 54 +++++++++++++ delivery_multi_destination/i18n/it.po | 54 +++++++++++++ delivery_multi_destination/i18n/nl.po | 54 +++++++++++++ delivery_multi_destination/i18n/nl_NL.po | 54 +++++++++++++ delivery_multi_destination/i18n/pt_BR.po | 54 +++++++++++++ delivery_multi_destination/i18n/sl.po | 54 +++++++++++++ .../models/delivery_carrier.py | 8 +- .../tests/test_delivery_multi_destination.py | 52 ++++++++----- .../views/delivery_carrier_view.xml | 22 ++---- 15 files changed, 489 insertions(+), 145 deletions(-) rename delivery_multi_destination/{__openerp__.py => __manifest__.py} (66%) delete mode 100644 delivery_multi_destination/hooks.py create mode 100644 delivery_multi_destination/i18n/de.po create mode 100644 delivery_multi_destination/i18n/es.po create mode 100644 delivery_multi_destination/i18n/fr.po create mode 100644 delivery_multi_destination/i18n/it.po create mode 100644 delivery_multi_destination/i18n/nl.po create mode 100644 delivery_multi_destination/i18n/nl_NL.po create mode 100644 delivery_multi_destination/i18n/pt_BR.po create mode 100644 delivery_multi_destination/i18n/sl.po diff --git a/delivery_multi_destination/README.rst b/delivery_multi_destination/README.rst index 93ab093c1c..375bd30aed 100644 --- a/delivery_multi_destination/README.rst +++ b/delivery_multi_destination/README.rst @@ -1,35 +1,17 @@ .. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :target: https://www.gnu.org/licenses/agpl :alt: License: AGPL-3 ================================================== Multiple destinations for the same delivery method ================================================== -Module `delivery` in version 8 allows to set different price rules depending -on the destination. This is what is called a delivery grid. +This module allows to set different price rules depending on the destination. -In version 9, for simplifying delivery methods, Odoo has plained the structure, -lowering destinations at delivery method level, and removing delivery grid -model. - -This is not usable when you have different prices according the destination -of your delivery. - -This module restores the same concept, reusing the same model for nesting -several "children" delivery methods, one per possible destination. It has been -designed to reuse all possible extensions to the base delivery, without the -need to create a glue module for having multiple destinations. - -This module also handles if you're migrating from version 8 and you had -`delivery` module installed, to keep the delivery grids. - -Installation -============ - -If you installed the module on a version 8 migrated database, some operations -will be done for recovering delivery grids. If so, you need to have -**openupgradelib** library installed. +This module restores the concept of delivery grid, reusing the same model for +nesting several "children" delivery methods, one per possible destination. +It has been designed to reuse all possible extensions to the base delivery, +without the need to create a glue module for having multiple destinations. Configuration ============= @@ -51,7 +33,7 @@ Usage .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/99/9.0 + :target: https://runbot.odoo-community.org/runbot/99/10.0 Bug Tracker =========== @@ -73,6 +55,7 @@ Contributors ------------ * Pedro M. Baeza +* Luis M. Ontalba Maintainer ---------- diff --git a/delivery_multi_destination/__init__.py b/delivery_multi_destination/__init__.py index 79adc6aa13..ec50cfc0f3 100644 --- a/delivery_multi_destination/__init__.py +++ b/delivery_multi_destination/__init__.py @@ -2,5 +2,3 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from . import models -from .hooks import post_init_hook -from .hooks import uninstall_hook diff --git a/delivery_multi_destination/__openerp__.py b/delivery_multi_destination/__manifest__.py similarity index 66% rename from delivery_multi_destination/__openerp__.py rename to delivery_multi_destination/__manifest__.py index 08d04d38fb..08a8b34e82 100644 --- a/delivery_multi_destination/__openerp__.py +++ b/delivery_multi_destination/__manifest__.py @@ -1,12 +1,13 @@ # -*- coding: utf-8 -*- -# Copyright 2016 Pedro M. Baeza +# Copyright 2016-2017 Pedro M. Baeza +# Copyright 2017 Luis M. Ontalba # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { "name": "Multiple destinations for the same delivery method", - "version": "9.0.1.0.0", + "version": "10.0.1.0.0", "category": "Delivery", - "website": "https://www.tecnativa.com/", + "website": "https://github.com/OCA/delivery-carrier", "author": "Tecnativa, " "Odoo Community Association (OCA)", "license": "AGPL-3", @@ -17,6 +18,4 @@ "data": [ "views/delivery_carrier_view.xml", ], - "uninstall_hook": "uninstall_hook", - "post_init_hook": "post_init_hook", } diff --git a/delivery_multi_destination/hooks.py b/delivery_multi_destination/hooks.py deleted file mode 100644 index 646f902d62..0000000000 --- a/delivery_multi_destination/hooks.py +++ /dev/null @@ -1,76 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright 2016 Pedro M. Baeza -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -from openerp import api, SUPERUSER_ID -try: - from openupgradelib import openupgrade -except ImportError: - openupgrade = False - - -def migrate_from_v8(cr): - """Reconvert delivery carriers that were the grids from the same - v8 carrier again on childs with this new structure. - """ - cr.execute( - """ - SELECT COUNT({0}), {0} - FROM carrier_delivery - GROUP BY {0} - """.format(openupgrade.get_legacy_name('carrier_id')) - ) - rows = cr.fetchall() - with api.Environment.manage(): - env = api.Environment(cr, SUPERUSER_ID, {}) - carrier_obj = env['delivery.carrier'] - for count, old_carrier_id in rows: - if count <= 1: - continue - # Get children ids - cr.execute( - """ - SELECT id - FROM carrier_delivery - WHERE {0} = %s - """.format(openupgrade.get_legacy_name('carrier_id')), - (old_carrier_id, ) - ) - child_ids = [x[0] for x in cr.fetchall()] - # Get old carrier data - cr.execute( - """ - SELECT name, partner_id - FROM carrier_delivery - WHERE {0} = %s - """.format(openupgrade.get_legacy_name('carrier_id')), - (old_carrier_id, ) - ) - old_carrier_vals = cr.fetchone() - # Create new carrier and put the rest of the carriers as children - carrier = carrier_obj.create({ - 'name': old_carrier_vals[0], - 'partner_id': old_carrier_vals[1], - 'destination_type': 'multi', - }) - cr.execute( - """ - UPDATE carrier_delivery - SET parent_id = %s - WHERE ids = %s - """, (carrier.id, tuple(child_ids)) - ) - - -def post_init_hook(cr, registry): # pragma: no cover - if openupgrade and openupgrade.column_exists( - 'delivery_carrier', openupgrade.get_legacy_name('carrier_id')): - migrate_from_v8(cr) - - -def uninstall_hook(cr, registry): - with api.Environment.manage(): - env = api.Environment(cr, SUPERUSER_ID, {}) - act_window = env.ref('delivery.action_delivery_carrier_form') - if act_window: - act_window.domain = False diff --git a/delivery_multi_destination/i18n/de.po b/delivery_multi_destination/i18n/de.po new file mode 100644 index 0000000000..2ab05427d8 --- /dev/null +++ b/delivery_multi_destination/i18n/de.po @@ -0,0 +1,54 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * delivery_multi_destination +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-12-15 18:21+0000\n" +"PO-Revision-Date: 2017-12-15 18:21+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: de\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: delivery_multi_destination +#: model:ir.model,name:delivery_multi_destination.model_delivery_carrier +msgid "Carrier" +msgstr "Spediteur" + +#. module: delivery_multi_destination +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids +msgid "Destination grid" +msgstr "" + +#. module: delivery_multi_destination +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type +msgid "Destination type" +msgstr "" + +#. module: delivery_multi_destination +#: model:ir.ui.view,arch_db:delivery_multi_destination.view_delivery_carrier_form +msgid "Destinations" +msgstr "" + +#. module: delivery_multi_destination +#: selection:delivery.carrier,destination_type:0 +msgid "Multiple destinations" +msgstr "" + +#. module: delivery_multi_destination +#: selection:delivery.carrier,destination_type:0 +msgid "One destination" +msgstr "" + +#. module: delivery_multi_destination +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_parent_id +msgid "Parent carrier" +msgstr "" diff --git a/delivery_multi_destination/i18n/es.po b/delivery_multi_destination/i18n/es.po new file mode 100644 index 0000000000..bb0060d7ac --- /dev/null +++ b/delivery_multi_destination/i18n/es.po @@ -0,0 +1,54 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * delivery_multi_destination +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-12-15 18:21+0000\n" +"PO-Revision-Date: 2017-12-15 18:21+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: es\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: delivery_multi_destination +#: model:ir.model,name:delivery_multi_destination.model_delivery_carrier +msgid "Carrier" +msgstr "Transportista" + +#. module: delivery_multi_destination +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids +msgid "Destination grid" +msgstr "" + +#. module: delivery_multi_destination +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type +msgid "Destination type" +msgstr "" + +#. module: delivery_multi_destination +#: model:ir.ui.view,arch_db:delivery_multi_destination.view_delivery_carrier_form +msgid "Destinations" +msgstr "" + +#. module: delivery_multi_destination +#: selection:delivery.carrier,destination_type:0 +msgid "Multiple destinations" +msgstr "" + +#. module: delivery_multi_destination +#: selection:delivery.carrier,destination_type:0 +msgid "One destination" +msgstr "" + +#. module: delivery_multi_destination +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_parent_id +msgid "Parent carrier" +msgstr "" diff --git a/delivery_multi_destination/i18n/fr.po b/delivery_multi_destination/i18n/fr.po new file mode 100644 index 0000000000..e403139940 --- /dev/null +++ b/delivery_multi_destination/i18n/fr.po @@ -0,0 +1,54 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * delivery_multi_destination +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-12-15 18:21+0000\n" +"PO-Revision-Date: 2017-12-15 18:21+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: fr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: delivery_multi_destination +#: model:ir.model,name:delivery_multi_destination.model_delivery_carrier +msgid "Carrier" +msgstr "Transporteur" + +#. module: delivery_multi_destination +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids +msgid "Destination grid" +msgstr "" + +#. module: delivery_multi_destination +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type +msgid "Destination type" +msgstr "" + +#. module: delivery_multi_destination +#: model:ir.ui.view,arch_db:delivery_multi_destination.view_delivery_carrier_form +msgid "Destinations" +msgstr "" + +#. module: delivery_multi_destination +#: selection:delivery.carrier,destination_type:0 +msgid "Multiple destinations" +msgstr "" + +#. module: delivery_multi_destination +#: selection:delivery.carrier,destination_type:0 +msgid "One destination" +msgstr "" + +#. module: delivery_multi_destination +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_parent_id +msgid "Parent carrier" +msgstr "" diff --git a/delivery_multi_destination/i18n/it.po b/delivery_multi_destination/i18n/it.po new file mode 100644 index 0000000000..8c2a4f532f --- /dev/null +++ b/delivery_multi_destination/i18n/it.po @@ -0,0 +1,54 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * delivery_multi_destination +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-12-15 18:21+0000\n" +"PO-Revision-Date: 2017-12-15 18:21+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: it\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: delivery_multi_destination +#: model:ir.model,name:delivery_multi_destination.model_delivery_carrier +msgid "Carrier" +msgstr "Corriere" + +#. module: delivery_multi_destination +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids +msgid "Destination grid" +msgstr "" + +#. module: delivery_multi_destination +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type +msgid "Destination type" +msgstr "" + +#. module: delivery_multi_destination +#: model:ir.ui.view,arch_db:delivery_multi_destination.view_delivery_carrier_form +msgid "Destinations" +msgstr "" + +#. module: delivery_multi_destination +#: selection:delivery.carrier,destination_type:0 +msgid "Multiple destinations" +msgstr "" + +#. module: delivery_multi_destination +#: selection:delivery.carrier,destination_type:0 +msgid "One destination" +msgstr "" + +#. module: delivery_multi_destination +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_parent_id +msgid "Parent carrier" +msgstr "" diff --git a/delivery_multi_destination/i18n/nl.po b/delivery_multi_destination/i18n/nl.po new file mode 100644 index 0000000000..79462b016d --- /dev/null +++ b/delivery_multi_destination/i18n/nl.po @@ -0,0 +1,54 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * delivery_multi_destination +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-12-15 18:21+0000\n" +"PO-Revision-Date: 2017-12-15 18:21+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Dutch (https://www.transifex.com/oca/teams/23907/nl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: nl\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: delivery_multi_destination +#: model:ir.model,name:delivery_multi_destination.model_delivery_carrier +msgid "Carrier" +msgstr "Vervoerder" + +#. module: delivery_multi_destination +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids +msgid "Destination grid" +msgstr "" + +#. module: delivery_multi_destination +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type +msgid "Destination type" +msgstr "" + +#. module: delivery_multi_destination +#: model:ir.ui.view,arch_db:delivery_multi_destination.view_delivery_carrier_form +msgid "Destinations" +msgstr "" + +#. module: delivery_multi_destination +#: selection:delivery.carrier,destination_type:0 +msgid "Multiple destinations" +msgstr "" + +#. module: delivery_multi_destination +#: selection:delivery.carrier,destination_type:0 +msgid "One destination" +msgstr "" + +#. module: delivery_multi_destination +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_parent_id +msgid "Parent carrier" +msgstr "" diff --git a/delivery_multi_destination/i18n/nl_NL.po b/delivery_multi_destination/i18n/nl_NL.po new file mode 100644 index 0000000000..84d513b931 --- /dev/null +++ b/delivery_multi_destination/i18n/nl_NL.po @@ -0,0 +1,54 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * delivery_multi_destination +# +# Translators: +# Peter Hageman , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-12-15 18:21+0000\n" +"PO-Revision-Date: 2017-12-15 18:21+0000\n" +"Last-Translator: Peter Hageman , 2017\n" +"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: nl_NL\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: delivery_multi_destination +#: model:ir.model,name:delivery_multi_destination.model_delivery_carrier +msgid "Carrier" +msgstr "Vervoerder" + +#. module: delivery_multi_destination +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids +msgid "Destination grid" +msgstr "" + +#. module: delivery_multi_destination +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type +msgid "Destination type" +msgstr "" + +#. module: delivery_multi_destination +#: model:ir.ui.view,arch_db:delivery_multi_destination.view_delivery_carrier_form +msgid "Destinations" +msgstr "" + +#. module: delivery_multi_destination +#: selection:delivery.carrier,destination_type:0 +msgid "Multiple destinations" +msgstr "" + +#. module: delivery_multi_destination +#: selection:delivery.carrier,destination_type:0 +msgid "One destination" +msgstr "" + +#. module: delivery_multi_destination +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_parent_id +msgid "Parent carrier" +msgstr "" diff --git a/delivery_multi_destination/i18n/pt_BR.po b/delivery_multi_destination/i18n/pt_BR.po new file mode 100644 index 0000000000..4f30031c73 --- /dev/null +++ b/delivery_multi_destination/i18n/pt_BR.po @@ -0,0 +1,54 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * delivery_multi_destination +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-12-15 18:21+0000\n" +"PO-Revision-Date: 2017-12-15 18:21+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/23907/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: delivery_multi_destination +#: model:ir.model,name:delivery_multi_destination.model_delivery_carrier +msgid "Carrier" +msgstr "Transportador" + +#. module: delivery_multi_destination +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids +msgid "Destination grid" +msgstr "" + +#. module: delivery_multi_destination +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type +msgid "Destination type" +msgstr "" + +#. module: delivery_multi_destination +#: model:ir.ui.view,arch_db:delivery_multi_destination.view_delivery_carrier_form +msgid "Destinations" +msgstr "" + +#. module: delivery_multi_destination +#: selection:delivery.carrier,destination_type:0 +msgid "Multiple destinations" +msgstr "" + +#. module: delivery_multi_destination +#: selection:delivery.carrier,destination_type:0 +msgid "One destination" +msgstr "" + +#. module: delivery_multi_destination +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_parent_id +msgid "Parent carrier" +msgstr "" diff --git a/delivery_multi_destination/i18n/sl.po b/delivery_multi_destination/i18n/sl.po new file mode 100644 index 0000000000..24deece85e --- /dev/null +++ b/delivery_multi_destination/i18n/sl.po @@ -0,0 +1,54 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * delivery_multi_destination +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-12-15 18:21+0000\n" +"PO-Revision-Date: 2017-12-15 18:21+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: sl\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" + +#. module: delivery_multi_destination +#: model:ir.model,name:delivery_multi_destination.model_delivery_carrier +msgid "Carrier" +msgstr "Prevoznik" + +#. module: delivery_multi_destination +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids +msgid "Destination grid" +msgstr "" + +#. module: delivery_multi_destination +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type +msgid "Destination type" +msgstr "" + +#. module: delivery_multi_destination +#: model:ir.ui.view,arch_db:delivery_multi_destination.view_delivery_carrier_form +msgid "Destinations" +msgstr "" + +#. module: delivery_multi_destination +#: selection:delivery.carrier,destination_type:0 +msgid "Multiple destinations" +msgstr "" + +#. module: delivery_multi_destination +#: selection:delivery.carrier,destination_type:0 +msgid "One destination" +msgstr "" + +#. module: delivery_multi_destination +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_parent_id +msgid "Parent carrier" +msgstr "" diff --git a/delivery_multi_destination/models/delivery_carrier.py b/delivery_multi_destination/models/delivery_carrier.py index 133ede270a..96436dcf30 100644 --- a/delivery_multi_destination/models/delivery_carrier.py +++ b/delivery_multi_destination/models/delivery_carrier.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- # Copyright 2016 Pedro M. Baeza +# Copyright 2017 Luis M. Ontalba # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from openerp import api, fields, models -from openerp.tools import config +from odoo import api, fields, models class DeliveryCarrier(models.Model): @@ -26,9 +26,7 @@ class DeliveryCarrier(models.Model): @api.multi def verify_carrier(self, contact): - test_condition = (config['test_enable'] and - not self.env.context.get('test_delivery_multi')) - if test_condition or self.destination_type == 'one': + if self.destination_type == 'one': return super(DeliveryCarrier, self).verify_carrier(contact) for subcarrier in self.child_ids: if super(DeliveryCarrier, subcarrier).verify_carrier(contact): diff --git a/delivery_multi_destination/tests/test_delivery_multi_destination.py b/delivery_multi_destination/tests/test_delivery_multi_destination.py index 14d775faf8..9e3f3ddd96 100644 --- a/delivery_multi_destination/tests/test_delivery_multi_destination.py +++ b/delivery_multi_destination/tests/test_delivery_multi_destination.py @@ -1,9 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright +# Copyright 2017 Luis M. Ontalba # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from openerp.tests import common -from ..hooks import uninstall_hook class TestDeliveryMultiDestination(common.SavepointCase): @@ -13,35 +12,53 @@ def setUpClass(cls): cls.country_1 = cls.env['res.country'].create({ 'name': 'Test country 1', }) - cls.country_2 = cls.env['res.country'].create({ - 'name': 'Test country 2', - }) cls.partner_1 = cls.env['res.partner'].create({ 'name': 'Test partner 1', 'country_id': cls.country_1.id, }) + cls.country_2 = cls.env['res.country'].create({ + 'name': 'Test country 2', + }) + cls.state = cls.env['res.country.state'].create({ + 'name': 'Test state', + 'code': 'TS', + 'country_id': cls.country_2.id, + }) cls.partner_2 = cls.env['res.partner'].create({ 'name': 'Test partner 2', 'country_id': cls.country_2.id, + 'state_id': cls.state.id, + 'zip': '22222' + }) + cls.partner_3 = cls.env['res.partner'].create({ + 'name': 'Test partner 3', + 'country_id': cls.country_2.id, + 'state_id': cls.state.id, + 'zip': '33333' }) cls.carrier_multi = cls.env['delivery.carrier'].create({ 'name': 'Test carrier multi', - 'partner_id': cls.partner_1.id, 'destination_type': 'multi', 'delivery_type': 'fixed', 'fixed_price': 100, 'child_ids': [ (0, 0, { + 'name': 'Test child 1', 'sequence': 1, - 'partner_id': cls.partner_1.id, - 'country_ids': [(6, 0, cls.country_1.ids)], + 'country_ids': [(6, 0, cls.country_2.ids)], + 'state_ids': [(6, 0, cls.state.ids)], + 'zip_from': 20000, + 'zip_to': 29999, 'delivery_type': 'fixed', 'fixed_price': 50, }), (0, 0, { + 'name': 'Test child 2', 'sequence': 2, - 'partner_id': cls.partner_1.id, 'country_ids': [(6, 0, cls.country_2.ids)], + 'state_ids': [(6, 0, cls.state.ids)], + 'zip_from': 30000, + 'zip_to': 39999, 'delivery_type': 'fixed', 'fixed_price': 150, }) @@ -57,28 +74,27 @@ def setUpClass(cls): }) cls.sale_order = cls.env['sale.order'].create({ 'partner_id': cls.partner_1.id, + 'picking_policy': 'direct', 'order_line': [ (0, 0, { 'name': 'Test', 'product_id': cls.product.id, 'product_uom_qty': 1, + 'price_unit': 1, }), ] }) def test_delivery_multi_destination(self): - order = self.sale_order.with_context(test_delivery_multi=True) + order = self.sale_order order.carrier_id = self.carrier_single.id self.assertAlmostEqual(order.delivery_price, 100, 2) order.carrier_id = self.carrier_multi.id - self.assertAlmostEqual(order.delivery_price, 50, 2) - # HACK: Needed as Odoo doesn't recompute non stored fields in tests order.invalidate_cache() order.partner_shipping_id = self.partner_2.id - order.partner_id = self.partner_2.id + order.delivery_set() + self.assertAlmostEqual(order.delivery_price, 50, 2) + order.invalidate_cache() + order.partner_shipping_id = self.partner_3.id + order.delivery_set() self.assertAlmostEqual(order.delivery_price, 150, 2) - - def test_uninstall_hook(self): - uninstall_hook(self.env.cr, self.env.registry) - act_window = self.env.ref('delivery.action_delivery_carrier_form') - self.assertFalse(act_window.domain) diff --git a/delivery_multi_destination/views/delivery_carrier_view.xml b/delivery_multi_destination/views/delivery_carrier_view.xml index 2c5c2d3a2e..2e445fd65b 100644 --- a/delivery_multi_destination/views/delivery_carrier_view.xml +++ b/delivery_multi_destination/views/delivery_carrier_view.xml @@ -1,5 +1,6 @@ - @@ -8,27 +9,25 @@ delivery.carrier - + - + {'invisible': [('destination_type', '=', 'multi')]} {'invisible': [('destination_type', '=', 'multi')]} - - context.get('show_children_carriers', False) - @@ -39,13 +38,8 @@ delivery.carrier - - context.get('show_children_carriers', False) - - - context.get('show_children_carriers', False) - - + + From 0f09558c9424432b83c20019eb402f6aab50458c Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Sat, 23 Dec 2017 13:06:59 +0100 Subject: [PATCH 03/27] [FIX+IMP] delivery_multi_destination: Don't show children + demo (#148) * Don't show children carriers on many2one selections * Don't search by default children carriers * Add demo data OCA Transbot updated translations from Transifex --- delivery_multi_destination/__manifest__.py | 5 +- .../demo/delivery_carrier_demo.xml | 71 ++++++++++++++++ delivery_multi_destination/i18n/cs_CZ.po | 83 +++++++++++++++++++ delivery_multi_destination/i18n/de.po | 32 ++++++- .../i18n/delivery_multi_destination.pot | 78 +++++++++++++++++ delivery_multi_destination/i18n/es.po | 49 ++++++++--- delivery_multi_destination/i18n/fr.po | 32 ++++++- delivery_multi_destination/i18n/it.po | 32 ++++++- delivery_multi_destination/i18n/nl.po | 32 ++++++- delivery_multi_destination/i18n/nl_NL.po | 35 +++++++- delivery_multi_destination/i18n/pt_BR.po | 35 +++++++- delivery_multi_destination/i18n/sl.po | 35 +++++++- .../models/delivery_carrier.py | 24 +++++- .../tests/test_delivery_multi_destination.py | 16 ++++ .../views/delivery_carrier_view.xml | 13 +-- 15 files changed, 537 insertions(+), 35 deletions(-) create mode 100644 delivery_multi_destination/demo/delivery_carrier_demo.xml create mode 100644 delivery_multi_destination/i18n/cs_CZ.po create mode 100644 delivery_multi_destination/i18n/delivery_multi_destination.pot diff --git a/delivery_multi_destination/__manifest__.py b/delivery_multi_destination/__manifest__.py index 08a8b34e82..28a08a4fb1 100644 --- a/delivery_multi_destination/__manifest__.py +++ b/delivery_multi_destination/__manifest__.py @@ -5,7 +5,7 @@ { "name": "Multiple destinations for the same delivery method", - "version": "10.0.1.0.0", + "version": "10.0.1.1.0", "category": "Delivery", "website": "https://github.com/OCA/delivery-carrier", "author": "Tecnativa, " @@ -15,6 +15,9 @@ "depends": [ "delivery", ], + "demo": [ + "demo/delivery_carrier_demo.xml", + ], "data": [ "views/delivery_carrier_view.xml", ], diff --git a/delivery_multi_destination/demo/delivery_carrier_demo.xml b/delivery_multi_destination/demo/delivery_carrier_demo.xml new file mode 100644 index 0000000000..7eadbd1668 --- /dev/null +++ b/delivery_multi_destination/demo/delivery_carrier_demo.xml @@ -0,0 +1,71 @@ + + + + + International Carrier Inc. + 4 + service + + multi + + + + Belgium + + 20 + 1 + base_on_rule + service + + + + + + + + + + + + + + + >= + + + + + + + + + >= + price + + + + + + + France + + 40 + 2 + fixed + service + + + + + + United Kingdom + + 60 + 2 + fixed + service + + + + + diff --git a/delivery_multi_destination/i18n/cs_CZ.po b/delivery_multi_destination/i18n/cs_CZ.po new file mode 100644 index 0000000000..b7c9941141 --- /dev/null +++ b/delivery_multi_destination/i18n/cs_CZ.po @@ -0,0 +1,83 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * delivery_multi_destination +# +# Translators: +# Lukáš Spurný , 2018 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-02-28 01:44+0000\n" +"PO-Revision-Date: 2018-02-28 01:44+0000\n" +"Last-Translator: Lukáš Spurný , 2018\n" +"Language-Team: Czech (Czech Republic) (https://www.transifex.com/oca/" +"teams/23907/cs_CZ/)\n" +"Language: cs_CZ\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_1 +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_template +msgid "Belgium" +msgstr "Belgie" + +#. module: delivery_multi_destination +#: model:ir.model,name:delivery_multi_destination.model_delivery_carrier +msgid "Carrier" +msgstr "Dopravce" + +#. module: delivery_multi_destination +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids +msgid "Destination grid" +msgstr "Destinační mřížka" + +#. module: delivery_multi_destination +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type +msgid "Destination type" +msgstr "Typ cíle" + +#. module: delivery_multi_destination +#: model:ir.ui.view,arch_db:delivery_multi_destination.view_delivery_carrier_form +msgid "Destinations" +msgstr "Destinace" + +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_2 +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_template +msgid "France" +msgstr "Francie" + +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_product_template +msgid "International Carrier Inc." +msgstr "Mezinárodní dopravce Inc." + +#. module: delivery_multi_destination +#: selection:delivery.carrier,destination_type:0 +msgid "Multiple destinations" +msgstr "Více cílů" + +#. module: delivery_multi_destination +#: selection:delivery.carrier,destination_type:0 +msgid "One destination" +msgstr "Jeden cíl" + +#. module: delivery_multi_destination +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_parent_id +msgid "Parent carrier" +msgstr "Nadřazený dopravce" + +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_3 +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_template +msgid "United Kingdom" +msgstr "Spojené království" diff --git a/delivery_multi_destination/i18n/de.po b/delivery_multi_destination/i18n/de.po index 2ab05427d8..64dd5ffd09 100644 --- a/delivery_multi_destination/i18n/de.po +++ b/delivery_multi_destination/i18n/de.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * delivery_multi_destination -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,12 +12,19 @@ msgstr "" "PO-Revision-Date: 2017-12-15 18:21+0000\n" "Last-Translator: OCA Transbot , 2017\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" -"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_1 +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_template +msgid "Belgium" +msgstr "" + #. module: delivery_multi_destination #: model:ir.model,name:delivery_multi_destination.model_delivery_carrier msgid "Carrier" @@ -38,6 +45,20 @@ msgstr "" msgid "Destinations" msgstr "" +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_2 +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_template +msgid "France" +msgstr "" + +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_product_template +msgid "International Carrier Inc." +msgstr "" + #. module: delivery_multi_destination #: selection:delivery.carrier,destination_type:0 msgid "Multiple destinations" @@ -52,3 +73,10 @@ msgstr "" #: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_parent_id msgid "Parent carrier" msgstr "" + +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_3 +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_template +msgid "United Kingdom" +msgstr "" diff --git a/delivery_multi_destination/i18n/delivery_multi_destination.pot b/delivery_multi_destination/i18n/delivery_multi_destination.pot new file mode 100644 index 0000000000..4932f4bb5c --- /dev/null +++ b/delivery_multi_destination/i18n/delivery_multi_destination.pot @@ -0,0 +1,78 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * delivery_multi_destination +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_1 +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_template +msgid "Belgium" +msgstr "" + +#. module: delivery_multi_destination +#: model:ir.model,name:delivery_multi_destination.model_delivery_carrier +msgid "Carrier" +msgstr "" + +#. module: delivery_multi_destination +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids +msgid "Destination grid" +msgstr "" + +#. module: delivery_multi_destination +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type +msgid "Destination type" +msgstr "" + +#. module: delivery_multi_destination +#: model:ir.ui.view,arch_db:delivery_multi_destination.view_delivery_carrier_form +msgid "Destinations" +msgstr "" + +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_2 +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_template +msgid "France" +msgstr "" + +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_product_template +msgid "International Carrier Inc." +msgstr "" + +#. module: delivery_multi_destination +#: selection:delivery.carrier,destination_type:0 +msgid "Multiple destinations" +msgstr "" + +#. module: delivery_multi_destination +#: selection:delivery.carrier,destination_type:0 +msgid "One destination" +msgstr "" + +#. module: delivery_multi_destination +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_parent_id +msgid "Parent carrier" +msgstr "" + +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_3 +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_template +msgid "United Kingdom" +msgstr "" + diff --git a/delivery_multi_destination/i18n/es.po b/delivery_multi_destination/i18n/es.po index bb0060d7ac..95ba20546f 100644 --- a/delivery_multi_destination/i18n/es.po +++ b/delivery_multi_destination/i18n/es.po @@ -1,23 +1,31 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * delivery_multi_destination -# +# # Translators: # OCA Transbot , 2017 +# enjolras , 2018 msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-15 18:21+0000\n" -"PO-Revision-Date: 2017-12-15 18:21+0000\n" -"Last-Translator: OCA Transbot , 2017\n" +"POT-Creation-Date: 2018-03-13 03:45+0000\n" +"PO-Revision-Date: 2018-03-13 03:45+0000\n" +"Last-Translator: enjolras , 2018\n" "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_1 +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_template +msgid "Belgium" +msgstr "Bélgica" + #. module: delivery_multi_destination #: model:ir.model,name:delivery_multi_destination.model_delivery_carrier msgid "Carrier" @@ -31,24 +39,45 @@ msgstr "" #. module: delivery_multi_destination #: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type msgid "Destination type" -msgstr "" +msgstr "Tipo de destino" #. module: delivery_multi_destination #: model:ir.ui.view,arch_db:delivery_multi_destination.view_delivery_carrier_form msgid "Destinations" -msgstr "" +msgstr "Destinos" + +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_2 +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_template +msgid "France" +msgstr "Francia" + +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_product_template +msgid "International Carrier Inc." +msgstr "Transportes Internacionales, S.A." #. module: delivery_multi_destination #: selection:delivery.carrier,destination_type:0 msgid "Multiple destinations" -msgstr "" +msgstr "Destino múltiples" #. module: delivery_multi_destination #: selection:delivery.carrier,destination_type:0 msgid "One destination" -msgstr "" +msgstr "Un destino" #. module: delivery_multi_destination #: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_parent_id msgid "Parent carrier" -msgstr "" +msgstr "Transportista matriz" + +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_3 +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_template +msgid "United Kingdom" +msgstr "Reino Unido" diff --git a/delivery_multi_destination/i18n/fr.po b/delivery_multi_destination/i18n/fr.po index e403139940..469f1f12dc 100644 --- a/delivery_multi_destination/i18n/fr.po +++ b/delivery_multi_destination/i18n/fr.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * delivery_multi_destination -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,12 +12,19 @@ msgstr "" "PO-Revision-Date: 2017-12-15 18:21+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_1 +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_template +msgid "Belgium" +msgstr "" + #. module: delivery_multi_destination #: model:ir.model,name:delivery_multi_destination.model_delivery_carrier msgid "Carrier" @@ -38,6 +45,20 @@ msgstr "" msgid "Destinations" msgstr "" +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_2 +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_template +msgid "France" +msgstr "" + +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_product_template +msgid "International Carrier Inc." +msgstr "" + #. module: delivery_multi_destination #: selection:delivery.carrier,destination_type:0 msgid "Multiple destinations" @@ -52,3 +73,10 @@ msgstr "" #: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_parent_id msgid "Parent carrier" msgstr "" + +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_3 +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_template +msgid "United Kingdom" +msgstr "" diff --git a/delivery_multi_destination/i18n/it.po b/delivery_multi_destination/i18n/it.po index 8c2a4f532f..15a15a0a66 100644 --- a/delivery_multi_destination/i18n/it.po +++ b/delivery_multi_destination/i18n/it.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * delivery_multi_destination -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,12 +12,19 @@ msgstr "" "PO-Revision-Date: 2017-12-15 18:21+0000\n" "Last-Translator: OCA Transbot , 2017\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" -"Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_1 +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_template +msgid "Belgium" +msgstr "" + #. module: delivery_multi_destination #: model:ir.model,name:delivery_multi_destination.model_delivery_carrier msgid "Carrier" @@ -38,6 +45,20 @@ msgstr "" msgid "Destinations" msgstr "" +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_2 +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_template +msgid "France" +msgstr "" + +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_product_template +msgid "International Carrier Inc." +msgstr "" + #. module: delivery_multi_destination #: selection:delivery.carrier,destination_type:0 msgid "Multiple destinations" @@ -52,3 +73,10 @@ msgstr "" #: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_parent_id msgid "Parent carrier" msgstr "" + +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_3 +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_template +msgid "United Kingdom" +msgstr "" diff --git a/delivery_multi_destination/i18n/nl.po b/delivery_multi_destination/i18n/nl.po index 79462b016d..cd469decc4 100644 --- a/delivery_multi_destination/i18n/nl.po +++ b/delivery_multi_destination/i18n/nl.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * delivery_multi_destination -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,12 +12,19 @@ msgstr "" "PO-Revision-Date: 2017-12-15 18:21+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Dutch (https://www.transifex.com/oca/teams/23907/nl/)\n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_1 +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_template +msgid "Belgium" +msgstr "" + #. module: delivery_multi_destination #: model:ir.model,name:delivery_multi_destination.model_delivery_carrier msgid "Carrier" @@ -38,6 +45,20 @@ msgstr "" msgid "Destinations" msgstr "" +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_2 +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_template +msgid "France" +msgstr "" + +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_product_template +msgid "International Carrier Inc." +msgstr "" + #. module: delivery_multi_destination #: selection:delivery.carrier,destination_type:0 msgid "Multiple destinations" @@ -52,3 +73,10 @@ msgstr "" #: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_parent_id msgid "Parent carrier" msgstr "" + +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_3 +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_template +msgid "United Kingdom" +msgstr "" diff --git a/delivery_multi_destination/i18n/nl_NL.po b/delivery_multi_destination/i18n/nl_NL.po index 84d513b931..d01f5d6be9 100644 --- a/delivery_multi_destination/i18n/nl_NL.po +++ b/delivery_multi_destination/i18n/nl_NL.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * delivery_multi_destination -# +# # Translators: # Peter Hageman , 2017 msgid "" @@ -11,13 +11,21 @@ msgstr "" "POT-Creation-Date: 2017-12-15 18:21+0000\n" "PO-Revision-Date: 2017-12-15 18:21+0000\n" "Last-Translator: Peter Hageman , 2017\n" -"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n" +"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/" +"teams/23907/nl_NL/)\n" +"Language: nl_NL\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: nl_NL\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_1 +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_template +msgid "Belgium" +msgstr "" + #. module: delivery_multi_destination #: model:ir.model,name:delivery_multi_destination.model_delivery_carrier msgid "Carrier" @@ -38,6 +46,20 @@ msgstr "" msgid "Destinations" msgstr "" +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_2 +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_template +msgid "France" +msgstr "" + +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_product_template +msgid "International Carrier Inc." +msgstr "" + #. module: delivery_multi_destination #: selection:delivery.carrier,destination_type:0 msgid "Multiple destinations" @@ -52,3 +74,10 @@ msgstr "" #: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_parent_id msgid "Parent carrier" msgstr "" + +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_3 +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_template +msgid "United Kingdom" +msgstr "" diff --git a/delivery_multi_destination/i18n/pt_BR.po b/delivery_multi_destination/i18n/pt_BR.po index 4f30031c73..0380a654b5 100644 --- a/delivery_multi_destination/i18n/pt_BR.po +++ b/delivery_multi_destination/i18n/pt_BR.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * delivery_multi_destination -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,13 +11,21 @@ msgstr "" "POT-Creation-Date: 2017-12-15 18:21+0000\n" "PO-Revision-Date: 2017-12-15 18:21+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/23907/pt_BR/)\n" +"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/" +"teams/23907/pt_BR/)\n" +"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: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_1 +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_template +msgid "Belgium" +msgstr "" + #. module: delivery_multi_destination #: model:ir.model,name:delivery_multi_destination.model_delivery_carrier msgid "Carrier" @@ -38,6 +46,20 @@ msgstr "" msgid "Destinations" msgstr "" +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_2 +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_template +msgid "France" +msgstr "" + +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_product_template +msgid "International Carrier Inc." +msgstr "" + #. module: delivery_multi_destination #: selection:delivery.carrier,destination_type:0 msgid "Multiple destinations" @@ -52,3 +74,10 @@ msgstr "" #: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_parent_id msgid "Parent carrier" msgstr "" + +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_3 +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_template +msgid "United Kingdom" +msgstr "" diff --git a/delivery_multi_destination/i18n/sl.po b/delivery_multi_destination/i18n/sl.po index 24deece85e..564558d0fb 100644 --- a/delivery_multi_destination/i18n/sl.po +++ b/delivery_multi_destination/i18n/sl.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * delivery_multi_destination -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,11 +12,19 @@ msgstr "" "PO-Revision-Date: 2017-12-15 18:21+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: sl\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" +"%100==4 ? 2 : 3);\n" + +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_1 +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_template +msgid "Belgium" +msgstr "" #. module: delivery_multi_destination #: model:ir.model,name:delivery_multi_destination.model_delivery_carrier @@ -38,6 +46,20 @@ msgstr "" msgid "Destinations" msgstr "" +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_2 +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_template +msgid "France" +msgstr "" + +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_product_template +msgid "International Carrier Inc." +msgstr "" + #. module: delivery_multi_destination #: selection:delivery.carrier,destination_type:0 msgid "Multiple destinations" @@ -52,3 +74,10 @@ msgstr "" #: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_parent_id msgid "Parent carrier" msgstr "" + +#. module: delivery_multi_destination +#: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_3 +#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_product +#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_template +msgid "United Kingdom" +msgstr "" diff --git a/delivery_multi_destination/models/delivery_carrier.py b/delivery_multi_destination/models/delivery_carrier.py index 96436dcf30..f215327cdf 100644 --- a/delivery_multi_destination/models/delivery_carrier.py +++ b/delivery_multi_destination/models/delivery_carrier.py @@ -24,10 +24,32 @@ class DeliveryCarrier(models.Model): default="one", required=True, ) + def search(self, args, offset=0, limit=None, order=None, count=False): + """Don't show by default children carriers.""" + if not self.env.context.get('show_children_carriers'): + if args is None: + args = [] + args += [('parent_id', '=', False)] + return super(DeliveryCarrier, self).search( + args, offset=offset, limit=limit, order=order, count=count, + ) + + @api.model + def name_search(self, name='', args=None, operator='ilike', limit=100): + """Don't show by default children carriers.""" + if not self.env.context.get('show_children_carriers'): + if args is None: + args = [] + args += [('parent_id', '=', False)] + return super(DeliveryCarrier, self)._name_search( + name=name, args=args, operator=operator, limit=limit, + ) + @api.multi def verify_carrier(self, contact): if self.destination_type == 'one': return super(DeliveryCarrier, self).verify_carrier(contact) - for subcarrier in self.child_ids: + carrier = self.with_context(show_children_carriers=True) + for subcarrier in carrier.child_ids: if super(DeliveryCarrier, subcarrier).verify_carrier(contact): return subcarrier diff --git a/delivery_multi_destination/tests/test_delivery_multi_destination.py b/delivery_multi_destination/tests/test_delivery_multi_destination.py index 9e3f3ddd96..a2e6ec625f 100644 --- a/delivery_multi_destination/tests/test_delivery_multi_destination.py +++ b/delivery_multi_destination/tests/test_delivery_multi_destination.py @@ -98,3 +98,19 @@ def test_delivery_multi_destination(self): order.partner_shipping_id = self.partner_3.id order.delivery_set() self.assertAlmostEqual(order.delivery_price, 150, 2) + + def test_search(self): + carriers = self.env['delivery.carrier'].search([]) + children_carrier = self.carrier_multi.with_context( + show_children_carriers=True, + ).child_ids[0] + self.assertNotIn(children_carrier, carriers) + + def test_name_search(self): + carrier_names = self.env['delivery.carrier'].name_search() + children_carrier = self.carrier_multi.with_context( + show_children_carriers=True, + ).child_ids[0] + self.assertTrue( + all(x[0] != children_carrier.id for x in carrier_names) + ) diff --git a/delivery_multi_destination/views/delivery_carrier_view.xml b/delivery_multi_destination/views/delivery_carrier_view.xml index 2e445fd65b..3942b90b45 100644 --- a/delivery_multi_destination/views/delivery_carrier_view.xml +++ b/delivery_multi_destination/views/delivery_carrier_view.xml @@ -11,7 +11,7 @@ @@ -41,16 +41,16 @@ @@ -58,6 +58,7 @@ [('parent_id', '=', False)] + {'show_children_carriers': True} From b5ecdf4882ec45fd55f0ee04b934c7cd8719139c Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Fri, 18 Jan 2019 01:20:55 +0100 Subject: [PATCH 04/27] [MIG] delivery_multi_destination: Migration to 11.0 * Standard procedure * README by fragments * Code changed to follow v11 logic * Tests adapted and expanded --- delivery_multi_destination/README.rst | 76 ++- delivery_multi_destination/__init__.py | 1 - delivery_multi_destination/__manifest__.py | 5 +- .../demo/delivery_carrier_demo.xml | 35 +- delivery_multi_destination/i18n/cs_CZ.po | 42 +- delivery_multi_destination/i18n/de.po | 36 +- .../i18n/delivery_multi_destination.pot | 38 +- delivery_multi_destination/i18n/es.po | 42 +- delivery_multi_destination/i18n/fr.po | 36 +- delivery_multi_destination/i18n/it.po | 36 +- delivery_multi_destination/i18n/nl.po | 36 +- delivery_multi_destination/i18n/nl_NL.po | 36 +- delivery_multi_destination/i18n/pt_BR.po | 36 +- delivery_multi_destination/i18n/sl.po | 36 +- delivery_multi_destination/models/__init__.py | 1 - .../models/delivery_carrier.py | 35 +- .../readme/CONFIGURE.rst | 8 + .../readme/CONTRIBUTORS.rst | 4 + .../readme/DESCRIPTION.rst | 6 + delivery_multi_destination/readme/ROADMAP.rst | 2 + delivery_multi_destination/readme/USAGE.rst | 2 + .../static/description/index.html | 456 ++++++++++++++++++ delivery_multi_destination/tests/__init__.py | 1 - .../tests/test_delivery_multi_destination.py | 34 +- 24 files changed, 863 insertions(+), 177 deletions(-) create mode 100644 delivery_multi_destination/readme/CONFIGURE.rst create mode 100644 delivery_multi_destination/readme/CONTRIBUTORS.rst create mode 100644 delivery_multi_destination/readme/DESCRIPTION.rst create mode 100644 delivery_multi_destination/readme/ROADMAP.rst create mode 100644 delivery_multi_destination/readme/USAGE.rst create mode 100644 delivery_multi_destination/static/description/index.html diff --git a/delivery_multi_destination/README.rst b/delivery_multi_destination/README.rst index 375bd30aed..f6cfc5ad6a 100644 --- a/delivery_multi_destination/README.rst +++ b/delivery_multi_destination/README.rst @@ -1,11 +1,30 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :target: https://www.gnu.org/licenses/agpl - :alt: License: AGPL-3 - ================================================== Multiple destinations for the same delivery method ================================================== +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fdelivery--carrier-lightgray.png?logo=github + :target: https://github.com/OCA/delivery-carrier/tree/11.0/delivery_multi_destination + :alt: OCA/delivery-carrier +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/delivery-carrier-11-0/delivery-carrier-11-0-delivery_multi_destination + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/99/11.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + This module allows to set different price rules depending on the destination. This module restores the concept of delivery grid, reusing the same model for @@ -13,6 +32,11 @@ nesting several "children" delivery methods, one per possible destination. It has been designed to reuse all possible extensions to the base delivery, without the need to create a glue module for having multiple destinations. +**Table of contents** + +.. contents:: + :local: + Configuration ============= @@ -31,43 +55,51 @@ Usage #. When using the delivery method in a Sales order, delivery address will be used for computing the delivery price according introduced destinations. -.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas - :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/99/10.0 +Known issues / Roadmap +====================== + +* Delivery prices for e-commerce (`website_sale_delivery` module) might need + an extra module for handling everything properly. Bug Tracker =========== -Bugs are tracked on `GitHub Issues -`_. In case of trouble, please -check there if your issue has already been reported. If you spotted it first, -help us smashing it by providing a detailed and welcomed feedback. +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. Credits ======= -Images ------- +Authors +~~~~~~~ -* Odoo Community Association: `Icon `_. +* Tecnativa Contributors ------------- +~~~~~~~~~~~~ -* Pedro M. Baeza -* Luis M. Ontalba +* `Tecnativa __`: -Maintainer ----------- + * Pedro M. Baeza + * Luis M. Ontalba + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. .. image:: https://odoo-community.org/logo.png :alt: Odoo Community Association :target: https://odoo-community.org -This module is maintained by the OCA. - OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -To contribute to this module, please visit https://odoo-community.org. +This module is part of the `OCA/delivery-carrier `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/delivery_multi_destination/__init__.py b/delivery_multi_destination/__init__.py index ec50cfc0f3..69f7babdfb 100644 --- a/delivery_multi_destination/__init__.py +++ b/delivery_multi_destination/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from . import models diff --git a/delivery_multi_destination/__manifest__.py b/delivery_multi_destination/__manifest__.py index 28a08a4fb1..7a6854d6d8 100644 --- a/delivery_multi_destination/__manifest__.py +++ b/delivery_multi_destination/__manifest__.py @@ -1,11 +1,10 @@ -# -*- coding: utf-8 -*- -# Copyright 2016-2017 Pedro M. Baeza +# Copyright 2016-2019 Tecnativa - Pedro M. Baeza # Copyright 2017 Luis M. Ontalba # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { "name": "Multiple destinations for the same delivery method", - "version": "10.0.1.1.0", + "version": "11.0.1.0.0", "category": "Delivery", "website": "https://github.com/OCA/delivery-carrier", "author": "Tecnativa, " diff --git a/delivery_multi_destination/demo/delivery_carrier_demo.xml b/delivery_multi_destination/demo/delivery_carrier_demo.xml index 7eadbd1668..c266ae0485 100644 --- a/delivery_multi_destination/demo/delivery_carrier_demo.xml +++ b/delivery_multi_destination/demo/delivery_carrier_demo.xml @@ -1,12 +1,21 @@ + + International Carrier Inc. + service + + International Carrier Inc. 4 - service - multi + + + + + International Carrier Inc., Belgium + service @@ -15,16 +24,14 @@ 20 1 base_on_rule - service - + - @@ -33,7 +40,6 @@ >= - @@ -43,7 +49,11 @@ price - + + + + International Carrier Inc., France + service @@ -52,9 +62,13 @@ 40 2 fixed - service - + + + + + International Carrier Inc., United Kingdom + service @@ -63,9 +77,8 @@ 60 2 fixed - service - + diff --git a/delivery_multi_destination/i18n/cs_CZ.po b/delivery_multi_destination/i18n/cs_CZ.po index b7c9941141..0886136ef1 100644 --- a/delivery_multi_destination/i18n/cs_CZ.po +++ b/delivery_multi_destination/i18n/cs_CZ.po @@ -21,8 +21,6 @@ msgstr "" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_1 -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_template msgid "Belgium" msgstr "Belgie" @@ -31,16 +29,17 @@ msgstr "Belgie" msgid "Carrier" msgstr "Dopravce" +#. module: delivery_multi_destination +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type +#, fuzzy +msgid "Destination Type" +msgstr "Typ cíle" + #. module: delivery_multi_destination #: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids msgid "Destination grid" msgstr "Destinační mřížka" -#. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type -msgid "Destination type" -msgstr "Typ cíle" - #. module: delivery_multi_destination #: model:ir.ui.view,arch_db:delivery_multi_destination.view_delivery_carrier_form msgid "Destinations" @@ -48,18 +47,37 @@ msgstr "Destinace" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_2 -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_template msgid "France" msgstr "Francie" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_product_template +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_product_template msgid "International Carrier Inc." msgstr "Mezinárodní dopravce Inc." +#. module: delivery_multi_destination +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1 +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1_product_template +#, fuzzy +msgid "International Carrier Inc., Belgium" +msgstr "Mezinárodní dopravce Inc." + +#. module: delivery_multi_destination +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2 +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2_product_template +#, fuzzy +msgid "International Carrier Inc., France" +msgstr "Mezinárodní dopravce Inc." + +#. module: delivery_multi_destination +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3 +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3_product_template +#, fuzzy +msgid "International Carrier Inc., United Kingdom" +msgstr "Mezinárodní dopravce Inc." + #. module: delivery_multi_destination #: selection:delivery.carrier,destination_type:0 msgid "Multiple destinations" @@ -77,7 +95,5 @@ msgstr "Nadřazený dopravce" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_3 -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_template msgid "United Kingdom" msgstr "Spojené království" diff --git a/delivery_multi_destination/i18n/de.po b/delivery_multi_destination/i18n/de.po index 64dd5ffd09..95cde3473c 100644 --- a/delivery_multi_destination/i18n/de.po +++ b/delivery_multi_destination/i18n/de.po @@ -20,8 +20,6 @@ msgstr "" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_1 -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_template msgid "Belgium" msgstr "" @@ -31,13 +29,13 @@ msgid "Carrier" msgstr "Spediteur" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids -msgid "Destination grid" +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type +msgid "Destination Type" msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type -msgid "Destination type" +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids +msgid "Destination grid" msgstr "" #. module: delivery_multi_destination @@ -47,18 +45,34 @@ msgstr "" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_2 -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_template msgid "France" msgstr "" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_product_template +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_product_template msgid "International Carrier Inc." msgstr "" +#. module: delivery_multi_destination +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1 +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1_product_template +msgid "International Carrier Inc., Belgium" +msgstr "" + +#. module: delivery_multi_destination +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2 +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2_product_template +msgid "International Carrier Inc., France" +msgstr "" + +#. module: delivery_multi_destination +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3 +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3_product_template +msgid "International Carrier Inc., United Kingdom" +msgstr "" + #. module: delivery_multi_destination #: selection:delivery.carrier,destination_type:0 msgid "Multiple destinations" @@ -76,7 +90,5 @@ msgstr "" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_3 -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_template msgid "United Kingdom" msgstr "" diff --git a/delivery_multi_destination/i18n/delivery_multi_destination.pot b/delivery_multi_destination/i18n/delivery_multi_destination.pot index 4932f4bb5c..72f0531527 100644 --- a/delivery_multi_destination/i18n/delivery_multi_destination.pot +++ b/delivery_multi_destination/i18n/delivery_multi_destination.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.0\n" +"Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: <>\n" "Language-Team: \n" @@ -15,8 +15,6 @@ msgstr "" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_1 -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_template msgid "Belgium" msgstr "" @@ -26,13 +24,13 @@ msgid "Carrier" msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids -msgid "Destination grid" +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type +msgid "Destination Type" msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type -msgid "Destination type" +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids +msgid "Destination grid" msgstr "" #. module: delivery_multi_destination @@ -42,18 +40,34 @@ msgstr "" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_2 -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_template msgid "France" msgstr "" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_product_template +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_product_template msgid "International Carrier Inc." msgstr "" +#. module: delivery_multi_destination +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1 +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1_product_template +msgid "International Carrier Inc., Belgium" +msgstr "" + +#. module: delivery_multi_destination +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2 +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2_product_template +msgid "International Carrier Inc., France" +msgstr "" + +#. module: delivery_multi_destination +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3 +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3_product_template +msgid "International Carrier Inc., United Kingdom" +msgstr "" + #. module: delivery_multi_destination #: selection:delivery.carrier,destination_type:0 msgid "Multiple destinations" @@ -71,8 +85,6 @@ msgstr "" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_3 -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_template msgid "United Kingdom" msgstr "" diff --git a/delivery_multi_destination/i18n/es.po b/delivery_multi_destination/i18n/es.po index 95ba20546f..4e052331c4 100644 --- a/delivery_multi_destination/i18n/es.po +++ b/delivery_multi_destination/i18n/es.po @@ -21,8 +21,6 @@ msgstr "" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_1 -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_template msgid "Belgium" msgstr "Bélgica" @@ -31,16 +29,17 @@ msgstr "Bélgica" msgid "Carrier" msgstr "Transportista" +#. module: delivery_multi_destination +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type +#, fuzzy +msgid "Destination Type" +msgstr "Tipo de destino" + #. module: delivery_multi_destination #: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids msgid "Destination grid" msgstr "" -#. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type -msgid "Destination type" -msgstr "Tipo de destino" - #. module: delivery_multi_destination #: model:ir.ui.view,arch_db:delivery_multi_destination.view_delivery_carrier_form msgid "Destinations" @@ -48,18 +47,37 @@ msgstr "Destinos" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_2 -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_template msgid "France" msgstr "Francia" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_product_template +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_product_template msgid "International Carrier Inc." msgstr "Transportes Internacionales, S.A." +#. module: delivery_multi_destination +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1 +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1_product_template +#, fuzzy +msgid "International Carrier Inc., Belgium" +msgstr "Transportes Internacionales, S.A." + +#. module: delivery_multi_destination +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2 +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2_product_template +#, fuzzy +msgid "International Carrier Inc., France" +msgstr "Transportes Internacionales, S.A." + +#. module: delivery_multi_destination +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3 +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3_product_template +#, fuzzy +msgid "International Carrier Inc., United Kingdom" +msgstr "Transportes Internacionales, S.A." + #. module: delivery_multi_destination #: selection:delivery.carrier,destination_type:0 msgid "Multiple destinations" @@ -77,7 +95,5 @@ msgstr "Transportista matriz" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_3 -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_template msgid "United Kingdom" msgstr "Reino Unido" diff --git a/delivery_multi_destination/i18n/fr.po b/delivery_multi_destination/i18n/fr.po index 469f1f12dc..b73dd87e5d 100644 --- a/delivery_multi_destination/i18n/fr.po +++ b/delivery_multi_destination/i18n/fr.po @@ -20,8 +20,6 @@ msgstr "" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_1 -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_template msgid "Belgium" msgstr "" @@ -31,13 +29,13 @@ msgid "Carrier" msgstr "Transporteur" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids -msgid "Destination grid" +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type +msgid "Destination Type" msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type -msgid "Destination type" +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids +msgid "Destination grid" msgstr "" #. module: delivery_multi_destination @@ -47,18 +45,34 @@ msgstr "" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_2 -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_template msgid "France" msgstr "" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_product_template +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_product_template msgid "International Carrier Inc." msgstr "" +#. module: delivery_multi_destination +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1 +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1_product_template +msgid "International Carrier Inc., Belgium" +msgstr "" + +#. module: delivery_multi_destination +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2 +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2_product_template +msgid "International Carrier Inc., France" +msgstr "" + +#. module: delivery_multi_destination +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3 +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3_product_template +msgid "International Carrier Inc., United Kingdom" +msgstr "" + #. module: delivery_multi_destination #: selection:delivery.carrier,destination_type:0 msgid "Multiple destinations" @@ -76,7 +90,5 @@ msgstr "" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_3 -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_template msgid "United Kingdom" msgstr "" diff --git a/delivery_multi_destination/i18n/it.po b/delivery_multi_destination/i18n/it.po index 15a15a0a66..048e6397d3 100644 --- a/delivery_multi_destination/i18n/it.po +++ b/delivery_multi_destination/i18n/it.po @@ -20,8 +20,6 @@ msgstr "" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_1 -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_template msgid "Belgium" msgstr "" @@ -31,13 +29,13 @@ msgid "Carrier" msgstr "Corriere" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids -msgid "Destination grid" +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type +msgid "Destination Type" msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type -msgid "Destination type" +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids +msgid "Destination grid" msgstr "" #. module: delivery_multi_destination @@ -47,18 +45,34 @@ msgstr "" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_2 -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_template msgid "France" msgstr "" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_product_template +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_product_template msgid "International Carrier Inc." msgstr "" +#. module: delivery_multi_destination +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1 +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1_product_template +msgid "International Carrier Inc., Belgium" +msgstr "" + +#. module: delivery_multi_destination +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2 +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2_product_template +msgid "International Carrier Inc., France" +msgstr "" + +#. module: delivery_multi_destination +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3 +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3_product_template +msgid "International Carrier Inc., United Kingdom" +msgstr "" + #. module: delivery_multi_destination #: selection:delivery.carrier,destination_type:0 msgid "Multiple destinations" @@ -76,7 +90,5 @@ msgstr "" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_3 -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_template msgid "United Kingdom" msgstr "" diff --git a/delivery_multi_destination/i18n/nl.po b/delivery_multi_destination/i18n/nl.po index cd469decc4..fc4b530452 100644 --- a/delivery_multi_destination/i18n/nl.po +++ b/delivery_multi_destination/i18n/nl.po @@ -20,8 +20,6 @@ msgstr "" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_1 -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_template msgid "Belgium" msgstr "" @@ -31,13 +29,13 @@ msgid "Carrier" msgstr "Vervoerder" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids -msgid "Destination grid" +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type +msgid "Destination Type" msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type -msgid "Destination type" +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids +msgid "Destination grid" msgstr "" #. module: delivery_multi_destination @@ -47,18 +45,34 @@ msgstr "" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_2 -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_template msgid "France" msgstr "" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_product_template +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_product_template msgid "International Carrier Inc." msgstr "" +#. module: delivery_multi_destination +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1 +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1_product_template +msgid "International Carrier Inc., Belgium" +msgstr "" + +#. module: delivery_multi_destination +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2 +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2_product_template +msgid "International Carrier Inc., France" +msgstr "" + +#. module: delivery_multi_destination +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3 +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3_product_template +msgid "International Carrier Inc., United Kingdom" +msgstr "" + #. module: delivery_multi_destination #: selection:delivery.carrier,destination_type:0 msgid "Multiple destinations" @@ -76,7 +90,5 @@ msgstr "" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_3 -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_template msgid "United Kingdom" msgstr "" diff --git a/delivery_multi_destination/i18n/nl_NL.po b/delivery_multi_destination/i18n/nl_NL.po index d01f5d6be9..3f1e874919 100644 --- a/delivery_multi_destination/i18n/nl_NL.po +++ b/delivery_multi_destination/i18n/nl_NL.po @@ -21,8 +21,6 @@ msgstr "" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_1 -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_template msgid "Belgium" msgstr "" @@ -32,13 +30,13 @@ msgid "Carrier" msgstr "Vervoerder" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids -msgid "Destination grid" +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type +msgid "Destination Type" msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type -msgid "Destination type" +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids +msgid "Destination grid" msgstr "" #. module: delivery_multi_destination @@ -48,18 +46,34 @@ msgstr "" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_2 -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_template msgid "France" msgstr "" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_product_template +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_product_template msgid "International Carrier Inc." msgstr "" +#. module: delivery_multi_destination +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1 +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1_product_template +msgid "International Carrier Inc., Belgium" +msgstr "" + +#. module: delivery_multi_destination +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2 +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2_product_template +msgid "International Carrier Inc., France" +msgstr "" + +#. module: delivery_multi_destination +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3 +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3_product_template +msgid "International Carrier Inc., United Kingdom" +msgstr "" + #. module: delivery_multi_destination #: selection:delivery.carrier,destination_type:0 msgid "Multiple destinations" @@ -77,7 +91,5 @@ msgstr "" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_3 -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_template msgid "United Kingdom" msgstr "" diff --git a/delivery_multi_destination/i18n/pt_BR.po b/delivery_multi_destination/i18n/pt_BR.po index 0380a654b5..8adfa9e77e 100644 --- a/delivery_multi_destination/i18n/pt_BR.po +++ b/delivery_multi_destination/i18n/pt_BR.po @@ -21,8 +21,6 @@ msgstr "" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_1 -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_template msgid "Belgium" msgstr "" @@ -32,13 +30,13 @@ msgid "Carrier" msgstr "Transportador" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids -msgid "Destination grid" +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type +msgid "Destination Type" msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type -msgid "Destination type" +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids +msgid "Destination grid" msgstr "" #. module: delivery_multi_destination @@ -48,18 +46,34 @@ msgstr "" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_2 -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_template msgid "France" msgstr "" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_product_template +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_product_template msgid "International Carrier Inc." msgstr "" +#. module: delivery_multi_destination +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1 +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1_product_template +msgid "International Carrier Inc., Belgium" +msgstr "" + +#. module: delivery_multi_destination +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2 +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2_product_template +msgid "International Carrier Inc., France" +msgstr "" + +#. module: delivery_multi_destination +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3 +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3_product_template +msgid "International Carrier Inc., United Kingdom" +msgstr "" + #. module: delivery_multi_destination #: selection:delivery.carrier,destination_type:0 msgid "Multiple destinations" @@ -77,7 +91,5 @@ msgstr "" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_3 -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_template msgid "United Kingdom" msgstr "" diff --git a/delivery_multi_destination/i18n/sl.po b/delivery_multi_destination/i18n/sl.po index 564558d0fb..ca0e274a50 100644 --- a/delivery_multi_destination/i18n/sl.po +++ b/delivery_multi_destination/i18n/sl.po @@ -21,8 +21,6 @@ msgstr "" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_1 -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_1_product_template msgid "Belgium" msgstr "" @@ -32,13 +30,13 @@ msgid "Carrier" msgstr "Prevoznik" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids -msgid "Destination grid" +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type +msgid "Destination Type" msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type -msgid "Destination type" +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids +msgid "Destination grid" msgstr "" #. module: delivery_multi_destination @@ -48,18 +46,34 @@ msgstr "" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_2 -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_2_product_template msgid "France" msgstr "" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_product_template +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_product_template msgid "International Carrier Inc." msgstr "" +#. module: delivery_multi_destination +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1 +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1_product_template +msgid "International Carrier Inc., Belgium" +msgstr "" + +#. module: delivery_multi_destination +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2 +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2_product_template +msgid "International Carrier Inc., France" +msgstr "" + +#. module: delivery_multi_destination +#: model:product.product,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3 +#: model:product.template,name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3_product_template +msgid "International Carrier Inc., United Kingdom" +msgstr "" + #. module: delivery_multi_destination #: selection:delivery.carrier,destination_type:0 msgid "Multiple destinations" @@ -77,7 +91,5 @@ msgstr "" #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_3 -#: model:product.product,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_product -#: model:product.template,name:delivery_multi_destination.delivery_carrier_multi_child_3_product_template msgid "United Kingdom" msgstr "" diff --git a/delivery_multi_destination/models/__init__.py b/delivery_multi_destination/models/__init__.py index add727a8de..4060769124 100644 --- a/delivery_multi_destination/models/__init__.py +++ b/delivery_multi_destination/models/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from . import delivery_carrier diff --git a/delivery_multi_destination/models/delivery_carrier.py b/delivery_multi_destination/models/delivery_carrier.py index f215327cdf..8d5be6714c 100644 --- a/delivery_multi_destination/models/delivery_carrier.py +++ b/delivery_multi_destination/models/delivery_carrier.py @@ -1,5 +1,4 @@ -# -*- coding: utf-8 -*- -# Copyright 2016 Pedro M. Baeza +# Copyright 2016-2019 Tecnativa - Pedro M. Baeza # Copyright 2017 Luis M. Ontalba # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). @@ -45,11 +44,29 @@ def name_search(self, name='', args=None, operator='ilike', limit=100): name=name, args=args, operator=operator, limit=limit, ) - @api.multi - def verify_carrier(self, contact): + def available_carriers(self, partner): + """Add childrens on the possible list to select carriers. This is + used on `website_sale_delivery` module. + """ + candidates = self.env['delivery.carrier'] + for carrier in self: + if self.destination_type == 'one': + candidates |= carrier + else: + carrier = self.with_context(show_children_carriers=True) + candidates |= carrier.child_ids + return super(DeliveryCarrier, candidates).available_carriers(partner) + + def rate_shipment(self, order): + """We have to override this method for getting the proper price + according destination on sales orders. + """ if self.destination_type == 'one': - return super(DeliveryCarrier, self).verify_carrier(contact) - carrier = self.with_context(show_children_carriers=True) - for subcarrier in carrier.child_ids: - if super(DeliveryCarrier, subcarrier).verify_carrier(contact): - return subcarrier + return super().rate_shipment(order) + else: + carrier = self.with_context(show_children_carriers=True) + for subcarrier in carrier.child_ids: + if subcarrier._match_address(order.partner_shipping_id): + return super( + DeliveryCarrier, subcarrier, + ).rate_shipment(order) diff --git a/delivery_multi_destination/readme/CONFIGURE.rst b/delivery_multi_destination/readme/CONFIGURE.rst new file mode 100644 index 0000000000..4621c12bb1 --- /dev/null +++ b/delivery_multi_destination/readme/CONFIGURE.rst @@ -0,0 +1,8 @@ +To configure delivery methods with multiple destinations: + +#. Go to Inventory > Configuration > Delivery > Delivery Methods +#. Create or edit an existing record. +#. Select "Destination type" = "Multiple destinations". +#. Introduce a line for each destination in the new tab "Destinations" +#. Lines have priority, so you have to put first the lines with more restricted + destinations. diff --git a/delivery_multi_destination/readme/CONTRIBUTORS.rst b/delivery_multi_destination/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..502fca703b --- /dev/null +++ b/delivery_multi_destination/readme/CONTRIBUTORS.rst @@ -0,0 +1,4 @@ +* `Tecnativa __`: + + * Pedro M. Baeza + * Luis M. Ontalba diff --git a/delivery_multi_destination/readme/DESCRIPTION.rst b/delivery_multi_destination/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..a6d2cbf50c --- /dev/null +++ b/delivery_multi_destination/readme/DESCRIPTION.rst @@ -0,0 +1,6 @@ +This module allows to set different price rules depending on the destination. + +This module restores the concept of delivery grid, reusing the same model for +nesting several "children" delivery methods, one per possible destination. +It has been designed to reuse all possible extensions to the base delivery, +without the need to create a glue module for having multiple destinations. diff --git a/delivery_multi_destination/readme/ROADMAP.rst b/delivery_multi_destination/readme/ROADMAP.rst new file mode 100644 index 0000000000..a123b25024 --- /dev/null +++ b/delivery_multi_destination/readme/ROADMAP.rst @@ -0,0 +1,2 @@ +* Delivery prices for e-commerce (`website_sale_delivery` module) might need + an extra module for handling everything properly. diff --git a/delivery_multi_destination/readme/USAGE.rst b/delivery_multi_destination/readme/USAGE.rst new file mode 100644 index 0000000000..58f93d4e88 --- /dev/null +++ b/delivery_multi_destination/readme/USAGE.rst @@ -0,0 +1,2 @@ +#. When using the delivery method in a Sales order, delivery address will be + used for computing the delivery price according introduced destinations. diff --git a/delivery_multi_destination/static/description/index.html b/delivery_multi_destination/static/description/index.html new file mode 100644 index 0000000000..91b865b511 --- /dev/null +++ b/delivery_multi_destination/static/description/index.html @@ -0,0 +1,456 @@ + + + + + + +Multiple destinations for the same delivery method + + + +
+

Multiple destinations for the same delivery method

+ + +

Beta License: AGPL-3 OCA/delivery-carrier Translate me on Weblate Try me on Runbot

+

This module allows to set different price rules depending on the destination.

+

This module restores the concept of delivery grid, reusing the same model for +nesting several “children” delivery methods, one per possible destination. +It has been designed to reuse all possible extensions to the base delivery, +without the need to create a glue module for having multiple destinations.

+

Table of contents

+ +
+

Configuration

+

To configure delivery methods with multiple destinations:

+
    +
  1. Go to Inventory > Configuration > Delivery > Delivery Methods
    2. +
  2. Create or edit an existing record.
    3. +
  3. Select “Destination type” = “Multiple destinations”.
    4. +
  4. Introduce a line for each destination in the new tab “Destinations”
    5. +
  5. Lines have priority, so you have to put first the lines with more restricted +destinations.
    6. +
+
+
+

Usage

+
    +
  1. When using the delivery method in a Sales order, delivery address will be +used for computing the delivery price according introduced destinations.
    2. +
+
+
+

Known issues / Roadmap

+
    +
  • Delivery prices for e-commerce (website_sale_delivery module) might need +an extra module for handling everything properly.
    • +
+
+
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Tecnativa
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

This module is part of the OCA/delivery-carrier project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/delivery_multi_destination/tests/__init__.py b/delivery_multi_destination/tests/__init__.py index 3a4ea32c6b..a34eb49ca0 100644 --- a/delivery_multi_destination/tests/__init__.py +++ b/delivery_multi_destination/tests/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from . import test_delivery_multi_destination diff --git a/delivery_multi_destination/tests/test_delivery_multi_destination.py b/delivery_multi_destination/tests/test_delivery_multi_destination.py index a2e6ec625f..6a51b0ad20 100644 --- a/delivery_multi_destination/tests/test_delivery_multi_destination.py +++ b/delivery_multi_destination/tests/test_delivery_multi_destination.py @@ -1,8 +1,8 @@ -# -*- coding: utf-8 -*- # Copyright 2017 Luis M. Ontalba +# Copyright 2019 Tecnativa - Pedro M. Baeza # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from openerp.tests import common +from odoo.tests import common class TestDeliveryMultiDestination(common.SavepointCase): @@ -36,14 +36,28 @@ def setUpClass(cls): 'state_id': cls.state.id, 'zip': '33333' }) + cls.product = cls.env['product.product'].create({ + 'name': 'Test carrier multi', + 'type': 'service', + }) + cls.product_child_1 = cls.env['product.product'].create({ + 'name': 'Test child 1', + 'type': 'service', + }) + cls.product_child_2 = cls.env['product.product'].create({ + 'name': 'Test child 2', + 'type': 'service', + }) cls.carrier_multi = cls.env['delivery.carrier'].create({ 'name': 'Test carrier multi', + 'product_id': cls.product.id, 'destination_type': 'multi', 'delivery_type': 'fixed', 'fixed_price': 100, 'child_ids': [ (0, 0, { 'name': 'Test child 1', + 'product_id': cls.product_child_1.id, 'sequence': 1, 'country_ids': [(6, 0, cls.country_2.ids)], 'state_ids': [(6, 0, cls.state.ids)], @@ -54,6 +68,7 @@ def setUpClass(cls): }), (0, 0, { 'name': 'Test child 2', + 'product_id': cls.product_child_2.id, 'sequence': 2, 'country_ids': [(6, 0, cls.country_2.ids)], 'state_ids': [(6, 0, cls.state.ids)], @@ -88,15 +103,14 @@ def setUpClass(cls): def test_delivery_multi_destination(self): order = self.sale_order order.carrier_id = self.carrier_single.id + order.get_delivery_price() self.assertAlmostEqual(order.delivery_price, 100, 2) order.carrier_id = self.carrier_multi.id - order.invalidate_cache() order.partner_shipping_id = self.partner_2.id - order.delivery_set() + order.get_delivery_price() self.assertAlmostEqual(order.delivery_price, 50, 2) - order.invalidate_cache() order.partner_shipping_id = self.partner_3.id - order.delivery_set() + order.get_delivery_price() self.assertAlmostEqual(order.delivery_price, 150, 2) def test_search(self): @@ -114,3 +128,11 @@ def test_name_search(self): self.assertTrue( all(x[0] != children_carrier.id for x in carrier_names) ) + + def test_available_carriers(self): + self.assertEqual( + self.carrier_multi.available_carriers(self.partner_2), + self.carrier_multi.with_context( + show_children_carriers=True, + ).child_ids[0], + ) From a11e0599e733949f9697d2862e741dad25554c48 Mon Sep 17 00:00:00 2001 From: "Luis M. Ontalba" Date: Sat, 18 May 2019 14:02:04 +0200 Subject: [PATCH 05/27] [MIG] delivery_multi_destination: Migration to 12.0 --- delivery_multi_destination/README.rst | 10 ++--- delivery_multi_destination/__init__.py | 2 +- delivery_multi_destination/__manifest__.py | 4 +- delivery_multi_destination/i18n/cs_CZ.po | 39 ++++++++++++++++--- delivery_multi_destination/i18n/de.po | 39 ++++++++++++++++--- .../i18n/delivery_multi_destination.pot | 36 ++++++++++++++--- delivery_multi_destination/i18n/es.po | 39 ++++++++++++++++--- delivery_multi_destination/i18n/fr.po | 39 ++++++++++++++++--- delivery_multi_destination/i18n/it.po | 39 ++++++++++++++++--- delivery_multi_destination/i18n/nl.po | 39 ++++++++++++++++--- delivery_multi_destination/i18n/nl_NL.po | 39 ++++++++++++++++--- delivery_multi_destination/i18n/pt_BR.po | 39 ++++++++++++++++--- delivery_multi_destination/i18n/sl.po | 39 ++++++++++++++++--- delivery_multi_destination/models/__init__.py | 2 +- .../models/delivery_carrier.py | 2 +- .../static/description/index.html | 8 ++-- delivery_multi_destination/tests/__init__.py | 2 +- .../tests/test_delivery_multi_destination.py | 2 +- .../views/delivery_carrier_view.xml | 2 +- 19 files changed, 344 insertions(+), 77 deletions(-) diff --git a/delivery_multi_destination/README.rst b/delivery_multi_destination/README.rst index f6cfc5ad6a..477e57deca 100644 --- a/delivery_multi_destination/README.rst +++ b/delivery_multi_destination/README.rst @@ -14,13 +14,13 @@ Multiple destinations for the same delivery method :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fdelivery--carrier-lightgray.png?logo=github - :target: https://github.com/OCA/delivery-carrier/tree/11.0/delivery_multi_destination + :target: https://github.com/OCA/delivery-carrier/tree/12.0/delivery_multi_destination :alt: OCA/delivery-carrier .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/delivery-carrier-11-0/delivery-carrier-11-0-delivery_multi_destination + :target: https://translation.odoo-community.org/projects/delivery-carrier-12-0/delivery-carrier-12-0-delivery_multi_destination :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/99/11.0 + :target: https://runbot.odoo-community.org/runbot/99/12.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -67,7 +67,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -100,6 +100,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/delivery-carrier `_ project on GitHub. +This module is part of the `OCA/delivery-carrier `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/delivery_multi_destination/__init__.py b/delivery_multi_destination/__init__.py index 69f7babdfb..31660d6a96 100644 --- a/delivery_multi_destination/__init__.py +++ b/delivery_multi_destination/__init__.py @@ -1,3 +1,3 @@ -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from . import models diff --git a/delivery_multi_destination/__manifest__.py b/delivery_multi_destination/__manifest__.py index 7a6854d6d8..3e0a17f606 100644 --- a/delivery_multi_destination/__manifest__.py +++ b/delivery_multi_destination/__manifest__.py @@ -1,10 +1,10 @@ # Copyright 2016-2019 Tecnativa - Pedro M. Baeza # Copyright 2017 Luis M. Ontalba -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). { "name": "Multiple destinations for the same delivery method", - "version": "11.0.1.0.0", + "version": "12.0.1.0.0", "category": "Delivery", "website": "https://github.com/OCA/delivery-carrier", "author": "Tecnativa, " diff --git a/delivery_multi_destination/i18n/cs_CZ.po b/delivery_multi_destination/i18n/cs_CZ.po index 0886136ef1..c225801590 100644 --- a/delivery_multi_destination/i18n/cs_CZ.po +++ b/delivery_multi_destination/i18n/cs_CZ.po @@ -26,22 +26,22 @@ msgstr "Belgie" #. module: delivery_multi_destination #: model:ir.model,name:delivery_multi_destination.model_delivery_carrier -msgid "Carrier" -msgstr "Dopravce" +msgid "Delivery Methods" +msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier__destination_type #, fuzzy msgid "Destination Type" msgstr "Typ cíle" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier__child_ids msgid "Destination grid" msgstr "Destinační mřížka" #. module: delivery_multi_destination -#: model:ir.ui.view,arch_db:delivery_multi_destination.view_delivery_carrier_form +#: model_terms:ir.ui.view,arch_db:delivery_multi_destination.view_delivery_carrier_form msgid "Destinations" msgstr "Destinace" @@ -89,11 +89,38 @@ msgid "One destination" msgstr "Jeden cíl" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_parent_id +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier__parent_id msgid "Parent carrier" msgstr "Nadřazený dopravce" +#. module: delivery_multi_destination +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1 +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2 +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3 +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1_product_template +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2_product_template +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3_product_template +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_product_template +msgid "Unit(s)" +msgstr "" + #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_3 msgid "United Kingdom" msgstr "Spojené království" + +#. module: delivery_multi_destination +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1 +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2 +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3 +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1_product_template +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2_product_template +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3_product_template +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_product_template +msgid "kg" +msgstr "" + +#~ msgid "Carrier" +#~ msgstr "Dopravce" diff --git a/delivery_multi_destination/i18n/de.po b/delivery_multi_destination/i18n/de.po index 95cde3473c..07b6797587 100644 --- a/delivery_multi_destination/i18n/de.po +++ b/delivery_multi_destination/i18n/de.po @@ -25,21 +25,21 @@ msgstr "" #. module: delivery_multi_destination #: model:ir.model,name:delivery_multi_destination.model_delivery_carrier -msgid "Carrier" -msgstr "Spediteur" +msgid "Delivery Methods" +msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier__destination_type msgid "Destination Type" msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier__child_ids msgid "Destination grid" msgstr "" #. module: delivery_multi_destination -#: model:ir.ui.view,arch_db:delivery_multi_destination.view_delivery_carrier_form +#: model_terms:ir.ui.view,arch_db:delivery_multi_destination.view_delivery_carrier_form msgid "Destinations" msgstr "" @@ -84,11 +84,38 @@ msgid "One destination" msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_parent_id +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier__parent_id msgid "Parent carrier" msgstr "" +#. module: delivery_multi_destination +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1 +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2 +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3 +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1_product_template +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2_product_template +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3_product_template +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_product_template +msgid "Unit(s)" +msgstr "" + #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_3 msgid "United Kingdom" msgstr "" + +#. module: delivery_multi_destination +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1 +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2 +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3 +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1_product_template +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2_product_template +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3_product_template +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_product_template +msgid "kg" +msgstr "" + +#~ msgid "Carrier" +#~ msgstr "Spediteur" diff --git a/delivery_multi_destination/i18n/delivery_multi_destination.pot b/delivery_multi_destination/i18n/delivery_multi_destination.pot index 72f0531527..6fc3c6d320 100644 --- a/delivery_multi_destination/i18n/delivery_multi_destination.pot +++ b/delivery_multi_destination/i18n/delivery_multi_destination.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 11.0\n" +"Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: <>\n" "Language-Team: \n" @@ -20,21 +20,21 @@ msgstr "" #. module: delivery_multi_destination #: model:ir.model,name:delivery_multi_destination.model_delivery_carrier -msgid "Carrier" +msgid "Delivery Methods" msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier__destination_type msgid "Destination Type" msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier__child_ids msgid "Destination grid" msgstr "" #. module: delivery_multi_destination -#: model:ir.ui.view,arch_db:delivery_multi_destination.view_delivery_carrier_form +#: model_terms:ir.ui.view,arch_db:delivery_multi_destination.view_delivery_carrier_form msgid "Destinations" msgstr "" @@ -79,12 +79,36 @@ msgid "One destination" msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_parent_id +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier__parent_id msgid "Parent carrier" msgstr "" +#. module: delivery_multi_destination +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1 +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2 +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3 +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1_product_template +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2_product_template +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3_product_template +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_product_template +msgid "Unit(s)" +msgstr "" + #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_3 msgid "United Kingdom" msgstr "" +#. module: delivery_multi_destination +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1 +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2 +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3 +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1_product_template +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2_product_template +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3_product_template +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_product_template +msgid "kg" +msgstr "" + diff --git a/delivery_multi_destination/i18n/es.po b/delivery_multi_destination/i18n/es.po index 4e052331c4..a7474b8da9 100644 --- a/delivery_multi_destination/i18n/es.po +++ b/delivery_multi_destination/i18n/es.po @@ -26,22 +26,22 @@ msgstr "Bélgica" #. module: delivery_multi_destination #: model:ir.model,name:delivery_multi_destination.model_delivery_carrier -msgid "Carrier" -msgstr "Transportista" +msgid "Delivery Methods" +msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier__destination_type #, fuzzy msgid "Destination Type" msgstr "Tipo de destino" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier__child_ids msgid "Destination grid" msgstr "" #. module: delivery_multi_destination -#: model:ir.ui.view,arch_db:delivery_multi_destination.view_delivery_carrier_form +#: model_terms:ir.ui.view,arch_db:delivery_multi_destination.view_delivery_carrier_form msgid "Destinations" msgstr "Destinos" @@ -89,11 +89,38 @@ msgid "One destination" msgstr "Un destino" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_parent_id +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier__parent_id msgid "Parent carrier" msgstr "Transportista matriz" +#. module: delivery_multi_destination +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1 +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2 +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3 +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1_product_template +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2_product_template +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3_product_template +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_product_template +msgid "Unit(s)" +msgstr "" + #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_3 msgid "United Kingdom" msgstr "Reino Unido" + +#. module: delivery_multi_destination +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1 +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2 +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3 +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1_product_template +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2_product_template +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3_product_template +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_product_template +msgid "kg" +msgstr "" + +#~ msgid "Carrier" +#~ msgstr "Transportista" diff --git a/delivery_multi_destination/i18n/fr.po b/delivery_multi_destination/i18n/fr.po index b73dd87e5d..7017d6e3e2 100644 --- a/delivery_multi_destination/i18n/fr.po +++ b/delivery_multi_destination/i18n/fr.po @@ -25,21 +25,21 @@ msgstr "" #. module: delivery_multi_destination #: model:ir.model,name:delivery_multi_destination.model_delivery_carrier -msgid "Carrier" -msgstr "Transporteur" +msgid "Delivery Methods" +msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier__destination_type msgid "Destination Type" msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier__child_ids msgid "Destination grid" msgstr "" #. module: delivery_multi_destination -#: model:ir.ui.view,arch_db:delivery_multi_destination.view_delivery_carrier_form +#: model_terms:ir.ui.view,arch_db:delivery_multi_destination.view_delivery_carrier_form msgid "Destinations" msgstr "" @@ -84,11 +84,38 @@ msgid "One destination" msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_parent_id +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier__parent_id msgid "Parent carrier" msgstr "" +#. module: delivery_multi_destination +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1 +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2 +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3 +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1_product_template +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2_product_template +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3_product_template +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_product_template +msgid "Unit(s)" +msgstr "" + #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_3 msgid "United Kingdom" msgstr "" + +#. module: delivery_multi_destination +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1 +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2 +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3 +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1_product_template +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2_product_template +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3_product_template +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_product_template +msgid "kg" +msgstr "" + +#~ msgid "Carrier" +#~ msgstr "Transporteur" diff --git a/delivery_multi_destination/i18n/it.po b/delivery_multi_destination/i18n/it.po index 048e6397d3..4e28623f1a 100644 --- a/delivery_multi_destination/i18n/it.po +++ b/delivery_multi_destination/i18n/it.po @@ -25,21 +25,21 @@ msgstr "" #. module: delivery_multi_destination #: model:ir.model,name:delivery_multi_destination.model_delivery_carrier -msgid "Carrier" -msgstr "Corriere" +msgid "Delivery Methods" +msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier__destination_type msgid "Destination Type" msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier__child_ids msgid "Destination grid" msgstr "" #. module: delivery_multi_destination -#: model:ir.ui.view,arch_db:delivery_multi_destination.view_delivery_carrier_form +#: model_terms:ir.ui.view,arch_db:delivery_multi_destination.view_delivery_carrier_form msgid "Destinations" msgstr "" @@ -84,11 +84,38 @@ msgid "One destination" msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_parent_id +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier__parent_id msgid "Parent carrier" msgstr "" +#. module: delivery_multi_destination +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1 +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2 +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3 +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1_product_template +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2_product_template +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3_product_template +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_product_template +msgid "Unit(s)" +msgstr "" + #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_3 msgid "United Kingdom" msgstr "" + +#. module: delivery_multi_destination +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1 +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2 +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3 +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1_product_template +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2_product_template +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3_product_template +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_product_template +msgid "kg" +msgstr "" + +#~ msgid "Carrier" +#~ msgstr "Corriere" diff --git a/delivery_multi_destination/i18n/nl.po b/delivery_multi_destination/i18n/nl.po index fc4b530452..e01b628370 100644 --- a/delivery_multi_destination/i18n/nl.po +++ b/delivery_multi_destination/i18n/nl.po @@ -25,21 +25,21 @@ msgstr "" #. module: delivery_multi_destination #: model:ir.model,name:delivery_multi_destination.model_delivery_carrier -msgid "Carrier" -msgstr "Vervoerder" +msgid "Delivery Methods" +msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier__destination_type msgid "Destination Type" msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier__child_ids msgid "Destination grid" msgstr "" #. module: delivery_multi_destination -#: model:ir.ui.view,arch_db:delivery_multi_destination.view_delivery_carrier_form +#: model_terms:ir.ui.view,arch_db:delivery_multi_destination.view_delivery_carrier_form msgid "Destinations" msgstr "" @@ -84,11 +84,38 @@ msgid "One destination" msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_parent_id +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier__parent_id msgid "Parent carrier" msgstr "" +#. module: delivery_multi_destination +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1 +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2 +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3 +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1_product_template +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2_product_template +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3_product_template +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_product_template +msgid "Unit(s)" +msgstr "" + #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_3 msgid "United Kingdom" msgstr "" + +#. module: delivery_multi_destination +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1 +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2 +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3 +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1_product_template +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2_product_template +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3_product_template +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_product_template +msgid "kg" +msgstr "" + +#~ msgid "Carrier" +#~ msgstr "Vervoerder" diff --git a/delivery_multi_destination/i18n/nl_NL.po b/delivery_multi_destination/i18n/nl_NL.po index 3f1e874919..c61c876466 100644 --- a/delivery_multi_destination/i18n/nl_NL.po +++ b/delivery_multi_destination/i18n/nl_NL.po @@ -26,21 +26,21 @@ msgstr "" #. module: delivery_multi_destination #: model:ir.model,name:delivery_multi_destination.model_delivery_carrier -msgid "Carrier" -msgstr "Vervoerder" +msgid "Delivery Methods" +msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier__destination_type msgid "Destination Type" msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier__child_ids msgid "Destination grid" msgstr "" #. module: delivery_multi_destination -#: model:ir.ui.view,arch_db:delivery_multi_destination.view_delivery_carrier_form +#: model_terms:ir.ui.view,arch_db:delivery_multi_destination.view_delivery_carrier_form msgid "Destinations" msgstr "" @@ -85,11 +85,38 @@ msgid "One destination" msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_parent_id +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier__parent_id msgid "Parent carrier" msgstr "" +#. module: delivery_multi_destination +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1 +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2 +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3 +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1_product_template +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2_product_template +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3_product_template +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_product_template +msgid "Unit(s)" +msgstr "" + #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_3 msgid "United Kingdom" msgstr "" + +#. module: delivery_multi_destination +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1 +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2 +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3 +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1_product_template +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2_product_template +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3_product_template +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_product_template +msgid "kg" +msgstr "" + +#~ msgid "Carrier" +#~ msgstr "Vervoerder" diff --git a/delivery_multi_destination/i18n/pt_BR.po b/delivery_multi_destination/i18n/pt_BR.po index 8adfa9e77e..70bd1a563d 100644 --- a/delivery_multi_destination/i18n/pt_BR.po +++ b/delivery_multi_destination/i18n/pt_BR.po @@ -26,21 +26,21 @@ msgstr "" #. module: delivery_multi_destination #: model:ir.model,name:delivery_multi_destination.model_delivery_carrier -msgid "Carrier" -msgstr "Transportador" +msgid "Delivery Methods" +msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier__destination_type msgid "Destination Type" msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier__child_ids msgid "Destination grid" msgstr "" #. module: delivery_multi_destination -#: model:ir.ui.view,arch_db:delivery_multi_destination.view_delivery_carrier_form +#: model_terms:ir.ui.view,arch_db:delivery_multi_destination.view_delivery_carrier_form msgid "Destinations" msgstr "" @@ -85,11 +85,38 @@ msgid "One destination" msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_parent_id +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier__parent_id msgid "Parent carrier" msgstr "" +#. module: delivery_multi_destination +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1 +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2 +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3 +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1_product_template +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2_product_template +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3_product_template +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_product_template +msgid "Unit(s)" +msgstr "" + #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_3 msgid "United Kingdom" msgstr "" + +#. module: delivery_multi_destination +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1 +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2 +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3 +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1_product_template +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2_product_template +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3_product_template +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_product_template +msgid "kg" +msgstr "" + +#~ msgid "Carrier" +#~ msgstr "Transportador" diff --git a/delivery_multi_destination/i18n/sl.po b/delivery_multi_destination/i18n/sl.po index ca0e274a50..3191620f87 100644 --- a/delivery_multi_destination/i18n/sl.po +++ b/delivery_multi_destination/i18n/sl.po @@ -26,21 +26,21 @@ msgstr "" #. module: delivery_multi_destination #: model:ir.model,name:delivery_multi_destination.model_delivery_carrier -msgid "Carrier" -msgstr "Prevoznik" +msgid "Delivery Methods" +msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_destination_type +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier__destination_type msgid "Destination Type" msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_child_ids +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier__child_ids msgid "Destination grid" msgstr "" #. module: delivery_multi_destination -#: model:ir.ui.view,arch_db:delivery_multi_destination.view_delivery_carrier_form +#: model_terms:ir.ui.view,arch_db:delivery_multi_destination.view_delivery_carrier_form msgid "Destinations" msgstr "" @@ -85,11 +85,38 @@ msgid "One destination" msgstr "" #. module: delivery_multi_destination -#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier_parent_id +#: model:ir.model.fields,field_description:delivery_multi_destination.field_delivery_carrier__parent_id msgid "Parent carrier" msgstr "" +#. module: delivery_multi_destination +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1 +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2 +#: model:product.product,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3 +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1_product_template +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2_product_template +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3_product_template +#: model:product.template,uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_product_template +msgid "Unit(s)" +msgstr "" + #. module: delivery_multi_destination #: model:delivery.carrier,name:delivery_multi_destination.delivery_carrier_multi_child_3 msgid "United Kingdom" msgstr "" + +#. module: delivery_multi_destination +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1 +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2 +#: model:product.product,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3 +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_1_product_template +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_2_product_template +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_child_3_product_template +#: model:product.template,weight_uom_name:delivery_multi_destination.product_product_delivery_carrier_multi_product_template +msgid "kg" +msgstr "" + +#~ msgid "Carrier" +#~ msgstr "Prevoznik" diff --git a/delivery_multi_destination/models/__init__.py b/delivery_multi_destination/models/__init__.py index 4060769124..f3bc012b95 100644 --- a/delivery_multi_destination/models/__init__.py +++ b/delivery_multi_destination/models/__init__.py @@ -1,3 +1,3 @@ -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from . import delivery_carrier diff --git a/delivery_multi_destination/models/delivery_carrier.py b/delivery_multi_destination/models/delivery_carrier.py index 8d5be6714c..fd30e9d9b6 100644 --- a/delivery_multi_destination/models/delivery_carrier.py +++ b/delivery_multi_destination/models/delivery_carrier.py @@ -1,6 +1,6 @@ # Copyright 2016-2019 Tecnativa - Pedro M. Baeza # Copyright 2017 Luis M. Ontalba -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from odoo import api, fields, models diff --git a/delivery_multi_destination/static/description/index.html b/delivery_multi_destination/static/description/index.html index 91b865b511..5aec2b765a 100644 --- a/delivery_multi_destination/static/description/index.html +++ b/delivery_multi_destination/static/description/index.html @@ -3,7 +3,7 @@ - + Multiple destinations for the same delivery method