diff options
| author | pinky <> | 2007-01-22 05:38:00 +0000 |
|---|---|---|
| committer | pinky <> | 2007-01-22 05:38:00 +0000 |
| commit | 98fcbe1b18e19ea91c66ffa76f6940b4a2ac59b5 (patch) | |
| tree | 4349df69c4ecf990250ae115199bc80292493c09 | |
| parent | f80ff1a22be14219287961393d53d2ab7bf8e28a (diff) | |
Modifs
bzr revid: pinky-e3f7017bac63cf667a7db5c141a3702543e457ef
| -rw-r--r-- | addons/account/invoice.py | 2 | ||||
| -rwxr-xr-x | addons/crm/scripts/tinyerp-mailgate/fetchmailrc | 2 | ||||
| -rw-r--r-- | addons/hr_timesheet/hr_timesheet.py | 3 | ||||
| -rw-r--r-- | addons/purchase_discount/purchase_discount_report.xml | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/addons/account/invoice.py b/addons/account/invoice.py index d0c2f44064d..ed78d5025a8 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -94,7 +94,7 @@ class account_invoice(osv.osv): 'number': fields.char('Invoice Number', size=32,readonly=True), 'reference': fields.char('Invoice Reference', size=64), - 'project_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True, states={'draft':[('readonly',False)]}), + 'project_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True, states={'draft':[('readonly',False)]}, relate=True), 'comment': fields.text('Additionnal Information'), 'state': fields.selection([ diff --git a/addons/crm/scripts/tinyerp-mailgate/fetchmailrc b/addons/crm/scripts/tinyerp-mailgate/fetchmailrc index 7b44d958d22..9b9b04e6826 100755 --- a/addons/crm/scripts/tinyerp-mailgate/fetchmailrc +++ b/addons/crm/scripts/tinyerp-mailgate/fetchmailrc @@ -1,5 +1,5 @@ # .fetchmailrc poll pop.tiny.be proto pop3: -username testsup@tiny.be password tiny mda "/home/pinky/code/terp/trunk/server/bin/addons/crm/scripts/tinyerp-mailgate/tinyerp-mailgate.py -u3 -padmin -ssupport -etestsup@tiny.be -dfp@tiny.be" +username efl@tiny.be password fle843 mda "/home/pinky/code/terp/trunk/server/bin/addons/crm/scripts/tinyerp-mailgate/tinyerp-mailgate.py -u3 -padmin -ssupport -eefl@tiny.be -mfp@tiny.be -dterp" diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py index c53a07e5558..530d490c9af 100644 --- a/addons/hr_timesheet/hr_timesheet.py +++ b/addons/hr_timesheet/hr_timesheet.py @@ -58,7 +58,8 @@ class hr_analytic_timesheet(osv.osv): return super(hr_analytic_timesheet, self).unlink(cr, uid, ids, context) def on_change_unit_amount(self, cr, uid, id, prod_id, unit_amount, unit, context={}): - return self.pool.get('account.analytic.line').on_change_unit_amount(cr, uid, id, prod_id, unit_amount,unit, context) + res = self.pool.get('account.analytic.line').on_change_unit_amount(cr, uid, id, prod_id, unit_amount,unit, context) + return res def _getEmployeeProduct(self, cr, uid, context): emp_obj = self.pool.get('hr.employee') diff --git a/addons/purchase_discount/purchase_discount_report.xml b/addons/purchase_discount/purchase_discount_report.xml index af653d79cbb..91bccdd6177 100644 --- a/addons/purchase_discount/purchase_discount_report.xml +++ b/addons/purchase_discount/purchase_discount_report.xml @@ -3,7 +3,7 @@ <data> <report id="purchase.report_purchase_order" name="purchase.order" - string="Print Order" + string="Print Orders" model="purchase.order" rml="purchase_discount/report/order.rml" auto="False"/> |