ingadhoc/odoo-argentina#910
Created by fw-bot-adhoc
Merged
at ec1f8ff56d64c6d88c3e1ab3d186b0794cccd101
- label
- adhoc-dev:17.0-16.0-h-76148-mem-jasH-fw
- head
- ad3c257e41188047c163e20f71939887ab00327f
- target
- 17.0
- merged
- hace 1 mes by mem-adhoc
- forward-port of
- ingadhoc/odoo-argentina#890 DETACHED (conflicts: ('4bcaa50c402d85feffd9c4a6acf43f41a014d094', 'Auto-merging l10n_ar_purchase/__manifest__.py\nCONFLICT (content): Merge conflict in l10n_ar_purchase/__manifest__.py\n', "20:33:27.017736 git.c:444 trace: built-in: git cherry-pick 4bcaa50c402d85feffd9c4a6acf43f41a014d094\nerror: could not apply 4bcaa50c... [FIX] l10n_ar_purchase: Cambiamos los nombres de las fechas en los reportes de compra\nhint: after resolving the conflicts, mark the corrected paths\nhint: with 'git add <paths>' or 'git rm <paths>'\nhint: and commit the result with 'git commit'\n----------\nstatus:\n", ['4bcaa50c402d85feffd9c4a6acf43f41a014d094']) ('4bcaa50c402d85feffd9c4a6acf43f41a014d094', 'Auto-merging l10n_ar_purchase/__manifest__.py\nCONFLICT (content): Merge conflict in l10n_ar_purchase/__manifest__.py\n', "20:33:27.017736 git.c:444 trace: built-in: git cherry-pick 4bcaa50c402d85feffd9c4a6acf43f41a014d094\nerror: could not apply 4bcaa50c... [FIX] l10n_ar_purchase: Cambiamos los nombres de las fechas en los reportes de compra\nhint: after resolving the conflicts, mark the corrected paths\nhint: with 'git add <paths>' or 'git rm <paths>'\nhint: and commit the result with 'git commit'\n----------\nstatus:\n", ['4bcaa50c402d85feffd9c4a6acf43f41a014d094']))
[FW][FIX] l10n_ar_purchase: Cambiamos los nombres de las fechas en los reportes de compra
Ticket: 76148
Forward-Port-Of: ingadhoc/odoo-argentina#890