openerp-openbig

Merge lp:~openbig/bigconsulting/again_modify_product_ean13_generator_last into lp:bigconsulting

  1. again_modify_product_ean13_generator_last
  2. Merge into addons
Proposed by Atik Agewan(OpenERP)
Status: Merged
Merged at revision: 40
Proposed branch: lp:~openbig/bigconsulting/again_modify_product_ean13_generator_last
Merge into: lp:bigconsulting
Diff against target: 253 lines (+131/-57)
3 files modified
product_ean13_generator/__terp__.py (+1/-1)
product_ean13_generator/report/product_ean_generator_report.rml (+117/-43)
product_ean13_generator/wizard/generator_ean13.py (+13/-13)
To merge this branch: bzr merge lp:~openbig/bigconsulting/again_modify_product_ean13_generator_last
Reviewer Review Type Date Requested Status
openbig Pending
Review via email: mp+28975@code.launchpad.net

Description of the change

again_modify_product_ean13_generator_last is done

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'product_ean13_generator/__terp__.py'
2--- product_ean13_generator/__terp__.py 2010-06-24 10:49:42 +0000
3+++ product_ean13_generator/__terp__.py 2010-07-01 10:41:12 +0000
4@@ -29,7 +29,7 @@
5 "description": """
6 * Adds a wizard on product form to generate valid EAN13 product codes.
7 * By default EAN13 will be generated with german country code (404) and 13341 as company code.
8- Each company should this values on administration/sequences to addecuate to his country and company code.
9+ Each company should change these values on administration/sequences to their country's and company's code.
10 """,
11 "license" : "GPL-3",
12 "depends" : ["base","product",],
13
14=== modified file 'product_ean13_generator/report/product_ean_generator_report.rml'
15--- product_ean13_generator/report/product_ean_generator_report.rml 2010-06-03 06:48:10 +0000
16+++ product_ean13_generator/report/product_ean_generator_report.rml 2010-07-01 10:41:12 +0000
17@@ -14,33 +14,34 @@
18 <blockAlignment value="LEFT"/>
19 <blockValign value="TOP"/>
20 <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
21+ <lineStyle kind="LINEAFTER" colorName="#000000" start="0,0" stop="0,-1"/>
22 <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
23 <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
24- <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,0" stop="1,-1"/>
25- <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
26- <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
27- <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,0" stop="2,-1"/>
28- <lineStyle kind="LINEAFTER" colorName="#000000" start="2,0" stop="2,-1"/>
29- <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
30- <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
31- <blockBackground colorName="#ffffff" start="0,0" stop="0,-1"/>
32- <blockBackground colorName="#ffffff" start="1,0" stop="1,-1"/>
33- <blockBackground colorName="#ffffff" start="2,0" stop="2,-1"/>
34 </blockTableStyle>
35- <blockTableStyle id="Table2">
36+ <blockTableStyle id="Table3">
37 <blockAlignment value="LEFT"/>
38 <blockValign value="TOP"/>
39 <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
40- <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
41- <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,0" stop="1,-1"/>
42- <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
43- <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,0" stop="2,-1"/>
44- <lineStyle kind="LINEAFTER" colorName="#000000" start="2,0" stop="2,-1"/>
45- <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
46+ <lineStyle kind="LINEAFTER" colorName="#000000" start="0,0" stop="0,-1"/>
47+ <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
48+ <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
49+ <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,1" stop="0,-1"/>
50+ <lineStyle kind="LINEAFTER" colorName="#000000" start="0,1" stop="0,-1"/>
51+ <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
52 </blockTableStyle>
53 <initialize>
54 <paraStyle name="all" alignment="justify"/>
55 </initialize>
56+ <paraStyle name="P1" fontName="Times-Bold" fontSize="10.0" leading="13" alignment="CENTER"/>
57+ <paraStyle name="P2" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="CENTER"/>
58+ <paraStyle name="P3" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="LEFT"/>
59+ <paraStyle name="P4" fontName="Times-Roman" fontSize="14.0" leading="17" alignment="CENTER"/>
60+ <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
61+ <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
62+ <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
63+ <paraStyle name="P8" fontName="Times-Roman" fontSize="10.0" leading="13"/>
64+ <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT"/>
65+ <paraStyle name="P10" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="LEFT"/>
66 <paraStyle name="Standard" fontName="Times-Roman"/>
67 <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
68 <paraStyle name="Heading" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="12.0" spaceAfter="6.0"/>
69@@ -79,43 +80,116 @@
70 <images/>
71 </stylesheet>
72 <story>
73+ <para style="P7">
74+ <font color="white"> .........</font>
75+ <font color="white"> .........</font>
76+ <font face="Times-Roman" size="15.0"/>
77+ <font face="Times-Bold" size="15.0">EAN13 REPORT</font>
78+ </para>
79 <para style="terp_default_8">
80- <font color="white"> </font>
81- </para>
82- <para style="Standard">
83- <font color="white"> </font>
84- </para>
85- <blockTable colWidths="78.0,294.0,167.0" style="Table1">
86+ <font face="Times-Bold" size="10.0"/>
87+ <font face="Times-Roman" size="10.0">[[repeatIn(objects,'o')]]</font>
88+ </para>
89+ <para style="P8">
90+ <font color="white"> </font>
91+ </para>
92+ <blockTable colWidths="228.0" style="Table1">
93 <tr>
94 <td>
95- <para style="terp_default_Bold_12">Code</para>
96- </td>
97- <td>
98- <para style="terp_default_Bold_12">Name</para>
99- </td>
100- <td>
101- <para style="terp_default_Bold_12">EAN 13 Code</para>
102+ <para style="P9">Code : <font face="Times-Roman">[[ o.code ]]</font></para>
103+ <para style="P9">Name : <font face="Times-Roman">[[ o.name ]]</font></para>
104+ <para style="P9">Ean Number:</para>
105 </td>
106 </tr>
107 </blockTable>
108 <section>
109+ <para style="P1">[[repeatIn(o.packaging,'a')]]</para>
110+ <blockTable colWidths="228.0" style="Table3">
111+ <tr>
112+ <td>
113+ <para style="P3">[[ a.ean ]]</para>
114+ </td>
115+ </tr>
116+ <tr>
117+ <td>
118+ <barCode code="code128" barWidth="1.4" barHeight="25">[[ a.ean or removeParentNode('td')]]</barCode>
119+ </td>
120+ </tr>
121+ </blockTable>
122+ </section>
123+ <para style="P5">
124+ <font color="white"> </font>
125+ </para>
126+ <para style="P5">
127+ <font color="white"> </font>
128+ </para>
129+ <para style="P5">
130+ <font color="white"> </font>
131+ </para>
132+ <section>
133+ <para style="P6">
134+ <font color="white"> </font>
135+ </para>
136+ </section>
137+ <para style="P6">
138+ <font color="white"> </font>
139+ </para>
140+ <para style="P1">
141+ <font color="white"> </font>
142+ </para>
143+ <para style="P1">
144+ <font color="white"> </font>
145+ </para>
146+ <para style="P1">
147+ <font color="white"> </font>
148+ </para>
149+ <para style="P1">
150+ <font color="white"> </font>
151+ </para>
152+ <para style="P1">
153+ <font color="white"> </font>
154+ </para>
155+ <para style="P1">
156+ <font color="white"> </font>
157+ </para>
158+ <para style="P1">
159+ <font color="white"> </font>
160+ </para>
161+ <para style="P6">
162+ <font color="white"> </font>
163+ </para>
164+ <para style="P6">
165+ <font color="white"> </font>
166+ </para>
167+ <para style="P6">
168+ <font color="white"> </font>
169+ </para>
170+ <para style="P6">
171+ <font color="white"> </font>
172+ </para>
173+ <para style="P6">
174+ <font color="white"> </font>
175+ </para>
176+ <para style="P6">
177+ <font color="white"> </font>
178+ </para>
179+ <para style="Standard">
180+ <font color="white"> </font>
181+ </para>
182+ <para style="Standard">
183+ <font color="white"> </font>
184+ </para>
185+ <section>
186 <para style="terp_default_1">[[repeatIn(objects,'o')]]</para>
187- <blockTable colWidths="78.0,294.0,167.0" style="Table2">
188- <tr>
189- <td>
190- <para style="terp_default_left_10">[[ o.code ]]</para>
191- </td>
192- <td>
193- <para style="terp_default_left_10">[[ o.name ]]</para>
194- </td>
195- <td>
196- <para style="terp_default_left_10">[[ o.ean13 ]]</para>
197- </td>
198- </tr>
199- </blockTable>
200+ <para style="terp_default_1">
201+ <font color="white"> </font>
202+ </para>
203 </section>
204 <para style="Standard">
205 <font color="white"> </font>
206 </para>
207+ <para style="Standard">
208+ <font color="white"> </font>
209+ </para>
210 </story>
211 </document>
212
213=== modified file 'product_ean13_generator/report/product_ean_generator_report.sxw'
214Binary files product_ean13_generator/report/product_ean_generator_report.sxw 2010-06-03 06:48:10 +0000 and product_ean13_generator/report/product_ean_generator_report.sxw 2010-07-01 10:41:12 +0000 differ
215=== modified file 'product_ean13_generator/wizard/generator_ean13.py'
216--- product_ean13_generator/wizard/generator_ean13.py 2010-06-29 06:24:04 +0000
217+++ product_ean13_generator/wizard/generator_ean13.py 2010-07-01 10:41:12 +0000
218@@ -40,22 +40,22 @@
219 product_obj = pooler.get_pool(cr.dbname).get('product.product')
220 sequence_obj = pooler.get_pool(cr.dbname).get('ir.sequence')
221 packaging_obj = pooler.get_pool(cr.dbname).get('product.packaging')
222-
223 for product in product_obj.browse(cr, uid, data['ids'], context=context):
224 ref = sequence_obj.get(cr, uid, 'generator.ean13')
225 for pack in product.packaging:
226- ref = sequence_obj.get(cr, uid, 'generator.ean13')
227- sum=0
228- for i in range(12):
229- if is_pair(i):
230- sum += int(ref[i])
231- else:
232- sum += 3 * int(ref[i])
233- new_ean_cc = int(math.ceil(sum / 10.0) * 10 - sum)
234- new_ean = ref + str(new_ean_cc)
235- vals = {'ean': new_ean}
236- packaging_obj.write(cr, uid, [pack.id], vals)
237-
238+ ean_val = pack.ean
239+ if ean_val == False:
240+ ref = sequence_obj.get(cr, uid, 'generator.ean13')
241+ sum=0
242+ for i in range(12):
243+ if is_pair(i):
244+ sum += int(ref[i])
245+ else:
246+ sum += 3 * int(ref[i])
247+ new_ean_cc = int(math.ceil(sum / 10.0) * 10 - sum)
248+ new_ean = ref + str(new_ean_cc)
249+ vals = {'ean': new_ean}
250+ packaging_obj.write(cr, uid, [pack.id], vals)
251 return {}
252
253 class generate_ean13(wizard.interface):

Subscribers

People subscribed via source and target branches