Amit Parmar (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-leave_status_report_improve-aar into
lp:~openerp-dev/openobject-addons/trunk-leave_status_report-uco.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-leave_status_report_improve-aar/+merge/81256
Hello Mam,
I have made changes as you mentioned in leave status report
Thanks,
Amit Parmar
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-leave_status_report_improve-aar/+merge/81256
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-leave_status_report_improve-aar into
lp:~openerp-dev/openobject-addons/trunk-leave_status_report-uco.
=== modified file 'account/wizard/account_reconcile.py'
--- account/wizard/account_reconcile.py 2011-09-19 13:36:00 +0000
+++ account/wizard/account_reconcile.py 2011-11-04 10:42:32 +0000
@@ -158,7 +158,7 @@
journal_id = data['journal_id'][0]
context['comment'] = data['comment']
if data['analytic_id']:
- context['analytic_id'] = data['analytic_id']
+ context['analytic_id'] = data['analytic_id'][0]
if context['date_p']:
date = context['date_p']
=== modified file 'hr_holidays/hr_holidays.py'
--- hr_holidays/hr_holidays.py 2011-11-02 12:23:03 +0000
+++ hr_holidays/hr_holidays.py 2011-11-04 10:42:32 +0000
@@ -143,7 +143,7 @@
key = diff_months[1][0]
if diff_months[0][0] > diff_months[1][0]:
key = diff_months[0][0]
- result[key] = diff_months[1][1] - diff_months[0][1]
+ result[key] = result[hol.id] + diff_months[1][1] - diff_months[0][1] - 1
else:
result[hol.id] = 0
return result
=== modified file 'hr_holidays/hr_holidays_data.xml'
--- hr_holidays/hr_holidays_data.xml 2011-07-22 11:31:47 +0000
+++ hr_holidays/hr_holidays_data.xml 2011-11-04 10:42:32 +0000
@@ -25,7 +25,7 @@
<!--Unpaid Leave -->
<record model="hr.holidays.status" id="holiday_status_unpaid">
- <field name="name">Unpaid</field>
+ <field name="name">Unpaid Leaves</field>
<field name="limit">True</field>
<field name="color_name">brown</field>
</record>
=== modified file 'hr_holidays/report/holidays_status_of_employees.py'
--- hr_holidays/report/holidays_status_of_employees.py 2011-11-02 12:23:03 +0000
+++ hr_holidays/report/holidays_status_of_employees.py 2011-11-04 10:42:32 +0000
@@ -27,6 +27,7 @@
def __init__(self, cr, uid, name, context=None):
super(holidays_status, self).__init__(cr, uid, name, context=context)
self.months = {}
+ self.previous_month_carry = 0
self.localcontext.update({
'time': time,
'get_data': self._get_data,
@@ -64,11 +65,20 @@
def _get_monthly_data(self, obj, month, value):
data = 0
+ flag = False
for res in self.months.get(obj):
if not month:
data = res[value]
+ self.previous_month_carry = 0
+ flag = True
elif res['month'] == month:
data += res[value]
+ flag = True
+ if value == 'cf':
+ self.previous_month_carry = res['cf']
+ if not flag and month and value == 'cf':
+ self.previous_month_carry += 1
+ data = self.previous_month_carry
return data
report_sxw.report_sxw('report.holidays.status', 'hr.holidays', 'addons/hr_holidays/report/holidays_status_of_employees.rml', parser=holidays_status, header="internal landscape")
=== modified file 'project/project.py'
--- project/project.py 2011-10-26 13:51:02 +0000
+++ project/project.py 2011-11-04 10:42:32 +0000
@@ -45,6 +45,7 @@
_defaults = {
'sequence': 1
}
+ _order = 'sequence'
project_task_type()
class project(osv.osv):
=== modified file 'purchase/i18n/ar.po'
--- purchase/i18n/ar.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/ar.po 2011-11-04 10:42:32 +0000
@@ -1584,7 +1584,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr ""
#. module: purchase
=== modified file 'purchase/i18n/bg.po'
--- purchase/i18n/bg.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/bg.po 2011-11-04 10:42:32 +0000
@@ -1606,7 +1606,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr ""
#. module: purchase
=== modified file 'purchase/i18n/bs.po'
--- purchase/i18n/bs.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/bs.po 2011-11-04 10:42:32 +0000
@@ -1599,7 +1599,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr "Datum nabavnog naloga"
#. module: purchase
=== modified file 'purchase/i18n/ca.po'
--- purchase/i18n/ca.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/ca.po 2011-11-04 10:42:32 +0000
@@ -1684,7 +1684,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr "Data ordenada"
#. module: purchase
=== modified file 'purchase/i18n/cs.po'
--- purchase/i18n/cs.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/cs.po 2011-11-04 10:42:32 +0000
@@ -1615,7 +1615,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr "Datum objednání"
#. module: purchase
=== modified file 'purchase/i18n/da.po'
--- purchase/i18n/da.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/da.po 2011-11-04 10:42:32 +0000
@@ -1585,7 +1585,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr ""
#. module: purchase
=== modified file 'purchase/i18n/de.po'
--- purchase/i18n/de.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/de.po 2011-11-04 10:42:32 +0000
@@ -1705,7 +1705,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr "Auftragsdatum"
#. module: purchase
=== modified file 'purchase/i18n/el.po'
--- purchase/i18n/el.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/el.po 2011-11-04 10:42:32 +0000
@@ -1609,7 +1609,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr "Ημερ/νία Παραγγελίας"
#. module: purchase
=== modified file 'purchase/i18n/en_GB.po'
--- purchase/i18n/en_GB.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/en_GB.po 2011-11-04 10:42:32 +0000
@@ -1585,7 +1585,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr ""
#. module: purchase
=== modified file 'purchase/i18n/es.po'
--- purchase/i18n/es.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/es.po 2011-11-04 10:42:32 +0000
@@ -1678,7 +1678,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr "Fecha ordenado"
#. module: purchase
=== modified file 'purchase/i18n/es_AR.po'
--- purchase/i18n/es_AR.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/es_AR.po 2011-11-04 10:42:32 +0000
@@ -1605,7 +1605,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr "Fecha ordenada"
#. module: purchase
=== modified file 'purchase/i18n/es_CL.po'
--- purchase/i18n/es_CL.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/es_CL.po 2011-11-04 10:42:32 +0000
@@ -1666,7 +1666,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr "Fecha ordenado"
#. module: purchase
=== modified file 'purchase/i18n/es_EC.po'
--- purchase/i18n/es_EC.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/es_EC.po 2011-11-04 10:42:32 +0000
@@ -1622,7 +1622,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr "Fecha ordenado"
#. module: purchase
=== modified file 'purchase/i18n/es_MX.po'
--- purchase/i18n/es_MX.po 2011-10-09 04:24:10 +0000
+++ purchase/i18n/es_MX.po 2011-11-04 10:42:32 +0000
@@ -1515,7 +1515,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr "Ordenado por Fecha"
#. module: purchase
=== modified file 'purchase/i18n/et.po'
--- purchase/i18n/et.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/et.po 2011-11-04 10:42:32 +0000
@@ -1619,7 +1619,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr "Tellimise kuupäev"
#. module: purchase
=== modified file 'purchase/i18n/fi.po'
--- purchase/i18n/fi.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/fi.po 2011-11-04 10:42:32 +0000
@@ -1655,7 +1655,7 @@
#. 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
=== modified file 'purchase/i18n/fr.po'
--- purchase/i18n/fr.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/fr.po 2011-11-04 10:42:32 +0000
@@ -1692,7 +1692,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr "Date de Commande"
#. module: purchase
=== modified file 'purchase/i18n/gl.po'
--- purchase/i18n/gl.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/gl.po 2011-11-04 10:42:32 +0000
@@ -1585,7 +1585,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr ""
#. module: purchase
=== modified file 'purchase/i18n/hr.po'
--- purchase/i18n/hr.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/hr.po 2011-11-04 10:42:32 +0000
@@ -1585,7 +1585,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr ""
#. module: purchase
=== modified file 'purchase/i18n/hu.po'
--- purchase/i18n/hu.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/hu.po 2011-11-04 10:42:32 +0000
@@ -1676,7 +1676,7 @@
#. 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
=== modified file 'purchase/i18n/id.po'
--- purchase/i18n/id.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/id.po 2011-11-04 10:42:32 +0000
@@ -1657,7 +1657,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr "Tanggal pemesanan"
#. module: purchase
=== modified file 'purchase/i18n/it.po'
--- purchase/i18n/it.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/it.po 2011-11-04 10:42:32 +0000
@@ -1671,7 +1671,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr "Data ordine"
#. module: purchase
=== modified file 'purchase/i18n/ko.po'
--- purchase/i18n/ko.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/ko.po 2011-11-04 10:42:32 +0000
@@ -1588,7 +1588,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr "주문 날짜"
#. module: purchase
=== modified file 'purchase/i18n/lt.po'
--- purchase/i18n/lt.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/lt.po 2011-11-04 10:42:32 +0000
@@ -1590,7 +1590,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr "Užsakymo data"
#. module: purchase
=== modified file 'purchase/i18n/mn.po'
--- purchase/i18n/mn.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/mn.po 2011-11-04 10:42:32 +0000
@@ -1606,7 +1606,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr "Захиалсан огноо"
#. module: purchase
=== modified file 'purchase/i18n/nb.po'
--- purchase/i18n/nb.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/nb.po 2011-11-04 10:42:32 +0000
@@ -1595,7 +1595,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr "Ordredato"
#. module: purchase
=== modified file 'purchase/i18n/nl.po'
--- purchase/i18n/nl.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/nl.po 2011-11-04 10:42:32 +0000
@@ -1674,7 +1674,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr "Besteldatum"
#. module: purchase
=== modified file 'purchase/i18n/nl_BE.po'
--- purchase/i18n/nl_BE.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/nl_BE.po 2011-11-04 10:42:32 +0000
@@ -1584,7 +1584,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr ""
#. module: purchase
=== modified file 'purchase/i18n/pl.po'
--- purchase/i18n/pl.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/pl.po 2011-11-04 10:42:32 +0000
@@ -1665,7 +1665,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr "Data zamówienia"
#. module: purchase
=== modified file 'purchase/i18n/pt.po'
--- purchase/i18n/pt.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/pt.po 2011-11-04 10:42:32 +0000
@@ -1616,7 +1616,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr "Data do pedido"
#. module: purchase
=== modified file 'purchase/i18n/pt_BR.po'
--- purchase/i18n/pt_BR.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/pt_BR.po 2011-11-04 10:42:32 +0000
@@ -1683,7 +1683,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr "Data do Pedido"
#. module: purchase
=== modified file 'purchase/i18n/purchase.pot'
--- purchase/i18n/purchase.pot 2011-05-30 10:32:02 +0000
+++ purchase/i18n/purchase.pot 2011-11-04 10:42:32 +0000
@@ -1511,7 +1511,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr ""
#. module: purchase
=== modified file 'purchase/i18n/ro.po'
--- purchase/i18n/ro.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/ro.po 2011-11-04 10:42:32 +0000
@@ -1642,7 +1642,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr "Data comenzii"
#. module: purchase
=== modified file 'purchase/i18n/ru.po'
--- purchase/i18n/ru.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/ru.po 2011-11-04 10:42:32 +0000
@@ -1626,7 +1626,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr "Дата заказа"
#. module: purchase
=== modified file 'purchase/i18n/sk.po'
--- purchase/i18n/sk.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/sk.po 2011-11-04 10:42:32 +0000
@@ -1586,7 +1586,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr ""
#. module: purchase
=== modified file 'purchase/i18n/sl.po'
--- purchase/i18n/sl.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/sl.po 2011-11-04 10:42:32 +0000
@@ -1594,7 +1594,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr "Datum naročila"
#. module: purchase
=== modified file 'purchase/i18n/sq.po'
--- purchase/i18n/sq.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/sq.po 2011-11-04 10:42:32 +0000
@@ -1585,7 +1585,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr ""
#. module: purchase
=== modified file 'purchase/i18n/sr.po'
--- purchase/i18n/sr.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/sr.po 2011-11-04 10:42:32 +0000
@@ -1600,7 +1600,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr "Datum narudzbe"
#. module: purchase
=== modified file 'purchase/i18n/[email protected]'
--- purchase/i18n/[email protected] 2011-10-19 05:53:43 +0000
+++ purchase/i18n/[email protected] 2011-11-04 10:42:32 +0000
@@ -1600,7 +1600,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr "Datum narudzbe"
#. module: purchase
=== modified file 'purchase/i18n/sv.po'
--- purchase/i18n/sv.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/sv.po 2011-11-04 10:42:32 +0000
@@ -1603,7 +1603,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr "Datum beställd"
#. module: purchase
=== modified file 'purchase/i18n/th.po'
--- purchase/i18n/th.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/th.po 2011-11-04 10:42:32 +0000
@@ -1620,7 +1620,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr ""
#. module: purchase
=== modified file 'purchase/i18n/tlh.po'
--- purchase/i18n/tlh.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/tlh.po 2011-11-04 10:42:32 +0000
@@ -1584,7 +1584,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr ""
#. module: purchase
=== modified file 'purchase/i18n/tr.po'
--- purchase/i18n/tr.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/tr.po 2011-11-04 10:42:32 +0000
@@ -1674,7 +1674,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr "Sipariş Tarihi"
#. module: purchase
=== modified file 'purchase/i18n/uk.po'
--- purchase/i18n/uk.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/uk.po 2011-11-04 10:42:32 +0000
@@ -1592,7 +1592,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr "Дата заявки"
#. module: purchase
=== modified file 'purchase/i18n/vi.po'
--- purchase/i18n/vi.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/vi.po 2011-11-04 10:42:32 +0000
@@ -1585,7 +1585,7 @@
#. 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
=== modified file 'purchase/i18n/zh_CN.po'
--- purchase/i18n/zh_CN.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/zh_CN.po 2011-11-04 10:42:32 +0000
@@ -1605,7 +1605,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr "下单日期"
#. module: purchase
=== modified file 'purchase/i18n/zh_TW.po'
--- purchase/i18n/zh_TW.po 2011-10-19 05:53:43 +0000
+++ purchase/i18n/zh_TW.po 2011-11-04 10:42:32 +0000
@@ -1584,7 +1584,7 @@
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,date_order:0
-msgid "Date Ordered"
+msgid "Order Date"
msgstr "訂單日期"
#. module: purchase
=== modified file 'purchase/purchase.py'
--- purchase/purchase.py 2011-10-18 08:42:34 +0000
+++ purchase/purchase.py 2011-11-04 10:42:32 +0000
@@ -165,7 +165,7 @@
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 @@
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)),
=== modified file 'purchase/purchase_view.xml'
--- purchase/purchase_view.xml 2011-10-25 15:21:55 +0000
+++ purchase/purchase_view.xml 2011-11-04 10:42:32 +0000
@@ -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>
=== modified file 'purchase/report/order.rml'
--- purchase/report/order.rml 2011-10-02 17:31:16 +0000
+++ purchase/report/order.rml 2011-11-04 10:42:32 +0000
@@ -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>
=== modified file 'purchase/report/order.sxw'
Binary files purchase/report/order.sxw 2011-01-14 00:11:01 +0000 and purchase/report/order.sxw 2011-11-04 10:42:32 +0000 differ
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
