From: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Date: Fri, 16 Nov 2012 09:24:16 +0000 (+0100)
Subject: Merge branch 'master' into v7
X-Git-Url: http://git.cyclocoop.org/?p=burette%2Fbikecoop.git;a=commitdiff_plain;h=57c488c7cff3094bb39398610bca8f22a0b0de87;hp=d0eae9cc0ea0698980705e31737d81b00a2e7b0e

Merge branch 'master' into v7
---

diff --git a/demo/membership.xml b/demo/membership.xml
deleted file mode 100644
index 4128df3..0000000
--- a/demo/membership.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-        <record id="product_standard_member" model="product.product">
-            <field name="name">Standard member</field>
-            <field name="list_price">25.00</field>
-            <field name="standard_price">0.00</field>
-            <field name="uom_id" ref="product.product_uom_unit"/>
-            <field name="uom_po_id" ref="product.product_uom_unit"/>
-            <field name="type">service</field>
-            <field name="categ_id" ref="product_category_other"/>
-            <field name="supply_method">produce</field>
-            <field name="membership">True</field>
-            <field name="membership_date_from" eval="time.strftime('%Y-01-01')"/>
-            <field name="membership_date_to" eval="time.strftime('%Y-12-31')"/>
-            <field name="property_account_income" ref="l10n_fr.pcg_758"/>
-        </record>
-        <record id="product_reduce_member" model="product.product">
-            <field name="name">Reduce member</field>
-            <field name="list_price">15.00</field>
-            <field name="standard_price">0.00</field>
-            <field name="uom_id" ref="product.product_uom_unit"/>
-            <field name="uom_po_id" ref="product.product_uom_unit"/>
-            <field name="type">service</field>
-            <field name="categ_id" ref="product_category_other"/>
-            <field name="supply_method">produce</field>
-            <field name="membership">True</field>
-            <field name="membership_date_from" eval="time.strftime('%Y-01-01')"/>
-            <field name="membership_date_to" eval="time.strftime('%Y-12-31')"/>
-        </record>
-        <record id="product_group_membership" model="product.product">
-            <field name="name">Group membership</field>
-            <field name="list_price">45.00</field>
-            <field name="standard_price">0.00</field>
-            <field name="uom_id" ref="product.product_uom_unit"/>
-            <field name="uom_po_id" ref="product.product_uom_unit"/>
-            <field name="type">service</field>
-            <field name="categ_id" ref="product_category_other"/>
-            <field name="supply_method">produce</field>
-            <field name="membership">True</field>
-            <field name="membership_date_from" eval="time.strftime('%Y-01-01')"/>
-            <field name="membership_date_to" eval="time.strftime('%Y-12-31')"/>
-        </record>
-    </data>
-
-    <data noupdate="1">
-    <!-- Join Memberships  -->
-        <function model="res.partner" name="create_membership_invoice" eval="(ref('res_partner_francois'), ref('product_standard_member'), {'amount':25})"/>
-        <function model="res.partner" name="create_membership_invoice" eval="(ref('res_partner_matt'), ref('product_group_membership'), {'amount':45})"/>
-    </data>
-</openerp>