odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] lp:883930 

bzr revid: qdp-launchpad@openerp.com-20111104075049-fr6wrg4e5idt7yu1
This commit is contained in:
Quentin (OpenERP) 2011-11-04 08:50:49 +01:00
parent f0e7053185 37e36c058a
commit 1ca7da3f60
50 changed files with 51 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/purchase/i18n/ar.po
View File

@ -1584,7 +1584,7 @@ msgstr ""
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr ""
#. module: purchase

2
addons/purchase/i18n/bg.po
View File

@ -1606,7 +1606,7 @@ msgstr ""
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr ""
#. module: purchase

2
addons/purchase/i18n/bs.po
View File

@ -1599,7 +1599,7 @@ msgstr "TVA:"
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "Datum nabavnog naloga"
#. module: purchase

2
addons/purchase/i18n/ca.po
View File

@ -1684,7 +1684,7 @@ msgstr "IVA:"
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "Data ordenada"
#. module: purchase

2
addons/purchase/i18n/cs.po
View File

@ -1615,7 +1615,7 @@ msgstr "TVA :"
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "Datum objednání"
#. module: purchase

2
addons/purchase/i18n/da.po
View File

@ -1585,7 +1585,7 @@ msgstr ""
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr ""
#. module: purchase

2
addons/purchase/i18n/de.po
View File

@ -1705,7 +1705,7 @@ msgstr "USt.:"
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "Auftragsdatum"
#. module: purchase

2
addons/purchase/i18n/el.po
View File

@ -1609,7 +1609,7 @@ msgstr "ΦΠΑ:"
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "Ημερ/νία Παραγγελίας"
#. module: purchase

2
addons/purchase/i18n/en_GB.po
View File

@ -1585,7 +1585,7 @@ msgstr ""
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr ""
#. module: purchase

2
addons/purchase/i18n/es.po
View File

@ -1678,7 +1678,7 @@ msgstr "IVA:"
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "Fecha ordenado"
#. module: purchase

2
addons/purchase/i18n/es_AR.po
View File

@ -1605,7 +1605,7 @@ msgstr "IVA:"
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "Fecha ordenada"
#. module: purchase

2
addons/purchase/i18n/es_CL.po
View File

@ -1666,7 +1666,7 @@ msgstr "IVA:"
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "Fecha ordenado"
#. module: purchase

2
addons/purchase/i18n/es_EC.po
View File

@ -1622,7 +1622,7 @@ msgstr "IVA:"
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "Fecha ordenado"
#. module: purchase

2
addons/purchase/i18n/es_MX.po
View File

@ -1515,7 +1515,7 @@ msgstr "IVA:"
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "Ordenado por Fecha"
#. module: purchase

2
addons/purchase/i18n/et.po
View File

@ -1619,7 +1619,7 @@ msgstr "KM:"
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "Tellimise kuupäev"
#. module: purchase

2
addons/purchase/i18n/fi.po
View File

@ -1655,7 +1655,7 @@ msgstr "ALV:"
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "Tilauspäivämäärä"
#. module: purchase

2
addons/purchase/i18n/fr.po
View File

@ -1692,7 +1692,7 @@ msgstr "TVA :"
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "Date de Commande"
#. module: purchase

2
addons/purchase/i18n/gl.po
View File

@ -1585,7 +1585,7 @@ msgstr ""
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr ""
#. module: purchase

2
addons/purchase/i18n/hr.po
View File

@ -1585,7 +1585,7 @@ msgstr ""
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr ""
#. module: purchase

2
addons/purchase/i18n/hu.po
View File

@ -1676,7 +1676,7 @@ msgstr "ÁFA:"
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "Megrendelés dátuma"
#. module: purchase

2
addons/purchase/i18n/id.po
View File

@ -1657,7 +1657,7 @@ msgstr ""
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "Tanggal pemesanan"
#. module: purchase

2
addons/purchase/i18n/it.po
View File

@ -1671,7 +1671,7 @@ msgstr "IVA"
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "Data ordine"
#. module: purchase

2
addons/purchase/i18n/ko.po
View File

@ -1588,7 +1588,7 @@ msgstr "TVA:"
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "주문 날짜"
#. module: purchase

2
addons/purchase/i18n/lt.po
View File

@ -1590,7 +1590,7 @@ msgstr "PVM mok. kodas:"
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "Užsakymo data"
#. module: purchase

2
addons/purchase/i18n/mn.po
View File

@ -1606,7 +1606,7 @@ msgstr "НӨАТ:"
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "Захиалсан огноо"
#. module: purchase

2
addons/purchase/i18n/nb.po
View File

@ -1595,7 +1595,7 @@ msgstr "TVA:"
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "Ordredato"
#. module: purchase

2
addons/purchase/i18n/nl.po
View File

@ -1674,7 +1674,7 @@ msgstr "BTW"
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "Besteldatum"
#. module: purchase

2
addons/purchase/i18n/nl_BE.po
View File

@ -1584,7 +1584,7 @@ msgstr ""
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr ""
#. module: purchase

2
addons/purchase/i18n/pl.po
View File

@ -1665,7 +1665,7 @@ msgstr "VAT:"
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "Data zamówienia"
#. module: purchase

2
addons/purchase/i18n/pt.po
View File

@ -1616,7 +1616,7 @@ msgstr "IVA"
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "Data do pedido"
#. module: purchase

2
addons/purchase/i18n/pt_BR.po
View File

@ -1683,7 +1683,7 @@ msgstr "TVA:"
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "Data do Pedido"
#. module: purchase

2
addons/purchase/i18n/purchase.pot
View File

@ -1511,7 +1511,7 @@ msgstr ""
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr ""
#. module: purchase

2
addons/purchase/i18n/ro.po
View File

@ -1642,7 +1642,7 @@ msgstr "TVA:"
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "Data comenzii"
#. module: purchase

2
addons/purchase/i18n/ru.po
View File

@ -1626,7 +1626,7 @@ msgstr "НДС:"
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "Дата заказа"
#. module: purchase

2
addons/purchase/i18n/sk.po
View File

@ -1586,7 +1586,7 @@ msgstr ""
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr ""
#. module: purchase

2
addons/purchase/i18n/sl.po
View File

@ -1594,7 +1594,7 @@ msgstr ""
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "Datum naročila"
#. module: purchase

2
addons/purchase/i18n/sq.po
View File

@ -1585,7 +1585,7 @@ msgstr ""
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr ""
#. module: purchase

2
addons/purchase/i18n/sr.po
View File

@ -1600,7 +1600,7 @@ msgstr "PDV:"
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "Datum narudzbe"
#. module: purchase

2
addons/purchase/i18n/sr@latin.po
View File

@ -1600,7 +1600,7 @@ msgstr "PDV:"
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "Datum narudzbe"
#. module: purchase

2
addons/purchase/i18n/sv.po
View File

@ -1603,7 +1603,7 @@ msgstr "TVA:"
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "Datum beställd"
#. module: purchase

2
addons/purchase/i18n/th.po
View File

@ -1620,7 +1620,7 @@ msgstr ""
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr ""
#. module: purchase

2
addons/purchase/i18n/tlh.po
View File

@ -1584,7 +1584,7 @@ msgstr ""
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr ""
#. module: purchase

2
addons/purchase/i18n/tr.po
View File

@ -1674,7 +1674,7 @@ msgstr "TVA:"
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "Sipariş Tarihi"
#. module: purchase

2
addons/purchase/i18n/uk.po
View File

@ -1592,7 +1592,7 @@ msgstr ""
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "Дата заявки"
#. module: purchase

2
addons/purchase/i18n/vi.po
View File

@ -1585,7 +1585,7 @@ msgstr ""
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "Ngày đặt hàng"
#. module: purchase

2
addons/purchase/i18n/zh_CN.po
View File

@ -1605,7 +1605,7 @@ msgstr "增值税:"
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "下单日期"
#. module: purchase

2
addons/purchase/i18n/zh_TW.po
View File

@ -1584,7 +1584,7 @@ msgstr ""
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
msgid "Date Ordered"
msgid "Order Date"
msgstr "訂單日期"
#. module: purchase

4
addons/purchase/purchase.py
View File

@ -165,7 +165,7 @@ class purchase_order(osv.osv):
help="Reference of the document that generated this purchase order request."
),
'partner_ref': fields.char('Supplier Reference', states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, size=64),
'date_order':fields.date('Date Ordered', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, select=True, help="Date on which this document has been created."),
'date_order':fields.date('Order Date', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, select=True, help="Date on which this document has been created."),
'date_approve':fields.date('Date Approved', readonly=1, select=True, help="Date on which purchase order has been approved"),
'partner_id':fields.many2one('res.partner', 'Supplier', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, change_default=True),
'partner_address_id':fields.many2one('res.partner.address', 'Address', required=True,
@ -622,7 +622,7 @@ class purchase_order_line(osv.osv):
return result[1]
except Exception, ex:
return False
_columns = {
'name': fields.char('Description', size=256, required=True),
'product_qty': fields.float('Quantity', required=True, digits=(16,2)),

5
addons/purchase/purchase_view.xml
View File

@ -311,7 +311,7 @@
<field name="arch" type="xml">
<tree colors="grey:state=='cancel';blue:state in ('wait','confirmed');red:state in ('except_invoice','except_picking')" string="Purchase Order">
<field name="name" string="Reference"/>
<field name="date_order" string="Order Date"/>
<field name="date_order" />
<field name="partner_id"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<field name="location_id"/>
@ -406,9 +406,6 @@
<field name="product_uom"/>
<field name="price_subtotal"/>
<field name="date_planned" widget="date" width="135"/>
<field name="state" invisible="1"/>
<field name="invoiced" invisible="1"/>
</tree>

2
addons/purchase/report/order.rml
View File

@ -217,7 +217,7 @@
<para style="terp_tblheader_General_Centre">Your Order Reference</para>
</td>
<td>
<para style="terp_tblheader_General_Centre">Date Ordered</para>
<para style="terp_tblheader_General_Centre">Order Date</para>
</td>
<td>
<para style="terp_tblheader_General_Centre">Validated By</para>