Odoo Addons (MOVED TO GITHUB)

lp://staging/~vrt-openerp/openobject-addons/6.1-trunk-bug-923440

Created by Stuart Longland on 2012-03-05 and last modified on 2012-04-18

A merge of https://code.launchpad.net/~openerp-community/openobject-addons/trunk-bug-923440-base_contact_finalise6.1 onto the mainline 6.1 branch of OpenERP.

Get this branch:: bzr branch lp://staging/~vrt-openerp/openobject-addons/6.1-trunk-bug-923440

Members of VRT Systems OpenERP Contributions can upload to this branch. Log in for directions.

Branch merges

No branches dependent on this one.

Ready for review for merging into lp://staging/openobject-addons/6.1

Amit Parik (community): Disapprove on 2012-04-30

OpenERP Core Team: Pending requested 2012-03-08

Superseded for merging into lp://staging/openobject-addons

OpenERP Core Team: Pending requested 2012-03-07

Diff: 23054 lines (+11150/-1264) (has conflicts)

109 files modified

account/i18n/el.po (+14/-2)
account/i18n/fr.po (+19/-10)
account/i18n/id.po (+48/-22)
account/i18n/mk.po (+25/-15)
account/i18n/nl.po (+259/-70)
account/i18n/pl.po (+12/-3)
account/i18n/ta.po (+12/-2)
account_analytic_analysis/i18n/nl.po (+9/-0)
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/nl.po (+72/-54)
account_asset/i18n/pt_BR.po (+49/-38)
account_budget/i18n/nl.po (+11/-2)
account_budget/i18n/pt_BR.po (+11/-1)
account_cancel/i18n/fa.po (+11/-1)
account_cancel/i18n/gu.po (+23/-0)
account_cancel/i18n/id.po (+14/-0)
account_check_writing/i18n/nl.po (+203/-0)
account_followup/i18n/fr.po (+21/-3)
account_followup/i18n/nl.po (+10/-1)
account_invoice_layout/i18n/nl.po (+10/-0)
account_payment/i18n/lv.po (+726/-0)
account_payment/i18n/nl.po (+15/-2)
account_voucher/i18n/fr.po (+70/-39)
account_voucher/i18n/gu.po (+1114/-0)
account_voucher/i18n/nl.po (+13/-4)
account_voucher/i18n/pl.po (+78/-38)
analytic/i18n/fr.po (+19/-6)
analytic_journal_billing_rate/i18n/fr.po (+14/-2)
analytic_journal_billing_rate/i18n/gu.po (+79/-0)
audittrail/i18n/fr.po (+15/-2)
audittrail/i18n/gu.po (+369/-0)
auth_openid/i18n/fr.po.OTHER (+112/-0)
base_action_rule/i18n/gu.po (+496/-0)
base_calendar/base_calendar.py (+13/-29)
base_calendar/i18n/fr.po (+23/-12)
base_contact/base_contact.py (+153/-25)
base_contact/base_contact_view.xml (+115/-29)
base_contact/i18n/fr.po (+24/-14)
base_contact/i18n/gu.po (+264/-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)
base_vat/i18n/gu.po (+75/-0)
board/i18n/fr.po (+12/-2)
caldav/i18n/fr.po (+15/-5)
caldav/i18n/nl.po (+10/-0)
crm/i18n/fr.po (+74/-51)
crm/i18n/it.po (+12/-1)
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/i18n/gu.po (+1003/-0)
document_webdav/i18n/fr.po (+15/-5)
email_template/i18n/nl.po (+9/-0)
fetchmail_hr_recruitment/i18n/fr.po (+32/-0)
fetchmail_hr_recruitment/i18n/pt.po (+32/-0)
google_map/i18n/gu.po (+35/-0)
hr/i18n/en_AU.po (+688/-0)
hr/i18n/id.po (+56/-35)
hr_payroll/i18n/gu.po (+1119/-0)
hr_payroll/i18n/nl.po (+10/-1)
hr_payroll_account/i18n/gu.po (+140/-0)
hr_timesheet/i18n/fr.po (+18/-7)
hr_timesheet_invoice/i18n/fr.po (+51/-26)
hr_timesheet_sheet/i18n/fr.po (+54/-20)
import_base/i18n/fr.po (+100/-0)
import_sugarcrm/i18n/ar.po (+404/-0)
mrp/i18n/fr.po (+12/-0)
mrp_subproduct/i18n/nl.po (+15/-1)
point_of_sale/i18n/bg.po (+209/-189)
point_of_sale/i18n/nl.po (+105/-87)
portal/i18n/nl.po (+9/-0)
product/i18n/es.po (+12/-2)
product/i18n/fr.po (+76/-23)
product/i18n/nl.po (+10/-1)
project/i18n/fr.po (+101/-68)
project/i18n/nl.po (+100/-69)
project_gtd/i18n/fr.po (+39/-28)
project_issue/i18n/fr.po (+35/-25)
project_issue/i18n/nl_BE.po (+981/-0)
project_issue_sheet/i18n/fr.po (+18/-1)
project_issue_sheet/i18n/nl.po (+15/-0)
project_issue_sheet/project_issue_sheet_view.xml (+1/-1)
project_long_term/i18n/fr.po (+41/-18)
project_mailgate/i18n/nl_BE.po (+79/-0)
project_mrp/i18n/nl.po (+14/-0)
project_timesheet/i18n/fr.po (+31/-9)
project_timesheet/i18n/nl.po (+13/-0)
purchase/i18n/fr.po (+13/-3)
purchase/i18n/nl.po (+24/-15)
sale/i18n/fr.po (+58/-32)
sale/i18n/lt.po (+41/-15)
sale_mrp/i18n/nl_BE.po (+53/-0)
share/i18n/nl.po (+9/-0)
stock/i18n/nl.po (+19/-8)
stock_location/i18n/nl.po (+10/-0)
warning/i18n/fr.po (+11/-1)
wiki/i18n/fr.po (+11/-1)

Related bugs

Bug #923440: Base_contact: Missing Fields in new design [6.1]	Wishlist	Invalid
Bug #940264: base_contact address required fields	Wishlist	Invalid

Link a bug report

Related blueprints

Branch information

Owner:: VRT Systems OpenERP Contributions

Project:: Odoo Addons (MOVED TO GITHUB)

Status:: Mature

Recent revisions

6750. By Stuart Longland on 2012-04-18

Rebase off upstream tree

6749. By Stuart Longland on 2012-03-16

base_contact: Add support for private addresses

This patch adds support for private contact addresses and allows for the UI to
pick out addresses of a given type by default based on the context.

Credit: Etienne Hirt

6748. By Stuart Longland on 2012-03-07

Rebase and merge with upstream

6747. By Stuart Longland on 2012-03-06

base_contact: Make contact_id OR partner_id required

Source and credit: Etienne Hirt
https://bugs.launchpad.net/openobject-addons/+bug/940264/comments/4

This patch mandates that at least one of contact_id OR partner_id (or both)
must be filled in for the object to be valid.

6746. By Stuart Longland on 2012-03-06

base_contact: Tweak order of address "names"

Tweak name_get so that it returns a string of the form:
FirstName LastName, Partner, City, Country
rather than the default:
Partner, FirstName, LastName, City, Country

IMO this should be locale dependent.

6745. By Stuart Longland on 2012-03-05

base_contact: Remove erronious security/base_contact_security.xml

Seems this is one of many rabbit droppings from the 6.0-branch of OpenERP.

6744. By Stuart Longland on 2012-03-05

Rebase and merge with upstream 6.1 branch

Credit goes to Etienne Hirt for putting the contributions together. Please see
https://code.launchpad.net/~openerp-community/openobject-addons/trunk-bug-923440-base_contact_finalise6.1

for the original commit log.

I tried to add these changes individually, but ran into numerous snags due to
the way the original branch was constructed (bzr merge won't work as the
branches do not share a common ancestor).

So all changes have been folded into one commit here, with the updates to .po
files filtered out as these seemed to be mostly noise.

6743. By Xavier ALT on 2012-04-17

[MERGE] report_webkit: handle more gracefull remove of 'lib_path' + fix test in l10n_ch

6742. By Launchpad Translations on behalf of openerp on 2012-04-17

Launchpad automatic translations update.

6741. By Launchpad Translations on behalf of openerp on 2012-04-16

Launchpad automatic translations update.

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

This branch contains Public information

Everyone can see this information.

Subscribers

Etienne Hirt

Stuart Longland