small changes in labels

bzr revid: nel@silver-20081106114325-g3dtta90wnxxln78
This commit is contained in:
Najlaa 2008-11-06 12:43:25 +01:00
commit 98f97215f0
5 changed files with 20 additions and 14 deletions

View File

@ -1604,7 +1604,7 @@ msgstr ""
#. module: account
#: field:account.invoice,address_invoice_id:0
msgid "Invoice Address"
msgstr "Adresse de facturation"
msgstr "Adresse"
#. module: account
#: model:ir.actions.act_window,name:account.act_acc_analytic_acc_2_report_hr_timesheet_invoice_journal
@ -2090,7 +2090,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_invoice_tree8
#: model:ir.ui.menu,name:account.menu_action_invoice_tree8
msgid "Draft Supplier Invoices"
msgstr "Facture fournisseur brouillon"
msgstr "Facture fournisseur en attente"
#. module: account
#: rml:account.overdue:0
@ -2174,7 +2174,7 @@ msgstr ""
#. module: account
#: field:account.invoice,date_invoice:0
msgid "Date Invoiced"
msgstr "Date de facturation"
msgstr "Date facture"
#. module: account
#: model:account.account.type,name:account.account_type_liability

View File

@ -150,8 +150,8 @@
<field name="state" readonly="1" select="1"/>
<group col="4" colspan="2">
<button name="cancel" states="draft,open" string="Cancel"/>
<button name="open" states="draft" string="Open"/>
<button name="%(wizard_pay_payment)d" states="open" string="Make Payment" type="action"/>
<button name="open" states="draft" string="Confirm Payments"/>
<button name="%(wizard_pay_payment)d" states="open" string="Make Payments" type="action"/>
<button name="set_to_draft" states="cancel" string="Set to draft" type="object"/>
</group>
</form>

View File

@ -115,8 +115,6 @@
<field name="user_id"/>
<field name="create_uid" select="1"/>
<field name="create_date" select="1"/>
<field name="write_date"/>
<field name="write_uid"/>
</group>
<notebook colspan="4">
<page string="Attachment">
@ -124,13 +122,11 @@
<separator string="Data" colspan="2"/>
<field name="datas" filename="datas_fname"/>
<field name="datas_fname" select="1"/>
<field name="file_size" readonly="1"/>
</group>
<group col="2" colspan="2">
<separator string="Attached To" colspan="2"/>
<field name="res_model" select="1" readonly="1"/>
<field name="res_id" readonly="1"/>
<field name="parent_id" readonly="1"/>
</group>
<separator string="Preview" colspan="4"/>
<field
@ -146,6 +142,17 @@
<field name="index_content" nolabel="1" colspan="4" select="1"/>
</page><page string="Security">
<field name="group_ids" colspan="4" nolabel="1"/>
</page><page string="Others Info">
<group colspan="2" col="2">
<separator string="History" colspan="2"/>
<field name="write_date"/>
<field name="write_uid"/>
</group>
<group colspan="2" col="2">
<separator string="File Information" colspan="2"/>
<field name="file_size" readonly="1"/>
<field name="parent_id" readonly="1"/>
</group>
</page><page string="Notes">
<field colspan="4" name="description" nolabel="1"/>
</page>

View File

@ -12,7 +12,7 @@ import pooler
import sys
from mx.DateTime import *
import tools
from report.render import render
from report.render import render
from report.interface import report_int
import os
import pdf_ext
@ -49,7 +49,6 @@ class external_pdf(render):
class report_custom(report_int):
def create(self, cr, uid, ids, datas, context={}):
print datas, ids, uid
pool = pooler.get_pool(cr.dbname)
@ -70,7 +69,7 @@ class report_custom(report_int):
result['info_address'] = partner.address[0].street
result['info_address2'] = str(partner.address[0].zip) + ' ' + str(partner.address[0].city)
pdf_ext.fill_pdf('addons/l10n_lu/wizard/2008_DECL_F_M10.pdf', '/tmp/output.pdf', result)
pdf_ext.fill_pdf(tools.config['addons_path']+'/l10n_lu/wizard/2008_DECL_F_M10.pdf', '/tmp/output.pdf', result)
self.obj = external_pdf(file('/tmp/output.pdf').read())
self.obj.render()
return (self.obj.pdf, 'pdf')

View File

@ -28,11 +28,11 @@ ask_form = """<?xml version="1.0" ?>
<form string="Delegate this task to a user">
<separator string="Delegated Task" colspan="4"/>
<field name="user_id" colspan="4"/>
<field name="planned_hours" colspan="4"/>
<field name="planned_hours" colspan="4" widget="float_time"/>
<field name="name" colspan="4"/>
<field name="include_info"/>
<separator string="Validation Task" colspan="4"/>
<field name="planned_hours_me" colspan="4"/>
<field name="planned_hours_me" colspan="4" widget="float_time"/>
<field name="prefix" colspan="4"/>
<field name="state" colspan="4"/>
</form>"""