g2p!plwzQ(g1Aa^uTH&p$OVf3sEo;*bk8ykhD6wlcJ7p1I~Nk#7S{) z8|3iNM_TJ|W4E9+;P{!!35FYmanD#Ir!teHxJ=GR+n?`pa|t%Ts6dWPPMn1RTj-^I zBGOuIK`V77Wb-HpY9cZr+mVd0_+b#p#F) z )@OZmw0D2Uq3x0}#=d1zAVx%TmQwXKSm}-Yhs;r&LmZmLN{9 ziS{gzh=u+vnMzjNpha-DXvIc?iWHr&Bk4pm`9WAh_4{qpqN7Obd$wxX4LNY;b}eeZ znelZYf3L19BvI9>QjJg;azjegqr@u}iyv)C(y~2H(G@v{B0Of9+`#3%*9CJ}jl1SM zl1%PAV;ZkX;WvPC9vVDd|CxMm8cOS)y0T+Z7n)gGcN%TKUIm@ee#z{DY!5o=)KtrI zMTM-@WXLtB$w=4~)MOOzUbRwDw1JfsXV^g1z|ywxbaqz3dU@YFs>!4G+|*C266(zR zD(xe2rS9uX(oV7d4z@enAvy_l)+gGO<|acGDpF|K6^cAgw;8#ru=3_~3d!5?I3ZOO zsYNJ4J_$k}o_T9J*6!7!=(3zSny?)9pPMf9GT)?mf_uoM6uBHU6cZ8pOW}s?nzj zjMNeuM0t) 3FJ_y5144;5mkto!8lfG-#1qBw%>bV;*=2m z@3DMQB$wyzWw5xstOcjK8>?|}hgHg~GOV O(@7oGRihdC+ejv}>h8dH1-_le{ zg+2T$6g&Qt#^gMd*_C^ ^nN}O^BdgaRHB^{R9igK2zgu{(9OsEY>#q|ws9^Nq} z+l`o!8Z<%!D-p8=U-SxY$;)?y3fwPfwkTL+S_jZX75Ai&Os&EWrF17+c+-8+!JA5U zwQ_r{+P*SFfnBsG;)~Y=qT%3RFjMA5fnHr8Jh!)fh9@xdyn7php`o_!M7_;cn?83A z)!kPl65p#UtBJ)jcQnt4CfjB;HGLQr_px+ee (N`QOKY{&J;$7!62I1|U9F(UsjF2f^^Pr#noA=JzB){F zw=yy%;74;Sz1H2TB+820TdDpW)dG=uF06Cxv9_| @jr5S6hkU8{1BYY!Wx)=st~wFQNp=_r$)YTTj2FOH`#gWmT=h^4DuL zb5Nt1Bs`WD(G3k9{B bSP1cr2=$xGXIwQ1AeXh)D}HLqwFl z_i8j};PlJ+xlj&MR?{IO1Zsb+kAkMCzZUvrTj*4_QItE-HzQKvEIL6>>=~`)YKYFs zNVSs5kBSDI2qP<$I%?U7hN-2NYFDbW+&(^w8Rwv|@me1*F^fes@G7c7JM%2$RnRQk ziS|U}E>YDdiQbv7!OAnBN^MmZMVxdf$Y``%P*;a;SvVG_qaIU`=xDfO6w|7G!-}Q_ zc@Zz4mab^Es1nsyi$0zrHb$TfXfz|B(QGa?{;YN`b5M4SqT+xczibD9qkbyLP!XC% z
qXD-e$=o&qQu2@ou*Bbe`Kwh?h4`gRcdrl_6Jei_L0rc|m- z3UY?d5lR%cJdQcL(6vgBZ_k;~xhiUSug+CPAr>|GowsqTMDREOl{K-E)#<{>6PjCH zI@zL|*zHQ1XvOK&-dCWiNzr7)74--*=A+51I0mPRY?0koMK!kczmFzQX^8bS2z*LY ztS><9!PXERxr(7uqsbGXDhdCupi-mBQ=p<~@)W3ehmgi9RQm+3&KOPBU@VFzpB_wM z@|}i7fXw$5O`ZaI?roKUrb6GM#amSPcMAArbgiI+qhz+Jp=1hz)1Jd*Q@1^CDBksa zIGNzq5(#-?{l5< KrnXt)jlXh#r}dT$OkY^#Pai-*Kpw%A1Up z;{h8gFV;%sg^5fRTWZLIa%AFLJWwW2U%x}0G*BWxb`(D-kDu4LpMRX g|@kBvjWHp6xsJuw;Ku;o5)PZm+sJ6Dmr0T94mg}^RddV zfj2%EOLh&!8}_c9Ru^A5JyLScn%;)wf}_9pEg5XT{x|L=gDsn;uiAVxTD2&?uwnDD zggEIVI*mbsP+jhlY$g&yV=*gr9E(N}Ae-EEEF5CREyu7T;hF=rA|3_=gVyOs)f&+= z_8t?F<4OI;z70V)u?JZfNjZs4f-wvnXfTFDQ#+$Y(5r2{f>tdv*9z%1v-y3(C?d*} zVB83?HxWjW*UQ7W4|ptP`*84>kv$d+mPVrJB^e5fc5OI Dvg4`niSP z8)|UeX+z9d3MeIZMm)nx5{AR1WoY5%i7WZ08oyDoeNa$D45vrix!P t5BO zU&8JgG&wYBENc4*|( zOm2yG5m}TI+M-D|p*>aD4+_{r?AC1m8DJL~d9Q>HDCj!uRTtqkcx0bD L x`Lkbi@1#V#F;NXyjqN0KNIV z7`NifD;qGr#F*nc#+-Pc^9aVXIAN5F&2B6 zvG{Su5_m4L7X$MpaX*RcCoyjl? I~gm-b<3Y;tm2al5j2de8Oua5 z@LJ|1V^x^D8UdB+FELg#7voQi$$%9dvzhW~#%ilDKFU~K6UMI?s|O7AxOT(s7{6ew z@eszp7;E|iW6h-)J1~C3SPQ !T?;IcwbjJ z#%hck7@LN5O~W<1v6ksx#(MDHo);MF?P4sO!g!srzMnGIe>nzVnDIM?c9)FJ!fUhe zcmQ(_;JO3&{Os>x0Nz2sFvp02=Z88l0MF3h7#jw>!&v9sN{lNRo5wKDWo-Uh#ult# zY~j_6Edrd2{)@52pp}s$j4j#5*i!8CGQhR$DaMw6g|QU_7?^wIM;RN%{G-2PY!z^| zdNE^burF)yc LfBiCyzcID}YuyO=Hogl|eu%Nnz{BQ~jBNqFwqDNI zHo&qSV+UY9dlO?jaevn}jO{+a*q(9>TyO9FjGc1`;}yovor!_x&cplmwP5^^vHj~9 zJCMY9gRz5mGj^zwvBP!@%y(o7W9P>)fY+n9Gj{Ac=uYu7c0MwP6m6UQ^MZJmjAQ*cI$c?91%m*fs38?3?V1?Cb0_==fdy4J z^@m*1+t+IYYy9=gnWRaM9wCB} )p1tRsd)~hN2M!)O402`XA3b)#g%@3X$)(3HyZnkPue$m}*Iawu^&kGoM?ZGM z$8Wsp=1+X`mRoPT{f;|7_369r{>(l1e)c|g|K}d~{DWV3=!;+a^23i{Zy!DJwXZ++ z_&2`!t#5zli6_7Nz3;Q9e(=K|{rD$8efpW7J^LJCoYcm-xUB<~>OsvHV7H!TFJqTa zu`!Mge*BR1J?U3Te=?ekCsWDFWJ9tm`9N7J6%l$ViT8gB`}ivMe~d5Y>$LadYp0W? z$)tFHXVLp7V)(rtalrH^_9s5T*P?^gjrhHpe^UFsmEXzl=ARY6_jCN>LjPa$C#d~= zQ1db1|3X2_mw>~F|1Jk-UJ0JK8vJ(+xa~T8m)wWJFCPW}-M~H$?!1ZJ%s# e)#<%8h3hrr*&?Zo%Q|Btd0>}%lo$H491 z0QY~3eH&8Z2_Z4Q2QGdJy!=COu*$hl3%-38{7dw+6P&mMJb47XyB|Ed4?MdEJiixQ zy9r#r6`Z?S@be)M`vLY54vmDKQx&xJ_@5sqasLL4%^0gNW@C(E{2AjJj9W42`JEV7 zVQj_t8OAXTdf)XJdob2xY{bYvPmk$!`s_;>*I_Ki*oCnTgWgB)r`NY&T#9ie#^o4a zz}SRw0OKZ%OEBoYG}k%|f@KZHA&li17h=$RcVN(K3o%w>EWlWXaS_J-7)Q1Hcnzlk zN7 6wlT#K;+gW#ie68x885G)U19LIPXV*>`g=PV5R9L;|V#u1DUVeH1B>#W6~ z_sqw*7z69&di ?oSDU7Qz=)Hf$p!d_*k1>Mbz@Y1g zF$e})XB30heG-G#bvDLI49qED*o^xh!!TkDU}Q1qTC}(H9NoVcgK$G|^ 0E71Rbc5bcdrkXHgJ7rsH)(_Rl3=5`>H3og!9dT^>&1iC zdu-Bk#jmf&YlI8hyW&CnOM_^H=B3wY-zE>b7R^EXTRdog=SzpAVd?MEFYwI}Tlk;& zHPT0bLkHi@pMktEN-bmZ*eUdUJvz1vz0lqq8^Cuv4e@tacx)7vK-1B8v0ggPzrr5O zy~ qZMqd&|>*b;MLRahZw`XP~aLgHKsIr2EHg*A{VDaefD;QnTC_bf=IJ7Ehg z7T-lSDm?~^NiRJnT@7ZxUj5I%%bJ9?h4Vo&VCqlb&VA=W8zoZ_T@tc~>5{w*?}9d_ zAJEQMpeLV~hGDhNSX|rB)?Rx>>-9B%{ =kJV_z zq4W>lkIjUy7yAJI*gv4_a+uA``~m!Nen8jdvRIhq1Nh^%TAB3&_~ZG2uFGq)G1~|5 n$M*qUm)~w@_7C7sz~Nwy58zMm1G=t|)5)A4z@P93bY1@k diff --git a/addons/l10n_ch/dta/dta_demo.xml b/addons/l10n_ch/dta/dta_demo.xml index e1de5333316..1b785a63625 100644 --- a/addons/l10n_ch/dta/dta_demo.xml +++ b/addons/l10n_ch/dta/dta_demo.xml @@ -32,7 +32,7 @@ + + diff --git a/addons/purchase_journal/purchase_journal_view.xml b/addons/purchase_journal/purchase_journal_view.xml index 04157654b23..202adf98915 100644 --- a/addons/purchase_journal/purchase_journal_view.xml +++ b/addons/purchase_journal/purchase_journal_view.xml @@ -7,10 +7,22 @@ Co01 -Co01 +01-162-8 + - + + +stock.picking.purchase.journal.view.tree +tree +stock.picking ++ + ++ ++ diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 5467e6c1b61..8056225610d 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -336,7 +336,7 @@ class stock_picking(osv.osv): 'auto_picking': fields.boolean('Auto-Picking'), 'work': fields.boolean('Work todo'), 'loc_move_id': fields.many2one('stock.location', 'Move to Location'), - 'address_id': fields.many2one('res.partner.address', 'Partner Address'), + 'address_id': fields.many2one('res.partner.address', 'Partner'), 'lot_id': fields.many2one('stock.lot', 'Consumer Lot Created'), 'move_lot_id': fields.many2one('stock.move.lot', 'Moves Created'), 'invoice_state':fields.selection([ @@ -500,7 +500,6 @@ class stock_picking(osv.osv): 'name': p.name, 'origin': p.name+':'+p.origin, 'type': type, - 'reference': "P%dSO%d"%(p.address_id.partner_id.id,p.id), 'account_id': a, 'partner_id': p.address_id.partner_id.id, 'address_invoice_id': pinv_id, @@ -533,7 +532,7 @@ class stock_picking(osv.osv): if type in ('in_invoice','in_refund'): punit = line.product_id.standard_price iline_id = self.pool.get('account.invoice.line').create(cr, uid, { - 'name': p.name + ' - ' + line.name, + 'name': ((group and (p.name + ' - ')) or '') + line.name, 'invoice_id': invoice_id, 'uos_id': line.product_uos.id, 'product_id': line.product_id.id, diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 6594ec9862d..e0701e58818 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -433,8 +433,8 @@ purchase_journal.purchase.journal.form diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 0f4955ecaa4..97f8c0e60b5 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -366,7 +366,7 @@ class sale_order(osv.osv): }) move_id = self.pool.get('stock.move').create(cr, uid, { - 'name':'SO:'+order.name, + 'name':line.name, 'picking_id': picking_id, 'product_id': line.product_id.id, 'date_planned': date_planned, diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index e147b520647..e650eba0b85 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -269,8 +269,8 @@@@ -189,9 +189,9 @@ sale.order.pos sale.order -25 form +- + - - + +