From 7096589f0dda3bc3d1941a1b6d844c740493d3cf Mon Sep 17 00:00:00 2001 From: Hanane ELKHAL Date: Fri, 7 Jun 2013 17:09:30 +0200 Subject: [PATCH 01/61] migration to v7 --- stock_analytic/__init__.py | 26 +++++++ stock_analytic/__openerp__.py | 50 +++++++++++++ stock_analytic/purchase.py | 38 ++++++++++ stock_analytic/sale.py | 38 ++++++++++ stock_analytic/stock.py | 43 +++++++++++ stock_analytic/stock_view.xml | 136 ++++++++++++++++++++++++++++++++++ 6 files changed, 331 insertions(+) create mode 100644 stock_analytic/__init__.py create mode 100755 stock_analytic/__openerp__.py create mode 100644 stock_analytic/purchase.py create mode 100644 stock_analytic/sale.py create mode 100644 stock_analytic/stock.py create mode 100755 stock_analytic/stock_view.xml diff --git a/stock_analytic/__init__.py b/stock_analytic/__init__.py new file mode 100644 index 0000000000..51acc45408 --- /dev/null +++ b/stock_analytic/__init__.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +################################################################################# +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2012 Julius Network Solutions SARL +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +################################################################################# + +import stock +import sale +import purchase + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/stock_analytic/__openerp__.py b/stock_analytic/__openerp__.py new file mode 100755 index 0000000000..0d0c40c730 --- /dev/null +++ b/stock_analytic/__openerp__.py @@ -0,0 +1,50 @@ +# -*- coding: utf-8 -*- +################################################################################# +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2012 Julius Network Solutions SARL +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +################################################################################# + +{ + "name" : "Stock analytic", + "version" : "1.0", + "author" : "Julius Network Solutions", + "website" : "http://www.julius.fr/", + 'complexity': "easy", + "category" : "Warehouse Management", + "depends" : [ + "base", + "stock", + "sale", + "purchase", + "account", + ], + "description": """ + Adds an analytic account in stock move to be able to get analytic info when generating the account move line + """, + "init_xml" : [], + "demo_xml" : [], + "update_xml" : [ +# "security/service_security.xml", +# "security/ir.model.access.csv", + "stock_view.xml", + ], + 'installable' : True, + 'active' : False, +} + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/stock_analytic/purchase.py b/stock_analytic/purchase.py new file mode 100644 index 0000000000..324ee609e4 --- /dev/null +++ b/stock_analytic/purchase.py @@ -0,0 +1,38 @@ +# -*- coding: utf-8 -*- +################################################################################# +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2012 Julius Network Solutions SARL +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +################################################################################# + +from osv import fields, osv, orm +from tools.translate import _ + +#---------------------------------------------------------- +# Purchase order +#---------------------------------------------------------- +class purchase_order(orm.Model): + _inherit = "purchase.order" + + def _prepare_order_line_move(self, cr, uid, order, order_line, picking_id, context=None): + res = super(purchase_order, self)._prepare_order_line_move(cr, uid, order, order_line, picking_id, context=context) + if order_line.account_analytic_id: + res['account_analytic_id'] = order_line.account_analytic_id.id + return res + + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/stock_analytic/sale.py b/stock_analytic/sale.py new file mode 100644 index 0000000000..f75df2b0bd --- /dev/null +++ b/stock_analytic/sale.py @@ -0,0 +1,38 @@ +# -*- coding: utf-8 -*- +################################################################################# +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2012 Julius Network Solutions SARL +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +################################################################################# + +from osv import fields, osv, orm +from tools.translate import _ + +#---------------------------------------------------------- +# Sale order +#---------------------------------------------------------- +class sale_order(orm.Model): + _inherit = 'sale.order' + + def _prepare_order_line_move(self, cr, uid, order, line, picking_id, date_planned, context=None): + res = super(sale_order, self)._prepare_order_line_move(cr, uid, order, line, picking_id, date_planned, context=context) + if order.project_id: + res['account_analytic_id'] = order.project_id.id + return res + + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/stock_analytic/stock.py b/stock_analytic/stock.py new file mode 100644 index 0000000000..d6ba43483f --- /dev/null +++ b/stock_analytic/stock.py @@ -0,0 +1,43 @@ +# -*- coding: utf-8 -*- +################################################################################# +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2012 Julius Network Solutions SARL +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +################################################################################# + +from osv import fields, osv, orm +from tools.translate import _ + +# ---------------------------------------------------- +# Move +# ---------------------------------------------------- +class stock_move(orm.Model): + _inherit = "stock.move" + + _columns = { + 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic account'), + } + + def _create_account_move_line(self, cr, uid, move, src_account_id, dest_account_id, reference_amount, reference_currency_id, context=None): + res = super(stock_move, self)._create_account_move_line(cr, uid, move, src_account_id, dest_account_id, reference_amount, reference_currency_id, context=context) + if move.account_analytic_id: + for val1, val2, vals in res: + vals['analytic_account_id'] = move.account_analytic_id.id + return res + + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/stock_analytic/stock_view.xml b/stock_analytic/stock_view.xml new file mode 100755 index 0000000000..0af61dca7b --- /dev/null +++ b/stock_analytic/stock_view.xml @@ -0,0 +1,136 @@ + + + + + + stock.inventory.form + stock.inventory + + + + + + + + + + + + + + + + stock.move.tree + stock.move + + + + + + + + + + Stock Moves + stock.move + + + + + + + + + + Stock Moves + stock.move + + + + + + + + + + stock.move.tree2 + stock.move + + + + + + + + + + stock.move.tree3 + stock.move + + + + + + + + + + stock.move.form + stock.move + + + + + + + + + + stock.move.form2 + stock.move + + + + + + + + + + From 60b7aecf5426582f982a38b7e5d79e16df3353cd Mon Sep 17 00:00:00 2001 From: Yvan Patry Date: Thu, 13 Jun 2013 12:30:24 +0200 Subject: [PATCH 02/61] merge with mathieu --- stock_analytic/purchase.py | 4 ++-- stock_analytic/sale.py | 4 ++-- stock_analytic/stock.py | 4 ++-- stock_analytic/stock_view.xml | 30 +++++++++++++++--------------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/stock_analytic/purchase.py b/stock_analytic/purchase.py index 324ee609e4..cf690ed4f3 100644 --- a/stock_analytic/purchase.py +++ b/stock_analytic/purchase.py @@ -19,8 +19,8 @@ # ################################################################################# -from osv import fields, osv, orm -from tools.translate import _ +from openerp.osv import fields, osv, orm +from openerp.tools.translate import _ #---------------------------------------------------------- # Purchase order diff --git a/stock_analytic/sale.py b/stock_analytic/sale.py index f75df2b0bd..03c55dfb63 100644 --- a/stock_analytic/sale.py +++ b/stock_analytic/sale.py @@ -19,8 +19,8 @@ # ################################################################################# -from osv import fields, osv, orm -from tools.translate import _ +from openerp.osv import fields, osv, orm +from openerp.tools.translate import _ #---------------------------------------------------------- # Sale order diff --git a/stock_analytic/stock.py b/stock_analytic/stock.py index d6ba43483f..8349cdd09c 100644 --- a/stock_analytic/stock.py +++ b/stock_analytic/stock.py @@ -19,8 +19,8 @@ # ################################################################################# -from osv import fields, osv, orm -from tools.translate import _ +from openerp.osv import fields, osv, orm +from openerp.tools.translate import _ # ---------------------------------------------------- # Move diff --git a/stock_analytic/stock_view.xml b/stock_analytic/stock_view.xml index 0af61dca7b..3feac4d576 100755 --- a/stock_analytic/stock_view.xml +++ b/stock_analytic/stock_view.xml @@ -7,41 +7,41 @@ stock.inventory - + - + - + - + stock.move.tree @@ -115,7 +115,7 @@ stock.move - + @@ -124,9 +124,9 @@ stock.move.form2 stock.move - + - + From 734edb460443f1018728e1f8598508dc76e4238d Mon Sep 17 00:00:00 2001 From: "pierre@julius.fr" Date: Thu, 13 Jun 2013 17:44:54 +0200 Subject: [PATCH 03/61] update for migration V7 --- stock_analytic/stock_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stock_analytic/stock_view.xml b/stock_analytic/stock_view.xml index 3feac4d576..6606e915d6 100755 --- a/stock_analytic/stock_view.xml +++ b/stock_analytic/stock_view.xml @@ -1,7 +1,7 @@ - + From 7fadecb3ea39f5a0ab225a138f7c7100817b7024 Mon Sep 17 00:00:00 2001 From: Hanane Date: Wed, 14 Aug 2013 17:21:28 +0200 Subject: [PATCH 04/61] add images --- stock_analytic/__openerp__.py | 0 stock_analytic/stock_view.xml | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 stock_analytic/__openerp__.py mode change 100755 => 100644 stock_analytic/stock_view.xml diff --git a/stock_analytic/__openerp__.py b/stock_analytic/__openerp__.py old mode 100755 new mode 100644 diff --git a/stock_analytic/stock_view.xml b/stock_analytic/stock_view.xml old mode 100755 new mode 100644 From 0339c91550a8ba45629ae5284a7716da2f91df7c Mon Sep 17 00:00:00 2001 From: "pierre@julius.fr" Date: Tue, 3 Sep 2013 09:25:40 +0200 Subject: [PATCH 05/61] update for wilog v7.0 --- stock_analytic/stock_view.xml | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/stock_analytic/stock_view.xml b/stock_analytic/stock_view.xml index 6606e915d6..efa8fce2c5 100644 --- a/stock_analytic/stock_view.xml +++ b/stock_analytic/stock_view.xml @@ -2,18 +2,18 @@ stock.move.tree @@ -115,22 +115,11 @@ stock.move - + - - stock.move.form2 - stock.move - - - - - - - ---> From ede9786e9b07311d877c307b2ed0b4c45d4d93db Mon Sep 17 00:00:00 2001 From: Yvan PATRY Date: Tue, 3 Sep 2013 17:50:27 +0200 Subject: [PATCH 06/61] Add contract customer invoice and migrate [IMP] SMS erase print [IMP] Stock analytic XML part is now migrated Add logo for generic modules --- stock_analytic/static/src/img/icon.png | Bin 0 -> 7242 bytes stock_analytic/stock_view.xml | 49 ++++++++----------------- 2 files changed, 15 insertions(+), 34 deletions(-) create mode 100644 stock_analytic/static/src/img/icon.png diff --git a/stock_analytic/static/src/img/icon.png b/stock_analytic/static/src/img/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0d224da57b316e830f7243efaf97d98b08dcac2d GIT binary patch literal 7242 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 - @@ -115,11 +97,10 @@ stock.move - + - From a86897f5977570a84bf2b109c39cbae4dfb67b4e Mon Sep 17 00:00:00 2001 From: Mathieu VATEL Date: Tue, 18 Mar 2014 11:39:35 +0100 Subject: [PATCH 07/61] =?UTF-8?q?=C2=A0-=20change=20the=20logo=20of=20all?= =?UTF-8?q?=20modules?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - migration point, put all the modules to not installable --- stock_analytic/__openerp__.py | 2 +- stock_analytic/static/src/img/icon.png | Bin 7242 -> 11930 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/stock_analytic/__openerp__.py b/stock_analytic/__openerp__.py index 0d0c40c730..bfcfeb1c46 100644 --- a/stock_analytic/__openerp__.py +++ b/stock_analytic/__openerp__.py @@ -43,7 +43,7 @@ # "security/ir.model.access.csv", "stock_view.xml", ], - 'installable' : True, + 'installable' : False, 'active' : False, } diff --git a/stock_analytic/static/src/img/icon.png b/stock_analytic/static/src/img/icon.png index 0d224da57b316e830f7243efaf97d98b08dcac2d..e07cdd3f72bfe46a4c038900eb7ef8d927a01ddb 100644 GIT binary patch literal 11930 zcmchd^;ZaNYDmK~Ly9i5fj|9!bq_L?(+`%Sdv-nXM(Z1jYq zzM~NJ{r~7B;-6RtH>XO7&F9#a<*263orF7BtIRg<%xAC%_Vr|jQRDN6<04Ha2ztp3 zw6(qL{WQ&QsfEYkUM*t+lUc`)6 z`dVUspsk@mkQ_z0$Zk>BwA#5ik?vA*`0|Z<&nqDp0rr=_TZ~+bH8RgHk(V68x7C6O zlBA42Merpx?~2c;#eMQ=4<-6?e65)ERhi5LBm>d!qj92ZgIsa`gt?-rIM-$Rry&ucSzqx4t)J|)2T}!+eNw>0#5`UpWYWhUNU;Fw(ynb#tY9>cD-$jbA|GCj z;3TqEwTOzCOvhPBSD^F75Lk60p}GU}eH%!Y5}@Py=S&$$n+)e;GkKg2`|1G;x$GrW zf7MN_|9v}Nn&f(bJtlVRt}~ZEpdr{b9oo_bI^s4Rz; z4q1y#so-@VC-_r;HG~`TL0r-MX9}1krnN+YArgkb^reQJMkF2*{7Krg!5%Kp_o6js~CP8o*Ihf-U zi;Gg&i>nok9Fu`iD@hpBioxdjlyR&QJu+?n(kcj>Rr8ms@Ovn>l5SA~IEfGNl_b`p z%ls%Ft2~a+#-$*{xDGRQi-D@;s-X63DzF()Gyxz+P02ngW`!a?3TkyrzDrbj#y)64 z@L6BFl!#`fkJk&43Rv`H|p#A5`zNSMMk1;&g^c-7$&CO8U4l@> zv`is*!Gmr0XU5qVwWs(6#%KDGxj%h;xWajRdIBTMbxR z82M}0&Wd+a+xJvV>XjYf)NqlC1BMP!*|{|eW5!!k+n=Eg4?rNv_Zry3n<9m}_cc=t zktkH#y{I&`KdnB6hGzZn-z9UwmBCVcw(I}kcYWXl_c|Xqd30u=lPbh82+k{#Du0I3 z)=cl~%pZk}+4qk-o=KD{wmx$`Wf{&Gtmme5N_a+K>hA{nxb}qIH)z>_r{r#sl^ym?jPhIG-2+|4{jpTxm7~U$#Kx{h0M9jL->~xc9uQL!$ zv63UUV}EjL;~t5vYv7Wp&GI)!e}z`K*x+ji4V_Hwc3OpN@d3- z%>2yubJ~d>cb3gy?LZr0ilb{sCT1JI0(Zk-C@ctrej;DQk6UU@y>)2CTq>VFcJ-Y5 z5MDSCSN%5OvJ0P9jAIRJK^dIVXm6#F=aWKd)A3@nZ)ad?M$mHZn}iG$iLAdK@7N2W zJ(?vRovRt5D`{awwU+wpfm>|i@D%gPP%e-GgDq&VK+Bg1=uKRMm@+fkF(!%=h=+m1 z=ldTuJeKL9p$Bfdq^28&EGXum!3{(R0mF}BK$`Lu;oJ`r?AaQ)5N-8HGpa3>r7>qA zHcR(!#Jz;|`}&}PjUItYzxP@lL<~H}3gv$#<&?$~yo~EuMbbU%yXyffK@wk#1NQBz zS(Uzr>&>YKu?>~F2gEH6T2>Wq=UKU_Ud72zNP>rHVvRh?WJ9D65&8ja47VS{oqMN! zK1#acFy4~R3~C;Usxe99bqhu##G&GcM_K+DB|@SqI8}4!pGf9EtPqarbQVldM2d2wll8`VP8r>>75OLxzyk3^3e z?fg3}OYMcHm{oEdEJxOhoc!IbJ|Ldwl}UbjuF*bED_M`Yi;@Uh)n4rppKuTbxRB2f zBpV*#!RnUxt^uM7VXsfSG#Q}KJ|w2+!byopBJkxtkX8UK%V%rjQf@vGFS_%#ZarN7 zXo1WgIsd06nIYVNTJX_F5WpK_O+(Q`>1BwwEVI zsExyIX7n+3Whwfnh%v0ePgiBdDE&rn6bWY|*!~hX~ z6G7|r-Z^NK0upca-K!3SmhyOc2XKqWOs5=%;#DA)kw*T`mM=sfoD8vVIDhBRaK2c) z**aK7!UIko?Q}On)>#V$>i5n*`(n3-Z6e427izHkUrCOZ#mCI@PmHNcF!i8!$r*m_ zPsVp&4A(GF^oeWM1y`G(mW}UfSaFPog6VCff)L}U6h0DIoprD`jHDjCSvY*Zmmb0jM_K!XJ57k7u3NU6>rzq}*%_+-M zJW6fzk1k>cCBz({6F-ZLkc^Sf(nCw z8j*AOaj8)RsRXq9d2UcErrJd9`L2(BA`>Z1x1Qxy$ysLL+Zo4@$);q$0;ghM86ijt zeQ$n^VNs?(>`!Q>KP&B1@sd!KEjpDRfY^I@az}~aI!MqB2gD=B zl&CrUu+ufOYt_Xy|9d0Jy(E#YqD9j!L73K^L`&#hX>fVUcXjTxV`Yr)8p%_v+opUJ z#z~w-_%jAc3fUD(m1gK{$d4Zzj*LZk8Z(vhGWeAChch-neT3WNBtp$1n>*-%d(&;( zF18>EXL6~?LsV6HWnkCq7(+rvTuKhaiP>$75P!`dcon04{W!X0W_%+X@a^4^*poB4 zHS0G8n82nV5S*>1Rr3ts0?HxUs+KMq+m^0v7H9ztfd35%6}iW}M|(i3-uM^gg08|lBbxYBM2G!P6uZLq#!2!Zq5ggGb63$qU?)&E3%G!QYU zq2y+ooSVX2$V4(jHWz`wCy}Y><7)gK*KUx8X*afn0dIx`U^elW*a&JeHLc8gB*K%X zRh4lxT^xi#5yB?&xJcpY$cA{mteS=3Li`nsEI&Yj^BkeCceQg|u zES+n?q!R&6O&E^`P|vy4bp?_`1nMtx;4@Ph-T%Ad<;59vgt@W7&ZatI4+FijlG&1D zzKUYsob-pRO^TdYNL)--MEc}*aBFBkmG(L-Ovs3$Jg_;3O#+knR%QfL*ftAan*J*K zOJf9GfNy7eGW_owU5m=#@$`G2E;Fx1M#z5*Gnv?zC`G~%{o|2N+d|JK0$ktL*EPlh zn*QBTcF9xb#5cnU*Pp;v!A)WWY7hIN4esQz)S}YVg2O^u`Y1Ny)#8-|ldZ^PsSN5U zW_Vp6^|}@Y=Nc2L55mjZvLA6dFMczA<0I2qOQ2D0vGK+6WLG`;vC*7g^ENraGoTnl zD$e__;zV!}8QF+n6b4l$z|sP6gt;2jpB4tac}5K=+uS10duU18_0O5EK=LK-?qyk65^yDc1DfM;b{O~H6-bv(lE^YxO2Bo3cR;45%x9Hqf(CZ$DXbbyZ-bhO6RhG;L-TT za_82W-3+fADx^4{a~E#w6J*Xyw=ZhU0Qkx*)JHR;XW|1uU_+YVDO9I zsB-rY0YGnS8$sA-t6t{gFZ_wkz=GFqy7w|Y)hYC4LnB2>A@4E!1T)~0)YjK!NH4W= zIMncb?Zb{?;tkrHtM%5>Wi>Y4T?|H7Z~U|N8>9!nLm)DszOgK{@nK+qsYgE@)^?yw z$afon^BwCv9~~W~prF(OkfRrWux2D}x_DYZM$eyRFvHjpKrNOfh}zhWNw)M(XQ6sf ztlWjn5#Onq+4o^-G_IUnZr!%qm|bHWz@+;nfS0`UDwDahOQ4;2Dgr%x-ySiICPmL0 zuB5N5J*scGOop$JsAIc5F&ZpB-{|++TDG0kJ3;#12j4~FWtQWwB6u2N45>YlNG)68puy*?@8+HH#%&NuYB(TveN?H zs!+L9WtmaUlNXjo1@vB9#BQyG@1l2EQ*auTj8DZ|$atXB?pFV-Joa1-@LOVj?Qm7i z3+mQfQJLX~n>N-EBJd!zsmv7j3tPnkz5tA8H`@OyUnkc$q%x4Ro_a6{?kNL-f!&u@ z-J!X{MhdOxBngW{%H@@)z}aF+y9ill!&}?Pd?1orQBKq2FXfFgYL?m^*AMRA8uLE! zShIYG&ofEU%zfn#ONIM3ekV3Pqm)&vAJnhTmK}nhQ(7>BQ3jbpu4fdPVa1<+GEWRC zPv5gXZRMDj8WzZ2ep50a`C*JEsWk$o?yeD!3D7^Mtmdkc;`42+bN7pqyqo6S)7}2%`;QU zeHwPV17Se+CY=0!v3k5z0HZ|6{Ry0cO`#ux#c62mpHY-19vqJ7;(ZQ4A2ufk=^akQ z?=9Sj3a&9qU1OvS!_i<>DLsR$Vr` zy%4S zfH=wr_R=BdQGhDpxIhZ>T7Kz7TDZG_csAb2IL=LVG z5*ueMK5Ew45i46F&2kDK92^_t)TuE?lRCg8+8e(Y#7i+C|H^#I|v83eMB}Qr7i0hrROlb%EJDSg@%~U-Do)2f{ z#5%2=TvTmr_M3&&DgdD^n&IVL8cE3o*q2A>@5J2f!jx|1s}5^ox-rTTPqjbHb}5CX zb#w$3W3!jA7?ITs9WQ~|z>Xgvlai!o#$ICd=qKj-+3V*bWpn4miakoX#8ePXzP{Ce z(IM5=iv$P4eFHJJ6_gF}2yox_IcM;_ywQCy6Bb5TdLGm7&pEM|XBZ|kUXW#`5|iee zt6`^vTbK|XlZu=9SPVnHkiHv6*~kcZ8tv!J@Zqn|2J!}`Wwelk$KewKt0@((54v#(A zOP_uSGE+IKLahXVOak$Sd?uA&zJ73|#$W1iH@KLW?^OV`V4GXHIWdk?1KHSP3csz4 z{@;mzs;{-}+SR((F@SQ*CZWlCKnbQyvGZk5#rD4XVkSCF3HitstNJpmK0oMcINV+& zW=xU@k)uX>N3rZ8FEI`{O-uErM2e|;bvkp=kw)XT&}ZcD09x83>$JuBnP_*PpShxF zmAzUEB5Y!D<||`&>Fq@;)Xd*}%L7mrUB|PSoc>05ch5QQhbujg6X zR)tiSYSjyYKUrnud5$y9AbXJGB#90TJsilXN2ul2+_l_Y`h?3?HY$wbj@inslofr9 z-(j%l(6>A{3@J>R6QB7+=pHEf0l2n9RIN1srr7#njk>_} zbx>A7;AvA@>U;xRiP(ScE00HH25nz~Q<+0WyE`Jzm)lmS?j})$=4<2CFuNqVQ>lQDC_0%j!n3slJ~wSmg3MO1h{47Lk5;jnV>6eyLq@ zsSUEiBcIBN9pni@zueftJg@Y zZ^vXBDQB^|c6jDcFlmbKoBZnTOl5%-CUVtmKYf#G*0KFQZhtvuN!JX5gDC#imlmVL z)T7~iGNP_U8ih;FSV^Pw$u~{?k#j@QSeU((NB?=E(>n*vAEV&;%W&Dq)nTHJH5DJe zF1_McKdf7htRh_Z)C(ktrL{IVH@c8i2P&~;?A_YFN#akjA)Uqz2|TUpt#$!M4E zU>PnwvZCNsl?1x*A)o%Vy;~FLg!(F1BNhHg@)K->%GUlToKWUCsSZ*sJUE4erpTlKUj8=DWi-ZzPLw*oMD^iDJ&pUeF)Mn@QyW_oqfom zORP8fVzct=@7*_dbnB%rW%Z=Tkb=Td_~S^W4aQx_O(=5WL?xOYLa6y)jMqIH9xNeM zFE1}rkKB)>XNWowK$@DDck0o=b7-)$=Y()toK)wu6Y!xQNPwY0|L$#kMy34~d ze+MVO4wy#?K^je8zBWzmf|WwHWq}6o!}z>75@fX?CkvB46|&VGD#xlo8Ka^10Vrf| ztodhWnoWaq3C3~VpNyogVz265l(O!;5yWy^H;6USox4$-+0jDfR2xD(0Tykor!zl` z1NrR{COmrNhy>OgV!BmXLI_QT9;IF`(gEHmAF{NwH%F%Im6(gxJ$4qBu>%_#PQ4li z29m&_H{}B{ls?U{bagt{WDsR9!TMTuUwrV>X}W0Uvnd!WX#5oGVP{)Hs(Tp##u#Bn z6I|f8A4D**_2i`OkF`VkP%mdxq~_OAgoo;EH0z$Eo7<|G&FlE=DkopP`N3^r->AVo zH>h_dI6Fgsx-ID7^?Ktv1Yi5J-M%a9an>Ru83Rgpt){mA_3HmLm?pXYy4xcfyZPW4 zCD0}=`Mn6S5Rza`wM6JR(h0`?8@<1YX5;K_*NgCT-M!RrqrpLDu;1fU4ZEU<;xsjC z$+onPjyzG5jwp+Xo@xrNJ97{HxSt<7wse?^TZ-g$*!!o&5rtKj*pH6R$J-5dWv@tC zpN|r=MNC%&wKg01FjdN7S1Om7ZI7>58Ff3BId1egs_S{P(+Mf-6vONY8OLPQl3d*c z-4oxtAugoMe@xJNB9;V+iaIbOZv`~2g7Aq(lMS6YM768WRAjX?caWJg5)qw< zM%6Mqy!FUe=3zKkh>3l9%^1`_qtRk%Q!K(1p-@C?K`QQ_H?xc>_MsVAHby91MsKRX zU8O{O$k4nx1E5ExDa*K*p6=ZrYgFlupxlPD|2Txk z?|Vf9>&0kgu{B_X2>gU2zvEuRU2P#5H9G%ZHLda`9**f-sAbadng;)=EY^)fgUjD5 zcx&OTX!#8t5xnG$a>ar$F0|NLGxO2RhHZKHKdfbv9)3O#L4#>zE1*pln)1wnrlbLP zjgkyKX7at$`a+O$Nu49Y^L)(o@7Z8>zo z-t~bfU~x#Z=G*rkw-3mg+qfn{XBC9PxPHH5Kz6A4b!>zpQ8+ zS0HBUoj!%du>~$=8ZLk<5o`AjL}DnRy|eCk#^m&rhz6${y`ODl+FmZ!XaM3%hNY?+ zQi8!CF!5iq8Egmp@h{641-Ryhfq+J&!;&1~6r1d6puI{7JD0fl#j3 zw;jWTSC;>af`o*vaKM=@db{K7XDDJ+4n0j@_cJf275(=M6T+@d$^4a#&~sA3D$@sa z4y=eevjAJOil&12NG^LLoT9m4Pk>;%{<-+rLrq>#UfHj=8~cWkxa5+?)GxN0eRoOr zUNG`7CDdzGTVI+zt$R^A=S<)`!{3zR|8@E4?@RccNtB?E{A~seZ$0wFm+h5uG`Ozw zM0qbF@8|gaxAK=IIQpNY>r>*G1mJKMeS1S?4z1HeY`~J_jQ|I5Qj;%AcmoB4 z4YH}3UN9!y22S=EdQv?J5m6MDid=us1(|xlLu;5%w+oD)#!pdQj)i>>a?u{RDjtxp z0)MSG- zYG&Iy#FWkMl)QN+b_J<3YmcBd<9)ML2`HLi5P|YnTlmekC$^B%tkA0}j|3ixuh8=W zGwOQ+`G$Mrt#sRepI$8Z3&(e0^+4vMd8NB*xPPZ!38vHvmKhdx&2sWR3=;3te4$T; z6}$_S0ELVyun?!Ko&lSL%@+0ncaE zHHm7llT!1qpOX}tf7_n|`Ad@;{EAL@m=fso0)u5+6X=M#n*H{h{&aK{QxOl*P?ey) z{T$0uIx@jh&lG=Qkawqg4Sedlk7L9Dz4|XKbRv9~uL&u?yTOW2MvOZo5FSKH`%x%x zt~9`~Abxr*WmB==->)6+nBSOD73mXb$^|Ji!5+{F!+OWJ{tEsHno729(`RiTBgb2XAH=t600P2HtxwOF<9m*MrD>~gP%xubWcE>)8;Xb2v<4oKMNZgAz3=8L{fLf*Xv*{ZK9P4#}yel0T)dL zraR3(n(i|JFYlC$4Pw&W8YBesL3;8m=Cb7>K`AsM=zpQN3s_2D_t`N-`)I{j>0rtv zUKZBqP`-e_inaVq073MO+5!hrkKi@+m+x3nIO+xNn6XJvs|4ab?=;Jrtm0F?Pf73A~)1;^Je@9f#y?(AD!?Dt^7<6#J{162f^!hI$ zkCBF?NF&3AY?ZaqJ#M|Hkb&_RH;ZzayQ}J&@@s}@SnHLG>q41Cyys$FdaO(6ly=;;UtH)68Xgy{F4bkAbaGV;z2ucP zTc~dMZ8ZnkgF=owQ=z72n$C_(I-QH^gPfelb=qNZn#TJT2 zeBPH7)cxO!u(xp0&%s!R5)QzkoB5MGd3t?da{k^|*N-)b_f^4Vi`x7Zcj7zB`Vs`6gO+t?!rKkohK+^#}t|xXL8sQ;~TFCpz#Y#>STY z(K6uIzB!Zk!2uWq@G)z_?>V}+T%gY@r!2v-s!=a(mci84Z(gY-iM~0eO$OJ>_zC3f z2sLl_!qfftuG7C!;|gZPX|__ltnRGyIfN>Q<#G>0atr}+;2|lJ zr{n&hvr2qUH>bpt zkHu~tN%(K_@(E7Xr<|F+5RAx=N%aaFl)EwC-yaJ0TV}W|Z<$SC+&&X$hwvB8{+&|) zxaM=(i>6RDaLj>ac%`xXA8#te9Opm~NVfPxX)7Z_$e*5K&?p-|kh?%Za$Lw?!97o# z)7Rt$yL!*;{>h`X)PHHv1Nl(iK-r6My~B67R3b9l5TsqvI7&o1Zi<$*ocGIrFXwxj z*NOJAgvUsR02BF&=zevTKTa;WzWJylq|i(KuXnkk-xU&4_k^l&QZFahW-Uk08^@WU zmk@t_TBYG17JZ;u!_&zM@o;!woKWJbc_e##O6A!#@^ziFmcT!(B3Gme1nA4#a`U*m z@xR;|`&$Q-6xECj9{DXpg9|KD6ARqiI+}ZO5%1QW6I_ft&+O6B_Wzywpr-E_2o~e3VM-&SoHM9ewCjK#u zo0zc!Cm~a#2#NYLW4dHto{CIVmJ?zob~JhiX95?a#eo$;Xv8cm6XH&Q!)Y_dsk<i4)r-HqL~LevjYJ&f|C#WAt7g^rd(I-dxZ1N> zTz`#KlP00L|C(gT)QWy^{=+v6^vdadBIulh4gy>)Dfh#vb`xk7$fU=t!!GO5H})bEu4Q45P#KJebF z#!Ddk{XOANqxMX3equonpvHx$=85l=QB|j^1V;fOkiw_paaT6G!)tv>r_O2WlRmc^ z5m%V1F@*1GZxHdp9;iHj!oL=0TovkE3hp;ET>V1 zBGklf2FrEQjc5LwWR8gD#c=$=_Q%3PYsJZmOT6+qtZU+BE?ev@HO6z-PLCEG1Bs<_ zJz>0ftb=UM@UbvR$GX4blVJuSA6J7c@M^Ci6Y}aG5i5N3Bw1M z9r?e1+vGF-{xY%N_KqBFIK=K7xSNhm_Y(pXIz6|#rMaQ5erP-uqe!;7r5Ulia5)*( zv_<vJVAh6G5MmKSUp$xS|KrjDrP^@aO2`sD7Dg_CwuXnk=7hyZ2%^utH6C6`_X8v>GeVSCG6bEH4Z7 zFrVRR6*Q2$eZWhpRRFx^OM9Fr$HPu8D|5uJ$@zKU0>E)LW_GreXav~~MPe3)U*rsZG%XiR!`1p3TchI13XjQX%1e+HZ_RFJ2g5<7xv<0@F5Y`mM7t5Sl(Qy{A%Zbd4*q zq8cV|?iWf&2@ip zg`SpJ(1L$n*bf8Tx(09NX02yIw(3Sc)^_(-P=LQ)l*5}jYKqS8V zKFvJzvngB>MeiPO)irbP0nStgD(MAFJU1Uzkahsm){#ivUn5uuY0)v4ei};y8V9T?+tT*2BOWLnXwi>#kA)s9{Zw0I;m<3ja{Gp!5Un(K0_Rwb<4*5qG zhf-d7s8p9oKV3hq3wJy{%2}*FOlE4N+V-YgOIe}|!Vsl-h|2&EfYOC%MT_u{h>_xn zN5K7DssIt_-WN{We_UY)Wr&Tzl0S?RN)VqbELQRg(ASwMP zHS*X1odvgPHA6jCaR~Ev;VUB2;?r6_siBd{^EQ&iSNIzfn$=Jg&a=g;+hHpH%NKlc z+~A(9A#NGqf@GN=VB=v_Cf~;x^Le@)fF0`7h=QxBSh0HHQ6d@^RWK|TkWYJ literal 7242 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 Date: Thu, 19 Nov 2015 14:39:43 -0600 Subject: [PATCH 08/61] - Added new module stock_analytic This module allows the user to generate analytic information from stock moves. - Fixed flake8 and pylint errors. --- stock_analytic/README.rst | 33 +++++++++++++++++++++++ stock_analytic/__init__.py | 10 +++---- stock_analytic/__openerp__.py | 34 +++++++++++------------ stock_analytic/i18n/es.po | 47 ++++++++++++++++++++++++++++++++ stock_analytic/purchase.py | 24 +++++++++-------- stock_analytic/sale.py | 38 +++++++++++++++++++------- stock_analytic/stock.py | 51 ++++++++++++++++++++++++++--------- stock_analytic/stock_view.xml | 29 +++++--------------- 8 files changed, 187 insertions(+), 79 deletions(-) create mode 100644 stock_analytic/README.rst create mode 100644 stock_analytic/i18n/es.po diff --git a/stock_analytic/README.rst b/stock_analytic/README.rst new file mode 100644 index 0000000000..be81b2bf01 --- /dev/null +++ b/stock_analytic/README.rst @@ -0,0 +1,33 @@ +.. 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 + +============== +Stock Analytic +============== + +Adds an analytic account in stock move to be able to get analytic information +when generating the journal items. + +Credits +======= + +Contributors +------------ + +* Fabio Vílchez + +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 http://odoo-community.org. \ No newline at end of file diff --git a/stock_analytic/__init__.py b/stock_analytic/__init__.py index 51acc45408..043d70419e 100644 --- a/stock_analytic/__init__.py +++ b/stock_analytic/__init__.py @@ -17,10 +17,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -################################################################################# +############################################################################### -import stock -import sale -import purchase +from . import stock +from . import sale +from . import purchase -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/stock_analytic/__openerp__.py b/stock_analytic/__openerp__.py index bfcfeb1c46..8b2224c286 100644 --- a/stock_analytic/__openerp__.py +++ b/stock_analytic/__openerp__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -################################################################################# +############################################################################### # # OpenERP, Open Source Management Solution # Copyright (C) 2012 Julius Network Solutions SARL @@ -17,34 +17,30 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -################################################################################# +############################################################################### { - "name" : "Stock analytic", - "version" : "1.0", - "author" : "Julius Network Solutions", - "website" : "http://www.julius.fr/", + "name": "Stock analytic", + "summary": "Adds an analytic account in stock move", + "version": "1.0", + "author": "Julius Network Solutions," + "ClearCorp, Odoo Community Association (OCA)", + "website": "http://www.julius.fr/", 'complexity': "easy", - "category" : "Warehouse Management", - "depends" : [ + "category": "Warehouse Management", + "depends": [ "base", "stock", "sale", "purchase", - "account", + "analytic", + "sale_stock", ], - "description": """ - Adds an analytic account in stock move to be able to get analytic info when generating the account move line - """, - "init_xml" : [], - "demo_xml" : [], - "update_xml" : [ -# "security/service_security.xml", -# "security/ir.model.access.csv", + "data": [ "stock_view.xml", ], - 'installable' : False, - 'active' : False, + 'installable': True, + 'active': False, } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/stock_analytic/i18n/es.po b/stock_analytic/i18n/es.po new file mode 100644 index 0000000000..fab2e682f0 --- /dev/null +++ b/stock_analytic/i18n/es.po @@ -0,0 +1,47 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_analytic +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-11-19 20:50+0000\n" +"PO-Revision-Date: 2015-11-19 20:50+0000\n" +"Last-Translator: Fabio Vilchez\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: stock_analytic +#: field:stock.move,account_analytic_id:0 +msgid "Analytic account" +msgstr "Cuenta analítica" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_purchase_order +msgid "Purchase Order" +msgstr "Pedido de compra" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_sale_order +msgid "Sales Order" +msgstr "Pedido de venta" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move +msgid "Stock Move" +msgstr "Movimiento stock" + +#. module: stock_analytic +#: field:purchase.order,website_message_ids:0 +msgid "Website Messages" +msgstr "Mensajes del sitio web" + +#. module: stock_analytic +#: help:purchase.order,website_message_ids:0 +msgid "Website communication history" +msgstr "Historial de comunicaciones del sitio web" + diff --git a/stock_analytic/purchase.py b/stock_analytic/purchase.py index cf690ed4f3..1bad691619 100644 --- a/stock_analytic/purchase.py +++ b/stock_analytic/purchase.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -################################################################################# +############################################################################### # # OpenERP, Open Source Management Solution # Copyright (C) 2012 Julius Network Solutions SARL @@ -17,21 +17,23 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -################################################################################# +############################################################################### -from openerp.osv import fields, osv, orm -from openerp.tools.translate import _ +from openerp import models -#---------------------------------------------------------- -# Purchase order -#---------------------------------------------------------- -class purchase_order(orm.Model): + +class purchase_order(models.Model): _inherit = "purchase.order" - def _prepare_order_line_move(self, cr, uid, order, order_line, picking_id, context=None): - res = super(purchase_order, self)._prepare_order_line_move(cr, uid, order, order_line, picking_id, context=context) + def _prepare_order_line_move(self, cr, uid, order, order_line, + picking_id, group_id, context=None): + res = super( + purchase_order, self)._prepare_order_line_move( + cr, uid, order, order_line, picking_id, group_id, + context=context) if order_line.account_analytic_id: - res['account_analytic_id'] = order_line.account_analytic_id.id + for move in res: + move['account_analytic_id'] = order_line.account_analytic_id.id return res diff --git a/stock_analytic/sale.py b/stock_analytic/sale.py index 03c55dfb63..4d01d8495c 100644 --- a/stock_analytic/sale.py +++ b/stock_analytic/sale.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -################################################################################# +############################################################################### # # OpenERP, Open Source Management Solution # Copyright (C) 2012 Julius Network Solutions SARL @@ -17,22 +17,40 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -################################################################################# +############################################################################### -from openerp.osv import fields, osv, orm -from openerp.tools.translate import _ +from openerp import models +from openerp.osv import fields -#---------------------------------------------------------- -# Sale order -#---------------------------------------------------------- -class sale_order(orm.Model): + +class sale_order(models.Model): _inherit = 'sale.order' - def _prepare_order_line_move(self, cr, uid, order, line, picking_id, date_planned, context=None): - res = super(sale_order, self)._prepare_order_line_move(cr, uid, order, line, picking_id, date_planned, context=context) + def _prepare_order_line_procurement(self, cr, uid, order, + line, group_id=False, + context=None): + res = super( + sale_order, self)._prepare_order_line_procurement( + cr, uid, order, line, group_id=group_id, context=context) if order.project_id: res['account_analytic_id'] = order.project_id.id return res +class procurement_order(models.Model): + _inherit = "procurement.order" + + _columns = { + 'account_analytic_id': fields.many2one( + 'account.analytic.account', 'Analytic account'), + } + + def _run_move_create(self, cr, uid, procurement, context=None): + res = super( + procurement_order, self)._run_move_create( + cr, uid, procurement, context=context) + if procurement.account_analytic_id: + res['account_analytic_id'] = procurement.account_analytic_id.id + return res + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/stock_analytic/stock.py b/stock_analytic/stock.py index 8349cdd09c..66d9b808bf 100644 --- a/stock_analytic/stock.py +++ b/stock_analytic/stock.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -################################################################################# +############################################################################### # # OpenERP, Open Source Management Solution # Copyright (C) 2012 Julius Network Solutions SARL @@ -17,27 +17,54 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -################################################################################# +############################################################################### -from openerp.osv import fields, osv, orm -from openerp.tools.translate import _ +from openerp.osv import fields, osv -# ---------------------------------------------------- -# Move -# ---------------------------------------------------- -class stock_move(orm.Model): + +class stock_move(osv.Model): _inherit = "stock.move" _columns = { - 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic account'), + 'account_analytic_id': fields.many2one('account.analytic.account', + 'Analytic account'), } - def _create_account_move_line(self, cr, uid, move, src_account_id, dest_account_id, reference_amount, reference_currency_id, context=None): - res = super(stock_move, self)._create_account_move_line(cr, uid, move, src_account_id, dest_account_id, reference_amount, reference_currency_id, context=context) + def _create_account_move_line(self, cr, uid, move, src_account_id, + dest_account_id, reference_amount, + reference_currency_id, context=None): + res = super(stock_move, + self)._create_account_move_line(cr, uid, + move, + src_account_id, + dest_account_id, + reference_amount, + reference_currency_id, + context=context + ) if move.account_analytic_id: - for val1, val2, vals in res: + for _val1, _val2, vals in res: vals['analytic_account_id'] = move.account_analytic_id.id return res +class stock_quant(osv.Model): + + _inherit = "stock.quant" + + def _prepare_account_move_line(self, cr, uid, move, qty, cost, + credit_account_id, debit_account_id, + context=None): + res = super(stock_quant, + self)._prepare_account_move_line(cr, + uid, move, qty, cost, + credit_account_id, + debit_account_id, + context=context + ) + # Add analytic account in debit line + res[0][2].update({ + 'analytic_account_id': move.account_analytic_id.id, + }) + return res # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/stock_analytic/stock_view.xml b/stock_analytic/stock_view.xml index 27478c1d33..7102e9ab38 100644 --- a/stock_analytic/stock_view.xml +++ b/stock_analytic/stock_view.xml @@ -6,10 +6,7 @@ stock.inventory - - - - + @@ -35,7 +32,7 @@ - --> + stock.move.tree @@ -47,18 +44,6 @@ - - - Stock Moves - stock.move - - - - - - - - Stock Moves stock.move @@ -70,10 +55,10 @@ - + stock.move.tree2 stock.move - + @@ -81,10 +66,10 @@ - + stock.move.tree3 stock.move - + @@ -97,7 +82,7 @@ stock.move - + From 50e40cf483608b086dfb7e6d870f96c71ee363e3 Mon Sep 17 00:00:00 2001 From: Andhitia Rama Date: Fri, 5 Feb 2016 14:32:46 +0700 Subject: [PATCH 09/61] Adapt original module according OCA Standard Remove sale and purchase dependency. Add test Only assign analytic account if account != valuation acc Changing field name account_analytic_id Adjust to OCA latest guidelines. Add some usahe info on README --- stock_analytic/README.rst | 55 ++++++- stock_analytic/__init__.py | 29 +--- stock_analytic/__openerp__.py | 44 ++---- stock_analytic/i18n/ca.po | 34 +++++ stock_analytic/i18n/de.po | 35 +++++ stock_analytic/i18n/el_GR.po | 34 +++++ stock_analytic/i18n/es.po | 43 ++---- stock_analytic/i18n/es_MX.po | 34 +++++ stock_analytic/i18n/fi.po | 35 +++++ stock_analytic/i18n/fr.po | 36 +++++ stock_analytic/i18n/gl.po | 34 +++++ stock_analytic/i18n/hr.po | 34 +++++ stock_analytic/i18n/hr_HR.po | 34 +++++ stock_analytic/i18n/hu.po | 34 +++++ stock_analytic/i18n/it.po | 36 +++++ stock_analytic/i18n/nl.po | 34 +++++ stock_analytic/i18n/pt.po | 35 +++++ stock_analytic/i18n/pt_BR.po | 35 +++++ stock_analytic/i18n/pt_PT.po | 34 +++++ stock_analytic/i18n/ro.po | 35 +++++ stock_analytic/i18n/sk_SK.po | 34 +++++ stock_analytic/i18n/sl.po | 35 +++++ stock_analytic/i18n/tr.po | 34 +++++ stock_analytic/i18n/tr_TR.po | 34 +++++ stock_analytic/i18n/vi_VN.po | 34 +++++ stock_analytic/i18n/zh_CN.po | 34 +++++ stock_analytic/models/__init__.py | 7 + stock_analytic/models/stock.py | 45 ++++++ stock_analytic/purchase.py | 40 ----- stock_analytic/sale.py | 56 ------- stock_analytic/static/description/icon.png | Bin 0 -> 9455 bytes stock_analytic/static/src/img/icon.png | Bin 11930 -> 0 bytes stock_analytic/stock.py | 70 --------- stock_analytic/stock_view.xml | 91 ----------- stock_analytic/tests/__init__.py | 7 + stock_analytic/tests/test_stock_picking.py | 143 ++++++++++++++++++ .../views/stock_inventory_views.xml | 15 ++ stock_analytic/views/stock_move_views.xml | 80 ++++++++++ 38 files changed, 1141 insertions(+), 342 deletions(-) create mode 100644 stock_analytic/i18n/ca.po create mode 100644 stock_analytic/i18n/de.po create mode 100644 stock_analytic/i18n/el_GR.po create mode 100644 stock_analytic/i18n/es_MX.po create mode 100644 stock_analytic/i18n/fi.po create mode 100644 stock_analytic/i18n/fr.po create mode 100644 stock_analytic/i18n/gl.po create mode 100644 stock_analytic/i18n/hr.po create mode 100644 stock_analytic/i18n/hr_HR.po create mode 100644 stock_analytic/i18n/hu.po create mode 100644 stock_analytic/i18n/it.po create mode 100644 stock_analytic/i18n/nl.po create mode 100644 stock_analytic/i18n/pt.po create mode 100644 stock_analytic/i18n/pt_BR.po create mode 100644 stock_analytic/i18n/pt_PT.po create mode 100644 stock_analytic/i18n/ro.po create mode 100644 stock_analytic/i18n/sk_SK.po create mode 100644 stock_analytic/i18n/sl.po create mode 100644 stock_analytic/i18n/tr.po create mode 100644 stock_analytic/i18n/tr_TR.po create mode 100644 stock_analytic/i18n/vi_VN.po create mode 100644 stock_analytic/i18n/zh_CN.po create mode 100644 stock_analytic/models/__init__.py create mode 100644 stock_analytic/models/stock.py delete mode 100644 stock_analytic/purchase.py delete mode 100644 stock_analytic/sale.py create mode 100644 stock_analytic/static/description/icon.png delete mode 100644 stock_analytic/static/src/img/icon.png delete mode 100644 stock_analytic/stock.py delete mode 100644 stock_analytic/stock_view.xml create mode 100644 stock_analytic/tests/__init__.py create mode 100644 stock_analytic/tests/test_stock_picking.py create mode 100644 stock_analytic/views/stock_inventory_views.xml create mode 100644 stock_analytic/views/stock_move_views.xml diff --git a/stock_analytic/README.rst b/stock_analytic/README.rst index be81b2bf01..ce4f6d5189 100644 --- a/stock_analytic/README.rst +++ b/stock_analytic/README.rst @@ -9,13 +9,66 @@ Stock Analytic Adds an analytic account in stock move to be able to get analytic information when generating the journal items. +Installation +============ + +To install this module, you need to: + +1. Clone the branch 8.0 of the repository https://github.com/OCA/account-analytic +2. Add the path to this repository in your configuration (addons-path) +3. Update the module list +4. Go to menu *Setting -> Modules -> Local Modules* +5. Search For *Stock Analytic* +6. Install the module + +Usage +===== + +Assigned Stock Move With Analytic Account +----------------------------------------- + +You need to: + +#. Create manually or open draft picking +#. Add or edit stock move. Fill **analytic account** field + +Assigned Journal Items created from Stock Move with Analytic Account +-------------------------------------------------------------------- + +If stock move automatically create journal entry, the journal entry will contain +journal items with following rule: + +#. Journal item with account equal to product's valuation account will not be assigned + any analytic account +#. Journal item with account not equal to product's valuation account will be assigned + analytic account according to stock move's analytic account + + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/87/8.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 ======= Contributors ------------ +* Hanane ELKHAL +* Yvan Patry +* Pierre +* Mathieu VATEL * Fabio Vílchez +* Andhitia Rama +* Michael Viriyananda Maintainer ---------- @@ -30,4 +83,4 @@ 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 http://odoo-community.org. \ No newline at end of file +To contribute to this module, please visit https://odoo-community.org. diff --git a/stock_analytic/__init__.py b/stock_analytic/__init__.py index 043d70419e..5d9d01b67d 100644 --- a/stock_analytic/__init__.py +++ b/stock_analytic/__init__.py @@ -1,26 +1,7 @@ # -*- coding: utf-8 -*- -################################################################################# -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2012 Julius Network Solutions SARL -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -############################################################################### +# Copyright 2013 Julius Network Solutions +# Copyright 2015 Clear Corp +# Copyright 2016 OpenSynergy Indonesia +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from . import stock -from . import sale -from . import purchase - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: +from . import models diff --git a/stock_analytic/__openerp__.py b/stock_analytic/__openerp__.py index 8b2224c286..6688c15c57 100644 --- a/stock_analytic/__openerp__.py +++ b/stock_analytic/__openerp__.py @@ -1,46 +1,26 @@ # -*- coding: utf-8 -*- -############################################################################### -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2012 Julius Network Solutions SARL -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -############################################################################### - +# Copyright 2013 Julius Network Solutions +# Copyright 2015 Clear Corp +# Copyright 2016 OpenSynergy Indonesia +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { - "name": "Stock analytic", + "name": "Stock Analytic", "summary": "Adds an analytic account in stock move", - "version": "1.0", + "version": "8.0.1.0.0", "author": "Julius Network Solutions," - "ClearCorp, Odoo Community Association (OCA)", + "ClearCorp, OpenSynergy Indonesia, " + "Odoo Community Association (OCA)", "website": "http://www.julius.fr/", - 'complexity': "easy", "category": "Warehouse Management", + "license": "AGPL-3", "depends": [ - "base", - "stock", - "sale", - "purchase", + "stock_account", "analytic", - "sale_stock", ], "data": [ - "stock_view.xml", + "views/stock_move_views.xml", + "views/stock_inventory_views.xml", ], 'installable': True, 'active': False, } - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/stock_analytic/i18n/ca.po b/stock_analytic/i18n/ca.po new file mode 100644 index 0000000000..fe21837da8 --- /dev/null +++ b/stock_analytic/i18n/ca.po @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_analytic +# +# Translators: +# Carles Antoli , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-01-13 23:06+0000\n" +"PO-Revision-Date: 2017-01-13 23:06+0000\n" +"Last-Translator: Carles Antoli , 2017\n" +"Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: ca\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: stock_analytic +#: field:stock.move,analytic_account_id:0 +msgid "Analytic Account" +msgstr "Compte analític" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_quant +msgid "Quants" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move +msgid "Stock Move" +msgstr "Moure l'estoc" diff --git a/stock_analytic/i18n/de.po b/stock_analytic/i18n/de.po new file mode 100644 index 0000000000..a0522d831d --- /dev/null +++ b/stock_analytic/i18n/de.po @@ -0,0 +1,35 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_analytic +# +# Translators: +# OCA Transbot , 2016 +# Rudolf Schnapka , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-01-20 23:05+0000\n" +"PO-Revision-Date: 2017-01-20 23:05+0000\n" +"Last-Translator: Rudolf Schnapka , 2016\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: stock_analytic +#: field:stock.move,analytic_account_id:0 +msgid "Analytic Account" +msgstr "Kostenstelle" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_quant +msgid "Quants" +msgstr "Quanten" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move +msgid "Stock Move" +msgstr "Lagerbuchung" diff --git a/stock_analytic/i18n/el_GR.po b/stock_analytic/i18n/el_GR.po new file mode 100644 index 0000000000..b591ef17d8 --- /dev/null +++ b/stock_analytic/i18n/el_GR.po @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_analytic +# +# Translators: +# Kostas Goutoudis , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-16 03:41+0000\n" +"PO-Revision-Date: 2016-12-16 03:41+0000\n" +"Last-Translator: Kostas Goutoudis , 2016\n" +"Language-Team: Greek (Greece) (https://www.transifex.com/oca/teams/23907/el_GR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: el_GR\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: stock_analytic +#: field:stock.move,analytic_account_id:0 +msgid "Analytic Account" +msgstr "Αναλυτικός Λογαριασμός" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_quant +msgid "Quants" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move +msgid "Stock Move" +msgstr "" diff --git a/stock_analytic/i18n/es.po b/stock_analytic/i18n/es.po index fab2e682f0..4bd0228003 100644 --- a/stock_analytic/i18n/es.po +++ b/stock_analytic/i18n/es.po @@ -1,47 +1,34 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * stock_analytic -# +# * stock_analytic +# +# Translators: +# OCA Transbot , 2016 msgid "" msgstr "" "Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-19 20:50+0000\n" -"PO-Revision-Date: 2015-11-19 20:50+0000\n" -"Last-Translator: Fabio Vilchez\n" -"Language-Team: \n" +"POT-Creation-Date: 2016-12-16 03:41+0000\n" +"PO-Revision-Date: 2016-12-16 03:41+0000\n" +"Last-Translator: OCA Transbot , 2016\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" -"Plural-Forms: \n" +"Language: es\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: field:stock.move,account_analytic_id:0 -msgid "Analytic account" +#: field:stock.move,analytic_account_id:0 +msgid "Analytic Account" msgstr "Cuenta analítica" #. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_purchase_order -msgid "Purchase Order" -msgstr "Pedido de compra" - -#. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_sale_order -msgid "Sales Order" -msgstr "Pedido de venta" +#: model:ir.model,name:stock_analytic.model_stock_quant +msgid "Quants" +msgstr "Quants" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" msgstr "Movimiento stock" - -#. module: stock_analytic -#: field:purchase.order,website_message_ids:0 -msgid "Website Messages" -msgstr "Mensajes del sitio web" - -#. module: stock_analytic -#: help:purchase.order,website_message_ids:0 -msgid "Website communication history" -msgstr "Historial de comunicaciones del sitio web" - diff --git a/stock_analytic/i18n/es_MX.po b/stock_analytic/i18n/es_MX.po new file mode 100644 index 0000000000..e3e3c66861 --- /dev/null +++ b/stock_analytic/i18n/es_MX.po @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_analytic +# +# Translators: +# Juan González , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-16 03:41+0000\n" +"PO-Revision-Date: 2016-12-16 03:41+0000\n" +"Last-Translator: Juan González , 2016\n" +"Language-Team: Spanish (Mexico) (https://www.transifex.com/oca/teams/23907/es_MX/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: es_MX\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: stock_analytic +#: field:stock.move,analytic_account_id:0 +msgid "Analytic Account" +msgstr "Cuenta analítica" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_quant +msgid "Quants" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move +msgid "Stock Move" +msgstr "Movimiento bursátil" diff --git a/stock_analytic/i18n/fi.po b/stock_analytic/i18n/fi.po new file mode 100644 index 0000000000..742030bb83 --- /dev/null +++ b/stock_analytic/i18n/fi.po @@ -0,0 +1,35 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_analytic +# +# Translators: +# Jarmo Kortetjärvi , 2016 +# OCA Transbot , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-16 03:41+0000\n" +"PO-Revision-Date: 2016-12-16 03:41+0000\n" +"Last-Translator: OCA Transbot , 2016\n" +"Language-Team: Finnish (https://www.transifex.com/oca/teams/23907/fi/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: fi\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: stock_analytic +#: field:stock.move,analytic_account_id:0 +msgid "Analytic Account" +msgstr "Analyyttinen tili" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_quant +msgid "Quants" +msgstr "Määrät" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move +msgid "Stock Move" +msgstr "Varastosiirto" diff --git a/stock_analytic/i18n/fr.po b/stock_analytic/i18n/fr.po new file mode 100644 index 0000000000..8abe9ae790 --- /dev/null +++ b/stock_analytic/i18n/fr.po @@ -0,0 +1,36 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_analytic +# +# Translators: +# Christophe CHAUVET , 2016 +# Zwygart , 2016 +# OCA Transbot , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-16 03:41+0000\n" +"PO-Revision-Date: 2016-12-16 03:41+0000\n" +"Last-Translator: OCA Transbot , 2016\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: stock_analytic +#: field:stock.move,analytic_account_id:0 +msgid "Analytic Account" +msgstr "Compte analytique" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_quant +msgid "Quants" +msgstr "Quants" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move +msgid "Stock Move" +msgstr "Mouvement de stock" diff --git a/stock_analytic/i18n/gl.po b/stock_analytic/i18n/gl.po new file mode 100644 index 0000000000..1fda25757d --- /dev/null +++ b/stock_analytic/i18n/gl.po @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_analytic +# +# Translators: +# César Castro Cruz , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-16 03:41+0000\n" +"PO-Revision-Date: 2016-12-16 03:41+0000\n" +"Last-Translator: César Castro Cruz , 2016\n" +"Language-Team: Galician (https://www.transifex.com/oca/teams/23907/gl/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: gl\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: stock_analytic +#: field:stock.move,analytic_account_id:0 +msgid "Analytic Account" +msgstr "Conta analítica" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_quant +msgid "Quants" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move +msgid "Stock Move" +msgstr "Movemento de existencias" diff --git a/stock_analytic/i18n/hr.po b/stock_analytic/i18n/hr.po new file mode 100644 index 0000000000..c092af7f96 --- /dev/null +++ b/stock_analytic/i18n/hr.po @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_analytic +# +# Translators: +# Bole , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-16 03:41+0000\n" +"PO-Revision-Date: 2016-12-16 03:41+0000\n" +"Last-Translator: Bole , 2016\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: stock_analytic +#: field:stock.move,analytic_account_id:0 +msgid "Analytic Account" +msgstr "Analitički konto" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_quant +msgid "Quants" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move +msgid "Stock Move" +msgstr "Skladišni prenos" diff --git a/stock_analytic/i18n/hr_HR.po b/stock_analytic/i18n/hr_HR.po new file mode 100644 index 0000000000..027ac107a8 --- /dev/null +++ b/stock_analytic/i18n/hr_HR.po @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_analytic +# +# Translators: +# Bole , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-16 03:41+0000\n" +"PO-Revision-Date: 2016-12-16 03:41+0000\n" +"Last-Translator: Bole , 2016\n" +"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/hr_HR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr_HR\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: stock_analytic +#: field:stock.move,analytic_account_id:0 +msgid "Analytic Account" +msgstr "Konto analitike" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_quant +msgid "Quants" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move +msgid "Stock Move" +msgstr "" diff --git a/stock_analytic/i18n/hu.po b/stock_analytic/i18n/hu.po new file mode 100644 index 0000000000..c9f8cf5c73 --- /dev/null +++ b/stock_analytic/i18n/hu.po @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_analytic +# +# Translators: +# OCA Transbot , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-16 03:41+0000\n" +"PO-Revision-Date: 2016-12-16 03:41+0000\n" +"Last-Translator: OCA Transbot , 2016\n" +"Language-Team: Hungarian (https://www.transifex.com/oca/teams/23907/hu/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hu\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: stock_analytic +#: field:stock.move,analytic_account_id:0 +msgid "Analytic Account" +msgstr "Analitikus gyűjtőkód könyvelés" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_quant +msgid "Quants" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move +msgid "Stock Move" +msgstr "" diff --git a/stock_analytic/i18n/it.po b/stock_analytic/i18n/it.po new file mode 100644 index 0000000000..45a4f1cb50 --- /dev/null +++ b/stock_analytic/i18n/it.po @@ -0,0 +1,36 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_analytic +# +# Translators: +# OCA Transbot , 2016 +# Nicola Malcontenti , 2016 +# Paolo Valier , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-16 03:41+0000\n" +"PO-Revision-Date: 2016-12-16 03:41+0000\n" +"Last-Translator: Paolo Valier , 2016\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: stock_analytic +#: field:stock.move,analytic_account_id:0 +msgid "Analytic Account" +msgstr "Conto Analitico" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_quant +msgid "Quants" +msgstr "Quantità" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move +msgid "Stock Move" +msgstr "Movimento di magazzino" diff --git a/stock_analytic/i18n/nl.po b/stock_analytic/i18n/nl.po new file mode 100644 index 0000000000..67b8b2cdbb --- /dev/null +++ b/stock_analytic/i18n/nl.po @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_analytic +# +# Translators: +# OCA Transbot , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-16 03:41+0000\n" +"PO-Revision-Date: 2016-12-16 03:41+0000\n" +"Last-Translator: OCA Transbot , 2016\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: stock_analytic +#: field:stock.move,analytic_account_id:0 +msgid "Analytic Account" +msgstr "Kostenplaats" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_quant +msgid "Quants" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move +msgid "Stock Move" +msgstr "" diff --git a/stock_analytic/i18n/pt.po b/stock_analytic/i18n/pt.po new file mode 100644 index 0000000000..553f8f3426 --- /dev/null +++ b/stock_analytic/i18n/pt.po @@ -0,0 +1,35 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_analytic +# +# Translators: +# Daniel Reis , 2016 +# OCA Transbot , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-16 03:41+0000\n" +"PO-Revision-Date: 2016-12-16 03:41+0000\n" +"Last-Translator: OCA Transbot , 2016\n" +"Language-Team: Portuguese (https://www.transifex.com/oca/teams/23907/pt/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: pt\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: stock_analytic +#: field:stock.move,analytic_account_id:0 +msgid "Analytic Account" +msgstr "Conta Analítica" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_quant +msgid "Quants" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move +msgid "Stock Move" +msgstr "Movimento Stock" diff --git a/stock_analytic/i18n/pt_BR.po b/stock_analytic/i18n/pt_BR.po new file mode 100644 index 0000000000..9cd38304cd --- /dev/null +++ b/stock_analytic/i18n/pt_BR.po @@ -0,0 +1,35 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_analytic +# +# Translators: +# danimaribeiro , 2016 +# OCA Transbot , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-16 03:41+0000\n" +"PO-Revision-Date: 2016-12-16 03:41+0000\n" +"Last-Translator: OCA Transbot , 2016\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: stock_analytic +#: field:stock.move,analytic_account_id:0 +msgid "Analytic Account" +msgstr "Conta analítica" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_quant +msgid "Quants" +msgstr "Quants" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move +msgid "Stock Move" +msgstr "Movimentação de estoque" diff --git a/stock_analytic/i18n/pt_PT.po b/stock_analytic/i18n/pt_PT.po new file mode 100644 index 0000000000..67418b9622 --- /dev/null +++ b/stock_analytic/i18n/pt_PT.po @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_analytic +# +# Translators: +# Daniel Reis , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-16 03:41+0000\n" +"PO-Revision-Date: 2016-12-16 03:41+0000\n" +"Last-Translator: Daniel Reis , 2016\n" +"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/teams/23907/pt_PT/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: pt_PT\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: stock_analytic +#: field:stock.move,analytic_account_id:0 +msgid "Analytic Account" +msgstr "Conta Analítica" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_quant +msgid "Quants" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move +msgid "Stock Move" +msgstr "" diff --git a/stock_analytic/i18n/ro.po b/stock_analytic/i18n/ro.po new file mode 100644 index 0000000000..c247ce5093 --- /dev/null +++ b/stock_analytic/i18n/ro.po @@ -0,0 +1,35 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_analytic +# +# Translators: +# Dorin Hongu , 2016 +# OCA Transbot , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-16 03:41+0000\n" +"PO-Revision-Date: 2016-12-16 03:41+0000\n" +"Last-Translator: OCA Transbot , 2016\n" +"Language-Team: Romanian (https://www.transifex.com/oca/teams/23907/ro/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: ro\n" +"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" + +#. module: stock_analytic +#: field:stock.move,analytic_account_id:0 +msgid "Analytic Account" +msgstr "Cont analitic" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_quant +msgid "Quants" +msgstr "Poziții de stoc" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move +msgid "Stock Move" +msgstr "Mișcare stoc" diff --git a/stock_analytic/i18n/sk_SK.po b/stock_analytic/i18n/sk_SK.po new file mode 100644 index 0000000000..5e9d3eb0a7 --- /dev/null +++ b/stock_analytic/i18n/sk_SK.po @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_analytic +# +# Translators: +# ivbo , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-16 03:41+0000\n" +"PO-Revision-Date: 2016-12-16 03:41+0000\n" +"Last-Translator: ivbo , 2016\n" +"Language-Team: Slovak (Slovakia) (https://www.transifex.com/oca/teams/23907/sk_SK/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: sk_SK\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +#. module: stock_analytic +#: field:stock.move,analytic_account_id:0 +msgid "Analytic Account" +msgstr "Analytický účet" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_quant +msgid "Quants" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move +msgid "Stock Move" +msgstr "" diff --git a/stock_analytic/i18n/sl.po b/stock_analytic/i18n/sl.po new file mode 100644 index 0000000000..745d1a17ee --- /dev/null +++ b/stock_analytic/i18n/sl.po @@ -0,0 +1,35 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_analytic +# +# Translators: +# Matjaž Mozetič , 2016 +# OCA Transbot , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-16 03:41+0000\n" +"PO-Revision-Date: 2016-12-16 03:41+0000\n" +"Last-Translator: OCA Transbot , 2016\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: stock_analytic +#: field:stock.move,analytic_account_id:0 +msgid "Analytic Account" +msgstr "Analitični konto" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_quant +msgid "Quants" +msgstr "Kvant" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move +msgid "Stock Move" +msgstr "Premik zaloge" diff --git a/stock_analytic/i18n/tr.po b/stock_analytic/i18n/tr.po new file mode 100644 index 0000000000..30b94ebc9b --- /dev/null +++ b/stock_analytic/i18n/tr.po @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_analytic +# +# Translators: +# Ivan BARAYEV , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-01-06 23:06+0000\n" +"PO-Revision-Date: 2017-01-06 23:06+0000\n" +"Last-Translator: Ivan BARAYEV , 2017\n" +"Language-Team: Turkish (https://www.transifex.com/oca/teams/23907/tr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: tr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: stock_analytic +#: field:stock.move,analytic_account_id:0 +msgid "Analytic Account" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_quant +msgid "Quants" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move +msgid "Stock Move" +msgstr "Stok Taşı" diff --git a/stock_analytic/i18n/tr_TR.po b/stock_analytic/i18n/tr_TR.po new file mode 100644 index 0000000000..f5ed02e2fe --- /dev/null +++ b/stock_analytic/i18n/tr_TR.po @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_analytic +# +# Translators: +# Ozge Altinisik , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-30 23:06+0000\n" +"PO-Revision-Date: 2016-12-30 23:06+0000\n" +"Last-Translator: Ozge Altinisik , 2017\n" +"Language-Team: Turkish (Turkey) (https://www.transifex.com/oca/teams/23907/tr_TR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: tr_TR\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#. module: stock_analytic +#: field:stock.move,analytic_account_id:0 +msgid "Analytic Account" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_quant +msgid "Quants" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move +msgid "Stock Move" +msgstr "Stok hareketi" diff --git a/stock_analytic/i18n/vi_VN.po b/stock_analytic/i18n/vi_VN.po new file mode 100644 index 0000000000..854fb536de --- /dev/null +++ b/stock_analytic/i18n/vi_VN.po @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_analytic +# +# Translators: +# OCA Transbot , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-16 03:41+0000\n" +"PO-Revision-Date: 2016-12-16 03:41+0000\n" +"Last-Translator: OCA Transbot , 2016\n" +"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/oca/teams/23907/vi_VN/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: vi_VN\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#. module: stock_analytic +#: field:stock.move,analytic_account_id:0 +msgid "Analytic Account" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_quant +msgid "Quants" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move +msgid "Stock Move" +msgstr "Dịch chuyển kho" diff --git a/stock_analytic/i18n/zh_CN.po b/stock_analytic/i18n/zh_CN.po new file mode 100644 index 0000000000..3c9d726471 --- /dev/null +++ b/stock_analytic/i18n/zh_CN.po @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_analytic +# +# Translators: +# Jeffery Chen Fan , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-16 03:41+0000\n" +"PO-Revision-Date: 2016-12-16 03:41+0000\n" +"Last-Translator: Jeffery Chen Fan , 2016\n" +"Language-Team: Chinese (China) (https://www.transifex.com/oca/teams/23907/zh_CN/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: zh_CN\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#. module: stock_analytic +#: field:stock.move,analytic_account_id:0 +msgid "Analytic Account" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_quant +msgid "Quants" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move +msgid "Stock Move" +msgstr "库存移动" diff --git a/stock_analytic/models/__init__.py b/stock_analytic/models/__init__.py new file mode 100644 index 0000000000..db4a58459c --- /dev/null +++ b/stock_analytic/models/__init__.py @@ -0,0 +1,7 @@ +# -*- coding: utf-8 -*- +# Copyright 2013 Julius Network Solutions +# Copyright 2015 Clear Corp +# Copyright 2016 OpenSynergy Indonesia +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import stock diff --git a/stock_analytic/models/stock.py b/stock_analytic/models/stock.py new file mode 100644 index 0000000000..ebe38845ee --- /dev/null +++ b/stock_analytic/models/stock.py @@ -0,0 +1,45 @@ +# -*- coding: utf-8 -*- +# Copyright 2013 Julius Network Solutions +# Copyright 2015 Clear Corp +# Copyright 2016 OpenSynergy Indonesia +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from openerp import fields, models, api + + +class StockMove(models.Model): + _inherit = "stock.move" + + analytic_account_id = fields.Many2one( + string='Analytic Account', + comodel_name='account.analytic.account', + ) + + +class StockQuant(models.Model): + + _inherit = "stock.quant" + + @api.model + def _prepare_account_move_line(self, move, qty, cost, + credit_account_id, debit_account_id, + context=None): + res = super(StockQuant, + self)._prepare_account_move_line( + move, qty, cost, + credit_account_id, + debit_account_id, + context=context + ) + + # Add analytic account in debit line + if not move.analytic_account_id: + return res + + for num in range(0, 2): + if res[num][2]["account_id"] != move.product_id.\ + categ_id.property_stock_valuation_account_id.id: + res[num][2].update({ + 'analytic_account_id': move.analytic_account_id.id, + }) + return res diff --git a/stock_analytic/purchase.py b/stock_analytic/purchase.py deleted file mode 100644 index 1bad691619..0000000000 --- a/stock_analytic/purchase.py +++ /dev/null @@ -1,40 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################### -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2012 Julius Network Solutions SARL -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -############################################################################### - -from openerp import models - - -class purchase_order(models.Model): - _inherit = "purchase.order" - - def _prepare_order_line_move(self, cr, uid, order, order_line, - picking_id, group_id, context=None): - res = super( - purchase_order, self)._prepare_order_line_move( - cr, uid, order, order_line, picking_id, group_id, - context=context) - if order_line.account_analytic_id: - for move in res: - move['account_analytic_id'] = order_line.account_analytic_id.id - return res - - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/stock_analytic/sale.py b/stock_analytic/sale.py deleted file mode 100644 index 4d01d8495c..0000000000 --- a/stock_analytic/sale.py +++ /dev/null @@ -1,56 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################### -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2012 Julius Network Solutions SARL -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -############################################################################### - -from openerp import models -from openerp.osv import fields - - -class sale_order(models.Model): - _inherit = 'sale.order' - - def _prepare_order_line_procurement(self, cr, uid, order, - line, group_id=False, - context=None): - res = super( - sale_order, self)._prepare_order_line_procurement( - cr, uid, order, line, group_id=group_id, context=context) - if order.project_id: - res['account_analytic_id'] = order.project_id.id - return res - - -class procurement_order(models.Model): - _inherit = "procurement.order" - - _columns = { - 'account_analytic_id': fields.many2one( - 'account.analytic.account', 'Analytic account'), - } - - def _run_move_create(self, cr, uid, procurement, context=None): - res = super( - procurement_order, self)._run_move_create( - cr, uid, procurement, context=context) - if procurement.account_analytic_id: - res['account_analytic_id'] = procurement.account_analytic_id.id - return res - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/stock_analytic/static/description/icon.png b/stock_analytic/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/stock_analytic/static/src/img/icon.png b/stock_analytic/static/src/img/icon.png deleted file mode 100644 index e07cdd3f72bfe46a4c038900eb7ef8d927a01ddb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11930 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 diff --git a/stock_analytic/stock.py b/stock_analytic/stock.py deleted file mode 100644 index 66d9b808bf..0000000000 --- a/stock_analytic/stock.py +++ /dev/null @@ -1,70 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################### -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2012 Julius Network Solutions SARL -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -############################################################################### - -from openerp.osv import fields, osv - - -class stock_move(osv.Model): - _inherit = "stock.move" - - _columns = { - 'account_analytic_id': fields.many2one('account.analytic.account', - 'Analytic account'), - } - - def _create_account_move_line(self, cr, uid, move, src_account_id, - dest_account_id, reference_amount, - reference_currency_id, context=None): - res = super(stock_move, - self)._create_account_move_line(cr, uid, - move, - src_account_id, - dest_account_id, - reference_amount, - reference_currency_id, - context=context - ) - if move.account_analytic_id: - for _val1, _val2, vals in res: - vals['analytic_account_id'] = move.account_analytic_id.id - return res - - -class stock_quant(osv.Model): - - _inherit = "stock.quant" - - def _prepare_account_move_line(self, cr, uid, move, qty, cost, - credit_account_id, debit_account_id, - context=None): - res = super(stock_quant, - self)._prepare_account_move_line(cr, - uid, move, qty, cost, - credit_account_id, - debit_account_id, - context=context - ) - # Add analytic account in debit line - res[0][2].update({ - 'analytic_account_id': move.account_analytic_id.id, - }) - return res -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/stock_analytic/stock_view.xml b/stock_analytic/stock_view.xml deleted file mode 100644 index 7102e9ab38..0000000000 --- a/stock_analytic/stock_view.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - stock.inventory.form - stock.inventory - - - - - - - - - - stock.move.picking.form - stock.move - - - - - - - - - - stock.move.picking.tree - stock.move - - - - - - - - - - stock.move.tree - stock.move - - - - - - - - - Stock Moves - stock.move - - - - - - - - - - stock.move.tree2 - stock.move - - - - - - - - - - stock.move.tree3 - stock.move - - - - - - - - - - stock.move.form - stock.move - - - - - - - - - diff --git a/stock_analytic/tests/__init__.py b/stock_analytic/tests/__init__.py new file mode 100644 index 0000000000..d0dcefcdc5 --- /dev/null +++ b/stock_analytic/tests/__init__.py @@ -0,0 +1,7 @@ +# -*- coding: utf-8 -*- +# Copyright 2013 Julius Network Solutions +# Copyright 2015 Clear Corp +# Copyright 2016 OpenSynergy Indonesia +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import test_stock_picking diff --git a/stock_analytic/tests/test_stock_picking.py b/stock_analytic/tests/test_stock_picking.py new file mode 100644 index 0000000000..55ae9f05a3 --- /dev/null +++ b/stock_analytic/tests/test_stock_picking.py @@ -0,0 +1,143 @@ +# -*- coding: utf-8 -*- +# Copyright 2013 Julius Network Solutions +# Copyright 2015 Clear Corp +# Copyright 2016 OpenSynergy Indonesia +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from openerp.tests.common import TransactionCase +from datetime import datetime + + +class TestStockPicking(TransactionCase): + + def setUp(self): + super(TestStockPicking, self).setUp() + + self.product = self.env.ref('product.product_product_4') + self.product.update({'valuation': 'real_time'}) + self.product_categ = self.env.ref('product.ipad') + self.valuation_account = self.env.ref('account.stk') + self.stock_account = self.env.ref('account.xfa') + self.stock_journal = self.env.ref('stock_account.stock_journal') + self.analytic_journal = self.env.ref('account.sit') + self.analytic_account = self.env.ref( + 'account.analytic_project_1_development') + self.warehouse = self.env.ref('stock.warehouse0') + self.location = self.warehouse.lot_stock_id + self.dest_location = self.env.ref('stock.stock_location_customers') + self.outgoing_picking_type = self.env.ref('stock.picking_type_out') + self.incoming_picking_type = self.env.ref('stock.picking_type_in') + + self.stock_journal.update({ + 'analytic_journal_id': self.analytic_journal.id + }) + + self.product_categ.update({ + 'property_stock_valuation_account_id': self.valuation_account.id, + 'property_stock_account_input_categ': self.stock_account.id, + 'property_stock_account_output_categ': self.stock_account.id, + }) + + def _create_picking( + self, location_id, location_dest_id, + picking_type_id, analytic_account_id=False): + picking_data = { + 'picking_type_id': picking_type_id.id, + 'move_type': 'direct', + } + + picking = self.env['stock.picking'].create(picking_data) + + move_data = { + 'picking_id': picking.id, + 'product_id': self.product.id, + 'location_id': location_id.id, + 'location_dest_id': location_dest_id.id, + 'date': datetime.now().strftime('%Y-%m-%d %H:%M:%S'), + 'date_expected': datetime.now().strftime('%Y-%m-%d %H:%M:%S'), + 'invoice_state': 'none', + 'name': self.product.name, + 'procure_method': 'make_to_stock', + 'product_uom': self.product.uom_id.id, + 'product_uom_qty': 1.0, + 'analytic_account_id': analytic_account_id and + analytic_account_id.id or False + } + + self.env['stock.move'].create(move_data) + + return picking + + def _confirm_picking_no_error(self, picking): + picking.action_confirm() + self.assertEqual(picking.state, 'confirmed') + + def _force_assign_no_error(self, picking): + picking.force_assign() + self.assertEqual(picking.state, 'assigned') + + def _picking_done_no_error(self, picking): + picking.action_done() + self.assertEqual(picking.state, 'done') + + def _check_account_move_no_error(self, picking): + criteria1 = [['ref', '=', picking.name]] + acc_moves = self.env['account.move'].search(criteria1) + self.assertGreater(len(acc_moves), 0) + + def _check_analytic_account_no_error(self, picking): + move = picking.move_lines[0] + criteria2 = [['move_id.ref', '=', picking.name]] + acc_lines = self.env['account.move.line'].search(criteria2) + for acc_line in acc_lines: + if acc_line.account_id != move.product_id.categ_id.\ + property_stock_valuation_account_id: + self.assertEqual( + acc_line.analytic_account_id.id, + move.analytic_account_id.id) + + def _check_no_analytic_account(self, picking): + criteria2 = [ + ("move_id.ref", "=", picking.name), + ("analytic_account_id", "!=", False), + ] + line_count = self.env['account.move.line'].search_count( + criteria2) + self.assertEqual( + line_count, + 0) + + def test_outgoing_picking_with_analytic(self): + picking = self._create_picking( + self.location, self.dest_location, + self.outgoing_picking_type, + self.analytic_account, + ) + self._confirm_picking_no_error(picking) + self._force_assign_no_error(picking) + self._picking_done_no_error(picking) + self._check_account_move_no_error(picking) + self._check_analytic_account_no_error(picking) + + def test_outgoing_picking_without_analytic(self): + picking = self._create_picking( + self.location, self.dest_location, + self.outgoing_picking_type, + ) + self._confirm_picking_no_error(picking) + self._force_assign_no_error(picking) + self._picking_done_no_error(picking) + self._check_account_move_no_error(picking) + self._check_no_analytic_account(picking) + + def test_incoming_picking_with_analytic(self): + picking = self._create_picking( + self.location, self.dest_location, + self.incoming_picking_type, + self.analytic_account, + ) + self._confirm_picking_no_error(picking) + self._force_assign_no_error(picking) + self._picking_done_no_error(picking) + self._check_account_move_no_error(picking) + self._check_analytic_account_no_error(picking) diff --git a/stock_analytic/views/stock_inventory_views.xml b/stock_analytic/views/stock_inventory_views.xml new file mode 100644 index 0000000000..d92ab1f222 --- /dev/null +++ b/stock_analytic/views/stock_inventory_views.xml @@ -0,0 +1,15 @@ + + + + + stock.inventory.form + stock.inventory + + + + + + + + + diff --git a/stock_analytic/views/stock_move_views.xml b/stock_analytic/views/stock_move_views.xml new file mode 100644 index 0000000000..d59f7d1014 --- /dev/null +++ b/stock_analytic/views/stock_move_views.xml @@ -0,0 +1,80 @@ + + + + + stock.move.picking.form + stock.move + + + + + + + + + + stock.move.picking.tree + stock.move + + + + + + + + + + stock.move.tree + stock.move + + + + + + + + + Stock Moves + stock.move + + + + + + + + + + stock.move.tree2 + stock.move + + + + + + + + + + stock.move.tree3 + stock.move + + + + + + + + + + stock.move.form + stock.move + + + + + + + + + From 3d51c26ad94332abddc0156a87e9121d0078951f Mon Sep 17 00:00:00 2001 From: aheficent Date: Mon, 3 Apr 2017 10:56:03 +0200 Subject: [PATCH 10/61] [MIG]stock_analytic to v9 --- stock_analytic/README.rst | 18 +++---------- stock_analytic/__openerp__.py | 7 +++-- stock_analytic/models/stock.py | 13 +++------- stock_analytic/tests/test_stock_picking.py | 22 +++++++--------- .../views/stock_inventory_views.xml | 4 +-- stock_analytic/views/stock_move_views.xml | 26 ++----------------- 6 files changed, 23 insertions(+), 67 deletions(-) diff --git a/stock_analytic/README.rst b/stock_analytic/README.rst index ce4f6d5189..16b7b1349e 100644 --- a/stock_analytic/README.rst +++ b/stock_analytic/README.rst @@ -9,22 +9,11 @@ Stock Analytic Adds an analytic account in stock move to be able to get analytic information when generating the journal items. -Installation -============ - -To install this module, you need to: - -1. Clone the branch 8.0 of the repository https://github.com/OCA/account-analytic -2. Add the path to this repository in your configuration (addons-path) -3. Update the module list -4. Go to menu *Setting -> Modules -> Local Modules* -5. Search For *Stock Analytic* -6. Install the module Usage ===== -Assigned Stock Move With Analytic Account +To Assign an Analytic Account to a Stock Move ----------------------------------------- You need to: @@ -46,7 +35,7 @@ journal items with following rule: .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/87/8.0 + :target: https://runbot.odoo-community.org/runbot/87/9.0 Bug Tracker =========== @@ -68,7 +57,8 @@ Contributors * Mathieu VATEL * Fabio Vílchez * Andhitia Rama -* Michael Viriyananda +* Michael Viriyananda +* Eficent Maintainer ---------- diff --git a/stock_analytic/__openerp__.py b/stock_analytic/__openerp__.py index 6688c15c57..100db37e80 100644 --- a/stock_analytic/__openerp__.py +++ b/stock_analytic/__openerp__.py @@ -6,10 +6,10 @@ { "name": "Stock Analytic", "summary": "Adds an analytic account in stock move", - "version": "8.0.1.0.0", + "version": "9.0.1.0.0", "author": "Julius Network Solutions," - "ClearCorp, OpenSynergy Indonesia, " - "Odoo Community Association (OCA)", + "ClearCorp, OpenSynergy Indonesia," + "Odoo Community Association (OCA)", "website": "http://www.julius.fr/", "category": "Warehouse Management", "license": "AGPL-3", @@ -22,5 +22,4 @@ "views/stock_inventory_views.xml", ], 'installable': True, - 'active': False, } diff --git a/stock_analytic/models/stock.py b/stock_analytic/models/stock.py index ebe38845ee..bf5178480e 100644 --- a/stock_analytic/models/stock.py +++ b/stock_analytic/models/stock.py @@ -22,16 +22,9 @@ class StockQuant(models.Model): @api.model def _prepare_account_move_line(self, move, qty, cost, - credit_account_id, debit_account_id, - context=None): - res = super(StockQuant, - self)._prepare_account_move_line( - move, qty, cost, - credit_account_id, - debit_account_id, - context=context - ) - + credit_account_id, debit_account_id): + res = super(StockQuant, self)._prepare_account_move_line( + move, qty, cost, credit_account_id, debit_account_id) # Add analytic account in debit line if not move.analytic_account_id: return res diff --git a/stock_analytic/tests/test_stock_picking.py b/stock_analytic/tests/test_stock_picking.py index 55ae9f05a3..eeb2b2a12a 100644 --- a/stock_analytic/tests/test_stock_picking.py +++ b/stock_analytic/tests/test_stock_picking.py @@ -15,27 +15,22 @@ def setUp(self): self.product = self.env.ref('product.product_product_4') self.product.update({'valuation': 'real_time'}) - self.product_categ = self.env.ref('product.ipad') - self.valuation_account = self.env.ref('account.stk') - self.stock_account = self.env.ref('account.xfa') - self.stock_journal = self.env.ref('stock_account.stock_journal') - self.analytic_journal = self.env.ref('account.sit') + self.product_categ = self.env.ref('product.product_category_5') + self.valuation_account = self.env.ref( + 'account.data_account_type_expenses') + self.stock_account = self.env.ref('account.data_account_type_revenue') self.analytic_account = self.env.ref( - 'account.analytic_project_1_development') + 'analytic.analytic_agrolait') self.warehouse = self.env.ref('stock.warehouse0') self.location = self.warehouse.lot_stock_id self.dest_location = self.env.ref('stock.stock_location_customers') self.outgoing_picking_type = self.env.ref('stock.picking_type_out') self.incoming_picking_type = self.env.ref('stock.picking_type_in') - self.stock_journal.update({ - 'analytic_journal_id': self.analytic_journal.id - }) - self.product_categ.update({ 'property_stock_valuation_account_id': self.valuation_account.id, - 'property_stock_account_input_categ': self.stock_account.id, - 'property_stock_account_output_categ': self.stock_account.id, + 'property_stock_account_input_categ_id': self.stock_account.id, + 'property_stock_account_output_categ_id': self.stock_account.id, }) def _create_picking( @@ -44,6 +39,8 @@ def _create_picking( picking_data = { 'picking_type_id': picking_type_id.id, 'move_type': 'direct', + 'location_id': location_id.id, + 'location_dest_id': location_dest_id.id, } picking = self.env['stock.picking'].create(picking_data) @@ -55,7 +52,6 @@ def _create_picking( 'location_dest_id': location_dest_id.id, 'date': datetime.now().strftime('%Y-%m-%d %H:%M:%S'), 'date_expected': datetime.now().strftime('%Y-%m-%d %H:%M:%S'), - 'invoice_state': 'none', 'name': self.product.name, 'procure_method': 'make_to_stock', 'product_uom': self.product.uom_id.id, diff --git a/stock_analytic/views/stock_inventory_views.xml b/stock_analytic/views/stock_inventory_views.xml index d92ab1f222..c7aca48bb1 100644 --- a/stock_analytic/views/stock_inventory_views.xml +++ b/stock_analytic/views/stock_inventory_views.xml @@ -1,5 +1,5 @@ - + stock.inventory.form @@ -12,4 +12,4 @@ - + diff --git a/stock_analytic/views/stock_move_views.xml b/stock_analytic/views/stock_move_views.xml index d59f7d1014..46ae95869b 100644 --- a/stock_analytic/views/stock_move_views.xml +++ b/stock_analytic/views/stock_move_views.xml @@ -1,5 +1,5 @@ - + stock.move.picking.form @@ -44,28 +44,6 @@ - - stock.move.tree2 - stock.move - - - - - - - - - - stock.move.tree3 - stock.move - - - - - - - - stock.move.form stock.move @@ -77,4 +55,4 @@ - + From d1b3ce1ac1c3d5fa7542f669849fa14fc1045ea4 Mon Sep 17 00:00:00 2001 From: aheficent Date: Wed, 28 Jun 2017 14:03:17 +0200 Subject: [PATCH 11/61] [MIG]stock_analytic to v10 --- stock_analytic/README.rst | 18 +++++------ stock_analytic/__init__.py | 3 -- .../{__openerp__.py => __manifest__.py} | 4 +-- stock_analytic/i18n/ca.po | 20 +++++-------- stock_analytic/i18n/cs_CZ.po | 30 +++++++++++++++++++ stock_analytic/i18n/de.po | 21 +++++-------- stock_analytic/i18n/el_GR.po | 18 +++++------ stock_analytic/i18n/es.po | 21 ++++++------- stock_analytic/i18n/es_EC.po | 30 +++++++++++++++++++ stock_analytic/i18n/es_MX.po | 20 +++++-------- stock_analytic/i18n/fi.po | 21 +++++-------- stock_analytic/i18n/fr.po | 22 +++++--------- stock_analytic/i18n/gu_IN.po | 30 +++++++++++++++++++ stock_analytic/i18n/hi_IN.po | 30 +++++++++++++++++++ stock_analytic/i18n/hr.po | 20 +++++-------- stock_analytic/i18n/hr_HR.po | 20 +++++-------- stock_analytic/i18n/nl.po | 18 +++++------ stock_analytic/i18n/pt_BR.po | 21 +++++-------- stock_analytic/i18n/sk_SK.po | 18 +++++------ stock_analytic/i18n/sl.po | 21 +++++-------- stock_analytic/i18n/zh_CN.po | 22 ++++++-------- stock_analytic/models/__init__.py | 3 -- stock_analytic/models/stock.py | 23 +++++++------- stock_analytic/tests/__init__.py | 3 -- stock_analytic/tests/test_stock_picking.py | 21 +++++++++---- .../views/stock_inventory_views.xml | 15 ---------- stock_analytic/views/stock_move_views.xml | 27 ++++++++++------- 27 files changed, 284 insertions(+), 236 deletions(-) rename stock_analytic/{__openerp__.py => __manifest__.py} (87%) create mode 100644 stock_analytic/i18n/cs_CZ.po create mode 100644 stock_analytic/i18n/es_EC.po create mode 100644 stock_analytic/i18n/gu_IN.po create mode 100644 stock_analytic/i18n/hi_IN.po delete mode 100644 stock_analytic/views/stock_inventory_views.xml diff --git a/stock_analytic/README.rst b/stock_analytic/README.rst index 16b7b1349e..2f8e57c5b7 100644 --- a/stock_analytic/README.rst +++ b/stock_analytic/README.rst @@ -24,18 +24,18 @@ You need to: Assigned Journal Items created from Stock Move with Analytic Account -------------------------------------------------------------------- -If stock move automatically create journal entry, the journal entry will contain -journal items with following rule: - -#. Journal item with account equal to product's valuation account will not be assigned - any analytic account -#. Journal item with account not equal to product's valuation account will be assigned - analytic account according to stock move's analytic account +If stock move automatically create journal entry, the journal entry will +contain journal items with following rule: +#. Journal item with account equal to product's valuation account will not be + assigned to any analytic account +#. Journal item with account different to product's valuation account will be + assigned to an analytic account according to the stock move's analytic + account .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/87/9.0 + :target: https://runbot.odoo-community.org/runbot/87/10.0 Bug Tracker =========== @@ -58,7 +58,7 @@ Contributors * Fabio Vílchez * Andhitia Rama * Michael Viriyananda -* Eficent +* Aaron Henriquez Maintainer ---------- diff --git a/stock_analytic/__init__.py b/stock_analytic/__init__.py index 5d9d01b67d..a77a6fcbc5 100644 --- a/stock_analytic/__init__.py +++ b/stock_analytic/__init__.py @@ -1,7 +1,4 @@ # -*- coding: utf-8 -*- -# Copyright 2013 Julius Network Solutions -# Copyright 2015 Clear Corp -# Copyright 2016 OpenSynergy Indonesia # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import models diff --git a/stock_analytic/__openerp__.py b/stock_analytic/__manifest__.py similarity index 87% rename from stock_analytic/__openerp__.py rename to stock_analytic/__manifest__.py index 100db37e80..b0083f7b74 100644 --- a/stock_analytic/__openerp__.py +++ b/stock_analytic/__manifest__.py @@ -2,11 +2,12 @@ # Copyright 2013 Julius Network Solutions # Copyright 2015 Clear Corp # Copyright 2016 OpenSynergy Indonesia +# Copyright 2017 Eficent Business and IT Consulting Services S.L. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { "name": "Stock Analytic", "summary": "Adds an analytic account in stock move", - "version": "9.0.1.0.0", + "version": "10.0.1.0.0", "author": "Julius Network Solutions," "ClearCorp, OpenSynergy Indonesia," "Odoo Community Association (OCA)", @@ -19,7 +20,6 @@ ], "data": [ "views/stock_move_views.xml", - "views/stock_inventory_views.xml", ], 'installable': True, } diff --git a/stock_analytic/i18n/ca.po b/stock_analytic/i18n/ca.po index fe21837da8..8ed9abcaaf 100644 --- a/stock_analytic/i18n/ca.po +++ b/stock_analytic/i18n/ca.po @@ -3,14 +3,14 @@ # * stock_analytic # # Translators: -# Carles Antoli , 2017 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-13 23:06+0000\n" -"PO-Revision-Date: 2017-01-13 23:06+0000\n" -"Last-Translator: Carles Antoli , 2017\n" +"POT-Creation-Date: 2017-11-19 22:13+0000\n" +"PO-Revision-Date: 2017-11-19 22:13+0000\n" +"Last-Translator: OCA Transbot , 2017\n" "Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,16 +19,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: field:stock.move,analytic_account_id:0 +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id +#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Compte analític" -#. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_stock_quant -msgid "Quants" -msgstr "" - #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" -msgstr "Moure l'estoc" +msgstr "" diff --git a/stock_analytic/i18n/cs_CZ.po b/stock_analytic/i18n/cs_CZ.po new file mode 100644 index 0000000000..77db690364 --- /dev/null +++ b/stock_analytic/i18n/cs_CZ.po @@ -0,0 +1,30 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_analytic +# +# Translators: +# Lukáš Spurný , 2018 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-02-21 03:54+0000\n" +"PO-Revision-Date: 2018-02-21 03:54+0000\n" +"Last-Translator: Lukáš Spurný , 2018\n" +"Language-Team: Czech (Czech Republic) (https://www.transifex.com/oca/teams/23907/cs_CZ/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: cs_CZ\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id +#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic +msgid "Analytic Account" +msgstr "Analytický účet" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move +msgid "Stock Move" +msgstr "Posunout sklad" diff --git a/stock_analytic/i18n/de.po b/stock_analytic/i18n/de.po index a0522d831d..fcd6b375e5 100644 --- a/stock_analytic/i18n/de.po +++ b/stock_analytic/i18n/de.po @@ -3,15 +3,14 @@ # * stock_analytic # # Translators: -# OCA Transbot , 2016 -# Rudolf Schnapka , 2016 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-20 23:05+0000\n" -"PO-Revision-Date: 2017-01-20 23:05+0000\n" -"Last-Translator: Rudolf Schnapka , 2016\n" +"POT-Creation-Date: 2017-11-19 22:13+0000\n" +"PO-Revision-Date: 2017-11-19 22:13+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" @@ -20,16 +19,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: field:stock.move,analytic_account_id:0 +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id +#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Kostenstelle" -#. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_stock_quant -msgid "Quants" -msgstr "Quanten" - #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" -msgstr "Lagerbuchung" +msgstr "" diff --git a/stock_analytic/i18n/el_GR.po b/stock_analytic/i18n/el_GR.po index b591ef17d8..cfa451973c 100644 --- a/stock_analytic/i18n/el_GR.po +++ b/stock_analytic/i18n/el_GR.po @@ -3,14 +3,14 @@ # * stock_analytic # # Translators: -# Kostas Goutoudis , 2016 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-16 03:41+0000\n" -"PO-Revision-Date: 2016-12-16 03:41+0000\n" -"Last-Translator: Kostas Goutoudis , 2016\n" +"POT-Creation-Date: 2017-11-19 22:13+0000\n" +"PO-Revision-Date: 2017-11-19 22:13+0000\n" +"Last-Translator: OCA Transbot , 2017\n" "Language-Team: Greek (Greece) (https://www.transifex.com/oca/teams/23907/el_GR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,15 +19,11 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: field:stock.move,analytic_account_id:0 +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id +#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Αναλυτικός Λογαριασμός" -#. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_stock_quant -msgid "Quants" -msgstr "" - #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/es.po b/stock_analytic/i18n/es.po index 4bd0228003..19576d0698 100644 --- a/stock_analytic/i18n/es.po +++ b/stock_analytic/i18n/es.po @@ -3,14 +3,15 @@ # * stock_analytic # # Translators: -# OCA Transbot , 2016 +# OCA Transbot , 2017 +# enjolras , 2018 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-16 03:41+0000\n" -"PO-Revision-Date: 2016-12-16 03:41+0000\n" -"Last-Translator: OCA Transbot , 2016\n" +"POT-Creation-Date: 2018-02-21 03:54+0000\n" +"PO-Revision-Date: 2018-02-21 03:54+0000\n" +"Last-Translator: enjolras , 2018\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" @@ -19,16 +20,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: field:stock.move,analytic_account_id:0 +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id +#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Cuenta analítica" -#. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_stock_quant -msgid "Quants" -msgstr "Quants" - #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" -msgstr "Movimiento stock" +msgstr "Movimiento de existencias" diff --git a/stock_analytic/i18n/es_EC.po b/stock_analytic/i18n/es_EC.po new file mode 100644 index 0000000000..1f293ed648 --- /dev/null +++ b/stock_analytic/i18n/es_EC.po @@ -0,0 +1,30 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_analytic +# +# Translators: +# Cristian Salamea , 2018 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-01-05 23:07+0000\n" +"PO-Revision-Date: 2018-01-05 23:07+0000\n" +"Last-Translator: Cristian Salamea , 2018\n" +"Language-Team: Spanish (Ecuador) (https://www.transifex.com/oca/teams/23907/es_EC/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: es_EC\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id +#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic +msgid "Analytic Account" +msgstr "Cuenta Analítica" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move +msgid "Stock Move" +msgstr "" diff --git a/stock_analytic/i18n/es_MX.po b/stock_analytic/i18n/es_MX.po index e3e3c66861..dd3d26995e 100644 --- a/stock_analytic/i18n/es_MX.po +++ b/stock_analytic/i18n/es_MX.po @@ -3,14 +3,14 @@ # * stock_analytic # # Translators: -# Juan González , 2016 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-16 03:41+0000\n" -"PO-Revision-Date: 2016-12-16 03:41+0000\n" -"Last-Translator: Juan González , 2016\n" +"POT-Creation-Date: 2017-11-19 22:13+0000\n" +"PO-Revision-Date: 2017-11-19 22:13+0000\n" +"Last-Translator: OCA Transbot , 2017\n" "Language-Team: Spanish (Mexico) (https://www.transifex.com/oca/teams/23907/es_MX/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,16 +19,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: field:stock.move,analytic_account_id:0 +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id +#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Cuenta analítica" -#. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_stock_quant -msgid "Quants" -msgstr "" - #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" -msgstr "Movimiento bursátil" +msgstr "" diff --git a/stock_analytic/i18n/fi.po b/stock_analytic/i18n/fi.po index 742030bb83..124e381803 100644 --- a/stock_analytic/i18n/fi.po +++ b/stock_analytic/i18n/fi.po @@ -3,15 +3,14 @@ # * stock_analytic # # Translators: -# Jarmo Kortetjärvi , 2016 -# OCA Transbot , 2016 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-16 03:41+0000\n" -"PO-Revision-Date: 2016-12-16 03:41+0000\n" -"Last-Translator: OCA Transbot , 2016\n" +"POT-Creation-Date: 2017-11-19 22:13+0000\n" +"PO-Revision-Date: 2017-11-19 22:13+0000\n" +"Last-Translator: OCA Transbot , 2017\n" "Language-Team: Finnish (https://www.transifex.com/oca/teams/23907/fi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,16 +19,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: field:stock.move,analytic_account_id:0 +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id +#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Analyyttinen tili" -#. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_stock_quant -msgid "Quants" -msgstr "Määrät" - #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" -msgstr "Varastosiirto" +msgstr "" diff --git a/stock_analytic/i18n/fr.po b/stock_analytic/i18n/fr.po index 8abe9ae790..30edc2b686 100644 --- a/stock_analytic/i18n/fr.po +++ b/stock_analytic/i18n/fr.po @@ -3,16 +3,14 @@ # * stock_analytic # # Translators: -# Christophe CHAUVET , 2016 -# Zwygart , 2016 -# OCA Transbot , 2016 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-16 03:41+0000\n" -"PO-Revision-Date: 2016-12-16 03:41+0000\n" -"Last-Translator: OCA Transbot , 2016\n" +"POT-Creation-Date: 2017-11-19 22:13+0000\n" +"PO-Revision-Date: 2017-11-19 22:13+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" @@ -21,16 +19,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: stock_analytic -#: field:stock.move,analytic_account_id:0 +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id +#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Compte analytique" -#. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_stock_quant -msgid "Quants" -msgstr "Quants" - #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" -msgstr "Mouvement de stock" +msgstr "" diff --git a/stock_analytic/i18n/gu_IN.po b/stock_analytic/i18n/gu_IN.po new file mode 100644 index 0000000000..8064ed4e48 --- /dev/null +++ b/stock_analytic/i18n/gu_IN.po @@ -0,0 +1,30 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_analytic +# +# Translators: +# Parth Goswami , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-19 22:13+0000\n" +"PO-Revision-Date: 2017-11-19 22:13+0000\n" +"Last-Translator: Parth Goswami , 2017\n" +"Language-Team: Gujarati (India) (https://www.transifex.com/oca/teams/23907/gu_IN/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: gu_IN\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id +#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic +msgid "Analytic Account" +msgstr "વિશ્લેષણાત્મક ખાતું" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move +msgid "Stock Move" +msgstr "" diff --git a/stock_analytic/i18n/hi_IN.po b/stock_analytic/i18n/hi_IN.po new file mode 100644 index 0000000000..17adee96aa --- /dev/null +++ b/stock_analytic/i18n/hi_IN.po @@ -0,0 +1,30 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_analytic +# +# Translators: +# Parth Goswami , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-19 22:13+0000\n" +"PO-Revision-Date: 2017-11-19 22:13+0000\n" +"Last-Translator: Parth Goswami , 2017\n" +"Language-Team: Hindi (India) (https://www.transifex.com/oca/teams/23907/hi_IN/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hi_IN\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id +#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic +msgid "Analytic Account" +msgstr "विश्लेषणात्मक खाता" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move +msgid "Stock Move" +msgstr "" diff --git a/stock_analytic/i18n/hr.po b/stock_analytic/i18n/hr.po index c092af7f96..be4a618adc 100644 --- a/stock_analytic/i18n/hr.po +++ b/stock_analytic/i18n/hr.po @@ -3,14 +3,14 @@ # * stock_analytic # # Translators: -# Bole , 2016 +# Bole , 2018 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-16 03:41+0000\n" -"PO-Revision-Date: 2016-12-16 03:41+0000\n" -"Last-Translator: Bole , 2016\n" +"POT-Creation-Date: 2018-02-21 03:54+0000\n" +"PO-Revision-Date: 2018-02-21 03:54+0000\n" +"Last-Translator: Bole , 2018\n" "Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,16 +19,12 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #. module: stock_analytic -#: field:stock.move,analytic_account_id:0 +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id +#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Analitički konto" -#. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_stock_quant -msgid "Quants" -msgstr "" - #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" -msgstr "Skladišni prenos" +msgstr "Skladišni prijenos" diff --git a/stock_analytic/i18n/hr_HR.po b/stock_analytic/i18n/hr_HR.po index 027ac107a8..109324ea8f 100644 --- a/stock_analytic/i18n/hr_HR.po +++ b/stock_analytic/i18n/hr_HR.po @@ -3,14 +3,14 @@ # * stock_analytic # # Translators: -# Bole , 2016 +# Bole , 2017 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-16 03:41+0000\n" -"PO-Revision-Date: 2016-12-16 03:41+0000\n" -"Last-Translator: Bole , 2016\n" +"POT-Creation-Date: 2017-11-19 22:13+0000\n" +"PO-Revision-Date: 2017-11-19 22:13+0000\n" +"Last-Translator: Bole , 2017\n" "Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/hr_HR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,14 +19,10 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #. module: stock_analytic -#: field:stock.move,analytic_account_id:0 +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id +#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" -msgstr "Konto analitike" - -#. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_stock_quant -msgid "Quants" -msgstr "" +msgstr "Analitički konto" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move diff --git a/stock_analytic/i18n/nl.po b/stock_analytic/i18n/nl.po index 67b8b2cdbb..998e9192e2 100644 --- a/stock_analytic/i18n/nl.po +++ b/stock_analytic/i18n/nl.po @@ -3,14 +3,14 @@ # * stock_analytic # # Translators: -# OCA Transbot , 2016 +# Cas Vissers , 2017 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-16 03:41+0000\n" -"PO-Revision-Date: 2016-12-16 03:41+0000\n" -"Last-Translator: OCA Transbot , 2016\n" +"POT-Creation-Date: 2017-11-19 22:13+0000\n" +"PO-Revision-Date: 2017-11-19 22:13+0000\n" +"Last-Translator: Cas Vissers , 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" @@ -19,15 +19,11 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: field:stock.move,analytic_account_id:0 +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id +#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Kostenplaats" -#. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_stock_quant -msgid "Quants" -msgstr "" - #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/pt_BR.po b/stock_analytic/i18n/pt_BR.po index 9cd38304cd..de55732f81 100644 --- a/stock_analytic/i18n/pt_BR.po +++ b/stock_analytic/i18n/pt_BR.po @@ -3,15 +3,14 @@ # * stock_analytic # # Translators: -# danimaribeiro , 2016 -# OCA Transbot , 2016 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-16 03:41+0000\n" -"PO-Revision-Date: 2016-12-16 03:41+0000\n" -"Last-Translator: OCA Transbot , 2016\n" +"POT-Creation-Date: 2017-11-19 22:13+0000\n" +"PO-Revision-Date: 2017-11-19 22:13+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" @@ -20,16 +19,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: stock_analytic -#: field:stock.move,analytic_account_id:0 +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id +#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Conta analítica" -#. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_stock_quant -msgid "Quants" -msgstr "Quants" - #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" -msgstr "Movimentação de estoque" +msgstr "" diff --git a/stock_analytic/i18n/sk_SK.po b/stock_analytic/i18n/sk_SK.po index 5e9d3eb0a7..53566b6010 100644 --- a/stock_analytic/i18n/sk_SK.po +++ b/stock_analytic/i18n/sk_SK.po @@ -3,14 +3,14 @@ # * stock_analytic # # Translators: -# ivbo , 2016 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-16 03:41+0000\n" -"PO-Revision-Date: 2016-12-16 03:41+0000\n" -"Last-Translator: ivbo , 2016\n" +"POT-Creation-Date: 2017-11-19 22:13+0000\n" +"PO-Revision-Date: 2017-11-19 22:13+0000\n" +"Last-Translator: OCA Transbot , 2017\n" "Language-Team: Slovak (Slovakia) (https://www.transifex.com/oca/teams/23907/sk_SK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,15 +19,11 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #. module: stock_analytic -#: field:stock.move,analytic_account_id:0 +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id +#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Analytický účet" -#. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_stock_quant -msgid "Quants" -msgstr "" - #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/sl.po b/stock_analytic/i18n/sl.po index 745d1a17ee..338114b18f 100644 --- a/stock_analytic/i18n/sl.po +++ b/stock_analytic/i18n/sl.po @@ -3,15 +3,14 @@ # * stock_analytic # # Translators: -# Matjaž Mozetič , 2016 -# OCA Transbot , 2016 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-16 03:41+0000\n" -"PO-Revision-Date: 2016-12-16 03:41+0000\n" -"Last-Translator: OCA Transbot , 2016\n" +"POT-Creation-Date: 2017-11-19 22:13+0000\n" +"PO-Revision-Date: 2017-11-19 22:13+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" @@ -20,16 +19,12 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" #. module: stock_analytic -#: field:stock.move,analytic_account_id:0 +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id +#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Analitični konto" -#. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_stock_quant -msgid "Quants" -msgstr "Kvant" - #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" -msgstr "Premik zaloge" +msgstr "" diff --git a/stock_analytic/i18n/zh_CN.po b/stock_analytic/i18n/zh_CN.po index 3c9d726471..d6ffbb94a5 100644 --- a/stock_analytic/i18n/zh_CN.po +++ b/stock_analytic/i18n/zh_CN.po @@ -3,14 +3,14 @@ # * stock_analytic # # Translators: -# Jeffery Chen Fan , 2016 +# OCA Transbot , 2017 msgid "" msgstr "" -"Project-Id-Version: Odoo Server 8.0\n" +"Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-16 03:41+0000\n" -"PO-Revision-Date: 2016-12-16 03:41+0000\n" -"Last-Translator: Jeffery Chen Fan , 2016\n" +"POT-Creation-Date: 2017-11-19 22:13+0000\n" +"PO-Revision-Date: 2017-11-19 22:13+0000\n" +"Last-Translator: OCA Transbot , 2017\n" "Language-Team: Chinese (China) (https://www.transifex.com/oca/teams/23907/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,16 +19,12 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #. module: stock_analytic -#: field:stock.move,analytic_account_id:0 +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id +#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" -msgstr "" - -#. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_stock_quant -msgid "Quants" -msgstr "" +msgstr "核算科目" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" -msgstr "库存移动" +msgstr "" diff --git a/stock_analytic/models/__init__.py b/stock_analytic/models/__init__.py index db4a58459c..4e3c8255cc 100644 --- a/stock_analytic/models/__init__.py +++ b/stock_analytic/models/__init__.py @@ -1,7 +1,4 @@ # -*- coding: utf-8 -*- -# Copyright 2013 Julius Network Solutions -# Copyright 2015 Clear Corp -# Copyright 2016 OpenSynergy Indonesia # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import stock diff --git a/stock_analytic/models/stock.py b/stock_analytic/models/stock.py index bf5178480e..6da52825e4 100644 --- a/stock_analytic/models/stock.py +++ b/stock_analytic/models/stock.py @@ -2,9 +2,10 @@ # Copyright 2013 Julius Network Solutions # Copyright 2015 Clear Corp # Copyright 2016 OpenSynergy Indonesia +# Copyright 2017 Eficent Business and IT Consulting Services S.L. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from openerp import fields, models, api +from odoo import fields, models, api class StockMove(models.Model): @@ -15,24 +16,20 @@ class StockMove(models.Model): comodel_name='account.analytic.account', ) - -class StockQuant(models.Model): - - _inherit = "stock.quant" - - @api.model - def _prepare_account_move_line(self, move, qty, cost, + @api.multi + def _prepare_account_move_line(self, qty, cost, credit_account_id, debit_account_id): - res = super(StockQuant, self)._prepare_account_move_line( - move, qty, cost, credit_account_id, debit_account_id) + self.ensure_one() + res = super(StockMove, self)._prepare_account_move_line( + qty, cost, credit_account_id, debit_account_id) # Add analytic account in debit line - if not move.analytic_account_id: + if not self.analytic_account_id: return res for num in range(0, 2): - if res[num][2]["account_id"] != move.product_id.\ + if res[num][2]["account_id"] != self.product_id.\ categ_id.property_stock_valuation_account_id.id: res[num][2].update({ - 'analytic_account_id': move.analytic_account_id.id, + 'analytic_account_id': self.analytic_account_id.id, }) return res diff --git a/stock_analytic/tests/__init__.py b/stock_analytic/tests/__init__.py index d0dcefcdc5..42f37c63ac 100644 --- a/stock_analytic/tests/__init__.py +++ b/stock_analytic/tests/__init__.py @@ -1,7 +1,4 @@ # -*- coding: utf-8 -*- -# Copyright 2013 Julius Network Solutions -# Copyright 2015 Clear Corp -# Copyright 2016 OpenSynergy Indonesia # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import test_stock_picking diff --git a/stock_analytic/tests/test_stock_picking.py b/stock_analytic/tests/test_stock_picking.py index eeb2b2a12a..c76b9d6fa6 100644 --- a/stock_analytic/tests/test_stock_picking.py +++ b/stock_analytic/tests/test_stock_picking.py @@ -2,9 +2,10 @@ # Copyright 2013 Julius Network Solutions # Copyright 2015 Clear Corp # Copyright 2016 OpenSynergy Indonesia +# Copyright 2017 Eficent Business and IT Consulting Services S.L. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from openerp.tests.common import TransactionCase +from odoo.tests.common import TransactionCase from datetime import datetime @@ -14,11 +15,13 @@ def setUp(self): super(TestStockPicking, self).setUp() self.product = self.env.ref('product.product_product_4') - self.product.update({'valuation': 'real_time'}) self.product_categ = self.env.ref('product.product_category_5') self.valuation_account = self.env.ref( - 'account.data_account_type_expenses') - self.stock_account = self.env.ref('account.data_account_type_revenue') + 'l10n_generic_coa.1_conf_cas') + self.stock_input_account = self.env.ref( + 'l10n_generic_coa.1_current_liabilities') + self.stock_output_account = self.env.ref( + 'l10n_generic_coa.1_conf_a_expense') self.analytic_account = self.env.ref( 'analytic.analytic_agrolait') self.warehouse = self.env.ref('stock.warehouse0') @@ -28,9 +31,15 @@ def setUp(self): self.incoming_picking_type = self.env.ref('stock.picking_type_in') self.product_categ.update({ + 'property_valuation': 'real_time', 'property_stock_valuation_account_id': self.valuation_account.id, - 'property_stock_account_input_categ_id': self.stock_account.id, - 'property_stock_account_output_categ_id': self.stock_account.id, + 'property_stock_account_input_categ_id': + self.stock_input_account.id, + 'property_stock_account_output_categ_id': + self.stock_output_account.id, + }) + self.product.update({ + 'categ_id': self.product_categ.id, }) def _create_picking( diff --git a/stock_analytic/views/stock_inventory_views.xml b/stock_analytic/views/stock_inventory_views.xml deleted file mode 100644 index c7aca48bb1..0000000000 --- a/stock_analytic/views/stock_inventory_views.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - stock.inventory.form - stock.inventory - - - - - - - - - diff --git a/stock_analytic/views/stock_move_views.xml b/stock_analytic/views/stock_move_views.xml index 46ae95869b..300a6af44c 100644 --- a/stock_analytic/views/stock_move_views.xml +++ b/stock_analytic/views/stock_move_views.xml @@ -33,16 +33,6 @@ - - Stock Moves - stock.move - - - - - - - stock.move.form @@ -54,5 +44,22 @@ + + + stock.move.search + stock.move + + + + + + + + + + + From 0eb964f0881ebdb9eb5140ca8a5be55fc3fb85df Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Mon, 19 Mar 2018 08:47:24 -0700 Subject: [PATCH 12/61] 11.0 MIG stock_analytic --- stock_analytic/README.rst | 6 ++++-- stock_analytic/__init__.py | 1 - stock_analytic/__manifest__.py | 10 ++++++---- stock_analytic/models/__init__.py | 1 - stock_analytic/models/stock.py | 1 + stock_analytic/tests/__init__.py | 1 - stock_analytic/tests/test_stock_picking.py | 16 +++++++++++++--- stock_analytic/views/stock_move_views.xml | 16 ++++++++-------- 8 files changed, 32 insertions(+), 20 deletions(-) diff --git a/stock_analytic/README.rst b/stock_analytic/README.rst index 2f8e57c5b7..64e38da706 100644 --- a/stock_analytic/README.rst +++ b/stock_analytic/README.rst @@ -14,7 +14,7 @@ Usage ===== To Assign an Analytic Account to a Stock Move ------------------------------------------ +--------------------------------------------- You need to: @@ -35,7 +35,8 @@ contain journal items with following rule: .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/87/10.0 + :target: https://runbot.odoo-community.org/runbot/87/11.0 + Bug Tracker =========== @@ -59,6 +60,7 @@ Contributors * Andhitia Rama * Michael Viriyananda * Aaron Henriquez +* Jared Kipe Maintainer ---------- diff --git a/stock_analytic/__init__.py b/stock_analytic/__init__.py index a77a6fcbc5..83e553ac46 100644 --- a/stock_analytic/__init__.py +++ b/stock_analytic/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import models diff --git a/stock_analytic/__manifest__.py b/stock_analytic/__manifest__.py index b0083f7b74..b934d3e342 100644 --- a/stock_analytic/__manifest__.py +++ b/stock_analytic/__manifest__.py @@ -3,15 +3,17 @@ # Copyright 2015 Clear Corp # Copyright 2016 OpenSynergy Indonesia # Copyright 2017 Eficent Business and IT Consulting Services S.L. +# Copyright 2018 Hibou Corp. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { "name": "Stock Analytic", "summary": "Adds an analytic account in stock move", - "version": "10.0.1.0.0", - "author": "Julius Network Solutions," - "ClearCorp, OpenSynergy Indonesia," + "version": "11.0.1.0.0", + "author": "Julius Network Solutions, " + "ClearCorp, OpenSynergy Indonesia, " + "Hibou Corp., " "Odoo Community Association (OCA)", - "website": "http://www.julius.fr/", + "website": "https://github.com/OCA/account-analytic", "category": "Warehouse Management", "license": "AGPL-3", "depends": [ diff --git a/stock_analytic/models/__init__.py b/stock_analytic/models/__init__.py index 4e3c8255cc..ece5455940 100644 --- a/stock_analytic/models/__init__.py +++ b/stock_analytic/models/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import stock diff --git a/stock_analytic/models/stock.py b/stock_analytic/models/stock.py index 6da52825e4..d515c408a5 100644 --- a/stock_analytic/models/stock.py +++ b/stock_analytic/models/stock.py @@ -3,6 +3,7 @@ # Copyright 2015 Clear Corp # Copyright 2016 OpenSynergy Indonesia # Copyright 2017 Eficent Business and IT Consulting Services S.L. +# Copyright 2018 Hibou Corp. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo import fields, models, api diff --git a/stock_analytic/tests/__init__.py b/stock_analytic/tests/__init__.py index 42f37c63ac..bffaf7cf28 100644 --- a/stock_analytic/tests/__init__.py +++ b/stock_analytic/tests/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import test_stock_picking diff --git a/stock_analytic/tests/test_stock_picking.py b/stock_analytic/tests/test_stock_picking.py index c76b9d6fa6..c5d3c8167a 100644 --- a/stock_analytic/tests/test_stock_picking.py +++ b/stock_analytic/tests/test_stock_picking.py @@ -1,8 +1,8 @@ -# -*- coding: utf-8 -*- # Copyright 2013 Julius Network Solutions # Copyright 2015 Clear Corp # Copyright 2016 OpenSynergy Indonesia # Copyright 2017 Eficent Business and IT Consulting Services S.L. +# Copyright 2018 Hibou Corp. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo.tests.common import TransactionCase @@ -65,8 +65,18 @@ def _create_picking( 'procure_method': 'make_to_stock', 'product_uom': self.product.uom_id.id, 'product_uom_qty': 1.0, - 'analytic_account_id': analytic_account_id and - analytic_account_id.id or False + 'analytic_account_id': (analytic_account_id.id + if analytic_account_id else False), + 'move_line_ids': [ + (0, 0, {'product_id': self.product.id, + 'product_uom_qty': 0, # bypass reservation here + 'product_uom_id': self.product.uom_id.id, + 'qty_done': 1.0, + 'package_id': False, + 'result_package_id': False, + 'location_id': location_id.id, + 'location_dest_id': location_dest_id.id,}) + ], } self.env['stock.move'].create(move_data) diff --git a/stock_analytic/views/stock_move_views.xml b/stock_analytic/views/stock_move_views.xml index 300a6af44c..8ad37b3f8e 100644 --- a/stock_analytic/views/stock_move_views.xml +++ b/stock_analytic/views/stock_move_views.xml @@ -6,9 +6,9 @@ stock.move - + - + @@ -17,9 +17,9 @@ stock.move - + - + @@ -28,9 +28,9 @@ stock.move - + - + @@ -39,9 +39,9 @@ stock.move - + - + From 8d07b0be966a433b3f984b5597a492cb990a2921 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 30 Oct 2018 11:22:53 -0700 Subject: [PATCH 13/61] Add the ability to pick Analytic account on picking form. Remove remaining encoding hints. Correct lint in test Correct flake8 in test Fix documentation and test_flake8 --- stock_analytic/README.rst | 2 +- stock_analytic/__manifest__.py | 1 - stock_analytic/i18n/ca.po | 4 ++-- stock_analytic/i18n/cs_CZ.po | 7 +++--- stock_analytic/i18n/de.po | 4 ++-- stock_analytic/i18n/el_GR.po | 7 +++--- stock_analytic/i18n/es.po | 4 ++-- stock_analytic/i18n/es_EC.po | 7 +++--- stock_analytic/i18n/es_MX.po | 7 +++--- stock_analytic/i18n/fi.po | 4 ++-- stock_analytic/i18n/fr.po | 4 ++-- stock_analytic/i18n/gl.po | 12 ++++------ stock_analytic/i18n/gu_IN.po | 7 +++--- stock_analytic/i18n/hi_IN.po | 7 +++--- stock_analytic/i18n/hr.po | 7 +++--- stock_analytic/i18n/hr_HR.po | 10 +++++---- stock_analytic/i18n/hu.po | 12 ++++------ stock_analytic/i18n/it.po | 15 ++++++------- stock_analytic/i18n/nl.po | 4 ++-- stock_analytic/i18n/pt.po | 12 ++++------ stock_analytic/i18n/pt_BR.po | 7 +++--- stock_analytic/i18n/pt_PT.po | 15 +++++-------- stock_analytic/i18n/ro.po | 18 +++++++-------- stock_analytic/i18n/sk_SK.po | 7 +++--- stock_analytic/i18n/sl.po | 7 +++--- stock_analytic/i18n/stock_analytic.pot | 26 ++++++++++++++++++++++ stock_analytic/i18n/tr.po | 12 ++++------ stock_analytic/i18n/tr_TR.po | 15 +++++-------- stock_analytic/i18n/vi_VN.po | 15 +++++-------- stock_analytic/i18n/zh_CN.po | 7 +++--- stock_analytic/models/stock.py | 1 - stock_analytic/tests/test_stock_picking.py | 3 ++- stock_analytic/views/stock_move_views.xml | 14 ++++++++++-- 33 files changed, 153 insertions(+), 131 deletions(-) create mode 100644 stock_analytic/i18n/stock_analytic.pot diff --git a/stock_analytic/README.rst b/stock_analytic/README.rst index 64e38da706..71dfad6624 100644 --- a/stock_analytic/README.rst +++ b/stock_analytic/README.rst @@ -19,7 +19,7 @@ To Assign an Analytic Account to a Stock Move You need to: #. Create manually or open draft picking -#. Add or edit stock move. Fill **analytic account** field +#. Add move lines and fill **analytic account** field Assigned Journal Items created from Stock Move with Analytic Account -------------------------------------------------------------------- diff --git a/stock_analytic/__manifest__.py b/stock_analytic/__manifest__.py index b934d3e342..bf3150eb0a 100644 --- a/stock_analytic/__manifest__.py +++ b/stock_analytic/__manifest__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2013 Julius Network Solutions # Copyright 2015 Clear Corp # Copyright 2016 OpenSynergy Indonesia diff --git a/stock_analytic/i18n/ca.po b/stock_analytic/i18n/ca.po index 8ed9abcaaf..fbc056631d 100644 --- a/stock_analytic/i18n/ca.po +++ b/stock_analytic/i18n/ca.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_analytic -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-11-19 22:13+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n" +"Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic diff --git a/stock_analytic/i18n/cs_CZ.po b/stock_analytic/i18n/cs_CZ.po index 77db690364..8996186ab7 100644 --- a/stock_analytic/i18n/cs_CZ.po +++ b/stock_analytic/i18n/cs_CZ.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_analytic -# +# # Translators: # Lukáš Spurný , 2018 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2018-02-21 03:54+0000\n" "PO-Revision-Date: 2018-02-21 03:54+0000\n" "Last-Translator: Lukáš Spurný , 2018\n" -"Language-Team: Czech (Czech Republic) (https://www.transifex.com/oca/teams/23907/cs_CZ/)\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" -"Language: cs_CZ\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #. module: stock_analytic diff --git a/stock_analytic/i18n/de.po b/stock_analytic/i18n/de.po index fcd6b375e5..f95845b2ad 100644 --- a/stock_analytic/i18n/de.po +++ b/stock_analytic/i18n/de.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_analytic -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-11-19 22:13+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: stock_analytic diff --git a/stock_analytic/i18n/el_GR.po b/stock_analytic/i18n/el_GR.po index cfa451973c..fbfb669e8a 100644 --- a/stock_analytic/i18n/el_GR.po +++ b/stock_analytic/i18n/el_GR.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_analytic -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-11-19 22:13+0000\n" "PO-Revision-Date: 2017-11-19 22:13+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Greek (Greece) (https://www.transifex.com/oca/teams/23907/el_GR/)\n" +"Language-Team: Greek (Greece) (https://www.transifex.com/oca/teams/23907/" +"el_GR/)\n" +"Language: el_GR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: el_GR\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic diff --git a/stock_analytic/i18n/es.po b/stock_analytic/i18n/es.po index 19576d0698..a42445ecc8 100644 --- a/stock_analytic/i18n/es.po +++ b/stock_analytic/i18n/es.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_analytic -# +# # Translators: # OCA Transbot , 2017 # enjolras , 2018 @@ -13,10 +13,10 @@ msgstr "" "PO-Revision-Date: 2018-02-21 03:54+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: stock_analytic diff --git a/stock_analytic/i18n/es_EC.po b/stock_analytic/i18n/es_EC.po index 1f293ed648..38612878fe 100644 --- a/stock_analytic/i18n/es_EC.po +++ b/stock_analytic/i18n/es_EC.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_analytic -# +# # Translators: # Cristian Salamea , 2018 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2018-01-05 23:07+0000\n" "PO-Revision-Date: 2018-01-05 23:07+0000\n" "Last-Translator: Cristian Salamea , 2018\n" -"Language-Team: Spanish (Ecuador) (https://www.transifex.com/oca/teams/23907/es_EC/)\n" +"Language-Team: Spanish (Ecuador) (https://www.transifex.com/oca/teams/23907/" +"es_EC/)\n" +"Language: es_EC\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es_EC\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic diff --git a/stock_analytic/i18n/es_MX.po b/stock_analytic/i18n/es_MX.po index dd3d26995e..4f2520a146 100644 --- a/stock_analytic/i18n/es_MX.po +++ b/stock_analytic/i18n/es_MX.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_analytic -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-11-19 22:13+0000\n" "PO-Revision-Date: 2017-11-19 22:13+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Spanish (Mexico) (https://www.transifex.com/oca/teams/23907/es_MX/)\n" +"Language-Team: Spanish (Mexico) (https://www.transifex.com/oca/teams/23907/" +"es_MX/)\n" +"Language: es_MX\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es_MX\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic diff --git a/stock_analytic/i18n/fi.po b/stock_analytic/i18n/fi.po index 124e381803..ab113a7b29 100644 --- a/stock_analytic/i18n/fi.po +++ b/stock_analytic/i18n/fi.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_analytic -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-11-19 22:13+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Finnish (https://www.transifex.com/oca/teams/23907/fi/)\n" +"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: fi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic diff --git a/stock_analytic/i18n/fr.po b/stock_analytic/i18n/fr.po index 30edc2b686..4fd76c4f41 100644 --- a/stock_analytic/i18n/fr.po +++ b/stock_analytic/i18n/fr.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_analytic -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-11-19 22:13+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: stock_analytic diff --git a/stock_analytic/i18n/gl.po b/stock_analytic/i18n/gl.po index 1fda25757d..c679a254d0 100644 --- a/stock_analytic/i18n/gl.po +++ b/stock_analytic/i18n/gl.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_analytic -# +# # Translators: # César Castro Cruz , 2016 msgid "" @@ -12,22 +12,18 @@ msgstr "" "PO-Revision-Date: 2016-12-16 03:41+0000\n" "Last-Translator: César Castro Cruz , 2016\n" "Language-Team: Galician (https://www.transifex.com/oca/teams/23907/gl/)\n" +"Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: gl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: field:stock.move,analytic_account_id:0 +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id +#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Conta analítica" -#. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_stock_quant -msgid "Quants" -msgstr "" - #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/gu_IN.po b/stock_analytic/i18n/gu_IN.po index 8064ed4e48..db8d7b999f 100644 --- a/stock_analytic/i18n/gu_IN.po +++ b/stock_analytic/i18n/gu_IN.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_analytic -# +# # Translators: # Parth Goswami , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-11-19 22:13+0000\n" "PO-Revision-Date: 2017-11-19 22:13+0000\n" "Last-Translator: Parth Goswami , 2017\n" -"Language-Team: Gujarati (India) (https://www.transifex.com/oca/teams/23907/gu_IN/)\n" +"Language-Team: Gujarati (India) (https://www.transifex.com/oca/teams/23907/" +"gu_IN/)\n" +"Language: gu_IN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: gu_IN\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic diff --git a/stock_analytic/i18n/hi_IN.po b/stock_analytic/i18n/hi_IN.po index 17adee96aa..4538409c20 100644 --- a/stock_analytic/i18n/hi_IN.po +++ b/stock_analytic/i18n/hi_IN.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_analytic -# +# # Translators: # Parth Goswami , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-11-19 22:13+0000\n" "PO-Revision-Date: 2017-11-19 22:13+0000\n" "Last-Translator: Parth Goswami , 2017\n" -"Language-Team: Hindi (India) (https://www.transifex.com/oca/teams/23907/hi_IN/)\n" +"Language-Team: Hindi (India) (https://www.transifex.com/oca/teams/23907/" +"hi_IN/)\n" +"Language: hi_IN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: hi_IN\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic diff --git a/stock_analytic/i18n/hr.po b/stock_analytic/i18n/hr.po index be4a618adc..63dfb6b1bf 100644 --- a/stock_analytic/i18n/hr.po +++ b/stock_analytic/i18n/hr.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_analytic -# +# # Translators: # Bole , 2018 msgid "" @@ -12,11 +12,12 @@ msgstr "" "PO-Revision-Date: 2018-02-21 03:54+0000\n" "Last-Translator: Bole , 2018\n" "Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"Language: hr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: hr\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id diff --git a/stock_analytic/i18n/hr_HR.po b/stock_analytic/i18n/hr_HR.po index 109324ea8f..5b2f559f9f 100644 --- a/stock_analytic/i18n/hr_HR.po +++ b/stock_analytic/i18n/hr_HR.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_analytic -# +# # Translators: # Bole , 2017 msgid "" @@ -11,12 +11,14 @@ msgstr "" "POT-Creation-Date: 2017-11-19 22:13+0000\n" "PO-Revision-Date: 2017-11-19 22:13+0000\n" "Last-Translator: Bole , 2017\n" -"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/hr_HR/)\n" +"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/" +"hr_HR/)\n" +"Language: hr_HR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: hr_HR\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id diff --git a/stock_analytic/i18n/hu.po b/stock_analytic/i18n/hu.po index c9f8cf5c73..030f9f5e38 100644 --- a/stock_analytic/i18n/hu.po +++ b/stock_analytic/i18n/hu.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_analytic -# +# # Translators: # OCA Transbot , 2016 msgid "" @@ -12,22 +12,18 @@ msgstr "" "PO-Revision-Date: 2016-12-16 03:41+0000\n" "Last-Translator: OCA Transbot , 2016\n" "Language-Team: Hungarian (https://www.transifex.com/oca/teams/23907/hu/)\n" +"Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: field:stock.move,analytic_account_id:0 +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id +#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Analitikus gyűjtőkód könyvelés" -#. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_stock_quant -msgid "Quants" -msgstr "" - #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/it.po b/stock_analytic/i18n/it.po index 45a4f1cb50..2604398d84 100644 --- a/stock_analytic/i18n/it.po +++ b/stock_analytic/i18n/it.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_analytic -# +# # Translators: # OCA Transbot , 2016 # Nicola Malcontenti , 2016 @@ -14,23 +14,22 @@ msgstr "" "PO-Revision-Date: 2016-12-16 03:41+0000\n" "Last-Translator: Paolo Valier , 2016\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: stock_analytic -#: field:stock.move,analytic_account_id:0 +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id +#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Conto Analitico" -#. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_stock_quant -msgid "Quants" -msgstr "Quantità" - #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" msgstr "Movimento di magazzino" + +#~ msgid "Quants" +#~ msgstr "Quantità" diff --git a/stock_analytic/i18n/nl.po b/stock_analytic/i18n/nl.po index 998e9192e2..0ea5e2cc4b 100644 --- a/stock_analytic/i18n/nl.po +++ b/stock_analytic/i18n/nl.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_analytic -# +# # Translators: # Cas Vissers , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-11-19 22:13+0000\n" "Last-Translator: Cas Vissers , 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: stock_analytic diff --git a/stock_analytic/i18n/pt.po b/stock_analytic/i18n/pt.po index 553f8f3426..b8c3a96603 100644 --- a/stock_analytic/i18n/pt.po +++ b/stock_analytic/i18n/pt.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_analytic -# +# # Translators: # Daniel Reis , 2016 # OCA Transbot , 2016 @@ -13,22 +13,18 @@ msgstr "" "PO-Revision-Date: 2016-12-16 03:41+0000\n" "Last-Translator: OCA Transbot , 2016\n" "Language-Team: Portuguese (https://www.transifex.com/oca/teams/23907/pt/)\n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: pt\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: field:stock.move,analytic_account_id:0 +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id +#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Conta Analítica" -#. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_stock_quant -msgid "Quants" -msgstr "" - #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/pt_BR.po b/stock_analytic/i18n/pt_BR.po index de55732f81..e49cf54bc2 100644 --- a/stock_analytic/i18n/pt_BR.po +++ b/stock_analytic/i18n/pt_BR.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_analytic -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-11-19 22:13+0000\n" "PO-Revision-Date: 2017-11-19 22:13+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: stock_analytic diff --git a/stock_analytic/i18n/pt_PT.po b/stock_analytic/i18n/pt_PT.po index 67418b9622..ade4de782a 100644 --- a/stock_analytic/i18n/pt_PT.po +++ b/stock_analytic/i18n/pt_PT.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_analytic -# +# # Translators: # Daniel Reis , 2016 msgid "" @@ -11,23 +11,20 @@ msgstr "" "POT-Creation-Date: 2016-12-16 03:41+0000\n" "PO-Revision-Date: 2016-12-16 03:41+0000\n" "Last-Translator: Daniel Reis , 2016\n" -"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/teams/23907/pt_PT/)\n" +"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/" +"teams/23907/pt_PT/)\n" +"Language: pt_PT\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: pt_PT\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: field:stock.move,analytic_account_id:0 +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id +#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Conta Analítica" -#. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_stock_quant -msgid "Quants" -msgstr "" - #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/ro.po b/stock_analytic/i18n/ro.po index c247ce5093..a12fc0dfaa 100644 --- a/stock_analytic/i18n/ro.po +++ b/stock_analytic/i18n/ro.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_analytic -# +# # Translators: # Dorin Hongu , 2016 # OCA Transbot , 2016 @@ -13,23 +13,23 @@ msgstr "" "PO-Revision-Date: 2016-12-16 03:41+0000\n" "Last-Translator: OCA Transbot , 2016\n" "Language-Team: Romanian (https://www.transifex.com/oca/teams/23907/ro/)\n" +"Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: ro\n" -"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" +"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?" +"2:1));\n" #. module: stock_analytic -#: field:stock.move,analytic_account_id:0 +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id +#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Cont analitic" -#. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_stock_quant -msgid "Quants" -msgstr "Poziții de stoc" - #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" msgstr "Mișcare stoc" + +#~ msgid "Quants" +#~ msgstr "Poziții de stoc" diff --git a/stock_analytic/i18n/sk_SK.po b/stock_analytic/i18n/sk_SK.po index 53566b6010..b2f320d6a8 100644 --- a/stock_analytic/i18n/sk_SK.po +++ b/stock_analytic/i18n/sk_SK.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_analytic -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-11-19 22:13+0000\n" "PO-Revision-Date: 2017-11-19 22:13+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Slovak (Slovakia) (https://www.transifex.com/oca/teams/23907/sk_SK/)\n" +"Language-Team: Slovak (Slovakia) (https://www.transifex.com/oca/teams/23907/" +"sk_SK/)\n" +"Language: sk_SK\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: sk_SK\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #. module: stock_analytic diff --git a/stock_analytic/i18n/sl.po b/stock_analytic/i18n/sl.po index 338114b18f..75677f95c5 100644 --- a/stock_analytic/i18n/sl.po +++ b/stock_analytic/i18n/sl.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_analytic -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,11 +12,12 @@ msgstr "" "PO-Revision-Date: 2017-11-19 22:13+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: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id diff --git a/stock_analytic/i18n/stock_analytic.pot b/stock_analytic/i18n/stock_analytic.pot new file mode 100644 index 0000000000..476892899b --- /dev/null +++ b/stock_analytic/i18n/stock_analytic.pot @@ -0,0 +1,26 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_analytic +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.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: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id +#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic +msgid "Analytic Account" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move +msgid "Stock Move" +msgstr "" + diff --git a/stock_analytic/i18n/tr.po b/stock_analytic/i18n/tr.po index 30b94ebc9b..8d0b7dbc78 100644 --- a/stock_analytic/i18n/tr.po +++ b/stock_analytic/i18n/tr.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_analytic -# +# # Translators: # Ivan BARAYEV , 2017 msgid "" @@ -12,22 +12,18 @@ msgstr "" "PO-Revision-Date: 2017-01-06 23:06+0000\n" "Last-Translator: Ivan BARAYEV , 2017\n" "Language-Team: Turkish (https://www.transifex.com/oca/teams/23907/tr/)\n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: tr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: stock_analytic -#: field:stock.move,analytic_account_id:0 +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id +#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "" -#. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_stock_quant -msgid "Quants" -msgstr "" - #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/tr_TR.po b/stock_analytic/i18n/tr_TR.po index f5ed02e2fe..287237253c 100644 --- a/stock_analytic/i18n/tr_TR.po +++ b/stock_analytic/i18n/tr_TR.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_analytic -# +# # Translators: # Ozge Altinisik , 2017 msgid "" @@ -11,23 +11,20 @@ msgstr "" "POT-Creation-Date: 2016-12-30 23:06+0000\n" "PO-Revision-Date: 2016-12-30 23:06+0000\n" "Last-Translator: Ozge Altinisik , 2017\n" -"Language-Team: Turkish (Turkey) (https://www.transifex.com/oca/teams/23907/tr_TR/)\n" +"Language-Team: Turkish (Turkey) (https://www.transifex.com/oca/teams/23907/" +"tr_TR/)\n" +"Language: tr_TR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: tr_TR\n" "Plural-Forms: nplurals=1; plural=0;\n" #. module: stock_analytic -#: field:stock.move,analytic_account_id:0 +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id +#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "" -#. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_stock_quant -msgid "Quants" -msgstr "" - #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/vi_VN.po b/stock_analytic/i18n/vi_VN.po index 854fb536de..09132361b3 100644 --- a/stock_analytic/i18n/vi_VN.po +++ b/stock_analytic/i18n/vi_VN.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_analytic -# +# # Translators: # OCA Transbot , 2016 msgid "" @@ -11,23 +11,20 @@ msgstr "" "POT-Creation-Date: 2016-12-16 03:41+0000\n" "PO-Revision-Date: 2016-12-16 03:41+0000\n" "Last-Translator: OCA Transbot , 2016\n" -"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/oca/teams/23907/vi_VN/)\n" +"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/oca/" +"teams/23907/vi_VN/)\n" +"Language: vi_VN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: vi_VN\n" "Plural-Forms: nplurals=1; plural=0;\n" #. module: stock_analytic -#: field:stock.move,analytic_account_id:0 +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id +#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "" -#. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_stock_quant -msgid "Quants" -msgstr "" - #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/zh_CN.po b/stock_analytic/i18n/zh_CN.po index d6ffbb94a5..108386f141 100644 --- a/stock_analytic/i18n/zh_CN.po +++ b/stock_analytic/i18n/zh_CN.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_analytic -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-11-19 22:13+0000\n" "PO-Revision-Date: 2017-11-19 22:13+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Chinese (China) (https://www.transifex.com/oca/teams/23907/zh_CN/)\n" +"Language-Team: Chinese (China) (https://www.transifex.com/oca/teams/23907/" +"zh_CN/)\n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" #. module: stock_analytic diff --git a/stock_analytic/models/stock.py b/stock_analytic/models/stock.py index d515c408a5..ac62bddb7c 100644 --- a/stock_analytic/models/stock.py +++ b/stock_analytic/models/stock.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2013 Julius Network Solutions # Copyright 2015 Clear Corp # Copyright 2016 OpenSynergy Indonesia diff --git a/stock_analytic/tests/test_stock_picking.py b/stock_analytic/tests/test_stock_picking.py index c5d3c8167a..e293aed77e 100644 --- a/stock_analytic/tests/test_stock_picking.py +++ b/stock_analytic/tests/test_stock_picking.py @@ -75,7 +75,8 @@ def _create_picking( 'package_id': False, 'result_package_id': False, 'location_id': location_id.id, - 'location_dest_id': location_dest_id.id,}) + 'location_dest_id': location_dest_id.id, + }) ], } diff --git a/stock_analytic/views/stock_move_views.xml b/stock_analytic/views/stock_move_views.xml index 8ad37b3f8e..bf39ea1995 100644 --- a/stock_analytic/views/stock_move_views.xml +++ b/stock_analytic/views/stock_move_views.xml @@ -51,15 +51,25 @@ - + - + + stock.picking.form + stock.picking + + + + + + + From be6f5e40ad7a13a2d59df754a783af23d57dbae1 Mon Sep 17 00:00:00 2001 From: Rudolf Schnapka Date: Mon, 21 Jan 2019 14:26:12 +0000 Subject: [PATCH 14/61] Translated using Weblate (German) Currently translated at 100.0% (2 of 2 strings) Translation: account-analytic-11.0/account-analytic-11.0-stock_analytic Translate-URL: https://translation.odoo-community.org/projects/account-analytic-11-0/account-analytic-11-0-stock_analytic/de/ --- stock_analytic/i18n/de.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/stock_analytic/i18n/de.po b/stock_analytic/i18n/de.po index f95845b2ad..c8b49199e0 100644 --- a/stock_analytic/i18n/de.po +++ b/stock_analytic/i18n/de.po @@ -9,14 +9,15 @@ msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-11-19 22:13+0000\n" -"PO-Revision-Date: 2017-11-19 22:13+0000\n" -"Last-Translator: OCA Transbot , 2017\n" +"PO-Revision-Date: 2019-01-21 16:41+0000\n" +"Last-Translator: Rudolf Schnapka \n" "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 3.3\n" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id @@ -27,4 +28,4 @@ msgstr "Kostenstelle" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" -msgstr "" +msgstr "Bestandsbuchung" From 071d09d697e5fb27bd18b6203c41ca671dc69cd5 Mon Sep 17 00:00:00 2001 From: Aaron Henriquez Date: Wed, 30 Jan 2019 17:52:17 +0100 Subject: [PATCH 15/61] [MIG]stock_analytic to v12 --- stock_analytic/__manifest__.py | 2 +- stock_analytic/models/stock.py | 9 ++++- stock_analytic/tests/test_stock_picking.py | 38 +++++++++++++++++----- stock_analytic/views/stock_move_views.xml | 2 +- 4 files changed, 40 insertions(+), 11 deletions(-) diff --git a/stock_analytic/__manifest__.py b/stock_analytic/__manifest__.py index bf3150eb0a..30480074fc 100644 --- a/stock_analytic/__manifest__.py +++ b/stock_analytic/__manifest__.py @@ -7,7 +7,7 @@ { "name": "Stock Analytic", "summary": "Adds an analytic account in stock move", - "version": "11.0.1.0.0", + "version": "12.0.1.0.0", "author": "Julius Network Solutions, " "ClearCorp, OpenSynergy Indonesia, " "Hibou Corp., " diff --git a/stock_analytic/models/stock.py b/stock_analytic/models/stock.py index ac62bddb7c..7e25ee7a55 100644 --- a/stock_analytic/models/stock.py +++ b/stock_analytic/models/stock.py @@ -23,7 +23,7 @@ def _prepare_account_move_line(self, qty, cost, res = super(StockMove, self)._prepare_account_move_line( qty, cost, credit_account_id, debit_account_id) # Add analytic account in debit line - if not self.analytic_account_id: + if not self.analytic_account_id or not res: return res for num in range(0, 2): @@ -33,3 +33,10 @@ def _prepare_account_move_line(self, qty, cost, 'analytic_account_id': self.analytic_account_id.id, }) return res + + +class StockMoveLine(models.Model): + _inherit = "stock.move.line" + + analytic_account_id = fields.Many2one( + related='move_id.analytic_account_id') diff --git a/stock_analytic/tests/test_stock_picking.py b/stock_analytic/tests/test_stock_picking.py index e293aed77e..8b79cad135 100644 --- a/stock_analytic/tests/test_stock_picking.py +++ b/stock_analytic/tests/test_stock_picking.py @@ -16,12 +16,33 @@ def setUp(self): self.product = self.env.ref('product.product_product_4') self.product_categ = self.env.ref('product.product_category_5') - self.valuation_account = self.env.ref( - 'l10n_generic_coa.1_conf_cas') - self.stock_input_account = self.env.ref( - 'l10n_generic_coa.1_current_liabilities') - self.stock_output_account = self.env.ref( - 'l10n_generic_coa.1_conf_a_expense') + self.valuation_account = self.env['account.account'].create({ + 'name': 'Test stock valuation', + 'code': 'tv', + 'user_type_id': + self.env['account.account.type'].search( + [], limit=1).id, + 'reconcile': True, + 'company_id': self.env.ref('base.main_company').id, + }) + self.stock_input_account = self.env['account.account'].create({ + 'name': 'Test stock input', + 'code': 'tsti', + 'user_type_id': + self.env['account.account.type'].search( + [], limit=1).id, + 'reconcile': True, + 'company_id': self.env.ref('base.main_company').id, + }) + self.stock_output_account = self.env['account.account'].create({ + 'name': 'Test stock output', + 'code': 'tout', + 'user_type_id': + self.env['account.account.type'].search( + [], limit=1).id, + 'reconcile': True, + 'company_id': self.env.ref('base.main_company').id, + }) self.analytic_account = self.env.ref( 'analytic.analytic_agrolait') self.warehouse = self.env.ref('stock.warehouse0') @@ -89,8 +110,9 @@ def _confirm_picking_no_error(self, picking): self.assertEqual(picking.state, 'confirmed') def _force_assign_no_error(self, picking): - picking.force_assign() - self.assertEqual(picking.state, 'assigned') + self.picking.move_line_ids.write({'qty_done': 5.0}) + picking.button_validate() + self.assertEqual(picking.state, 'confirmed') def _picking_done_no_error(self, picking): picking.action_done() diff --git a/stock_analytic/views/stock_move_views.xml b/stock_analytic/views/stock_move_views.xml index bf39ea1995..dfe64eaadd 100644 --- a/stock_analytic/views/stock_move_views.xml +++ b/stock_analytic/views/stock_move_views.xml @@ -66,7 +66,7 @@ stock.picking - + From 940e081dcdfd8debdf3bfb6ad9590bc0989878d9 Mon Sep 17 00:00:00 2001 From: BT-cserra Date: Thu, 13 Jun 2019 14:56:29 +0200 Subject: [PATCH 16/61] [MIG] Updated the tests of the module stock_analytic. --- stock_analytic/i18n/ca.po | 10 ++++-- stock_analytic/i18n/cs_CZ.po | 10 ++++-- stock_analytic/i18n/de.po | 10 ++++-- stock_analytic/i18n/el_GR.po | 10 ++++-- stock_analytic/i18n/es.po | 10 ++++-- stock_analytic/i18n/es_EC.po | 10 ++++-- stock_analytic/i18n/es_MX.po | 10 ++++-- stock_analytic/i18n/fi.po | 10 ++++-- stock_analytic/i18n/fr.po | 10 ++++-- stock_analytic/i18n/gl.po | 10 ++++-- stock_analytic/i18n/gu_IN.po | 10 ++++-- stock_analytic/i18n/hi_IN.po | 10 ++++-- stock_analytic/i18n/hr.po | 10 ++++-- stock_analytic/i18n/hr_HR.po | 10 ++++-- stock_analytic/i18n/hu.po | 10 ++++-- stock_analytic/i18n/it.po | 10 ++++-- stock_analytic/i18n/nl.po | 10 ++++-- stock_analytic/i18n/pt.po | 10 ++++-- stock_analytic/i18n/pt_BR.po | 10 ++++-- stock_analytic/i18n/pt_PT.po | 10 ++++-- stock_analytic/i18n/ro.po | 10 ++++-- stock_analytic/i18n/sk_SK.po | 10 ++++-- stock_analytic/i18n/sl.po | 10 ++++-- stock_analytic/i18n/stock_analytic.pot | 12 +++++-- stock_analytic/i18n/tr.po | 10 ++++-- stock_analytic/i18n/tr_TR.po | 10 ++++-- stock_analytic/i18n/vi_VN.po | 10 ++++-- stock_analytic/i18n/zh_CN.po | 10 ++++-- stock_analytic/tests/test_stock_picking.py | 37 +++++++++++----------- 29 files changed, 243 insertions(+), 76 deletions(-) diff --git a/stock_analytic/i18n/ca.po b/stock_analytic/i18n/ca.po index fbc056631d..0648a35de2 100644 --- a/stock_analytic/i18n/ca.po +++ b/stock_analytic/i18n/ca.po @@ -19,11 +19,17 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id -#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Compte analític" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move_line +msgid "Product Moves (Stock Move Line)" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/cs_CZ.po b/stock_analytic/i18n/cs_CZ.po index 8996186ab7..a6d69032b9 100644 --- a/stock_analytic/i18n/cs_CZ.po +++ b/stock_analytic/i18n/cs_CZ.po @@ -20,11 +20,17 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id -#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Analytický účet" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move_line +msgid "Product Moves (Stock Move Line)" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/de.po b/stock_analytic/i18n/de.po index c8b49199e0..c63320fe38 100644 --- a/stock_analytic/i18n/de.po +++ b/stock_analytic/i18n/de.po @@ -20,11 +20,17 @@ msgstr "" "X-Generator: Weblate 3.3\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id -#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Kostenstelle" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move_line +msgid "Product Moves (Stock Move Line)" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/el_GR.po b/stock_analytic/i18n/el_GR.po index fbfb669e8a..04b6162724 100644 --- a/stock_analytic/i18n/el_GR.po +++ b/stock_analytic/i18n/el_GR.po @@ -20,11 +20,17 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id -#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Αναλυτικός Λογαριασμός" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move_line +msgid "Product Moves (Stock Move Line)" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/es.po b/stock_analytic/i18n/es.po index a42445ecc8..950dc36505 100644 --- a/stock_analytic/i18n/es.po +++ b/stock_analytic/i18n/es.po @@ -20,11 +20,17 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id -#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Cuenta analítica" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move_line +msgid "Product Moves (Stock Move Line)" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/es_EC.po b/stock_analytic/i18n/es_EC.po index 38612878fe..87e808b947 100644 --- a/stock_analytic/i18n/es_EC.po +++ b/stock_analytic/i18n/es_EC.po @@ -20,11 +20,17 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id -#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Cuenta Analítica" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move_line +msgid "Product Moves (Stock Move Line)" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/es_MX.po b/stock_analytic/i18n/es_MX.po index 4f2520a146..8b225357d4 100644 --- a/stock_analytic/i18n/es_MX.po +++ b/stock_analytic/i18n/es_MX.po @@ -20,11 +20,17 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id -#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Cuenta analítica" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move_line +msgid "Product Moves (Stock Move Line)" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/fi.po b/stock_analytic/i18n/fi.po index ab113a7b29..4e7ff7dc4d 100644 --- a/stock_analytic/i18n/fi.po +++ b/stock_analytic/i18n/fi.po @@ -19,11 +19,17 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id -#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Analyyttinen tili" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move_line +msgid "Product Moves (Stock Move Line)" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/fr.po b/stock_analytic/i18n/fr.po index 4fd76c4f41..7da9df986b 100644 --- a/stock_analytic/i18n/fr.po +++ b/stock_analytic/i18n/fr.po @@ -19,11 +19,17 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id -#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Compte analytique" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move_line +msgid "Product Moves (Stock Move Line)" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/gl.po b/stock_analytic/i18n/gl.po index c679a254d0..8c90affccf 100644 --- a/stock_analytic/i18n/gl.po +++ b/stock_analytic/i18n/gl.po @@ -19,11 +19,17 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id -#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Conta analítica" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move_line +msgid "Product Moves (Stock Move Line)" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/gu_IN.po b/stock_analytic/i18n/gu_IN.po index db8d7b999f..9aeb4e1175 100644 --- a/stock_analytic/i18n/gu_IN.po +++ b/stock_analytic/i18n/gu_IN.po @@ -20,11 +20,17 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id -#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "વિશ્લેષણાત્મક ખાતું" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move_line +msgid "Product Moves (Stock Move Line)" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/hi_IN.po b/stock_analytic/i18n/hi_IN.po index 4538409c20..4e36b17f41 100644 --- a/stock_analytic/i18n/hi_IN.po +++ b/stock_analytic/i18n/hi_IN.po @@ -20,11 +20,17 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id -#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "विश्लेषणात्मक खाता" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move_line +msgid "Product Moves (Stock Move Line)" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/hr.po b/stock_analytic/i18n/hr.po index 63dfb6b1bf..110c3cfcaf 100644 --- a/stock_analytic/i18n/hr.po +++ b/stock_analytic/i18n/hr.po @@ -20,11 +20,17 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id -#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Analitički konto" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move_line +msgid "Product Moves (Stock Move Line)" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/hr_HR.po b/stock_analytic/i18n/hr_HR.po index 5b2f559f9f..a4bf132ed2 100644 --- a/stock_analytic/i18n/hr_HR.po +++ b/stock_analytic/i18n/hr_HR.po @@ -21,11 +21,17 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id -#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Analitički konto" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move_line +msgid "Product Moves (Stock Move Line)" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/hu.po b/stock_analytic/i18n/hu.po index 030f9f5e38..663867148e 100644 --- a/stock_analytic/i18n/hu.po +++ b/stock_analytic/i18n/hu.po @@ -19,11 +19,17 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id -#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Analitikus gyűjtőkód könyvelés" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move_line +msgid "Product Moves (Stock Move Line)" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/it.po b/stock_analytic/i18n/it.po index 2604398d84..b64eed0fce 100644 --- a/stock_analytic/i18n/it.po +++ b/stock_analytic/i18n/it.po @@ -21,11 +21,17 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id -#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Conto Analitico" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move_line +msgid "Product Moves (Stock Move Line)" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/nl.po b/stock_analytic/i18n/nl.po index 0ea5e2cc4b..8f6e1030af 100644 --- a/stock_analytic/i18n/nl.po +++ b/stock_analytic/i18n/nl.po @@ -19,11 +19,17 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id -#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Kostenplaats" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move_line +msgid "Product Moves (Stock Move Line)" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/pt.po b/stock_analytic/i18n/pt.po index b8c3a96603..a276f11bf7 100644 --- a/stock_analytic/i18n/pt.po +++ b/stock_analytic/i18n/pt.po @@ -20,11 +20,17 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id -#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Conta Analítica" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move_line +msgid "Product Moves (Stock Move Line)" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/pt_BR.po b/stock_analytic/i18n/pt_BR.po index e49cf54bc2..f15fa6ea4e 100644 --- a/stock_analytic/i18n/pt_BR.po +++ b/stock_analytic/i18n/pt_BR.po @@ -20,11 +20,17 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id -#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Conta analítica" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move_line +msgid "Product Moves (Stock Move Line)" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/pt_PT.po b/stock_analytic/i18n/pt_PT.po index ade4de782a..2a2742272a 100644 --- a/stock_analytic/i18n/pt_PT.po +++ b/stock_analytic/i18n/pt_PT.po @@ -20,11 +20,17 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id -#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Conta Analítica" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move_line +msgid "Product Moves (Stock Move Line)" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/ro.po b/stock_analytic/i18n/ro.po index a12fc0dfaa..e1135ecf4a 100644 --- a/stock_analytic/i18n/ro.po +++ b/stock_analytic/i18n/ro.po @@ -21,11 +21,17 @@ msgstr "" "2:1));\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id -#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Cont analitic" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move_line +msgid "Product Moves (Stock Move Line)" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/sk_SK.po b/stock_analytic/i18n/sk_SK.po index b2f320d6a8..dda8b7027b 100644 --- a/stock_analytic/i18n/sk_SK.po +++ b/stock_analytic/i18n/sk_SK.po @@ -20,11 +20,17 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id -#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Analytický účet" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move_line +msgid "Product Moves (Stock Move Line)" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/sl.po b/stock_analytic/i18n/sl.po index 75677f95c5..d7f5a64ca8 100644 --- a/stock_analytic/i18n/sl.po +++ b/stock_analytic/i18n/sl.po @@ -20,11 +20,17 @@ msgstr "" "%100==4 ? 2 : 3);\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id -#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Analitični konto" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move_line +msgid "Product Moves (Stock Move Line)" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/stock_analytic.pot b/stock_analytic/i18n/stock_analytic.pot index 476892899b..7869ce27bb 100644 --- a/stock_analytic/i18n/stock_analytic.pot +++ b/stock_analytic/i18n/stock_analytic.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" @@ -14,11 +14,17 @@ msgstr "" "Plural-Forms: \n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id -#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move_line +msgid "Product Moves (Stock Move Line)" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/tr.po b/stock_analytic/i18n/tr.po index 8d0b7dbc78..33cb6dd581 100644 --- a/stock_analytic/i18n/tr.po +++ b/stock_analytic/i18n/tr.po @@ -19,11 +19,17 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id -#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move_line +msgid "Product Moves (Stock Move Line)" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/tr_TR.po b/stock_analytic/i18n/tr_TR.po index 287237253c..2a87391fb5 100644 --- a/stock_analytic/i18n/tr_TR.po +++ b/stock_analytic/i18n/tr_TR.po @@ -20,11 +20,17 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id -#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move_line +msgid "Product Moves (Stock Move Line)" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/vi_VN.po b/stock_analytic/i18n/vi_VN.po index 09132361b3..100a5a2aa7 100644 --- a/stock_analytic/i18n/vi_VN.po +++ b/stock_analytic/i18n/vi_VN.po @@ -20,11 +20,17 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id -#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move_line +msgid "Product Moves (Stock Move Line)" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/zh_CN.po b/stock_analytic/i18n/zh_CN.po index 108386f141..437c34fe8d 100644 --- a/stock_analytic/i18n/zh_CN.po +++ b/stock_analytic/i18n/zh_CN.po @@ -20,11 +20,17 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_analytic_account_id -#: model:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "核算科目" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_move_line +msgid "Product Moves (Stock Move Line)" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/tests/test_stock_picking.py b/stock_analytic/tests/test_stock_picking.py index 8b79cad135..b4471c008a 100644 --- a/stock_analytic/tests/test_stock_picking.py +++ b/stock_analytic/tests/test_stock_picking.py @@ -88,34 +88,32 @@ def _create_picking( 'product_uom_qty': 1.0, 'analytic_account_id': (analytic_account_id.id if analytic_account_id else False), - 'move_line_ids': [ - (0, 0, {'product_id': self.product.id, - 'product_uom_qty': 0, # bypass reservation here - 'product_uom_id': self.product.uom_id.id, - 'qty_done': 1.0, - 'package_id': False, - 'result_package_id': False, - 'location_id': location_id.id, - 'location_dest_id': location_dest_id.id, - }) - ], } self.env['stock.move'].create(move_data) return picking + def __update_qty_on_hand_product(self, product, new_qty): + qty_wizard = self.env['stock.change.product.qty'].create({ + 'product_id': product.id, + 'new_quantity': new_qty + }) + qty_wizard.change_product_qty() + def _confirm_picking_no_error(self, picking): picking.action_confirm() self.assertEqual(picking.state, 'confirmed') - def _force_assign_no_error(self, picking): - self.picking.move_line_ids.write({'qty_done': 5.0}) - picking.button_validate() - self.assertEqual(picking.state, 'confirmed') + def _force_assign_out_no_error(self, picking): + self.assertEqual(picking.move_lines.reserved_availability, 0) + picking.action_assign() + self.assertEqual(picking.move_lines.reserved_availability, 1) + self.assertEqual(picking.state, 'assigned') def _picking_done_no_error(self, picking): - picking.action_done() + picking.move_lines.quantity_done = 1.0 + picking.button_validate() self.assertEqual(picking.state, 'done') def _check_account_move_no_error(self, picking): @@ -151,8 +149,9 @@ def test_outgoing_picking_with_analytic(self): self.outgoing_picking_type, self.analytic_account, ) + self.__update_qty_on_hand_product(self.product, 1) self._confirm_picking_no_error(picking) - self._force_assign_no_error(picking) + self._force_assign_out_no_error(picking) self._picking_done_no_error(picking) self._check_account_move_no_error(picking) self._check_analytic_account_no_error(picking) @@ -162,8 +161,9 @@ def test_outgoing_picking_without_analytic(self): self.location, self.dest_location, self.outgoing_picking_type, ) + self.__update_qty_on_hand_product(self.product, 1) self._confirm_picking_no_error(picking) - self._force_assign_no_error(picking) + self._force_assign_out_no_error(picking) self._picking_done_no_error(picking) self._check_account_move_no_error(picking) self._check_no_analytic_account(picking) @@ -175,7 +175,6 @@ def test_incoming_picking_with_analytic(self): self.analytic_account, ) self._confirm_picking_no_error(picking) - self._force_assign_no_error(picking) self._picking_done_no_error(picking) self._check_account_move_no_error(picking) self._check_analytic_account_no_error(picking) From 65aab2338b24ed9111f40ff42f6db99a1d965e2d Mon Sep 17 00:00:00 2001 From: Marcel Savegnago Date: Fri, 2 Aug 2019 07:19:59 +0000 Subject: [PATCH 17/61] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (2 of 2 strings) Translation: account-analytic-12.0/account-analytic-12.0-stock_analytic Translate-URL: https://translation.odoo-community.org/projects/account-analytic-12-0/account-analytic-12-0-stock_analytic/pt_BR/ --- stock_analytic/i18n/pt_BR.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/stock_analytic/i18n/pt_BR.po b/stock_analytic/i18n/pt_BR.po index f15fa6ea4e..a7b106a36d 100644 --- a/stock_analytic/i18n/pt_BR.po +++ b/stock_analytic/i18n/pt_BR.po @@ -9,15 +9,16 @@ msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-11-19 22:13+0000\n" -"PO-Revision-Date: 2017-11-19 22:13+0000\n" -"Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/" -"teams/23907/pt_BR/)\n" +"PO-Revision-Date: 2019-08-02 09:43+0000\n" +"Last-Translator: Marcel Savegnago \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" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 3.7.1\n" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id @@ -34,4 +35,4 @@ msgstr "" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" -msgstr "" +msgstr "Movimentação de Estoque" From a8072d0fabf742ab00ed5951a57bf7830d2993e3 Mon Sep 17 00:00:00 2001 From: Jaume Planas Date: Mon, 7 Oct 2019 11:04:00 +0000 Subject: [PATCH 18/61] Translated using Weblate (Catalan) Currently translated at 100.0% (2 of 2 strings) Translation: account-analytic-12.0/account-analytic-12.0-stock_analytic Translate-URL: https://translation.odoo-community.org/projects/account-analytic-12-0/account-analytic-12-0-stock_analytic/ca/ --- stock_analytic/i18n/ca.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/stock_analytic/i18n/ca.po b/stock_analytic/i18n/ca.po index 0648a35de2..33f9b3a80c 100644 --- a/stock_analytic/i18n/ca.po +++ b/stock_analytic/i18n/ca.po @@ -9,14 +9,15 @@ msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-11-19 22:13+0000\n" -"PO-Revision-Date: 2017-11-19 22:13+0000\n" -"Last-Translator: OCA Transbot , 2017\n" +"PO-Revision-Date: 2019-10-07 11:10+0000\n" +"Last-Translator: Jaume Planas \n" "Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 3.8\n" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id @@ -33,4 +34,4 @@ msgstr "" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" -msgstr "" +msgstr "Moviment d'estoc" From 630ced0ec80663e63aff9127e4f4d20c5faa76ad Mon Sep 17 00:00:00 2001 From: Jerther Date: Tue, 15 Oct 2019 12:31:20 -0400 Subject: [PATCH 19/61] [12.0] [FIX] Wrong runbot link in readme --- stock_analytic/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stock_analytic/README.rst b/stock_analytic/README.rst index 71dfad6624..7d3c3d2431 100644 --- a/stock_analytic/README.rst +++ b/stock_analytic/README.rst @@ -35,7 +35,7 @@ contain journal items with following rule: .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/87/11.0 + :target: https://runbot.odoo-community.org/runbot/87/12.0 Bug Tracker From 07497f4ccfdd31e80c38cf0071151c3406fdb473 Mon Sep 17 00:00:00 2001 From: Jerther Date: Wed, 16 Oct 2019 09:22:48 -0400 Subject: [PATCH 20/61] [12.0] [FIX] stock_analytic: Analytic account field is in wrong page Fixes #257 --- stock_analytic/__manifest__.py | 2 +- stock_analytic/views/stock_move_views.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stock_analytic/__manifest__.py b/stock_analytic/__manifest__.py index 30480074fc..5d4ee7ba11 100644 --- a/stock_analytic/__manifest__.py +++ b/stock_analytic/__manifest__.py @@ -7,7 +7,7 @@ { "name": "Stock Analytic", "summary": "Adds an analytic account in stock move", - "version": "12.0.1.0.0", + "version": "12.0.1.0.1", "author": "Julius Network Solutions, " "ClearCorp, OpenSynergy Indonesia, " "Hibou Corp., " diff --git a/stock_analytic/views/stock_move_views.xml b/stock_analytic/views/stock_move_views.xml index dfe64eaadd..a3b8f80411 100644 --- a/stock_analytic/views/stock_move_views.xml +++ b/stock_analytic/views/stock_move_views.xml @@ -66,7 +66,7 @@ stock.picking - + From 06d4c4a5668bc22452464863809221af55555fb6 Mon Sep 17 00:00:00 2001 From: Bole Date: Wed, 13 Nov 2019 12:26:15 +0000 Subject: [PATCH 21/61] Translated using Weblate (Croatian) Currently translated at 100.0% (3 of 3 strings) Translation: account-analytic-12.0/account-analytic-12.0-stock_analytic Translate-URL: https://translation.odoo-community.org/projects/account-analytic-12-0/account-analytic-12-0-stock_analytic/hr/ --- stock_analytic/i18n/hr.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/stock_analytic/i18n/hr.po b/stock_analytic/i18n/hr.po index 110c3cfcaf..26a3c1cfca 100644 --- a/stock_analytic/i18n/hr.po +++ b/stock_analytic/i18n/hr.po @@ -9,15 +9,16 @@ msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-02-21 03:54+0000\n" -"PO-Revision-Date: 2018-02-21 03:54+0000\n" -"Last-Translator: Bole , 2018\n" +"PO-Revision-Date: 2019-11-13 14:34+0000\n" +"Last-Translator: Bole \n" "Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" "Language: hr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=" +"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 3.8\n" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id @@ -29,7 +30,7 @@ msgstr "Analitički konto" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" -msgstr "" +msgstr "Kretanja proizvoda (stavke skladišta)" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move From 37d1d0af8fe870052960b85df3ae5987892c7643 Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Wed, 20 Nov 2019 17:47:56 -0600 Subject: [PATCH 22/61] [IMP] stock_analytic: Add analytic account to scrap --- stock_analytic/__manifest__.py | 3 +- stock_analytic/i18n/ca.po | 6 +++ stock_analytic/i18n/cs_CZ.po | 6 +++ stock_analytic/i18n/de.po | 6 +++ stock_analytic/i18n/el_GR.po | 6 +++ stock_analytic/i18n/es.po | 6 +++ stock_analytic/i18n/es_EC.po | 6 +++ stock_analytic/i18n/es_MX.po | 6 +++ stock_analytic/i18n/fi.po | 6 +++ stock_analytic/i18n/fr.po | 6 +++ stock_analytic/i18n/gl.po | 6 +++ stock_analytic/i18n/gu_IN.po | 6 +++ stock_analytic/i18n/hi_IN.po | 6 +++ stock_analytic/i18n/hr.po | 10 ++++- stock_analytic/i18n/hr_HR.po | 6 +++ stock_analytic/i18n/hu.po | 6 +++ stock_analytic/i18n/it.po | 6 +++ stock_analytic/i18n/nl.po | 6 +++ stock_analytic/i18n/pt.po | 6 +++ stock_analytic/i18n/pt_BR.po | 10 ++++- stock_analytic/i18n/pt_PT.po | 6 +++ stock_analytic/i18n/ro.po | 6 +++ stock_analytic/i18n/sk_SK.po | 6 +++ stock_analytic/i18n/sl.po | 6 +++ stock_analytic/i18n/stock_analytic.pot | 6 +++ stock_analytic/i18n/tr.po | 6 +++ stock_analytic/i18n/tr_TR.po | 6 +++ stock_analytic/i18n/vi_VN.po | 6 +++ stock_analytic/i18n/zh_CN.po | 6 +++ stock_analytic/models/__init__.py | 1 + stock_analytic/models/stock_scrap.py | 19 ++++++++ stock_analytic/tests/__init__.py | 2 +- stock_analytic/tests/test_stock_scrap.py | 57 ++++++++++++++++++++++++ stock_analytic/views/stock_scrap.xml | 14 ++++++ 34 files changed, 266 insertions(+), 6 deletions(-) create mode 100644 stock_analytic/models/stock_scrap.py create mode 100644 stock_analytic/tests/test_stock_scrap.py create mode 100644 stock_analytic/views/stock_scrap.xml diff --git a/stock_analytic/__manifest__.py b/stock_analytic/__manifest__.py index 5d4ee7ba11..a033730156 100644 --- a/stock_analytic/__manifest__.py +++ b/stock_analytic/__manifest__.py @@ -7,7 +7,7 @@ { "name": "Stock Analytic", "summary": "Adds an analytic account in stock move", - "version": "12.0.1.0.1", + "version": "12.0.1.1.0", "author": "Julius Network Solutions, " "ClearCorp, OpenSynergy Indonesia, " "Hibou Corp., " @@ -21,6 +21,7 @@ ], "data": [ "views/stock_move_views.xml", + "views/stock_scrap.xml", ], 'installable': True, } diff --git a/stock_analytic/i18n/ca.po b/stock_analytic/i18n/ca.po index 33f9b3a80c..eb0f6d7519 100644 --- a/stock_analytic/i18n/ca.po +++ b/stock_analytic/i18n/ca.po @@ -22,6 +22,7 @@ msgstr "" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id #: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Compte analític" @@ -31,6 +32,11 @@ msgstr "Compte analític" msgid "Product Moves (Stock Move Line)" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_scrap +msgid "Scrap" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/cs_CZ.po b/stock_analytic/i18n/cs_CZ.po index a6d69032b9..45fadc15d9 100644 --- a/stock_analytic/i18n/cs_CZ.po +++ b/stock_analytic/i18n/cs_CZ.po @@ -22,6 +22,7 @@ msgstr "" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id #: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Analytický účet" @@ -31,6 +32,11 @@ msgstr "Analytický účet" msgid "Product Moves (Stock Move Line)" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_scrap +msgid "Scrap" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/de.po b/stock_analytic/i18n/de.po index c63320fe38..2bf1708a11 100644 --- a/stock_analytic/i18n/de.po +++ b/stock_analytic/i18n/de.po @@ -22,6 +22,7 @@ msgstr "" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id #: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Kostenstelle" @@ -31,6 +32,11 @@ msgstr "Kostenstelle" msgid "Product Moves (Stock Move Line)" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_scrap +msgid "Scrap" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/el_GR.po b/stock_analytic/i18n/el_GR.po index 04b6162724..09e47a0993 100644 --- a/stock_analytic/i18n/el_GR.po +++ b/stock_analytic/i18n/el_GR.po @@ -22,6 +22,7 @@ msgstr "" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id #: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Αναλυτικός Λογαριασμός" @@ -31,6 +32,11 @@ msgstr "Αναλυτικός Λογαριασμός" msgid "Product Moves (Stock Move Line)" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_scrap +msgid "Scrap" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/es.po b/stock_analytic/i18n/es.po index 950dc36505..8a7d6199a5 100644 --- a/stock_analytic/i18n/es.po +++ b/stock_analytic/i18n/es.po @@ -22,6 +22,7 @@ msgstr "" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id #: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Cuenta analítica" @@ -31,6 +32,11 @@ msgstr "Cuenta analítica" msgid "Product Moves (Stock Move Line)" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_scrap +msgid "Scrap" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/es_EC.po b/stock_analytic/i18n/es_EC.po index 87e808b947..357d7050fe 100644 --- a/stock_analytic/i18n/es_EC.po +++ b/stock_analytic/i18n/es_EC.po @@ -22,6 +22,7 @@ msgstr "" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id #: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Cuenta Analítica" @@ -31,6 +32,11 @@ msgstr "Cuenta Analítica" msgid "Product Moves (Stock Move Line)" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_scrap +msgid "Scrap" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/es_MX.po b/stock_analytic/i18n/es_MX.po index 8b225357d4..0eeff8d11b 100644 --- a/stock_analytic/i18n/es_MX.po +++ b/stock_analytic/i18n/es_MX.po @@ -22,6 +22,7 @@ msgstr "" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id #: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Cuenta analítica" @@ -31,6 +32,11 @@ msgstr "Cuenta analítica" msgid "Product Moves (Stock Move Line)" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_scrap +msgid "Scrap" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/fi.po b/stock_analytic/i18n/fi.po index 4e7ff7dc4d..a1fa86ca6b 100644 --- a/stock_analytic/i18n/fi.po +++ b/stock_analytic/i18n/fi.po @@ -21,6 +21,7 @@ msgstr "" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id #: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Analyyttinen tili" @@ -30,6 +31,11 @@ msgstr "Analyyttinen tili" msgid "Product Moves (Stock Move Line)" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_scrap +msgid "Scrap" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/fr.po b/stock_analytic/i18n/fr.po index 7da9df986b..6abdf746dd 100644 --- a/stock_analytic/i18n/fr.po +++ b/stock_analytic/i18n/fr.po @@ -21,6 +21,7 @@ msgstr "" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id #: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Compte analytique" @@ -30,6 +31,11 @@ msgstr "Compte analytique" msgid "Product Moves (Stock Move Line)" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_scrap +msgid "Scrap" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/gl.po b/stock_analytic/i18n/gl.po index 8c90affccf..6ae5999c9e 100644 --- a/stock_analytic/i18n/gl.po +++ b/stock_analytic/i18n/gl.po @@ -21,6 +21,7 @@ msgstr "" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id #: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Conta analítica" @@ -30,6 +31,11 @@ msgstr "Conta analítica" msgid "Product Moves (Stock Move Line)" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_scrap +msgid "Scrap" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/gu_IN.po b/stock_analytic/i18n/gu_IN.po index 9aeb4e1175..0739224e01 100644 --- a/stock_analytic/i18n/gu_IN.po +++ b/stock_analytic/i18n/gu_IN.po @@ -22,6 +22,7 @@ msgstr "" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id #: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "વિશ્લેષણાત્મક ખાતું" @@ -31,6 +32,11 @@ msgstr "વિશ્લેષણાત્મક ખાતું" msgid "Product Moves (Stock Move Line)" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_scrap +msgid "Scrap" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/hi_IN.po b/stock_analytic/i18n/hi_IN.po index 4e36b17f41..3dd84ed597 100644 --- a/stock_analytic/i18n/hi_IN.po +++ b/stock_analytic/i18n/hi_IN.po @@ -22,6 +22,7 @@ msgstr "" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id #: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "विश्लेषणात्मक खाता" @@ -31,6 +32,11 @@ msgstr "विश्लेषणात्मक खाता" msgid "Product Moves (Stock Move Line)" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_scrap +msgid "Scrap" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/hr.po b/stock_analytic/i18n/hr.po index 26a3c1cfca..81e407b302 100644 --- a/stock_analytic/i18n/hr.po +++ b/stock_analytic/i18n/hr.po @@ -16,13 +16,14 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=" -"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Weblate 3.8\n" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id #: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Analitički konto" @@ -32,6 +33,11 @@ msgstr "Analitički konto" msgid "Product Moves (Stock Move Line)" msgstr "Kretanja proizvoda (stavke skladišta)" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_scrap +msgid "Scrap" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/hr_HR.po b/stock_analytic/i18n/hr_HR.po index a4bf132ed2..f4f3d4ccec 100644 --- a/stock_analytic/i18n/hr_HR.po +++ b/stock_analytic/i18n/hr_HR.po @@ -23,6 +23,7 @@ msgstr "" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id #: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Analitički konto" @@ -32,6 +33,11 @@ msgstr "Analitički konto" msgid "Product Moves (Stock Move Line)" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_scrap +msgid "Scrap" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/hu.po b/stock_analytic/i18n/hu.po index 663867148e..ecb5b4f2be 100644 --- a/stock_analytic/i18n/hu.po +++ b/stock_analytic/i18n/hu.po @@ -21,6 +21,7 @@ msgstr "" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id #: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Analitikus gyűjtőkód könyvelés" @@ -30,6 +31,11 @@ msgstr "Analitikus gyűjtőkód könyvelés" msgid "Product Moves (Stock Move Line)" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_scrap +msgid "Scrap" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/it.po b/stock_analytic/i18n/it.po index b64eed0fce..cf828b7145 100644 --- a/stock_analytic/i18n/it.po +++ b/stock_analytic/i18n/it.po @@ -23,6 +23,7 @@ msgstr "" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id #: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Conto Analitico" @@ -32,6 +33,11 @@ msgstr "Conto Analitico" msgid "Product Moves (Stock Move Line)" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_scrap +msgid "Scrap" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/nl.po b/stock_analytic/i18n/nl.po index 8f6e1030af..023090ff69 100644 --- a/stock_analytic/i18n/nl.po +++ b/stock_analytic/i18n/nl.po @@ -21,6 +21,7 @@ msgstr "" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id #: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Kostenplaats" @@ -30,6 +31,11 @@ msgstr "Kostenplaats" msgid "Product Moves (Stock Move Line)" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_scrap +msgid "Scrap" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/pt.po b/stock_analytic/i18n/pt.po index a276f11bf7..7ead71297c 100644 --- a/stock_analytic/i18n/pt.po +++ b/stock_analytic/i18n/pt.po @@ -22,6 +22,7 @@ msgstr "" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id #: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Conta Analítica" @@ -31,6 +32,11 @@ msgstr "Conta Analítica" msgid "Product Moves (Stock Move Line)" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_scrap +msgid "Scrap" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/pt_BR.po b/stock_analytic/i18n/pt_BR.po index a7b106a36d..2fba61059b 100644 --- a/stock_analytic/i18n/pt_BR.po +++ b/stock_analytic/i18n/pt_BR.po @@ -11,8 +11,8 @@ msgstr "" "POT-Creation-Date: 2017-11-19 22:13+0000\n" "PO-Revision-Date: 2019-08-02 09:43+0000\n" "Last-Translator: Marcel Savegnago \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" @@ -23,6 +23,7 @@ msgstr "" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id #: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Conta analítica" @@ -32,6 +33,11 @@ msgstr "Conta analítica" msgid "Product Moves (Stock Move Line)" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_scrap +msgid "Scrap" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/pt_PT.po b/stock_analytic/i18n/pt_PT.po index 2a2742272a..4dd949bac5 100644 --- a/stock_analytic/i18n/pt_PT.po +++ b/stock_analytic/i18n/pt_PT.po @@ -22,6 +22,7 @@ msgstr "" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id #: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Conta Analítica" @@ -31,6 +32,11 @@ msgstr "Conta Analítica" msgid "Product Moves (Stock Move Line)" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_scrap +msgid "Scrap" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/ro.po b/stock_analytic/i18n/ro.po index e1135ecf4a..9b390d5049 100644 --- a/stock_analytic/i18n/ro.po +++ b/stock_analytic/i18n/ro.po @@ -23,6 +23,7 @@ msgstr "" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id #: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Cont analitic" @@ -32,6 +33,11 @@ msgstr "Cont analitic" msgid "Product Moves (Stock Move Line)" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_scrap +msgid "Scrap" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/sk_SK.po b/stock_analytic/i18n/sk_SK.po index dda8b7027b..a3edcd3d57 100644 --- a/stock_analytic/i18n/sk_SK.po +++ b/stock_analytic/i18n/sk_SK.po @@ -22,6 +22,7 @@ msgstr "" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id #: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Analytický účet" @@ -31,6 +32,11 @@ msgstr "Analytický účet" msgid "Product Moves (Stock Move Line)" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_scrap +msgid "Scrap" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/sl.po b/stock_analytic/i18n/sl.po index d7f5a64ca8..aa2af7cb6b 100644 --- a/stock_analytic/i18n/sl.po +++ b/stock_analytic/i18n/sl.po @@ -22,6 +22,7 @@ msgstr "" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id #: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "Analitični konto" @@ -31,6 +32,11 @@ msgstr "Analitični konto" msgid "Product Moves (Stock Move Line)" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_scrap +msgid "Scrap" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/stock_analytic.pot b/stock_analytic/i18n/stock_analytic.pot index 7869ce27bb..de645bffd7 100644 --- a/stock_analytic/i18n/stock_analytic.pot +++ b/stock_analytic/i18n/stock_analytic.pot @@ -16,6 +16,7 @@ msgstr "" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id #: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "" @@ -25,6 +26,11 @@ msgstr "" msgid "Product Moves (Stock Move Line)" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_scrap +msgid "Scrap" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/tr.po b/stock_analytic/i18n/tr.po index 33cb6dd581..307de05831 100644 --- a/stock_analytic/i18n/tr.po +++ b/stock_analytic/i18n/tr.po @@ -21,6 +21,7 @@ msgstr "" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id #: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "" @@ -30,6 +31,11 @@ msgstr "" msgid "Product Moves (Stock Move Line)" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_scrap +msgid "Scrap" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/tr_TR.po b/stock_analytic/i18n/tr_TR.po index 2a87391fb5..b7d796f460 100644 --- a/stock_analytic/i18n/tr_TR.po +++ b/stock_analytic/i18n/tr_TR.po @@ -22,6 +22,7 @@ msgstr "" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id #: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "" @@ -31,6 +32,11 @@ msgstr "" msgid "Product Moves (Stock Move Line)" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_scrap +msgid "Scrap" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/vi_VN.po b/stock_analytic/i18n/vi_VN.po index 100a5a2aa7..3ea383a3e4 100644 --- a/stock_analytic/i18n/vi_VN.po +++ b/stock_analytic/i18n/vi_VN.po @@ -22,6 +22,7 @@ msgstr "" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id #: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "" @@ -31,6 +32,11 @@ msgstr "" msgid "Product Moves (Stock Move Line)" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_scrap +msgid "Scrap" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/i18n/zh_CN.po b/stock_analytic/i18n/zh_CN.po index 437c34fe8d..c6f47f4430 100644 --- a/stock_analytic/i18n/zh_CN.po +++ b/stock_analytic/i18n/zh_CN.po @@ -22,6 +22,7 @@ msgstr "" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id #: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic msgid "Analytic Account" msgstr "核算科目" @@ -31,6 +32,11 @@ msgstr "核算科目" msgid "Product Moves (Stock Move Line)" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_scrap +msgid "Scrap" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" diff --git a/stock_analytic/models/__init__.py b/stock_analytic/models/__init__.py index ece5455940..bb813c10f7 100644 --- a/stock_analytic/models/__init__.py +++ b/stock_analytic/models/__init__.py @@ -1,3 +1,4 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import stock +from . import stock_scrap diff --git a/stock_analytic/models/stock_scrap.py b/stock_analytic/models/stock_scrap.py new file mode 100644 index 0000000000..1afe118408 --- /dev/null +++ b/stock_analytic/models/stock_scrap.py @@ -0,0 +1,19 @@ +# Copyright (C) 2019 Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from odoo import api, fields, models + + +class StockScrap(models.Model): + _inherit = "stock.scrap" + + analytic_account_id = fields.Many2one( + string='Analytic Account', + comodel_name='account.analytic.account') + + @api.multi + def _prepare_move_values(self): + res = super()._prepare_move_values() + res.update({ + 'analytic_account_id': self.analytic_account_id.id, + }) + return res diff --git a/stock_analytic/tests/__init__.py b/stock_analytic/tests/__init__.py index bffaf7cf28..e54d8f6e4f 100644 --- a/stock_analytic/tests/__init__.py +++ b/stock_analytic/tests/__init__.py @@ -1,3 +1,3 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - from . import test_stock_picking +from . import test_stock_scrap diff --git a/stock_analytic/tests/test_stock_scrap.py b/stock_analytic/tests/test_stock_scrap.py new file mode 100644 index 0000000000..aabbd8ebce --- /dev/null +++ b/stock_analytic/tests/test_stock_scrap.py @@ -0,0 +1,57 @@ +# Copyright (C) 2019 Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from odoo.tests.common import TransactionCase + + +class TestStockScrap(TransactionCase): + + def setUp(self): + super(TestStockScrap, self).setUp() + + self.product = self.env.ref('product.product_product_4') + self.warehouse = self.env.ref('stock.warehouse0') + self.location = self.warehouse.lot_stock_id + self.analytic_account = self.env.ref( + 'analytic.analytic_agrolait') + + def __update_qty_on_hand_product(self, product, new_qty): + qty_wizard = self.env['stock.change.product.qty'].create({ + 'product_id': product.id, + 'new_quantity': new_qty + }) + qty_wizard.change_product_qty() + + def _create_scrap(self, analytic_account_id=False): + scrap_data = { + 'product_id': self.product.id, + 'scrap_qty': 1.00, + 'product_uom_id': self.product.uom_id.id, + 'location_id': self.location.id, + 'analytic_account_id': + analytic_account_id and analytic_account_id.id or False + } + return self.env['stock.scrap'].create(scrap_data) + + def _validate_scrap_no_error(self, scrap): + scrap.action_validate() + self.assertEqual(scrap.state, 'done') + + def _check_analytic_account_no_error(self, scrap): + domain = [('name', '=', scrap.name)] + acc_lines = self.env['account.move.line'].search(domain) + for acc_line in acc_lines: + if acc_line.account_id != scrap.product_id.categ_id.\ + property_stock_valuation_account_id: + self.assertEqual(acc_line.analytic_account_id.id, + scrap.analytic_account_id.id) + + def test_scrap_without_analytic(self): + self.__update_qty_on_hand_product(self.product, 1) + scrap = self._create_scrap() + self._validate_scrap_no_error(scrap) + + def test_scrap_with_analytic(self): + self.__update_qty_on_hand_product(self.product, 1) + scrap = self._create_scrap(self.analytic_account) + self._validate_scrap_no_error(scrap) + self._check_analytic_account_no_error(scrap) diff --git a/stock_analytic/views/stock_scrap.xml b/stock_analytic/views/stock_scrap.xml new file mode 100644 index 0000000000..6fedd5364f --- /dev/null +++ b/stock_analytic/views/stock_scrap.xml @@ -0,0 +1,14 @@ + + + + stock.scrap.analytic.form + stock.scrap + + + + + + + + + From 7330780bfb949a5a38c9b285d5074f1eb37a1adc Mon Sep 17 00:00:00 2001 From: Maria Sparenberg Date: Wed, 29 Jan 2020 08:49:01 +0000 Subject: [PATCH 23/61] Translated using Weblate (German) Currently translated at 100.0% (4 of 4 strings) Translation: account-analytic-12.0/account-analytic-12.0-stock_analytic Translate-URL: https://translation.odoo-community.org/projects/account-analytic-12-0/account-analytic-12-0-stock_analytic/de/ --- stock_analytic/i18n/de.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/stock_analytic/i18n/de.po b/stock_analytic/i18n/de.po index 2bf1708a11..c31cdb6a56 100644 --- a/stock_analytic/i18n/de.po +++ b/stock_analytic/i18n/de.po @@ -9,15 +9,15 @@ msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-11-19 22:13+0000\n" -"PO-Revision-Date: 2019-01-21 16:41+0000\n" -"Last-Translator: Rudolf Schnapka \n" +"PO-Revision-Date: 2020-01-29 11:13+0000\n" +"Last-Translator: Maria Sparenberg \n" "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.3\n" +"X-Generator: Weblate 3.10\n" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id @@ -30,14 +30,14 @@ msgstr "Kostenstelle" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" -msgstr "" +msgstr "Produkt-Lagerbewegungen" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_scrap msgid "Scrap" -msgstr "" +msgstr "Ausschuss" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" -msgstr "Bestandsbuchung" +msgstr "Lagerbewegung" From e877e12dacfa19356d0c70c819c54c5a0dab51b6 Mon Sep 17 00:00:00 2001 From: alvarorib Date: Tue, 18 Feb 2020 15:28:54 +0000 Subject: [PATCH 24/61] Translated using Weblate (Portuguese) Currently translated at 100.0% (4 of 4 strings) Translation: account-analytic-12.0/account-analytic-12.0-stock_analytic Translate-URL: https://translation.odoo-community.org/projects/account-analytic-12-0/account-analytic-12-0-stock_analytic/pt/ --- stock_analytic/i18n/pt.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/stock_analytic/i18n/pt.po b/stock_analytic/i18n/pt.po index 7ead71297c..dafe304cbb 100644 --- a/stock_analytic/i18n/pt.po +++ b/stock_analytic/i18n/pt.po @@ -10,14 +10,15 @@ msgstr "" "Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-12-16 03:41+0000\n" -"PO-Revision-Date: 2016-12-16 03:41+0000\n" -"Last-Translator: OCA Transbot , 2016\n" +"PO-Revision-Date: 2020-02-18 17:13+0000\n" +"Last-Translator: alvarorib \n" "Language-Team: Portuguese (https://www.transifex.com/oca/teams/23907/pt/)\n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Weblate 3.10\n" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id @@ -30,12 +31,12 @@ msgstr "Conta Analítica" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" -msgstr "" +msgstr "Movimento de Artigo (Linha de Movimento de Stock)" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_scrap msgid "Scrap" -msgstr "" +msgstr "Sucata" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move From e7cc6ac554c5f1688dbc67af3d97935b8116af93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20P=C3=A9rez=20Ruth?= Date: Mon, 2 Mar 2020 19:47:51 +0000 Subject: [PATCH 25/61] Translated using Weblate (Spanish) Currently translated at 100.0% (4 of 4 strings) Translation: account-analytic-12.0/account-analytic-12.0-stock_analytic Translate-URL: https://translation.odoo-community.org/projects/account-analytic-12-0/account-analytic-12-0-stock_analytic/es/ --- stock_analytic/i18n/es.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/stock_analytic/i18n/es.po b/stock_analytic/i18n/es.po index 8a7d6199a5..247aee0c48 100644 --- a/stock_analytic/i18n/es.po +++ b/stock_analytic/i18n/es.po @@ -10,14 +10,15 @@ msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-02-21 03:54+0000\n" -"PO-Revision-Date: 2018-02-21 03:54+0000\n" -"Last-Translator: enjolras , 2018\n" +"PO-Revision-Date: 2020-03-02 22:13+0000\n" +"Last-Translator: Antonio Pérez Ruth \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" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 3.10\n" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id @@ -30,12 +31,12 @@ msgstr "Cuenta analítica" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" -msgstr "" +msgstr "Movimiento de productos (Movimiento de existencias)" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_scrap msgid "Scrap" -msgstr "" +msgstr "Restos" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move From 5f24b9f0ce1813e32f23be3f2e2b2ead26fbf756 Mon Sep 17 00:00:00 2001 From: Cas Vissers Date: Tue, 4 Feb 2020 12:45:44 +0100 Subject: [PATCH 26/61] [FIX] Apply analytic account on COGS account when booking customer invoice --- stock_analytic/__manifest__.py | 2 +- stock_analytic/i18n/ca.po | 5 ++++ stock_analytic/i18n/cs_CZ.po | 5 ++++ stock_analytic/i18n/de.po | 5 ++++ stock_analytic/i18n/el_GR.po | 5 ++++ stock_analytic/i18n/es.po | 5 ++++ stock_analytic/i18n/es_EC.po | 5 ++++ stock_analytic/i18n/es_MX.po | 5 ++++ stock_analytic/i18n/fi.po | 5 ++++ stock_analytic/i18n/fr.po | 5 ++++ stock_analytic/i18n/gl.po | 5 ++++ stock_analytic/i18n/gu_IN.po | 5 ++++ stock_analytic/i18n/hi_IN.po | 5 ++++ stock_analytic/i18n/hr.po | 5 ++++ stock_analytic/i18n/hr_HR.po | 5 ++++ stock_analytic/i18n/hu.po | 5 ++++ stock_analytic/i18n/it.po | 5 ++++ stock_analytic/i18n/nl.po | 5 ++++ stock_analytic/i18n/pt.po | 5 ++++ stock_analytic/i18n/pt_BR.po | 5 ++++ stock_analytic/i18n/pt_PT.po | 5 ++++ stock_analytic/i18n/ro.po | 5 ++++ stock_analytic/i18n/sk_SK.po | 5 ++++ stock_analytic/i18n/sl.po | 5 ++++ stock_analytic/i18n/stock_analytic.pot | 5 ++++ stock_analytic/i18n/tr.po | 5 ++++ stock_analytic/i18n/tr_TR.po | 5 ++++ stock_analytic/i18n/vi_VN.po | 5 ++++ stock_analytic/i18n/zh_CN.po | 5 ++++ stock_analytic/models/__init__.py | 1 + stock_analytic/models/product_product.py | 34 ++++++++++++++++++++++++ 31 files changed, 176 insertions(+), 1 deletion(-) create mode 100644 stock_analytic/models/product_product.py diff --git a/stock_analytic/__manifest__.py b/stock_analytic/__manifest__.py index a033730156..a3f99dbca8 100644 --- a/stock_analytic/__manifest__.py +++ b/stock_analytic/__manifest__.py @@ -7,7 +7,7 @@ { "name": "Stock Analytic", "summary": "Adds an analytic account in stock move", - "version": "12.0.1.1.0", + "version": "12.0.1.1.1", "author": "Julius Network Solutions, " "ClearCorp, OpenSynergy Indonesia, " "Hibou Corp., " diff --git a/stock_analytic/i18n/ca.po b/stock_analytic/i18n/ca.po index eb0f6d7519..26c3707e14 100644 --- a/stock_analytic/i18n/ca.po +++ b/stock_analytic/i18n/ca.po @@ -27,6 +27,11 @@ msgstr "" msgid "Analytic Account" msgstr "Compte analític" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_product_product +msgid "Product" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" diff --git a/stock_analytic/i18n/cs_CZ.po b/stock_analytic/i18n/cs_CZ.po index 45fadc15d9..01886079ba 100644 --- a/stock_analytic/i18n/cs_CZ.po +++ b/stock_analytic/i18n/cs_CZ.po @@ -27,6 +27,11 @@ msgstr "" msgid "Analytic Account" msgstr "Analytický účet" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_product_product +msgid "Product" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" diff --git a/stock_analytic/i18n/de.po b/stock_analytic/i18n/de.po index c31cdb6a56..3599322af1 100644 --- a/stock_analytic/i18n/de.po +++ b/stock_analytic/i18n/de.po @@ -27,6 +27,11 @@ msgstr "" msgid "Analytic Account" msgstr "Kostenstelle" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_product_product +msgid "Product" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" diff --git a/stock_analytic/i18n/el_GR.po b/stock_analytic/i18n/el_GR.po index 09e47a0993..a3a2c83c1b 100644 --- a/stock_analytic/i18n/el_GR.po +++ b/stock_analytic/i18n/el_GR.po @@ -27,6 +27,11 @@ msgstr "" msgid "Analytic Account" msgstr "Αναλυτικός Λογαριασμός" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_product_product +msgid "Product" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" diff --git a/stock_analytic/i18n/es.po b/stock_analytic/i18n/es.po index 247aee0c48..af3e5bcf68 100644 --- a/stock_analytic/i18n/es.po +++ b/stock_analytic/i18n/es.po @@ -28,6 +28,11 @@ msgstr "" msgid "Analytic Account" msgstr "Cuenta analítica" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_product_product +msgid "Product" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" diff --git a/stock_analytic/i18n/es_EC.po b/stock_analytic/i18n/es_EC.po index 357d7050fe..09252152c9 100644 --- a/stock_analytic/i18n/es_EC.po +++ b/stock_analytic/i18n/es_EC.po @@ -27,6 +27,11 @@ msgstr "" msgid "Analytic Account" msgstr "Cuenta Analítica" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_product_product +msgid "Product" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" diff --git a/stock_analytic/i18n/es_MX.po b/stock_analytic/i18n/es_MX.po index 0eeff8d11b..d91c18e7c6 100644 --- a/stock_analytic/i18n/es_MX.po +++ b/stock_analytic/i18n/es_MX.po @@ -27,6 +27,11 @@ msgstr "" msgid "Analytic Account" msgstr "Cuenta analítica" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_product_product +msgid "Product" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" diff --git a/stock_analytic/i18n/fi.po b/stock_analytic/i18n/fi.po index a1fa86ca6b..7a15c7a3ee 100644 --- a/stock_analytic/i18n/fi.po +++ b/stock_analytic/i18n/fi.po @@ -26,6 +26,11 @@ msgstr "" msgid "Analytic Account" msgstr "Analyyttinen tili" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_product_product +msgid "Product" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" diff --git a/stock_analytic/i18n/fr.po b/stock_analytic/i18n/fr.po index 6abdf746dd..1165d0bb4b 100644 --- a/stock_analytic/i18n/fr.po +++ b/stock_analytic/i18n/fr.po @@ -26,6 +26,11 @@ msgstr "" msgid "Analytic Account" msgstr "Compte analytique" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_product_product +msgid "Product" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" diff --git a/stock_analytic/i18n/gl.po b/stock_analytic/i18n/gl.po index 6ae5999c9e..e6cd4a0c5f 100644 --- a/stock_analytic/i18n/gl.po +++ b/stock_analytic/i18n/gl.po @@ -26,6 +26,11 @@ msgstr "" msgid "Analytic Account" msgstr "Conta analítica" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_product_product +msgid "Product" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" diff --git a/stock_analytic/i18n/gu_IN.po b/stock_analytic/i18n/gu_IN.po index 0739224e01..5908a324a0 100644 --- a/stock_analytic/i18n/gu_IN.po +++ b/stock_analytic/i18n/gu_IN.po @@ -27,6 +27,11 @@ msgstr "" msgid "Analytic Account" msgstr "વિશ્લેષણાત્મક ખાતું" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_product_product +msgid "Product" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" diff --git a/stock_analytic/i18n/hi_IN.po b/stock_analytic/i18n/hi_IN.po index 3dd84ed597..95d7d0cc31 100644 --- a/stock_analytic/i18n/hi_IN.po +++ b/stock_analytic/i18n/hi_IN.po @@ -27,6 +27,11 @@ msgstr "" msgid "Analytic Account" msgstr "विश्लेषणात्मक खाता" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_product_product +msgid "Product" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" diff --git a/stock_analytic/i18n/hr.po b/stock_analytic/i18n/hr.po index 81e407b302..5d49d688d9 100644 --- a/stock_analytic/i18n/hr.po +++ b/stock_analytic/i18n/hr.po @@ -28,6 +28,11 @@ msgstr "" msgid "Analytic Account" msgstr "Analitički konto" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_product_product +msgid "Product" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" diff --git a/stock_analytic/i18n/hr_HR.po b/stock_analytic/i18n/hr_HR.po index f4f3d4ccec..e389c295bf 100644 --- a/stock_analytic/i18n/hr_HR.po +++ b/stock_analytic/i18n/hr_HR.po @@ -28,6 +28,11 @@ msgstr "" msgid "Analytic Account" msgstr "Analitički konto" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_product_product +msgid "Product" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" diff --git a/stock_analytic/i18n/hu.po b/stock_analytic/i18n/hu.po index ecb5b4f2be..0177f789b5 100644 --- a/stock_analytic/i18n/hu.po +++ b/stock_analytic/i18n/hu.po @@ -26,6 +26,11 @@ msgstr "" msgid "Analytic Account" msgstr "Analitikus gyűjtőkód könyvelés" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_product_product +msgid "Product" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" diff --git a/stock_analytic/i18n/it.po b/stock_analytic/i18n/it.po index cf828b7145..1f1379a26f 100644 --- a/stock_analytic/i18n/it.po +++ b/stock_analytic/i18n/it.po @@ -28,6 +28,11 @@ msgstr "" msgid "Analytic Account" msgstr "Conto Analitico" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_product_product +msgid "Product" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" diff --git a/stock_analytic/i18n/nl.po b/stock_analytic/i18n/nl.po index 023090ff69..4e6fc562ab 100644 --- a/stock_analytic/i18n/nl.po +++ b/stock_analytic/i18n/nl.po @@ -26,6 +26,11 @@ msgstr "" msgid "Analytic Account" msgstr "Kostenplaats" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_product_product +msgid "Product" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" diff --git a/stock_analytic/i18n/pt.po b/stock_analytic/i18n/pt.po index dafe304cbb..9cf9a9c372 100644 --- a/stock_analytic/i18n/pt.po +++ b/stock_analytic/i18n/pt.po @@ -28,6 +28,11 @@ msgstr "" msgid "Analytic Account" msgstr "Conta Analítica" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_product_product +msgid "Product" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" diff --git a/stock_analytic/i18n/pt_BR.po b/stock_analytic/i18n/pt_BR.po index 2fba61059b..3c700be84f 100644 --- a/stock_analytic/i18n/pt_BR.po +++ b/stock_analytic/i18n/pt_BR.po @@ -28,6 +28,11 @@ msgstr "" msgid "Analytic Account" msgstr "Conta analítica" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_product_product +msgid "Product" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" diff --git a/stock_analytic/i18n/pt_PT.po b/stock_analytic/i18n/pt_PT.po index 4dd949bac5..3e0c1056f7 100644 --- a/stock_analytic/i18n/pt_PT.po +++ b/stock_analytic/i18n/pt_PT.po @@ -27,6 +27,11 @@ msgstr "" msgid "Analytic Account" msgstr "Conta Analítica" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_product_product +msgid "Product" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" diff --git a/stock_analytic/i18n/ro.po b/stock_analytic/i18n/ro.po index 9b390d5049..28de44d712 100644 --- a/stock_analytic/i18n/ro.po +++ b/stock_analytic/i18n/ro.po @@ -28,6 +28,11 @@ msgstr "" msgid "Analytic Account" msgstr "Cont analitic" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_product_product +msgid "Product" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" diff --git a/stock_analytic/i18n/sk_SK.po b/stock_analytic/i18n/sk_SK.po index a3edcd3d57..531ef3b8a6 100644 --- a/stock_analytic/i18n/sk_SK.po +++ b/stock_analytic/i18n/sk_SK.po @@ -27,6 +27,11 @@ msgstr "" msgid "Analytic Account" msgstr "Analytický účet" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_product_product +msgid "Product" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" diff --git a/stock_analytic/i18n/sl.po b/stock_analytic/i18n/sl.po index aa2af7cb6b..904bbb613e 100644 --- a/stock_analytic/i18n/sl.po +++ b/stock_analytic/i18n/sl.po @@ -27,6 +27,11 @@ msgstr "" msgid "Analytic Account" msgstr "Analitični konto" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_product_product +msgid "Product" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" diff --git a/stock_analytic/i18n/stock_analytic.pot b/stock_analytic/i18n/stock_analytic.pot index de645bffd7..da76517586 100644 --- a/stock_analytic/i18n/stock_analytic.pot +++ b/stock_analytic/i18n/stock_analytic.pot @@ -21,6 +21,11 @@ msgstr "" msgid "Analytic Account" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_product_product +msgid "Product" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" diff --git a/stock_analytic/i18n/tr.po b/stock_analytic/i18n/tr.po index 307de05831..2f200d30ca 100644 --- a/stock_analytic/i18n/tr.po +++ b/stock_analytic/i18n/tr.po @@ -26,6 +26,11 @@ msgstr "" msgid "Analytic Account" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_product_product +msgid "Product" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" diff --git a/stock_analytic/i18n/tr_TR.po b/stock_analytic/i18n/tr_TR.po index b7d796f460..d6938d69eb 100644 --- a/stock_analytic/i18n/tr_TR.po +++ b/stock_analytic/i18n/tr_TR.po @@ -27,6 +27,11 @@ msgstr "" msgid "Analytic Account" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_product_product +msgid "Product" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" diff --git a/stock_analytic/i18n/vi_VN.po b/stock_analytic/i18n/vi_VN.po index 3ea383a3e4..6d77a6f0fd 100644 --- a/stock_analytic/i18n/vi_VN.po +++ b/stock_analytic/i18n/vi_VN.po @@ -27,6 +27,11 @@ msgstr "" msgid "Analytic Account" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_product_product +msgid "Product" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" diff --git a/stock_analytic/i18n/zh_CN.po b/stock_analytic/i18n/zh_CN.po index c6f47f4430..030152fcd9 100644 --- a/stock_analytic/i18n/zh_CN.po +++ b/stock_analytic/i18n/zh_CN.po @@ -27,6 +27,11 @@ msgstr "" msgid "Analytic Account" msgstr "核算科目" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_product_product +msgid "Product" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" diff --git a/stock_analytic/models/__init__.py b/stock_analytic/models/__init__.py index bb813c10f7..38a3841dab 100644 --- a/stock_analytic/models/__init__.py +++ b/stock_analytic/models/__init__.py @@ -1,4 +1,5 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from . import product_product from . import stock from . import stock_scrap diff --git a/stock_analytic/models/product_product.py b/stock_analytic/models/product_product.py new file mode 100644 index 0000000000..fd4ee90037 --- /dev/null +++ b/stock_analytic/models/product_product.py @@ -0,0 +1,34 @@ +# Copyright (C) 2020 Brahoo +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import api, models + + +class ProductProduct(models.Model): + _inherit = "product.product" + + @api.model + def _anglo_saxon_sale_move_lines(self, name, product, uom, qty, price_unit, + currency=False, amount_currency=False, + fiscal_position=False, + account_analytic=False, + analytic_tags=False): + res = super()._anglo_saxon_sale_move_lines( + name, + product, + uom, + qty, + price_unit, + currency=currency, + amount_currency=amount_currency, + fiscal_position=fiscal_position, + account_analytic=account_analytic, + analytic_tags=analytic_tags, + ) + if res: + res[0]['account_analytic_id'] = \ + account_analytic and account_analytic.id + res[0]['analytic_tag_ids'] = \ + analytic_tags and analytic_tags.ids and \ + [(6, 0, analytic_tags.ids)] or False + return res From c3a081c29c597c4943cbe0d66df4df3f79824499 Mon Sep 17 00:00:00 2001 From: "jim.hoefnagels" Date: Tue, 24 Mar 2020 08:19:14 +0100 Subject: [PATCH 27/61] [IMP] stock_analytic: black, isort --- stock_analytic/__manifest__.py | 18 +- stock_analytic/models/product_product.py | 30 ++-- stock_analytic/models/stock.py | 28 ++-- stock_analytic/models/stock_scrap.py | 10 +- stock_analytic/tests/test_stock_picking.py | 185 ++++++++++----------- stock_analytic/tests/test_stock_scrap.py | 47 +++--- stock_analytic/views/stock_move_views.xml | 50 +++--- stock_analytic/views/stock_scrap.xml | 6 +- 8 files changed, 191 insertions(+), 183 deletions(-) diff --git a/stock_analytic/__manifest__.py b/stock_analytic/__manifest__.py index a3f99dbca8..4122507ab7 100644 --- a/stock_analytic/__manifest__.py +++ b/stock_analytic/__manifest__.py @@ -9,19 +9,13 @@ "summary": "Adds an analytic account in stock move", "version": "12.0.1.1.1", "author": "Julius Network Solutions, " - "ClearCorp, OpenSynergy Indonesia, " - "Hibou Corp., " - "Odoo Community Association (OCA)", + "ClearCorp, OpenSynergy Indonesia, " + "Hibou Corp., " + "Odoo Community Association (OCA)", "website": "https://github.com/OCA/account-analytic", "category": "Warehouse Management", "license": "AGPL-3", - "depends": [ - "stock_account", - "analytic", - ], - "data": [ - "views/stock_move_views.xml", - "views/stock_scrap.xml", - ], - 'installable': True, + "depends": ["stock_account", "analytic",], + "data": ["views/stock_move_views.xml", "views/stock_scrap.xml",], + "installable": True, } diff --git a/stock_analytic/models/product_product.py b/stock_analytic/models/product_product.py index fd4ee90037..e0139c5222 100644 --- a/stock_analytic/models/product_product.py +++ b/stock_analytic/models/product_product.py @@ -8,11 +8,19 @@ class ProductProduct(models.Model): _inherit = "product.product" @api.model - def _anglo_saxon_sale_move_lines(self, name, product, uom, qty, price_unit, - currency=False, amount_currency=False, - fiscal_position=False, - account_analytic=False, - analytic_tags=False): + def _anglo_saxon_sale_move_lines( + self, + name, + product, + uom, + qty, + price_unit, + currency=False, + amount_currency=False, + fiscal_position=False, + account_analytic=False, + analytic_tags=False, + ): res = super()._anglo_saxon_sale_move_lines( name, product, @@ -26,9 +34,11 @@ def _anglo_saxon_sale_move_lines(self, name, product, uom, qty, price_unit, analytic_tags=analytic_tags, ) if res: - res[0]['account_analytic_id'] = \ - account_analytic and account_analytic.id - res[0]['analytic_tag_ids'] = \ - analytic_tags and analytic_tags.ids and \ - [(6, 0, analytic_tags.ids)] or False + res[0]["account_analytic_id"] = account_analytic and account_analytic.id + res[0]["analytic_tag_ids"] = ( + analytic_tags + and analytic_tags.ids + and [(6, 0, analytic_tags.ids)] + or False + ) return res diff --git a/stock_analytic/models/stock.py b/stock_analytic/models/stock.py index 7e25ee7a55..18eb9e9cab 100644 --- a/stock_analytic/models/stock.py +++ b/stock_analytic/models/stock.py @@ -5,38 +5,40 @@ # Copyright 2018 Hibou Corp. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo import fields, models, api +from odoo import api, fields, models class StockMove(models.Model): _inherit = "stock.move" analytic_account_id = fields.Many2one( - string='Analytic Account', - comodel_name='account.analytic.account', + string="Analytic Account", comodel_name="account.analytic.account", ) @api.multi - def _prepare_account_move_line(self, qty, cost, - credit_account_id, debit_account_id): + def _prepare_account_move_line( + self, qty, cost, credit_account_id, debit_account_id + ): self.ensure_one() res = super(StockMove, self)._prepare_account_move_line( - qty, cost, credit_account_id, debit_account_id) + qty, cost, credit_account_id, debit_account_id + ) # Add analytic account in debit line if not self.analytic_account_id or not res: return res for num in range(0, 2): - if res[num][2]["account_id"] != self.product_id.\ - categ_id.property_stock_valuation_account_id.id: - res[num][2].update({ - 'analytic_account_id': self.analytic_account_id.id, - }) + if ( + res[num][2]["account_id"] + != self.product_id.categ_id.property_stock_valuation_account_id.id + ): + res[num][2].update( + {"analytic_account_id": self.analytic_account_id.id,} + ) return res class StockMoveLine(models.Model): _inherit = "stock.move.line" - analytic_account_id = fields.Many2one( - related='move_id.analytic_account_id') + analytic_account_id = fields.Many2one(related="move_id.analytic_account_id") diff --git a/stock_analytic/models/stock_scrap.py b/stock_analytic/models/stock_scrap.py index 1afe118408..d3e5c8d219 100644 --- a/stock_analytic/models/stock_scrap.py +++ b/stock_analytic/models/stock_scrap.py @@ -7,13 +7,13 @@ class StockScrap(models.Model): _inherit = "stock.scrap" analytic_account_id = fields.Many2one( - string='Analytic Account', - comodel_name='account.analytic.account') + string="Analytic Account", comodel_name="account.analytic.account" + ) @api.multi def _prepare_move_values(self): res = super()._prepare_move_values() - res.update({ - 'analytic_account_id': self.analytic_account_id.id, - }) + res.update( + {"analytic_account_id": self.analytic_account_id.id,} + ) return res diff --git a/stock_analytic/tests/test_stock_picking.py b/stock_analytic/tests/test_stock_picking.py index b4471c008a..3f77a59e75 100644 --- a/stock_analytic/tests/test_stock_picking.py +++ b/stock_analytic/tests/test_stock_picking.py @@ -5,147 +5,146 @@ # Copyright 2018 Hibou Corp. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo.tests.common import TransactionCase from datetime import datetime +from odoo.tests.common import TransactionCase -class TestStockPicking(TransactionCase): +class TestStockPicking(TransactionCase): def setUp(self): super(TestStockPicking, self).setUp() - self.product = self.env.ref('product.product_product_4') - self.product_categ = self.env.ref('product.product_category_5') - self.valuation_account = self.env['account.account'].create({ - 'name': 'Test stock valuation', - 'code': 'tv', - 'user_type_id': - self.env['account.account.type'].search( - [], limit=1).id, - 'reconcile': True, - 'company_id': self.env.ref('base.main_company').id, - }) - self.stock_input_account = self.env['account.account'].create({ - 'name': 'Test stock input', - 'code': 'tsti', - 'user_type_id': - self.env['account.account.type'].search( - [], limit=1).id, - 'reconcile': True, - 'company_id': self.env.ref('base.main_company').id, - }) - self.stock_output_account = self.env['account.account'].create({ - 'name': 'Test stock output', - 'code': 'tout', - 'user_type_id': - self.env['account.account.type'].search( - [], limit=1).id, - 'reconcile': True, - 'company_id': self.env.ref('base.main_company').id, - }) - self.analytic_account = self.env.ref( - 'analytic.analytic_agrolait') - self.warehouse = self.env.ref('stock.warehouse0') + self.product = self.env.ref("product.product_product_4") + self.product_categ = self.env.ref("product.product_category_5") + self.valuation_account = self.env["account.account"].create( + { + "name": "Test stock valuation", + "code": "tv", + "user_type_id": self.env["account.account.type"].search([], limit=1).id, + "reconcile": True, + "company_id": self.env.ref("base.main_company").id, + } + ) + self.stock_input_account = self.env["account.account"].create( + { + "name": "Test stock input", + "code": "tsti", + "user_type_id": self.env["account.account.type"].search([], limit=1).id, + "reconcile": True, + "company_id": self.env.ref("base.main_company").id, + } + ) + self.stock_output_account = self.env["account.account"].create( + { + "name": "Test stock output", + "code": "tout", + "user_type_id": self.env["account.account.type"].search([], limit=1).id, + "reconcile": True, + "company_id": self.env.ref("base.main_company").id, + } + ) + self.analytic_account = self.env.ref("analytic.analytic_agrolait") + self.warehouse = self.env.ref("stock.warehouse0") self.location = self.warehouse.lot_stock_id - self.dest_location = self.env.ref('stock.stock_location_customers') - self.outgoing_picking_type = self.env.ref('stock.picking_type_out') - self.incoming_picking_type = self.env.ref('stock.picking_type_in') - - self.product_categ.update({ - 'property_valuation': 'real_time', - 'property_stock_valuation_account_id': self.valuation_account.id, - 'property_stock_account_input_categ_id': - self.stock_input_account.id, - 'property_stock_account_output_categ_id': - self.stock_output_account.id, - }) - self.product.update({ - 'categ_id': self.product_categ.id, - }) + self.dest_location = self.env.ref("stock.stock_location_customers") + self.outgoing_picking_type = self.env.ref("stock.picking_type_out") + self.incoming_picking_type = self.env.ref("stock.picking_type_in") + + self.product_categ.update( + { + "property_valuation": "real_time", + "property_stock_valuation_account_id": self.valuation_account.id, + "property_stock_account_input_categ_id": self.stock_input_account.id, + "property_stock_account_output_categ_id": self.stock_output_account.id, + } + ) + self.product.update( + {"categ_id": self.product_categ.id,} + ) def _create_picking( - self, location_id, location_dest_id, - picking_type_id, analytic_account_id=False): + self, location_id, location_dest_id, picking_type_id, analytic_account_id=False + ): picking_data = { - 'picking_type_id': picking_type_id.id, - 'move_type': 'direct', - 'location_id': location_id.id, - 'location_dest_id': location_dest_id.id, + "picking_type_id": picking_type_id.id, + "move_type": "direct", + "location_id": location_id.id, + "location_dest_id": location_dest_id.id, } - picking = self.env['stock.picking'].create(picking_data) + picking = self.env["stock.picking"].create(picking_data) move_data = { - 'picking_id': picking.id, - 'product_id': self.product.id, - 'location_id': location_id.id, - 'location_dest_id': location_dest_id.id, - 'date': datetime.now().strftime('%Y-%m-%d %H:%M:%S'), - 'date_expected': datetime.now().strftime('%Y-%m-%d %H:%M:%S'), - 'name': self.product.name, - 'procure_method': 'make_to_stock', - 'product_uom': self.product.uom_id.id, - 'product_uom_qty': 1.0, - 'analytic_account_id': (analytic_account_id.id - if analytic_account_id else False), + "picking_id": picking.id, + "product_id": self.product.id, + "location_id": location_id.id, + "location_dest_id": location_dest_id.id, + "date": datetime.now().strftime("%Y-%m-%d %H:%M:%S"), + "date_expected": datetime.now().strftime("%Y-%m-%d %H:%M:%S"), + "name": self.product.name, + "procure_method": "make_to_stock", + "product_uom": self.product.uom_id.id, + "product_uom_qty": 1.0, + "analytic_account_id": ( + analytic_account_id.id if analytic_account_id else False + ), } - self.env['stock.move'].create(move_data) + self.env["stock.move"].create(move_data) return picking def __update_qty_on_hand_product(self, product, new_qty): - qty_wizard = self.env['stock.change.product.qty'].create({ - 'product_id': product.id, - 'new_quantity': new_qty - }) + qty_wizard = self.env["stock.change.product.qty"].create( + {"product_id": product.id, "new_quantity": new_qty} + ) qty_wizard.change_product_qty() def _confirm_picking_no_error(self, picking): picking.action_confirm() - self.assertEqual(picking.state, 'confirmed') + self.assertEqual(picking.state, "confirmed") def _force_assign_out_no_error(self, picking): self.assertEqual(picking.move_lines.reserved_availability, 0) picking.action_assign() self.assertEqual(picking.move_lines.reserved_availability, 1) - self.assertEqual(picking.state, 'assigned') + self.assertEqual(picking.state, "assigned") def _picking_done_no_error(self, picking): picking.move_lines.quantity_done = 1.0 picking.button_validate() - self.assertEqual(picking.state, 'done') + self.assertEqual(picking.state, "done") def _check_account_move_no_error(self, picking): - criteria1 = [['ref', '=', picking.name]] - acc_moves = self.env['account.move'].search(criteria1) + criteria1 = [["ref", "=", picking.name]] + acc_moves = self.env["account.move"].search(criteria1) self.assertGreater(len(acc_moves), 0) def _check_analytic_account_no_error(self, picking): move = picking.move_lines[0] - criteria2 = [['move_id.ref', '=', picking.name]] - acc_lines = self.env['account.move.line'].search(criteria2) + criteria2 = [["move_id.ref", "=", picking.name]] + acc_lines = self.env["account.move.line"].search(criteria2) for acc_line in acc_lines: - if acc_line.account_id != move.product_id.categ_id.\ - property_stock_valuation_account_id: + if ( + acc_line.account_id + != move.product_id.categ_id.property_stock_valuation_account_id + ): self.assertEqual( - acc_line.analytic_account_id.id, - move.analytic_account_id.id) + acc_line.analytic_account_id.id, move.analytic_account_id.id + ) def _check_no_analytic_account(self, picking): criteria2 = [ ("move_id.ref", "=", picking.name), ("analytic_account_id", "!=", False), ] - line_count = self.env['account.move.line'].search_count( - criteria2) - self.assertEqual( - line_count, - 0) + line_count = self.env["account.move.line"].search_count(criteria2) + self.assertEqual(line_count, 0) def test_outgoing_picking_with_analytic(self): picking = self._create_picking( - self.location, self.dest_location, + self.location, + self.dest_location, self.outgoing_picking_type, self.analytic_account, ) @@ -158,8 +157,7 @@ def test_outgoing_picking_with_analytic(self): def test_outgoing_picking_without_analytic(self): picking = self._create_picking( - self.location, self.dest_location, - self.outgoing_picking_type, + self.location, self.dest_location, self.outgoing_picking_type, ) self.__update_qty_on_hand_product(self.product, 1) self._confirm_picking_no_error(picking) @@ -170,7 +168,8 @@ def test_outgoing_picking_without_analytic(self): def test_incoming_picking_with_analytic(self): picking = self._create_picking( - self.location, self.dest_location, + self.location, + self.dest_location, self.incoming_picking_type, self.analytic_account, ) diff --git a/stock_analytic/tests/test_stock_scrap.py b/stock_analytic/tests/test_stock_scrap.py index aabbd8ebce..30652eed86 100644 --- a/stock_analytic/tests/test_stock_scrap.py +++ b/stock_analytic/tests/test_stock_scrap.py @@ -4,46 +4,47 @@ class TestStockScrap(TransactionCase): - def setUp(self): super(TestStockScrap, self).setUp() - self.product = self.env.ref('product.product_product_4') - self.warehouse = self.env.ref('stock.warehouse0') + self.product = self.env.ref("product.product_product_4") + self.warehouse = self.env.ref("stock.warehouse0") self.location = self.warehouse.lot_stock_id - self.analytic_account = self.env.ref( - 'analytic.analytic_agrolait') + self.analytic_account = self.env.ref("analytic.analytic_agrolait") def __update_qty_on_hand_product(self, product, new_qty): - qty_wizard = self.env['stock.change.product.qty'].create({ - 'product_id': product.id, - 'new_quantity': new_qty - }) + qty_wizard = self.env["stock.change.product.qty"].create( + {"product_id": product.id, "new_quantity": new_qty} + ) qty_wizard.change_product_qty() def _create_scrap(self, analytic_account_id=False): scrap_data = { - 'product_id': self.product.id, - 'scrap_qty': 1.00, - 'product_uom_id': self.product.uom_id.id, - 'location_id': self.location.id, - 'analytic_account_id': - analytic_account_id and analytic_account_id.id or False + "product_id": self.product.id, + "scrap_qty": 1.00, + "product_uom_id": self.product.uom_id.id, + "location_id": self.location.id, + "analytic_account_id": analytic_account_id + and analytic_account_id.id + or False, } - return self.env['stock.scrap'].create(scrap_data) + return self.env["stock.scrap"].create(scrap_data) def _validate_scrap_no_error(self, scrap): scrap.action_validate() - self.assertEqual(scrap.state, 'done') + self.assertEqual(scrap.state, "done") def _check_analytic_account_no_error(self, scrap): - domain = [('name', '=', scrap.name)] - acc_lines = self.env['account.move.line'].search(domain) + domain = [("name", "=", scrap.name)] + acc_lines = self.env["account.move.line"].search(domain) for acc_line in acc_lines: - if acc_line.account_id != scrap.product_id.categ_id.\ - property_stock_valuation_account_id: - self.assertEqual(acc_line.analytic_account_id.id, - scrap.analytic_account_id.id) + if ( + acc_line.account_id + != scrap.product_id.categ_id.property_stock_valuation_account_id + ): + self.assertEqual( + acc_line.analytic_account_id.id, scrap.analytic_account_id.id + ) def test_scrap_without_analytic(self): self.__update_qty_on_hand_product(self.product, 1) diff --git a/stock_analytic/views/stock_move_views.xml b/stock_analytic/views/stock_move_views.xml index a3b8f80411..c3e7454b80 100644 --- a/stock_analytic/views/stock_move_views.xml +++ b/stock_analytic/views/stock_move_views.xml @@ -1,73 +1,77 @@ - + stock.move.picking.form stock.move - + - + - stock.move.picking.tree stock.move - + - + - stock.move.tree stock.move - + - + - stock.move.form stock.move - + - + - stock.move.search stock.move - + - + - - + + - stock.picking.form stock.picking - + - - + + diff --git a/stock_analytic/views/stock_scrap.xml b/stock_analytic/views/stock_scrap.xml index 6fedd5364f..36e905f959 100644 --- a/stock_analytic/views/stock_scrap.xml +++ b/stock_analytic/views/stock_scrap.xml @@ -1,14 +1,12 @@ - stock.scrap.analytic.form stock.scrap - + - + - From 5bfd1b98a9c9e27a7260d172758db6f6fed4a905 Mon Sep 17 00:00:00 2001 From: "jim.hoefnagels" Date: Tue, 24 Mar 2020 08:26:00 +0100 Subject: [PATCH 28/61] [MIG] stock_analytic: Migration to 13.0 --- stock_analytic/__manifest__.py | 6 +++--- stock_analytic/i18n/stock_analytic.pot | 2 +- stock_analytic/models/stock.py | 11 ++++------- stock_analytic/models/stock_scrap.py | 7 ++----- stock_analytic/tests/test_stock_picking.py | 14 +++++++++----- stock_analytic/tests/test_stock_scrap.py | 6 +++++- stock_analytic/views/stock_move_views.xml | 10 ---------- 7 files changed, 24 insertions(+), 32 deletions(-) diff --git a/stock_analytic/__manifest__.py b/stock_analytic/__manifest__.py index 4122507ab7..6a91c4b50d 100644 --- a/stock_analytic/__manifest__.py +++ b/stock_analytic/__manifest__.py @@ -7,7 +7,7 @@ { "name": "Stock Analytic", "summary": "Adds an analytic account in stock move", - "version": "12.0.1.1.1", + "version": "13.0.1.0.0", "author": "Julius Network Solutions, " "ClearCorp, OpenSynergy Indonesia, " "Hibou Corp., " @@ -15,7 +15,7 @@ "website": "https://github.com/OCA/account-analytic", "category": "Warehouse Management", "license": "AGPL-3", - "depends": ["stock_account", "analytic",], - "data": ["views/stock_move_views.xml", "views/stock_scrap.xml",], + "depends": ["stock_account", "analytic"], + "data": ["views/stock_move_views.xml", "views/stock_scrap.xml"], "installable": True, } diff --git a/stock_analytic/i18n/stock_analytic.pot b/stock_analytic/i18n/stock_analytic.pot index da76517586..dec609da54 100644 --- a/stock_analytic/i18n/stock_analytic.pot +++ b/stock_analytic/i18n/stock_analytic.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 12.0\n" +"Project-Id-Version: Odoo Server 13.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: <>\n" "Language-Team: \n" diff --git a/stock_analytic/models/stock.py b/stock_analytic/models/stock.py index 18eb9e9cab..2f87f3d6a0 100644 --- a/stock_analytic/models/stock.py +++ b/stock_analytic/models/stock.py @@ -5,7 +5,7 @@ # Copyright 2018 Hibou Corp. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo import api, fields, models +from odoo import fields, models class StockMove(models.Model): @@ -15,13 +15,12 @@ class StockMove(models.Model): string="Analytic Account", comodel_name="account.analytic.account", ) - @api.multi def _prepare_account_move_line( - self, qty, cost, credit_account_id, debit_account_id + self, qty, cost, credit_account_id, debit_account_id, description ): self.ensure_one() res = super(StockMove, self)._prepare_account_move_line( - qty, cost, credit_account_id, debit_account_id + qty, cost, credit_account_id, debit_account_id, description ) # Add analytic account in debit line if not self.analytic_account_id or not res: @@ -32,9 +31,7 @@ def _prepare_account_move_line( res[num][2]["account_id"] != self.product_id.categ_id.property_stock_valuation_account_id.id ): - res[num][2].update( - {"analytic_account_id": self.analytic_account_id.id,} - ) + res[num][2].update({"analytic_account_id": self.analytic_account_id.id}) return res diff --git a/stock_analytic/models/stock_scrap.py b/stock_analytic/models/stock_scrap.py index d3e5c8d219..d20565975a 100644 --- a/stock_analytic/models/stock_scrap.py +++ b/stock_analytic/models/stock_scrap.py @@ -1,6 +1,6 @@ # Copyright (C) 2019 Open Source Integrators # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo import api, fields, models +from odoo import fields, models class StockScrap(models.Model): @@ -10,10 +10,7 @@ class StockScrap(models.Model): string="Analytic Account", comodel_name="account.analytic.account" ) - @api.multi def _prepare_move_values(self): res = super()._prepare_move_values() - res.update( - {"analytic_account_id": self.analytic_account_id.id,} - ) + res.update({"analytic_account_id": self.analytic_account_id.id}) return res diff --git a/stock_analytic/tests/test_stock_picking.py b/stock_analytic/tests/test_stock_picking.py index 3f77a59e75..bee86f08c4 100644 --- a/stock_analytic/tests/test_stock_picking.py +++ b/stock_analytic/tests/test_stock_picking.py @@ -58,9 +58,7 @@ def setUp(self): "property_stock_account_output_categ_id": self.stock_output_account.id, } ) - self.product.update( - {"categ_id": self.product_categ.id,} - ) + self.product.update({"categ_id": self.product_categ.id}) def _create_picking( self, location_id, location_dest_id, picking_type_id, analytic_account_id=False @@ -96,7 +94,11 @@ def _create_picking( def __update_qty_on_hand_product(self, product, new_qty): qty_wizard = self.env["stock.change.product.qty"].create( - {"product_id": product.id, "new_quantity": new_qty} + { + "product_id": product.id, + "product_tmpl_id": product.product_tmpl_id.id, + "new_quantity": new_qty, + } ) qty_wizard.change_product_qty() @@ -116,7 +118,9 @@ def _picking_done_no_error(self, picking): self.assertEqual(picking.state, "done") def _check_account_move_no_error(self, picking): - criteria1 = [["ref", "=", picking.name]] + criteria1 = [ + ["ref", "=", "{} - {}".format(picking.name, picking.product_id.name)] + ] acc_moves = self.env["account.move"].search(criteria1) self.assertGreater(len(acc_moves), 0) diff --git a/stock_analytic/tests/test_stock_scrap.py b/stock_analytic/tests/test_stock_scrap.py index 30652eed86..99a05a5887 100644 --- a/stock_analytic/tests/test_stock_scrap.py +++ b/stock_analytic/tests/test_stock_scrap.py @@ -14,7 +14,11 @@ def setUp(self): def __update_qty_on_hand_product(self, product, new_qty): qty_wizard = self.env["stock.change.product.qty"].create( - {"product_id": product.id, "new_quantity": new_qty} + { + "product_id": product.id, + "product_tmpl_id": product.product_tmpl_id.id, + "new_quantity": new_qty, + } ) qty_wizard.change_product_qty() diff --git a/stock_analytic/views/stock_move_views.xml b/stock_analytic/views/stock_move_views.xml index c3e7454b80..6820140f50 100644 --- a/stock_analytic/views/stock_move_views.xml +++ b/stock_analytic/views/stock_move_views.xml @@ -1,16 +1,6 @@ - - stock.move.picking.form - stock.move - - - - - - - stock.move.picking.tree stock.move From 7ec13edbe099c0666e039e9d6b568ae4ba79760c Mon Sep 17 00:00:00 2001 From: "jim.hoefnagels" Date: Mon, 11 May 2020 13:43:13 +0200 Subject: [PATCH 29/61] stock_analytic 12.0.1.1.2 (cherry picked from commit 925562222d4ad909559d560080435b700bc33748) --- stock_analytic/models/stock.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/stock_analytic/models/stock.py b/stock_analytic/models/stock.py index 2f87f3d6a0..69afd8d378 100644 --- a/stock_analytic/models/stock.py +++ b/stock_analytic/models/stock.py @@ -34,6 +34,12 @@ def _prepare_account_move_line( res[num][2].update({"analytic_account_id": self.analytic_account_id.id}) return res + @api.model + def _prepare_merge_moves_distinct_fields(self): + fields = super()._prepare_merge_moves_distinct_fields() + fields.append('analytic_account_id') + return fields + class StockMoveLine(models.Model): _inherit = "stock.move.line" From 5c78b1232b163fcf097fac6c528acf0214873511 Mon Sep 17 00:00:00 2001 From: "jim.hoefnagels" Date: Mon, 11 May 2020 13:58:26 +0200 Subject: [PATCH 30/61] [IMP] stock_analytic: black, isort --- stock_analytic/models/stock.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stock_analytic/models/stock.py b/stock_analytic/models/stock.py index 69afd8d378..59661d9e52 100644 --- a/stock_analytic/models/stock.py +++ b/stock_analytic/models/stock.py @@ -5,7 +5,7 @@ # Copyright 2018 Hibou Corp. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo import fields, models +from odoo import api, fields, models class StockMove(models.Model): @@ -37,7 +37,7 @@ def _prepare_account_move_line( @api.model def _prepare_merge_moves_distinct_fields(self): fields = super()._prepare_merge_moves_distinct_fields() - fields.append('analytic_account_id') + fields.append("analytic_account_id") return fields From fe28328fade54b45bdce801123c02d76089d6f25 Mon Sep 17 00:00:00 2001 From: "jim.hoefnagels" Date: Mon, 11 May 2020 16:40:23 +0200 Subject: [PATCH 31/61] [MIG] stock_analytic: Migration to 13.0 --- stock_analytic/i18n/stock_analytic.pot | 5 ++--- stock_analytic/tests/test_stock_picking.py | 4 ++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/stock_analytic/i18n/stock_analytic.pot b/stock_analytic/i18n/stock_analytic.pot index dec609da54..702286fb77 100644 --- a/stock_analytic/i18n/stock_analytic.pot +++ b/stock_analytic/i18n/stock_analytic.pot @@ -1,12 +1,12 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * stock_analytic +# * stock_analytic # msgid "" msgstr "" "Project-Id-Version: Odoo Server 13.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: <>\n" +"Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -40,4 +40,3 @@ msgstr "" #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" msgstr "" - diff --git a/stock_analytic/tests/test_stock_picking.py b/stock_analytic/tests/test_stock_picking.py index bee86f08c4..a072b9f23f 100644 --- a/stock_analytic/tests/test_stock_picking.py +++ b/stock_analytic/tests/test_stock_picking.py @@ -43,6 +43,9 @@ def setUp(self): "company_id": self.env.ref("base.main_company").id, } ) + self.stock_journal = self.env["account.journal"].create( + {"name": "Stock Journal", "code": "STJTEST", "type": "general"} + ) self.analytic_account = self.env.ref("analytic.analytic_agrolait") self.warehouse = self.env.ref("stock.warehouse0") self.location = self.warehouse.lot_stock_id @@ -56,6 +59,7 @@ def setUp(self): "property_stock_valuation_account_id": self.valuation_account.id, "property_stock_account_input_categ_id": self.stock_input_account.id, "property_stock_account_output_categ_id": self.stock_output_account.id, + "property_stock_journal": self.stock_journal.id, } ) self.product.update({"categ_id": self.product_categ.id}) From 0b4734526795b20276be1f9aa491a118beb445f8 Mon Sep 17 00:00:00 2001 From: Rodrigo Macedo Date: Wed, 12 Aug 2020 16:45:23 +0000 Subject: [PATCH 32/61] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (5 of 5 strings) Translation: account-analytic-13.0/account-analytic-13.0-stock_analytic Translate-URL: https://translation.odoo-community.org/projects/account-analytic-13-0/account-analytic-13-0-stock_analytic/pt_BR/ --- stock_analytic/i18n/pt_BR.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/stock_analytic/i18n/pt_BR.po b/stock_analytic/i18n/pt_BR.po index 3c700be84f..a2770617b6 100644 --- a/stock_analytic/i18n/pt_BR.po +++ b/stock_analytic/i18n/pt_BR.po @@ -9,16 +9,16 @@ msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-11-19 22:13+0000\n" -"PO-Revision-Date: 2019-08-02 09:43+0000\n" -"Last-Translator: Marcel Savegnago \n" -"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/" -"teams/23907/pt_BR/)\n" +"PO-Revision-Date: 2020-08-12 18:59+0000\n" +"Last-Translator: Rodrigo Macedo \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" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 3.7.1\n" +"X-Generator: Weblate 3.10\n" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id @@ -31,17 +31,17 @@ msgstr "Conta analítica" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_product_product msgid "Product" -msgstr "" +msgstr "Produto" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" -msgstr "" +msgstr "Movimentos de produto (linha de movimentação de estoque)" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_scrap msgid "Scrap" -msgstr "" +msgstr "Restos" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move From afa4affd906552e291347600d8b0da9a226dca5b Mon Sep 17 00:00:00 2001 From: mreficent Date: Wed, 30 Sep 2020 10:53:42 +0200 Subject: [PATCH 33/61] [UPD] Eficent -> ForgeFlow --- stock_analytic/README.rst | 2 +- stock_analytic/__manifest__.py | 2 +- stock_analytic/models/stock.py | 2 +- stock_analytic/tests/test_stock_picking.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stock_analytic/README.rst b/stock_analytic/README.rst index 7d3c3d2431..4a90cfbc77 100644 --- a/stock_analytic/README.rst +++ b/stock_analytic/README.rst @@ -59,7 +59,7 @@ Contributors * Fabio Vílchez * Andhitia Rama * Michael Viriyananda -* Aaron Henriquez +* Aaron Henriquez * Jared Kipe Maintainer diff --git a/stock_analytic/__manifest__.py b/stock_analytic/__manifest__.py index 6a91c4b50d..87bbaa00c5 100644 --- a/stock_analytic/__manifest__.py +++ b/stock_analytic/__manifest__.py @@ -1,7 +1,7 @@ # Copyright 2013 Julius Network Solutions # Copyright 2015 Clear Corp # Copyright 2016 OpenSynergy Indonesia -# Copyright 2017 Eficent Business and IT Consulting Services S.L. +# Copyright 2017 ForgeFlow S.L. # Copyright 2018 Hibou Corp. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { diff --git a/stock_analytic/models/stock.py b/stock_analytic/models/stock.py index 59661d9e52..0838037028 100644 --- a/stock_analytic/models/stock.py +++ b/stock_analytic/models/stock.py @@ -1,7 +1,7 @@ # Copyright 2013 Julius Network Solutions # Copyright 2015 Clear Corp # Copyright 2016 OpenSynergy Indonesia -# Copyright 2017 Eficent Business and IT Consulting Services S.L. +# Copyright 2017 ForgeFlow S.L. # Copyright 2018 Hibou Corp. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). diff --git a/stock_analytic/tests/test_stock_picking.py b/stock_analytic/tests/test_stock_picking.py index a072b9f23f..7fe2e2c11c 100644 --- a/stock_analytic/tests/test_stock_picking.py +++ b/stock_analytic/tests/test_stock_picking.py @@ -1,7 +1,7 @@ # Copyright 2013 Julius Network Solutions # Copyright 2015 Clear Corp # Copyright 2016 OpenSynergy Indonesia -# Copyright 2017 Eficent Business and IT Consulting Services S.L. +# Copyright 2017 ForgeFlow S.L. # Copyright 2018 Hibou Corp. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). From c0e007d340ec5706a90c9a8f550c297e3dc16ce3 Mon Sep 17 00:00:00 2001 From: Benoit Aimont Date: Mon, 9 Nov 2020 15:21:32 +0100 Subject: [PATCH 34/61] [13.0][IMP] stock_analytic - add analytic tags on stock move --- stock_analytic/README.rst | 20 ++++++++--------- stock_analytic/__manifest__.py | 2 +- stock_analytic/i18n/ca.po | 6 ++++++ stock_analytic/i18n/cs_CZ.po | 6 ++++++ stock_analytic/i18n/de.po | 6 ++++++ stock_analytic/i18n/el_GR.po | 6 ++++++ stock_analytic/i18n/es.po | 6 ++++++ stock_analytic/i18n/es_EC.po | 6 ++++++ stock_analytic/i18n/es_MX.po | 6 ++++++ stock_analytic/i18n/fi.po | 6 ++++++ stock_analytic/i18n/fr.po | 6 ++++++ stock_analytic/i18n/gl.po | 6 ++++++ stock_analytic/i18n/gu_IN.po | 6 ++++++ stock_analytic/i18n/hi_IN.po | 6 ++++++ stock_analytic/i18n/hr.po | 6 ++++++ stock_analytic/i18n/hr_HR.po | 6 ++++++ stock_analytic/i18n/hu.po | 6 ++++++ stock_analytic/i18n/it.po | 6 ++++++ stock_analytic/i18n/nl.po | 6 ++++++ stock_analytic/i18n/pt.po | 6 ++++++ stock_analytic/i18n/pt_BR.po | 10 +++++++-- stock_analytic/i18n/pt_PT.po | 6 ++++++ stock_analytic/i18n/ro.po | 6 ++++++ stock_analytic/i18n/sk_SK.po | 6 ++++++ stock_analytic/i18n/sl.po | 6 ++++++ stock_analytic/i18n/stock_analytic.pot | 6 ++++++ stock_analytic/i18n/tr.po | 6 ++++++ stock_analytic/i18n/tr_TR.po | 6 ++++++ stock_analytic/i18n/vi_VN.po | 6 ++++++ stock_analytic/i18n/zh_CN.po | 6 ++++++ stock_analytic/models/stock.py | 18 ++++++++++------ stock_analytic/models/stock_scrap.py | 8 ++++++- stock_analytic/tests/test_stock_picking.py | 25 +++++++++++++++++++++- stock_analytic/tests/test_stock_scrap.py | 16 ++++++++++++-- stock_analytic/views/stock_move_views.xml | 1 + stock_analytic/views/stock_scrap.xml | 1 + 36 files changed, 239 insertions(+), 24 deletions(-) diff --git a/stock_analytic/README.rst b/stock_analytic/README.rst index 4a90cfbc77..918a416410 100644 --- a/stock_analytic/README.rst +++ b/stock_analytic/README.rst @@ -6,36 +6,36 @@ Stock Analytic ============== -Adds an analytic account in stock move to be able to get analytic information -when generating the journal items. +Adds an analytic account and analytic tags in stock move to be able to get +analytic information when generating the journal items. Usage ===== -To Assign an Analytic Account to a Stock Move ---------------------------------------------- +To Assign an Analytic Account and Analytic Tags to a Stock Move +--------------------------------------------------------------- You need to: #. Create manually or open draft picking -#. Add move lines and fill **analytic account** field +#. Add move lines and fill **analytic account** and **analytic tags** fields -Assigned Journal Items created from Stock Move with Analytic Account --------------------------------------------------------------------- +Assigned Journal Items created from Stock Move with Analytic Account and Analytic Tags +-------------------------------------------------------------------------------------- If stock move automatically create journal entry, the journal entry will contain journal items with following rule: #. Journal item with account equal to product's valuation account will not be - assigned to any analytic account + assigned to any analytic account, neither analytic tags #. Journal item with account different to product's valuation account will be assigned to an analytic account according to the stock move's analytic - account + account. The same logic applies to analytic tags. .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/87/12.0 + :target: https://runbot.odoo-community.org/runbot/87/13.0 Bug Tracker diff --git a/stock_analytic/__manifest__.py b/stock_analytic/__manifest__.py index 87bbaa00c5..ef2b77bb47 100644 --- a/stock_analytic/__manifest__.py +++ b/stock_analytic/__manifest__.py @@ -6,7 +6,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { "name": "Stock Analytic", - "summary": "Adds an analytic account in stock move", + "summary": "Adds an analytic account and analytic tags in stock move", "version": "13.0.1.0.0", "author": "Julius Network Solutions, " "ClearCorp, OpenSynergy Indonesia, " diff --git a/stock_analytic/i18n/ca.po b/stock_analytic/i18n/ca.po index 26c3707e14..30dfa6f385 100644 --- a/stock_analytic/i18n/ca.po +++ b/stock_analytic/i18n/ca.po @@ -27,6 +27,12 @@ msgstr "" msgid "Analytic Account" msgstr "Compte analític" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids +msgid "Analytic Tags" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_product_product msgid "Product" diff --git a/stock_analytic/i18n/cs_CZ.po b/stock_analytic/i18n/cs_CZ.po index 01886079ba..4f889066e6 100644 --- a/stock_analytic/i18n/cs_CZ.po +++ b/stock_analytic/i18n/cs_CZ.po @@ -27,6 +27,12 @@ msgstr "" msgid "Analytic Account" msgstr "Analytický účet" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids +msgid "Analytic Tags" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_product_product msgid "Product" diff --git a/stock_analytic/i18n/de.po b/stock_analytic/i18n/de.po index 3599322af1..d5bb6361d4 100644 --- a/stock_analytic/i18n/de.po +++ b/stock_analytic/i18n/de.po @@ -27,6 +27,12 @@ msgstr "" msgid "Analytic Account" msgstr "Kostenstelle" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids +msgid "Analytic Tags" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_product_product msgid "Product" diff --git a/stock_analytic/i18n/el_GR.po b/stock_analytic/i18n/el_GR.po index a3a2c83c1b..27ac28885b 100644 --- a/stock_analytic/i18n/el_GR.po +++ b/stock_analytic/i18n/el_GR.po @@ -27,6 +27,12 @@ msgstr "" msgid "Analytic Account" msgstr "Αναλυτικός Λογαριασμός" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids +msgid "Analytic Tags" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_product_product msgid "Product" diff --git a/stock_analytic/i18n/es.po b/stock_analytic/i18n/es.po index af3e5bcf68..9ed7fca354 100644 --- a/stock_analytic/i18n/es.po +++ b/stock_analytic/i18n/es.po @@ -28,6 +28,12 @@ msgstr "" msgid "Analytic Account" msgstr "Cuenta analítica" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids +msgid "Analytic Tags" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_product_product msgid "Product" diff --git a/stock_analytic/i18n/es_EC.po b/stock_analytic/i18n/es_EC.po index 09252152c9..2ad4b74296 100644 --- a/stock_analytic/i18n/es_EC.po +++ b/stock_analytic/i18n/es_EC.po @@ -27,6 +27,12 @@ msgstr "" msgid "Analytic Account" msgstr "Cuenta Analítica" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids +msgid "Analytic Tags" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_product_product msgid "Product" diff --git a/stock_analytic/i18n/es_MX.po b/stock_analytic/i18n/es_MX.po index d91c18e7c6..7e6c3ead61 100644 --- a/stock_analytic/i18n/es_MX.po +++ b/stock_analytic/i18n/es_MX.po @@ -27,6 +27,12 @@ msgstr "" msgid "Analytic Account" msgstr "Cuenta analítica" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids +msgid "Analytic Tags" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_product_product msgid "Product" diff --git a/stock_analytic/i18n/fi.po b/stock_analytic/i18n/fi.po index 7a15c7a3ee..5c49158d20 100644 --- a/stock_analytic/i18n/fi.po +++ b/stock_analytic/i18n/fi.po @@ -26,6 +26,12 @@ msgstr "" msgid "Analytic Account" msgstr "Analyyttinen tili" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids +msgid "Analytic Tags" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_product_product msgid "Product" diff --git a/stock_analytic/i18n/fr.po b/stock_analytic/i18n/fr.po index 1165d0bb4b..a90db14400 100644 --- a/stock_analytic/i18n/fr.po +++ b/stock_analytic/i18n/fr.po @@ -26,6 +26,12 @@ msgstr "" msgid "Analytic Account" msgstr "Compte analytique" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids +msgid "Analytic Tags" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_product_product msgid "Product" diff --git a/stock_analytic/i18n/gl.po b/stock_analytic/i18n/gl.po index e6cd4a0c5f..35fcb0570a 100644 --- a/stock_analytic/i18n/gl.po +++ b/stock_analytic/i18n/gl.po @@ -26,6 +26,12 @@ msgstr "" msgid "Analytic Account" msgstr "Conta analítica" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids +msgid "Analytic Tags" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_product_product msgid "Product" diff --git a/stock_analytic/i18n/gu_IN.po b/stock_analytic/i18n/gu_IN.po index 5908a324a0..ea1f8c65ab 100644 --- a/stock_analytic/i18n/gu_IN.po +++ b/stock_analytic/i18n/gu_IN.po @@ -27,6 +27,12 @@ msgstr "" msgid "Analytic Account" msgstr "વિશ્લેષણાત્મક ખાતું" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids +msgid "Analytic Tags" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_product_product msgid "Product" diff --git a/stock_analytic/i18n/hi_IN.po b/stock_analytic/i18n/hi_IN.po index 95d7d0cc31..0245bddf8a 100644 --- a/stock_analytic/i18n/hi_IN.po +++ b/stock_analytic/i18n/hi_IN.po @@ -27,6 +27,12 @@ msgstr "" msgid "Analytic Account" msgstr "विश्लेषणात्मक खाता" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids +msgid "Analytic Tags" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_product_product msgid "Product" diff --git a/stock_analytic/i18n/hr.po b/stock_analytic/i18n/hr.po index 5d49d688d9..6613fdef29 100644 --- a/stock_analytic/i18n/hr.po +++ b/stock_analytic/i18n/hr.po @@ -28,6 +28,12 @@ msgstr "" msgid "Analytic Account" msgstr "Analitički konto" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids +msgid "Analytic Tags" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_product_product msgid "Product" diff --git a/stock_analytic/i18n/hr_HR.po b/stock_analytic/i18n/hr_HR.po index e389c295bf..e834ef2918 100644 --- a/stock_analytic/i18n/hr_HR.po +++ b/stock_analytic/i18n/hr_HR.po @@ -28,6 +28,12 @@ msgstr "" msgid "Analytic Account" msgstr "Analitički konto" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids +msgid "Analytic Tags" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_product_product msgid "Product" diff --git a/stock_analytic/i18n/hu.po b/stock_analytic/i18n/hu.po index 0177f789b5..aaa1515bbf 100644 --- a/stock_analytic/i18n/hu.po +++ b/stock_analytic/i18n/hu.po @@ -26,6 +26,12 @@ msgstr "" msgid "Analytic Account" msgstr "Analitikus gyűjtőkód könyvelés" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids +msgid "Analytic Tags" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_product_product msgid "Product" diff --git a/stock_analytic/i18n/it.po b/stock_analytic/i18n/it.po index 1f1379a26f..88f9beb3e3 100644 --- a/stock_analytic/i18n/it.po +++ b/stock_analytic/i18n/it.po @@ -28,6 +28,12 @@ msgstr "" msgid "Analytic Account" msgstr "Conto Analitico" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids +msgid "Analytic Tags" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_product_product msgid "Product" diff --git a/stock_analytic/i18n/nl.po b/stock_analytic/i18n/nl.po index 4e6fc562ab..eac3174516 100644 --- a/stock_analytic/i18n/nl.po +++ b/stock_analytic/i18n/nl.po @@ -26,6 +26,12 @@ msgstr "" msgid "Analytic Account" msgstr "Kostenplaats" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids +msgid "Analytic Tags" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_product_product msgid "Product" diff --git a/stock_analytic/i18n/pt.po b/stock_analytic/i18n/pt.po index 9cf9a9c372..88e16cf291 100644 --- a/stock_analytic/i18n/pt.po +++ b/stock_analytic/i18n/pt.po @@ -28,6 +28,12 @@ msgstr "" msgid "Analytic Account" msgstr "Conta Analítica" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids +msgid "Analytic Tags" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_product_product msgid "Product" diff --git a/stock_analytic/i18n/pt_BR.po b/stock_analytic/i18n/pt_BR.po index a2770617b6..0370e551b6 100644 --- a/stock_analytic/i18n/pt_BR.po +++ b/stock_analytic/i18n/pt_BR.po @@ -11,8 +11,8 @@ msgstr "" "POT-Creation-Date: 2017-11-19 22:13+0000\n" "PO-Revision-Date: 2020-08-12 18:59+0000\n" "Last-Translator: Rodrigo Macedo \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" @@ -28,6 +28,12 @@ msgstr "" msgid "Analytic Account" msgstr "Conta analítica" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids +msgid "Analytic Tags" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_product_product msgid "Product" diff --git a/stock_analytic/i18n/pt_PT.po b/stock_analytic/i18n/pt_PT.po index 3e0c1056f7..c49be8a687 100644 --- a/stock_analytic/i18n/pt_PT.po +++ b/stock_analytic/i18n/pt_PT.po @@ -27,6 +27,12 @@ msgstr "" msgid "Analytic Account" msgstr "Conta Analítica" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids +msgid "Analytic Tags" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_product_product msgid "Product" diff --git a/stock_analytic/i18n/ro.po b/stock_analytic/i18n/ro.po index 28de44d712..1a8a1c8b5f 100644 --- a/stock_analytic/i18n/ro.po +++ b/stock_analytic/i18n/ro.po @@ -28,6 +28,12 @@ msgstr "" msgid "Analytic Account" msgstr "Cont analitic" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids +msgid "Analytic Tags" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_product_product msgid "Product" diff --git a/stock_analytic/i18n/sk_SK.po b/stock_analytic/i18n/sk_SK.po index 531ef3b8a6..15d49c1de8 100644 --- a/stock_analytic/i18n/sk_SK.po +++ b/stock_analytic/i18n/sk_SK.po @@ -27,6 +27,12 @@ msgstr "" msgid "Analytic Account" msgstr "Analytický účet" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids +msgid "Analytic Tags" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_product_product msgid "Product" diff --git a/stock_analytic/i18n/sl.po b/stock_analytic/i18n/sl.po index 904bbb613e..210b9ac7a2 100644 --- a/stock_analytic/i18n/sl.po +++ b/stock_analytic/i18n/sl.po @@ -27,6 +27,12 @@ msgstr "" msgid "Analytic Account" msgstr "Analitični konto" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids +msgid "Analytic Tags" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_product_product msgid "Product" diff --git a/stock_analytic/i18n/stock_analytic.pot b/stock_analytic/i18n/stock_analytic.pot index 702286fb77..441e12c367 100644 --- a/stock_analytic/i18n/stock_analytic.pot +++ b/stock_analytic/i18n/stock_analytic.pot @@ -21,6 +21,12 @@ msgstr "" msgid "Analytic Account" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids +msgid "Analytic Tags" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_product_product msgid "Product" diff --git a/stock_analytic/i18n/tr.po b/stock_analytic/i18n/tr.po index 2f200d30ca..1b273e58c5 100644 --- a/stock_analytic/i18n/tr.po +++ b/stock_analytic/i18n/tr.po @@ -26,6 +26,12 @@ msgstr "" msgid "Analytic Account" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids +msgid "Analytic Tags" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_product_product msgid "Product" diff --git a/stock_analytic/i18n/tr_TR.po b/stock_analytic/i18n/tr_TR.po index d6938d69eb..25a93fc9a7 100644 --- a/stock_analytic/i18n/tr_TR.po +++ b/stock_analytic/i18n/tr_TR.po @@ -27,6 +27,12 @@ msgstr "" msgid "Analytic Account" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids +msgid "Analytic Tags" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_product_product msgid "Product" diff --git a/stock_analytic/i18n/vi_VN.po b/stock_analytic/i18n/vi_VN.po index 6d77a6f0fd..1e11dffe8e 100644 --- a/stock_analytic/i18n/vi_VN.po +++ b/stock_analytic/i18n/vi_VN.po @@ -27,6 +27,12 @@ msgstr "" msgid "Analytic Account" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids +msgid "Analytic Tags" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_product_product msgid "Product" diff --git a/stock_analytic/i18n/zh_CN.po b/stock_analytic/i18n/zh_CN.po index 030152fcd9..3095fb86a6 100644 --- a/stock_analytic/i18n/zh_CN.po +++ b/stock_analytic/i18n/zh_CN.po @@ -27,6 +27,12 @@ msgstr "" msgid "Analytic Account" msgstr "核算科目" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids +msgid "Analytic Tags" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_product_product msgid "Product" diff --git a/stock_analytic/models/stock.py b/stock_analytic/models/stock.py index 0838037028..d2e4a9803d 100644 --- a/stock_analytic/models/stock.py +++ b/stock_analytic/models/stock.py @@ -14,6 +14,7 @@ class StockMove(models.Model): analytic_account_id = fields.Many2one( string="Analytic Account", comodel_name="account.analytic.account", ) + analytic_tag_ids = fields.Many2many("account.analytic.tag", string="Analytic Tags") def _prepare_account_move_line( self, qty, cost, credit_account_id, debit_account_id, description @@ -22,16 +23,19 @@ def _prepare_account_move_line( res = super(StockMove, self)._prepare_account_move_line( qty, cost, credit_account_id, debit_account_id, description ) - # Add analytic account in debit line - if not self.analytic_account_id or not res: - return res - - for num in range(0, 2): + for line in res: if ( - res[num][2]["account_id"] + line[2]["account_id"] != self.product_id.categ_id.property_stock_valuation_account_id.id ): - res[num][2].update({"analytic_account_id": self.analytic_account_id.id}) + # Add analytic account in debit line + if self.analytic_account_id: + line[2].update({"analytic_account_id": self.analytic_account_id.id}) + # Add analytic tags in debit line + if self.analytic_tag_ids: + line[2].update( + {"analytic_tag_ids": [(6, 0, self.analytic_tag_ids.ids)]} + ) return res @api.model diff --git a/stock_analytic/models/stock_scrap.py b/stock_analytic/models/stock_scrap.py index d20565975a..2767ec5add 100644 --- a/stock_analytic/models/stock_scrap.py +++ b/stock_analytic/models/stock_scrap.py @@ -9,8 +9,14 @@ class StockScrap(models.Model): analytic_account_id = fields.Many2one( string="Analytic Account", comodel_name="account.analytic.account" ) + analytic_tag_ids = fields.Many2many("account.analytic.tag", string="Analytic Tags") def _prepare_move_values(self): res = super()._prepare_move_values() - res.update({"analytic_account_id": self.analytic_account_id.id}) + res.update( + { + "analytic_account_id": self.analytic_account_id.id, + "analytic_tag_ids": [(6, 0, self.analytic_tag_ids.ids)], + } + ) return res diff --git a/stock_analytic/tests/test_stock_picking.py b/stock_analytic/tests/test_stock_picking.py index 7fe2e2c11c..536023a747 100644 --- a/stock_analytic/tests/test_stock_picking.py +++ b/stock_analytic/tests/test_stock_picking.py @@ -46,6 +46,12 @@ def setUp(self): self.stock_journal = self.env["account.journal"].create( {"name": "Stock Journal", "code": "STJTEST", "type": "general"} ) + self.analytic_tag_1 = self.env["account.analytic.tag"].create( + {"name": "analytic tag test 1"} + ) + self.analytic_tag_2 = self.env["account.analytic.tag"].create( + {"name": "analytic tag test 2"} + ) self.analytic_account = self.env.ref("analytic.analytic_agrolait") self.warehouse = self.env.ref("stock.warehouse0") self.location = self.warehouse.lot_stock_id @@ -65,7 +71,12 @@ def setUp(self): self.product.update({"categ_id": self.product_categ.id}) def _create_picking( - self, location_id, location_dest_id, picking_type_id, analytic_account_id=False + self, + location_id, + location_dest_id, + picking_type_id, + analytic_account_id=False, + analytic_tag_ids=False, ): picking_data = { "picking_type_id": picking_type_id.id, @@ -90,6 +101,7 @@ def _create_picking( "analytic_account_id": ( analytic_account_id.id if analytic_account_id else False ), + "analytic_tag_ids": [(6, 0, analytic_tag_ids if analytic_tag_ids else [])], } self.env["stock.move"].create(move_data) @@ -140,14 +152,23 @@ def _check_analytic_account_no_error(self, picking): self.assertEqual( acc_line.analytic_account_id.id, move.analytic_account_id.id ) + self.assertEqual( + acc_line.analytic_tag_ids.ids, move.analytic_tag_ids.ids + ) def _check_no_analytic_account(self, picking): criteria2 = [ ("move_id.ref", "=", picking.name), ("analytic_account_id", "!=", False), ] + criteria3 = [ + ("move_id.ref", "=", picking.name), + ("analytic_tag_ids", "!=", []), + ] line_count = self.env["account.move.line"].search_count(criteria2) self.assertEqual(line_count, 0) + line_count = self.env["account.move.line"].search_count(criteria3) + self.assertEqual(line_count, 0) def test_outgoing_picking_with_analytic(self): picking = self._create_picking( @@ -155,6 +176,7 @@ def test_outgoing_picking_with_analytic(self): self.dest_location, self.outgoing_picking_type, self.analytic_account, + [self.analytic_tag_1.id | self.analytic_tag_2.id], ) self.__update_qty_on_hand_product(self.product, 1) self._confirm_picking_no_error(picking) @@ -180,6 +202,7 @@ def test_incoming_picking_with_analytic(self): self.dest_location, self.incoming_picking_type, self.analytic_account, + [self.analytic_tag_1.id | self.analytic_tag_2.id], ) self._confirm_picking_no_error(picking) self._picking_done_no_error(picking) diff --git a/stock_analytic/tests/test_stock_scrap.py b/stock_analytic/tests/test_stock_scrap.py index 99a05a5887..69f03960a7 100644 --- a/stock_analytic/tests/test_stock_scrap.py +++ b/stock_analytic/tests/test_stock_scrap.py @@ -11,6 +11,12 @@ def setUp(self): self.warehouse = self.env.ref("stock.warehouse0") self.location = self.warehouse.lot_stock_id self.analytic_account = self.env.ref("analytic.analytic_agrolait") + self.analytic_tag_1 = self.env["account.analytic.tag"].create( + {"name": "analytic tag test 1"} + ) + self.analytic_tag_2 = self.env["account.analytic.tag"].create( + {"name": "analytic tag test 2"} + ) def __update_qty_on_hand_product(self, product, new_qty): qty_wizard = self.env["stock.change.product.qty"].create( @@ -22,7 +28,7 @@ def __update_qty_on_hand_product(self, product, new_qty): ) qty_wizard.change_product_qty() - def _create_scrap(self, analytic_account_id=False): + def _create_scrap(self, analytic_account_id=False, analytic_tag_ids=False): scrap_data = { "product_id": self.product.id, "scrap_qty": 1.00, @@ -31,6 +37,7 @@ def _create_scrap(self, analytic_account_id=False): "analytic_account_id": analytic_account_id and analytic_account_id.id or False, + "analytic_tag_ids": [(6, 0, analytic_tag_ids if analytic_tag_ids else [])], } return self.env["stock.scrap"].create(scrap_data) @@ -49,6 +56,9 @@ def _check_analytic_account_no_error(self, scrap): self.assertEqual( acc_line.analytic_account_id.id, scrap.analytic_account_id.id ) + self.assertEqual( + acc_line.analytic_tag_ids.ids, scrap.analytic_tag_ids.ids + ) def test_scrap_without_analytic(self): self.__update_qty_on_hand_product(self.product, 1) @@ -57,6 +67,8 @@ def test_scrap_without_analytic(self): def test_scrap_with_analytic(self): self.__update_qty_on_hand_product(self.product, 1) - scrap = self._create_scrap(self.analytic_account) + scrap = self._create_scrap( + self.analytic_account, [self.analytic_tag_1.id | self.analytic_tag_2.id] + ) self._validate_scrap_no_error(scrap) self._check_analytic_account_no_error(scrap) diff --git a/stock_analytic/views/stock_move_views.xml b/stock_analytic/views/stock_move_views.xml index 6820140f50..e545cb81f0 100644 --- a/stock_analytic/views/stock_move_views.xml +++ b/stock_analytic/views/stock_move_views.xml @@ -62,6 +62,7 @@ position="after" > + diff --git a/stock_analytic/views/stock_scrap.xml b/stock_analytic/views/stock_scrap.xml index 36e905f959..13b3162f8f 100644 --- a/stock_analytic/views/stock_scrap.xml +++ b/stock_analytic/views/stock_scrap.xml @@ -6,6 +6,7 @@ + From adff18991ad4b6c4761b0868b96578761fa01179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Alan=20Ramos=20Rodr=C3=ADguez?= Date: Wed, 27 Jan 2021 19:10:14 -0600 Subject: [PATCH 35/61] [IMP] stock_analytic: black, isort, prettier --- stock_analytic/models/stock.py | 3 ++- stock_analytic/tests/test_stock_picking.py | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/stock_analytic/models/stock.py b/stock_analytic/models/stock.py index d2e4a9803d..914ebb46bd 100644 --- a/stock_analytic/models/stock.py +++ b/stock_analytic/models/stock.py @@ -12,7 +12,8 @@ class StockMove(models.Model): _inherit = "stock.move" analytic_account_id = fields.Many2one( - string="Analytic Account", comodel_name="account.analytic.account", + string="Analytic Account", + comodel_name="account.analytic.account", ) analytic_tag_ids = fields.Many2many("account.analytic.tag", string="Analytic Tags") diff --git a/stock_analytic/tests/test_stock_picking.py b/stock_analytic/tests/test_stock_picking.py index 536023a747..be3fa2175e 100644 --- a/stock_analytic/tests/test_stock_picking.py +++ b/stock_analytic/tests/test_stock_picking.py @@ -187,7 +187,9 @@ def test_outgoing_picking_with_analytic(self): def test_outgoing_picking_without_analytic(self): picking = self._create_picking( - self.location, self.dest_location, self.outgoing_picking_type, + self.location, + self.dest_location, + self.outgoing_picking_type, ) self.__update_qty_on_hand_product(self.product, 1) self._confirm_picking_no_error(picking) From f83797fe07c873fa15fd525012e774688b7fb876 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Alan=20Ramos=20Rodr=C3=ADguez?= Date: Wed, 27 Jan 2021 19:43:55 -0600 Subject: [PATCH 36/61] [MIG] stock_analytic: Migration to 14.0 --- stock_analytic/README.rst | 73 ++- stock_analytic/__manifest__.py | 2 +- stock_analytic/i18n/it.po | 3 - stock_analytic/i18n/ro.po | 3 - stock_analytic/i18n/stock_analytic.pot | 26 +- stock_analytic/readme/CONTRIBUTORS.rst | 10 + stock_analytic/readme/DESCRIPTION.rst | 2 + stock_analytic/readme/USAGE.rst | 19 + stock_analytic/static/description/index.html | 458 +++++++++++++++++++ stock_analytic/tests/test_stock_picking.py | 4 +- stock_analytic/views/stock_move_views.xml | 35 +- stock_analytic/views/stock_scrap.xml | 11 +- 12 files changed, 605 insertions(+), 41 deletions(-) create mode 100644 stock_analytic/readme/CONTRIBUTORS.rst create mode 100644 stock_analytic/readme/DESCRIPTION.rst create mode 100644 stock_analytic/readme/USAGE.rst create mode 100644 stock_analytic/static/description/index.html diff --git a/stock_analytic/README.rst b/stock_analytic/README.rst index 918a416410..ba96d3f281 100644 --- a/stock_analytic/README.rst +++ b/stock_analytic/README.rst @@ -1,20 +1,43 @@ -.. 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 - ============== Stock Analytic ============== +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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%2Faccount--analytic-lightgray.png?logo=github + :target: https://github.com/OCA/account-analytic/tree/14.0/stock_analytic + :alt: OCA/account-analytic +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/account-analytic-14-0/account-analytic-14-0-stock_analytic + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/87/14.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + Adds an analytic account and analytic tags in stock move to be able to get analytic information when generating the journal items. +**Table of contents** + +.. contents:: + :local: Usage ===== To Assign an Analytic Account and Analytic Tags to a Stock Move ---------------------------------------------------------------- +=============================================================== You need to: @@ -22,7 +45,7 @@ You need to: #. Add move lines and fill **analytic account** and **analytic tags** fields Assigned Journal Items created from Stock Move with Analytic Account and Analytic Tags --------------------------------------------------------------------------------------- +====================================================================================== If stock move automatically create journal entry, the journal entry will contain journal items with following rule: @@ -33,24 +56,29 @@ contain journal items with following rule: assigned to an analytic account according to the stock move's analytic account. The same logic applies to analytic tags. -.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas - :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/87/13.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. +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 +~~~~~~~ + +* Julius Network Solutions +* ClearCorp +* OpenSynergy Indonesia +* Hibou Corp. + Contributors ------------- +~~~~~~~~~~~~ * Hanane ELKHAL * Yvan Patry @@ -61,18 +89,21 @@ Contributors * Michael Viriyananda * Aaron Henriquez * Jared Kipe +* Alan Ramos + +Maintainers +~~~~~~~~~~~ -Maintainer ----------- +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/account-analytic `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/stock_analytic/__manifest__.py b/stock_analytic/__manifest__.py index ef2b77bb47..dac4ba4dc3 100644 --- a/stock_analytic/__manifest__.py +++ b/stock_analytic/__manifest__.py @@ -7,7 +7,7 @@ { "name": "Stock Analytic", "summary": "Adds an analytic account and analytic tags in stock move", - "version": "13.0.1.0.0", + "version": "14.0.1.0.0", "author": "Julius Network Solutions, " "ClearCorp, OpenSynergy Indonesia, " "Hibou Corp., " diff --git a/stock_analytic/i18n/it.po b/stock_analytic/i18n/it.po index 88f9beb3e3..3e54c4e3bd 100644 --- a/stock_analytic/i18n/it.po +++ b/stock_analytic/i18n/it.po @@ -53,6 +53,3 @@ msgstr "" #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" msgstr "Movimento di magazzino" - -#~ msgid "Quants" -#~ msgstr "Quantità" diff --git a/stock_analytic/i18n/ro.po b/stock_analytic/i18n/ro.po index 1a8a1c8b5f..fe3de58f5d 100644 --- a/stock_analytic/i18n/ro.po +++ b/stock_analytic/i18n/ro.po @@ -53,6 +53,3 @@ msgstr "" #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" msgstr "Mișcare stoc" - -#~ msgid "Quants" -#~ msgstr "Poziții de stoc" diff --git a/stock_analytic/i18n/stock_analytic.pot b/stock_analytic/i18n/stock_analytic.pot index 441e12c367..9aacb60bba 100644 --- a/stock_analytic/i18n/stock_analytic.pot +++ b/stock_analytic/i18n/stock_analytic.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 13.0\n" +"Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" @@ -27,6 +27,30 @@ msgstr "" msgid "Analytic Tags" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_product_product__display_name +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__display_name +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__display_name +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__display_name +msgid "Display Name" +msgstr "" + +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_product_product__id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__id +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__id +msgid "ID" +msgstr "" + +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_product_product____last_update +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move____last_update +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line____last_update +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap____last_update +msgid "Last Modified on" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_product_product msgid "Product" diff --git a/stock_analytic/readme/CONTRIBUTORS.rst b/stock_analytic/readme/CONTRIBUTORS.rst new file mode 100644 index 0000000000..00be6ead0e --- /dev/null +++ b/stock_analytic/readme/CONTRIBUTORS.rst @@ -0,0 +1,10 @@ +* Hanane ELKHAL +* Yvan Patry +* Pierre +* Mathieu VATEL +* Fabio Vílchez +* Andhitia Rama +* Michael Viriyananda +* Aaron Henriquez +* Jared Kipe +* Alan Ramos diff --git a/stock_analytic/readme/DESCRIPTION.rst b/stock_analytic/readme/DESCRIPTION.rst new file mode 100644 index 0000000000..2e8ec57ce6 --- /dev/null +++ b/stock_analytic/readme/DESCRIPTION.rst @@ -0,0 +1,2 @@ +Adds an analytic account and analytic tags in stock move to be able to get +analytic information when generating the journal items. diff --git a/stock_analytic/readme/USAGE.rst b/stock_analytic/readme/USAGE.rst new file mode 100644 index 0000000000..13df40e283 --- /dev/null +++ b/stock_analytic/readme/USAGE.rst @@ -0,0 +1,19 @@ +To Assign an Analytic Account and Analytic Tags to a Stock Move +=============================================================== + +You need to: + +#. Create manually or open draft picking +#. Add move lines and fill **analytic account** and **analytic tags** fields + +Assigned Journal Items created from Stock Move with Analytic Account and Analytic Tags +====================================================================================== + +If stock move automatically create journal entry, the journal entry will +contain journal items with following rule: + +#. Journal item with account equal to product's valuation account will not be + assigned to any analytic account, neither analytic tags +#. Journal item with account different to product's valuation account will be + assigned to an analytic account according to the stock move's analytic + account. The same logic applies to analytic tags. diff --git a/stock_analytic/static/description/index.html b/stock_analytic/static/description/index.html new file mode 100644 index 0000000000..5a7d26f6e9 --- /dev/null +++ b/stock_analytic/static/description/index.html @@ -0,0 +1,458 @@ + + + + + + +Stock Analytic + + + +
+

Stock Analytic

+ + +

Beta License: AGPL-3 OCA/account-analytic Translate me on Weblate Try me on Runbot

+

Adds an analytic account and analytic tags in stock move to be able to get +analytic information when generating the journal items.

+

Table of contents

+ +
+

Usage

+
+
+

To Assign an Analytic Account and Analytic Tags to a Stock Move

+

You need to:

+
    +
  1. Create manually or open draft picking
    2. +
  2. Add move lines and fill analytic account and analytic tags fields
    3. +
+
+
+

Assigned Journal Items created from Stock Move with Analytic Account and Analytic Tags

+

If stock move automatically create journal entry, the journal entry will +contain journal items with following rule:

+
    +
  1. Journal item with account equal to product’s valuation account will not be +assigned to any analytic account, neither analytic tags
    2. +
  2. Journal item with account different to product’s valuation account will be +assigned to an analytic account according to the stock move’s analytic +account. The same logic applies to analytic tags.
    3. +
+
+
+

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

+
    +
  • Julius Network Solutions
    • +
  • ClearCorp
    • +
  • OpenSynergy Indonesia
    • +
  • Hibou Corp.
    • +
+
+
+

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/account-analytic project on GitHub.

+

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

+
+
+
+ + diff --git a/stock_analytic/tests/test_stock_picking.py b/stock_analytic/tests/test_stock_picking.py index be3fa2175e..cd4a040cf9 100644 --- a/stock_analytic/tests/test_stock_picking.py +++ b/stock_analytic/tests/test_stock_picking.py @@ -93,7 +93,7 @@ def _create_picking( "location_id": location_id.id, "location_dest_id": location_dest_id.id, "date": datetime.now().strftime("%Y-%m-%d %H:%M:%S"), - "date_expected": datetime.now().strftime("%Y-%m-%d %H:%M:%S"), + "date_deadline": datetime.now().strftime("%Y-%m-%d %H:%M:%S"), "name": self.product.name, "procure_method": "make_to_stock", "product_uom": self.product.uom_id.id, @@ -163,7 +163,7 @@ def _check_no_analytic_account(self, picking): ] criteria3 = [ ("move_id.ref", "=", picking.name), - ("analytic_tag_ids", "!=", []), + ("analytic_tag_ids", "not in", []), ] line_count = self.env["account.move.line"].search_count(criteria2) self.assertEqual(line_count, 0) diff --git a/stock_analytic/views/stock_move_views.xml b/stock_analytic/views/stock_move_views.xml index e545cb81f0..5fb7e233ab 100644 --- a/stock_analytic/views/stock_move_views.xml +++ b/stock_analytic/views/stock_move_views.xml @@ -1,13 +1,16 @@ - + stock.move.picking.tree stock.move - + - + @@ -17,7 +20,10 @@ - + @@ -27,7 +33,10 @@ - + @@ -37,7 +46,10 @@ - + - - + + diff --git a/stock_analytic/views/stock_scrap.xml b/stock_analytic/views/stock_scrap.xml index 13b3162f8f..df047ca449 100644 --- a/stock_analytic/views/stock_scrap.xml +++ b/stock_analytic/views/stock_scrap.xml @@ -5,8 +5,15 @@ - - + + From 52fdb1466a4a479503dee729ae6b6774e8cad8b5 Mon Sep 17 00:00:00 2001 From: Denis Roussel Date: Fri, 26 Nov 2021 08:43:37 +0100 Subject: [PATCH 37/61] [14.0][IMP] stock_analytic: Transmit analytic account to new moves --- stock_analytic/models/stock.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/stock_analytic/models/stock.py b/stock_analytic/models/stock.py index 914ebb46bd..ff228d1871 100644 --- a/stock_analytic/models/stock.py +++ b/stock_analytic/models/stock.py @@ -39,6 +39,20 @@ def _prepare_account_move_line( ) return res + def _prepare_procurement_values(self): + """ + Allows to transmit analytic account from moves to new + moves through procurement. + """ + res = super()._prepare_procurement_values() + if self.analytic_account_id: + res.update( + { + "analytic_account_id": self.analytic_account_id.id, + } + ) + return res + @api.model def _prepare_merge_moves_distinct_fields(self): fields = super()._prepare_merge_moves_distinct_fields() From 32af6900b20520f57fa4cee33c895456fe90cdf9 Mon Sep 17 00:00:00 2001 From: Rodrigo Macedo Date: Tue, 1 Feb 2022 17:27:04 +0000 Subject: [PATCH 38/61] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (6 of 6 strings) Translation: account-analytic-14.0/account-analytic-14.0-stock_analytic Translate-URL: https://translation.odoo-community.org/projects/account-analytic-14-0/account-analytic-14-0-stock_analytic/pt_BR/ --- stock_analytic/i18n/pt_BR.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/stock_analytic/i18n/pt_BR.po b/stock_analytic/i18n/pt_BR.po index 0370e551b6..770666bdca 100644 --- a/stock_analytic/i18n/pt_BR.po +++ b/stock_analytic/i18n/pt_BR.po @@ -9,16 +9,16 @@ msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-11-19 22:13+0000\n" -"PO-Revision-Date: 2020-08-12 18:59+0000\n" -"Last-Translator: Rodrigo Macedo \n" -"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/" -"teams/23907/pt_BR/)\n" +"PO-Revision-Date: 2022-02-01 19:33+0000\n" +"Last-Translator: Rodrigo Macedo \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" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 3.10\n" +"X-Generator: Weblate 4.3.2\n" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id @@ -32,7 +32,7 @@ msgstr "Conta analítica" #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids #: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids msgid "Analytic Tags" -msgstr "" +msgstr "Etiquetas Analíticas" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_product_product From 8ca0569cf0d774eea4094e62bcab1007ef4dc6bc Mon Sep 17 00:00:00 2001 From: Noel estudillo Date: Mon, 21 Mar 2022 10:32:09 +0000 Subject: [PATCH 39/61] Translated using Weblate (Catalan) Currently translated at 100.0% (6 of 6 strings) Translation: account-analytic-14.0/account-analytic-14.0-stock_analytic Translate-URL: https://translation.odoo-community.org/projects/account-analytic-14-0/account-analytic-14-0-stock_analytic/ca/ --- stock_analytic/__manifest__.py | 2 +- stock_analytic/i18n/ca.po | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/stock_analytic/__manifest__.py b/stock_analytic/__manifest__.py index dac4ba4dc3..cb0a9de4e5 100644 --- a/stock_analytic/__manifest__.py +++ b/stock_analytic/__manifest__.py @@ -7,7 +7,7 @@ { "name": "Stock Analytic", "summary": "Adds an analytic account and analytic tags in stock move", - "version": "14.0.1.0.0", + "version": "14.0.1.0.1", "author": "Julius Network Solutions, " "ClearCorp, OpenSynergy Indonesia, " "Hibou Corp., " diff --git a/stock_analytic/i18n/ca.po b/stock_analytic/i18n/ca.po index 30dfa6f385..4ae84ca3f0 100644 --- a/stock_analytic/i18n/ca.po +++ b/stock_analytic/i18n/ca.po @@ -9,15 +9,15 @@ msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-11-19 22:13+0000\n" -"PO-Revision-Date: 2019-10-07 11:10+0000\n" -"Last-Translator: Jaume Planas \n" +"PO-Revision-Date: 2022-03-21 13:17+0000\n" +"Last-Translator: Noel estudillo \n" "Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.8\n" +"X-Generator: Weblate 4.3.2\n" #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id @@ -31,22 +31,22 @@ msgstr "Compte analític" #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids #: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids msgid "Analytic Tags" -msgstr "" +msgstr "Etiquetes analítiques" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_product_product msgid "Product" -msgstr "" +msgstr "Producte" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" -msgstr "" +msgstr "Moviments de producte (línia de moviment d'existències)" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_scrap msgid "Scrap" -msgstr "" +msgstr "Ferralla" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move From 5466b2be166c08931684d6f7d936e5fad318fd17 Mon Sep 17 00:00:00 2001 From: Denis Roussel Date: Tue, 28 Dec 2021 09:44:21 +0100 Subject: [PATCH 40/61] [14.0][IMP] stock_analytic: Add analytic on move lines tree view --- stock_analytic/__manifest__.py | 6 +++++- stock_analytic/views/stock_move_line.xml | 27 ++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 stock_analytic/views/stock_move_line.xml diff --git a/stock_analytic/__manifest__.py b/stock_analytic/__manifest__.py index cb0a9de4e5..804ccbec57 100644 --- a/stock_analytic/__manifest__.py +++ b/stock_analytic/__manifest__.py @@ -16,6 +16,10 @@ "category": "Warehouse Management", "license": "AGPL-3", "depends": ["stock_account", "analytic"], - "data": ["views/stock_move_views.xml", "views/stock_scrap.xml"], + "data": [ + "views/stock_move_views.xml", + "views/stock_scrap.xml", + "views/stock_move_line.xml", + ], "installable": True, } diff --git a/stock_analytic/views/stock_move_line.xml b/stock_analytic/views/stock_move_line.xml new file mode 100644 index 0000000000..30456e640d --- /dev/null +++ b/stock_analytic/views/stock_move_line.xml @@ -0,0 +1,27 @@ + + + + + stock.move.line.tree (in stock_analytic) + stock.move.line + + + + + + + + + + stock.move.line.search (in stock_analytic) + stock.move.line + + + + + + + + + From e6485c2d9bc6cc086ee1414659abeaca446df1c5 Mon Sep 17 00:00:00 2001 From: Denis Roussel Date: Tue, 17 May 2022 09:10:30 +0200 Subject: [PATCH 41/61] [IMP] stock_analytic: Take into account extra move lines flow If we add extra move lines in stock pickings and wanted to set the analytic account on it, as the related move is not yet created, the behaviour of the related field is not wanted. So, store the analytic account on move line level too and add it in the values preparation hooks. --- stock_analytic/__manifest__.py | 2 +- .../migrations/14.0.2.0.0/pre-migrate.py | 29 +++++++++++++++++++ stock_analytic/models/stock.py | 25 +++++++++++++++- stock_analytic/tests/test_stock_picking.py | 29 +++++++++++++++++++ stock_analytic/views/stock_move_line.xml | 16 ++++++++++ 5 files changed, 99 insertions(+), 2 deletions(-) create mode 100644 stock_analytic/migrations/14.0.2.0.0/pre-migrate.py diff --git a/stock_analytic/__manifest__.py b/stock_analytic/__manifest__.py index 804ccbec57..ef26d972da 100644 --- a/stock_analytic/__manifest__.py +++ b/stock_analytic/__manifest__.py @@ -7,7 +7,7 @@ { "name": "Stock Analytic", "summary": "Adds an analytic account and analytic tags in stock move", - "version": "14.0.1.0.1", + "version": "14.0.2.0.0", "author": "Julius Network Solutions, " "ClearCorp, OpenSynergy Indonesia, " "Hibou Corp., " diff --git a/stock_analytic/migrations/14.0.2.0.0/pre-migrate.py b/stock_analytic/migrations/14.0.2.0.0/pre-migrate.py new file mode 100644 index 0000000000..50533a5f29 --- /dev/null +++ b/stock_analytic/migrations/14.0.2.0.0/pre-migrate.py @@ -0,0 +1,29 @@ +# Copyright 2022 ACSONE SA/NV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from openupgradelib import openupgrade + + +def _fill_in_move_line(env): + analytic_field = [ + ( + "analytic_account_id", + "stock.move.line", + "stock_move_line", + "many2one", + "int4", + "stock_analytic", + ) + ] + openupgrade.add_fields(env, analytic_field) + query = """ + UPDATE stock_move_line + SET analytic_account_id = sm.analytic_account_id + FROM stock_move sm WHERE sm.id = stock_move_line.move_id + AND sm.analytic_account_id IS NOT NULL + """ + openupgrade.logged_query(env.cr, query) + + +@openupgrade.migrate() +def migrate(env, version): + _fill_in_move_line(env) diff --git a/stock_analytic/models/stock.py b/stock_analytic/models/stock.py index ff228d1871..3d992b8678 100644 --- a/stock_analytic/models/stock.py +++ b/stock_analytic/models/stock.py @@ -59,8 +59,31 @@ def _prepare_merge_moves_distinct_fields(self): fields.append("analytic_account_id") return fields + def _prepare_move_line_vals(self, quantity=None, reserved_quant=None): + """ + We fill in the analytic account when creating the move line from + the move + """ + res = super()._prepare_move_line_vals( + quantity=quantity, reserved_quant=reserved_quant + ) + if self.analytic_account_id: + res.update({"analytic_account_id": self.analytic_account_id.id}) + return res + class StockMoveLine(models.Model): _inherit = "stock.move.line" - analytic_account_id = fields.Many2one(related="move_id.analytic_account_id") + analytic_account_id = fields.Many2one(comodel_name="account.analytic.account") + + @api.model + def _prepare_stock_move_vals(self): + """ + In the case move lines are created manually, we should fill in the + new move created here with the analytic account if filled in. + """ + res = super()._prepare_stock_move_vals() + if self.analytic_account_id: + res.update({"analytic_account_id": self.analytic_account_id.id}) + return res diff --git a/stock_analytic/tests/test_stock_picking.py b/stock_analytic/tests/test_stock_picking.py index cd4a040cf9..c50afb9dde 100644 --- a/stock_analytic/tests/test_stock_picking.py +++ b/stock_analytic/tests/test_stock_picking.py @@ -15,6 +15,7 @@ def setUp(self): super(TestStockPicking, self).setUp() self.product = self.env.ref("product.product_product_4") + self.product_2 = self.env.ref("product.product_product_5") self.product_categ = self.env.ref("product.product_category_5") self.valuation_account = self.env["account.account"].create( { @@ -210,3 +211,31 @@ def test_incoming_picking_with_analytic(self): self._picking_done_no_error(picking) self._check_account_move_no_error(picking) self._check_analytic_account_no_error(picking) + + def test_picking_add_extra_move_line(self): + picking = self._create_picking( + self.location, + self.dest_location, + self.outgoing_picking_type, + self.analytic_account, + [self.analytic_tag_1.id | self.analytic_tag_2.id], + ) + move_before = picking.move_lines + + self.env["stock.move.line"].create( + { + "product_id": self.product_2.id, + "location_id": self.location.id, + "location_dest_id": self.dest_location.id, + "date": datetime.now().strftime("%Y-%m-%d %H:%M:%S"), + "product_uom_id": self.product_2.uom_id.id, + "product_uom_qty": 1.0, + "analytic_account_id": self.analytic_account.id, + "company_id": self.env.company.id, + "picking_id": picking.id, + } + ) + + move_after = picking.move_lines - move_before + + self.assertEqual(self.analytic_account, move_after.analytic_account_id) diff --git a/stock_analytic/views/stock_move_line.xml b/stock_analytic/views/stock_move_line.xml index 30456e640d..5b4b852067 100644 --- a/stock_analytic/views/stock_move_line.xml +++ b/stock_analytic/views/stock_move_line.xml @@ -24,4 +24,20 @@ + + + stock.move.line.detailed.tree (in stock_analytic) + stock.move.line + + + + + + + + + From fd6bb56180e501d26a437de12d35575bfc3ac15d Mon Sep 17 00:00:00 2001 From: nicolas Date: Tue, 6 Dec 2022 14:08:02 -0300 Subject: [PATCH 42/61] [MIG] stock_analytic: Migration to 16.0 --- stock_analytic/README.rst | 11 +- stock_analytic/__manifest__.py | 7 +- stock_analytic/i18n/ca.po | 34 +++-- stock_analytic/i18n/cs_CZ.po | 24 ++-- stock_analytic/i18n/de.po | 24 ++-- stock_analytic/i18n/el_GR.po | 24 ++-- stock_analytic/i18n/es.po | 24 ++-- stock_analytic/i18n/es_EC.po | 24 ++-- stock_analytic/i18n/es_MX.po | 24 ++-- stock_analytic/i18n/fi.po | 24 ++-- stock_analytic/i18n/fr.po | 24 ++-- stock_analytic/i18n/gl.po | 24 ++-- stock_analytic/i18n/gu_IN.po | 24 ++-- stock_analytic/i18n/hi_IN.po | 24 ++-- stock_analytic/i18n/hr.po | 24 ++-- stock_analytic/i18n/hr_HR.po | 24 ++-- stock_analytic/i18n/hu.po | 24 ++-- stock_analytic/i18n/it.po | 24 ++-- stock_analytic/i18n/nl.po | 24 ++-- stock_analytic/i18n/pt.po | 24 ++-- stock_analytic/i18n/pt_BR.po | 38 ++--- stock_analytic/i18n/pt_PT.po | 24 ++-- stock_analytic/i18n/ro.po | 24 ++-- stock_analytic/i18n/sk_SK.po | 24 ++-- stock_analytic/i18n/sl.po | 24 ++-- stock_analytic/i18n/stock_analytic.pot | 47 ++----- stock_analytic/i18n/tr.po | 21 ++- stock_analytic/i18n/tr_TR.po | 21 ++- stock_analytic/i18n/vi_VN.po | 21 ++- stock_analytic/i18n/zh_CN.po | 24 ++-- .../migrations/14.0.2.0.0/pre-migrate.py | 29 ---- stock_analytic/models/__init__.py | 1 - stock_analytic/models/product_product.py | 44 ------ stock_analytic/models/stock.py | 48 +++---- stock_analytic/models/stock_scrap.py | 13 +- stock_analytic/readme/CONTRIBUTORS.rst | 1 + stock_analytic/static/description/index.html | 7 +- stock_analytic/tests/test_stock_picking.py | 104 +++++++------- stock_analytic/tests/test_stock_scrap.py | 26 ++-- ...ove_line.xml => stock_move_line_views.xml} | 25 +++- stock_analytic/views/stock_move_views.xml | 132 ++++++------------ stock_analytic/views/stock_picking_views.xml | 22 +++ stock_analytic/views/stock_scrap.xml | 20 --- stock_analytic/views/stock_scrap_views.xml | 32 +++++ 44 files changed, 523 insertions(+), 709 deletions(-) delete mode 100644 stock_analytic/migrations/14.0.2.0.0/pre-migrate.py delete mode 100644 stock_analytic/models/product_product.py rename stock_analytic/views/{stock_move_line.xml => stock_move_line_views.xml} (58%) create mode 100644 stock_analytic/views/stock_picking_views.xml delete mode 100644 stock_analytic/views/stock_scrap.xml create mode 100644 stock_analytic/views/stock_scrap_views.xml diff --git a/stock_analytic/README.rst b/stock_analytic/README.rst index ba96d3f281..8fae894e81 100644 --- a/stock_analytic/README.rst +++ b/stock_analytic/README.rst @@ -14,13 +14,13 @@ Stock Analytic :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--analytic-lightgray.png?logo=github - :target: https://github.com/OCA/account-analytic/tree/14.0/stock_analytic + :target: https://github.com/OCA/account-analytic/tree/16.0/stock_analytic :alt: OCA/account-analytic .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/account-analytic-14-0/account-analytic-14-0-stock_analytic + :target: https://translation.odoo-community.org/projects/account-analytic-16-0/account-analytic-16-0-stock_analytic :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/87/14.0 + :target: https://runbot.odoo-community.org/runbot/87/16.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -62,7 +62,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. @@ -90,6 +90,7 @@ Contributors * Aaron Henriquez * Jared Kipe * Alan Ramos +* Mantas Šniukas Maintainers ~~~~~~~~~~~ @@ -104,6 +105,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/account-analytic `_ project on GitHub. +This module is part of the `OCA/account-analytic `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/stock_analytic/__manifest__.py b/stock_analytic/__manifest__.py index ef26d972da..d5124f16f3 100644 --- a/stock_analytic/__manifest__.py +++ b/stock_analytic/__manifest__.py @@ -7,7 +7,7 @@ { "name": "Stock Analytic", "summary": "Adds an analytic account and analytic tags in stock move", - "version": "14.0.2.0.0", + "version": "16.0.1.0.0", "author": "Julius Network Solutions, " "ClearCorp, OpenSynergy Indonesia, " "Hibou Corp., " @@ -18,8 +18,9 @@ "depends": ["stock_account", "analytic"], "data": [ "views/stock_move_views.xml", - "views/stock_scrap.xml", - "views/stock_move_line.xml", + "views/stock_scrap_views.xml", + "views/stock_move_line_views.xml", + "views/stock_picking_views.xml", ], "installable": True, } diff --git a/stock_analytic/i18n/ca.po b/stock_analytic/i18n/ca.po index 4ae84ca3f0..1a8a5eceee 100644 --- a/stock_analytic/i18n/ca.po +++ b/stock_analytic/i18n/ca.po @@ -20,23 +20,18 @@ msgstr "" "X-Generator: Weblate 4.3.2\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id -#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic -msgid "Analytic Account" -msgstr "Compte analític" - -#. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids -msgid "Analytic Tags" -msgstr "Etiquetes analítiques" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution +msgid "Analytic" +msgstr "" #. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_product_product -msgid "Product" -msgstr "Producte" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_precision +msgid "Analytic Precision" +msgstr "" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line @@ -52,3 +47,12 @@ msgstr "Ferralla" #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" msgstr "Moviment d'estoc" + +#~ msgid "Analytic Account" +#~ msgstr "Compte analític" + +#~ msgid "Analytic Tags" +#~ msgstr "Etiquetes analítiques" + +#~ msgid "Product" +#~ msgstr "Producte" diff --git a/stock_analytic/i18n/cs_CZ.po b/stock_analytic/i18n/cs_CZ.po index 4f889066e6..ab9671f999 100644 --- a/stock_analytic/i18n/cs_CZ.po +++ b/stock_analytic/i18n/cs_CZ.po @@ -20,22 +20,17 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id -#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic -msgid "Analytic Account" -msgstr "Analytický účet" - -#. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids -msgid "Analytic Tags" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution +msgid "Analytic" msgstr "" #. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_product_product -msgid "Product" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_precision +msgid "Analytic Precision" msgstr "" #. module: stock_analytic @@ -52,3 +47,6 @@ msgstr "" #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" msgstr "Posunout sklad" + +#~ msgid "Analytic Account" +#~ msgstr "Analytický účet" diff --git a/stock_analytic/i18n/de.po b/stock_analytic/i18n/de.po index d5bb6361d4..c318fbec2b 100644 --- a/stock_analytic/i18n/de.po +++ b/stock_analytic/i18n/de.po @@ -20,22 +20,17 @@ msgstr "" "X-Generator: Weblate 3.10\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id -#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic -msgid "Analytic Account" -msgstr "Kostenstelle" - -#. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids -msgid "Analytic Tags" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution +msgid "Analytic" msgstr "" #. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_product_product -msgid "Product" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_precision +msgid "Analytic Precision" msgstr "" #. module: stock_analytic @@ -52,3 +47,6 @@ msgstr "Ausschuss" #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" msgstr "Lagerbewegung" + +#~ msgid "Analytic Account" +#~ msgstr "Kostenstelle" diff --git a/stock_analytic/i18n/el_GR.po b/stock_analytic/i18n/el_GR.po index 27ac28885b..de5ce01c1d 100644 --- a/stock_analytic/i18n/el_GR.po +++ b/stock_analytic/i18n/el_GR.po @@ -20,22 +20,17 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id -#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic -msgid "Analytic Account" -msgstr "Αναλυτικός Λογαριασμός" - -#. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids -msgid "Analytic Tags" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution +msgid "Analytic" msgstr "" #. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_product_product -msgid "Product" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_precision +msgid "Analytic Precision" msgstr "" #. module: stock_analytic @@ -52,3 +47,6 @@ msgstr "" #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Αναλυτικός Λογαριασμός" diff --git a/stock_analytic/i18n/es.po b/stock_analytic/i18n/es.po index 9ed7fca354..cb0083b120 100644 --- a/stock_analytic/i18n/es.po +++ b/stock_analytic/i18n/es.po @@ -21,22 +21,17 @@ msgstr "" "X-Generator: Weblate 3.10\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id -#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic -msgid "Analytic Account" -msgstr "Cuenta analítica" - -#. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids -msgid "Analytic Tags" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution +msgid "Analytic" msgstr "" #. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_product_product -msgid "Product" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_precision +msgid "Analytic Precision" msgstr "" #. module: stock_analytic @@ -53,3 +48,6 @@ msgstr "Restos" #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" msgstr "Movimiento de existencias" + +#~ msgid "Analytic Account" +#~ msgstr "Cuenta analítica" diff --git a/stock_analytic/i18n/es_EC.po b/stock_analytic/i18n/es_EC.po index 2ad4b74296..99a8c8e3d4 100644 --- a/stock_analytic/i18n/es_EC.po +++ b/stock_analytic/i18n/es_EC.po @@ -20,22 +20,17 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id -#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic -msgid "Analytic Account" -msgstr "Cuenta Analítica" - -#. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids -msgid "Analytic Tags" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution +msgid "Analytic" msgstr "" #. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_product_product -msgid "Product" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_precision +msgid "Analytic Precision" msgstr "" #. module: stock_analytic @@ -52,3 +47,6 @@ msgstr "" #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Cuenta Analítica" diff --git a/stock_analytic/i18n/es_MX.po b/stock_analytic/i18n/es_MX.po index 7e6c3ead61..60d7885cb5 100644 --- a/stock_analytic/i18n/es_MX.po +++ b/stock_analytic/i18n/es_MX.po @@ -20,22 +20,17 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id -#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic -msgid "Analytic Account" -msgstr "Cuenta analítica" - -#. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids -msgid "Analytic Tags" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution +msgid "Analytic" msgstr "" #. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_product_product -msgid "Product" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_precision +msgid "Analytic Precision" msgstr "" #. module: stock_analytic @@ -52,3 +47,6 @@ msgstr "" #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Cuenta analítica" diff --git a/stock_analytic/i18n/fi.po b/stock_analytic/i18n/fi.po index 5c49158d20..5f25d79c62 100644 --- a/stock_analytic/i18n/fi.po +++ b/stock_analytic/i18n/fi.po @@ -19,22 +19,17 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id -#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic -msgid "Analytic Account" -msgstr "Analyyttinen tili" - -#. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids -msgid "Analytic Tags" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution +msgid "Analytic" msgstr "" #. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_product_product -msgid "Product" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_precision +msgid "Analytic Precision" msgstr "" #. module: stock_analytic @@ -51,3 +46,6 @@ msgstr "" #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Analyyttinen tili" diff --git a/stock_analytic/i18n/fr.po b/stock_analytic/i18n/fr.po index a90db14400..a22befbda2 100644 --- a/stock_analytic/i18n/fr.po +++ b/stock_analytic/i18n/fr.po @@ -19,22 +19,17 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id -#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic -msgid "Analytic Account" -msgstr "Compte analytique" - -#. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids -msgid "Analytic Tags" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution +msgid "Analytic" msgstr "" #. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_product_product -msgid "Product" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_precision +msgid "Analytic Precision" msgstr "" #. module: stock_analytic @@ -51,3 +46,6 @@ msgstr "" #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Compte analytique" diff --git a/stock_analytic/i18n/gl.po b/stock_analytic/i18n/gl.po index 35fcb0570a..88ec5d5846 100644 --- a/stock_analytic/i18n/gl.po +++ b/stock_analytic/i18n/gl.po @@ -19,22 +19,17 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id -#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic -msgid "Analytic Account" -msgstr "Conta analítica" - -#. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids -msgid "Analytic Tags" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution +msgid "Analytic" msgstr "" #. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_product_product -msgid "Product" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_precision +msgid "Analytic Precision" msgstr "" #. module: stock_analytic @@ -51,3 +46,6 @@ msgstr "" #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" msgstr "Movemento de existencias" + +#~ msgid "Analytic Account" +#~ msgstr "Conta analítica" diff --git a/stock_analytic/i18n/gu_IN.po b/stock_analytic/i18n/gu_IN.po index ea1f8c65ab..6f6f7b89d7 100644 --- a/stock_analytic/i18n/gu_IN.po +++ b/stock_analytic/i18n/gu_IN.po @@ -20,22 +20,17 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id -#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic -msgid "Analytic Account" -msgstr "વિશ્લેષણાત્મક ખાતું" - -#. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids -msgid "Analytic Tags" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution +msgid "Analytic" msgstr "" #. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_product_product -msgid "Product" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_precision +msgid "Analytic Precision" msgstr "" #. module: stock_analytic @@ -52,3 +47,6 @@ msgstr "" #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "વિશ્લેષણાત્મક ખાતું" diff --git a/stock_analytic/i18n/hi_IN.po b/stock_analytic/i18n/hi_IN.po index 0245bddf8a..9abf7e124f 100644 --- a/stock_analytic/i18n/hi_IN.po +++ b/stock_analytic/i18n/hi_IN.po @@ -20,22 +20,17 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id -#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic -msgid "Analytic Account" -msgstr "विश्लेषणात्मक खाता" - -#. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids -msgid "Analytic Tags" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution +msgid "Analytic" msgstr "" #. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_product_product -msgid "Product" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_precision +msgid "Analytic Precision" msgstr "" #. module: stock_analytic @@ -52,3 +47,6 @@ msgstr "" #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "विश्लेषणात्मक खाता" diff --git a/stock_analytic/i18n/hr.po b/stock_analytic/i18n/hr.po index 6613fdef29..e7ee4b9a7c 100644 --- a/stock_analytic/i18n/hr.po +++ b/stock_analytic/i18n/hr.po @@ -21,22 +21,17 @@ msgstr "" "X-Generator: Weblate 3.8\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id -#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic -msgid "Analytic Account" -msgstr "Analitički konto" - -#. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids -msgid "Analytic Tags" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution +msgid "Analytic" msgstr "" #. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_product_product -msgid "Product" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_precision +msgid "Analytic Precision" msgstr "" #. module: stock_analytic @@ -53,3 +48,6 @@ msgstr "" #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" msgstr "Skladišni prijenos" + +#~ msgid "Analytic Account" +#~ msgstr "Analitički konto" diff --git a/stock_analytic/i18n/hr_HR.po b/stock_analytic/i18n/hr_HR.po index e834ef2918..a63984573e 100644 --- a/stock_analytic/i18n/hr_HR.po +++ b/stock_analytic/i18n/hr_HR.po @@ -21,22 +21,17 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id -#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic -msgid "Analytic Account" -msgstr "Analitički konto" - -#. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids -msgid "Analytic Tags" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution +msgid "Analytic" msgstr "" #. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_product_product -msgid "Product" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_precision +msgid "Analytic Precision" msgstr "" #. module: stock_analytic @@ -53,3 +48,6 @@ msgstr "" #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Analitički konto" diff --git a/stock_analytic/i18n/hu.po b/stock_analytic/i18n/hu.po index aaa1515bbf..3ee60c42aa 100644 --- a/stock_analytic/i18n/hu.po +++ b/stock_analytic/i18n/hu.po @@ -19,22 +19,17 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id -#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic -msgid "Analytic Account" -msgstr "Analitikus gyűjtőkód könyvelés" - -#. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids -msgid "Analytic Tags" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution +msgid "Analytic" msgstr "" #. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_product_product -msgid "Product" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_precision +msgid "Analytic Precision" msgstr "" #. module: stock_analytic @@ -51,3 +46,6 @@ msgstr "" #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Analitikus gyűjtőkód könyvelés" diff --git a/stock_analytic/i18n/it.po b/stock_analytic/i18n/it.po index 3e54c4e3bd..6afb7044d8 100644 --- a/stock_analytic/i18n/it.po +++ b/stock_analytic/i18n/it.po @@ -21,22 +21,17 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id -#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic -msgid "Analytic Account" -msgstr "Conto Analitico" - -#. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids -msgid "Analytic Tags" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution +msgid "Analytic" msgstr "" #. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_product_product -msgid "Product" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_precision +msgid "Analytic Precision" msgstr "" #. module: stock_analytic @@ -53,3 +48,6 @@ msgstr "" #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" msgstr "Movimento di magazzino" + +#~ msgid "Analytic Account" +#~ msgstr "Conto Analitico" diff --git a/stock_analytic/i18n/nl.po b/stock_analytic/i18n/nl.po index eac3174516..e0e76b9214 100644 --- a/stock_analytic/i18n/nl.po +++ b/stock_analytic/i18n/nl.po @@ -19,22 +19,17 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id -#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic -msgid "Analytic Account" -msgstr "Kostenplaats" - -#. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids -msgid "Analytic Tags" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution +msgid "Analytic" msgstr "" #. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_product_product -msgid "Product" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_precision +msgid "Analytic Precision" msgstr "" #. module: stock_analytic @@ -51,3 +46,6 @@ msgstr "" #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Kostenplaats" diff --git a/stock_analytic/i18n/pt.po b/stock_analytic/i18n/pt.po index 88e16cf291..b61ee4a1e1 100644 --- a/stock_analytic/i18n/pt.po +++ b/stock_analytic/i18n/pt.po @@ -21,22 +21,17 @@ msgstr "" "X-Generator: Weblate 3.10\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id -#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic -msgid "Analytic Account" -msgstr "Conta Analítica" - -#. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids -msgid "Analytic Tags" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution +msgid "Analytic" msgstr "" #. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_product_product -msgid "Product" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_precision +msgid "Analytic Precision" msgstr "" #. module: stock_analytic @@ -53,3 +48,6 @@ msgstr "Sucata" #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" msgstr "Movimento Stock" + +#~ msgid "Analytic Account" +#~ msgstr "Conta Analítica" diff --git a/stock_analytic/i18n/pt_BR.po b/stock_analytic/i18n/pt_BR.po index 770666bdca..cdbc394544 100644 --- a/stock_analytic/i18n/pt_BR.po +++ b/stock_analytic/i18n/pt_BR.po @@ -11,8 +11,8 @@ msgstr "" "POT-Creation-Date: 2017-11-19 22:13+0000\n" "PO-Revision-Date: 2022-02-01 19:33+0000\n" "Last-Translator: Rodrigo Macedo \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" @@ -21,23 +21,18 @@ msgstr "" "X-Generator: Weblate 4.3.2\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id -#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic -msgid "Analytic Account" -msgstr "Conta analítica" - -#. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids -msgid "Analytic Tags" -msgstr "Etiquetas Analíticas" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution +msgid "Analytic" +msgstr "" #. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_product_product -msgid "Product" -msgstr "Produto" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_precision +msgid "Analytic Precision" +msgstr "" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line @@ -53,3 +48,12 @@ msgstr "Restos" #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" msgstr "Movimentação de Estoque" + +#~ msgid "Analytic Account" +#~ msgstr "Conta analítica" + +#~ msgid "Analytic Tags" +#~ msgstr "Etiquetas Analíticas" + +#~ msgid "Product" +#~ msgstr "Produto" diff --git a/stock_analytic/i18n/pt_PT.po b/stock_analytic/i18n/pt_PT.po index c49be8a687..544e44184b 100644 --- a/stock_analytic/i18n/pt_PT.po +++ b/stock_analytic/i18n/pt_PT.po @@ -20,22 +20,17 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id -#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic -msgid "Analytic Account" -msgstr "Conta Analítica" - -#. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids -msgid "Analytic Tags" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution +msgid "Analytic" msgstr "" #. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_product_product -msgid "Product" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_precision +msgid "Analytic Precision" msgstr "" #. module: stock_analytic @@ -52,3 +47,6 @@ msgstr "" #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Conta Analítica" diff --git a/stock_analytic/i18n/ro.po b/stock_analytic/i18n/ro.po index fe3de58f5d..dac8e75451 100644 --- a/stock_analytic/i18n/ro.po +++ b/stock_analytic/i18n/ro.po @@ -21,22 +21,17 @@ msgstr "" "2:1));\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id -#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic -msgid "Analytic Account" -msgstr "Cont analitic" - -#. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids -msgid "Analytic Tags" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution +msgid "Analytic" msgstr "" #. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_product_product -msgid "Product" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_precision +msgid "Analytic Precision" msgstr "" #. module: stock_analytic @@ -53,3 +48,6 @@ msgstr "" #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" msgstr "Mișcare stoc" + +#~ msgid "Analytic Account" +#~ msgstr "Cont analitic" diff --git a/stock_analytic/i18n/sk_SK.po b/stock_analytic/i18n/sk_SK.po index 15d49c1de8..8fc39b109a 100644 --- a/stock_analytic/i18n/sk_SK.po +++ b/stock_analytic/i18n/sk_SK.po @@ -20,22 +20,17 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id -#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic -msgid "Analytic Account" -msgstr "Analytický účet" - -#. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids -msgid "Analytic Tags" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution +msgid "Analytic" msgstr "" #. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_product_product -msgid "Product" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_precision +msgid "Analytic Precision" msgstr "" #. module: stock_analytic @@ -52,3 +47,6 @@ msgstr "" #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Analytický účet" diff --git a/stock_analytic/i18n/sl.po b/stock_analytic/i18n/sl.po index 210b9ac7a2..64efa37d19 100644 --- a/stock_analytic/i18n/sl.po +++ b/stock_analytic/i18n/sl.po @@ -20,22 +20,17 @@ msgstr "" "%100==4 ? 2 : 3);\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id -#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic -msgid "Analytic Account" -msgstr "Analitični konto" - -#. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids -msgid "Analytic Tags" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution +msgid "Analytic" msgstr "" #. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_product_product -msgid "Product" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_precision +msgid "Analytic Precision" msgstr "" #. module: stock_analytic @@ -52,3 +47,6 @@ msgstr "" #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "Analitični konto" diff --git a/stock_analytic/i18n/stock_analytic.pot b/stock_analytic/i18n/stock_analytic.pot index 9aacb60bba..ed196f8096 100644 --- a/stock_analytic/i18n/stock_analytic.pot +++ b/stock_analytic/i18n/stock_analytic.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 14.0\n" +"Project-Id-Version: Odoo Server 16.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" @@ -14,46 +14,17 @@ msgstr "" "Plural-Forms: \n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id -#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic -msgid "Analytic Account" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution +msgid "Analytic" msgstr "" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids -msgid "Analytic Tags" -msgstr "" - -#. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_product_product__display_name -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__display_name -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__display_name -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__display_name -msgid "Display Name" -msgstr "" - -#. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_product_product__id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__id -msgid "ID" -msgstr "" - -#. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_product_product____last_update -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move____last_update -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line____last_update -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap____last_update -msgid "Last Modified on" -msgstr "" - -#. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_product_product -msgid "Product" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_precision +msgid "Analytic Precision" msgstr "" #. module: stock_analytic diff --git a/stock_analytic/i18n/tr.po b/stock_analytic/i18n/tr.po index 1b273e58c5..90fc41b1ce 100644 --- a/stock_analytic/i18n/tr.po +++ b/stock_analytic/i18n/tr.po @@ -19,22 +19,17 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id -#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic -msgid "Analytic Account" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution +msgid "Analytic" msgstr "" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids -msgid "Analytic Tags" -msgstr "" - -#. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_product_product -msgid "Product" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_precision +msgid "Analytic Precision" msgstr "" #. module: stock_analytic diff --git a/stock_analytic/i18n/tr_TR.po b/stock_analytic/i18n/tr_TR.po index 25a93fc9a7..65c8f1d5c3 100644 --- a/stock_analytic/i18n/tr_TR.po +++ b/stock_analytic/i18n/tr_TR.po @@ -20,22 +20,17 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id -#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic -msgid "Analytic Account" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution +msgid "Analytic" msgstr "" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids -msgid "Analytic Tags" -msgstr "" - -#. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_product_product -msgid "Product" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_precision +msgid "Analytic Precision" msgstr "" #. module: stock_analytic diff --git a/stock_analytic/i18n/vi_VN.po b/stock_analytic/i18n/vi_VN.po index 1e11dffe8e..22a250b29d 100644 --- a/stock_analytic/i18n/vi_VN.po +++ b/stock_analytic/i18n/vi_VN.po @@ -20,22 +20,17 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id -#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic -msgid "Analytic Account" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution +msgid "Analytic" msgstr "" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids -msgid "Analytic Tags" -msgstr "" - -#. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_product_product -msgid "Product" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_precision +msgid "Analytic Precision" msgstr "" #. module: stock_analytic diff --git a/stock_analytic/i18n/zh_CN.po b/stock_analytic/i18n/zh_CN.po index 3095fb86a6..a397cd454a 100644 --- a/stock_analytic/i18n/zh_CN.po +++ b/stock_analytic/i18n/zh_CN.po @@ -20,22 +20,17 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" #. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_account_id -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_account_id -#: model_terms:ir.ui.view,arch_db:stock_analytic.view_move_search_analytic -msgid "Analytic Account" -msgstr "核算科目" - -#. module: stock_analytic -#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_tag_ids -#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_tag_ids -msgid "Analytic Tags" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution +msgid "Analytic" msgstr "" #. module: stock_analytic -#: model:ir.model,name:stock_analytic.model_product_product -msgid "Product" +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_precision +msgid "Analytic Precision" msgstr "" #. module: stock_analytic @@ -52,3 +47,6 @@ msgstr "" #: model:ir.model,name:stock_analytic.model_stock_move msgid "Stock Move" msgstr "" + +#~ msgid "Analytic Account" +#~ msgstr "核算科目" diff --git a/stock_analytic/migrations/14.0.2.0.0/pre-migrate.py b/stock_analytic/migrations/14.0.2.0.0/pre-migrate.py deleted file mode 100644 index 50533a5f29..0000000000 --- a/stock_analytic/migrations/14.0.2.0.0/pre-migrate.py +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2022 ACSONE SA/NV -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -from openupgradelib import openupgrade - - -def _fill_in_move_line(env): - analytic_field = [ - ( - "analytic_account_id", - "stock.move.line", - "stock_move_line", - "many2one", - "int4", - "stock_analytic", - ) - ] - openupgrade.add_fields(env, analytic_field) - query = """ - UPDATE stock_move_line - SET analytic_account_id = sm.analytic_account_id - FROM stock_move sm WHERE sm.id = stock_move_line.move_id - AND sm.analytic_account_id IS NOT NULL - """ - openupgrade.logged_query(env.cr, query) - - -@openupgrade.migrate() -def migrate(env, version): - _fill_in_move_line(env) diff --git a/stock_analytic/models/__init__.py b/stock_analytic/models/__init__.py index 38a3841dab..bb813c10f7 100644 --- a/stock_analytic/models/__init__.py +++ b/stock_analytic/models/__init__.py @@ -1,5 +1,4 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from . import product_product from . import stock from . import stock_scrap diff --git a/stock_analytic/models/product_product.py b/stock_analytic/models/product_product.py deleted file mode 100644 index e0139c5222..0000000000 --- a/stock_analytic/models/product_product.py +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright (C) 2020 Brahoo -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -from odoo import api, models - - -class ProductProduct(models.Model): - _inherit = "product.product" - - @api.model - def _anglo_saxon_sale_move_lines( - self, - name, - product, - uom, - qty, - price_unit, - currency=False, - amount_currency=False, - fiscal_position=False, - account_analytic=False, - analytic_tags=False, - ): - res = super()._anglo_saxon_sale_move_lines( - name, - product, - uom, - qty, - price_unit, - currency=currency, - amount_currency=amount_currency, - fiscal_position=fiscal_position, - account_analytic=account_analytic, - analytic_tags=analytic_tags, - ) - if res: - res[0]["account_analytic_id"] = account_analytic and account_analytic.id - res[0]["analytic_tag_ids"] = ( - analytic_tags - and analytic_tags.ids - and [(6, 0, analytic_tags.ids)] - or False - ) - return res diff --git a/stock_analytic/models/stock.py b/stock_analytic/models/stock.py index 3d992b8678..be2371844c 100644 --- a/stock_analytic/models/stock.py +++ b/stock_analytic/models/stock.py @@ -5,38 +5,29 @@ # Copyright 2018 Hibou Corp. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo import api, fields, models +from odoo import api, models class StockMove(models.Model): - _inherit = "stock.move" - - analytic_account_id = fields.Many2one( - string="Analytic Account", - comodel_name="account.analytic.account", - ) - analytic_tag_ids = fields.Many2many("account.analytic.tag", string="Analytic Tags") + _name = "stock.move" + _inherit = ["stock.move", "analytic.mixin"] def _prepare_account_move_line( - self, qty, cost, credit_account_id, debit_account_id, description + self, qty, cost, credit_account_id, debit_account_id, svl_id, description ): self.ensure_one() res = super(StockMove, self)._prepare_account_move_line( - qty, cost, credit_account_id, debit_account_id, description + qty, cost, credit_account_id, debit_account_id, svl_id, description ) + if not self.analytic_distribution: + return res for line in res: if ( line[2]["account_id"] != self.product_id.categ_id.property_stock_valuation_account_id.id ): # Add analytic account in debit line - if self.analytic_account_id: - line[2].update({"analytic_account_id": self.analytic_account_id.id}) - # Add analytic tags in debit line - if self.analytic_tag_ids: - line[2].update( - {"analytic_tag_ids": [(6, 0, self.analytic_tag_ids.ids)]} - ) + line[2].update({"analytic_distribution": self.analytic_distribution}) return res def _prepare_procurement_values(self): @@ -45,20 +36,14 @@ def _prepare_procurement_values(self): moves through procurement. """ res = super()._prepare_procurement_values() - if self.analytic_account_id: + if self.analytic_distribution: res.update( { - "analytic_account_id": self.analytic_account_id.id, + "analytic_distribution": self.analytic_distribution, } ) return res - @api.model - def _prepare_merge_moves_distinct_fields(self): - fields = super()._prepare_merge_moves_distinct_fields() - fields.append("analytic_account_id") - return fields - def _prepare_move_line_vals(self, quantity=None, reserved_quant=None): """ We fill in the analytic account when creating the move line from @@ -67,15 +52,14 @@ def _prepare_move_line_vals(self, quantity=None, reserved_quant=None): res = super()._prepare_move_line_vals( quantity=quantity, reserved_quant=reserved_quant ) - if self.analytic_account_id: - res.update({"analytic_account_id": self.analytic_account_id.id}) + if self.analytic_distribution: + res.update({"analytic_distribution": self.analytic_distribution}) return res class StockMoveLine(models.Model): - _inherit = "stock.move.line" - - analytic_account_id = fields.Many2one(comodel_name="account.analytic.account") + _name = "stock.move.line" + _inherit = ["stock.move.line", "analytic.mixin"] @api.model def _prepare_stock_move_vals(self): @@ -84,6 +68,6 @@ def _prepare_stock_move_vals(self): new move created here with the analytic account if filled in. """ res = super()._prepare_stock_move_vals() - if self.analytic_account_id: - res.update({"analytic_account_id": self.analytic_account_id.id}) + if self.analytic_distribution: + res.update({"analytic_distribution": self.analytic_distribution}) return res diff --git a/stock_analytic/models/stock_scrap.py b/stock_analytic/models/stock_scrap.py index 2767ec5add..52d3e6192a 100644 --- a/stock_analytic/models/stock_scrap.py +++ b/stock_analytic/models/stock_scrap.py @@ -1,22 +1,17 @@ # Copyright (C) 2019 Open Source Integrators # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo import fields, models +from odoo import models class StockScrap(models.Model): - _inherit = "stock.scrap" - - analytic_account_id = fields.Many2one( - string="Analytic Account", comodel_name="account.analytic.account" - ) - analytic_tag_ids = fields.Many2many("account.analytic.tag", string="Analytic Tags") + _name = "stock.scrap" + _inherit = ["stock.scrap", "analytic.mixin"] def _prepare_move_values(self): res = super()._prepare_move_values() res.update( { - "analytic_account_id": self.analytic_account_id.id, - "analytic_tag_ids": [(6, 0, self.analytic_tag_ids.ids)], + "analytic_distribution": self.analytic_distribution, } ) return res diff --git a/stock_analytic/readme/CONTRIBUTORS.rst b/stock_analytic/readme/CONTRIBUTORS.rst index 00be6ead0e..039e48fccb 100644 --- a/stock_analytic/readme/CONTRIBUTORS.rst +++ b/stock_analytic/readme/CONTRIBUTORS.rst @@ -8,3 +8,4 @@ * Aaron Henriquez * Jared Kipe * Alan Ramos +* Mantas Šniukas diff --git a/stock_analytic/static/description/index.html b/stock_analytic/static/description/index.html index 5a7d26f6e9..50891d064c 100644 --- a/stock_analytic/static/description/index.html +++ b/stock_analytic/static/description/index.html @@ -367,7 +367,7 @@

Stock Analytic

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/account-analytic Translate me on Weblate Try me on Runbot

+

Beta License: AGPL-3 OCA/account-analytic Translate me on Weblate Try me on Runbot

Adds an analytic account and analytic tags in stock move to be able to get analytic information when generating the journal items.

Table of contents

@@ -413,7 +413,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.

@@ -440,6 +440,7 @@

Contributors

  • Aaron Henriquez <ahenriquez@forgeflow.com>
  • Jared Kipe <jared@hibou.io>
  • Alan Ramos <alan.ramos@jarsa.com.mx>
    • +
  • Mantas Šniukas <mantas@vialaurea.lt>
    • @@ -449,7 +450,7 @@

    Maintainers

    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/account-analytic project on GitHub.

    +

    This module is part of the OCA/account-analytic project on GitHub.

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

    diff --git a/stock_analytic/tests/test_stock_picking.py b/stock_analytic/tests/test_stock_picking.py index c50afb9dde..5f30355382 100644 --- a/stock_analytic/tests/test_stock_picking.py +++ b/stock_analytic/tests/test_stock_picking.py @@ -13,15 +13,20 @@ class TestStockPicking(TransactionCase): def setUp(self): super(TestStockPicking, self).setUp() - - self.product = self.env.ref("product.product_product_4") + self.product = self.env["product.product"].create( + { + "name": "Test Product", + "type": "product", + "standard_price": 1.0, + } + ) self.product_2 = self.env.ref("product.product_product_5") self.product_categ = self.env.ref("product.product_category_5") self.valuation_account = self.env["account.account"].create( { "name": "Test stock valuation", "code": "tv", - "user_type_id": self.env["account.account.type"].search([], limit=1).id, + "account_type": "liability_current", "reconcile": True, "company_id": self.env.ref("base.main_company").id, } @@ -30,7 +35,7 @@ def setUp(self): { "name": "Test stock input", "code": "tsti", - "user_type_id": self.env["account.account.type"].search([], limit=1).id, + "account_type": "expense", "reconcile": True, "company_id": self.env.ref("base.main_company").id, } @@ -39,7 +44,7 @@ def setUp(self): { "name": "Test stock output", "code": "tout", - "user_type_id": self.env["account.account.type"].search([], limit=1).id, + "account_type": "income", "reconcile": True, "company_id": self.env.ref("base.main_company").id, } @@ -47,13 +52,9 @@ def setUp(self): self.stock_journal = self.env["account.journal"].create( {"name": "Stock Journal", "code": "STJTEST", "type": "general"} ) - self.analytic_tag_1 = self.env["account.analytic.tag"].create( - {"name": "analytic tag test 1"} + self.analytic_distribution = dict( + {str(self.env.ref("analytic.analytic_agrolait").id): 100.0} ) - self.analytic_tag_2 = self.env["account.analytic.tag"].create( - {"name": "analytic tag test 2"} - ) - self.analytic_account = self.env.ref("analytic.analytic_agrolait") self.warehouse = self.env.ref("stock.warehouse0") self.location = self.warehouse.lot_stock_id self.dest_location = self.env.ref("stock.stock_location_customers") @@ -76,8 +77,7 @@ def _create_picking( location_id, location_dest_id, picking_type_id, - analytic_account_id=False, - analytic_tag_ids=False, + analytic_distribution=False, ): picking_data = { "picking_type_id": picking_type_id.id, @@ -99,10 +99,7 @@ def _create_picking( "procure_method": "make_to_stock", "product_uom": self.product.uom_id.id, "product_uom_qty": 1.0, - "analytic_account_id": ( - analytic_account_id.id if analytic_account_id else False - ), - "analytic_tag_ids": [(6, 0, analytic_tag_ids if analytic_tag_ids else [])], + "analytic_distribution": analytic_distribution or False, } self.env["stock.move"].create(move_data) @@ -110,27 +107,16 @@ def _create_picking( return picking def __update_qty_on_hand_product(self, product, new_qty): - qty_wizard = self.env["stock.change.product.qty"].create( - { - "product_id": product.id, - "product_tmpl_id": product.product_tmpl_id.id, - "new_quantity": new_qty, - } + self.env["stock.quant"]._update_available_quantity( + product, self.location, new_qty ) - qty_wizard.change_product_qty() def _confirm_picking_no_error(self, picking): picking.action_confirm() - self.assertEqual(picking.state, "confirmed") - - def _force_assign_out_no_error(self, picking): - self.assertEqual(picking.move_lines.reserved_availability, 0) - picking.action_assign() - self.assertEqual(picking.move_lines.reserved_availability, 1) self.assertEqual(picking.state, "assigned") def _picking_done_no_error(self, picking): - picking.move_lines.quantity_done = 1.0 + picking.move_ids.quantity_done = 1.0 picking.button_validate() self.assertEqual(picking.state, "done") @@ -139,10 +125,10 @@ def _check_account_move_no_error(self, picking): ["ref", "=", "{} - {}".format(picking.name, picking.product_id.name)] ] acc_moves = self.env["account.move"].search(criteria1) - self.assertGreater(len(acc_moves), 0) + self.assertTrue(len(acc_moves) > 0) def _check_analytic_account_no_error(self, picking): - move = picking.move_lines[0] + move = picking.move_ids[0] criteria2 = [["move_id.ref", "=", picking.name]] acc_lines = self.env["account.move.line"].search(criteria2) for acc_line in acc_lines: @@ -151,37 +137,26 @@ def _check_analytic_account_no_error(self, picking): != move.product_id.categ_id.property_stock_valuation_account_id ): self.assertEqual( - acc_line.analytic_account_id.id, move.analytic_account_id.id - ) - self.assertEqual( - acc_line.analytic_tag_ids.ids, move.analytic_tag_ids.ids + acc_line.analytic_distribution, move.analytic_distribution ) def _check_no_analytic_account(self, picking): criteria2 = [ ("move_id.ref", "=", picking.name), - ("analytic_account_id", "!=", False), - ] - criteria3 = [ - ("move_id.ref", "=", picking.name), - ("analytic_tag_ids", "not in", []), + ("analytic_distribution", "!=", False), ] line_count = self.env["account.move.line"].search_count(criteria2) self.assertEqual(line_count, 0) - line_count = self.env["account.move.line"].search_count(criteria3) - self.assertEqual(line_count, 0) def test_outgoing_picking_with_analytic(self): picking = self._create_picking( self.location, self.dest_location, self.outgoing_picking_type, - self.analytic_account, - [self.analytic_tag_1.id | self.analytic_tag_2.id], + self.analytic_distribution, ) self.__update_qty_on_hand_product(self.product, 1) self._confirm_picking_no_error(picking) - self._force_assign_out_no_error(picking) self._picking_done_no_error(picking) self._check_account_move_no_error(picking) self._check_analytic_account_no_error(picking) @@ -194,7 +169,6 @@ def test_outgoing_picking_without_analytic(self): ) self.__update_qty_on_hand_product(self.product, 1) self._confirm_picking_no_error(picking) - self._force_assign_out_no_error(picking) self._picking_done_no_error(picking) self._check_account_move_no_error(picking) self._check_no_analytic_account(picking) @@ -204,9 +178,9 @@ def test_incoming_picking_with_analytic(self): self.location, self.dest_location, self.incoming_picking_type, - self.analytic_account, - [self.analytic_tag_1.id | self.analytic_tag_2.id], + self.analytic_distribution, ) + self.__update_qty_on_hand_product(self.product, 1) self._confirm_picking_no_error(picking) self._picking_done_no_error(picking) self._check_account_move_no_error(picking) @@ -217,10 +191,9 @@ def test_picking_add_extra_move_line(self): self.location, self.dest_location, self.outgoing_picking_type, - self.analytic_account, - [self.analytic_tag_1.id | self.analytic_tag_2.id], + self.analytic_distribution, ) - move_before = picking.move_lines + move_before = picking.move_ids self.env["stock.move.line"].create( { @@ -229,13 +202,30 @@ def test_picking_add_extra_move_line(self): "location_dest_id": self.dest_location.id, "date": datetime.now().strftime("%Y-%m-%d %H:%M:%S"), "product_uom_id": self.product_2.uom_id.id, - "product_uom_qty": 1.0, - "analytic_account_id": self.analytic_account.id, + "reserved_uom_qty": 1.0, + "analytic_distribution": self.analytic_distribution, "company_id": self.env.company.id, "picking_id": picking.id, } ) - move_after = picking.move_lines - move_before + move_after = picking.move_ids - move_before + + self.assertEqual(self.analytic_distribution, move_after.analytic_distribution) - self.assertEqual(self.analytic_account, move_after.analytic_account_id) + def test__prepare_procurement_values(self): + picking = self._create_picking( + self.location, + self.dest_location, + self.outgoing_picking_type, + self.analytic_distribution, + ) + values = picking.move_ids._prepare_procurement_values() + self.assertEqual(self.analytic_distribution, values["analytic_distribution"]) + picking = self._create_picking( + self.location, + self.dest_location, + self.outgoing_picking_type, + ) + values = picking.move_ids._prepare_procurement_values() + self.assertEqual(values.get("analytic_distribution"), None) diff --git a/stock_analytic/tests/test_stock_scrap.py b/stock_analytic/tests/test_stock_scrap.py index 69f03960a7..fdb26081f4 100644 --- a/stock_analytic/tests/test_stock_scrap.py +++ b/stock_analytic/tests/test_stock_scrap.py @@ -10,12 +10,8 @@ def setUp(self): self.product = self.env.ref("product.product_product_4") self.warehouse = self.env.ref("stock.warehouse0") self.location = self.warehouse.lot_stock_id - self.analytic_account = self.env.ref("analytic.analytic_agrolait") - self.analytic_tag_1 = self.env["account.analytic.tag"].create( - {"name": "analytic tag test 1"} - ) - self.analytic_tag_2 = self.env["account.analytic.tag"].create( - {"name": "analytic tag test 2"} + self.analytic_distribution = dict( + {str(self.env.ref("analytic.analytic_agrolait").id): 100.0} ) def __update_qty_on_hand_product(self, product, new_qty): @@ -28,16 +24,13 @@ def __update_qty_on_hand_product(self, product, new_qty): ) qty_wizard.change_product_qty() - def _create_scrap(self, analytic_account_id=False, analytic_tag_ids=False): + def _create_scrap(self, analytic_distribution=False): scrap_data = { "product_id": self.product.id, "scrap_qty": 1.00, "product_uom_id": self.product.uom_id.id, "location_id": self.location.id, - "analytic_account_id": analytic_account_id - and analytic_account_id.id - or False, - "analytic_tag_ids": [(6, 0, analytic_tag_ids if analytic_tag_ids else [])], + "analytic_distribution": analytic_distribution or False, } return self.env["stock.scrap"].create(scrap_data) @@ -45,7 +38,7 @@ def _validate_scrap_no_error(self, scrap): scrap.action_validate() self.assertEqual(scrap.state, "done") - def _check_analytic_account_no_error(self, scrap): + def _check_analytic_distribution_no_error(self, scrap): domain = [("name", "=", scrap.name)] acc_lines = self.env["account.move.line"].search(domain) for acc_line in acc_lines: @@ -54,10 +47,7 @@ def _check_analytic_account_no_error(self, scrap): != scrap.product_id.categ_id.property_stock_valuation_account_id ): self.assertEqual( - acc_line.analytic_account_id.id, scrap.analytic_account_id.id - ) - self.assertEqual( - acc_line.analytic_tag_ids.ids, scrap.analytic_tag_ids.ids + acc_line.analytic_distribution, scrap.analytic_distribution ) def test_scrap_without_analytic(self): @@ -68,7 +58,7 @@ def test_scrap_without_analytic(self): def test_scrap_with_analytic(self): self.__update_qty_on_hand_product(self.product, 1) scrap = self._create_scrap( - self.analytic_account, [self.analytic_tag_1.id | self.analytic_tag_2.id] + self.analytic_distribution, ) self._validate_scrap_no_error(scrap) - self._check_analytic_account_no_error(scrap) + self._check_analytic_distribution_no_error(scrap) diff --git a/stock_analytic/views/stock_move_line.xml b/stock_analytic/views/stock_move_line_views.xml similarity index 58% rename from stock_analytic/views/stock_move_line.xml rename to stock_analytic/views/stock_move_line_views.xml index 5b4b852067..37aa6a4091 100644 --- a/stock_analytic/views/stock_move_line.xml +++ b/stock_analytic/views/stock_move_line_views.xml @@ -8,21 +8,28 @@ - + - + + @@ -34,10 +41,14 @@ /> - + - -     diff --git a/stock_analytic/views/stock_move_views.xml b/stock_analytic/views/stock_move_views.xml index 5fb7e233ab..a30929ea97 100644 --- a/stock_analytic/views/stock_move_views.xml +++ b/stock_analytic/views/stock_move_views.xml @@ -1,89 +1,49 @@ - - - stock.move.picking.tree - stock.move - - - - - - - - - stock.move.tree - stock.move - - - - - - - - - stock.move.form - stock.move - - - - - - - - - stock.move.search - stock.move - - - - - - - - - - - - stock.picking.form - stock.picking - - - - - - - - - + + stock.move.picking.tree + stock.move + + + + + + + + + stock.move.tree + stock.move + + + + + + + + + stock.move.form + stock.move + + + + + + + diff --git a/stock_analytic/views/stock_picking_views.xml b/stock_analytic/views/stock_picking_views.xml new file mode 100644 index 0000000000..4173bce24b --- /dev/null +++ b/stock_analytic/views/stock_picking_views.xml @@ -0,0 +1,22 @@ + + + + stock.picking.form + stock.picking + + + + + + + + diff --git a/stock_analytic/views/stock_scrap.xml b/stock_analytic/views/stock_scrap.xml deleted file mode 100644 index df047ca449..0000000000 --- a/stock_analytic/views/stock_scrap.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - stock.scrap.analytic.form - stock.scrap - - - - - - - - - diff --git a/stock_analytic/views/stock_scrap_views.xml b/stock_analytic/views/stock_scrap_views.xml new file mode 100644 index 0000000000..536d40e68e --- /dev/null +++ b/stock_analytic/views/stock_scrap_views.xml @@ -0,0 +1,32 @@ + + + stock.scrap.analytic.form + stock.scrap + + + + + + + + + stock.scrap.form2 + stock.scrap + + + + + + + + From 657ddc35a86fd88dfe63815867dd484ebe704d61 Mon Sep 17 00:00:00 2001 From: Yoshi Tashiro Date: Mon, 23 Jan 2023 02:54:16 +0000 Subject: [PATCH 43/61] [IMP] stock_analytic: add validation on analytic distribution - Add validation on analytic distribution according to how it is done in other models (account.move.line, sale.order.line, etc.). - Update readme to reflect the current design. - Other cosmetic adjustments. --- stock_analytic/README.rst | 25 ++++-- stock_analytic/__manifest__.py | 5 +- stock_analytic/i18n/ca.po | 23 ++++++ stock_analytic/i18n/cs_CZ.po | 23 ++++++ stock_analytic/i18n/de.po | 23 ++++++ stock_analytic/i18n/el_GR.po | 23 ++++++ stock_analytic/i18n/es.po | 23 ++++++ stock_analytic/i18n/es_EC.po | 23 ++++++ stock_analytic/i18n/es_MX.po | 23 ++++++ stock_analytic/i18n/fi.po | 23 ++++++ stock_analytic/i18n/fr.po | 23 ++++++ stock_analytic/i18n/gl.po | 23 ++++++ stock_analytic/i18n/gu_IN.po | 23 ++++++ stock_analytic/i18n/hi_IN.po | 23 ++++++ stock_analytic/i18n/hr.po | 23 ++++++ stock_analytic/i18n/hr_HR.po | 23 ++++++ stock_analytic/i18n/hu.po | 23 ++++++ stock_analytic/i18n/it.po | 23 ++++++ stock_analytic/i18n/nl.po | 23 ++++++ stock_analytic/i18n/pt.po | 23 ++++++ stock_analytic/i18n/pt_BR.po | 23 ++++++ stock_analytic/i18n/pt_PT.po | 23 ++++++ stock_analytic/i18n/ro.po | 23 ++++++ stock_analytic/i18n/sk_SK.po | 23 ++++++ stock_analytic/i18n/sl.po | 23 ++++++ stock_analytic/i18n/stock_analytic.pot | 23 ++++++ stock_analytic/i18n/tr.po | 23 ++++++ stock_analytic/i18n/tr_TR.po | 23 ++++++ stock_analytic/i18n/vi_VN.po | 23 ++++++ stock_analytic/i18n/zh_CN.po | 23 ++++++ stock_analytic/models/__init__.py | 4 +- .../models/analytic_applicability.py | 13 +++ .../models/{stock.py => stock_move.py} | 18 ++++ stock_analytic/models/stock_picking.py | 12 +++ stock_analytic/models/stock_scrap.py | 4 + stock_analytic/readme/CONFIGURE.rst | 2 + stock_analytic/readme/CONTRIBUTORS.rst | 3 + stock_analytic/readme/DESCRIPTION.rst | 2 +- stock_analytic/readme/USAGE.rst | 14 ++-- stock_analytic/static/description/index.html | 58 +++++++------ stock_analytic/tests/test_stock_picking.py | 82 ++++++++++++------- stock_analytic/tests/test_stock_scrap.py | 19 ++++- .../views/stock_move_line_views.xml | 4 +- stock_analytic/views/stock_scrap_views.xml | 4 +- 44 files changed, 836 insertions(+), 77 deletions(-) create mode 100644 stock_analytic/models/analytic_applicability.py rename stock_analytic/models/{stock.py => stock_move.py} (77%) create mode 100644 stock_analytic/models/stock_picking.py create mode 100644 stock_analytic/readme/CONFIGURE.rst diff --git a/stock_analytic/README.rst b/stock_analytic/README.rst index 8fae894e81..423ce1033d 100644 --- a/stock_analytic/README.rst +++ b/stock_analytic/README.rst @@ -25,7 +25,7 @@ Stock Analytic |badge1| |badge2| |badge3| |badge4| |badge5| -Adds an analytic account and analytic tags in stock move to be able to get +Adds Analytic Distribution field in stock move to be able to get analytic information when generating the journal items. **Table of contents** @@ -33,28 +33,34 @@ analytic information when generating the journal items. .. contents:: :local: +Configuration +============= + +As necessary, go to *Invoicing > Configuration > Analytic Plans*, open the relevant +record and update the applicability for 'Stock Move'. + Usage ===== -To Assign an Analytic Account and Analytic Tags to a Stock Move -=============================================================== +To Assign an Analytic Account to a Stock Move +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ You need to: #. Create manually or open draft picking -#. Add move lines and fill **analytic account** and **analytic tags** fields +#. Add move lines and assign an **analytic account** in Analytic Distribution field -Assigned Journal Items created from Stock Move with Analytic Account and Analytic Tags -====================================================================================== +Assigned Journal Items created from Stock Move with Analytic Account +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ If stock move automatically create journal entry, the journal entry will contain journal items with following rule: #. Journal item with account equal to product's valuation account will not be - assigned to any analytic account, neither analytic tags + assigned to any analytic account. #. Journal item with account different to product's valuation account will be assigned to an analytic account according to the stock move's analytic - account. The same logic applies to analytic tags. + account. Bug Tracker =========== @@ -91,6 +97,9 @@ Contributors * Jared Kipe * Alan Ramos * Mantas Šniukas +* `Quartile `__: + + * Yoshi Tashiro Maintainers ~~~~~~~~~~~ diff --git a/stock_analytic/__manifest__.py b/stock_analytic/__manifest__.py index d5124f16f3..a0af4eaf44 100644 --- a/stock_analytic/__manifest__.py +++ b/stock_analytic/__manifest__.py @@ -3,11 +3,12 @@ # Copyright 2016 OpenSynergy Indonesia # Copyright 2017 ForgeFlow S.L. # Copyright 2018 Hibou Corp. +# Copyright 2023 Quartile Limited # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { "name": "Stock Analytic", - "summary": "Adds an analytic account and analytic tags in stock move", - "version": "16.0.1.0.0", + "summary": "Adds analytic distribution in stock move", + "version": "16.0.1.1.0", "author": "Julius Network Solutions, " "ClearCorp, OpenSynergy Indonesia, " "Hibou Corp., " diff --git a/stock_analytic/i18n/ca.po b/stock_analytic/i18n/ca.po index 1a8a5eceee..536cad47e1 100644 --- a/stock_analytic/i18n/ca.po +++ b/stock_analytic/i18n/ca.po @@ -26,6 +26,18 @@ msgstr "" msgid "Analytic" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_account_analytic_applicability +msgid "Analytic Plan's Applicabilities" +msgstr "" + #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision @@ -33,6 +45,11 @@ msgstr "" msgid "Analytic Precision" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_account_analytic_applicability__business_domain +msgid "Domain" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" @@ -45,9 +62,15 @@ msgstr "Ferralla" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move +#: model:ir.model.fields.selection,name:stock_analytic.selection__account_analytic_applicability__business_domain__stock_move msgid "Stock Move" msgstr "Moviment d'estoc" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_picking +msgid "Transfer" +msgstr "" + #~ msgid "Analytic Account" #~ msgstr "Compte analític" diff --git a/stock_analytic/i18n/cs_CZ.po b/stock_analytic/i18n/cs_CZ.po index ab9671f999..6042b66a9d 100644 --- a/stock_analytic/i18n/cs_CZ.po +++ b/stock_analytic/i18n/cs_CZ.po @@ -26,6 +26,18 @@ msgstr "" msgid "Analytic" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_account_analytic_applicability +msgid "Analytic Plan's Applicabilities" +msgstr "" + #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision @@ -33,6 +45,11 @@ msgstr "" msgid "Analytic Precision" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_account_analytic_applicability__business_domain +msgid "Domain" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" @@ -45,8 +62,14 @@ msgstr "" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move +#: model:ir.model.fields.selection,name:stock_analytic.selection__account_analytic_applicability__business_domain__stock_move msgid "Stock Move" msgstr "Posunout sklad" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_picking +msgid "Transfer" +msgstr "" + #~ msgid "Analytic Account" #~ msgstr "Analytický účet" diff --git a/stock_analytic/i18n/de.po b/stock_analytic/i18n/de.po index c318fbec2b..e35c4f0b93 100644 --- a/stock_analytic/i18n/de.po +++ b/stock_analytic/i18n/de.po @@ -26,6 +26,18 @@ msgstr "" msgid "Analytic" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_account_analytic_applicability +msgid "Analytic Plan's Applicabilities" +msgstr "" + #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision @@ -33,6 +45,11 @@ msgstr "" msgid "Analytic Precision" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_account_analytic_applicability__business_domain +msgid "Domain" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" @@ -45,8 +62,14 @@ msgstr "Ausschuss" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move +#: model:ir.model.fields.selection,name:stock_analytic.selection__account_analytic_applicability__business_domain__stock_move msgid "Stock Move" msgstr "Lagerbewegung" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_picking +msgid "Transfer" +msgstr "" + #~ msgid "Analytic Account" #~ msgstr "Kostenstelle" diff --git a/stock_analytic/i18n/el_GR.po b/stock_analytic/i18n/el_GR.po index de5ce01c1d..0bcad87e89 100644 --- a/stock_analytic/i18n/el_GR.po +++ b/stock_analytic/i18n/el_GR.po @@ -26,6 +26,18 @@ msgstr "" msgid "Analytic" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_account_analytic_applicability +msgid "Analytic Plan's Applicabilities" +msgstr "" + #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision @@ -33,6 +45,11 @@ msgstr "" msgid "Analytic Precision" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_account_analytic_applicability__business_domain +msgid "Domain" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" @@ -45,8 +62,14 @@ msgstr "" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move +#: model:ir.model.fields.selection,name:stock_analytic.selection__account_analytic_applicability__business_domain__stock_move msgid "Stock Move" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_picking +msgid "Transfer" +msgstr "" + #~ msgid "Analytic Account" #~ msgstr "Αναλυτικός Λογαριασμός" diff --git a/stock_analytic/i18n/es.po b/stock_analytic/i18n/es.po index cb0083b120..8ba4cd76dc 100644 --- a/stock_analytic/i18n/es.po +++ b/stock_analytic/i18n/es.po @@ -27,6 +27,18 @@ msgstr "" msgid "Analytic" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_account_analytic_applicability +msgid "Analytic Plan's Applicabilities" +msgstr "" + #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision @@ -34,6 +46,11 @@ msgstr "" msgid "Analytic Precision" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_account_analytic_applicability__business_domain +msgid "Domain" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" @@ -46,8 +63,14 @@ msgstr "Restos" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move +#: model:ir.model.fields.selection,name:stock_analytic.selection__account_analytic_applicability__business_domain__stock_move msgid "Stock Move" msgstr "Movimiento de existencias" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_picking +msgid "Transfer" +msgstr "" + #~ msgid "Analytic Account" #~ msgstr "Cuenta analítica" diff --git a/stock_analytic/i18n/es_EC.po b/stock_analytic/i18n/es_EC.po index 99a8c8e3d4..c7923938f9 100644 --- a/stock_analytic/i18n/es_EC.po +++ b/stock_analytic/i18n/es_EC.po @@ -26,6 +26,18 @@ msgstr "" msgid "Analytic" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_account_analytic_applicability +msgid "Analytic Plan's Applicabilities" +msgstr "" + #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision @@ -33,6 +45,11 @@ msgstr "" msgid "Analytic Precision" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_account_analytic_applicability__business_domain +msgid "Domain" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" @@ -45,8 +62,14 @@ msgstr "" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move +#: model:ir.model.fields.selection,name:stock_analytic.selection__account_analytic_applicability__business_domain__stock_move msgid "Stock Move" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_picking +msgid "Transfer" +msgstr "" + #~ msgid "Analytic Account" #~ msgstr "Cuenta Analítica" diff --git a/stock_analytic/i18n/es_MX.po b/stock_analytic/i18n/es_MX.po index 60d7885cb5..426378afa4 100644 --- a/stock_analytic/i18n/es_MX.po +++ b/stock_analytic/i18n/es_MX.po @@ -26,6 +26,18 @@ msgstr "" msgid "Analytic" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_account_analytic_applicability +msgid "Analytic Plan's Applicabilities" +msgstr "" + #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision @@ -33,6 +45,11 @@ msgstr "" msgid "Analytic Precision" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_account_analytic_applicability__business_domain +msgid "Domain" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" @@ -45,8 +62,14 @@ msgstr "" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move +#: model:ir.model.fields.selection,name:stock_analytic.selection__account_analytic_applicability__business_domain__stock_move msgid "Stock Move" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_picking +msgid "Transfer" +msgstr "" + #~ msgid "Analytic Account" #~ msgstr "Cuenta analítica" diff --git a/stock_analytic/i18n/fi.po b/stock_analytic/i18n/fi.po index 5f25d79c62..3bd10bca44 100644 --- a/stock_analytic/i18n/fi.po +++ b/stock_analytic/i18n/fi.po @@ -25,6 +25,18 @@ msgstr "" msgid "Analytic" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_account_analytic_applicability +msgid "Analytic Plan's Applicabilities" +msgstr "" + #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision @@ -32,6 +44,11 @@ msgstr "" msgid "Analytic Precision" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_account_analytic_applicability__business_domain +msgid "Domain" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" @@ -44,8 +61,14 @@ msgstr "" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move +#: model:ir.model.fields.selection,name:stock_analytic.selection__account_analytic_applicability__business_domain__stock_move msgid "Stock Move" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_picking +msgid "Transfer" +msgstr "" + #~ msgid "Analytic Account" #~ msgstr "Analyyttinen tili" diff --git a/stock_analytic/i18n/fr.po b/stock_analytic/i18n/fr.po index a22befbda2..0a8b13a28f 100644 --- a/stock_analytic/i18n/fr.po +++ b/stock_analytic/i18n/fr.po @@ -25,6 +25,18 @@ msgstr "" msgid "Analytic" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_account_analytic_applicability +msgid "Analytic Plan's Applicabilities" +msgstr "" + #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision @@ -32,6 +44,11 @@ msgstr "" msgid "Analytic Precision" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_account_analytic_applicability__business_domain +msgid "Domain" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" @@ -44,8 +61,14 @@ msgstr "" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move +#: model:ir.model.fields.selection,name:stock_analytic.selection__account_analytic_applicability__business_domain__stock_move msgid "Stock Move" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_picking +msgid "Transfer" +msgstr "" + #~ msgid "Analytic Account" #~ msgstr "Compte analytique" diff --git a/stock_analytic/i18n/gl.po b/stock_analytic/i18n/gl.po index 88ec5d5846..31e24eed42 100644 --- a/stock_analytic/i18n/gl.po +++ b/stock_analytic/i18n/gl.po @@ -25,6 +25,18 @@ msgstr "" msgid "Analytic" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_account_analytic_applicability +msgid "Analytic Plan's Applicabilities" +msgstr "" + #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision @@ -32,6 +44,11 @@ msgstr "" msgid "Analytic Precision" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_account_analytic_applicability__business_domain +msgid "Domain" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" @@ -44,8 +61,14 @@ msgstr "" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move +#: model:ir.model.fields.selection,name:stock_analytic.selection__account_analytic_applicability__business_domain__stock_move msgid "Stock Move" msgstr "Movemento de existencias" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_picking +msgid "Transfer" +msgstr "" + #~ msgid "Analytic Account" #~ msgstr "Conta analítica" diff --git a/stock_analytic/i18n/gu_IN.po b/stock_analytic/i18n/gu_IN.po index 6f6f7b89d7..694198b44a 100644 --- a/stock_analytic/i18n/gu_IN.po +++ b/stock_analytic/i18n/gu_IN.po @@ -26,6 +26,18 @@ msgstr "" msgid "Analytic" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_account_analytic_applicability +msgid "Analytic Plan's Applicabilities" +msgstr "" + #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision @@ -33,6 +45,11 @@ msgstr "" msgid "Analytic Precision" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_account_analytic_applicability__business_domain +msgid "Domain" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" @@ -45,8 +62,14 @@ msgstr "" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move +#: model:ir.model.fields.selection,name:stock_analytic.selection__account_analytic_applicability__business_domain__stock_move msgid "Stock Move" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_picking +msgid "Transfer" +msgstr "" + #~ msgid "Analytic Account" #~ msgstr "વિશ્લેષણાત્મક ખાતું" diff --git a/stock_analytic/i18n/hi_IN.po b/stock_analytic/i18n/hi_IN.po index 9abf7e124f..807070b676 100644 --- a/stock_analytic/i18n/hi_IN.po +++ b/stock_analytic/i18n/hi_IN.po @@ -26,6 +26,18 @@ msgstr "" msgid "Analytic" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_account_analytic_applicability +msgid "Analytic Plan's Applicabilities" +msgstr "" + #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision @@ -33,6 +45,11 @@ msgstr "" msgid "Analytic Precision" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_account_analytic_applicability__business_domain +msgid "Domain" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" @@ -45,8 +62,14 @@ msgstr "" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move +#: model:ir.model.fields.selection,name:stock_analytic.selection__account_analytic_applicability__business_domain__stock_move msgid "Stock Move" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_picking +msgid "Transfer" +msgstr "" + #~ msgid "Analytic Account" #~ msgstr "विश्लेषणात्मक खाता" diff --git a/stock_analytic/i18n/hr.po b/stock_analytic/i18n/hr.po index e7ee4b9a7c..826e596b2c 100644 --- a/stock_analytic/i18n/hr.po +++ b/stock_analytic/i18n/hr.po @@ -27,6 +27,18 @@ msgstr "" msgid "Analytic" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_account_analytic_applicability +msgid "Analytic Plan's Applicabilities" +msgstr "" + #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision @@ -34,6 +46,11 @@ msgstr "" msgid "Analytic Precision" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_account_analytic_applicability__business_domain +msgid "Domain" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" @@ -46,8 +63,14 @@ msgstr "" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move +#: model:ir.model.fields.selection,name:stock_analytic.selection__account_analytic_applicability__business_domain__stock_move msgid "Stock Move" msgstr "Skladišni prijenos" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_picking +msgid "Transfer" +msgstr "" + #~ msgid "Analytic Account" #~ msgstr "Analitički konto" diff --git a/stock_analytic/i18n/hr_HR.po b/stock_analytic/i18n/hr_HR.po index a63984573e..4a467c7ee9 100644 --- a/stock_analytic/i18n/hr_HR.po +++ b/stock_analytic/i18n/hr_HR.po @@ -27,6 +27,18 @@ msgstr "" msgid "Analytic" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_account_analytic_applicability +msgid "Analytic Plan's Applicabilities" +msgstr "" + #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision @@ -34,6 +46,11 @@ msgstr "" msgid "Analytic Precision" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_account_analytic_applicability__business_domain +msgid "Domain" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" @@ -46,8 +63,14 @@ msgstr "" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move +#: model:ir.model.fields.selection,name:stock_analytic.selection__account_analytic_applicability__business_domain__stock_move msgid "Stock Move" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_picking +msgid "Transfer" +msgstr "" + #~ msgid "Analytic Account" #~ msgstr "Analitički konto" diff --git a/stock_analytic/i18n/hu.po b/stock_analytic/i18n/hu.po index 3ee60c42aa..b474b4765d 100644 --- a/stock_analytic/i18n/hu.po +++ b/stock_analytic/i18n/hu.po @@ -25,6 +25,18 @@ msgstr "" msgid "Analytic" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_account_analytic_applicability +msgid "Analytic Plan's Applicabilities" +msgstr "" + #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision @@ -32,6 +44,11 @@ msgstr "" msgid "Analytic Precision" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_account_analytic_applicability__business_domain +msgid "Domain" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" @@ -44,8 +61,14 @@ msgstr "" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move +#: model:ir.model.fields.selection,name:stock_analytic.selection__account_analytic_applicability__business_domain__stock_move msgid "Stock Move" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_picking +msgid "Transfer" +msgstr "" + #~ msgid "Analytic Account" #~ msgstr "Analitikus gyűjtőkód könyvelés" diff --git a/stock_analytic/i18n/it.po b/stock_analytic/i18n/it.po index 6afb7044d8..62c4f90bb0 100644 --- a/stock_analytic/i18n/it.po +++ b/stock_analytic/i18n/it.po @@ -27,6 +27,18 @@ msgstr "" msgid "Analytic" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_account_analytic_applicability +msgid "Analytic Plan's Applicabilities" +msgstr "" + #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision @@ -34,6 +46,11 @@ msgstr "" msgid "Analytic Precision" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_account_analytic_applicability__business_domain +msgid "Domain" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" @@ -46,8 +63,14 @@ msgstr "" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move +#: model:ir.model.fields.selection,name:stock_analytic.selection__account_analytic_applicability__business_domain__stock_move msgid "Stock Move" msgstr "Movimento di magazzino" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_picking +msgid "Transfer" +msgstr "" + #~ msgid "Analytic Account" #~ msgstr "Conto Analitico" diff --git a/stock_analytic/i18n/nl.po b/stock_analytic/i18n/nl.po index e0e76b9214..97efad8f74 100644 --- a/stock_analytic/i18n/nl.po +++ b/stock_analytic/i18n/nl.po @@ -25,6 +25,18 @@ msgstr "" msgid "Analytic" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_account_analytic_applicability +msgid "Analytic Plan's Applicabilities" +msgstr "" + #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision @@ -32,6 +44,11 @@ msgstr "" msgid "Analytic Precision" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_account_analytic_applicability__business_domain +msgid "Domain" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" @@ -44,8 +61,14 @@ msgstr "" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move +#: model:ir.model.fields.selection,name:stock_analytic.selection__account_analytic_applicability__business_domain__stock_move msgid "Stock Move" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_picking +msgid "Transfer" +msgstr "" + #~ msgid "Analytic Account" #~ msgstr "Kostenplaats" diff --git a/stock_analytic/i18n/pt.po b/stock_analytic/i18n/pt.po index b61ee4a1e1..bbd14229b3 100644 --- a/stock_analytic/i18n/pt.po +++ b/stock_analytic/i18n/pt.po @@ -27,6 +27,18 @@ msgstr "" msgid "Analytic" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_account_analytic_applicability +msgid "Analytic Plan's Applicabilities" +msgstr "" + #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision @@ -34,6 +46,11 @@ msgstr "" msgid "Analytic Precision" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_account_analytic_applicability__business_domain +msgid "Domain" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" @@ -46,8 +63,14 @@ msgstr "Sucata" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move +#: model:ir.model.fields.selection,name:stock_analytic.selection__account_analytic_applicability__business_domain__stock_move msgid "Stock Move" msgstr "Movimento Stock" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_picking +msgid "Transfer" +msgstr "" + #~ msgid "Analytic Account" #~ msgstr "Conta Analítica" diff --git a/stock_analytic/i18n/pt_BR.po b/stock_analytic/i18n/pt_BR.po index cdbc394544..c32fa9f5f4 100644 --- a/stock_analytic/i18n/pt_BR.po +++ b/stock_analytic/i18n/pt_BR.po @@ -27,6 +27,18 @@ msgstr "" msgid "Analytic" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_account_analytic_applicability +msgid "Analytic Plan's Applicabilities" +msgstr "" + #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision @@ -34,6 +46,11 @@ msgstr "" msgid "Analytic Precision" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_account_analytic_applicability__business_domain +msgid "Domain" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" @@ -46,9 +63,15 @@ msgstr "Restos" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move +#: model:ir.model.fields.selection,name:stock_analytic.selection__account_analytic_applicability__business_domain__stock_move msgid "Stock Move" msgstr "Movimentação de Estoque" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_picking +msgid "Transfer" +msgstr "" + #~ msgid "Analytic Account" #~ msgstr "Conta analítica" diff --git a/stock_analytic/i18n/pt_PT.po b/stock_analytic/i18n/pt_PT.po index 544e44184b..a433ab941f 100644 --- a/stock_analytic/i18n/pt_PT.po +++ b/stock_analytic/i18n/pt_PT.po @@ -26,6 +26,18 @@ msgstr "" msgid "Analytic" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_account_analytic_applicability +msgid "Analytic Plan's Applicabilities" +msgstr "" + #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision @@ -33,6 +45,11 @@ msgstr "" msgid "Analytic Precision" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_account_analytic_applicability__business_domain +msgid "Domain" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" @@ -45,8 +62,14 @@ msgstr "" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move +#: model:ir.model.fields.selection,name:stock_analytic.selection__account_analytic_applicability__business_domain__stock_move msgid "Stock Move" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_picking +msgid "Transfer" +msgstr "" + #~ msgid "Analytic Account" #~ msgstr "Conta Analítica" diff --git a/stock_analytic/i18n/ro.po b/stock_analytic/i18n/ro.po index dac8e75451..1e7e0e5727 100644 --- a/stock_analytic/i18n/ro.po +++ b/stock_analytic/i18n/ro.po @@ -27,6 +27,18 @@ msgstr "" msgid "Analytic" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_account_analytic_applicability +msgid "Analytic Plan's Applicabilities" +msgstr "" + #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision @@ -34,6 +46,11 @@ msgstr "" msgid "Analytic Precision" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_account_analytic_applicability__business_domain +msgid "Domain" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" @@ -46,8 +63,14 @@ msgstr "" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move +#: model:ir.model.fields.selection,name:stock_analytic.selection__account_analytic_applicability__business_domain__stock_move msgid "Stock Move" msgstr "Mișcare stoc" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_picking +msgid "Transfer" +msgstr "" + #~ msgid "Analytic Account" #~ msgstr "Cont analitic" diff --git a/stock_analytic/i18n/sk_SK.po b/stock_analytic/i18n/sk_SK.po index 8fc39b109a..a9c842e0dc 100644 --- a/stock_analytic/i18n/sk_SK.po +++ b/stock_analytic/i18n/sk_SK.po @@ -26,6 +26,18 @@ msgstr "" msgid "Analytic" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_account_analytic_applicability +msgid "Analytic Plan's Applicabilities" +msgstr "" + #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision @@ -33,6 +45,11 @@ msgstr "" msgid "Analytic Precision" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_account_analytic_applicability__business_domain +msgid "Domain" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" @@ -45,8 +62,14 @@ msgstr "" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move +#: model:ir.model.fields.selection,name:stock_analytic.selection__account_analytic_applicability__business_domain__stock_move msgid "Stock Move" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_picking +msgid "Transfer" +msgstr "" + #~ msgid "Analytic Account" #~ msgstr "Analytický účet" diff --git a/stock_analytic/i18n/sl.po b/stock_analytic/i18n/sl.po index 64efa37d19..0f45ed756b 100644 --- a/stock_analytic/i18n/sl.po +++ b/stock_analytic/i18n/sl.po @@ -26,6 +26,18 @@ msgstr "" msgid "Analytic" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_account_analytic_applicability +msgid "Analytic Plan's Applicabilities" +msgstr "" + #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision @@ -33,6 +45,11 @@ msgstr "" msgid "Analytic Precision" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_account_analytic_applicability__business_domain +msgid "Domain" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" @@ -45,8 +62,14 @@ msgstr "" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move +#: model:ir.model.fields.selection,name:stock_analytic.selection__account_analytic_applicability__business_domain__stock_move msgid "Stock Move" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_picking +msgid "Transfer" +msgstr "" + #~ msgid "Analytic Account" #~ msgstr "Analitični konto" diff --git a/stock_analytic/i18n/stock_analytic.pot b/stock_analytic/i18n/stock_analytic.pot index ed196f8096..9cdfc3e5ce 100644 --- a/stock_analytic/i18n/stock_analytic.pot +++ b/stock_analytic/i18n/stock_analytic.pot @@ -20,6 +20,18 @@ msgstr "" msgid "Analytic" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_account_analytic_applicability +msgid "Analytic Plan's Applicabilities" +msgstr "" + #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision @@ -27,6 +39,11 @@ msgstr "" msgid "Analytic Precision" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_account_analytic_applicability__business_domain +msgid "Domain" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" @@ -39,5 +56,11 @@ msgstr "" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move +#: model:ir.model.fields.selection,name:stock_analytic.selection__account_analytic_applicability__business_domain__stock_move msgid "Stock Move" msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_picking +msgid "Transfer" +msgstr "" diff --git a/stock_analytic/i18n/tr.po b/stock_analytic/i18n/tr.po index 90fc41b1ce..046fc66471 100644 --- a/stock_analytic/i18n/tr.po +++ b/stock_analytic/i18n/tr.po @@ -25,6 +25,18 @@ msgstr "" msgid "Analytic" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_account_analytic_applicability +msgid "Analytic Plan's Applicabilities" +msgstr "" + #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision @@ -32,6 +44,11 @@ msgstr "" msgid "Analytic Precision" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_account_analytic_applicability__business_domain +msgid "Domain" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" @@ -44,5 +61,11 @@ msgstr "" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move +#: model:ir.model.fields.selection,name:stock_analytic.selection__account_analytic_applicability__business_domain__stock_move msgid "Stock Move" msgstr "Stok Taşı" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_picking +msgid "Transfer" +msgstr "" diff --git a/stock_analytic/i18n/tr_TR.po b/stock_analytic/i18n/tr_TR.po index 65c8f1d5c3..40d3cfc1b6 100644 --- a/stock_analytic/i18n/tr_TR.po +++ b/stock_analytic/i18n/tr_TR.po @@ -26,6 +26,18 @@ msgstr "" msgid "Analytic" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_account_analytic_applicability +msgid "Analytic Plan's Applicabilities" +msgstr "" + #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision @@ -33,6 +45,11 @@ msgstr "" msgid "Analytic Precision" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_account_analytic_applicability__business_domain +msgid "Domain" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" @@ -45,5 +62,11 @@ msgstr "" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move +#: model:ir.model.fields.selection,name:stock_analytic.selection__account_analytic_applicability__business_domain__stock_move msgid "Stock Move" msgstr "Stok hareketi" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_picking +msgid "Transfer" +msgstr "" diff --git a/stock_analytic/i18n/vi_VN.po b/stock_analytic/i18n/vi_VN.po index 22a250b29d..00f6a1296c 100644 --- a/stock_analytic/i18n/vi_VN.po +++ b/stock_analytic/i18n/vi_VN.po @@ -26,6 +26,18 @@ msgstr "" msgid "Analytic" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_account_analytic_applicability +msgid "Analytic Plan's Applicabilities" +msgstr "" + #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision @@ -33,6 +45,11 @@ msgstr "" msgid "Analytic Precision" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_account_analytic_applicability__business_domain +msgid "Domain" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" @@ -45,5 +62,11 @@ msgstr "" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move +#: model:ir.model.fields.selection,name:stock_analytic.selection__account_analytic_applicability__business_domain__stock_move msgid "Stock Move" msgstr "Dịch chuyển kho" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_picking +msgid "Transfer" +msgstr "" diff --git a/stock_analytic/i18n/zh_CN.po b/stock_analytic/i18n/zh_CN.po index a397cd454a..4354b130ea 100644 --- a/stock_analytic/i18n/zh_CN.po +++ b/stock_analytic/i18n/zh_CN.po @@ -26,6 +26,18 @@ msgstr "" msgid "Analytic" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_distribution_search +#: model:ir.model.fields,field_description:stock_analytic.field_stock_scrap__analytic_distribution_search +msgid "Analytic Distribution Search" +msgstr "" + +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_account_analytic_applicability +msgid "Analytic Plan's Applicabilities" +msgstr "" + #. module: stock_analytic #: model:ir.model.fields,field_description:stock_analytic.field_stock_move__analytic_precision #: model:ir.model.fields,field_description:stock_analytic.field_stock_move_line__analytic_precision @@ -33,6 +45,11 @@ msgstr "" msgid "Analytic Precision" msgstr "" +#. module: stock_analytic +#: model:ir.model.fields,field_description:stock_analytic.field_account_analytic_applicability__business_domain +msgid "Domain" +msgstr "" + #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move_line msgid "Product Moves (Stock Move Line)" @@ -45,8 +62,14 @@ msgstr "" #. module: stock_analytic #: model:ir.model,name:stock_analytic.model_stock_move +#: model:ir.model.fields.selection,name:stock_analytic.selection__account_analytic_applicability__business_domain__stock_move msgid "Stock Move" msgstr "" +#. module: stock_analytic +#: model:ir.model,name:stock_analytic.model_stock_picking +msgid "Transfer" +msgstr "" + #~ msgid "Analytic Account" #~ msgstr "核算科目" diff --git a/stock_analytic/models/__init__.py b/stock_analytic/models/__init__.py index bb813c10f7..3e009cb39f 100644 --- a/stock_analytic/models/__init__.py +++ b/stock_analytic/models/__init__.py @@ -1,4 +1,6 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from . import stock +from . import analytic_applicability +from . import stock_move +from . import stock_picking from . import stock_scrap diff --git a/stock_analytic/models/analytic_applicability.py b/stock_analytic/models/analytic_applicability.py new file mode 100644 index 0000000000..b5146790f2 --- /dev/null +++ b/stock_analytic/models/analytic_applicability.py @@ -0,0 +1,13 @@ +# Copyright 2023 Quartile Limited +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class AccountAnalyticApplicability(models.Model): + _inherit = "account.analytic.applicability" + + business_domain = fields.Selection( + selection_add=[("stock_move", "Stock Move")], + ondelete={"stock_move": "cascade"}, + ) diff --git a/stock_analytic/models/stock.py b/stock_analytic/models/stock_move.py similarity index 77% rename from stock_analytic/models/stock.py rename to stock_analytic/models/stock_move.py index be2371844c..989ca9599a 100644 --- a/stock_analytic/models/stock.py +++ b/stock_analytic/models/stock_move.py @@ -3,6 +3,7 @@ # Copyright 2016 OpenSynergy Indonesia # Copyright 2017 ForgeFlow S.L. # Copyright 2018 Hibou Corp. +# Copyright 2023 Quartile Limited # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo import api, models @@ -56,6 +57,23 @@ def _prepare_move_line_vals(self, quantity=None, reserved_quant=None): res.update({"analytic_distribution": self.analytic_distribution}) return res + def _action_done(self, cancel_backorder=False): + for move in self: + # Validate analytic distribution only for outgoing moves. + if move.location_id.usage not in ( + "internal", + "transit", + ) or move.location_dest_id.usage in ("internal", "transit"): + continue + move._validate_distribution( + **{ + "product": move.product_id.id, + "business_domain": "stock_move", + "company_id": move.company_id.id, + } + ) + return super()._action_done(cancel_backorder=cancel_backorder) + class StockMoveLine(models.Model): _name = "stock.move.line" diff --git a/stock_analytic/models/stock_picking.py b/stock_analytic/models/stock_picking.py new file mode 100644 index 0000000000..ac245fa054 --- /dev/null +++ b/stock_analytic/models/stock_picking.py @@ -0,0 +1,12 @@ +# Copyright 2023 Quartile Limited +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import models + + +class StockPicking(models.Model): + _inherit = "stock.picking" + + def button_validate(self): + self = self.with_context(validate_analytic=True) + return super().button_validate() diff --git a/stock_analytic/models/stock_scrap.py b/stock_analytic/models/stock_scrap.py index 52d3e6192a..0d277d89f3 100644 --- a/stock_analytic/models/stock_scrap.py +++ b/stock_analytic/models/stock_scrap.py @@ -15,3 +15,7 @@ def _prepare_move_values(self): } ) return res + + def action_validate(self): + self = self.with_context(validate_analytic=True) + return super().action_validate() diff --git a/stock_analytic/readme/CONFIGURE.rst b/stock_analytic/readme/CONFIGURE.rst new file mode 100644 index 0000000000..93b61ef460 --- /dev/null +++ b/stock_analytic/readme/CONFIGURE.rst @@ -0,0 +1,2 @@ +As necessary, go to *Invoicing > Configuration > Analytic Plans*, open the relevant +record and update the applicability for 'Stock Move'. diff --git a/stock_analytic/readme/CONTRIBUTORS.rst b/stock_analytic/readme/CONTRIBUTORS.rst index 039e48fccb..e41a71affe 100644 --- a/stock_analytic/readme/CONTRIBUTORS.rst +++ b/stock_analytic/readme/CONTRIBUTORS.rst @@ -9,3 +9,6 @@ * Jared Kipe * Alan Ramos * Mantas Šniukas +* `Quartile `__: + + * Yoshi Tashiro diff --git a/stock_analytic/readme/DESCRIPTION.rst b/stock_analytic/readme/DESCRIPTION.rst index 2e8ec57ce6..6cab2bfb33 100644 --- a/stock_analytic/readme/DESCRIPTION.rst +++ b/stock_analytic/readme/DESCRIPTION.rst @@ -1,2 +1,2 @@ -Adds an analytic account and analytic tags in stock move to be able to get +Adds Analytic Distribution field in stock move to be able to get analytic information when generating the journal items. diff --git a/stock_analytic/readme/USAGE.rst b/stock_analytic/readme/USAGE.rst index 13df40e283..6977782f37 100644 --- a/stock_analytic/readme/USAGE.rst +++ b/stock_analytic/readme/USAGE.rst @@ -1,19 +1,19 @@ -To Assign an Analytic Account and Analytic Tags to a Stock Move -=============================================================== +To Assign an Analytic Account to a Stock Move +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ You need to: #. Create manually or open draft picking -#. Add move lines and fill **analytic account** and **analytic tags** fields +#. Add move lines and assign an **analytic account** in Analytic Distribution field -Assigned Journal Items created from Stock Move with Analytic Account and Analytic Tags -====================================================================================== +Assigned Journal Items created from Stock Move with Analytic Account +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ If stock move automatically create journal entry, the journal entry will contain journal items with following rule: #. Journal item with account equal to product's valuation account will not be - assigned to any analytic account, neither analytic tags + assigned to any analytic account. #. Journal item with account different to product's valuation account will be assigned to an analytic account according to the stock move's analytic - account. The same logic applies to analytic tags. + account. diff --git a/stock_analytic/static/description/index.html b/stock_analytic/static/description/index.html index 50891d064c..0fa4bd3a6b 100644 --- a/stock_analytic/static/description/index.html +++ b/stock_analytic/static/description/index.html @@ -368,48 +368,56 @@

    Stock Analytic

    !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

    Beta License: AGPL-3 OCA/account-analytic Translate me on Weblate Try me on Runbot

    -

    Adds an analytic account and analytic tags in stock move to be able to get +

    Adds Analytic Distribution field in stock move to be able to get analytic information when generating the journal items.

    Table of contents

    -
    -

    Usage

    +
    +

    Configuration

    +

    As necessary, go to Invoicing > Configuration > Analytic Plans, open the relevant +record and update the applicability for ‘Stock Move’.

    -
    -

    To Assign an Analytic Account and Analytic Tags to a Stock Move

    +
    +

    Usage

    +
    +

    To Assign an Analytic Account to a Stock Move

    You need to:

    1. Create manually or open draft picking
      2. -
    2. Add move lines and fill analytic account and analytic tags fields
      3. +
    3. Add move lines and assign an analytic account in Analytic Distribution field
    -
    -

    Assigned Journal Items created from Stock Move with Analytic Account and Analytic Tags

    +
    +

    Assigned Journal Items created from Stock Move with Analytic Account

    If stock move automatically create journal entry, the journal entry will contain journal items with following rule:

    1. Journal item with account equal to product’s valuation account will not be -assigned to any analytic account, neither analytic tags
      2. +assigned to any analytic account.
    2. Journal item with account different to product’s valuation account will be assigned to an analytic account according to the stock move’s analytic -account. The same logic applies to analytic tags.
      3. +account.
    +
    -

    Bug Tracker

    +

    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 @@ -417,9 +425,9 @@

    Bug Tracker

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

    -

    Credits

    +

    Credits

    -

    Authors

    +

    Authors

    • Julius Network Solutions
    • ClearCorp
      • @@ -428,7 +436,7 @@

      Authors

    -

    Contributors

    +

    Contributors

    -

    Maintainers

    +

    Maintainers

    This module is maintained by the OCA.

    Odoo Community Association

    OCA, or the Odoo Community Association, is a nonprofit organization whose diff --git a/stock_analytic/tests/test_stock_picking.py b/stock_analytic/tests/test_stock_picking.py index 5f30355382..c917686e03 100644 --- a/stock_analytic/tests/test_stock_picking.py +++ b/stock_analytic/tests/test_stock_picking.py @@ -3,74 +3,85 @@ # Copyright 2016 OpenSynergy Indonesia # Copyright 2017 ForgeFlow S.L. # Copyright 2018 Hibou Corp. +# Copyright 2023 Quartile Limited # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from datetime import datetime +from odoo.exceptions import ValidationError from odoo.tests.common import TransactionCase class TestStockPicking(TransactionCase): - def setUp(self): - super(TestStockPicking, self).setUp() - self.product = self.env["product.product"].create( + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.product = cls.env["product.product"].create( { "name": "Test Product", "type": "product", "standard_price": 1.0, } ) - self.product_2 = self.env.ref("product.product_product_5") - self.product_categ = self.env.ref("product.product_category_5") - self.valuation_account = self.env["account.account"].create( + cls.product_2 = cls.env.ref("product.product_product_5") + cls.product_categ = cls.env.ref("product.product_category_5") + cls.valuation_account = cls.env["account.account"].create( { "name": "Test stock valuation", "code": "tv", "account_type": "liability_current", "reconcile": True, - "company_id": self.env.ref("base.main_company").id, + "company_id": cls.env.ref("base.main_company").id, } ) - self.stock_input_account = self.env["account.account"].create( + cls.stock_input_account = cls.env["account.account"].create( { "name": "Test stock input", "code": "tsti", "account_type": "expense", "reconcile": True, - "company_id": self.env.ref("base.main_company").id, + "company_id": cls.env.ref("base.main_company").id, } ) - self.stock_output_account = self.env["account.account"].create( + cls.stock_output_account = cls.env["account.account"].create( { "name": "Test stock output", "code": "tout", "account_type": "income", "reconcile": True, - "company_id": self.env.ref("base.main_company").id, + "company_id": cls.env.ref("base.main_company").id, } ) - self.stock_journal = self.env["account.journal"].create( + cls.stock_journal = cls.env["account.journal"].create( {"name": "Stock Journal", "code": "STJTEST", "type": "general"} ) - self.analytic_distribution = dict( - {str(self.env.ref("analytic.analytic_agrolait").id): 100.0} + cls.analytic_distribution = dict( + {str(cls.env.ref("analytic.analytic_agrolait").id): 100.0} ) - self.warehouse = self.env.ref("stock.warehouse0") - self.location = self.warehouse.lot_stock_id - self.dest_location = self.env.ref("stock.stock_location_customers") - self.outgoing_picking_type = self.env.ref("stock.picking_type_out") - self.incoming_picking_type = self.env.ref("stock.picking_type_in") + # analytic.analytic_agrolait belongs to analytic.analytic_plan_projects + cls.analytic_applicability = cls.env["account.analytic.applicability"].create( + { + "business_domain": "stock_move", + "applicability": "optional", + "analytic_plan_id": cls.env.ref("analytic.analytic_plan_projects").id, + } + ) + cls.warehouse = cls.env.ref("stock.warehouse0") + cls.location = cls.warehouse.lot_stock_id + cls.dest_location = cls.env.ref("stock.stock_location_customers") + cls.outgoing_picking_type = cls.env.ref("stock.picking_type_out") + cls.incoming_picking_type = cls.env.ref("stock.picking_type_in") - self.product_categ.update( + cls.product_categ.update( { "property_valuation": "real_time", - "property_stock_valuation_account_id": self.valuation_account.id, - "property_stock_account_input_categ_id": self.stock_input_account.id, - "property_stock_account_output_categ_id": self.stock_output_account.id, - "property_stock_journal": self.stock_journal.id, + "property_stock_valuation_account_id": cls.valuation_account.id, + "property_stock_account_input_categ_id": cls.stock_input_account.id, + "property_stock_account_output_categ_id": cls.stock_output_account.id, + "property_stock_journal": cls.stock_journal.id, } ) - self.product.update({"categ_id": self.product_categ.id}) + cls.product.update({"categ_id": cls.product_categ.id}) def _create_picking( self, @@ -132,10 +143,9 @@ def _check_analytic_account_no_error(self, picking): criteria2 = [["move_id.ref", "=", picking.name]] acc_lines = self.env["account.move.line"].search(criteria2) for acc_line in acc_lines: - if ( - acc_line.account_id - != move.product_id.categ_id.property_stock_valuation_account_id - ): + if acc_line.account_id == self.valuation_account: + self.assertEqual(acc_line.analytic_distribution, False) + else: self.assertEqual( acc_line.analytic_distribution, move.analytic_distribution ) @@ -161,7 +171,7 @@ def test_outgoing_picking_with_analytic(self): self._check_account_move_no_error(picking) self._check_analytic_account_no_error(picking) - def test_outgoing_picking_without_analytic(self): + def test_outgoing_picking_without_analytic_optional(self): picking = self._create_picking( self.location, self.dest_location, @@ -173,6 +183,18 @@ def test_outgoing_picking_without_analytic(self): self._check_account_move_no_error(picking) self._check_no_analytic_account(picking) + def test_outgoing_picking_without_analytic_mandatory(self): + self.analytic_applicability.write({"applicability": "mandatory"}) + picking = self._create_picking( + self.location, + self.dest_location, + self.outgoing_picking_type, + ) + self.__update_qty_on_hand_product(self.product, 1) + self._confirm_picking_no_error(picking) + with self.assertRaises(ValidationError): + self._picking_done_no_error(picking) + def test_incoming_picking_with_analytic(self): picking = self._create_picking( self.location, diff --git a/stock_analytic/tests/test_stock_scrap.py b/stock_analytic/tests/test_stock_scrap.py index fdb26081f4..7e72791a4c 100644 --- a/stock_analytic/tests/test_stock_scrap.py +++ b/stock_analytic/tests/test_stock_scrap.py @@ -1,5 +1,7 @@ # Copyright (C) 2019 Open Source Integrators +# Copyright 2023 Quartile Limited # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from odoo.exceptions import ValidationError from odoo.tests.common import TransactionCase @@ -13,6 +15,14 @@ def setUp(self): self.analytic_distribution = dict( {str(self.env.ref("analytic.analytic_agrolait").id): 100.0} ) + # analytic.analytic_agrolait belongs to analytic.analytic_plan_projects + self.analytic_applicability = self.env["account.analytic.applicability"].create( + { + "business_domain": "stock_move", + "applicability": "optional", + "analytic_plan_id": self.env.ref("analytic.analytic_plan_projects").id, + } + ) def __update_qty_on_hand_product(self, product, new_qty): qty_wizard = self.env["stock.change.product.qty"].create( @@ -50,11 +60,18 @@ def _check_analytic_distribution_no_error(self, scrap): acc_line.analytic_distribution, scrap.analytic_distribution ) - def test_scrap_without_analytic(self): + def test_scrap_without_analytic_optional(self): self.__update_qty_on_hand_product(self.product, 1) scrap = self._create_scrap() self._validate_scrap_no_error(scrap) + def test_scrap_without_analytic_mandatory(self): + self.analytic_applicability.write({"applicability": "mandatory"}) + self.__update_qty_on_hand_product(self.product, 1) + scrap = self._create_scrap() + with self.assertRaises(ValidationError): + self._validate_scrap_no_error(scrap) + def test_scrap_with_analytic(self): self.__update_qty_on_hand_product(self.product, 1) scrap = self._create_scrap( diff --git a/stock_analytic/views/stock_move_line_views.xml b/stock_analytic/views/stock_move_line_views.xml index 37aa6a4091..6617f73541 100644 --- a/stock_analytic/views/stock_move_line_views.xml +++ b/stock_analytic/views/stock_move_line_views.xml @@ -13,7 +13,7 @@ widget="analytic_distribution" optional="hide" groups="analytic.group_analytic_accounting" - options="{'product_field': 'product_id', 'business_domain': 'stock_move_line'}" + options="{'product_field': 'product_id', 'business_domain': 'stock_move'}" /> @@ -46,7 +46,7 @@ widget="analytic_distribution" optional="hide" groups="analytic.group_analytic_accounting" - options="{'product_field': 'product_id', 'business_domain': 'stock_move_line'}" + options="{'product_field': 'product_id', 'business_domain': 'stock_move'}" /> diff --git a/stock_analytic/views/stock_scrap_views.xml b/stock_analytic/views/stock_scrap_views.xml index 536d40e68e..c7da12a45f 100644 --- a/stock_analytic/views/stock_scrap_views.xml +++ b/stock_analytic/views/stock_scrap_views.xml @@ -9,7 +9,7 @@ name="analytic_distribution" widget="analytic_distribution" groups="analytic.group_analytic_accounting" - options="{'product_field': 'product_id', 'business_domain': 'stock_scrap'}" + options="{'product_field': 'product_id', 'business_domain': 'stock_move'}" /> @@ -24,7 +24,7 @@ name="analytic_distribution" widget="analytic_distribution" groups="analytic.group_analytic_accounting" - options="{'product_field': 'product_id', 'business_domain': 'stock_scrap'}" + options="{'product_field': 'product_id', 'business_domain': 'stock_move'}" /> From 2ad2f25f091fd72d0a520850dbbf2cf37cdd0693 Mon Sep 17 00:00:00 2001 From: ThiagoMForgeFlow Date: Thu, 15 Jun 2023 12:33:48 +0200 Subject: [PATCH 44/61] [16.0][IMP] stock_analytic: add analytic distribution to move tree receipt picking view --- stock_analytic/README.rst | 15 +++--- stock_analytic/__manifest__.py | 2 +- stock_analytic/static/description/index.html | 50 ++++++++++---------- stock_analytic/views/stock_move_views.xml | 17 +++++++ 4 files changed, 53 insertions(+), 31 deletions(-) diff --git a/stock_analytic/README.rst b/stock_analytic/README.rst index 423ce1033d..95d3427d96 100644 --- a/stock_analytic/README.rst +++ b/stock_analytic/README.rst @@ -2,10 +2,13 @@ Stock Analytic ============== -.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:a86e6eadbda1a82f8959ab9abed984ad2f25b1a351ad6563deafb50ef3f6183f + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png :target: https://odoo-community.org/page/development-status @@ -19,11 +22,11 @@ Stock Analytic .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png :target: https://translation.odoo-community.org/projects/account-analytic-16-0/account-analytic-16-0-stock_analytic :alt: Translate me on Weblate -.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/87/16.0 - :alt: Try me on Runbot +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/account-analytic&target_branch=16.0 + :alt: Try me on Runboat -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| |badge5| Adds Analytic Distribution field in stock move to be able to get analytic information when generating the journal items. @@ -67,7 +70,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 +If you spotted it first, help us to smash it by providing a detailed and welcomed `feedback `_. Do not contact contributors directly about support or help with technical issues. diff --git a/stock_analytic/__manifest__.py b/stock_analytic/__manifest__.py index a0af4eaf44..7ecda7ff49 100644 --- a/stock_analytic/__manifest__.py +++ b/stock_analytic/__manifest__.py @@ -8,7 +8,7 @@ { "name": "Stock Analytic", "summary": "Adds analytic distribution in stock move", - "version": "16.0.1.1.0", + "version": "16.0.1.2.0", "author": "Julius Network Solutions, " "ClearCorp, OpenSynergy Indonesia, " "Hibou Corp., " diff --git a/stock_analytic/static/description/index.html b/stock_analytic/static/description/index.html index 0fa4bd3a6b..ce476902f9 100644 --- a/stock_analytic/static/description/index.html +++ b/stock_analytic/static/description/index.html @@ -1,20 +1,20 @@ - + - + Stock Analytic