summaryrefslogtreecommitdiff
path: root/addons/membership
diff options
context:
space:
mode:
authorYannick Tivisse <yti@odoo.com>2016-01-07 15:22:26 +0100
committerYannick Tivisse <yti@odoo.com>2016-01-07 16:07:28 +0100
commite03943a8dfd9530f0907da90dcca2f395708fd10 (patch)
tree792cb7834ed0a9debd9ef6dfd59baf5426c239d2 /addons/membership
parentddff7543034ca7dd48e8cee7a71b7e6ef1077137 (diff)
[IMP] Remove and clean product demo data
Remaining products : - product_product_0 becomes service_order_01 - product_product_1b becomes service_cost_01 - product_product_43 becomes product_order_01 - product_product_47 becomes product_delivery_01 - prodcut_product becomes product_delivery_02 - Replace product_product_56 by service_delivery - Replace product_product_59 by consu_delivery_01 - Replace product_product_58 by consu_delivery_02 - Replace product_product_57 by consu_delivery_03 Removed products : - product_product_53, product_product_57, product_product_55, product_product_54, product_product_52, product_product_51, product_product_50, product_product_48, product_product_46, product_product_32, product_product_33, product_product_28, product_product_38, product_product_39, product_product_40, product_product_41, product_product_34, product_product_29, product_product_30, product_product_44, product_product_31, product_product_35, product_product_36, product_product_37, product_product_42, product_product_45, product_product_49, product_product_26, product_product_14, product_product_15, product_product_18, product_product_19, product_product_21, product_product_23 Removed corresponding binaries. Removed all Bill of Materials demo data, that were ridiculous and replace them by 2 bom: A complete computer, and a kit computer. Rewritten the tests accordingly. Fixed tests : - sale_mrp/test/cancellation_propagated.yml : The yaml ref function return a id, not a dictionnary - sale_stock/tests/test_sale_stock.py : The service product invoiced on the delivered quantity was in fact not invoiced on delivery on the test. As we are in sale_stock, Without timesheet, we manually set the delivered qty for the product serv_del. If we don't do this, the invoice will never be fully invoiced. - The pricelist rules choice is not based on the sequence anymore (Seems to be a bug, reported to online). By the way, I changed the product to avoid the overlap. - sale_mrp/test/sale_mrp.yml: The yaml ref function return a id, not a dictionnary - mrp : Rewritten the tests to be coherent with the new bom data
Diffstat (limited to 'addons/membership')
-rw-r--r--addons/membership/membership_demo.xml26
-rw-r--r--addons/membership/static/img/membership_0-image.jpgbin3796 -> 0 bytes
-rw-r--r--addons/membership/static/img/membership_1-image.jpgbin3158 -> 0 bytes
-rw-r--r--addons/membership/static/img/membership_2-image.jpgbin3691 -> 0 bytes
4 files changed, 7 insertions, 19 deletions
diff --git a/addons/membership/membership_demo.xml b/addons/membership/membership_demo.xml
index ff05a2d3a99..18ebfa7ba84 100644
--- a/addons/membership/membership_demo.xml
+++ b/addons/membership/membership_demo.xml
@@ -2,36 +2,24 @@
<openerp>
<data>
-<!-- Demo Data for Memberships -->
- <record id="membership_0" model="product.product">
+ <!-- Demo Data for Memberships -->
+ <record id="product.membership_0" model="product.product">
<field name="membership">True</field>
<field eval="time.strftime('%Y-01-01')" name="membership_date_from"/>
<field eval="time.strftime('%Y-12-31')" name="membership_date_to"/>
- <field name="name">Gold Membership</field>
- <field name="list_price">180</field>
- <field name="categ_id" ref="product.product_category_1"/>
- <field name="type">service</field>
- <field name="image" type="base64" file="membership/static/img/membership_0-image.jpg"/>
+ <field name="active" eval="True"/>
</record>
- <record id="membership_1" model="product.product">
+ <record id="product.membership_1" model="product.product">
<field name="membership">True</field>
<field eval="time.strftime('%Y-01-01')" name="membership_date_from"/>
<field eval="time.strftime('%Y-12-31')" name="membership_date_to"/>
- <field name="name">Silver Membership</field>
- <field name="categ_id" ref="product.product_category_1"/>
- <field name="list_price">80</field>
- <field name="type">service</field>
- <field name="image" type="base64" file="membership/static/img/membership_1-image.jpg"/>
+ <field name="active" eval="True"/>
</record>
- <record id="membership_2" model="product.product">
+ <record id="product.membership_2" model="product.product">
<field name="membership">True</field>
<field eval="time.strftime('%Y-01-01')" name="membership_date_from"/>
<field eval="time.strftime('%Y-12-31')" name="membership_date_to"/>
- <field name="name">Basic Membership</field>
- <field name="categ_id" ref="product.product_category_1"/>
- <field name="list_price">40</field>
- <field name="type">service</field>
- <field name="image" type="base64" file="membership/static/img/membership_2-image.jpg"/>
+ <field name="active" eval="True"/>
</record>
</data>
diff --git a/addons/membership/static/img/membership_0-image.jpg b/addons/membership/static/img/membership_0-image.jpg
deleted file mode 100644
index f9723384f8b..00000000000
--- a/addons/membership/static/img/membership_0-image.jpg
+++ /dev/null
Binary files differ
diff --git a/addons/membership/static/img/membership_1-image.jpg b/addons/membership/static/img/membership_1-image.jpg
deleted file mode 100644
index ade87446afb..00000000000
--- a/addons/membership/static/img/membership_1-image.jpg
+++ /dev/null
Binary files differ
diff --git a/addons/membership/static/img/membership_2-image.jpg b/addons/membership/static/img/membership_2-image.jpg
deleted file mode 100644
index ed6f4118417..00000000000
--- a/addons/membership/static/img/membership_2-image.jpg
+++ /dev/null
Binary files differ