Merge lp:~openerp-dev/openobject-addons/trunk-ecommerce-clean-category-1-ypa into lp:openobject-addons
- trunk-ecommerce-clean-category-1-ypa
- Merge into trunk
Status: | Work in progress |
---|---|
Proposed branch: | lp:~openerp-dev/openobject-addons/trunk-ecommerce-clean-category-1-ypa |
Merge into: | lp:openobject-addons |
Diff against target: |
2737 lines (+699/-484) 19 files modified
account/product_view.xml (+1/-0) point_of_sale/point_of_sale.py (+61/-0) point_of_sale/point_of_sale_demo.xml (+159/-163) point_of_sale/point_of_sale_view.xml (+41/-2) point_of_sale/security/ir.model.access.csv (+2/-2) point_of_sale/static/src/js/db.js (+1/-1) point_of_sale/static/src/js/models.js (+2/-2) point_of_sale/static/src/js/widgets.js (+1/-1) product/product.py (+1/-69) product/product_data.xml (+0/-4) product/product_demo.xml (+0/-166) product/product_view.xml (+1/-59) product/security/ir.model.access.csv (+0/-2) website_quote/data/website_quotation_demo.xml (+0/-3) website_sale/controllers/main.py (+12/-9) website_sale/data/demo.xml (+293/-0) website_sale/models/product.py (+63/-0) website_sale/security/ir.model.access.csv (+3/-1) website_sale/views/views.xml (+58/-0) |
To merge this branch: | bzr merge lp:~openerp-dev/openobject-addons/trunk-ecommerce-clean-category-1-ypa |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenERP Core Team | Pending | ||
Review via email: mp+219698@code.launchpad.net |
Commit message
Description of the change
Hello,
I have make following improvements
- Change string for categ_id field in product_template form.
- Move categ_id field into accounting tab.
- Move product_
- Create pos_category object in Pointofsale module.
- Change model name in demodata in Pointofsale module.
- Create demodata for website_sale module.
Thanks,
ypa.
- 9470. By Yogesh Parekh(OpenERP)
-
[MERGE] Merge with addons
- 9471. By Yogesh Parekh(OpenERP)
-
[IMP] Improve access right in website_sale csv file and remove unnecessary space in contoller file
- 9472. By Yogesh Parekh(OpenERP)
-
[IMP] Add demodata for product in website_sale demo file
- 9473. By Yogesh Parekh(OpenERP)
-
[IMP] Improve string for pos_categ_id field and improve demodata
- 9474. By Yogesh Parekh(OpenERP)
-
[IMP] Add computer image in website_sale module
- 9475. By Pinakin Nayi (OpenERP)
-
[IMP]point_of_sale: rename pos category name
- 9476. By Yogesh Parekh(OpenERP)
-
[MERGE] Merge with addons
- 9477. By Yogesh Parekh(OpenERP)
-
[MERGE] Merge with addons
Unmerged revisions
- 9477. By Yogesh Parekh(OpenERP)
-
[MERGE] Merge with addons
- 9476. By Yogesh Parekh(OpenERP)
-
[MERGE] Merge with addons
- 9475. By Pinakin Nayi (OpenERP)
-
[IMP]point_of_sale: rename pos category name
- 9474. By Yogesh Parekh(OpenERP)
-
[IMP] Add computer image in website_sale module
- 9473. By Yogesh Parekh(OpenERP)
-
[IMP] Improve string for pos_categ_id field and improve demodata
- 9472. By Yogesh Parekh(OpenERP)
-
[IMP] Add demodata for product in website_sale demo file
- 9471. By Yogesh Parekh(OpenERP)
-
[IMP] Improve access right in website_sale csv file and remove unnecessary space in contoller file
- 9470. By Yogesh Parekh(OpenERP)
-
[MERGE] Merge with addons
- 9469. By Yogesh Parekh(OpenERP)
-
[IMP] Add group on public category menu and improve view for public_categ_id field in website_sale view file
- 9468. By Yogesh Parekh(OpenERP)
-
[IMP] Add domain in controller file to make invisible all products in website_sale module
Preview Diff
1 | === modified file 'account/product_view.xml' |
2 | --- account/product_view.xml 2014-01-22 09:58:26 +0000 |
3 | +++ account/product_view.xml 2014-05-20 04:55:26 +0000 |
4 | @@ -37,6 +37,7 @@ |
5 | <page string="Accounting"> |
6 | <group name="properties"> |
7 | <group> |
8 | + <field name="categ_id"/> |
9 | <field name="property_account_income" domain="[('type','<>','view'),('type','<>','consolidation')]"/> |
10 | <field name="taxes_id" colspan="2" widget="many2many_tags"/> |
11 | </group> |
12 | |
13 | === modified file 'point_of_sale/point_of_sale.py' |
14 | --- point_of_sale/point_of_sale.py 2014-05-08 14:39:40 +0000 |
15 | +++ point_of_sale/point_of_sale.py 2014-05-20 04:55:26 +0000 |
16 | @@ -1318,6 +1318,66 @@ |
17 | self.pool[m].write(cr,uid,[m_id],{'ean13':ean13}) |
18 | return { 'type' : 'ir.actions.act_window_close' } |
19 | |
20 | +class pos_category(osv.Model): |
21 | + _name = "pos.category" |
22 | + _description = "Point Of Sale Category" |
23 | + |
24 | + def name_get(self, cr, uid, ids, context=None): |
25 | + if not len(ids): |
26 | + return [] |
27 | + reads = self.read(cr, uid, ids, ['name','parent_id'], context=context) |
28 | + res = [] |
29 | + for record in reads: |
30 | + name = record['name'] |
31 | + if record['parent_id']: |
32 | + name = record['parent_id'][1]+' / '+name |
33 | + res.append((record['id'], name)) |
34 | + return res |
35 | + |
36 | + def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None): |
37 | + res = self.name_get(cr, uid, ids, context=context) |
38 | + return dict(res) |
39 | + |
40 | + def _get_image(self, cr, uid, ids, name, args, context=None): |
41 | + result = dict.fromkeys(ids, False) |
42 | + for obj in self.browse(cr, uid, ids, context=context): |
43 | + result[obj.id] = tools.image_get_resized_images(obj.image) |
44 | + return result |
45 | + |
46 | + def _set_image(self, cr, uid, id, name, value, args, context=None): |
47 | + return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context) |
48 | + |
49 | + _columns = { |
50 | + 'name': fields.char('Name', required=True, translate=True), |
51 | + 'complete_name': fields.function(_name_get_fnc, type="char", string='Name'), |
52 | + 'parent_id': fields.many2one('pos.category','Parent Category', select=True), |
53 | + 'child_id': fields.one2many('pos.category', 'parent_id', string='Children Categories'), |
54 | + 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of product categories."), |
55 | + |
56 | + # NOTE: there is no 'default image', because by default we don't show thumbnails for categories. However if we have a thumbnail |
57 | + # for at least one category, then we display a default image on the other, so that the buttons have consistent styling. |
58 | + # In this case, the default image is set by the js code. |
59 | + # NOTE2: image: all image fields are base64 encoded and PIL-supported |
60 | + 'image': fields.binary("Image", |
61 | + help="This field holds the image used as image for the cateogry, limited to 1024x1024px."), |
62 | + 'image_medium': fields.function(_get_image, fnct_inv=_set_image, |
63 | + string="Medium-sized image", type="binary", multi="_get_image", |
64 | + store={ |
65 | + 'pos.category': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10), |
66 | + }, |
67 | + help="Medium-sized image of the category. It is automatically "\ |
68 | + "resized as a 128x128px image, with aspect ratio preserved. "\ |
69 | + "Use this field in form views or some kanban views."), |
70 | + 'image_small': fields.function(_get_image, fnct_inv=_set_image, |
71 | + string="Smal-sized image", type="binary", multi="_get_image", |
72 | + store={ |
73 | + 'pos.category': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10), |
74 | + }, |
75 | + help="Small-sized image of the category. It is automatically "\ |
76 | + "resized as a 64x64px image, with aspect ratio preserved. "\ |
77 | + "Use this field anywhere a small image is required."), |
78 | + } |
79 | + |
80 | class product_product(osv.osv): |
81 | _inherit = 'product.product' |
82 | |
83 | @@ -1338,6 +1398,7 @@ |
84 | # return result |
85 | |
86 | _columns = { |
87 | + 'pos_categ_id': fields.many2one('pos.category', string="Point of Sale Category", help="Those categories are used to group similar products for public sales (eg.: point of sale)."), |
88 | 'income_pdt': fields.boolean('Point of Sale Cash In', help="Check if, this is a product you can use to put cash into a statement for the point of sale backend."), |
89 | 'expense_pdt': fields.boolean('Point of Sale Cash Out', help="Check if, this is a product you can use to take cash from a statement for the point of sale backend, example: money lost, transfer to bank, etc."), |
90 | 'available_in_pos': fields.boolean('Available in the Point of Sale', help='Check if you want this product to appear in the Point of Sale'), |
91 | |
92 | === modified file 'point_of_sale/point_of_sale_demo.xml' |
93 | --- point_of_sale/point_of_sale_demo.xml 2014-01-27 17:21:21 +0000 |
94 | +++ point_of_sale/point_of_sale_demo.xml 2014-05-20 04:55:26 +0000 |
95 | @@ -39,145 +39,141 @@ |
96 | <field name="journal_ids" eval="[(6, 0, [ref('account.cash_journal'), ref('account.bank_journal'), ref('account.check_journal')])]" /> |
97 | </record> |
98 | |
99 | - <!-- Resource: product.public.category --> |
100 | - |
101 | - <record id="product.computers" model="product.public.category"> |
102 | - <field name="image" type="base64" file="point_of_sale/static/img/computer.png"/> |
103 | - </record> |
104 | - |
105 | - <record id="beverage" model="product.public.category"> |
106 | + <!-- Resource: pos.category --> |
107 | + |
108 | + <record id="beverage" model="pos.category"> |
109 | <field name="name">Beverages</field> |
110 | <field name="image" type="base64" file="point_of_sale/static/img/beverage-image.jpg"/> |
111 | </record> |
112 | |
113 | - <record id="water" model="product.public.category"> |
114 | + <record id="water" model="pos.category"> |
115 | <field name="parent_id" ref="beverage"/> |
116 | <field name="name">Water</field> |
117 | <field name="image" type="base64" file="point_of_sale/static/img/water-image.jpg"/> |
118 | </record> |
119 | - <record id="plain_water" model="product.public.category"> |
120 | + <record id="plain_water" model="pos.category"> |
121 | <field name="parent_id" ref="water"/> |
122 | <field name="name">Plain Water</field> |
123 | <field name="image" type="base64" file="point_of_sale/static/img/plain_water-image.jpg"/> |
124 | </record> |
125 | - <record id="sparkling_water" model="product.public.category"> |
126 | + <record id="sparkling_water" model="pos.category"> |
127 | <field name="parent_id" ref="water"/> |
128 | <field name="name">Sparkling Water</field> |
129 | <field name="image" type="base64" file="point_of_sale/static/img/sparkling_water-image.jpg"/> |
130 | </record> |
131 | - <record id="soda" model="product.public.category"> |
132 | + <record id="soda" model="pos.category"> |
133 | <field name="parent_id" ref="beverage"/> |
134 | <field name="name">Soda</field> |
135 | <field name="image" type="base64" file="point_of_sale/static/img/soda-image.jpg"/> |
136 | </record> |
137 | - <record id="coke" model="product.public.category"> |
138 | + <record id="coke" model="pos.category"> |
139 | <field name="parent_id" ref="soda"/> |
140 | <field name="name">Coke</field> |
141 | <field name="image" type="base64" file="point_of_sale/static/img/coke-image.jpg"/> |
142 | </record> |
143 | - <record id="soda_orange" model="product.public.category"> |
144 | + <record id="soda_orange" model="pos.category"> |
145 | <field name="parent_id" ref="soda"/> |
146 | <field name="name">Orange</field> |
147 | <field name="image" type="base64" file="point_of_sale/static/img/soda_orange-image.jpg"/> |
148 | </record> |
149 | - <record id="beers" model="product.public.category"> |
150 | + <record id="beers" model="pos.category"> |
151 | <field name="parent_id" ref="beverage"/> |
152 | <field name="name">Beers</field> |
153 | <field name="image" type="base64" file="point_of_sale/static/img/beers-image.jpg"/> |
154 | </record> |
155 | - <record id="pils" model="product.public.category"> |
156 | + <record id="pils" model="pos.category"> |
157 | <field name="parent_id" ref="beers"/> |
158 | <field name="name">Pils</field> |
159 | <field name="image" type="base64" file="point_of_sale/static/img/pils-image.jpg"/> |
160 | </record> |
161 | - <record id="fruity_beers" model="product.public.category"> |
162 | + <record id="fruity_beers" model="pos.category"> |
163 | <field name="parent_id" ref="beers"/> |
164 | <field name="name">Fruity Beers</field> |
165 | <field name="image" type="base64" file="point_of_sale/static/img/fruity_beers-image.jpg"/> |
166 | </record> |
167 | - <record id="special_beers" model="product.public.category"> |
168 | + <record id="special_beers" model="pos.category"> |
169 | <field name="parent_id" ref="beers"/> |
170 | <field name="name">Special Beers</field> |
171 | <field name="image" type="base64" file="point_of_sale/static/img/special_beers-image.jpg"/> |
172 | </record> |
173 | - <record id="food" model="product.public.category"> |
174 | + <record id="food" model="pos.category"> |
175 | <field name="name">Food</field> |
176 | <field name="image" type="base64" file="point_of_sale/static/img/food-image.jpg"/> |
177 | </record> |
178 | - <record id="pizza" model="product.public.category"> |
179 | + <record id="pizza" model="pos.category"> |
180 | <field name="parent_id" ref="food"/> |
181 | <field name="name">Pizza</field> |
182 | <field name="image" type="base64" file="point_of_sale/static/img/pizza-image.jpg"/> |
183 | </record> |
184 | - <record id="ice_cream" model="product.public.category"> |
185 | + <record id="ice_cream" model="pos.category"> |
186 | <field name="parent_id" ref="food"/> |
187 | <field name="name">Ice Cream</field> |
188 | <field name="image" type="base64" file="point_of_sale/static/img/ice_cream-image.jpg"/> |
189 | </record> |
190 | - <record id="chips" model="product.public.category"> |
191 | + <record id="chips" model="pos.category"> |
192 | <field name="parent_id" ref="food"/> |
193 | <field name="name">Chips</field> |
194 | <field name="image" type="base64" file="point_of_sale/static/img/chips-image.jpg"/> |
195 | </record> |
196 | - <record id="fruits" model="product.public.category"> |
197 | + <record id="fruits" model="pos.category"> |
198 | <field name="name">Fresh Fruits</field> |
199 | <field name="image" type="base64" file="point_of_sale/static/img/fruits-image.jpg"/> |
200 | </record> |
201 | - <record id="oranges" model="product.public.category"> |
202 | + <record id="oranges" model="pos.category"> |
203 | <field name="parent_id" ref="fruits"/> |
204 | <field name="name">Oranges</field> |
205 | <field name="image" type="base64" file="point_of_sale/static/img/oranges-image.jpg"/> |
206 | </record> |
207 | - <record id="pomme" model="product.public.category"> |
208 | + <record id="pomme" model="pos.category"> |
209 | <field name="parent_id" ref="fruits"/> |
210 | <field name="name">Apples</field> |
211 | <field name="image" type="base64" file="point_of_sale/static/img/pomme-image.jpg"/> |
212 | </record> |
213 | - <record id="autres_agrumes" model="product.public.category"> |
214 | + <record id="autres_agrumes" model="pos.category"> |
215 | <field name="parent_id" ref="fruits"/> |
216 | <field name="name">Other Citrus</field> |
217 | <field name="image" type="base64" file="point_of_sale/static/img/autres_agrumes-image.jpg"/> |
218 | </record> |
219 | - <record id="poire" model="product.public.category"> |
220 | + <record id="poire" model="pos.category"> |
221 | <field name="parent_id" ref="fruits"/> |
222 | <field name="name">Pears</field> |
223 | <field name="image" type="base64" file="point_of_sale/static/img/poire-image.jpg"/> |
224 | </record> |
225 | - <record id="rouges_noyau_fruits" model="product.public.category"> |
226 | + <record id="rouges_noyau_fruits" model="pos.category"> |
227 | <field name="parent_id" ref="fruits"/> |
228 | <field name="name">Berries</field> |
229 | <field name="image" type="base64" file="point_of_sale/static/img/rouges_noyau_fruits-image.jpg"/> |
230 | </record> |
231 | - <record id="raisins" model="product.public.category"> |
232 | + <record id="raisins" model="pos.category"> |
233 | <field name="parent_id" ref="fruits"/> |
234 | <field name="name">Grapes</field> |
235 | <field name="image" type="base64" file="point_of_sale/static/img/raisins-image.jpg"/> |
236 | </record> |
237 | - <record id="legumes" model="product.public.category"> |
238 | + <record id="legumes" model="pos.category"> |
239 | <field name="name">Fresh vegetables</field> |
240 | <field name="image" type="base64" file="point_of_sale/static/img/legumes-image.jpg"/> |
241 | </record> |
242 | - <record id="pommes_de_terre" model="product.public.category"> |
243 | + <record id="pommes_de_terre" model="pos.category"> |
244 | <field name="parent_id" ref="legumes"/> |
245 | <field name="name">Potatoes</field> |
246 | <field name="image" type="base64" file="point_of_sale/static/img/pommes_de_terre-image.jpg"/> |
247 | </record> |
248 | - <record id="legumes_racine" model="product.public.category"> |
249 | + <record id="legumes_racine" model="pos.category"> |
250 | <field name="parent_id" ref="legumes"/> |
251 | <field name="name">Root vegetables</field> |
252 | <field name="image" type="base64" file="point_of_sale/static/img/legumes_racine-image.jpg"/> |
253 | </record> |
254 | - <record id="tomates" model="product.public.category"> |
255 | + <record id="tomates" model="pos.category"> |
256 | <field name="parent_id" ref="legumes"/> |
257 | <field name="name">Tomatos</field> |
258 | <field name="image" type="base64" file="point_of_sale/static/img/tomates-image.jpg"/> |
259 | </record> |
260 | - <record id="oignons_ail_echalotes" model="product.public.category"> |
261 | + <record id="oignons_ail_echalotes" model="pos.category"> |
262 | <field name="parent_id" ref="legumes"/> |
263 | <field name="name">Onions / Garlic / Shallots</field> |
264 | <field name="image" type="base64" file="point_of_sale/static/img/oignons_ail_echalotes-image.jpg"/> |
265 | </record> |
266 | - <record id="autres_legumes_frais" model="product.public.category"> |
267 | + <record id="autres_legumes_frais" model="pos.category"> |
268 | <field name="parent_id" ref="legumes"/> |
269 | <field name="name">Other fresh vegetables</field> |
270 | <field name="image" type="base64" file="point_of_sale/static/img/autres_legumes_frais-image.jpg"/> |
271 | @@ -191,7 +187,7 @@ |
272 | <field name="name">Boni Oranges</field> |
273 | <field name="to_weight">True</field> |
274 | <field name="ean13">2100002000003</field> |
275 | - <field name="public_categ_id" ref="oranges"/> |
276 | + <field name="pos_categ_id" ref="oranges"/> |
277 | <field name="uom_id" ref="product.product_uom_kgm" /> |
278 | <field name="uom_po_id" ref="product.product_uom_kgm" /> |
279 | <field name="image" type="base64" file="point_of_sale/static/img/boni_orange-image.jpg"/> |
280 | @@ -200,7 +196,7 @@ |
281 | <field name="available_in_pos">True</field> |
282 | <field name="list_price">2.83</field> |
283 | <field name="name">Orange Butterfly</field> |
284 | - <field name="public_categ_id" ref="oranges"/> |
285 | + <field name="pos_categ_id" ref="oranges"/> |
286 | <field name="to_weight">True</field> |
287 | <field name="uom_id" ref="product.product_uom_kgm" /> |
288 | <field name="uom_po_id" ref="product.product_uom_kgm" /> |
289 | @@ -213,7 +209,7 @@ |
290 | <field name="name">Lemon</field> |
291 | <field name="ean13">2301000000006</field> |
292 | <field name="to_weight">True</field> |
293 | - <field name="public_categ_id" ref="autres_agrumes"/> |
294 | + <field name="pos_categ_id" ref="autres_agrumes"/> |
295 | <field name="uom_id" ref="product.product_uom_kgm" /> |
296 | <field name="uom_po_id" ref="product.product_uom_kgm" /> |
297 | <field name="image" type="base64" file="point_of_sale/static/img/citron-image.jpg"/> |
298 | @@ -223,7 +219,7 @@ |
299 | <field name="list_price">3.19</field> |
300 | <field name="name">Stringers</field> |
301 | <field name="to_weight">True</field> |
302 | - <field name="public_categ_id" ref="autres_agrumes"/> |
303 | + <field name="pos_categ_id" ref="autres_agrumes"/> |
304 | <field name="uom_id" ref="product.product_uom_kgm" /> |
305 | <field name="uom_po_id" ref="product.product_uom_kgm" /> |
306 | <field name="image" type="base64" file="point_of_sale/static/img/limon-image.jpg"/> |
307 | @@ -233,7 +229,7 @@ |
308 | <field name="list_price">1.98</field> |
309 | <field name="name">Red grapefruit</field> |
310 | <field name="to_weight">True</field> |
311 | - <field name="public_categ_id" ref="autres_agrumes"/> |
312 | + <field name="pos_categ_id" ref="autres_agrumes"/> |
313 | <field name="uom_id" ref="product.product_uom_kgm" /> |
314 | <field name="uom_po_id" ref="product.product_uom_kgm" /> |
315 | <field name="image" type="base64" file="point_of_sale/static/img/pamplemousse_rouge_pamplemousse-image.jpg"/> |
316 | @@ -244,7 +240,7 @@ |
317 | <field name="list_price">2.09</field> |
318 | <field name="name">Granny Smith apples</field> |
319 | <field name="to_weight">True</field> |
320 | - <field name="public_categ_id" ref="pomme"/> |
321 | + <field name="pos_categ_id" ref="pomme"/> |
322 | <field name="uom_id" ref="product.product_uom_kgm" /> |
323 | <field name="uom_po_id" ref="product.product_uom_kgm" /> |
324 | <field name="image" type="base64" file="point_of_sale/static/img/pomme_granny_smith-image.jpg"/> |
325 | @@ -254,7 +250,7 @@ |
326 | <field name="list_price">1.10</field> |
327 | <field name="name">Jonagold apples</field> |
328 | <field name="to_weight">True</field> |
329 | - <field name="public_categ_id" ref="pomme"/> |
330 | + <field name="pos_categ_id" ref="pomme"/> |
331 | <field name="uom_id" ref="product.product_uom_kgm" /> |
332 | <field name="uom_po_id" ref="product.product_uom_kgm" /> |
333 | <field name="image" type="base64" file="point_of_sale/static/img/pomme_jonagold-image.jpg"/> |
334 | @@ -264,7 +260,7 @@ |
335 | <field name="list_price">1.69</field> |
336 | <field name="name">Golden Apples Perlim</field> |
337 | <field name="to_weight">True</field> |
338 | - <field name="public_categ_id" ref="pomme"/> |
339 | + <field name="pos_categ_id" ref="pomme"/> |
340 | <field name="uom_id" ref="product.product_uom_kgm" /> |
341 | <field name="uom_po_id" ref="product.product_uom_kgm" /> |
342 | <field name="image" type="base64" file="point_of_sale/static/img/pomme_golden_perlim-image.jpg"/> |
343 | @@ -275,7 +271,7 @@ |
344 | <field name="list_price">1.70</field> |
345 | <field name="name">Conference pears</field> |
346 | <field name="to_weight">True</field> |
347 | - <field name="public_categ_id" ref="poire"/> |
348 | + <field name="pos_categ_id" ref="poire"/> |
349 | <field name="uom_id" ref="product.product_uom_kgm" /> |
350 | <field name="uom_po_id" ref="product.product_uom_kgm" /> |
351 | <field name="image" type="base64" file="point_of_sale/static/img/poire_conference-image.jpg"/> |
352 | @@ -286,7 +282,7 @@ |
353 | <field name="list_price">5.70</field> |
354 | <field name="name">Peach</field> |
355 | <field name="to_weight">True</field> |
356 | - <field name="public_categ_id" ref="rouges_noyau_fruits"/> |
357 | + <field name="pos_categ_id" ref="rouges_noyau_fruits"/> |
358 | <field name="uom_id" ref="product.product_uom_kgm" /> |
359 | <field name="uom_po_id" ref="product.product_uom_kgm" /> |
360 | <field name="image" type="base64" file="point_of_sale/static/img/nectarine-image.jpg"/> |
361 | @@ -297,7 +293,7 @@ |
362 | <field name="name">Peaches</field> |
363 | <field name="to_weight">True</field> |
364 | <field name="ean13">2300001000008</field> |
365 | - <field name="public_categ_id" ref="rouges_noyau_fruits"/> |
366 | + <field name="pos_categ_id" ref="rouges_noyau_fruits"/> |
367 | <field name="uom_id" ref="product.product_uom_kgm" /> |
368 | <field name="uom_po_id" ref="product.product_uom_kgm" /> |
369 | <field name="image" type="base64" file="point_of_sale/static/img/peche-image.jpg"/> |
370 | @@ -308,7 +304,7 @@ |
371 | <field name="list_price">4.80</field> |
372 | <field name="name">Black Grapes</field> |
373 | <field name="to_weight">True</field> |
374 | - <field name="public_categ_id" ref="raisins"/> |
375 | + <field name="pos_categ_id" ref="raisins"/> |
376 | <field name="uom_id" ref="product.product_uom_kgm" /> |
377 | <field name="uom_po_id" ref="product.product_uom_kgm" /> |
378 | <field name="image" type="base64" file="point_of_sale/static/img/raisins_noir-image.jpg"/> |
379 | @@ -319,7 +315,7 @@ |
380 | <field name="list_price">1.39</field> |
381 | <field name="name">Potatoes</field> |
382 | <field name="to_weight">True</field> |
383 | - <field name="public_categ_id" ref="pommes_de_terre"/> |
384 | + <field name="pos_categ_id" ref="pommes_de_terre"/> |
385 | <field name="uom_id" ref="product.product_uom_kgm" /> |
386 | <field name="uom_po_id" ref="product.product_uom_kgm" /> |
387 | <field name="image" type="base64" file="point_of_sale/static/img/pomme_de_terre-image.jpg"/> |
388 | @@ -330,7 +326,7 @@ |
389 | <field name="list_price">2.20</field> |
390 | <field name="name">Extra Flandria chicory</field> |
391 | <field name="to_weight">True</field> |
392 | - <field name="public_categ_id" ref="legumes_racine"/> |
393 | + <field name="pos_categ_id" ref="legumes_racine"/> |
394 | <field name="uom_id" ref="product.product_uom_kgm" /> |
395 | <field name="uom_po_id" ref="product.product_uom_kgm" /> |
396 | <field name="image" type="base64" file="point_of_sale/static/img/chicon_flandria_extra-image.jpg"/> |
397 | @@ -340,7 +336,7 @@ |
398 | <field name="list_price">0.90</field> |
399 | <field name="name">Carrots</field> |
400 | <field name="to_weight">True</field> |
401 | - <field name="public_categ_id" ref="legumes_racine"/> |
402 | + <field name="pos_categ_id" ref="legumes_racine"/> |
403 | <field name="uom_id" ref="product.product_uom_kgm" /> |
404 | <field name="uom_po_id" ref="product.product_uom_kgm" /> |
405 | <field name="image" type="base64" file="point_of_sale/static/img/carotte-image.jpg"/> |
406 | @@ -350,7 +346,7 @@ |
407 | <field name="list_price">2.10</field> |
408 | <field name="name">Fennel</field> |
409 | <field name="to_weight">True</field> |
410 | - <field name="public_categ_id" ref="legumes_racine"/> |
411 | + <field name="pos_categ_id" ref="legumes_racine"/> |
412 | <field name="uom_id" ref="product.product_uom_kgm" /> |
413 | <field name="uom_po_id" ref="product.product_uom_kgm" /> |
414 | <field name="image" type="base64" file="point_of_sale/static/img/fenouil_fenouil-image.jpg"/> |
415 | @@ -361,7 +357,7 @@ |
416 | <field name="list_price">1.90</field> |
417 | <field name="name">In Cluster Tomatoes</field> |
418 | <field name="to_weight">True</field> |
419 | - <field name="public_categ_id" ref="tomates"/> |
420 | + <field name="pos_categ_id" ref="tomates"/> |
421 | <field name="uom_id" ref="product.product_uom_kgm" /> |
422 | <field name="uom_po_id" ref="product.product_uom_kgm" /> |
423 | <field name="image" type="base64" file="point_of_sale/static/img/tomate_en_grappe-image.jpg"/> |
424 | @@ -373,7 +369,7 @@ |
425 | <field name="name">Onions</field> |
426 | <field name="to_weight">True</field> |
427 | <field name="ean13">2100001000004</field> |
428 | - <field name="public_categ_id" ref="oignons_ail_echalotes"/> |
429 | + <field name="pos_categ_id" ref="oignons_ail_echalotes"/> |
430 | <field name="uom_id" ref="product.product_uom_kgm" /> |
431 | <field name="uom_po_id" ref="product.product_uom_kgm" /> |
432 | <field name="image" type="base64" file="point_of_sale/static/img/Onions-image.jpg"/> |
433 | @@ -384,7 +380,7 @@ |
434 | <field name="list_price">3.10</field> |
435 | <field name="name">Red Pepper</field> |
436 | <field name="to_weight">True</field> |
437 | - <field name="public_categ_id" ref="autres_legumes_frais"/> |
438 | + <field name="pos_categ_id" ref="autres_legumes_frais"/> |
439 | <field name="uom_id" ref="product.product_uom_kgm" /> |
440 | <field name="uom_po_id" ref="product.product_uom_kgm" /> |
441 | <field name="image" type="base64" file="point_of_sale/static/img/poivron_rouges-image.jpg"/> |
442 | @@ -394,7 +390,7 @@ |
443 | <field name="list_price">3.00</field> |
444 | <field name="name">Green Peppers</field> |
445 | <field name="to_weight">True</field> |
446 | - <field name="public_categ_id" ref="autres_legumes_frais"/> |
447 | + <field name="pos_categ_id" ref="autres_legumes_frais"/> |
448 | <field name="uom_id" ref="product.product_uom_kgm" /> |
449 | <field name="uom_po_id" ref="product.product_uom_kgm" /> |
450 | <field name="image" type="base64" file="point_of_sale/static/img/poivron_verts-image.jpg"/> |
451 | @@ -404,7 +400,7 @@ |
452 | <field name="list_price">2.70</field> |
453 | <field name="name">Yellow Peppers</field> |
454 | <field name="to_weight">True</field> |
455 | - <field name="public_categ_id" ref="autres_legumes_frais"/> |
456 | + <field name="pos_categ_id" ref="autres_legumes_frais"/> |
457 | <field name="uom_id" ref="product.product_uom_kgm" /> |
458 | <field name="uom_po_id" ref="product.product_uom_kgm" /> |
459 | <field name="image" type="base64" file="point_of_sale/static/img/poivron_jaunes-image.jpg"/> |
460 | @@ -414,7 +410,7 @@ |
461 | <field name="list_price">2.29</field> |
462 | <field name="name">Leeks</field> |
463 | <field name="to_weight">True</field> |
464 | - <field name="public_categ_id" ref="autres_legumes_frais"/> |
465 | + <field name="pos_categ_id" ref="autres_legumes_frais"/> |
466 | <field name="uom_id" ref="product.product_uom_kgm" /> |
467 | <field name="uom_po_id" ref="product.product_uom_kgm" /> |
468 | <field name="image" type="base64" file="point_of_sale/static/img/poireaux_poireaux-image.jpg"/> |
469 | @@ -424,7 +420,7 @@ |
470 | <field name="list_price">1.20</field> |
471 | <field name="name">Zucchini</field> |
472 | <field name="to_weight">True</field> |
473 | - <field name="public_categ_id" ref="autres_legumes_frais"/> |
474 | + <field name="pos_categ_id" ref="autres_legumes_frais"/> |
475 | <field name="uom_id" ref="product.product_uom_kgm" /> |
476 | <field name="uom_po_id" ref="product.product_uom_kgm" /> |
477 | <field name="image" type="base64" file="point_of_sale/static/img/courgette-image.jpg"/> |
478 | @@ -435,21 +431,21 @@ |
479 | <field name="list_price">1.49</field> |
480 | <field name="name">Coca-Cola Regular 1L</field> |
481 | <field name="ean13">5449000054227</field> |
482 | - <field name="public_categ_id" ref="coke"/> |
483 | + <field name="pos_categ_id" ref="coke"/> |
484 | <field name="image" type="base64" file="point_of_sale/static/img/coca_regular_1l-image.jpg"/> |
485 | </record> |
486 | <record id="coca_regular_2l" model="product.product"> |
487 | <field name="available_in_pos">True</field> |
488 | <field name="list_price">2.38</field> |
489 | <field name="name">Coca-Cola Regular 2L</field> |
490 | - <field name="public_categ_id" ref="coke"/> |
491 | + <field name="pos_categ_id" ref="coke"/> |
492 | <field name="image" type="base64" file="point_of_sale/static/img/coca_regular_2l-image.jpg"/> |
493 | </record> |
494 | <record id="coca_regular_50cl" model="product.product"> |
495 | <field name="available_in_pos">True</field> |
496 | <field name="list_price">0.97</field> |
497 | <field name="name">Coca-Cola Regular 50cl</field> |
498 | - <field name="public_categ_id" ref="coke"/> |
499 | + <field name="pos_categ_id" ref="coke"/> |
500 | <field name="image" type="base64" file="point_of_sale/static/img/coca_regular_50cl-image.jpg"/> |
501 | </record> |
502 | <record id="coca_regular_33cl" model="product.product"> |
503 | @@ -457,7 +453,7 @@ |
504 | <field name="list_price">0.51</field> |
505 | <field name="name">Coca-Cola Regular 33cl</field> |
506 | <field name="ean13">5449000000996</field> |
507 | - <field name="public_categ_id" ref="coke"/> |
508 | + <field name="pos_categ_id" ref="coke"/> |
509 | <field name="image" type="base64" file="point_of_sale/static/img/coca_regular_33cl-image.jpg"/> |
510 | </record> |
511 | |
512 | @@ -465,35 +461,35 @@ |
513 | <field name="available_in_pos">True</field> |
514 | <field name="list_price">1.49</field> |
515 | <field name="name">Coca-Cola Light 1L</field> |
516 | - <field name="public_categ_id" ref="coke"/> |
517 | + <field name="pos_categ_id" ref="coke"/> |
518 | <field name="image" type="base64" file="point_of_sale/static/img/coca_light_1l-image.jpg"/> |
519 | </record> |
520 | <record id="coca_light_2l" model="product.product"> |
521 | <field name="available_in_pos">True</field> |
522 | <field name="list_price">2.38</field> |
523 | <field name="name">Coca-Cola Light 2L</field> |
524 | - <field name="public_categ_id" ref="coke"/> |
525 | + <field name="pos_categ_id" ref="coke"/> |
526 | <field name="image" type="base64" file="point_of_sale/static/img/coca_light_2l-image.jpg"/> |
527 | </record> |
528 | <record id="coca_light_50cl" model="product.product"> |
529 | <field name="available_in_pos">True</field> |
530 | <field name="list_price">0.97</field> |
531 | <field name="name">Coca-Cola Light 50cl</field> |
532 | - <field name="public_categ_id" ref="coke"/> |
533 | + <field name="pos_categ_id" ref="coke"/> |
534 | <field name="image" type="base64" file="point_of_sale/static/img/coca_light_50cl-image.jpg"/> |
535 | </record> |
536 | <record id="coca_light_33cl" model="product.product"> |
537 | <field name="available_in_pos">True</field> |
538 | <field name="list_price">0.51</field> |
539 | <field name="name">Coca-Cola Light 33cl</field> |
540 | - <field name="public_categ_id" ref="coke"/> |
541 | + <field name="pos_categ_id" ref="coke"/> |
542 | <field name="image" type="base64" file="point_of_sale/static/img/coca_light_33cl-image.jpg"/> |
543 | </record> |
544 | <record id="coca_light_decaf_33cl" model="product.product"> |
545 | <field name="available_in_pos">True</field> |
546 | <field name="list_price">0.53</field> |
547 | <field name="name">Coca-Cola Light 33cl Decaf</field> |
548 | - <field name="public_categ_id" ref="coke"/> |
549 | + <field name="pos_categ_id" ref="coke"/> |
550 | <field name="image" type="base64" file="point_of_sale/static/img/coca_light_decaf_33cl-image.jpg"/> |
551 | </record> |
552 | |
553 | @@ -501,35 +497,35 @@ |
554 | <field name="available_in_pos">True</field> |
555 | <field name="list_price">1.49</field> |
556 | <field name="name">Coca-Cola Zero 1L</field> |
557 | - <field name="public_categ_id" ref="coke"/> |
558 | + <field name="pos_categ_id" ref="coke"/> |
559 | <field name="image" type="base64" file="point_of_sale/static/img/coca_zero_1l-image.jpg"/> |
560 | </record> |
561 | <record id="coca_zero_2l" model="product.product"> |
562 | <field name="available_in_pos">True</field> |
563 | <field name="list_price">2.38</field> |
564 | <field name="name">Coca-Cola Zero 2L</field> |
565 | - <field name="public_categ_id" ref="coke"/> |
566 | + <field name="pos_categ_id" ref="coke"/> |
567 | <field name="image" type="base64" file="point_of_sale/static/img/coca_zero_2l-image.jpg"/> |
568 | </record> |
569 | <record id="coca_zero_50cl" model="product.product"> |
570 | <field name="available_in_pos">True</field> |
571 | <field name="list_price">0.97</field> |
572 | <field name="name">Coca-Cola Zero 50cl</field> |
573 | - <field name="public_categ_id" ref="coke"/> |
574 | + <field name="pos_categ_id" ref="coke"/> |
575 | <field name="image" type="base64" file="point_of_sale/static/img/coca_zero_50cl-image.jpg"/> |
576 | </record> |
577 | <record id="coca_zero_33cl" model="product.product"> |
578 | <field name="available_in_pos">True</field> |
579 | <field name="list_price">0.51</field> |
580 | <field name="name">Coca-Cola Zero 33cl</field> |
581 | - <field name="public_categ_id" ref="coke"/> |
582 | + <field name="pos_categ_id" ref="coke"/> |
583 | <field name="image" type="base64" file="point_of_sale/static/img/coca_zero_33cl-image.jpg"/> |
584 | </record> |
585 | <record id="coca_zero_decaf_33cl" model="product.product"> |
586 | <field name="available_in_pos">True</field> |
587 | <field name="list_price">0.67</field> |
588 | <field name="name">Coca-Cola Zero Decaf 33cl</field> |
589 | - <field name="public_categ_id" ref="coke"/> |
590 | + <field name="pos_categ_id" ref="coke"/> |
591 | <field name="image" type="base64" file="point_of_sale/static/img/coca_zero_decaf_33cl-image.jpg"/> |
592 | </record> |
593 | |
594 | @@ -537,21 +533,21 @@ |
595 | <field name="available_in_pos">True</field> |
596 | <field name="list_price">2.83</field> |
597 | <field name="name">Coca-Cola Light Lemon 2L</field> |
598 | - <field name="public_categ_id" ref="coke"/> |
599 | + <field name="pos_categ_id" ref="coke"/> |
600 | <field name="image" type="base64" file="point_of_sale/static/img/coca_light_lemon_2l-image.jpg"/> |
601 | </record> |
602 | <record id="coca_light_lemon_50cl" model="product.product"> |
603 | <field name="available_in_pos">True</field> |
604 | <field name="list_price">1.16</field> |
605 | <field name="name">Coca-Cola Light Lemon 50cl</field> |
606 | - <field name="public_categ_id" ref="coke"/> |
607 | + <field name="pos_categ_id" ref="coke"/> |
608 | <field name="image" type="base64" file="point_of_sale/static/img/coca_light_lemon_50cl-image.jpg"/> |
609 | </record> |
610 | <record id="coca_light_lemon_33cl" model="product.product"> |
611 | <field name="available_in_pos">True</field> |
612 | <field name="list_price">0.53</field> |
613 | <field name="name">Coca-Cola Light Lemon 33cl</field> |
614 | - <field name="public_categ_id" ref="coke"/> |
615 | + <field name="pos_categ_id" ref="coke"/> |
616 | <field name="image" type="base64" file="point_of_sale/static/img/coca_light_lemon_33cl-image.jpg"/> |
617 | </record> |
618 | |
619 | @@ -559,42 +555,42 @@ |
620 | <field name="available_in_pos">True</field> |
621 | <field name="list_price">1.70</field> |
622 | <field name="name">Pepsi 2L</field> |
623 | - <field name="public_categ_id" ref="coke"/> |
624 | + <field name="pos_categ_id" ref="coke"/> |
625 | <field name="image" type="base64" file="point_of_sale/static/img/pepsi_2l-image.jpg"/> |
626 | </record> |
627 | <record id="pepsi_33cl" model="product.product"> |
628 | <field name="available_in_pos">True</field> |
629 | <field name="list_price">0.43</field> |
630 | <field name="name">Pepsi 33cl</field> |
631 | - <field name="public_categ_id" ref="coke"/> |
632 | + <field name="pos_categ_id" ref="coke"/> |
633 | <field name="image" type="base64" file="point_of_sale/static/img/pepsi_33cl-image.jpg"/> |
634 | </record> |
635 | <record id="pepsi_max_2l" model="product.product"> |
636 | <field name="available_in_pos">True</field> |
637 | <field name="list_price">1.71</field> |
638 | <field name="name">Pepsi Max 2L</field> |
639 | - <field name="public_categ_id" ref="coke"/> |
640 | + <field name="pos_categ_id" ref="coke"/> |
641 | <field name="image" type="base64" file="point_of_sale/static/img/pepsi_max_2l-image.jpg"/> |
642 | </record> |
643 | <record id="pepsi_max_33cl" model="product.product"> |
644 | <field name="available_in_pos">True</field> |
645 | <field name="list_price">0.40</field> |
646 | <field name="name">Pepsi Max 33cl</field> |
647 | - <field name="public_categ_id" ref="coke"/> |
648 | + <field name="pos_categ_id" ref="coke"/> |
649 | <field name="image" type="base64" file="point_of_sale/static/img/pepsi_max_33cl-image.jpg"/> |
650 | </record> |
651 | <record id="pepsi_max_50cl" model="product.product"> |
652 | <field name="available_in_pos">True</field> |
653 | <field name="list_price">0.61</field> |
654 | <field name="name">Pepsi Max 50cl</field> |
655 | - <field name="public_categ_id" ref="coke"/> |
656 | + <field name="pos_categ_id" ref="coke"/> |
657 | <field name="image" type="base64" file="point_of_sale/static/img/pepsi_max_50cl-image.jpg"/> |
658 | </record> |
659 | <record id="pepsi_max_lemon_33cl" model="product.product"> |
660 | <field name="available_in_pos">True</field> |
661 | <field name="list_price">0.40</field> |
662 | <field name="name">Pepsi Max Cool Lemon 33cl</field> |
663 | - <field name="public_categ_id" ref="coke"/> |
664 | + <field name="pos_categ_id" ref="coke"/> |
665 | <field name="image" type="base64" file="point_of_sale/static/img/pepsi_max_lemon_33cl-image.jpg"/> |
666 | </record> |
667 | |
668 | @@ -602,63 +598,63 @@ |
669 | <field name="available_in_pos">True</field> |
670 | <field name="list_price">0.75</field> |
671 | <field name="name">Spa Fruit and Orange 50cl</field> |
672 | - <field name="public_categ_id" ref="soda_orange"/> |
673 | + <field name="pos_categ_id" ref="soda_orange"/> |
674 | <field name="image" type="base64" file="point_of_sale/static/img/spa_et_fruit_50cl-image.jpg"/> |
675 | </record> |
676 | <record id="orangina_33cl" model="product.product"> |
677 | <field name="available_in_pos">True</field> |
678 | <field name="list_price">0.72</field> |
679 | <field name="name">Orangina 33cl</field> |
680 | - <field name="public_categ_id" ref="soda_orange"/> |
681 | + <field name="pos_categ_id" ref="soda_orange"/> |
682 | <field name="image" type="base64" file="point_of_sale/static/img/orangina_33cl-image.jpg"/> |
683 | </record> |
684 | <record id="orangina_1,5l" model="product.product"> |
685 | <field name="available_in_pos">True</field> |
686 | <field name="list_price">2.42</field> |
687 | <field name="name">Orangina 1.5L</field> |
688 | - <field name="public_categ_id" ref="soda_orange"/> |
689 | + <field name="pos_categ_id" ref="soda_orange"/> |
690 | <field name="image" type="base64" file="point_of_sale/static/img/orangina_1,5l-image.jpg"/> |
691 | </record> |
692 | <record id="fanta_orange_50cl" model="product.product"> |
693 | <field name="available_in_pos">True</field> |
694 | <field name="list_price">0.98</field> |
695 | <field name="name">Fanta Orange 50cl</field> |
696 | - <field name="public_categ_id" ref="soda_orange"/> |
697 | + <field name="pos_categ_id" ref="soda_orange"/> |
698 | <field name="image" type="base64" file="point_of_sale/static/img/fanta_orange_50cl-image.jpg"/> |
699 | </record> |
700 | <record id="fanta_orange_2l" model="product.product"> |
701 | <field name="available_in_pos">True</field> |
702 | <field name="list_price">2.28</field> |
703 | <field name="name">Fanta Orange 2L</field> |
704 | - <field name="public_categ_id" ref="soda_orange"/> |
705 | + <field name="pos_categ_id" ref="soda_orange"/> |
706 | <field name="image" type="base64" file="point_of_sale/static/img/fanta_orange_2l-image.jpg"/> |
707 | </record> |
708 | <record id="fanta_orange_33cl" model="product.product"> |
709 | <field name="available_in_pos">True</field> |
710 | <field name="list_price">0.51</field> |
711 | <field name="name">Fanta Orange 33cl</field> |
712 | - <field name="public_categ_id" ref="soda_orange"/> |
713 | + <field name="pos_categ_id" ref="soda_orange"/> |
714 | <field name="image" type="base64" file="point_of_sale/static/img/fanta_orange_33cl-image.jpg"/> |
715 | </record> |
716 | <record id="fanta_orange_25cl" model="product.product"> |
717 | <field name="available_in_pos">True</field> |
718 | <field name="list_price">0.84</field> |
719 | <field name="name">Fanta Orange 25cl</field> |
720 | - <field name="public_categ_id" ref="soda_orange"/> |
721 | + <field name="pos_categ_id" ref="soda_orange"/> |
722 | <field name="image" type="base64" file="point_of_sale/static/img/fanta_orange_25cl-image.jpg"/> |
723 | </record> |
724 | <record id="fanta_zero_orange_1,5l" model="product.product"> |
725 | <field name="available_in_pos">True</field> |
726 | <field name="list_price">2.08</field> |
727 | <field name="name">Fanta Orange Zero 1.5L</field> |
728 | - <field name="public_categ_id" ref="soda_orange"/> |
729 | + <field name="pos_categ_id" ref="soda_orange"/> |
730 | <field name="image" type="base64" file="point_of_sale/static/img/fanta_zero_orange_1,5l-image.jpg"/> |
731 | </record> |
732 | <record id="fanta_zero_orange_33cl" model="product.product"> |
733 | <field name="available_in_pos">True</field> |
734 | <field name="list_price">0.53</field> |
735 | <field name="name">Fanta Zero Orange 33cl</field> |
736 | - <field name="public_categ_id" ref="soda_orange"/> |
737 | + <field name="pos_categ_id" ref="soda_orange"/> |
738 | <field name="image" type="base64" file="point_of_sale/static/img/fanta_zero_orange_33cl-image.jpg"/> |
739 | </record> |
740 | |
741 | @@ -666,56 +662,56 @@ |
742 | <field name="available_in_pos">True</field> |
743 | <field name="list_price">0.52</field> |
744 | <field name="name">Evian 50cl</field> |
745 | - <field name="public_categ_id" ref="plain_water"/> |
746 | + <field name="pos_categ_id" ref="plain_water"/> |
747 | <field name="image" type="base64" file="point_of_sale/static/img/evian_50cl-image.jpg"/> |
748 | </record> |
749 | <record id="evian_1l" model="product.product"> |
750 | <field name="available_in_pos">True</field> |
751 | <field name="list_price">0.70</field> |
752 | <field name="name">Evian 1L</field> |
753 | - <field name="public_categ_id" ref="plain_water"/> |
754 | + <field name="pos_categ_id" ref="plain_water"/> |
755 | <field name="image" type="base64" file="point_of_sale/static/img/evian_1l-image.jpg"/> |
756 | </record> |
757 | <record id="evian_2l" model="product.product"> |
758 | <field name="available_in_pos">True</field> |
759 | <field name="list_price">1.26</field> |
760 | <field name="name">2L Evian</field> |
761 | - <field name="public_categ_id" ref="plain_water"/> |
762 | + <field name="pos_categ_id" ref="plain_water"/> |
763 | <field name="image" type="base64" file="point_of_sale/static/img/evian_2l-image.jpg"/> |
764 | </record> |
765 | <record id="spa_33cl" model="product.product"> |
766 | <field name="available_in_pos">True</field> |
767 | <field name="list_price">0.40</field> |
768 | <field name="name">Spa Reine 33cl</field> |
769 | - <field name="public_categ_id" ref="plain_water"/> |
770 | + <field name="pos_categ_id" ref="plain_water"/> |
771 | <field name="image" type="base64" file="point_of_sale/static/img/spa_33cl-image.jpg"/> |
772 | </record> |
773 | <record id="spa_50cl" model="product.product"> |
774 | <field name="available_in_pos">True</field> |
775 | <field name="list_price">0.46</field> |
776 | <field name="name">Spa Reine 50cl</field> |
777 | - <field name="public_categ_id" ref="plain_water"/> |
778 | + <field name="pos_categ_id" ref="plain_water"/> |
779 | <field name="image" type="base64" file="point_of_sale/static/img/spa_50cl-image.jpg"/> |
780 | </record> |
781 | <record id="spa_1l" model="product.product"> |
782 | <field name="available_in_pos">True</field> |
783 | <field name="list_price">0.65</field> |
784 | <field name="name">Spa Reine 1L</field> |
785 | - <field name="public_categ_id" ref="plain_water"/> |
786 | + <field name="pos_categ_id" ref="plain_water"/> |
787 | <field name="image" type="base64" file="point_of_sale/static/img/spa_1l-image.jpg"/> |
788 | </record> |
789 | <record id="spa_2l" model="product.product"> |
790 | <field name="available_in_pos">True</field> |
791 | <field name="list_price">1.30</field> |
792 | <field name="name">Spa Reine 2L</field> |
793 | - <field name="public_categ_id" ref="plain_water"/> |
794 | + <field name="pos_categ_id" ref="plain_water"/> |
795 | <field name="image" type="base64" file="point_of_sale/static/img/spa_2l-image.jpg"/> |
796 | </record> |
797 | <record id="chaudfontaine_33cl" model="product.product"> |
798 | <field name="available_in_pos">True</field> |
799 | <field name="list_price">0.34</field> |
800 | <field name="name">Chaudfontaine 33cl</field> |
801 | - <field name="public_categ_id" ref="plain_water"/> |
802 | + <field name="pos_categ_id" ref="plain_water"/> |
803 | <field name="image" type="base64" file="point_of_sale/static/img/chaudfontaine_33cl-image.jpg"/> |
804 | </record> |
805 | <record id="chaudfontaine_50cl" model="product.product"> |
806 | @@ -723,14 +719,14 @@ |
807 | <field name="list_price">0.44</field> |
808 | <field name="ean13">5449000111715</field> |
809 | <field name="name">Chaudfontaine 50cl</field> |
810 | - <field name="public_categ_id" ref="plain_water"/> |
811 | + <field name="pos_categ_id" ref="plain_water"/> |
812 | <field name="image" type="base64" file="point_of_sale/static/img/chaudfontaine_50cl-image.jpg"/> |
813 | </record> |
814 | <record id="chaudfontaine_1,5l" model="product.product"> |
815 | <field name="available_in_pos">True</field> |
816 | <field name="list_price">0.86</field> |
817 | <field name="name">Chaudfontaine 1.5l</field> |
818 | - <field name="public_categ_id" ref="plain_water"/> |
819 | + <field name="pos_categ_id" ref="plain_water"/> |
820 | <field name="image" type="base64" file="point_of_sale/static/img/chaudfontaine_1,5l-image.jpg"/> |
821 | </record> |
822 | |
823 | @@ -738,63 +734,63 @@ |
824 | <field name="available_in_pos">True</field> |
825 | <field name="list_price">0.38</field> |
826 | <field name="name">Spa Barisart 33cl</field> |
827 | - <field name="public_categ_id" ref="sparkling_water"/> |
828 | + <field name="pos_categ_id" ref="sparkling_water"/> |
829 | <field name="image" type="base64" file="point_of_sale/static/img/spa_gazeuse_33cl-image.jpg"/> |
830 | </record> |
831 | <record id="spa_gazeuse_50cl" model="product.product"> |
832 | <field name="available_in_pos">True</field> |
833 | <field name="list_price">0.49</field> |
834 | <field name="name">Spa Barisart 50cl</field> |
835 | - <field name="public_categ_id" ref="sparkling_water"/> |
836 | + <field name="pos_categ_id" ref="sparkling_water"/> |
837 | <field name="image" type="base64" file="point_of_sale/static/img/spa_gazeuse_50cl-image.jpg"/> |
838 | </record> |
839 | <record id="spa_gazeuse_1,5l" model="product.product"> |
840 | <field name="available_in_pos">True</field> |
841 | <field name="list_price">1.00</field> |
842 | <field name="name">Spa Barisart 1.5l</field> |
843 | - <field name="public_categ_id" ref="sparkling_water"/> |
844 | + <field name="pos_categ_id" ref="sparkling_water"/> |
845 | <field name="image" type="base64" file="point_of_sale/static/img/spa_gazeuse_1,5l-image.jpg"/> |
846 | </record> |
847 | <record id="chaudfontaine_petillante_33cl" model="product.product"> |
848 | <field name="available_in_pos">True</field> |
849 | <field name="list_price">0.41</field> |
850 | <field name="name">Chaudfontaine Petillante 33cl</field> |
851 | - <field name="public_categ_id" ref="sparkling_water"/> |
852 | + <field name="pos_categ_id" ref="sparkling_water"/> |
853 | <field name="image" type="base64" file="point_of_sale/static/img/chaudfontaine_petillante_33cl-image.jpg"/> |
854 | </record> |
855 | <record id="chaudfontaine_petillante_50cl" model="product.product"> |
856 | <field name="available_in_pos">True</field> |
857 | <field name="list_price">0.57</field> |
858 | <field name="name">Chaudfontaine Petillante 50cl</field> |
859 | - <field name="public_categ_id" ref="sparkling_water"/> |
860 | + <field name="pos_categ_id" ref="sparkling_water"/> |
861 | <field name="image" type="base64" file="point_of_sale/static/img/chaudfontaine_petillante_50cl-image.jpg"/> |
862 | </record> |
863 | <record id="chaudfontaine_petillante_1,5l" model="product.product"> |
864 | <field name="available_in_pos">True</field> |
865 | <field name="list_price">0.98</field> |
866 | <field name="name">Chaudfontaine Petillante 1.5l</field> |
867 | - <field name="public_categ_id" ref="sparkling_water"/> |
868 | + <field name="pos_categ_id" ref="sparkling_water"/> |
869 | <field name="image" type="base64" file="point_of_sale/static/img/chaudfontaine_petillante_1,5l-image.jpg"/> |
870 | </record> |
871 | <record id="perrier_50cl" model="product.product"> |
872 | <field name="available_in_pos">True</field> |
873 | <field name="list_price">0.71</field> |
874 | <field name="name">50cl Perrier</field> |
875 | - <field name="public_categ_id" ref="sparkling_water"/> |
876 | + <field name="pos_categ_id" ref="sparkling_water"/> |
877 | <field name="image" type="base64" file="point_of_sale/static/img/perrier_50cl-image.jpg"/> |
878 | </record> |
879 | <record id="perrier_1l" model="product.product"> |
880 | <field name="available_in_pos">True</field> |
881 | <field name="list_price">0.96</field> |
882 | <field name="name">Perrier 1L</field> |
883 | - <field name="public_categ_id" ref="sparkling_water"/> |
884 | + <field name="pos_categ_id" ref="sparkling_water"/> |
885 | <field name="image" type="base64" file="point_of_sale/static/img/perrier_1l-image.jpg"/> |
886 | </record> |
887 | <record id="san_pellegrino_1l" model="product.product"> |
888 | <field name="available_in_pos">True</field> |
889 | <field name="list_price">0.98</field> |
890 | <field name="name">San Pellegrino 1L</field> |
891 | - <field name="public_categ_id" ref="sparkling_water"/> |
892 | + <field name="pos_categ_id" ref="sparkling_water"/> |
893 | <field name="image" type="base64" file="point_of_sale/static/img/san_pellegrino_1l-image.jpg"/> |
894 | </record> |
895 | |
896 | @@ -802,35 +798,35 @@ |
897 | <field name="available_in_pos">True</field> |
898 | <field name="list_price">1.19</field> |
899 | <field name="name">Stella Artois 50cl</field> |
900 | - <field name="public_categ_id" ref="pils"/> |
901 | + <field name="pos_categ_id" ref="pils"/> |
902 | <field name="image" type="base64" file="point_of_sale/static/img/stella_50cl-image.jpg"/> |
903 | </record> |
904 | <record id="stella_33cl" model="product.product"> |
905 | <field name="available_in_pos">True</field> |
906 | <field name="list_price">0.82</field> |
907 | <field name="name">Stella Artois 33cl</field> |
908 | - <field name="public_categ_id" ref="pils"/> |
909 | + <field name="pos_categ_id" ref="pils"/> |
910 | <field name="image" type="base64" file="point_of_sale/static/img/stella_33cl-image.jpg"/> |
911 | </record> |
912 | <record id="maes_50cl" model="product.product"> |
913 | <field name="available_in_pos">True</field> |
914 | <field name="list_price">0.95</field> |
915 | <field name="name">Maes 50cl</field> |
916 | - <field name="public_categ_id" ref="pils"/> |
917 | + <field name="pos_categ_id" ref="pils"/> |
918 | <field name="image" type="base64" file="point_of_sale/static/img/maes_50cl-image.jpg"/> |
919 | </record> |
920 | <record id="maes_33cl" model="product.product"> |
921 | <field name="available_in_pos">True</field> |
922 | <field name="list_price">0.77</field> |
923 | <field name="name">Maes 33cl</field> |
924 | - <field name="public_categ_id" ref="pils"/> |
925 | + <field name="pos_categ_id" ref="pils"/> |
926 | <field name="image" type="base64" file="point_of_sale/static/img/maes_33cl-image.jpg"/> |
927 | </record> |
928 | <record id="jupiler_50cl" model="product.product"> |
929 | <field name="available_in_pos">True</field> |
930 | <field name="list_price">0.97</field> |
931 | <field name="name">Jupiler 50cl</field> |
932 | - <field name="public_categ_id" ref="pils"/> |
933 | + <field name="pos_categ_id" ref="pils"/> |
934 | <field name="image" type="base64" file="point_of_sale/static/img/jupiler_50cl-image.jpg"/> |
935 | </record> |
936 | <record id="jupiler_33cl" model="product.product"> |
937 | @@ -838,7 +834,7 @@ |
938 | <field name="list_price">0.77</field> |
939 | <field name="ean13">5410228142027</field> |
940 | <field name="name">Jupiler 33cl</field> |
941 | - <field name="public_categ_id" ref="pils"/> |
942 | + <field name="pos_categ_id" ref="pils"/> |
943 | <field name="image" type="base64" file="point_of_sale/static/img/jupiler_33cl-image.jpg"/> |
944 | </record> |
945 | |
946 | @@ -846,49 +842,49 @@ |
947 | <field name="available_in_pos">True</field> |
948 | <field name="list_price">2.53</field> |
949 | <field name="name">Boon Framboise 37.5cl</field> |
950 | - <field name="public_categ_id" ref="fruity_beers"/> |
951 | + <field name="pos_categ_id" ref="fruity_beers"/> |
952 | <field name="image" type="base64" file="point_of_sale/static/img/boon_framboise_37,5cl-image.jpg"/> |
953 | </record> |
954 | <record id="timmermans_geuze_37,5cl" model="product.product"> |
955 | <field name="available_in_pos">True</field> |
956 | <field name="list_price">1.54</field> |
957 | <field name="name">Timmermans Geuze 37.5cl</field> |
958 | - <field name="public_categ_id" ref="fruity_beers"/> |
959 | + <field name="pos_categ_id" ref="fruity_beers"/> |
960 | <field name="image" type="base64" file="point_of_sale/static/img/timmermans_geuze_37,5cl-image.jpg"/> |
961 | </record> |
962 | <record id="timmermans_kriek_37,5cl" model="product.product"> |
963 | <field name="available_in_pos">True</field> |
964 | <field name="list_price">1.7</field> |
965 | <field name="name">Timmermans Kriek 37.5cl</field> |
966 | - <field name="public_categ_id" ref="fruity_beers"/> |
967 | + <field name="pos_categ_id" ref="fruity_beers"/> |
968 | <field name="image" type="base64" file="point_of_sale/static/img/timmermans_kriek_37,5cl-image.jpg"/> |
969 | </record> |
970 | <record id="timmermans_faro_37,5cl" model="product.product"> |
971 | <field name="available_in_pos">True</field> |
972 | <field name="list_price">1.56</field> |
973 | <field name="name">Timmermans Faro 37.5cl</field> |
974 | - <field name="public_categ_id" ref="fruity_beers"/> |
975 | + <field name="pos_categ_id" ref="fruity_beers"/> |
976 | <field name="image" type="base64" file="point_of_sale/static/img/timmermans_faro_37,5cl-image.jpg"/> |
977 | </record> |
978 | <record id="lindemans_pecheresse_37,,5cl" model="product.product"> |
979 | <field name="available_in_pos">True</field> |
980 | <field name="list_price">1.94</field> |
981 | <field name="name">Lindemans sinful 37.5cl</field> |
982 | - <field name="public_categ_id" ref="fruity_beers"/> |
983 | + <field name="pos_categ_id" ref="fruity_beers"/> |
984 | <field name="image" type="base64" file="point_of_sale/static/img/lindemans_pecheresse_37,,5cl-image.jpg"/> |
985 | </record> |
986 | <record id="lindemans_kriek_37,5cl" model="product.product"> |
987 | <field name="available_in_pos">True</field> |
988 | <field name="list_price">1.51</field> |
989 | <field name="name">Lindemans Kriek 37.5cl</field> |
990 | - <field name="public_categ_id" ref="fruity_beers"/> |
991 | + <field name="pos_categ_id" ref="fruity_beers"/> |
992 | <field name="image" type="base64" file="point_of_sale/static/img/lindemans_kriek_37,5cl-image.jpg"/> |
993 | </record> |
994 | <record id="grisette_cerise_25cl" model="product.product"> |
995 | <field name="available_in_pos">True</field> |
996 | <field name="list_price">1.04</field> |
997 | <field name="name">Grisette Cherry 25cl</field> |
998 | - <field name="public_categ_id" ref="fruity_beers"/> |
999 | + <field name="pos_categ_id" ref="fruity_beers"/> |
1000 | <field name="image" type="base64" file="point_of_sale/static/img/grisette_cerise_25cl-image.jpg"/> |
1001 | </record> |
1002 | <record id="belle_vue_kriek_25cl" model="product.product"> |
1003 | @@ -896,7 +892,7 @@ |
1004 | <field name="list_price">0.83</field> |
1005 | <field name="name">Belle-Vue Kriek 25cl</field> |
1006 | <field name='ean13'>5410228193449</field> |
1007 | - <field name="public_categ_id" ref="fruity_beers"/> |
1008 | + <field name="pos_categ_id" ref="fruity_beers"/> |
1009 | <field name="image" type="base64" file="point_of_sale/static/img/belle_vue_kriek_25cl-image.jpg"/> |
1010 | </record> |
1011 | |
1012 | @@ -905,7 +901,7 @@ |
1013 | <field name="list_price">1.00</field> |
1014 | <field name="name">Leffe Brune 33cl</field> |
1015 | <field name='ean13'>5410228142164</field> |
1016 | - <field name="public_categ_id" ref="special_beers"/> |
1017 | + <field name="pos_categ_id" ref="special_beers"/> |
1018 | <field name="image" type="base64" file="point_of_sale/static/img/leffe_brune_33cl-image.jpg"/> |
1019 | </record> |
1020 | <record id="leffe_blonde_33cl" model="product.product"> |
1021 | @@ -913,49 +909,49 @@ |
1022 | <field name="list_price">1.00</field> |
1023 | <field name="name">Leffe Blonde 33cl</field> |
1024 | <field name='ean13'>5410228142218</field> |
1025 | - <field name="public_categ_id" ref="special_beers"/> |
1026 | + <field name="pos_categ_id" ref="special_beers"/> |
1027 | <field name="image" type="base64" file="point_of_sale/static/img/leffe_blonde_33cl-image.jpg"/> |
1028 | </record> |
1029 | <record id="leffe_9_33cl" model="product.product"> |
1030 | <field name="available_in_pos">True</field> |
1031 | <field name="list_price">1.16</field> |
1032 | <field name="name">Leffe Brune "9" 33cl</field> |
1033 | - <field name="public_categ_id" ref="special_beers"/> |
1034 | + <field name="pos_categ_id" ref="special_beers"/> |
1035 | <field name="image" type="base64" file="point_of_sale/static/img/leffe_9_33cl-image.jpg"/> |
1036 | </record> |
1037 | <record id="orval_33cl" model="product.product"> |
1038 | <field name="available_in_pos">True</field> |
1039 | <field name="list_price">1.59</field> |
1040 | <field name="name">Orval 33cl</field> |
1041 | - <field name="public_categ_id" ref="special_beers"/> |
1042 | + <field name="pos_categ_id" ref="special_beers"/> |
1043 | <field name="image" type="base64" file="point_of_sale/static/img/orval_33cl-image.jpg"/> |
1044 | </record> |
1045 | <record id="rochefort_8_33cl" model="product.product"> |
1046 | <field name="available_in_pos">True</field> |
1047 | <field name="list_price">1.75</field> |
1048 | <field name="name">Rochefort "8" 33cl</field> |
1049 | - <field name="public_categ_id" ref="special_beers"/> |
1050 | + <field name="pos_categ_id" ref="special_beers"/> |
1051 | <field name="image" type="base64" file="point_of_sale/static/img/rochefort_8_33cl-image.jpg"/> |
1052 | </record> |
1053 | <record id="chimay_bleu_33cl" model="product.product"> |
1054 | <field name="available_in_pos">True</field> |
1055 | <field name="list_price">1.46</field> |
1056 | <field name="name">Chimay Bleu 33cl</field> |
1057 | - <field name="public_categ_id" ref="special_beers"/> |
1058 | + <field name="pos_categ_id" ref="special_beers"/> |
1059 | <field name="image" type="base64" file="point_of_sale/static/img/chimay_bleu_33cl-image.jpg"/> |
1060 | </record> |
1061 | <record id="chimay_bleu_75cl" model="product.product"> |
1062 | <field name="available_in_pos">True</field> |
1063 | <field name="list_price">3.57</field> |
1064 | <field name="name">Chimay Bleu 75cl</field> |
1065 | - <field name="public_categ_id" ref="special_beers"/> |
1066 | + <field name="pos_categ_id" ref="special_beers"/> |
1067 | <field name="image" type="base64" file="point_of_sale/static/img/chimay_bleu_75cl-image.jpg"/> |
1068 | </record> |
1069 | <record id="chimay_rouge_33cl" model="product.product"> |
1070 | <field name="available_in_pos">True</field> |
1071 | <field name="list_price">1.02</field> |
1072 | <field name="name">Chimay Red 33cl</field> |
1073 | - <field name="public_categ_id" ref="special_beers"/> |
1074 | + <field name="pos_categ_id" ref="special_beers"/> |
1075 | <field name="image" type="base64" file="point_of_sale/static/img/chimay_rouge_33cl-image.jpg"/> |
1076 | </record> |
1077 | |
1078 | @@ -963,84 +959,84 @@ |
1079 | <field name="available_in_pos">True</field> |
1080 | <field name="list_price">2.86</field> |
1081 | <field name="name">Dr. Oetker Ristorante Mozzarella</field> |
1082 | - <field name="public_categ_id" ref="pizza"/> |
1083 | + <field name="pos_categ_id" ref="pizza"/> |
1084 | <field name="image" type="base64" file="point_of_sale/static/img/oetker_mozzarella-image.jpg"/> |
1085 | </record> |
1086 | <record id="oetker_bolognese" model="product.product"> |
1087 | <field name="available_in_pos">True</field> |
1088 | <field name="list_price">2.86</field> |
1089 | <field name="name">Dr. Oetker Ristorante Bolognese</field> |
1090 | - <field name="public_categ_id" ref="pizza"/> |
1091 | + <field name="pos_categ_id" ref="pizza"/> |
1092 | <field name="image" type="base64" file="point_of_sale/static/img/oetker_bolognese-image.jpg"/> |
1093 | </record> |
1094 | <record id="oetker_funghi" model="product.product"> |
1095 | <field name="available_in_pos">True</field> |
1096 | <field name="list_price">2.86</field> |
1097 | <field name="name">Dr. Oetker Ristorante Funghi</field> |
1098 | - <field name="public_categ_id" ref="pizza"/> |
1099 | + <field name="pos_categ_id" ref="pizza"/> |
1100 | <field name="image" type="base64" file="point_of_sale/static/img/oetker_funghi-image.jpg"/> |
1101 | </record> |
1102 | <record id="oetker_hawaii" model="product.product"> |
1103 | <field name="available_in_pos">True</field> |
1104 | <field name="list_price">2.86</field> |
1105 | <field name="name">Dr. Oetker Ristorante Hawaii</field> |
1106 | - <field name="public_categ_id" ref="pizza"/> |
1107 | + <field name="pos_categ_id" ref="pizza"/> |
1108 | <field name="image" type="base64" file="point_of_sale/static/img/oetker_hawaii-image.jpg"/> |
1109 | </record> |
1110 | <record id="oetker_pollo" model="product.product"> |
1111 | <field name="available_in_pos">True</field> |
1112 | <field name="list_price">2.86</field> |
1113 | <field name="name">Dr. Oetker Ristorante Pollo</field> |
1114 | - <field name="public_categ_id" ref="pizza"/> |
1115 | + <field name="pos_categ_id" ref="pizza"/> |
1116 | <field name="image" type="base64" file="point_of_sale/static/img/oetker_pollo-image.jpg"/> |
1117 | </record> |
1118 | <record id="oetker_prosciutto" model="product.product"> |
1119 | <field name="available_in_pos">True</field> |
1120 | <field name="list_price">2.86</field> |
1121 | <field name="name">Dr. Oetker Ristorante Prosciutto</field> |
1122 | - <field name="public_categ_id" ref="pizza"/> |
1123 | + <field name="pos_categ_id" ref="pizza"/> |
1124 | <field name="image" type="base64" file="point_of_sale/static/img/oetker_prosciutto-image.jpg"/> |
1125 | </record> |
1126 | <record id="oetker_4formaggi" model="product.product"> |
1127 | <field name="available_in_pos">True</field> |
1128 | <field name="list_price">2.86</field> |
1129 | <field name="name">Dr. Oetker Ristorante Quattro Formaggi</field> |
1130 | - <field name="public_categ_id" ref="pizza"/> |
1131 | + <field name="pos_categ_id" ref="pizza"/> |
1132 | <field name="image" type="base64" file="point_of_sale/static/img/oetker_4formaggi-image.jpg"/> |
1133 | </record> |
1134 | <record id="oetker_speciale" model="product.product"> |
1135 | <field name="available_in_pos">True</field> |
1136 | <field name="list_price">2.86</field> |
1137 | <field name="name">Dr. Oetker Ristorante Speciale</field> |
1138 | - <field name="public_categ_id" ref="pizza"/> |
1139 | + <field name="pos_categ_id" ref="pizza"/> |
1140 | <field name="image" type="base64" file="point_of_sale/static/img/oetker_speciale-image.jpg"/> |
1141 | </record> |
1142 | <record id="oetker_spinaci" model="product.product"> |
1143 | <field name="available_in_pos">True</field> |
1144 | <field name="list_price">2.86</field> |
1145 | <field name="name">Dr. Oetker Ristorante Spinaci</field> |
1146 | - <field name="public_categ_id" ref="pizza"/> |
1147 | + <field name="pos_categ_id" ref="pizza"/> |
1148 | <field name="image" type="base64" file="point_of_sale/static/img/oetker_spinaci-image.jpg"/> |
1149 | </record> |
1150 | <record id="oetker_tonno" model="product.product"> |
1151 | <field name="available_in_pos">True</field> |
1152 | <field name="list_price">2.86</field> |
1153 | <field name="name">Dr. Oetker Ristorante Tonno</field> |
1154 | - <field name="public_categ_id" ref="pizza"/> |
1155 | + <field name="pos_categ_id" ref="pizza"/> |
1156 | <field name="image" type="base64" file="point_of_sale/static/img/oetker_tonno-image.jpg"/> |
1157 | </record> |
1158 | <record id="oetker_vegetale" model="product.product"> |
1159 | <field name="available_in_pos">True</field> |
1160 | <field name="list_price">2.86</field> |
1161 | <field name="name">Dr. Oetker Ristorante Vegetable</field> |
1162 | - <field name="public_categ_id" ref="pizza"/> |
1163 | + <field name="pos_categ_id" ref="pizza"/> |
1164 | <field name="image" type="base64" file="point_of_sale/static/img/oetker_vegetale-image.jpg"/> |
1165 | </record> |
1166 | <record id="oetker_margherita" model="product.product"> |
1167 | <field name="available_in_pos">True</field> |
1168 | <field name="list_price">2.67</field> |
1169 | <field name="name">Dr. Oetker La Margherita</field> |
1170 | - <field name="public_categ_id" ref="pizza"/> |
1171 | + <field name="pos_categ_id" ref="pizza"/> |
1172 | <field name="image" type="base64" file="point_of_sale/static/img/oetker_margherita-image.jpg"/> |
1173 | </record> |
1174 | |
1175 | @@ -1048,42 +1044,42 @@ |
1176 | <field name="available_in_pos">True</field> |
1177 | <field name="list_price">0.33</field> |
1178 | <field name="name">Croky Paprika 45g</field> |
1179 | - <field name="public_categ_id" ref="chips"/> |
1180 | + <field name="pos_categ_id" ref="chips"/> |
1181 | <field name="image" type="base64" file="point_of_sale/static/img/croky_paprika_45g-image.jpg"/> |
1182 | </record> |
1183 | <record id="croky_naturel_45g" model="product.product"> |
1184 | <field name="available_in_pos">True</field> |
1185 | <field name="list_price">0.39</field> |
1186 | <field name="name">Croky Natural 45g</field> |
1187 | - <field name="public_categ_id" ref="chips"/> |
1188 | + <field name="pos_categ_id" ref="chips"/> |
1189 | <field name="image" type="base64" file="point_of_sale/static/img/croky_naturel_45g-image.jpg"/> |
1190 | </record> |
1191 | <record id="croky_bolognaise_250g" model="product.product"> |
1192 | <field name="available_in_pos">True</field> |
1193 | <field name="list_price">1.78</field> |
1194 | <field name="name">Croky Bolognese 250g</field> |
1195 | - <field name="public_categ_id" ref="chips"/> |
1196 | + <field name="pos_categ_id" ref="chips"/> |
1197 | <field name="image" type="base64" file="point_of_sale/static/img/croky_bolognaise_250g-image.jpg"/> |
1198 | </record> |
1199 | <record id="lays_pickles_250g" model="product.product"> |
1200 | <field name="available_in_pos">True</field> |
1201 | <field name="list_price">1.48</field> |
1202 | <field name="name">250g Lays Pickels</field> |
1203 | - <field name="public_categ_id" ref="chips"/> |
1204 | + <field name="pos_categ_id" ref="chips"/> |
1205 | <field name="image" type="base64" file="point_of_sale/static/img/lays_pickles_250g-image.jpg"/> |
1206 | </record> |
1207 | <record id="lays_ketchup_250g" model="product.product"> |
1208 | <field name="available_in_pos">True</field> |
1209 | <field name="list_price">1.48</field> |
1210 | <field name="name">Lays Ketchup 250g</field> |
1211 | - <field name="public_categ_id" ref="chips"/> |
1212 | + <field name="pos_categ_id" ref="chips"/> |
1213 | <field name="image" type="base64" file="point_of_sale/static/img/lays_ketchup_250g-image.jpg"/> |
1214 | </record> |
1215 | <record id="lays_poivre_sel_oven_150g" model="product.product"> |
1216 | <field name="available_in_pos">True</field> |
1217 | <field name="list_price">1.58</field> |
1218 | <field name="name">Lays Salt and Pepper Oven Baked 150g</field> |
1219 | - <field name="public_categ_id" ref="chips"/> |
1220 | + <field name="pos_categ_id" ref="chips"/> |
1221 | <field name="image" type="base64" file="point_of_sale/static/img/lays_poivre_sel_oven_150g-image.jpg"/> |
1222 | </record> |
1223 | |
1224 | @@ -1091,35 +1087,35 @@ |
1225 | <field name="available_in_pos">True</field> |
1226 | <field name="list_price">1.54</field> |
1227 | <field name="name">Oven Baked Lays Paprika 150g</field> |
1228 | - <field name="public_categ_id" ref="chips"/> |
1229 | + <field name="pos_categ_id" ref="chips"/> |
1230 | <field name="image" type="base64" file="point_of_sale/static/img/lays_paprika_oven_150g-image.jpg"/> |
1231 | </record> |
1232 | <record id="lays_paprika_300g" model="product.product"> |
1233 | <field name="available_in_pos">True</field> |
1234 | <field name="list_price">1.55</field> |
1235 | <field name="name">Lays Paprika XXL 300g</field> |
1236 | - <field name="public_categ_id" ref="chips"/> |
1237 | + <field name="pos_categ_id" ref="chips"/> |
1238 | <field name="image" type="base64" file="point_of_sale/static/img/lays_paprika_300g-image.jpg"/> |
1239 | </record> |
1240 | <record id="lays_paprika_170g" model="product.product"> |
1241 | <field name="available_in_pos">True</field> |
1242 | <field name="list_price">1.48</field> |
1243 | <field name="name">Lays Light Paprika 170g</field> |
1244 | - <field name="public_categ_id" ref="chips"/> |
1245 | + <field name="pos_categ_id" ref="chips"/> |
1246 | <field name="image" type="base64" file="point_of_sale/static/img/lays_paprika_170g-image.jpg"/> |
1247 | </record> |
1248 | <record id="lays_light_paprika_170g" model="product.product"> |
1249 | <field name="available_in_pos">True</field> |
1250 | <field name="list_price">1.48</field> |
1251 | <field name="name">Lays Light Paprika 170g</field> |
1252 | - <field name="public_categ_id" ref="chips"/> |
1253 | + <field name="pos_categ_id" ref="chips"/> |
1254 | <field name="image" type="base64" file="point_of_sale/static/img/lays_light_paprika_170g-image.jpg"/> |
1255 | </record> |
1256 | <record id="lays_paprika_45g" model="product.product"> |
1257 | <field name="available_in_pos">True</field> |
1258 | <field name="list_price">0.39</field> |
1259 | <field name="name">Lays Paprika 45g</field> |
1260 | - <field name="public_categ_id" ref="chips"/> |
1261 | + <field name="pos_categ_id" ref="chips"/> |
1262 | <field name="image" type="base64" file="point_of_sale/static/img/lays_paprika_45g-image.jpg"/> |
1263 | </record> |
1264 | |
1265 | @@ -1127,35 +1123,35 @@ |
1266 | <field name="available_in_pos">True</field> |
1267 | <field name="list_price">1.54</field> |
1268 | <field name="name">Oven Baked Lays Natural 150g</field> |
1269 | - <field name="public_categ_id" ref="chips"/> |
1270 | + <field name="pos_categ_id" ref="chips"/> |
1271 | <field name="image" type="base64" file="point_of_sale/static/img/lays_naturel_oven_150g-image.jpg"/> |
1272 | </record> |
1273 | <record id="lays_naturel_300g" model="product.product"> |
1274 | <field name="available_in_pos">True</field> |
1275 | <field name="list_price">1.55</field> |
1276 | <field name="name">Lays Natural XXL 300g</field> |
1277 | - <field name="public_categ_id" ref="chips"/> |
1278 | + <field name="pos_categ_id" ref="chips"/> |
1279 | <field name="image" type="base64" file="point_of_sale/static/img/lays_naturel_300g-image.jpg"/> |
1280 | </record> |
1281 | <record id="lays_naturel_170g" model="product.product"> |
1282 | <field name="available_in_pos">True</field> |
1283 | <field name="list_price">1.48</field> |
1284 | <field name="name">Lays Natural Light 170g</field> |
1285 | - <field name="public_categ_id" ref="chips"/> |
1286 | + <field name="pos_categ_id" ref="chips"/> |
1287 | <field name="image" type="base64" file="point_of_sale/static/img/lays_naturel_170g-image.jpg"/> |
1288 | </record> |
1289 | <record id="lays_light_naturel_170g" model="product.product"> |
1290 | <field name="available_in_pos">True</field> |
1291 | <field name="list_price">1.48</field> |
1292 | <field name="name">Lays Natural Light 170g</field> |
1293 | - <field name="public_categ_id" ref="chips"/> |
1294 | + <field name="pos_categ_id" ref="chips"/> |
1295 | <field name="image" type="base64" file="point_of_sale/static/img/lays_light_naturel_170g-image.jpg"/> |
1296 | </record> |
1297 | <record id="lays_naturel_45g" model="product.product"> |
1298 | <field name="available_in_pos">True</field> |
1299 | <field name="list_price">0.39</field> |
1300 | <field name="name">Lays Natural 45g</field> |
1301 | - <field name="public_categ_id" ref="chips"/> |
1302 | + <field name="pos_categ_id" ref="chips"/> |
1303 | <field name="image" type="base64" file="point_of_sale/static/img/lays_naturel_45g-image.jpg"/> |
1304 | </record> |
1305 | |
1306 | @@ -1163,35 +1159,35 @@ |
1307 | <field name="available_in_pos">True</field> |
1308 | <field name="list_price">7.60</field> |
1309 | <field name="name">IJsboerke Chocolat 2.5L</field> |
1310 | - <field name="public_categ_id" ref="ice_cream"/> |
1311 | + <field name="pos_categ_id" ref="ice_cream"/> |
1312 | <field name="image" type="base64" file="point_of_sale/static/img/ijsboerke_chocolat_2,5l-image.jpg"/> |
1313 | </record> |
1314 | <record id="ijsboerke_moka_2,5l" model="product.product"> |
1315 | <field name="available_in_pos">True</field> |
1316 | <field name="list_price">7.60</field> |
1317 | <field name="name">IJsboerke Mocha 2.5L</field> |
1318 | - <field name="public_categ_id" ref="ice_cream"/> |
1319 | + <field name="pos_categ_id" ref="ice_cream"/> |
1320 | <field name="image" type="base64" file="point_of_sale/static/img/ijsboerke_moka_2,5l-image.jpg"/> |
1321 | </record> |
1322 | <record id="ijsboerke_vanille_2,5l" model="product.product"> |
1323 | <field name="available_in_pos">True</field> |
1324 | <field name="list_price">7.40</field> |
1325 | <field name="name">IJsboerke Vanilla 2.5L</field> |
1326 | - <field name="public_categ_id" ref="ice_cream"/> |
1327 | + <field name="pos_categ_id" ref="ice_cream"/> |
1328 | <field name="image" type="base64" file="point_of_sale/static/img/ijsboerke_vanille_2,5l-image.jpg"/> |
1329 | </record> |
1330 | <record id="ijsboerke_stracciatella_2,5l" model="product.product"> |
1331 | <field name="available_in_pos">True</field> |
1332 | <field name="list_price">8.40</field> |
1333 | <field name="name">IJsboerke Stracciatella 2.5L</field> |
1334 | - <field name="public_categ_id" ref="ice_cream"/> |
1335 | + <field name="pos_categ_id" ref="ice_cream"/> |
1336 | <field name="image" type="base64" file="point_of_sale/static/img/ijsboerke_stracciatella_2,5l-image.jpg"/> |
1337 | </record> |
1338 | <record id="ijsboerke_dame_blanche_2,5l" model="product.product"> |
1339 | <field name="available_in_pos">True</field> |
1340 | <field name="list_price">7.60</field> |
1341 | <field name="name">IJsboerke 2.5L White Lady</field> |
1342 | - <field name="public_categ_id" ref="ice_cream"/> |
1343 | + <field name="pos_categ_id" ref="ice_cream"/> |
1344 | <field name="image" type="base64" file="point_of_sale/static/img/ijsboerke_dame_blanche_2,5l-image.jpg"/> |
1345 | </record> |
1346 | |
1347 | |
1348 | === modified file 'point_of_sale/point_of_sale_view.xml' |
1349 | --- point_of_sale/point_of_sale_view.xml 2014-05-07 18:29:17 +0000 |
1350 | +++ point_of_sale/point_of_sale_view.xml 2014-05-20 04:55:26 +0000 |
1351 | @@ -484,6 +484,7 @@ |
1352 | <field name="arch" type="xml"> |
1353 | <group name="sale" position="inside"> |
1354 | <group name="pos" string="Point of Sale"> |
1355 | + <field name="pos_categ_id"/> |
1356 | <field name="available_in_pos"/> |
1357 | <field name="to_weight" /> |
1358 | <field name="income_pdt"/> |
1359 | @@ -496,8 +497,6 @@ |
1360 | </field> |
1361 | </record> |
1362 | |
1363 | - <!-- Categories tree view --> |
1364 | - <menuitem action="product.product_public_category_action" id="menu_product_public_category" parent="menu_point_of_sale_product" sequence="0" /> |
1365 | <!-- END --> |
1366 | |
1367 | <menuitem name="Configuration" parent="menu_point_root" |
1368 | @@ -919,6 +918,46 @@ |
1369 | </field> |
1370 | </record> |
1371 | |
1372 | + <record id="pos_categ_form_view" model="ir.ui.view"> |
1373 | + <field name="name">pos.category.form</field> |
1374 | + <field name="model">pos.category</field> |
1375 | + <field name="arch" type="xml"> |
1376 | + <form string="Point Of Sale Categories" version="7.0"> |
1377 | + <sheet> |
1378 | + <field name="image_medium" widget='image' class="oe_avatar oe_right"/> |
1379 | + <div class="oe_left"> |
1380 | + <group> |
1381 | + <field name="name"/> |
1382 | + <field name="parent_id"/> |
1383 | + <field name="sequence"/> |
1384 | + </group> |
1385 | + </div> |
1386 | + </sheet> |
1387 | + </form> |
1388 | + </field> |
1389 | + </record> |
1390 | + |
1391 | + <record id="pos_category_list_view" model="ir.ui.view"> |
1392 | + <field name="name">pos.category.list</field> |
1393 | + <field name="model">pos.category</field> |
1394 | + <field name="arch" type="xml"> |
1395 | + <tree string="Point Of Sale Categories"> |
1396 | + <field name="sequence" invisible="1"/> |
1397 | + <field name="complete_name"/> |
1398 | + </tree> |
1399 | + </field> |
1400 | + </record> |
1401 | + |
1402 | + <record id="pos_category_action_form" model="ir.actions.act_window"> |
1403 | + <field name="name">Product Categories</field> |
1404 | + <field name="type">ir.actions.act_window</field> |
1405 | + <field name="res_model">pos.category</field> |
1406 | + <field name="view_type">form</field> |
1407 | + <field name="view_id" ref="pos_category_list_view"/> |
1408 | + </record> |
1409 | + |
1410 | + <menuitem action="pos_category_action_form" id="menu_product_pos_category" parent="menu_point_of_sale_product" sequence="0" /> |
1411 | + |
1412 | |
1413 | </data> |
1414 | </openerp> |
1415 | |
1416 | === modified file 'point_of_sale/security/ir.model.access.csv' |
1417 | --- point_of_sale/security/ir.model.access.csv 2014-02-03 17:30:00 +0000 |
1418 | +++ point_of_sale/security/ir.model.access.csv 2014-05-20 04:55:26 +0000 |
1419 | @@ -57,5 +57,5 @@ |
1420 | access_pos_session_user,pos.session user,model_pos_session,group_pos_user,1,1,1,0 |
1421 | access_pos_config_user,pos.config user,model_pos_config,group_pos_user,1,1,1,0 |
1422 | access_ir_sequence_manager,ir.sequence manager,base.model_ir_sequence,group_pos_manager,1,1,1,1 |
1423 | -access_product_category_pos_manager,product.public.category manager,product.model_product_public_category,group_pos_manager,1,1,1,1 |
1424 | -access_product_category_pos_user,product.public.category user,product.model_product_public_category,group_pos_user,1,0,0,0 |
1425 | +access_product_category_pos_manager,pos.category manager,model_pos_category,group_pos_manager,1,1,1,1 |
1426 | +access_product_category_pos_user,pos.category user,model_pos_category,group_pos_user,1,0,0,0 |
1427 | |
1428 | === modified file 'point_of_sale/static/src/js/db.js' |
1429 | --- point_of_sale/static/src/js/db.js 2014-01-27 16:10:05 +0000 |
1430 | +++ point_of_sale/static/src/js/db.js 2014-05-20 04:55:26 +0000 |
1431 | @@ -145,7 +145,7 @@ |
1432 | for(var i = 0, len = products.length; i < len; i++){ |
1433 | var product = products[i]; |
1434 | var search_string = this._product_search_string(product); |
1435 | - var categ_id = product.public_categ_id ? product.public_categ_id[0] : this.root_category_id; |
1436 | + var categ_id = product.pos_categ_id ? product.pos_categ_id[0] : this.root_category_id; |
1437 | if(!stored_categories[categ_id]){ |
1438 | stored_categories[categ_id] = []; |
1439 | } |
1440 | |
1441 | === modified file 'point_of_sale/static/src/js/models.js' |
1442 | --- point_of_sale/static/src/js/models.js 2014-03-28 14:57:10 +0000 |
1443 | +++ point_of_sale/static/src/js/models.js 2014-05-20 04:55:26 +0000 |
1444 | @@ -208,13 +208,13 @@ |
1445 | }).then(function(packagings){ |
1446 | self.db.add_packagings(packagings); |
1447 | |
1448 | - return self.fetch('product.public.category', ['id','name','parent_id','child_id','image']) |
1449 | + return self.fetch('pos.category', ['id','name','parent_id','child_id','image']) |
1450 | }).then(function(categories){ |
1451 | self.db.add_categories(categories); |
1452 | |
1453 | return self.fetch( |
1454 | 'product.product', |
1455 | - ['name', 'list_price','price','public_categ_id', 'taxes_id', 'ean13', 'default_code', |
1456 | + ['name', 'list_price','price','pos_categ_id', 'taxes_id', 'ean13', 'default_code', |
1457 | 'to_weight', 'uom_id', 'uos_id', 'uos_coeff', 'mes_type', 'description_sale', 'description'], |
1458 | [['sale_ok','=',true],['available_in_pos','=',true]], |
1459 | {pricelist: self.pricelist.id} // context for price |
1460 | |
1461 | === modified file 'point_of_sale/static/src/js/widgets.js' |
1462 | --- point_of_sale/static/src/js/widgets.js 2014-04-25 12:22:20 +0000 |
1463 | +++ point_of_sale/static/src/js/widgets.js 2014-05-20 04:55:26 +0000 |
1464 | @@ -436,7 +436,7 @@ |
1465 | }, |
1466 | |
1467 | get_image_url: function(category){ |
1468 | - return window.location.origin + '/web/binary/image?model=product.public.category&field=image_medium&id='+category.id; |
1469 | + return window.location.origin + '/web/binary/image?model=pos.category&field=image_medium&id='+category.id; |
1470 | }, |
1471 | |
1472 | render_category: function( category, with_image ){ |
1473 | |
1474 | === modified file 'product/product.py' |
1475 | --- product/product.py 2014-05-09 07:33:15 +0000 |
1476 | +++ product/product.py 2014-05-20 04:55:26 +0000 |
1477 | @@ -315,73 +315,6 @@ |
1478 | 'company_id': _get_default_company, |
1479 | } |
1480 | |
1481 | - |
1482 | -class product_public_category(osv.osv): |
1483 | - _name = "product.public.category" |
1484 | - _description = "Public Category" |
1485 | - _order = "sequence, name" |
1486 | - |
1487 | - _constraints = [ |
1488 | - (osv.osv._check_recursion, 'Error ! You cannot create recursive categories.', ['parent_id']) |
1489 | - ] |
1490 | - |
1491 | - def name_get(self, cr, uid, ids, context=None): |
1492 | - if not len(ids): |
1493 | - return [] |
1494 | - reads = self.read(cr, uid, ids, ['name','parent_id'], context=context) |
1495 | - res = [] |
1496 | - for record in reads: |
1497 | - name = record['name'] |
1498 | - if record['parent_id']: |
1499 | - name = record['parent_id'][1]+' / '+name |
1500 | - res.append((record['id'], name)) |
1501 | - return res |
1502 | - |
1503 | - def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None): |
1504 | - res = self.name_get(cr, uid, ids, context=context) |
1505 | - return dict(res) |
1506 | - |
1507 | - def _get_image(self, cr, uid, ids, name, args, context=None): |
1508 | - result = dict.fromkeys(ids, False) |
1509 | - for obj in self.browse(cr, uid, ids, context=context): |
1510 | - result[obj.id] = tools.image_get_resized_images(obj.image) |
1511 | - return result |
1512 | - |
1513 | - def _set_image(self, cr, uid, id, name, value, args, context=None): |
1514 | - return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context) |
1515 | - |
1516 | - _columns = { |
1517 | - 'name': fields.char('Name', required=True, translate=True), |
1518 | - 'complete_name': fields.function(_name_get_fnc, type="char", string='Name'), |
1519 | - 'parent_id': fields.many2one('product.public.category','Parent Category', select=True), |
1520 | - 'child_id': fields.one2many('product.public.category', 'parent_id', string='Children Categories'), |
1521 | - 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of product categories."), |
1522 | - |
1523 | - # NOTE: there is no 'default image', because by default we don't show thumbnails for categories. However if we have a thumbnail |
1524 | - # for at least one category, then we display a default image on the other, so that the buttons have consistent styling. |
1525 | - # In this case, the default image is set by the js code. |
1526 | - # NOTE2: image: all image fields are base64 encoded and PIL-supported |
1527 | - 'image': fields.binary("Image", |
1528 | - help="This field holds the image used as image for the cateogry, limited to 1024x1024px."), |
1529 | - 'image_medium': fields.function(_get_image, fnct_inv=_set_image, |
1530 | - string="Medium-sized image", type="binary", multi="_get_image", |
1531 | - store={ |
1532 | - 'product.public.category': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10), |
1533 | - }, |
1534 | - help="Medium-sized image of the category. It is automatically "\ |
1535 | - "resized as a 128x128px image, with aspect ratio preserved. "\ |
1536 | - "Use this field in form views or some kanban views."), |
1537 | - 'image_small': fields.function(_get_image, fnct_inv=_set_image, |
1538 | - string="Smal-sized image", type="binary", multi="_get_image", |
1539 | - store={ |
1540 | - 'product.public.category': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10), |
1541 | - }, |
1542 | - help="Small-sized image of the category. It is automatically "\ |
1543 | - "resized as a 64x64px image, with aspect ratio preserved. "\ |
1544 | - "Use this field anywhere a small image is required."), |
1545 | - } |
1546 | - |
1547 | - |
1548 | #---------------------------------------------------------- |
1549 | # Products |
1550 | #---------------------------------------------------------- |
1551 | @@ -434,8 +367,7 @@ |
1552 | "This description will be copied to every Sale Order, Delivery Order and Customer Invoice/Refund"), |
1553 | 'type': fields.selection([('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Consumable are product where you don't manage stock, a service is a non-material product provided by a company or an individual."), |
1554 | 'rental': fields.boolean('Can be Rent'), |
1555 | - 'categ_id': fields.many2one('product.category','Category', required=True, change_default=True, domain="[('type','=','normal')]" ,help="Select category for the current product"), |
1556 | - 'public_categ_id': fields.many2one('product.public.category','Public Category', help="Those categories are used to group similar products for public sales (eg.: point of sale, e-commerce)."), |
1557 | + 'categ_id': fields.many2one('product.category','Internal Category', required=True, change_default=True, domain="[('type','=','normal')]" ,help="Select category for the current product"), |
1558 | 'list_price': fields.float('Sale Price', digits_compute=dp.get_precision('Product Price'), help="Base price to compute the customer price. Sometimes called the catalog price."), |
1559 | 'standard_price': fields.property(type = 'float', digits_compute=dp.get_precision('Product Price'), |
1560 | help="Cost price of the product template used for standard stock valuation in accounting and used as a base price on purchase orders.", |
1561 | |
1562 | === modified file 'product/product_data.xml' |
1563 | --- product/product_data.xml 2014-05-02 13:03:52 +0000 |
1564 | +++ product/product_data.xml 2014-05-20 04:55:26 +0000 |
1565 | @@ -256,9 +256,5 @@ |
1566 | <field name="sale_ok" eval="False"/> |
1567 | </record> |
1568 | |
1569 | - <!-- Product Public Categories --> |
1570 | - <record id="categ_others" model="product.public.category"> |
1571 | - <field name="name">Others</field> |
1572 | - </record> |
1573 | </data> |
1574 | </openerp> |
1575 | |
1576 | === modified file 'product/product_demo.xml' |
1577 | --- product/product_demo.xml 2014-01-28 12:53:40 +0000 |
1578 | +++ product/product_demo.xml 2014-05-20 04:55:26 +0000 |
1579 | @@ -56,127 +56,6 @@ |
1580 | <field name="type">box</field> |
1581 | </record> |
1582 | |
1583 | - |
1584 | - <!-- product.public.category --> |
1585 | - |
1586 | - <record id="computers" model="product.public.category"> |
1587 | - <field name="name">Computers</field> |
1588 | - </record> |
1589 | - |
1590 | - <record id="Components" model="product.public.category"> |
1591 | - <field name="parent_id" ref="computers"/> |
1592 | - <field name="name">Components</field> |
1593 | - </record> |
1594 | - |
1595 | - <record id="case" model="product.public.category"> |
1596 | - <field name="parent_id" ref="Components"/> |
1597 | - <field name="name">Case</field> |
1598 | - </record> |
1599 | - <record id="HDD" model="product.public.category"> |
1600 | - <field name="parent_id" ref="Components"/> |
1601 | - <field name="name">Hard Drive</field> |
1602 | - </record> |
1603 | - <record id="motherboard" model="product.public.category"> |
1604 | - <field name="parent_id" ref="Components"/> |
1605 | - <field name="name">Motherboard</field> |
1606 | - </record> |
1607 | - <record id="graphics_card" model="product.public.category"> |
1608 | - <field name="parent_id" ref="Components"/> |
1609 | - <field name="name">Graphics Card</field> |
1610 | - </record> |
1611 | - <record id="Memory" model="product.public.category"> |
1612 | - <field name="parent_id" ref="Components"/> |
1613 | - <field name="name">Memory</field> |
1614 | - </record> |
1615 | - <record id="processor" model="product.public.category"> |
1616 | - <field name="parent_id" ref="Components"/> |
1617 | - <field name="name">Processor</field> |
1618 | - </record> |
1619 | - <record id="video_acquisition" model="product.public.category"> |
1620 | - <field name="parent_id" ref="Components"/> |
1621 | - <field name="name">Video Acquisition</field> |
1622 | - </record> |
1623 | - |
1624 | - <record id="devices" model="product.public.category"> |
1625 | - <field name="parent_id" ref="computers"/> |
1626 | - <field name="name">Devices</field> |
1627 | - </record> |
1628 | - |
1629 | - <record id="Screen" model="product.public.category"> |
1630 | - <field name="parent_id" ref="devices"/> |
1631 | - <field name="name">Screen</field> |
1632 | - </record> |
1633 | - <record id="Pen_Drive" model="product.public.category"> |
1634 | - <field name="parent_id" ref="devices"/> |
1635 | - <field name="name">Pen Drive</field> |
1636 | - </record> |
1637 | - <record id="External_Hard_Drive" model="product.public.category"> |
1638 | - <field name="parent_id" ref="devices"/> |
1639 | - <field name="name">External Hard Drive</field> |
1640 | - </record> |
1641 | - <record id="Keyboard_Mouse" model="product.public.category"> |
1642 | - <field name="parent_id" ref="devices"/> |
1643 | - <field name="name">Keyboard / Mouse</field> |
1644 | - </record> |
1645 | - <record id="printer" model="product.public.category"> |
1646 | - <field name="parent_id" ref="devices"/> |
1647 | - <field name="name">Printer</field> |
1648 | - </record> |
1649 | - <record id="Speakers" model="product.public.category"> |
1650 | - <field name="parent_id" ref="devices"/> |
1651 | - <field name="name">Speakers</field> |
1652 | - </record> |
1653 | - <record id="Headset" model="product.public.category"> |
1654 | - <field name="parent_id" ref="devices"/> |
1655 | - <field name="name">Headset</field> |
1656 | - </record> |
1657 | - <record id="Software" model="product.public.category"> |
1658 | - <field name="parent_id" ref="devices"/> |
1659 | - <field name="name">Software</field> |
1660 | - </record> |
1661 | - |
1662 | - <record id="laptops" model="product.public.category"> |
1663 | - <field name="parent_id" ref="computers"/> |
1664 | - <field name="name">Laptops</field> |
1665 | - </record> |
1666 | - |
1667 | - <record id="sub_computers" model="product.public.category"> |
1668 | - <field name="parent_id" ref="computers"/> |
1669 | - <field name="name">Computers</field> |
1670 | - </record> |
1671 | - |
1672 | - <record id="Computer_all_in_one" model="product.public.category"> |
1673 | - <field name="parent_id" ref="sub_computers"/> |
1674 | - <field name="name">Computer all-in-one</field> |
1675 | - </record> |
1676 | - <record id="server" model="product.public.category"> |
1677 | - <field name="parent_id" ref="sub_computers"/> |
1678 | - <field name="name">Server</field> |
1679 | - </record> |
1680 | - |
1681 | - <record id="network" model="product.public.category"> |
1682 | - <field name="parent_id" ref="computers"/> |
1683 | - <field name="name">Network</field> |
1684 | - </record> |
1685 | - |
1686 | - <record id="Switch" model="product.public.category"> |
1687 | - <field name="parent_id" ref="network"/> |
1688 | - <field name="name">Switch</field> |
1689 | - </record> |
1690 | - <record id="Modem_Router" model="product.public.category"> |
1691 | - <field name="parent_id" ref="network"/> |
1692 | - <field name="name">Modem & Router</field> |
1693 | - </record> |
1694 | - <record id="Switch" model="product.public.category"> |
1695 | - <field name="parent_id" ref="network"/> |
1696 | - <field name="name">Switch</field> |
1697 | - </record> |
1698 | - |
1699 | - <record id="services" model="product.public.category"> |
1700 | - <field name="parent_id" ref="computers"/> |
1701 | - <field name="name">Services</field> |
1702 | - </record> |
1703 | - |
1704 | <!-- Apple Products --> |
1705 | <record id="apple" model="product.category"> |
1706 | <field name="name">Apple Products</field> |
1707 | @@ -213,7 +92,6 @@ |
1708 | <record id="product_template_1" model="product.template"> |
1709 | <field name="name">On Site Monitoring</field> |
1710 | <field name="categ_id" ref="product_category_5"/> |
1711 | - <field name="public_categ_id" ref="services"/> |
1712 | <field name="standard_price">20.5</field> |
1713 | <field name="list_price">30.75</field> |
1714 | <field name="type">service</field> |
1715 | @@ -230,7 +108,6 @@ |
1716 | <record id="product_template_2" model="product.template"> |
1717 | <field name="name">On Site Assistance</field> |
1718 | <field name="categ_id" ref="product_category_5"/> |
1719 | - <field name="public_categ_id" ref="services"/> |
1720 | <field name="standard_price">25.5</field> |
1721 | <field name="list_price">38.25</field> |
1722 | <field name="type">service</field> |
1723 | @@ -246,7 +123,6 @@ |
1724 | <record id="product_template_3" model="product.template"> |
1725 | <field name="name">PC Assemble SC234</field> |
1726 | <field name="categ_id" ref="product_category_4"/> |
1727 | - <field name="public_categ_id" ref="Computer_all_in_one"/> |
1728 | <field name="list_price">450.0</field> |
1729 | <field name="standard_price">300.0</field> |
1730 | <field name="type">consu</field> |
1731 | @@ -266,7 +142,6 @@ |
1732 | <record id="product_template_4" model="product.template"> |
1733 | <field name="name">iPad Retina Display</field> |
1734 | <field name="categ_id" ref="ipad"/> |
1735 | - <field name="public_categ_id" ref="Computer_all_in_one"/> |
1736 | <field name="standard_price">500.0</field> |
1737 | <field name="list_price">750.0</field> |
1738 | <field name="type">consu</field> |
1739 | @@ -285,7 +160,6 @@ |
1740 | <record id="product_template_5" model="product.template"> |
1741 | <field name="name">Bose Mini Bluetooth Speaker</field> |
1742 | <field name="categ_id" ref="accessories"/> |
1743 | - <field name="public_categ_id" ref="Speakers"/> |
1744 | <field name="standard_price">600.0</field> |
1745 | <field name="list_price">147.0</field> |
1746 | <field name="type">consu</field> |
1747 | @@ -303,7 +177,6 @@ |
1748 | <record id="product_template_6" model="product.template"> |
1749 | <field name="name">iPad Mini</field> |
1750 | <field name="categ_id" ref="ipad"/> |
1751 | - <field name="public_categ_id" ref="Screen"/> |
1752 | <field name="standard_price">800.0</field> |
1753 | <field name="list_price">320.0</field> |
1754 | <field name="type">consu</field> |
1755 | @@ -318,7 +191,6 @@ |
1756 | <record id="product_template_7" model="product.template"> |
1757 | <field name="name">Apple In-Ear Headphones</field> |
1758 | <field name="categ_id" ref="accessories"/> |
1759 | - <field name="public_categ_id" ref="Screen"/> |
1760 | <field name="standard_price">70.0</field> |
1761 | <field name="list_price">79.0</field> |
1762 | <field name="type">consu</field> |
1763 | @@ -347,7 +219,6 @@ |
1764 | <record id="product_template_9" model="product.template"> |
1765 | <field name="name">Apple Wireless Keyboard</field> |
1766 | <field name="categ_id" ref="accessories"/> |
1767 | - <field name="public_categ_id" ref="Keyboard_Mouse"/> |
1768 | <field name="standard_price">10.0</field> |
1769 | <field name="list_price">47.0</field> |
1770 | <field name="type">consu</field> |
1771 | @@ -362,7 +233,6 @@ |
1772 | <record id="product_template_10" model="product.template"> |
1773 | <field name="name">Mouse, Optical</field> |
1774 | <field name="categ_id" ref="product_category_8"/> |
1775 | - <field name="public_categ_id" ref="Keyboard_Mouse"/> |
1776 | <field name="standard_price">12.50</field> |
1777 | <field name="list_price">14</field> |
1778 | <field name="type">consu</field> |
1779 | @@ -377,7 +247,6 @@ |
1780 | <record id="product_template_11" model="product.template"> |
1781 | <field name="name">iPod</field> |
1782 | <field name="categ_id" ref="ipod"/> |
1783 | - <field name="public_categ_id" ref="Keyboard_Mouse"/> |
1784 | <field name="standard_price">14</field> |
1785 | <field name="list_price">16.50</field> |
1786 | <field name="type">consu</field> |
1787 | @@ -389,7 +258,6 @@ |
1788 | <field name="variants">16 Gb</field> |
1789 | <field name="default_code">A6678</field> |
1790 | <field name="categ_id" ref="ipod"/> |
1791 | - <field name="public_categ_id" ref="Keyboard_Mouse"/> |
1792 | <field name="standard_price">14</field> |
1793 | <field name="list_price">16.50</field> |
1794 | <field name="type">consu</field> |
1795 | @@ -407,7 +275,6 @@ |
1796 | <record id="product_template_12" model="product.template"> |
1797 | <field name="name">Mouse, Wireless</field> |
1798 | <field name="categ_id" ref="product_category_8"/> |
1799 | - <field name="public_categ_id" ref="Keyboard_Mouse"/> |
1800 | <field name="standard_price">18</field> |
1801 | <field name="list_price">12.50</field> |
1802 | <field name="type">consu</field> |
1803 | @@ -422,7 +289,6 @@ |
1804 | <record id="product_template_13" model="product.template"> |
1805 | <field name="name">RAM SR5</field> |
1806 | <field name="categ_id" ref="product_category_8"/> |
1807 | - <field name="public_categ_id" ref="Memory"/> |
1808 | <field name="standard_price">78.0</field> |
1809 | <field name="list_price">85.0</field> |
1810 | <field name="type">consu</field> |
1811 | @@ -437,7 +303,6 @@ |
1812 | <record id="product_template_14" model="product.template"> |
1813 | <field name="name">RAM SR2</field> |
1814 | <field name="categ_id" ref="product_category_8"/> |
1815 | - <field name="public_categ_id" ref="Memory"/> |
1816 | <field name="standard_price">87.0</field> |
1817 | <field name="list_price">95.0</field> |
1818 | <field name="type">consu</field> |
1819 | @@ -452,7 +317,6 @@ |
1820 | <record id="product_template_15" model="product.template"> |
1821 | <field name="name">RAM SR3</field> |
1822 | <field name="categ_id" ref="product_category_8"/> |
1823 | - <field name="public_categ_id" ref="Memory"/> |
1824 | <field name="standard_price">80.0</field> |
1825 | <field name="list_price">85.0</field> |
1826 | <field name="type">consu</field> |
1827 | @@ -467,7 +331,6 @@ |
1828 | <record id="product_template_16" model="product.template"> |
1829 | <field name="name">Computer Case</field> |
1830 | <field name="categ_id" ref="product_category_8"/> |
1831 | - <field name="public_categ_id" ref="case"/> |
1832 | <field name="standard_price">20.0</field> |
1833 | <field name="list_price">25.0</field> |
1834 | <field name="type">consu</field> |
1835 | @@ -482,7 +345,6 @@ |
1836 | <record id="product_template_17" model="product.template"> |
1837 | <field name="name">HDD SH-1</field> |
1838 | <field name="categ_id" ref="product_category_8"/> |
1839 | - <field name="public_categ_id" ref="HDD"/> |
1840 | <field name="standard_price">860.0</field> |
1841 | <field name="list_price">975.0</field> |
1842 | <field name="type">consu</field> |
1843 | @@ -497,7 +359,6 @@ |
1844 | <record id="product_template_18" model="product.template"> |
1845 | <field name="name">HDD SH-2</field> |
1846 | <field name="categ_id" ref="product_category_8"/> |
1847 | - <field name="public_categ_id" ref="HDD"/> |
1848 | <field name="standard_price">1020.0</field> |
1849 | <field name="list_price">1150.0</field> |
1850 | <field name="type">consu</field> |
1851 | @@ -512,7 +373,6 @@ |
1852 | <record id="product_template_19" model="product.template"> |
1853 | <field name="name">HDD on Demand</field> |
1854 | <field name="categ_id" ref="product_category_8"/> |
1855 | - <field name="public_categ_id" ref="HDD"/> |
1856 | <field name="standard_price">1100.0</field> |
1857 | <field name="list_price">1250.0</field> |
1858 | <field name="type">consu</field> |
1859 | @@ -528,7 +388,6 @@ |
1860 | <record id="product_template_20" model="product.template"> |
1861 | <field name="name">Motherboard I9P57</field> |
1862 | <field name="categ_id" ref="product_category_8"/> |
1863 | - <field name="public_categ_id" ref="motherboard"/> |
1864 | <field name="standard_price">1700.0</field> |
1865 | <field name="list_price">1950.0</field> |
1866 | <field name="type">consu</field> |
1867 | @@ -543,7 +402,6 @@ |
1868 | <record id="product_template_21" model="product.template"> |
1869 | <field name="name">Motherboard A20Z7</field> |
1870 | <field name="categ_id" ref="product_category_8"/> |
1871 | - <field name="public_categ_id" ref="motherboard"/> |
1872 | <field name="standard_price">1790.0</field> |
1873 | <field name="list_price">2000.0</field> |
1874 | <field name="type">consu</field> |
1875 | @@ -558,7 +416,6 @@ |
1876 | <record id="product_template_22" model="product.template"> |
1877 | <field name="name">Processor Core i5 2.70 Ghz</field> |
1878 | <field name="categ_id" ref="product_category_8"/> |
1879 | - <field name="public_categ_id" ref="processor"/> |
1880 | <field name="standard_price">2010.0</field> |
1881 | <field name="list_price">2100.0</field> |
1882 | <field name="type">consu</field> |
1883 | @@ -573,7 +430,6 @@ |
1884 | <record id="product_template_23" model="product.template"> |
1885 | <field name="name">Processor AMD 8-Core</field> |
1886 | <field name="categ_id" ref="product_category_8"/> |
1887 | - <field name="public_categ_id" ref="processor"/> |
1888 | <field name="standard_price">1910.0</field> |
1889 | <field name="list_price">1980.0</field> |
1890 | <field name="type">consu</field> |
1891 | @@ -588,7 +444,6 @@ |
1892 | <record id="product_template_24" model="product.template"> |
1893 | <field name="name">Graphics Card</field> |
1894 | <field name="categ_id" ref="product_category_8"/> |
1895 | - <field name="public_categ_id" ref="graphics_card"/> |
1896 | <field name="standard_price">876.0</field> |
1897 | <field name="list_price">885.0</field> |
1898 | <field name="type">consu</field> |
1899 | @@ -603,7 +458,6 @@ |
1900 | <record id="product_template_25" model="product.template"> |
1901 | <field name="name">Laptop E5023</field> |
1902 | <field name="categ_id" ref="product_category_4"/> |
1903 | - <field name="public_categ_id" ref="laptops"/> |
1904 | <field name="standard_price">2870.0</field> |
1905 | <field name="list_price">2950.0</field> |
1906 | <field name="type">consu</field> |
1907 | @@ -622,7 +476,6 @@ |
1908 | <record id="product_template_26" model="product.template"> |
1909 | <field name="name">Laptop S3450</field> |
1910 | <field name="categ_id" ref="product_category_4"/> |
1911 | - <field name="public_categ_id" ref="laptops"/> |
1912 | <field name="standard_price">3000.0</field> |
1913 | <field name="list_price">3245.0</field> |
1914 | <field name="type">consu</field> |
1915 | @@ -641,7 +494,6 @@ |
1916 | <record id="product_template_27" model="product.template"> |
1917 | <field name="name">Laptop Customized</field> |
1918 | <field name="categ_id" ref="product_category_4"/> |
1919 | - <field name="public_categ_id" ref="laptops"/> |
1920 | <field name="standard_price">3300.0</field> |
1921 | <field name="list_price">3645.0</field> |
1922 | <field name="type">consu</field> |
1923 | @@ -657,7 +509,6 @@ |
1924 | <record id="product_template_28" model="product.template"> |
1925 | <field name="name">External Hard disk</field> |
1926 | <field name="categ_id" ref="product_category_6"/> |
1927 | - <field name="public_categ_id" ref="External_Hard_Drive"/> |
1928 | <field name="standard_price">390.0</field> |
1929 | <field name="list_price">405.0</field> |
1930 | <field name="type">consu</field> |
1931 | @@ -673,7 +524,6 @@ |
1932 | <record id="product_template_29" model="product.template"> |
1933 | <field name="name">Pen drive, SP-2</field> |
1934 | <field name="categ_id" ref="product_category_7"/> |
1935 | - <field name="public_categ_id" ref="Pen_Drive"/> |
1936 | <field name="standard_price">90.0</field> |
1937 | <field name="list_price">100.0</field> |
1938 | <field name="type">consu</field> |
1939 | @@ -689,7 +539,6 @@ |
1940 | <record id="product_template_30" model="product.template"> |
1941 | <field name="name">Pen drive, SP-4</field> |
1942 | <field name="categ_id" ref="product_category_7"/> |
1943 | - <field name="public_categ_id" ref="Pen_Drive"/> |
1944 | <field name="standard_price">126.0</field> |
1945 | <field name="list_price">145.0</field> |
1946 | <field name="type">consu</field> |
1947 | @@ -704,7 +553,6 @@ |
1948 | <record id="product_template_31" model="product.template"> |
1949 | <field name="name">Multimedia Speakers</field> |
1950 | <field name="categ_id" ref="product_category_7"/> |
1951 | - <field name="public_categ_id" ref="Speakers"/> |
1952 | <field name="standard_price">134.0</field> |
1953 | <field name="list_price">150.0</field> |
1954 | <field name="type">consu</field> |
1955 | @@ -720,7 +568,6 @@ |
1956 | <record id="product_template_32" model="product.template"> |
1957 | <field name="name">Headset standard</field> |
1958 | <field name="categ_id" ref="product_category_7"/> |
1959 | - <field name="public_categ_id" ref="Headset"/> |
1960 | <field name="standard_price">57.0</field> |
1961 | <field name="list_price">62.0</field> |
1962 | <field name="type">consu</field> |
1963 | @@ -736,7 +583,6 @@ |
1964 | <record id="product_template_33" model="product.template"> |
1965 | <field name="name">Headset USB</field> |
1966 | <field name="categ_id" ref="product_category_7"/> |
1967 | - <field name="public_categ_id" ref="Headset"/> |
1968 | <field name="standard_price">60.0</field> |
1969 | <field name="list_price">65.0</field> |
1970 | <field name="type">consu</field> |
1971 | @@ -753,7 +599,6 @@ |
1972 | <record id="product_template_34" model="product.template"> |
1973 | <field name="name">Webcam</field> |
1974 | <field name="categ_id" ref="product_category_7"/> |
1975 | - <field name="public_categ_id" ref="video_acquisition"/> |
1976 | <field name="standard_price">38.0</field> |
1977 | <field name="list_price">45.0</field> |
1978 | <field name="type">consu</field> |
1979 | @@ -799,7 +644,6 @@ |
1980 | <record id="product_template_37" model="product.template"> |
1981 | <field name="name">Printer, All-in-one</field> |
1982 | <field name="categ_id" ref="product_category_6"/> |
1983 | - <field name="public_categ_id" ref="printer"/> |
1984 | <field name="standard_price">4258.0</field> |
1985 | <field name="list_price">4410.0</field> |
1986 | <field name="type">consu</field> |
1987 | @@ -816,7 +660,6 @@ |
1988 | <record id="product_template_38" model="product.template"> |
1989 | <field name="name">Ink Cartridge</field> |
1990 | <field name="categ_id" ref="product_category_6"/> |
1991 | - <field name="public_categ_id" ref="printer"/> |
1992 | <field name="standard_price">60.0</field> |
1993 | <field name="list_price">65.0</field> |
1994 | <field name="type">consu</field> |
1995 | @@ -832,7 +675,6 @@ |
1996 | <record id="product_template_39" model="product.template"> |
1997 | <field name="name">Toner Cartridge</field> |
1998 | <field name="categ_id" ref="product_category_6"/> |
1999 | - <field name="public_categ_id" ref="printer"/> |
2000 | <field name="standard_price">66.0</field> |
2001 | <field name="list_price">70.0</field> |
2002 | <field name="type">consu</field> |
2003 | @@ -848,7 +690,6 @@ |
2004 | <record id="product_template_40" model="product.template"> |
2005 | <field name="name">Windows 7 Professional</field> |
2006 | <field name="categ_id" ref="product_category_9"/> |
2007 | - <field name="public_categ_id" ref="Software"/> |
2008 | <field name="standard_price">330.0</field> |
2009 | <field name="list_price">470.0</field> |
2010 | <field name="type">consu</field> |
2011 | @@ -864,7 +705,6 @@ |
2012 | <record id="product_template_41" model="product.template"> |
2013 | <field name="name">Windows Home Server 2011</field> |
2014 | <field name="categ_id" ref="product_category_9"/> |
2015 | - <field name="public_categ_id" ref="Software"/> |
2016 | <field name="standard_price">540.0</field> |
2017 | <field name="list_price">620.0</field> |
2018 | <field name="type">consu</field> |
2019 | @@ -880,7 +720,6 @@ |
2020 | <record id="product_template_42" model="product.template"> |
2021 | <field name="name">Office Suite</field> |
2022 | <field name="categ_id" ref="product_category_9"/> |
2023 | - <field name="public_categ_id" ref="Software"/> |
2024 | <field name="standard_price">110.0</field> |
2025 | <field name="list_price">170.0</field> |
2026 | <field name="type">consu</field> |
2027 | @@ -897,7 +736,6 @@ |
2028 | <record id="product_template_43" model="product.template"> |
2029 | <field name="name">Zed+ Antivirus</field> |
2030 | <field name="categ_id" ref="product_category_9"/> |
2031 | - <field name="public_categ_id" ref="Software"/> |
2032 | <field name="standard_price">235.0</field> |
2033 | <field name="list_price">280.0</field> |
2034 | <field name="type">consu</field> |
2035 | @@ -913,7 +751,6 @@ |
2036 | <record id="product_template_44" model="product.template"> |
2037 | <field name="name">GrapWorks Software</field> |
2038 | <field name="categ_id" ref="product_category_9"/> |
2039 | - <field name="public_categ_id" ref="Software"/> |
2040 | <field name="standard_price">155.0</field> |
2041 | <field name="list_price">173.0</field> |
2042 | <field name="type">consu</field> |
2043 | @@ -930,7 +767,6 @@ |
2044 | <record id="product_template_45" model="product.template"> |
2045 | <field name="name">Router R430</field> |
2046 | <field name="categ_id" ref="product_category_6"/> |
2047 | - <field name="public_categ_id" ref="Modem_Router"/> |
2048 | <field name="standard_price">55.0</field> |
2049 | <field name="list_price">60.0</field> |
2050 | <field name="type">consu</field> |
2051 | @@ -946,7 +782,6 @@ |
2052 | <record id="product_template_46" model="product.template"> |
2053 | <field name="name">Datacard</field> |
2054 | <field name="categ_id" ref="product_category_6"/> |
2055 | - <field name="public_categ_id" ref="Pen_Drive"/> |
2056 | <field name="standard_price">35.0</field> |
2057 | <field name="list_price">40.0</field> |
2058 | <field name="type">consu</field> |
2059 | @@ -962,7 +797,6 @@ |
2060 | <record id="product_template_47" model="product.template"> |
2061 | <field name="name">Switch, 24 ports</field> |
2062 | <field name="categ_id" ref="product_category_6"/> |
2063 | - <field name="public_categ_id" ref="Switch"/> |
2064 | <field name="standard_price">55.0</field> |
2065 | <field name="list_price">70.0</field> |
2066 | <field name="type">consu</field> |
2067 | |
2068 | === modified file 'product/product_view.xml' |
2069 | --- product/product_view.xml 2014-04-25 09:04:14 +0000 |
2070 | +++ product/product_view.xml 2014-05-20 04:55:26 +0000 |
2071 | @@ -86,8 +86,6 @@ |
2072 | </span> |
2073 | <label for="categ_id" class="oe_edit_only"/> |
2074 | <h2><field name="categ_id" attrs="{'readonly': [('is_only_child', '=', False)]}"/></h2> |
2075 | - <label for="public_categ_id" class="oe_edit_only"/> |
2076 | - <h3><field name="public_categ_id" attrs="{'readonly': [('is_only_child', '=', False)]}"/></h3> |
2077 | <div name="options" groups="base.group_user"> |
2078 | <field name="sale_ok"/> |
2079 | <label for="sale_ok"/> |
2080 | @@ -398,7 +396,7 @@ |
2081 | parent="base.menu_product" |
2082 | sequence="30" groups="base.group_no_one"/> |
2083 | <record id="product_category_action_form" model="ir.actions.act_window"> |
2084 | - <field name="name">Product Categories</field> |
2085 | + <field name="name">Internal Categories</field> |
2086 | <field name="type">ir.actions.act_window</field> |
2087 | <field name="res_model">product.category</field> |
2088 | <field name="view_type">form</field> |
2089 | @@ -426,58 +424,6 @@ |
2090 | <field eval="'ir.actions.act_window,%d'%product_normal_action_tree" name="value"/> |
2091 | </record> |
2092 | |
2093 | - |
2094 | - <!-- Product Public Categories --> |
2095 | - <record id="product_public_category_form_view" model="ir.ui.view"> |
2096 | - <field name="name">product.public.category.form</field> |
2097 | - <field name="model">product.public.category</field> |
2098 | - <field name="arch" type="xml"> |
2099 | - <form string="Pos/Public Categories" version="7.0"> |
2100 | - <sheet> |
2101 | - <field name="image_medium" widget='image' class="oe_avatar oe_right"/> |
2102 | - <div class="oe_left"> |
2103 | - <group> |
2104 | - <field name="name"/> |
2105 | - <field name="parent_id"/> |
2106 | - <field name="sequence"/> |
2107 | - </group> |
2108 | - </div> |
2109 | - </sheet> |
2110 | - </form> |
2111 | - </field> |
2112 | - </record> |
2113 | - <record id="product_public_category_tree_view" model="ir.ui.view"> |
2114 | - <field name="name">product.public.category.tree</field> |
2115 | - <field name="model">product.public.category</field> |
2116 | - <field name="field_parent" eval="False"/> |
2117 | - <field name="arch" type="xml"> |
2118 | - <tree string="Product Product Categories"> |
2119 | - <field name="sequence" invisible="1"/> |
2120 | - <field name="complete_name"/> |
2121 | - </tree> |
2122 | - </field> |
2123 | - </record> |
2124 | - <record id="product_public_category_action" model="ir.actions.act_window"> |
2125 | - <field name="name">Pos/Public Product Categories</field> |
2126 | - <field name="type">ir.actions.act_window</field> |
2127 | - <field name="res_model">product.public.category</field> |
2128 | - <field name="view_type">form</field> |
2129 | - <field name="view_mode">tree,form</field> |
2130 | - <field name="view_id" eval="False"/> |
2131 | - <field name="help" type="html"> |
2132 | - <p class="oe_view_nocontent_create"> |
2133 | - Click to define a new category. |
2134 | - </p><p> |
2135 | - Categories are used to browse your products through the |
2136 | - touchscreen interface. |
2137 | - </p><p> |
2138 | - If you put a photo on the category, the layout of the |
2139 | - touchscreen interface will automatically. We suggest not to put |
2140 | - a photo on categories for small (1024x768) screens. |
2141 | - </p> |
2142 | - </field> |
2143 | - </record> |
2144 | - <menuitem action="product_public_category_action" id="menu_product_public_category" parent="prod_config_main" sequence="10" /> |
2145 | <!-- END --> |
2146 | |
2147 | <!-- Unit of Measure --> |
2148 | @@ -830,10 +776,6 @@ |
2149 | <h1> |
2150 | <field name="name"/> |
2151 | </h1> |
2152 | - <label for="categ_id" class="oe_edit_only"/> |
2153 | - <h2><field name="categ_id"/></h2> |
2154 | - <label for="public_categ_id" class="oe_edit_only"/> |
2155 | - <h3><field name="public_categ_id"/></h3> |
2156 | <div name="options" groups="base.group_user"> |
2157 | <field name="sale_ok"/> |
2158 | <label for="sale_ok"/> |
2159 | |
2160 | === modified file 'product/security/ir.model.access.csv' |
2161 | --- product/security/ir.model.access.csv 2014-04-28 15:33:55 +0000 |
2162 | +++ product/security/ir.model.access.csv 2014-05-20 04:55:26 +0000 |
2163 | @@ -19,5 +19,3 @@ |
2164 | access_product_template_sale_manager,product.template salemanager,model_product_template,base.group_sale_manager,1,1,1,1 |
2165 | access_product_product_sale_manager,product.product salemanager,model_product_product,base.group_sale_manager,1,1,1,1 |
2166 | access_product_category_sale_manager,product.category salemanager,product.model_product_category,base.group_sale_manager,1,1,1,1 |
2167 | -access_product_category_pos_manager,product.public.category manager,model_product_public_category,base.group_sale_manager,1,1,1,1 |
2168 | -access_product_category_pos_user,product.public.category user,model_product_public_category,base.group_user,1,0,0,0 |
2169 | |
2170 | === modified file 'website_quote/data/website_quotation_demo.xml' |
2171 | --- website_quote/data/website_quotation_demo.xml 2014-01-25 23:08:47 +0000 |
2172 | +++ website_quote/data/website_quotation_demo.xml 2014-05-20 04:55:26 +0000 |
2173 | @@ -4,7 +4,6 @@ |
2174 | <record id="product_template_quote_1" model="product.template"> |
2175 | <field name="name">Functional Training</field> |
2176 | <field name="categ_id" ref="product.product_category_5"/> |
2177 | - <field name="public_categ_id" ref="product.Computer_all_in_one"/> |
2178 | <field name="standard_price">50000.0</field> |
2179 | <field name="list_price">750000.0</field> |
2180 | <field name="type">service</field> |
2181 | @@ -21,7 +20,6 @@ |
2182 | <record id="product_template_quote_2" model="product.template"> |
2183 | <field name="name">Technical Training</field> |
2184 | <field name="categ_id" ref="product.product_category_5"/> |
2185 | - <field name="public_categ_id" ref="product.Computer_all_in_one"/> |
2186 | <field name="standard_price">50000.0</field> |
2187 | <field name="list_price">0.0</field> |
2188 | <field name="type">service</field> |
2189 | @@ -38,7 +36,6 @@ |
2190 | <record id="product_template_quote_3" model="product.template"> |
2191 | <field name="name">Advanced CRM Functional</field> |
2192 | <field name="categ_id" ref="product.product_category_5"/> |
2193 | - <field name="public_categ_id" ref="product.Computer_all_in_one"/> |
2194 | <field name="standard_price">50000.0</field> |
2195 | <field name="list_price">750000.0</field> |
2196 | <field name="type">service</field> |
2197 | |
2198 | === modified file 'website_sale/controllers/main.py' |
2199 | --- website_sale/controllers/main.py 2014-05-19 10:12:46 +0000 |
2200 | +++ website_sale/controllers/main.py 2014-05-20 04:55:26 +0000 |
2201 | @@ -121,6 +121,7 @@ |
2202 | domain = request.website.sale_product_domain() |
2203 | if search: |
2204 | domain += ['|', ('name', 'ilike', search), ('description', 'ilike', search)] |
2205 | + |
2206 | if category: |
2207 | domain += [('product_variant_ids.public_categ_id', 'child_of', int(category))] |
2208 | |
2209 | @@ -132,21 +133,23 @@ |
2210 | |
2211 | if not context.get('pricelist'): |
2212 | context['pricelist'] = int(self.get_pricelist()) |
2213 | + |
2214 | + style_obj = pool['product.style'] |
2215 | + style_ids = style_obj.search(cr, uid, [], context=context) |
2216 | + styles = style_obj.browse(cr, uid, style_ids, context=context) |
2217 | + |
2218 | + category_obj = pool['product.public.category'] |
2219 | + category_ids = category_obj.search(cr, uid, [], context=context) |
2220 | + categories = category_obj.browse(cr, uid, category_ids, context=context) |
2221 | + categs = filter(lambda x: not x.parent_id, categories) |
2222 | + |
2223 | + domain += [('public_categ_id', 'in', category_ids)] |
2224 | product_obj = pool.get('product.template') |
2225 | product_count = product_obj.search_count(cr, uid, domain, context=context) |
2226 | pager = request.website.pager(url="/shop", total=product_count, page=page, step=PPG, scope=7, url_args=post) |
2227 | product_ids = product_obj.search(cr, uid, domain, limit=PPG+10, offset=pager['offset'], order='website_published desc, website_sequence desc', context=context) |
2228 | products = product_obj.browse(cr, uid, product_ids, context=context) |
2229 | |
2230 | - style_obj = pool['product.style'] |
2231 | - style_ids = style_obj.search(cr, uid, [], context=context) |
2232 | - styles = style_obj.browse(cr, uid, style_ids, context=context) |
2233 | - |
2234 | - category_obj = pool['product.public.category'] |
2235 | - category_ids = category_obj.search(cr, uid, [], context=context) |
2236 | - categories = category_obj.browse(cr, uid, category_ids, context=context) |
2237 | - categs = filter(lambda x: not x.parent_id, categories) |
2238 | - |
2239 | attributes_obj = request.registry['product.attribute'] |
2240 | attributes_ids = attributes_obj.search(cr, uid, [], context=request.context) |
2241 | attributes = attributes_obj.browse(cr, uid, attributes_ids, context=request.context) |
2242 | |
2243 | === modified file 'website_sale/data/demo.xml' |
2244 | --- website_sale/data/demo.xml 2014-05-13 10:09:24 +0000 |
2245 | +++ website_sale/data/demo.xml 2014-05-20 04:55:26 +0000 |
2246 | @@ -5,6 +5,299 @@ |
2247 | <record id="product.product_product_consultant" model="product.product"> |
2248 | <field name="image" type="base64" file="website/static/description/website_edit.png"/> |
2249 | </record> |
2250 | + |
2251 | + <record id="computers" model="product.public.category"> |
2252 | + <field name="name">Computers</field> |
2253 | + <field name="sequence">2</field> |
2254 | + <field name="image" type="base64" file="website_sale/static/src/img/computer.png"/> |
2255 | + </record> |
2256 | + |
2257 | + <record id="Components" model="product.public.category"> |
2258 | + <field name="name">Components</field> |
2259 | + <field name="sequence">5</field> |
2260 | + </record> |
2261 | + |
2262 | + <record id="case" model="product.public.category"> |
2263 | + <field name="parent_id" ref="Components"/> |
2264 | + <field name="name">Case</field> |
2265 | + </record> |
2266 | + <record id="HDD" model="product.public.category"> |
2267 | + <field name="parent_id" ref="Components"/> |
2268 | + <field name="name">Hard Drive</field> |
2269 | + </record> |
2270 | + <record id="motherboard" model="product.public.category"> |
2271 | + <field name="parent_id" ref="Components"/> |
2272 | + <field name="name">Motherboard</field> |
2273 | + </record> |
2274 | + <record id="graphics_card" model="product.public.category"> |
2275 | + <field name="parent_id" ref="Components"/> |
2276 | + <field name="name">Graphics Card</field> |
2277 | + </record> |
2278 | + <record id="Memory" model="product.public.category"> |
2279 | + <field name="parent_id" ref="Components"/> |
2280 | + <field name="name">Memory</field> |
2281 | + </record> |
2282 | + <record id="processor" model="product.public.category"> |
2283 | + <field name="parent_id" ref="Components"/> |
2284 | + <field name="name">Processor</field> |
2285 | + </record> |
2286 | + <record id="video_acquisition" model="product.public.category"> |
2287 | + <field name="parent_id" ref="Components"/> |
2288 | + <field name="name">Video Acquisition</field> |
2289 | + </record> |
2290 | + |
2291 | + <record id="devices" model="product.public.category"> |
2292 | + <field name="name">Devices</field> |
2293 | + <field name="sequence">3</field> |
2294 | + </record> |
2295 | + |
2296 | + <record id="Screen" model="product.public.category"> |
2297 | + <field name="parent_id" ref="devices"/> |
2298 | + <field name="name">Screen</field> |
2299 | + </record> |
2300 | + <record id="Pen_Drive" model="product.public.category"> |
2301 | + <field name="parent_id" ref="devices"/> |
2302 | + <field name="name">Pen Drive</field> |
2303 | + </record> |
2304 | + <record id="External_Hard_Drive" model="product.public.category"> |
2305 | + <field name="parent_id" ref="devices"/> |
2306 | + <field name="name">External Hard Drive</field> |
2307 | + </record> |
2308 | + <record id="Keyboard_Mouse" model="product.public.category"> |
2309 | + <field name="parent_id" ref="devices"/> |
2310 | + <field name="name">Keyboard / Mouse</field> |
2311 | + </record> |
2312 | + <record id="printer" model="product.public.category"> |
2313 | + <field name="parent_id" ref="devices"/> |
2314 | + <field name="name">Printer</field> |
2315 | + </record> |
2316 | + <record id="Speakers" model="product.public.category"> |
2317 | + <field name="parent_id" ref="devices"/> |
2318 | + <field name="name">Speakers</field> |
2319 | + </record> |
2320 | + <record id="Headset" model="product.public.category"> |
2321 | + <field name="parent_id" ref="devices"/> |
2322 | + <field name="name">Headset</field> |
2323 | + </record> |
2324 | + <record id="Software" model="product.public.category"> |
2325 | + <field name="parent_id" ref="devices"/> |
2326 | + <field name="name">Software</field> |
2327 | + </record> |
2328 | + |
2329 | + <record id="laptops" model="product.public.category"> |
2330 | + <field name="name">Laptops</field> |
2331 | + <field name="sequence">1</field> |
2332 | + </record> |
2333 | + |
2334 | + <record id="Computer_all_in_one" model="product.public.category"> |
2335 | + <field name="parent_id" ref="computers"/> |
2336 | + <field name="name">All-in-one</field> |
2337 | + </record> |
2338 | + <record id="server" model="product.public.category"> |
2339 | + <field name="parent_id" ref="computers"/> |
2340 | + <field name="name">Servers</field> |
2341 | + </record> |
2342 | + |
2343 | + <record id="network" model="product.public.category"> |
2344 | + <field name="name">Network</field> |
2345 | + <field name="sequence">4</field> |
2346 | + </record> |
2347 | + |
2348 | + <record id="Switch" model="product.public.category"> |
2349 | + <field name="parent_id" ref="network"/> |
2350 | + <field name="name">Switch</field> |
2351 | + </record> |
2352 | + <record id="Modem_Router" model="product.public.category"> |
2353 | + <field name="parent_id" ref="network"/> |
2354 | + <field name="name">Modem & Router</field> |
2355 | + </record> |
2356 | + <record id="services" model="product.public.category"> |
2357 | + <field name="name">Services</field> |
2358 | + <field name="sequence">6</field> |
2359 | + </record> |
2360 | + |
2361 | + <!-- |
2362 | + Resource: product.product |
2363 | + --> |
2364 | + |
2365 | + <record id="product.product_template_1" model="product.template"> |
2366 | + <field name="public_categ_id" eval="[(4,ref('services'))]"/> |
2367 | + </record> |
2368 | + |
2369 | + <record id="product.product_template_2" model="product.template"> |
2370 | + <field name="public_categ_id" eval="[(4,ref('services'))]" /> |
2371 | + </record> |
2372 | + |
2373 | + <record id="product.product_template_3" model="product.template"> |
2374 | + <field name="public_categ_id" eval="[(4,ref('Computer_all_in_one'))]"/> |
2375 | + </record> |
2376 | + |
2377 | + <record id="product.product_template_4" model="product.template"> |
2378 | + <field name="public_categ_id" eval="[(4,ref('Computer_all_in_one'))]"/> |
2379 | + </record> |
2380 | + |
2381 | + <record id="product.product_template_5" model="product.template"> |
2382 | + <field name="public_categ_id" eval="[(4,ref('Speakers'))]"/> |
2383 | + </record> |
2384 | + |
2385 | + <record id="product.product_template_6" model="product.template"> |
2386 | + <field name="public_categ_id" eval="[(4,ref('Screen'))]"/> |
2387 | + </record> |
2388 | + |
2389 | + <record id="product.product_template_7" model="product.template"> |
2390 | + <field name="public_categ_id" eval="[(4,ref('Screen'))]"/> |
2391 | + </record> |
2392 | + |
2393 | + <record id="product.product_template_9" model="product.template"> |
2394 | + <field name="public_categ_id" eval="[(4,ref('Keyboard_Mouse'))]"/> |
2395 | + </record> |
2396 | + |
2397 | + <record id="product.product_template_10" model="product.template"> |
2398 | + <field name="public_categ_id" eval="[(4,ref('Keyboard_Mouse'))]"/> |
2399 | + </record> |
2400 | + |
2401 | + <record id="product.product_template_11" model="product.template"> |
2402 | + <field name="public_categ_id" eval="[(4,ref('Keyboard_Mouse'))]"/> |
2403 | + </record> |
2404 | + <record id="product.product_product_11" model="product.product"> |
2405 | + <field name="public_categ_id" eval="[(4,ref('Keyboard_Mouse'))]"/> |
2406 | + </record> |
2407 | + |
2408 | + <record id="product.product_template_12" model="product.template"> |
2409 | + <field name="public_categ_id" eval="[(4,ref('Keyboard_Mouse'))]"/> |
2410 | + </record> |
2411 | + |
2412 | + <record id="product.product_template_13" model="product.template"> |
2413 | + <field name="public_categ_id" eval="[(4,ref('Memory'))]"/> |
2414 | + </record> |
2415 | + |
2416 | + <record id="product.product_template_14" model="product.template"> |
2417 | + <field name="public_categ_id" eval="[(4,ref('Memory'))]"/> |
2418 | + </record> |
2419 | + |
2420 | + <record id="product.product_template_15" model="product.template"> |
2421 | + <field name="public_categ_id" eval="[(4,ref('Memory'))]"/> |
2422 | + </record> |
2423 | + |
2424 | + <record id="product.product_template_16" model="product.template"> |
2425 | + <field name="public_categ_id" eval="[(4,ref('case'))]"/> |
2426 | + </record> |
2427 | + |
2428 | + <record id="product.product_template_17" model="product.template"> |
2429 | + <field name="public_categ_id" eval="[(4,ref('HDD'))]"/> |
2430 | + </record> |
2431 | + |
2432 | + <record id="product.product_template_18" model="product.template"> |
2433 | + <field name="public_categ_id" eval="[(4,ref('HDD'))]"/> |
2434 | + </record> |
2435 | + |
2436 | + <record id="product.product_template_19" model="product.template"> |
2437 | + <field name="public_categ_id" eval="[(4,ref('HDD'))]"/> |
2438 | + </record> |
2439 | + |
2440 | + <record id="product.product_template_20" model="product.template"> |
2441 | + <field name="public_categ_id" eval="[(4,ref('motherboard'))]"/> |
2442 | + </record> |
2443 | + |
2444 | + <record id="product.product_template_21" model="product.template"> |
2445 | + <field name="public_categ_id" eval="[(4,ref('motherboard'))]"/> |
2446 | + </record> |
2447 | + |
2448 | + <record id="product.product_template_22" model="product.template"> |
2449 | + <field name="public_categ_id" eval="[(4,ref('processor'))]"/> |
2450 | + </record> |
2451 | + |
2452 | + <record id="product.product_template_23" model="product.template"> |
2453 | + <field name="public_categ_id" eval="[(4,ref('processor'))]"/> |
2454 | + </record> |
2455 | + |
2456 | + <record id="product.product_template_24" model="product.template"> |
2457 | + <field name="public_categ_id" eval="[(4,ref('graphics_card'))]"/> |
2458 | + </record> |
2459 | + |
2460 | + <record id="product.product_template_25" model="product.template"> |
2461 | + <field name="public_categ_id" eval="[(4,ref('laptops'))]"/> |
2462 | + </record> |
2463 | + |
2464 | + <record id="product.product_template_26" model="product.template"> |
2465 | + <field name="public_categ_id" eval="[(4,ref('laptops'))]"/> |
2466 | + </record> |
2467 | + |
2468 | + <record id="product.product_template_27" model="product.template"> |
2469 | + <field name="public_categ_id" eval="[(4,ref('laptops'))]"/> |
2470 | + </record> |
2471 | + |
2472 | + <record id="product.product_template_28" model="product.template"> |
2473 | + <field name="public_categ_id" eval="[(4,ref('External_Hard_Drive'))]"/> |
2474 | + </record> |
2475 | + |
2476 | + <record id="product.product_template_29" model="product.template"> |
2477 | + <field name="public_categ_id" eval="[(4,ref('Pen_Drive'))]"/> |
2478 | + </record> |
2479 | + |
2480 | + <record id="product.product_template_30" model="product.template"> |
2481 | + <field name="public_categ_id" eval="[(4,ref('Pen_Drive'))]"/> |
2482 | + </record> |
2483 | + |
2484 | + <record id="product.product_template_31" model="product.template"> |
2485 | + <field name="public_categ_id" eval="[(4,ref('Speakers'))]"/> |
2486 | + </record> |
2487 | + |
2488 | + <record id="product.product_template_32" model="product.template"> |
2489 | + <field name="public_categ_id" eval="[(4,ref('Headset'))]"/> |
2490 | + </record> |
2491 | + |
2492 | + <record id="product.product_template_33" model="product.template"> |
2493 | + <field name="public_categ_id" eval="[(4,ref('Headset'))]"/> |
2494 | + </record> |
2495 | + |
2496 | + <record id="product.product_template_34" model="product.template"> |
2497 | + <field name="public_categ_id" eval="[(4,ref('video_acquisition'))]"/> |
2498 | + </record> |
2499 | + |
2500 | + <record id="product.product_template_37" model="product.template"> |
2501 | + <field name="public_categ_id" eval="[(4,ref('printer'))]"/> |
2502 | + </record> |
2503 | + |
2504 | + <record id="product.product_template_38" model="product.template"> |
2505 | + <field name="public_categ_id" eval="[(4,ref('printer'))]"/> |
2506 | + </record> |
2507 | + |
2508 | + <record id="product.product_template_39" model="product.template"> |
2509 | + <field name="public_categ_id" eval="[(4,ref('printer'))]"/> |
2510 | + </record> |
2511 | + |
2512 | + <record id="product.product_template_40" model="product.template"> |
2513 | + <field name="public_categ_id" eval="[(4,ref('Software'))]"/> |
2514 | + </record> |
2515 | + |
2516 | + <record id="product.product_template_41" model="product.template"> |
2517 | + <field name="public_categ_id" eval="[(4,ref('Software'))]"/> |
2518 | + </record> |
2519 | + |
2520 | + <record id="product.product_template_42" model="product.template"> |
2521 | + <field name="public_categ_id" eval="[(4,ref('Software'))]"/> |
2522 | + </record> |
2523 | + |
2524 | + <record id="product.product_template_43" model="product.template"> |
2525 | + <field name="public_categ_id" eval="[(4,ref('Software'))]"/> |
2526 | + </record> |
2527 | + |
2528 | + <record id="product.product_template_44" model="product.template"> |
2529 | + <field name="public_categ_id" eval="[(4,ref('Software'))]"/> |
2530 | + </record> |
2531 | + |
2532 | + <record id="product.product_template_45" model="product.template"> |
2533 | + <field name="public_categ_id" eval="[(4,ref('Modem_Router'))]"/> |
2534 | + </record> |
2535 | + |
2536 | + <record id="product.product_template_46" model="product.template"> |
2537 | + <field name="public_categ_id" eval="[(4,ref('Pen_Drive'))]"/> |
2538 | + </record> |
2539 | + |
2540 | + <record id="product.product_template_47" model="product.template"> |
2541 | + <field name="public_categ_id" eval="[(4,ref('Switch'))]"/> |
2542 | + </record> |
2543 | |
2544 | <record id="product.product_product_4" model="product.product"> |
2545 | <field name="website_published" eval="True"/> |
2546 | |
2547 | === modified file 'website_sale/models/product.py' |
2548 | --- website_sale/models/product.py 2014-04-25 13:20:49 +0000 |
2549 | +++ website_sale/models/product.py 2014-05-20 04:55:26 +0000 |
2550 | @@ -20,6 +20,7 @@ |
2551 | ############################################################################## |
2552 | |
2553 | from openerp.osv import osv, fields |
2554 | +from openerp import tools |
2555 | |
2556 | class product_attribue(osv.Model): |
2557 | # TODO merge product.attribute, mrp.properties product_manufacturer_attributes |
2558 | @@ -61,6 +62,67 @@ |
2559 | 'code': fields.char('Promotional Code'), |
2560 | } |
2561 | |
2562 | +class product_public_category(osv.Model): |
2563 | + _name = "product.public.category" |
2564 | + _description = "Website Category" |
2565 | + |
2566 | + def name_get(self, cr, uid, ids, context=None): |
2567 | + if not len(ids): |
2568 | + return [] |
2569 | + reads = self.read(cr, uid, ids, ['name','parent_id'], context=context) |
2570 | + res = [] |
2571 | + for record in reads: |
2572 | + name = record['name'] |
2573 | + if record['parent_id']: |
2574 | + name = record['parent_id'][1]+' / '+name |
2575 | + res.append((record['id'], name)) |
2576 | + return res |
2577 | + |
2578 | + def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None): |
2579 | + res = self.name_get(cr, uid, ids, context=context) |
2580 | + return dict(res) |
2581 | + |
2582 | + def _get_image(self, cr, uid, ids, name, args, context=None): |
2583 | + result = dict.fromkeys(ids, False) |
2584 | + for obj in self.browse(cr, uid, ids, context=context): |
2585 | + result[obj.id] = tools.image_get_resized_images(obj.image) |
2586 | + return result |
2587 | + |
2588 | + def _set_image(self, cr, uid, id, name, value, args, context=None): |
2589 | + return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context) |
2590 | + |
2591 | + _columns = { |
2592 | + 'name': fields.char('Name', required=True, translate=True), |
2593 | + 'complete_name': fields.function(_name_get_fnc, type="char", string='Name'), |
2594 | + 'parent_id': fields.many2one('product.public.category','Parent Category', select=True), |
2595 | + 'child_id': fields.one2many('product.public.category', 'parent_id', string='Children Categories'), |
2596 | + 'template_id': fields.many2many('product.template', 'website_categ_rel', 'public_categ_id', 'template_id', 'Template Name'), |
2597 | + 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of product categories."), |
2598 | + |
2599 | + # NOTE: there is no 'default image', because by default we don't show thumbnails for categories. However if we have a thumbnail |
2600 | + # for at least one category, then we display a default image on the other, so that the buttons have consistent styling. |
2601 | + # In this case, the default image is set by the js code. |
2602 | + # NOTE2: image: all image fields are base64 encoded and PIL-supported |
2603 | + 'image': fields.binary("Image", |
2604 | + help="This field holds the image used as image for the cateogry, limited to 1024x1024px."), |
2605 | + 'image_medium': fields.function(_get_image, fnct_inv=_set_image, |
2606 | + string="Medium-sized image", type="binary", multi="_get_image", |
2607 | + store={ |
2608 | + 'product.public.category': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10), |
2609 | + }, |
2610 | + help="Medium-sized image of the category. It is automatically "\ |
2611 | + "resized as a 128x128px image, with aspect ratio preserved. "\ |
2612 | + "Use this field in form views or some kanban views."), |
2613 | + 'image_small': fields.function(_get_image, fnct_inv=_set_image, |
2614 | + string="Smal-sized image", type="binary", multi="_get_image", |
2615 | + store={ |
2616 | + 'product.public.category': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10), |
2617 | + }, |
2618 | + help="Small-sized image of the category. It is automatically "\ |
2619 | + "resized as a 64x64px image, with aspect ratio preserved. "\ |
2620 | + "Use this field anywhere a small image is required."), |
2621 | + } |
2622 | + |
2623 | class product_template(osv.Model): |
2624 | _inherit = ["product.template", "website.seo.metadata"] |
2625 | _order = 'website_published desc, website_sequence desc, name' |
2626 | @@ -73,6 +135,7 @@ |
2627 | return res |
2628 | |
2629 | _columns = { |
2630 | + 'public_categ_id': fields.many2many('product.public.category', 'website_categ_rel', 'template_id', 'public_categ_id', string="Website Category"), |
2631 | 'attribute_lines': fields.one2many('product.attribute.line', 'product_tmpl_id', 'Product attributes'), |
2632 | # TODO FIXME tde: when website_mail/mail_thread.py inheritance work -> this field won't be necessary |
2633 | 'website_message_ids': fields.one2many( |
2634 | |
2635 | === modified file 'website_sale/security/ir.model.access.csv' |
2636 | --- website_sale/security/ir.model.access.csv 2014-01-31 07:58:21 +0000 |
2637 | +++ website_sale/security/ir.model.access.csv 2014-05-20 04:55:26 +0000 |
2638 | @@ -2,7 +2,7 @@ |
2639 | access_product_product_public,product.product.public,product.model_product_product,,1,0,0,0 |
2640 | access_product_template_public,product.template.public,product.model_product_template,,1,0,0,0 |
2641 | access_product_category_public,product.category.public,product.model_product_category,,1,0,0,0 |
2642 | -access_product_public_category_public,product.category.public,product.model_product_public_category,,1,0,0,0 |
2643 | +access_product_public_category_public,product.category.public,website_sale.model_product_public_category,,1,0,0,0 |
2644 | access_product_pricelist_version_public,product.pricelist.version.public,product.model_product_pricelist_version,,1,0,0,0 |
2645 | access_product_pricelist_public,product.pricelist.public,product.model_product_pricelist,,1,0,0,0 |
2646 | access_product_pricelist_item_public,product.pricelist.item.public,product.model_product_pricelist_item,,1,0,0,0 |
2647 | @@ -12,3 +12,5 @@ |
2648 | access_product_attribute_line,product.attribute.line.public,website_sale.model_product_attribute_line,,1,0,0,0 |
2649 | access_product_style,product.style.public,website_sale.model_product_style,,1,0,0,0 |
2650 | access_product_supplierinfo,product.supplierinfo.public,product.model_product_supplierinfo,,1,0,0,0 |
2651 | +access_product_category_pos_manager,product.public.category manager,model_product_public_category,base.group_sale_manager,1,1,1,1 |
2652 | +access_product_category_pos_user,product.public.category user,model_product_public_category,base.group_user,1,0,0,0 |
2653 | |
2654 | === added file 'website_sale/static/src/img/computer.png' |
2655 | Binary files website_sale/static/src/img/computer.png 1970-01-01 00:00:00 +0000 and website_sale/static/src/img/computer.png 2014-05-20 04:55:26 +0000 differ |
2656 | === modified file 'website_sale/views/views.xml' |
2657 | --- website_sale/views/views.xml 2014-05-12 15:52:10 +0000 |
2658 | +++ website_sale/views/views.xml 2014-05-20 04:55:26 +0000 |
2659 | @@ -21,6 +21,10 @@ |
2660 | <field name="model">product.product</field> |
2661 | <field name="inherit_id" ref="product.product_normal_form_view"/> |
2662 | <field name="arch" type="xml"> |
2663 | + <xpath expr="//field[@name='categ_id']" position="after"> |
2664 | + <h4><label for="public_categ_id" class="oe_edit_only"/></h4> |
2665 | + <field name="public_categ_id" widget="many2many_tags"/> |
2666 | + </xpath> |
2667 | <!-- add state field in header --> |
2668 | <xpath expr="//sheet/div" position="before"> |
2669 | <field name="website_url" invisible="1"/> |
2670 | @@ -62,6 +66,7 @@ |
2671 | </xpath> |
2672 | <xpath expr="//field[@name='description']" position="before"> |
2673 | <group colspan="4" string="Website Options"> |
2674 | + <field name="public_categ_id" widget="many2many_tags"/> |
2675 | <field name="alternative_product_ids" widget="many2many_tags"/> |
2676 | <field name="accessory_product_ids" widget="many2many_tags"/> |
2677 | <field name="website_style_ids" widget="many2many_tags"/> |
2678 | @@ -90,6 +95,59 @@ |
2679 | </form> |
2680 | </field> |
2681 | </record> |
2682 | + |
2683 | + <!-- Product Public Categories --> |
2684 | + <record id="product_public_category_form_view" model="ir.ui.view"> |
2685 | + <field name="name">product.public.category.form</field> |
2686 | + <field name="model">product.public.category</field> |
2687 | + <field name="arch" type="xml"> |
2688 | + <form string="Public Categories" version="7.0"> |
2689 | + <sheet> |
2690 | + <field name="image_medium" widget='image' class="oe_avatar oe_right"/> |
2691 | + <div class="oe_left"> |
2692 | + <group> |
2693 | + <field name="name"/> |
2694 | + <field name="parent_id"/> |
2695 | + <field name="sequence"/> |
2696 | + </group> |
2697 | + </div> |
2698 | + </sheet> |
2699 | + </form> |
2700 | + </field> |
2701 | + </record> |
2702 | + <record id="product_public_category_tree_view" model="ir.ui.view"> |
2703 | + <field name="name">product.public.category.tree</field> |
2704 | + <field name="model">product.public.category</field> |
2705 | + <field name="field_parent" eval="False"/> |
2706 | + <field name="arch" type="xml"> |
2707 | + <tree string="Product Product Categories"> |
2708 | + <field name="sequence" invisible="1"/> |
2709 | + <field name="complete_name"/> |
2710 | + </tree> |
2711 | + </field> |
2712 | + </record> |
2713 | + <record id="product_public_category_action" model="ir.actions.act_window"> |
2714 | + <field name="name">Public Categories</field> |
2715 | + <field name="type">ir.actions.act_window</field> |
2716 | + <field name="res_model">product.public.category</field> |
2717 | + <field name="view_type">form</field> |
2718 | + <field name="view_mode">tree,form</field> |
2719 | + <field name="view_id" eval="False"/> |
2720 | + <field name="help" type="html"> |
2721 | + <p class="oe_view_nocontent_create"> |
2722 | + Click to define a new category. |
2723 | + </p><p> |
2724 | + Categories are used to browse your products through the |
2725 | + touchscreen interface. |
2726 | + </p><p> |
2727 | + If you put a photo on the category, the layout of the |
2728 | + touchscreen interface will automatically. We suggest not to put |
2729 | + a photo on categories for small (1024x768) screens. |
2730 | + </p> |
2731 | + </field> |
2732 | + </record> |
2733 | + |
2734 | + <menuitem action="product_public_category_action" id="menu_product_public_category" parent="product.prod_config_main" groups="base.group_no_one" sequence="3" /> |
2735 | |
2736 | </data> |
2737 | </openerp> |