From 0c375a3d6f0bd5e8622b52e2f27fafb79afead30 Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Mon, 3 Dec 2012 17:49:00 +0530
Subject: [PATCH] [IMP] improve data(Immediate Payment,15days) and remove data
 from data(30 Days end of Month,30% Advance, End 30 Days) and keep in demo

bzr revid: shp@tinyerp.com-20121203121900-fb52ryi5d2acolj8
---
 addons/account/data/account_data.xml | 42 ++++++++--------------------
 addons/account/demo/account_demo.xml | 31 ++++++++++++++++++++
 2 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/addons/account/data/account_data.xml b/addons/account/data/account_data.xml
index 97bea14c1f2..c9b528e75f8 100644
--- a/addons/account/data/account_data.xml
+++ b/addons/account/data/account_data.xml
@@ -10,17 +10,19 @@
         <!--
         Payment term
         -->
-        <record id="account_payment_term" model="account.payment.term">
-            <field name="name">30 Days End of Month</field>
-            <field name="note">30 Days End of Month</field>
+        <record id="account_payment_term_Immediate" model="account.payment.term">
+            <field name="name">Immediate Payment</field>
+            <field name="note">Immediate Payment</field>
         </record>
-        <record id="account_payment_term_line" model="account.payment.term.line">
-            <field name="name">30 Days End of Month</field>
+
+        <record id="account_payment_term_line_immediate" model="account.payment.term.line">
+            <field name="name">Immediate Payment</field>
             <field name="value">balance</field>
-            <field eval="30" name="days"/>
-            <field eval="-1" name="days2"/>
-            <field eval="account_payment_term" name="payment_id"/>
+            <field eval="15" name="days"/>
+            <field eval="0" name="days2"/>
+            <field eval="account_payment_term_Immediate" name="payment_id"/>
         </record>
+
         <record forcecreate="True" id="decimal_payment" model="decimal.precision">
             <field name="name">Payment Term</field>
             <field name="digits">6</field>
@@ -30,6 +32,7 @@
             <field name="name">30 Net Days</field>
             <field name="note">30 Net Days</field>
         </record>
+
         <record id="account_payment_term_line_net" model="account.payment.term.line">
             <field name="name">30 Net Days</field>
             <field name="value">balance</field>
@@ -37,28 +40,7 @@
             <field eval="0" name="days2"/>
             <field eval="account_payment_term_net" name="payment_id"/>
         </record>
-
-        <record id="account_payment_term_advance" model="account.payment.term">
-            <field name="name">30% Advance End 30 Days</field>
-            <field name="note">30% Advance End 30 Days</field>
-        </record>
-        <record id="account_payment_term_line_advance1" model="account.payment.term.line">
-            <field name="name">30% Advance</field>
-            <field name="value">procent</field>
-            <field eval="3" name="sequence"/>
-            <field eval="0.300000" name="value_amount"/>
-            <field eval="0" name="days"/>
-            <field eval="0" name="days2"/>
-            <field eval="account_payment_term_advance" name="payment_id"/>
-        </record>
-        <record id="account_payment_term_line_advance2" model="account.payment.term.line">
-            <field name="name">Remaining Balance</field>
-            <field name="value">balance</field>
-            <field eval="30" name="days"/>
-            <field eval="-1" name="days2"/>
-            <field eval="account_payment_term_advance" name="payment_id"/>
-        </record>
-
+        
         <!--
         Account Journal Sequences
         -->
diff --git a/addons/account/demo/account_demo.xml b/addons/account/demo/account_demo.xml
index 0dff40ca19f..e2fe480c0bc 100644
--- a/addons/account/demo/account_demo.xml
+++ b/addons/account/demo/account_demo.xml
@@ -127,6 +127,37 @@
             <field eval="time.strftime('%Y')+'-12-31'" name="date_stop"/>
             <field name="company_id" ref="base.main_company"/>
         </record>
+        <record id="account_payment_term" model="account.payment.term">
+            <field name="name">30 Days End of Month</field>
+            <field name="note">30 Days End of Month</field>
+        </record>
+        <record id="account_payment_term_line" model="account.payment.term.line">
+            <field name="name">30 Days End of Month</field>
+            <field name="value">balance</field>
+            <field eval="30" name="days"/>
+            <field eval="-1" name="days2"/>
+            <field eval="account_payment_term" name="payment_id"/>
+        </record>
+            <record id="account_payment_term_advance" model="account.payment.term">
+            <field name="name">30% Advance End 30 Days</field>
+            <field name="note">30% Advance End 30 Days</field>
+        </record>
+        <record id="account_payment_term_line_advance1" model="account.payment.term.line">
+            <field name="name">30% Advance</field>
+            <field name="value">procent</field>
+            <field eval="3" name="sequence"/>
+            <field eval="0.300000" name="value_amount"/>
+            <field eval="0" name="days"/>
+            <field eval="0" name="days2"/>
+            <field eval="account_payment_term_advance" name="payment_id"/>
+        </record>
+        <record id="account_payment_term_line_advance2" model="account.payment.term.line">
+            <field name="name">Remaining Balance</field>
+            <field name="value">balance</field>
+            <field eval="30" name="days"/>
+            <field eval="-1" name="days2"/>
+            <field eval="account_payment_term_advance" name="payment_id"/>
+        </record>
 
         <record id="base.user_demo" model="res.users">
             <field name="groups_id" eval="[(4,ref('account.group_account_user'))]"/>