[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
This commit is contained in:
Mustufa Rangwala 2010-09-01 10:41:44 +05:30
parent cebf48057f
commit 8197f130f3
42 changed files with 86 additions and 86 deletions

View File

@ -90,7 +90,7 @@ class payment_order(osv.osv):
return res return res
_columns = { _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)]}), '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.'), '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([ 'state': fields.selection([
@ -107,7 +107,7 @@ class payment_order(osv.osv):
('now', 'Directly'), ('now', 'Directly'),
('due', 'Due date'), ('due', 'Due date'),
('fixed', 'Fixed 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_created': fields.date('Creation date', readonly=True),
'date_done': fields.date('Execution date', readonly=True), 'date_done': fields.date('Execution date', readonly=True),
} }
@ -252,7 +252,7 @@ class payment_line(osv.osv):
res = {} res = {}
for line in self.browse(cursor, user, ids, context=context): for line in self.browse(cursor, user, ids, context=context):
if line.order_id.date_prefered == 'fixed': 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': elif line.order_id.date_prefered == 'due':
res[line.id] = line.due_date or time.strftime('%Y-%m-%d') res[line.id] = line.due_date or time.strftime('%Y-%m-%d')
else: else:
@ -330,7 +330,7 @@ class payment_line(osv.osv):
('name_uniq', 'UNIQUE(name)', 'The payment line name must be unique!'), ('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={}
data['amount_currency']=data['communication']=data['partner_id']=data['reference']=data['date_created']=data['bank_id']=data['amount']=False 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': elif date_prefered == 'due':
data['date'] = line.date_maturity data['date'] = line.date_maturity
elif date_prefered == 'fixed': elif date_prefered == 'fixed':
data['date'] = date_planned data['date'] = date_scheduled
return {'value': data} return {'value': data}

View File

@ -109,14 +109,14 @@
<field name="reference"/> <field name="reference"/>
<field name="mode"/> <field name="mode"/>
<field name="date_prefered"/> <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"/> <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"/> <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"> <field name="line_ids" colspan="4" widget="one2many_list" nolabel="1">
<form string="Payment Line"> <form string="Payment Line">
<notebook> <notebook>
<page string="Payment"> <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"/> <separator colspan="4" string="Transaction Information"/>
<field name="date"/> <field name="date"/>
<group colspan="2"> <group colspan="2">

View File

@ -16,7 +16,7 @@ msgstr ""
"Plural-Forms: \n" "Plural-Forms: \n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "" msgstr ""
@ -166,7 +166,7 @@ msgid "Payment lines"
msgstr "" msgstr ""
#. module: account_payment #. 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." msgid "Select a date if you have chosen Preferred Date to be fixed."
msgstr "" msgstr ""

View File

@ -17,7 +17,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "" msgstr ""
@ -170,7 +170,7 @@ msgid "Payment lines"
msgstr "" msgstr ""
#. module: account_payment #. 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." msgid "Select a date if you have chosen Preferred Date to be fixed."
msgstr "" msgstr ""

View File

@ -17,7 +17,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "Планирана дата ако е определена" msgstr "Планирана дата ако е определена"
@ -172,7 +172,7 @@ msgid "Payment lines"
msgstr "Редове от плащане" msgstr "Редове от плащане"
#. module: account_payment #. 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." msgid "Select a date if you have chosen Preferred Date to be fixed."
msgstr "Избор на дата ако искате да има зададена предпочитана дата" msgstr "Избор на дата ако искате да има зададена предпочитана дата"

View File

@ -17,7 +17,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "Zakazani datum ako je fiskno" msgstr "Zakazani datum ako je fiskno"
@ -174,7 +174,7 @@ msgid "Payment lines"
msgstr "Linije plaćanja" msgstr "Linije plaćanja"
#. module: account_payment #. 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." msgid "Select a date if you have chosen Preferred Date to be fixed."
msgstr "Odaberite datum ako ste odabrali fiksni poželjni datum" msgstr "Odaberite datum ako ste odabrali fiksni poželjni datum"

View File

@ -17,7 +17,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "Data planificada si fixa" msgstr "Data planificada si fixa"
@ -174,7 +174,7 @@ msgid "Payment lines"
msgstr "Línies de pagament" msgstr "Línies de pagament"
#. module: account_payment #. 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." msgid "Select a date if you have chosen Preferred Date to be fixed."
msgstr "" msgstr ""
"Seleccioneu una data si heu seleccionat que la data preferida sigui fixa." "Seleccioneu una data si heu seleccionat que la data preferida sigui fixa."

View File

@ -17,7 +17,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "" msgstr ""
@ -170,7 +170,7 @@ msgid "Payment lines"
msgstr "" msgstr ""
#. module: account_payment #. 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." msgid "Select a date if you have chosen Preferred Date to be fixed."
msgstr "" msgstr ""

View File

@ -17,7 +17,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "Terminierung bei Auswahl 'festes Datum'" msgstr "Terminierung bei Auswahl 'festes Datum'"
@ -173,7 +173,7 @@ msgid "Payment lines"
msgstr "Zahlungsvorschlag Positionen" msgstr "Zahlungsvorschlag Positionen"
#. module: account_payment #. 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." 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." msgstr "Wähle ein Datum wenn Ihre Auswahl 'festes Datum' sein soll."

View File

@ -18,7 +18,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "Προγραμματισμένη ημερομηνία εάν είναι καθορισμένο" msgstr "Προγραμματισμένη ημερομηνία εάν είναι καθορισμένο"
@ -175,7 +175,7 @@ msgid "Payment lines"
msgstr "Γραμμές Πληρωμής" msgstr "Γραμμές Πληρωμής"
#. module: account_payment #. 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." msgid "Select a date if you have chosen Preferred Date to be fixed."
msgstr "" msgstr ""
"Επιλέξτε μιά ημερομηνία εάν έχετε επιλέξει προτιμώμενη ημερομηνία ως " "Επιλέξτε μιά ημερομηνία εάν έχετε επιλέξει προτιμώμενη ημερομηνία ως "

View File

@ -18,7 +18,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "Fecha planificada si es fija" msgstr "Fecha planificada si es fija"
@ -175,7 +175,7 @@ msgid "Payment lines"
msgstr "Líneas de pago" msgstr "Líneas de pago"
#. module: account_payment #. 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." msgid "Select a date if you have chosen Preferred Date to be fixed."
msgstr "" msgstr ""
"Seleccione una fecha si ha seleccionado que la fecha preferida sea fija." "Seleccione una fecha si ha seleccionado que la fecha preferida sea fija."

View File

@ -17,7 +17,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "Fecha planificada si fija" msgstr "Fecha planificada si fija"
@ -174,7 +174,7 @@ msgid "Payment lines"
msgstr "Líneas de pago" msgstr "Líneas de pago"
#. module: account_payment #. 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." 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." msgstr "Seleccione una fecha si ha elegido que la fecha preferida sea fija."

View File

@ -17,7 +17,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "Planeeritud kuupäev kui fikseeritud" msgstr "Planeeritud kuupäev kui fikseeritud"
@ -173,7 +173,7 @@ msgid "Payment lines"
msgstr "Makseread" msgstr "Makseread"
#. module: account_payment #. 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." 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'." msgstr "Vali kuupäev, kui sa oled valinud 'Eelistatud kuupäev fikseerida'."

View File

@ -18,7 +18,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "Suunniteltu päivämäärä jos kiinteä" msgstr "Suunniteltu päivämäärä jos kiinteä"
@ -175,7 +175,7 @@ msgid "Payment lines"
msgstr "Maksurivit" msgstr "Maksurivit"
#. module: account_payment #. 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." msgid "Select a date if you have chosen Preferred Date to be fixed."
msgstr "" msgstr ""
"Aseta päivämäärä jos olet valinnut suositellun maksupäivän kiinteäksi." "Aseta päivämäärä jos olet valinnut suositellun maksupäivän kiinteäksi."

View File

@ -40,7 +40,7 @@ msgstr ""
"spéciaux !" "spéciaux !"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "Date prévue si fixe" msgstr "Date prévue si fixe"
@ -197,7 +197,7 @@ msgid "Payment lines"
msgstr "Lignes de paiement" msgstr "Lignes de paiement"
#. module: account_payment #. 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." msgid "Select a date if you have chosen Preferred Date to be fixed."
msgstr "" msgstr ""
"Sélectionnez une date si vous avez choisi \"Date fixe\" comme date préférée" "Sélectionnez une date si vous avez choisi \"Date fixe\" comme date préférée"

View File

@ -18,7 +18,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "अनुसूचित तिथि तो तय" msgstr "अनुसूचित तिथि तो तय"
@ -173,7 +173,7 @@ msgid "Payment lines"
msgstr "" msgstr ""
#. module: account_payment #. 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." msgid "Select a date if you have chosen Preferred Date to be fixed."
msgstr "" msgstr ""

View File

@ -17,7 +17,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "" msgstr ""
@ -170,7 +170,7 @@ msgid "Payment lines"
msgstr "" msgstr ""
#. module: account_payment #. 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." msgid "Select a date if you have chosen Preferred Date to be fixed."
msgstr "" msgstr ""

View File

@ -17,7 +17,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "" msgstr ""
@ -170,7 +170,7 @@ msgid "Payment lines"
msgstr "" msgstr ""
#. module: account_payment #. 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." msgid "Select a date if you have chosen Preferred Date to be fixed."
msgstr "" msgstr ""

View File

@ -17,7 +17,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "" msgstr ""
@ -170,7 +170,7 @@ msgid "Payment lines"
msgstr "" msgstr ""
#. module: account_payment #. 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." msgid "Select a date if you have chosen Preferred Date to be fixed."
msgstr "" msgstr ""

View File

@ -17,7 +17,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "" msgstr ""
@ -172,7 +172,7 @@ msgid "Payment lines"
msgstr "Riga pagamento" msgstr "Riga pagamento"
#. module: account_payment #. 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." msgid "Select a date if you have chosen Preferred Date to be fixed."
msgstr "" msgstr ""

View File

@ -18,7 +18,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "고정된 경우, 스케줄된 날짜" msgstr "고정된 경우, 스케줄된 날짜"
@ -171,7 +171,7 @@ msgid "Payment lines"
msgstr "결제 라인" msgstr "결제 라인"
#. module: account_payment #. 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." msgid "Select a date if you have chosen Preferred Date to be fixed."
msgstr "'선호 날짜'를 지정하려면, 날짜를 선택하십시오." msgstr "'선호 날짜'를 지정하려면, 날짜를 선택하십시오."

View File

@ -17,7 +17,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "" msgstr ""
@ -170,7 +170,7 @@ msgid "Payment lines"
msgstr "" msgstr ""
#. module: account_payment #. 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." msgid "Select a date if you have chosen Preferred Date to be fixed."
msgstr "" msgstr ""

View File

@ -18,7 +18,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "Төлөвлөсөн огноо" msgstr "Төлөвлөсөн огноо"
@ -174,7 +174,7 @@ msgid "Payment lines"
msgstr "Төлбөрийн мөрүүд" msgstr "Төлбөрийн мөрүүд"
#. module: account_payment #. 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." msgid "Select a date if you have chosen Preferred Date to be fixed."
msgstr "Сонгох огноо тогтмол байх бол огноог заана." msgstr "Сонгох огноо тогтмол байх бол огноог заана."

View File

@ -17,7 +17,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "Geplande datum indien vast" msgstr "Geplande datum indien vast"
@ -174,7 +174,7 @@ msgid "Payment lines"
msgstr "Betalingsregels" msgstr "Betalingsregels"
#. module: account_payment #. 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." msgid "Select a date if you have chosen Preferred Date to be fixed."
msgstr "" msgstr ""
"Kies een datum wanneer u hebt gekozen om op een voorkeursdatum uit te voeren." "Kies een datum wanneer u hebt gekozen om op een voorkeursdatum uit te voeren."

View File

@ -17,7 +17,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "" msgstr ""
@ -170,7 +170,7 @@ msgid "Payment lines"
msgstr "" msgstr ""
#. module: account_payment #. 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." msgid "Select a date if you have chosen Preferred Date to be fixed."
msgstr "" msgstr ""

View File

@ -18,7 +18,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "" msgstr ""
@ -171,7 +171,7 @@ msgid "Payment lines"
msgstr "" msgstr ""
#. module: account_payment #. 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." msgid "Select a date if you have chosen Preferred Date to be fixed."
msgstr "" msgstr ""

View File

@ -17,7 +17,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "Planowana data jeśli jest ustalona" msgstr "Planowana data jeśli jest ustalona"
@ -174,7 +174,7 @@ msgid "Payment lines"
msgstr "Pozycje płatności" msgstr "Pozycje płatności"
#. module: account_payment #. 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." msgid "Select a date if you have chosen Preferred Date to be fixed."
msgstr "Wybierz datę, jeśli wybrałaś(eś) opcję Preferowana data." msgstr "Wybierz datę, jeśli wybrałaś(eś) opcję Preferowana data."

View File

@ -17,7 +17,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "Data agendada se fixa" msgstr "Data agendada se fixa"
@ -174,7 +174,7 @@ msgid "Payment lines"
msgstr "Linhas de pagamentos" msgstr "Linhas de pagamentos"
#. module: account_payment #. 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." 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." msgstr "Selecione a data se você escolheu uma data preferida a ser reparada."

View File

@ -17,7 +17,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "Data programada se alterada" msgstr "Data programada se alterada"
@ -174,7 +174,7 @@ msgid "Payment lines"
msgstr "Linhas de pagamento" msgstr "Linhas de pagamento"
#. module: account_payment #. 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." 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." msgstr "Selecione uma data se você escolheu uma Data Preferida a ser fixada."

View File

@ -17,7 +17,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "Data programată, dacă este stabilită" msgstr "Data programată, dacă este stabilită"
@ -174,7 +174,7 @@ msgid "Payment lines"
msgstr "Linii plată" msgstr "Linii plată"
#. module: account_payment #. 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." msgid "Select a date if you have chosen Preferred Date to be fixed."
msgstr "Selectează o dată dacă ai ales să programezi plată" msgstr "Selectează o dată dacă ai ales să programezi plată"

View File

@ -17,7 +17,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "Дата по плану, если задана" msgstr "Дата по плану, если задана"
@ -172,7 +172,7 @@ msgid "Payment lines"
msgstr "Позиции платежа" msgstr "Позиции платежа"
#. module: account_payment #. 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." msgid "Select a date if you have chosen Preferred Date to be fixed."
msgstr "" msgstr ""

View File

@ -17,7 +17,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "" msgstr ""
@ -174,7 +174,7 @@ msgid "Payment lines"
msgstr "Vrstice plačila" msgstr "Vrstice plačila"
#. module: account_payment #. 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." msgid "Select a date if you have chosen Preferred Date to be fixed."
msgstr "" msgstr ""

View File

@ -18,7 +18,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "" msgstr ""
@ -171,7 +171,7 @@ msgid "Payment lines"
msgstr "" msgstr ""
#. module: account_payment #. 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." msgid "Select a date if you have chosen Preferred Date to be fixed."
msgstr "" msgstr ""

View File

@ -17,7 +17,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "" msgstr ""
@ -170,7 +170,7 @@ msgid "Payment lines"
msgstr "" msgstr ""
#. module: account_payment #. 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." msgid "Select a date if you have chosen Preferred Date to be fixed."
msgstr "" msgstr ""

View File

@ -17,7 +17,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "" msgstr ""
@ -170,7 +170,7 @@ msgid "Payment lines"
msgstr "" msgstr ""
#. module: account_payment #. 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." msgid "Select a date if you have chosen Preferred Date to be fixed."
msgstr "" msgstr ""

View File

@ -17,7 +17,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "" msgstr ""
@ -170,7 +170,7 @@ msgid "Payment lines"
msgstr "" msgstr ""
#. module: account_payment #. 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." msgid "Select a date if you have chosen Preferred Date to be fixed."
msgstr "" msgstr ""

View File

@ -17,7 +17,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "" msgstr ""
@ -170,7 +170,7 @@ msgid "Payment lines"
msgstr "" msgstr ""
#. module: account_payment #. 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." msgid "Select a date if you have chosen Preferred Date to be fixed."
msgstr "" msgstr ""

View File

@ -18,7 +18,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "" msgstr ""
@ -171,7 +171,7 @@ msgid "Payment lines"
msgstr "" msgstr ""
#. module: account_payment #. 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." msgid "Select a date if you have chosen Preferred Date to be fixed."
msgstr "" msgstr ""

View File

@ -17,7 +17,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "指定日期(如果是固定)" msgstr "指定日期(如果是固定)"
@ -172,7 +172,7 @@ msgid "Payment lines"
msgstr "付款明细" msgstr "付款明细"
#. module: account_payment #. 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." msgid "Select a date if you have chosen Preferred Date to be fixed."
msgstr "如果你选择的优先日期是固定的, 选择一个日期" msgstr "如果你选择的优先日期是固定的, 选择一个日期"

View File

@ -17,7 +17,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_planned:0 #: field:payment.order,date_scheduled:0
msgid "Scheduled date if fixed" msgid "Scheduled date if fixed"
msgstr "" msgstr ""
@ -170,7 +170,7 @@ msgid "Payment lines"
msgstr "" msgstr ""
#. module: account_payment #. 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." msgid "Select a date if you have chosen Preferred Date to be fixed."
msgstr "" msgstr ""

View File

@ -77,7 +77,7 @@ class payment_order_create(osv.osv_memory):
elif payment.date_prefered == 'due': elif payment.date_prefered == 'due':
date_to_pay = line.date_maturity date_to_pay = line.date_maturity
elif payment.date_prefered == 'fixed': elif payment.date_prefered == 'fixed':
date_to_pay = payment.date_planned date_to_pay = payment.date_scheduled
payment_obj.create(cr, uid,{ payment_obj.create(cr, uid,{
'move_line_id': line.id, 'move_line_id': line.id,
'amount_currency': line.amount_to_pay, 'amount_currency': line.amount_to_pay,

View File

@ -468,8 +468,8 @@ def _create_dta(obj, cr, uid, data, context=None):
'for the partner: ' + pline.partner_id.name + '\n' \ 'for the partner: ' + pline.partner_id.name + '\n' \
'on line: ' + pline.name) 'on line: ' + pline.name)
if pline.order_id.date_planned: if pline.order_id.date_scheduled:
date_value = mx.DateTime.strptime(pline.order_id.date_planned, '%Y-%m-%d') date_value = mx.DateTime.strptime(pline.order_id.date_scheduled, '%Y-%m-%d')
elif pline.date: elif pline.date:
date_value = mx.DateTime.strptime(pline.date, '%Y-%m-%d') date_value = mx.DateTime.strptime(pline.date, '%Y-%m-%d')
else: else: