Migration to version 14.0

[OCA-git-bot]

Todo

https://github.com/OCA/maintainer-tools/wiki/Migration-to-version-14.0

Modules to migrate

Missing module? Check https://github.com/OCA/maintainer-tools/wiki/%5BFAQ%5D-Missing-modules-in-migration-issue-list

[alexis-via]

I'd like to migrate the module asterisk_click2dial, but I have a problem with git. Here is the error:

git clone [email protected]:OCA/connector-telephony
cd connector-telephony
git checkout origin/14.0 -b 14-mig-asterisk_click2dial
git format-patch --keep-subject --stdout origin/14.0..origin/12.0 -- asterisk_click2dial | git am -3 --keep

Then I get this error:

Applying: Initial import.
Applying: - smaller "Dial" button on partner contact
Applying: Vianney changed the name of the 'alert-info' field to 'alert_info'...
Applying: [FIX] WaitTime parameter is now really taken into account
Applying: Make error messages displayed on screen translatable.
Applying: - Add copyright headers in XML files
Applying: Country_prefix is now a "required" field.
Applying: Check that the user has a callerID.
Applying: First implementation of get_name_from_phone_number function
Applying: Much better function get_name_from_phone_number :
Applying: Add AGI script and its wrapper to manage timeout.
Applying: Don't put the admin user by default, it's not a good example.
Applying: Add a group "Asterisk CallerID" decidated to the CallerID name lookup feature
Applying: Better context handling
Applying: Update URL of the module documentation.
Applying: [FIX] There shouldn't be any space between the name and the phone number in the callerID instruction to Asterisk.
Applying: - Send CallerID to Asterisk as UTF-8 by default
Applying: Networking code is now IPv6-ready
Applying: [FIX] Avoid a view conflict with the "base_contact" module by adding a priority on the res.partner view.
Applying: [FIX] Base_contact also inherit the view base.view_partner_address_form1 and removes the "mobile" field, so I need to change the priority to this view too.
Applying: [FIX] Wrong if condition fixed
Applying: Avoid code duplication in views : the full tree/form view for Asterisk server now inherit from the tree/form view in the company form.
Applying: Changed author name to Akretion
Applying: Add support for XML-RPC secure with SSL.
Applying: Fallback to utf-8 if sys.stdout.encoding fails.
Applying: Create a dedicated Tab in the res_users view.
Applying: Start to clean the networking code :
Applying: Large code cleanup :
Applying: Cosmetic changes.
Applying: Convert to new logger API of OpenERP 6.1
Applying: Add translations from extra-trunk
Applying: [FIX] Fix issue in constraint function for res_users.
Applying: [IMP] Better AGI script :
Applying: New feature : add wizard that opens the partner form of the calling party
Applying: Remove purchase menu entry, because it would require a dependancy on the 'purchase' module.
Applying: Update the module description to add the new feature "open calling partner".
Applying: Improve (and fixes) the 'Open calling partner' function : better usability and less clicks
Applying: Add 2 screenshots.
Applying: For the feature "Open calling party", if the phone number is not in OpenERP, he proposes to create a new partner with this phone or mobile number.
Applying: Add user-specific alert-info option.
Applying: Add logo that will appear in the list of modules in web client
Applying: Convert the phone number to international format before writing it on the new partner.
Applying: Works even if national_prefix is empty.
Applying: Update translation file.
Applying: Add 'variable' field on res.users
Applying: [FIX] avoid a crash when emptying "contact to update"
Applying: Better error message.
Applying: Port asterisk_click2dial_crm to version 6.1 :
Applying: asterisk_click2dial_crm :
Applying: Patch courtesy of daemon dog :
Applying: Fix crahes when using the Web interface (these crashes did not occur with the Gtk Client)
Applying: Don't set readonly fields in the "open calling partner" wizard, to avoid calling default_get twice (and thus connect to asterisk twice)
Applying: Add Local/ as possible channel type
Applying: Now uses the phonenumber lib to reformat numbers in "clean" format and store them in E.164 format. Start to modify the code to take advantage of this great lib.
Applying: Add support for geolocalisation via the phonenumbers lib in the get_cid_name.py script. If you add --geoloc, the numbers that are not found in OpenERP will be geolocalized.
Applying: Display the country name only when it's not my own country. This make the option to display only the city useless IMHO, so I removed this option.
Applying: Add debug log, to help a user.
Applying: More debug and warning messages, to help a user in its debug.
Applying: [FIX] open calling partner should work again.
Applying: Now use a PATH variable in get_cid_name_timeout.sh
Applying: Use py-asterisk from http://code.google.com/p/py-asterisk/ (up-to-date mercurial version required) instead of our own code
Applying: Add some exclusion on CallerID for which we don't query openerp or try to geolocate.
Applying: Remove the import of the socket lib, that we don't use any more.
Applying: Port to OpenERP 7.0
Applying: Oups, fix my previous commit.
Applying: In the wizards, Instead of creating a new record and opening it, I open a new form with the values. It's better when using the Web interface, because it avoids a click on "Edit".
Applying: Add a country to "Your company" in demo data (required for this module).
Applying: [FIX] res.partner.address -> res.partner
Applying: Update views to take advantage of the new styles provided by OpenERP 7.0.
Applying: Remove <field name="type">form/tree</field> in `ir.ui.view` model (deprecated in OpenERP 7.0)
Applying: Cosmetic changes.
Applying: The number of digits to match from the end of the phone number is now configurable. This code is now fully located in the asterisk_click2dial module (removed from the "get_cid_name.py" script).
Applying: Country prefix now has an intelligent default value.
Applying: Update version number of the script get_cid_name.py, to make it easier to identify people who forgot to update it.
Applying: Remove Local/ from the list of chan types, because Originate doesn't work with Local/phonenumber.
Applying: Add encoding in the shell script get_cid_name_timeout.sh
Applying: Add read rights on asterisk.server for group "Asterisk CallerID"
Applying: Avoid a crash when the answer to the "Status" query doesn't contain what is expected.
Applying: [FIX] Adapt view inheritance of res.partner form to post-v7.0-release changes
Applying: Add compatibility with Asterisk 1.4 for the function "Open calling partner"
Applying: [IMP] Add Dial button in Lead and Opportunity views
Applying: Move the generic code from res.partner to a new object asterisk.common.
Using index info to reconstruct a base tree...
M	asterisk_click2dial/asterisk_click2dial.py
Falling back to patching base and 3-way merge...
Auto-merging asterisk_click2dial/asterisk_click2dial.py
CONFLICT (content): Merge conflict in asterisk_click2dial/asterisk_click2dial.py
error: Failed to merge in the changes.
Patch failed at 0082 Move the generic code from res.partner to a new object asterisk.common.
hint: Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
zsh: done       git format-patch --keep-subject --stdout origin/14.0..origin/12.0 --  | 
zsh: exit 128   git am -3 --keep

This is the first time I have a failure with this command... how is it possible ?

[pedrobaeza]

When this happens, it's usually because a merge commit inside a merge commit has been done. My usual trick when this happens:

• On a copy of the repository, do git checkout <sha_of_the_conflicting_commit>. Copy the module folder.
• On the copy where the conflict happens, remove the module folder.
• Paste the module folder from the other copy.
• git add --all and git am --continue.
• Probably another conflict will arise lately, that is the reversed one, but proceeding the same way will finally get to all completed.

The longer history about the source of this is that the merge commits do a tree and the diff order is not the same as traversing such tree in a plain commit history.

[Gretel5X]

Hello,

I would love to set this connector up for my company and we need version 14, so if I can help somehow, please let me know.
I proceeded just like @pedrobaeza described and it looks like I have a clean patch history now locally on a branch 14-mig-asterisk_click2dial.
I do not know if I can or should push?

[pedrobaeza]

You should push to your repository fork, and propose a pull request (https://opensource.com/article/19/7/create-pull-request-github), that should be reviewed according guidelines (https://github.com/OCA/odoo-community.org/blob/master/website/Contribution/CONTRIBUTING.rst#review)

[Gretel5X]

There already is #249 open by @alexis-via with more or less the same commits, should I still open another one?

[pedrobaeza]

Then no need. Just review the existing one, and point to any possible problem. If no problem, approve it for getting it merged.

[github-actions]

There hasn't been any activity on this issue in the past 6 months, so it has been marked as stale and it will be closed automatically if no further activity occurs in the next 30 days.
If you want this issue to never become stale, please ask a PSC member to apply the "no stale" label.