From 8197f130f3f49c90bc6847e4ed339c16466cd961 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Wed, 1 Sep 2010 10:41:44 +0530
Subject: [PATCH] [IMP] account_payment: put attrs on schedule if fixed
 (readonly if not fixed) + rename that field (schedule date)

bzr revid: mra@mra-laptop-20100901051144-jarlb1vncdi5j2u1
---
 addons/account_payment/account_payment.py              | 10 +++++-----
 addons/account_payment/account_payment_view.xml        |  4 ++--
 addons/account_payment/i18n/account_payment.pot        |  4 ++--
 addons/account_payment/i18n/ar.po                      |  4 ++--
 addons/account_payment/i18n/bg.po                      |  4 ++--
 addons/account_payment/i18n/bs.po                      |  4 ++--
 addons/account_payment/i18n/ca.po                      |  4 ++--
 addons/account_payment/i18n/cs.po                      |  4 ++--
 addons/account_payment/i18n/de.po                      |  4 ++--
 addons/account_payment/i18n/el.po                      |  4 ++--
 addons/account_payment/i18n/es.po                      |  4 ++--
 addons/account_payment/i18n/es_AR.po                   |  4 ++--
 addons/account_payment/i18n/et.po                      |  4 ++--
 addons/account_payment/i18n/fi.po                      |  4 ++--
 addons/account_payment/i18n/fr.po                      |  4 ++--
 addons/account_payment/i18n/hi.po                      |  4 ++--
 addons/account_payment/i18n/hr.po                      |  4 ++--
 addons/account_payment/i18n/hu.po                      |  4 ++--
 addons/account_payment/i18n/id.po                      |  4 ++--
 addons/account_payment/i18n/it.po                      |  4 ++--
 addons/account_payment/i18n/ko.po                      |  4 ++--
 addons/account_payment/i18n/lt.po                      |  4 ++--
 addons/account_payment/i18n/mn.po                      |  4 ++--
 addons/account_payment/i18n/nl.po                      |  4 ++--
 addons/account_payment/i18n/nl_BE.po                   |  4 ++--
 addons/account_payment/i18n/oc.po                      |  4 ++--
 addons/account_payment/i18n/pl.po                      |  4 ++--
 addons/account_payment/i18n/pt.po                      |  4 ++--
 addons/account_payment/i18n/pt_BR.po                   |  4 ++--
 addons/account_payment/i18n/ro.po                      |  4 ++--
 addons/account_payment/i18n/ru.po                      |  4 ++--
 addons/account_payment/i18n/sl.po                      |  4 ++--
 addons/account_payment/i18n/sq.po                      |  4 ++--
 addons/account_payment/i18n/sv.po                      |  4 ++--
 addons/account_payment/i18n/tlh.po                     |  4 ++--
 addons/account_payment/i18n/tr.po                      |  4 ++--
 addons/account_payment/i18n/uk.po                      |  4 ++--
 addons/account_payment/i18n/vi.po                      |  4 ++--
 addons/account_payment/i18n/zh_CN.po                   |  4 ++--
 addons/account_payment/i18n/zh_TW.po                   |  4 ++--
 addons/account_payment/wizard/account_payment_order.py |  2 +-
 addons/l10n_ch/wizard/create_dta.py                    |  4 ++--
 42 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index a27a2d2e72d..149ec5eaad8 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -90,7 +90,7 @@ class payment_order(osv.osv):
         return res
 
     _columns = {
-        'date_planned': fields.date('Scheduled date if fixed', states={'done':[('readonly',True)]}, help='Select a date if you have chosen Preferred Date to be fixed.'),
+        'date_scheduled': fields.date('Scheduled date if fixed', states={'done':[('readonly',True)]}, help='Select a date if you have chosen Preferred Date to be fixed.'),
         'reference': fields.char('Reference', size=128, required=1, states={'done':[('readonly',True)]}),
         'mode': fields.many2one('payment.mode','Payment mode', select=True, required=1, states={'done':[('readonly',True)]}, help='Select the Payment Mode to be applied.'),
         'state': fields.selection([
@@ -107,7 +107,7 @@ class payment_order(osv.osv):
             ('now', 'Directly'),
             ('due', 'Due date'),
             ('fixed', 'Fixed date')
-            ], "Preferred date", change_default=True, required=True, states={'done':[('readonly',True)]}, help="Choose an option for the Payment Order:'Fixed' stands for a date specified by you.'Directly' stands for the direct execution.'Due date' stands for the scheduled date of execution."),
+            ], "Preferred date", change_default=True, required=True, states={'done':[('readonly', True)]}, help="Choose an option for the Payment Order:'Fixed' stands for a date specified by you.'Directly' stands for the direct execution.'Due date' stands for the scheduled date of execution."),
         'date_created': fields.date('Creation date', readonly=True),
         'date_done': fields.date('Execution date', readonly=True),
     }
@@ -252,7 +252,7 @@ class payment_line(osv.osv):
         res = {}
         for line in self.browse(cursor, user, ids, context=context):
             if line.order_id.date_prefered == 'fixed':
-                res[line.id] = line.order_id.date_planned
+                res[line.id] = line.order_id.date_scheduled
             elif line.order_id.date_prefered == 'due':
                 res[line.id] = line.due_date or time.strftime('%Y-%m-%d')
             else:
@@ -330,7 +330,7 @@ class payment_line(osv.osv):
         ('name_uniq', 'UNIQUE(name)', 'The payment line name must be unique!'),
     ]
 
-    def onchange_move_line(self, cr, uid, ids, move_line_id, payment_type, date_prefered, date_planned, currency=False, company_currency=False, context=None):
+    def onchange_move_line(self, cr, uid, ids, move_line_id, payment_type, date_prefered, date_scheduled, currency=False, company_currency=False, context=None):
         data={}
 
         data['amount_currency']=data['communication']=data['partner_id']=data['reference']=data['date_created']=data['bank_id']=data['amount']=False
@@ -365,7 +365,7 @@ class payment_line(osv.osv):
             elif date_prefered == 'due':
                 data['date'] = line.date_maturity
             elif date_prefered == 'fixed':
-                data['date'] = date_planned
+                data['date'] = date_scheduled
 
         return {'value': data}
 
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 9f0daff6b8c..79bca265531 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -109,14 +109,14 @@
                     <field name="reference"/>
                     <field name="mode"/>
                     <field name="date_prefered"/>
-                    <field name="date_planned" select="1"/>
+                    <field name="date_scheduled" select="1" attrs="{'readonly':[('date_prefered','!=','fixed')]}" />
                     <field name="user_id"/>
                     <button colspan="2" name="%(action_create_payment_order)d" string="Select Invoices to Pay" type="action" attrs="{'invisible':[('state','=','done')]}" icon="gtk-find"/>
                     <field name="line_ids" colspan="4" widget="one2many_list" nolabel="1">
                         <form string="Payment Line">
                             <notebook>
                                 <page string="Payment">
-                                    <field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode,parent.date_prefered,parent.date_planned,currency,company_currency)" select="1" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_to_pay','>',0)] "/>
+                                    <field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode,parent.date_prefered,parent.date_scheduled,currency,company_currency)" select="1" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_to_pay','>',0)] "/>
                                     <separator colspan="4" string="Transaction Information"/>
                                     <field name="date"/>
                                     <group colspan="2">
diff --git a/addons/account_payment/i18n/account_payment.pot b/addons/account_payment/i18n/account_payment.pot
index 35376e770af..8c99499e5d9 100644
--- a/addons/account_payment/i18n/account_payment.pot
+++ b/addons/account_payment/i18n/account_payment.pot
@@ -16,7 +16,7 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr ""
 
@@ -166,7 +166,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""
 
diff --git a/addons/account_payment/i18n/ar.po b/addons/account_payment/i18n/ar.po
index 0bbb577bafc..02ce6504dad 100644
--- a/addons/account_payment/i18n/ar.po
+++ b/addons/account_payment/i18n/ar.po
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr ""
 
@@ -170,7 +170,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""
 
diff --git a/addons/account_payment/i18n/bg.po b/addons/account_payment/i18n/bg.po
index 3efda3ce450..9dbda1f16e2 100644
--- a/addons/account_payment/i18n/bg.po
+++ b/addons/account_payment/i18n/bg.po
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr "Планирана дата ако е определена"
 
@@ -172,7 +172,7 @@ msgid "Payment lines"
 msgstr "Редове от плащане"
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr "Избор на дата ако искате да има зададена предпочитана дата"
 
diff --git a/addons/account_payment/i18n/bs.po b/addons/account_payment/i18n/bs.po
index 0dc31e7a75f..68001a226b9 100644
--- a/addons/account_payment/i18n/bs.po
+++ b/addons/account_payment/i18n/bs.po
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr "Zakazani datum ako je fiskno"
 
@@ -174,7 +174,7 @@ msgid "Payment lines"
 msgstr "Linije plaćanja"
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr "Odaberite datum ako ste odabrali fiksni poželjni datum"
 
diff --git a/addons/account_payment/i18n/ca.po b/addons/account_payment/i18n/ca.po
index 8968ee373ef..0813a1573ea 100644
--- a/addons/account_payment/i18n/ca.po
+++ b/addons/account_payment/i18n/ca.po
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr "Data planificada si fixa"
 
@@ -174,7 +174,7 @@ msgid "Payment lines"
 msgstr "Línies de pagament"
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""
 "Seleccioneu una data si heu seleccionat que la data preferida sigui fixa."
diff --git a/addons/account_payment/i18n/cs.po b/addons/account_payment/i18n/cs.po
index dc873b6d817..8eaccebcfd1 100644
--- a/addons/account_payment/i18n/cs.po
+++ b/addons/account_payment/i18n/cs.po
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr ""
 
@@ -170,7 +170,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""
 
diff --git a/addons/account_payment/i18n/de.po b/addons/account_payment/i18n/de.po
index d4300e1d944..212d27f150e 100644
--- a/addons/account_payment/i18n/de.po
+++ b/addons/account_payment/i18n/de.po
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr "Terminierung bei Auswahl 'festes Datum'"
 
@@ -173,7 +173,7 @@ msgid "Payment lines"
 msgstr "Zahlungsvorschlag Positionen"
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr "Wähle ein Datum wenn Ihre Auswahl 'festes Datum' sein soll."
 
diff --git a/addons/account_payment/i18n/el.po b/addons/account_payment/i18n/el.po
index 485677bd368..8b96dbb8347 100644
--- a/addons/account_payment/i18n/el.po
+++ b/addons/account_payment/i18n/el.po
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr "Προγραμματισμένη ημερομηνία εάν είναι καθορισμένο"
 
@@ -175,7 +175,7 @@ msgid "Payment lines"
 msgstr "Γραμμές Πληρωμής"
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""
 "Επιλέξτε μιά ημερομηνία εάν έχετε επιλέξει προτιμώμενη ημερομηνία ως "
diff --git a/addons/account_payment/i18n/es.po b/addons/account_payment/i18n/es.po
index 27c523068c2..ad5017945a7 100644
--- a/addons/account_payment/i18n/es.po
+++ b/addons/account_payment/i18n/es.po
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr "Fecha planificada si es fija"
 
@@ -175,7 +175,7 @@ msgid "Payment lines"
 msgstr "Líneas de pago"
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""
 "Seleccione una fecha si ha seleccionado que la fecha preferida sea fija."
diff --git a/addons/account_payment/i18n/es_AR.po b/addons/account_payment/i18n/es_AR.po
index a8741e3d0e5..ee7c56ad734 100644
--- a/addons/account_payment/i18n/es_AR.po
+++ b/addons/account_payment/i18n/es_AR.po
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr "Fecha planificada si fija"
 
@@ -174,7 +174,7 @@ msgid "Payment lines"
 msgstr "Líneas de pago"
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr "Seleccione una fecha si ha elegido que la fecha preferida sea fija."
 
diff --git a/addons/account_payment/i18n/et.po b/addons/account_payment/i18n/et.po
index b5d07c8219e..5ceb3f3f8a3 100644
--- a/addons/account_payment/i18n/et.po
+++ b/addons/account_payment/i18n/et.po
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr "Planeeritud kuupäev kui fikseeritud"
 
@@ -173,7 +173,7 @@ msgid "Payment lines"
 msgstr "Makseread"
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr "Vali kuupäev, kui sa oled valinud 'Eelistatud kuupäev fikseerida'."
 
diff --git a/addons/account_payment/i18n/fi.po b/addons/account_payment/i18n/fi.po
index 5b5c1542795..63f152886f4 100644
--- a/addons/account_payment/i18n/fi.po
+++ b/addons/account_payment/i18n/fi.po
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr "Suunniteltu päivämäärä jos kiinteä"
 
@@ -175,7 +175,7 @@ msgid "Payment lines"
 msgstr "Maksurivit"
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""
 "Aseta päivämäärä jos olet valinnut suositellun maksupäivän kiinteäksi."
diff --git a/addons/account_payment/i18n/fr.po b/addons/account_payment/i18n/fr.po
index f1dd4c8002b..95f2a580291 100644
--- a/addons/account_payment/i18n/fr.po
+++ b/addons/account_payment/i18n/fr.po
@@ -40,7 +40,7 @@ msgstr ""
 "spéciaux !"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr "Date prévue si fixe"
 
@@ -197,7 +197,7 @@ msgid "Payment lines"
 msgstr "Lignes de paiement"
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""
 "Sélectionnez une date si vous avez choisi \"Date fixe\" comme date préférée"
diff --git a/addons/account_payment/i18n/hi.po b/addons/account_payment/i18n/hi.po
index 8a58aefdeb4..b2bd37aad24 100644
--- a/addons/account_payment/i18n/hi.po
+++ b/addons/account_payment/i18n/hi.po
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr "अनुसूचित तिथि तो तय"
 
@@ -173,7 +173,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""
 
diff --git a/addons/account_payment/i18n/hr.po b/addons/account_payment/i18n/hr.po
index cd514aad23d..6343fcbf3b8 100644
--- a/addons/account_payment/i18n/hr.po
+++ b/addons/account_payment/i18n/hr.po
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr ""
 
@@ -170,7 +170,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""
 
diff --git a/addons/account_payment/i18n/hu.po b/addons/account_payment/i18n/hu.po
index 0bbb577bafc..02ce6504dad 100644
--- a/addons/account_payment/i18n/hu.po
+++ b/addons/account_payment/i18n/hu.po
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr ""
 
@@ -170,7 +170,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""
 
diff --git a/addons/account_payment/i18n/id.po b/addons/account_payment/i18n/id.po
index b656ce2651f..8014337913a 100644
--- a/addons/account_payment/i18n/id.po
+++ b/addons/account_payment/i18n/id.po
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr ""
 
@@ -170,7 +170,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""
 
diff --git a/addons/account_payment/i18n/it.po b/addons/account_payment/i18n/it.po
index aa5ade7faea..0f098139f1c 100644
--- a/addons/account_payment/i18n/it.po
+++ b/addons/account_payment/i18n/it.po
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr ""
 
@@ -172,7 +172,7 @@ msgid "Payment lines"
 msgstr "Riga pagamento"
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""
 
diff --git a/addons/account_payment/i18n/ko.po b/addons/account_payment/i18n/ko.po
index 536db1171cd..1727ce45a70 100644
--- a/addons/account_payment/i18n/ko.po
+++ b/addons/account_payment/i18n/ko.po
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr "고정된 경우, 스케줄된 날짜"
 
@@ -171,7 +171,7 @@ msgid "Payment lines"
 msgstr "결제 라인"
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr "'선호 날짜'를 지정하려면, 날짜를 선택하십시오."
 
diff --git a/addons/account_payment/i18n/lt.po b/addons/account_payment/i18n/lt.po
index 790af356a30..3cdd5f6d56e 100644
--- a/addons/account_payment/i18n/lt.po
+++ b/addons/account_payment/i18n/lt.po
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr ""
 
@@ -170,7 +170,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""
 
diff --git a/addons/account_payment/i18n/mn.po b/addons/account_payment/i18n/mn.po
index fd4b080ae95..5687b5af0b3 100644
--- a/addons/account_payment/i18n/mn.po
+++ b/addons/account_payment/i18n/mn.po
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr "Төлөвлөсөн огноо"
 
@@ -174,7 +174,7 @@ msgid "Payment lines"
 msgstr "Төлбөрийн мөрүүд"
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr "Сонгох огноо тогтмол байх бол огноог заана."
 
diff --git a/addons/account_payment/i18n/nl.po b/addons/account_payment/i18n/nl.po
index c40752000b1..516492ac565 100644
--- a/addons/account_payment/i18n/nl.po
+++ b/addons/account_payment/i18n/nl.po
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr "Geplande datum indien vast"
 
@@ -174,7 +174,7 @@ msgid "Payment lines"
 msgstr "Betalingsregels"
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""
 "Kies een datum wanneer u hebt gekozen om op een voorkeursdatum uit te voeren."
diff --git a/addons/account_payment/i18n/nl_BE.po b/addons/account_payment/i18n/nl_BE.po
index 9695e322250..d0844e937b4 100644
--- a/addons/account_payment/i18n/nl_BE.po
+++ b/addons/account_payment/i18n/nl_BE.po
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr ""
 
@@ -170,7 +170,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""
 
diff --git a/addons/account_payment/i18n/oc.po b/addons/account_payment/i18n/oc.po
index 9111223a710..5da4eb7edc2 100644
--- a/addons/account_payment/i18n/oc.po
+++ b/addons/account_payment/i18n/oc.po
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr ""
 
@@ -171,7 +171,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""
 
diff --git a/addons/account_payment/i18n/pl.po b/addons/account_payment/i18n/pl.po
index 81f6257956a..280341a73a5 100644
--- a/addons/account_payment/i18n/pl.po
+++ b/addons/account_payment/i18n/pl.po
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr "Planowana data jeśli jest ustalona"
 
@@ -174,7 +174,7 @@ msgid "Payment lines"
 msgstr "Pozycje płatności"
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr "Wybierz datę, jeśli wybrałaś(eś) opcję Preferowana data."
 
diff --git a/addons/account_payment/i18n/pt.po b/addons/account_payment/i18n/pt.po
index f5409e13ce7..d9df5c72754 100644
--- a/addons/account_payment/i18n/pt.po
+++ b/addons/account_payment/i18n/pt.po
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr "Data agendada se fixa"
 
@@ -174,7 +174,7 @@ msgid "Payment lines"
 msgstr "Linhas de pagamentos"
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr "Selecione a data se você escolheu uma data preferida a ser reparada."
 
diff --git a/addons/account_payment/i18n/pt_BR.po b/addons/account_payment/i18n/pt_BR.po
index 9b119244867..4ae99673a5a 100644
--- a/addons/account_payment/i18n/pt_BR.po
+++ b/addons/account_payment/i18n/pt_BR.po
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr "Data programada se alterada"
 
@@ -174,7 +174,7 @@ msgid "Payment lines"
 msgstr "Linhas de pagamento"
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr "Selecione uma data se você escolheu uma Data Preferida a ser fixada."
 
diff --git a/addons/account_payment/i18n/ro.po b/addons/account_payment/i18n/ro.po
index b2d91379109..57809e07959 100644
--- a/addons/account_payment/i18n/ro.po
+++ b/addons/account_payment/i18n/ro.po
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr "Data programată, dacă este stabilită"
 
@@ -174,7 +174,7 @@ msgid "Payment lines"
 msgstr "Linii plată"
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr "Selectează o dată dacă ai ales să programezi plată"
 
diff --git a/addons/account_payment/i18n/ru.po b/addons/account_payment/i18n/ru.po
index 3341ffbffd4..bba8c696ea0 100644
--- a/addons/account_payment/i18n/ru.po
+++ b/addons/account_payment/i18n/ru.po
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr "Дата по плану, если задана"
 
@@ -172,7 +172,7 @@ msgid "Payment lines"
 msgstr "Позиции платежа"
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""
 
diff --git a/addons/account_payment/i18n/sl.po b/addons/account_payment/i18n/sl.po
index 0de9e393073..4a079ac01de 100644
--- a/addons/account_payment/i18n/sl.po
+++ b/addons/account_payment/i18n/sl.po
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr ""
 
@@ -174,7 +174,7 @@ msgid "Payment lines"
 msgstr "Vrstice plačila"
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""
 
diff --git a/addons/account_payment/i18n/sq.po b/addons/account_payment/i18n/sq.po
index 360305518fc..30967f82792 100644
--- a/addons/account_payment/i18n/sq.po
+++ b/addons/account_payment/i18n/sq.po
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr ""
 
@@ -171,7 +171,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""
 
diff --git a/addons/account_payment/i18n/sv.po b/addons/account_payment/i18n/sv.po
index e033cc0ad49..df09d19e19d 100644
--- a/addons/account_payment/i18n/sv.po
+++ b/addons/account_payment/i18n/sv.po
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr ""
 
@@ -170,7 +170,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""
 
diff --git a/addons/account_payment/i18n/tlh.po b/addons/account_payment/i18n/tlh.po
index 66b5bb9c31a..34abf27990f 100644
--- a/addons/account_payment/i18n/tlh.po
+++ b/addons/account_payment/i18n/tlh.po
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr ""
 
@@ -170,7 +170,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""
 
diff --git a/addons/account_payment/i18n/tr.po b/addons/account_payment/i18n/tr.po
index 2cf63d7ae31..5d1a71fe957 100644
--- a/addons/account_payment/i18n/tr.po
+++ b/addons/account_payment/i18n/tr.po
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr ""
 
@@ -170,7 +170,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""
 
diff --git a/addons/account_payment/i18n/uk.po b/addons/account_payment/i18n/uk.po
index 9f75b050edf..d6d5097abaf 100644
--- a/addons/account_payment/i18n/uk.po
+++ b/addons/account_payment/i18n/uk.po
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr ""
 
@@ -170,7 +170,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""
 
diff --git a/addons/account_payment/i18n/vi.po b/addons/account_payment/i18n/vi.po
index 565529f1ad5..8398e08c8e6 100644
--- a/addons/account_payment/i18n/vi.po
+++ b/addons/account_payment/i18n/vi.po
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr ""
 
@@ -171,7 +171,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""
 
diff --git a/addons/account_payment/i18n/zh_CN.po b/addons/account_payment/i18n/zh_CN.po
index a7e26e82f1a..51c8c6ccca4 100644
--- a/addons/account_payment/i18n/zh_CN.po
+++ b/addons/account_payment/i18n/zh_CN.po
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr "指定日期(如果是固定)"
 
@@ -172,7 +172,7 @@ msgid "Payment lines"
 msgstr "付款明细"
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr "如果你选择的优先日期是固定的, 选择一个日期"
 
diff --git a/addons/account_payment/i18n/zh_TW.po b/addons/account_payment/i18n/zh_TW.po
index 288950d8a9c..70d5a328d8c 100644
--- a/addons/account_payment/i18n/zh_TW.po
+++ b/addons/account_payment/i18n/zh_TW.po
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
-#: field:payment.order,date_planned:0
+#: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
 msgstr ""
 
@@ -170,7 +170,7 @@ msgid "Payment lines"
 msgstr ""
 
 #. module: account_payment
-#: help:payment.order,date_planned:0
+#: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""
 
diff --git a/addons/account_payment/wizard/account_payment_order.py b/addons/account_payment/wizard/account_payment_order.py
index 74409cab3fa..696160c35ef 100644
--- a/addons/account_payment/wizard/account_payment_order.py
+++ b/addons/account_payment/wizard/account_payment_order.py
@@ -77,7 +77,7 @@ class payment_order_create(osv.osv_memory):
             elif payment.date_prefered == 'due':
                 date_to_pay = line.date_maturity
             elif payment.date_prefered == 'fixed':
-                date_to_pay = payment.date_planned
+                date_to_pay = payment.date_scheduled
             payment_obj.create(cr, uid,{
                 'move_line_id': line.id,
                 'amount_currency': line.amount_to_pay,
diff --git a/addons/l10n_ch/wizard/create_dta.py b/addons/l10n_ch/wizard/create_dta.py
index b9f4078def7..8bde159013a 100644
--- a/addons/l10n_ch/wizard/create_dta.py
+++ b/addons/l10n_ch/wizard/create_dta.py
@@ -468,8 +468,8 @@ def _create_dta(obj, cr, uid, data, context=None):
                     'for the partner: ' + pline.partner_id.name + '\n' \
                     'on line: ' + pline.name)
 
-        if pline.order_id.date_planned:
-            date_value = mx.DateTime.strptime(pline.order_id.date_planned, '%Y-%m-%d')
+        if pline.order_id.date_scheduled:
+            date_value = mx.DateTime.strptime(pline.order_id.date_scheduled, '%Y-%m-%d')
         elif pline.date:
             date_value = mx.DateTime.strptime(pline.date, '%Y-%m-%d')
         else: