lp://staging/~vrt-openerp/openobject-addons/addons-6.1
- Get this branch:
- bzr branch lp://staging/~vrt-openerp/openobject-addons/addons-6.1
Branch merges
- OpenERP Core Team: Pending requested
-
Diff: 13043 lines (+4554/-957) (has conflicts)73 files modifiedaccount/i18n/fr.po (+19/-10)
account/i18n/nl.po (+106/-44)
account/i18n/pl.po (+12/-3)
account_anglo_saxon/i18n/fr.po (+14/-4)
account_anglo_saxon/i18n/nl_BE.po (+100/-0)
account_asset/i18n/fr.po (+48/-27)
account_asset/i18n/pt_BR.po (+49/-38)
account_budget/i18n/pt_BR.po (+11/-1)
account_check_writing/i18n/nl.po (+201/-0)
account_followup/i18n/fr.po (+21/-3)
account_payment/i18n/lv.po (+726/-0)
account_voucher/i18n/fr.po (+70/-39)
account_voucher/i18n/nl.po (+12/-3)
account_voucher/i18n/pl.po (+78/-38)
analytic/i18n/fr.po (+19/-6)
analytic_journal_billing_rate/i18n/fr.po (+14/-2)
audittrail/i18n/fr.po (+15/-2)
auth_openid/i18n/fr.po.OTHER (+112/-0)
base_calendar/i18n/fr.po (+23/-12)
base_contact/base_contact.py (+151/-23)
base_contact/base_contact_view.xml (+110/-29)
base_contact/i18n/fr.po (+24/-14)
base_contact/security/base_contact_security.xml (+14/-0)
base_contact/security/ir.model.access.csv (+2/-1)
base_iban/i18n/es.po (+15/-3)
base_iban/i18n/fr.po (+19/-5)
base_module_doc_rst/i18n/fr.po (+17/-1)
base_module_quality/i18n/fr.po (+17/-7)
base_module_record/i18n/fr.po (+15/-0)
base_setup/i18n/fr.po (+34/-16)
base_synchro/i18n/fr.po (+11/-1)
base_tools/i18n/nl_BE.po (+32/-0)
base_vat/i18n/es.po (+15/-5)
base_vat/i18n/fr.po (+14/-3)
board/i18n/fr.po (+12/-2)
caldav/i18n/fr.po (+15/-5)
crm/i18n/fr.po (+74/-51)
crm/i18n/it.po (+12/-1)
crm/report/crm_lead_report.py (+4/-0)
crm/report/crm_lead_report_view.xml (+93/-3)
crm_caldav/i18n/nl_BE.po (+33/-0)
crm_helpdesk/i18n/fr.po (+18/-8)
decimal_precision/i18n/nl_BE.po (+49/-0)
document/i18n/fr.po (+23/-7)
document_webdav/i18n/fr.po (+15/-5)
fetchmail_hr_recruitment/i18n/pt.po (+32/-0)
hr_payroll/i18n/nl.po (+10/-1)
hr_timesheet/i18n/fr.po (+18/-7)
hr_timesheet_invoice/i18n/fr.po (+51/-26)
hr_timesheet_sheet/hr_timesheet_sheet_view.xml (+1/-1)
hr_timesheet_sheet/i18n/fr.po (+54/-20)
mrp/i18n/fr.po (+12/-0)
point_of_sale/i18n/bg.po (+209/-189)
point_of_sale/i18n/nl.po (+105/-87)
product/i18n/es.po (+12/-2)
product/i18n/nl.po (+10/-1)
project/i18n/nl.po (+100/-69)
project/project.py (+7/-2)
project/project_view.xml (+3/-0)
project_issue/i18n/fr.po (+34/-24)
project_issue/i18n/nl_BE.po (+981/-0)
project_long_term/project_long_term.py (+24/-2)
project_mailgate/i18n/nl_BE.po (+79/-0)
project_timesheet/i18n/nl.po (+13/-0)
purchase/i18n/nl.po (+13/-4)
resource/faces/pcalendar.py (+10/-1)
resource/resource.py (+99/-46)
sale/i18n/fr.po (+58/-32)
sale/i18n/lt.po (+41/-15)
sale_mrp/i18n/nl_BE.po (+53/-0)
stock/i18n/nl.po (+15/-4)
warning/i18n/fr.po (+11/-1)
wiki/i18n/fr.po (+11/-1)
Branch information
Recent revisions
- 6660. By Stuart Longland
-
crm_lead_report: Fix broken init function
SQL was complaining we specified id twice, so we call the latter
occurance lead_id. That keeps it happy. - 6659. By Stuart Longland
-
crm: Allow lead report to show individual leads
This allows the end user to navigate to an individual lead (for now via
an intermediate form). The form will need some prettying up, but at
least now if there's a heap of leads in one group, we can differentiate
them now.This also reverts my earlier commit, which broke things.
- 6658. By Stuart Longland
-
crm: Hide "Lead" in search view of Opportunities
They don't have "lead" fields, as the lead has been already converted to
a partner by this stage. - 6656. By Stuart Longland
-
hr_timesheet_sheet: Fix user_id default value
OpenERP 6.1-1 currently fails to fill in the user_id field. On submission of a
timesheet line, the end user finds the system rejects the entered data on the
basis that the user_id field is invalid. Being a hidden field, it is
impossible for the end user to correct this.The following seems to fix the problem here.
- 6655. By Stuart Longland
-
project_long_term: Skip cancelled or done tasks.
These are skipped when generating the project description for faces to manage,
therefore they should also be skipped when collecting results. - 6654. By Stuart Longland
-
project_
long_term. schedule_ phases: Skip projects with no phases Projects that have no phases by definition cannot be scheduled via the "Schedule Phases" algorithm. When one attempts to do this, the following is emitted to Faces:
from resource.faces import *
import datetimedef Project():
resulting in the following stack trace:
[2012-02-17 02:07:29,
630][developmen t61] ERROR:web- services: Uncaught exception
Traceback (most recent call last):
File "/usr/lib64/python2. 7/site- packages/ openerp- 6.1rc1_ 20120112_ 173907- py2.7.egg/ openerp/ osv/osv. py", line 120, in wrapper
return f(self, dbname, *args, **kwargs)
File "/usr/lib64/python2. 7/site- packages/ openerp- 6.1rc1_ 20120112_ 173907- py2.7.egg/ openerp/ osv/osv. py", line 175, in execute
res = self.execute_cr(cr, uid, obj, method, *args, **kw)
File "/usr/lib64/python2. 7/site- packages/ openerp- 6.1rc1_ 20120112_ 173907- py2.7.egg/ openerp/ osv/osv. py", line 163, in execute_cr
return getattr(object, method)(cr, uid, *args, **kw)
File "/usr/lib64/python2. 7/site- packages/ openerp- 6.1rc1_ 20120112_ 173907- py2.7.egg/ openerp/ addons/ project_ long_term/ wizard/ project_ compute_ phases. py", line 39, in check_selection
return self.compute_date(cr, uid, ids, context=context)
File "/usr/lib64/python2. 7/site- packages/ openerp- 6.1rc1_ 20120112_ 173907- py2.7.egg/ openerp/ addons/ project_ long_term/ wizard/ project_ compute_ phases. py", line 55, in compute_date
project_pool.schedule_ phases( cr, uid, project_ids, context=context)
File "/usr/lib64/python2. 7/site- packages/ openerp- 6.1rc1_ 20120112_ 173907- py2.7.egg/ openerp/ addons/ project_ long_term/ project_ long_term. py", line 238, in schedule_phases
exec result in local_dict
File "<string>", line 5^
IndentationError: expected an indented blockThis is a partial fix. The user should be warned as to what projects have been
skipped or at least, given the opportunity to schedule the tasks for those
projects. - 6653. By Stuart Longland
-
project.task: Revert r6627 and add note
It seems work_load is, and always will be, given to me as an int. As faces
crashes rather badly when load = 0 (division by zero), we will consider 0 as
being None or False as before.So entering an explicit 0, will be treated as 100, as for now I'm unable to distinguish between a literal 0 and a blank field.
My TODO items:
- Can 0 and blank be distinguished somehow?
- Can the UI enforce work_load > 0? work_load <= 0 should never be allowed. - 6652. By Stuart Longland
-
crm.lead.report: Make partner_name read-only
To make it consistent with the other fields.
- 6651. By Stuart Longland
-
project.task: Check work_load is an int
I just realised that 0.0 is effectly treated as False or None. Better to
explicitly check that it's an integer (it should be), and only substitute load
= 1.0 if the field is not an int (i.e. False or None).
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/openobject-addons