Skip to content

Commit

Permalink
Merge pull request #180 from ecino/emanuel
Browse files Browse the repository at this point in the history
Last corrections for go-live
  • Loading branch information
ecino authored Jan 27, 2017
2 parents 313d377 + 4f72285 commit 2ac78e2
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 27 deletions.
62 changes: 38 additions & 24 deletions partner_communication_switzerland/i18n/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: Odoo Server 8.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-01-26 13:48+0100\n"
"PO-Revision-Date: 2017-01-26 13:49+0100\n"
"PO-Revision-Date: 2017-01-27 08:24+0100\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"Language: it\n"
Expand All @@ -34,20 +34,22 @@ msgid ""
"1 LSV or Direct Debit authorization form to fill in if you don't already "
"have done it!"
msgstr ""
"1 LSV o addebitto diretto vi preghiamo di riempire il formulario per "
"l'addebito diretto se non l'avete già fatto"

#. module: partner_communication_switzerland
#: code:addons/partner_communication_switzerland/models/contracts.py:56
#, python-format
msgid "1 payment slip for the annual sponsorship payment"
msgstr ""
msgstr "1 BVR per il sostegno annuale"

#. module: partner_communication_switzerland
#: code:addons/partner_communication_switzerland/models/contracts.py:44
#, python-format
msgid ""
"1 payment slip to set up a standing order (monthly payment of the "
"sponsorship)"
msgstr ""
msgstr "1 BVR per l'ordine permanente (pagamento mensile per il sostegno) "

#. module: partner_communication_switzerland
#: model:email.template,subject:partner_communication_switzerland.email_sponsorship_anniversary_10
Expand Down Expand Up @@ -2384,11 +2386,15 @@ msgstr "Birthday paid"
#: model:email.template,subject:partner_communication_switzerland.email_child_transfer
msgid "Change of reference for your child ${object.get_objects().firstname}"
msgstr ""
"Cambiamento del codice di referenza del vostro bambino ${object."
"get_objects().firstname}"

#. module: partner_communication_switzerland
#: model:email.template,subject:partner_communication_switzerland.email_hold_removal
msgid "Child ${object.get_objects().child_id.local_id} removal notification"
msgstr ""
"Bambino ${object.get_objects().child_id.local_id} removal notificationNuova "
"proposta di sostegno"

#. module: partner_communication_switzerland
#: model:ir.model,name:partner_communication_switzerland.model_compassion_child_ble
Expand Down Expand Up @@ -2630,18 +2636,22 @@ msgid ""
"New notes for ${object.get_objects().get_list('firstname', 3, 'your "
"children')}"
msgstr ""
"Delle novità di ${object.get_objects().get_list('firstname', 3, 'vostri "
"figlioli')}"

#. module: partner_communication_switzerland
#: model:email.template,subject:partner_communication_switzerland.email_biennial
msgid ""
"New photo for ${object.get_objects().get_list('firstname', 3, 'your "
"children')}"
msgstr ""
"Nuova foto per ${object.get_objects().get_list('firstname', 3, 'vostri "
"figlioli')}"

#. module: partner_communication_switzerland
#: model:email.template,subject:partner_communication_switzerland.email_sponsorship_sub_dossier
msgid "New sponsorship proposal"
msgstr ""
msgstr "Nuova proposta di sostegno"

#. module: partner_communication_switzerland
#: field:compassion.hold,no_money_extension_duration:0
Expand Down Expand Up @@ -2690,7 +2700,7 @@ msgstr "Partner"
#: model:email.template,subject:partner_communication_switzerland.email_sponsorship_waiting_reminder_1
#: model:email.template,subject:partner_communication_switzerland.email_sponsorship_waiting_reminder_2
msgid "Payment reminder"
msgstr ""
msgstr "Richiamo pagamento"

#. module: partner_communication_switzerland
#: field:recurring.contract,payment_type_attachment:0
Expand Down Expand Up @@ -2742,22 +2752,22 @@ msgstr "Informazione riguardo ${object.get_objects().old_firstname}"
#. module: partner_communication_switzerland
#: model:email.template,subject:partner_communication_switzerland.email_sponsorship_waiting_reminder_3
msgid "Sponsorship Cancellation"
msgstr ""
msgstr "Annullazione del sostegno"

#. module: partner_communication_switzerland
#: model:email.template,subject:partner_communication_switzerland.email_sponsorship_completion
msgid "Sponsorship Completion"
msgstr ""
msgstr "Completamento del percorso"

#. module: partner_communication_switzerland
#: model:email.template,subject:partner_communication_switzerland.email_child_unplanned_exit
msgid "Sponsorship cancellation"
msgstr ""
msgstr "Annullazione del sostegno"

#. module: partner_communication_switzerland
#: model:email.template,subject:partner_communication_switzerland.email_child_planned_exit
msgid "Sponsorship completion"
msgstr ""
msgstr "Completamento del percorso"

#. module: partner_communication_switzerland
#: field:correspondence,communication_state:0
Expand Down Expand Up @@ -2786,7 +2796,7 @@ msgstr ""
msgid ""
"We will continue to withdraw the amount for the sponsorship from your "
"account."
msgstr ""
msgstr "Continueremo a prelevare la somma per il sostegno dal vostro conto"

#. module: partner_communication_switzerland
#: model:email.template,subject:partner_communication_switzerland.email_sponsorship_birthday_reminder
Expand All @@ -2806,19 +2816,23 @@ msgstr "You can download an archive file of child pictures to order from here."
msgid ""
"You received a letter from ${object.get_objects().mapped('child_id')."
"get_list('firstname', 3, 'your children')}!"
msgstr ""
msgstr "Una nuova lettera del vostro bambino è arrivata!"

#. module: partner_communication_switzerland
#: model:email.template,subject:partner_communication_switzerland.email_child_reinstatement
msgid "Your child ${object.get_objects().firstname} is back in project."
msgstr ""
"Il vostro bambino ${object.get_objects().firstname} è tornato al centro "
"Compassion"

#. module: partner_communication_switzerland
#: model:email.template,subject:partner_communication_switzerland.email_child_transition
msgid ""
"Your child ${object.get_objects().firstname} transitioned to ${object."
"get_objects().cdsp_type} Sponsorship"
msgstr ""
"Il vostro bambino ${object.get_objects().firstname} transitioned to ${object."
"get_objects().cdsp_type} Sostegno "

#. module: partner_communication_switzerland
#: model:email.template,subject:partner_communication_switzerland.email_project_lifecycle
Expand All @@ -2830,12 +2844,12 @@ msgstr "Your children's icp had an event."
#: model:email.template,subject:partner_communication_switzerland.email_sponsorship_dossier_correspondent
#: model:email.template,subject:partner_communication_switzerland.email_sponsorship_dossier_payer
msgid "Your new sponsorship"
msgstr ""
msgstr "Il vostro nuovo sostegno"

#. module: partner_communication_switzerland
#: model:email.template,subject:partner_communication_switzerland.email_sponsorship_no_sub
msgid "Your request to end the sponsorship program"
msgstr ""
msgstr "La vostra richiesta per uscire dal programma di sostegno"

#. module: partner_communication_switzerland
#: field:correspondence,zip_id:0
Expand All @@ -2858,49 +2872,49 @@ msgstr "child_photos.zip"
#: code:addons/partner_communication_switzerland/models/child.py:182
#, python-format
msgid "eight"
msgstr ""
msgstr "otto"

#. module: partner_communication_switzerland
#: code:addons/partner_communication_switzerland/models/child.py:179
#, python-format
msgid "five"
msgstr ""
msgstr "cinque"

#. module: partner_communication_switzerland
#: code:addons/partner_communication_switzerland/models/child.py:178
#, python-format
msgid "four"
msgstr ""
msgstr "quattro"

#. module: partner_communication_switzerland
#: code:addons/partner_communication_switzerland/models/child.py:183
#, python-format
msgid "nine"
msgstr ""
msgstr "nove"

#. module: partner_communication_switzerland
#: code:addons/partner_communication_switzerland/models/child.py:175
#, python-format
msgid "one"
msgstr ""
msgstr "uno"

#. module: partner_communication_switzerland
#: code:addons/partner_communication_switzerland/models/contracts.py:59
#, python-format
msgid "payment slips for the sponsorship payment"
msgstr ""
msgstr "BVR per il sostegno"

#. module: partner_communication_switzerland
#: code:addons/partner_communication_switzerland/models/child.py:181
#, python-format
msgid "seven"
msgstr ""
msgstr "sette"

#. module: partner_communication_switzerland
#: code:addons/partner_communication_switzerland/models/child.py:180
#, python-format
msgid "six"
msgstr ""
msgstr "sei"

#. module: partner_communication_switzerland
#: code:addons/partner_communication_switzerland/models/partner_communication.py:130
Expand All @@ -2918,19 +2932,19 @@ msgstr "bollettini di pagamento.pdf"
#: code:addons/partner_communication_switzerland/models/child.py:184
#, python-format
msgid "ten"
msgstr ""
msgstr "dieci"

#. module: partner_communication_switzerland
#: code:addons/partner_communication_switzerland/models/child.py:177
#, python-format
msgid "three"
msgstr ""
msgstr "tre"

#. module: partner_communication_switzerland
#: code:addons/partner_communication_switzerland/models/child.py:176
#, python-format
msgid "two"
msgstr ""
msgstr "due"

#~ msgid ""
#~ "<div>\n"
Expand Down
2 changes: 1 addition & 1 deletion partner_communication_switzerland/models/contracts.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def send_communication(self, communication, correspondent=True):
self.env['partner.communication.job'].create({
'config_id': communication.id,
'partner_id': partner.id,
'object_ids': objects.ids
'object_ids': objects.ids,
})

@api.model
Expand Down
2 changes: 1 addition & 1 deletion partner_compassion/views/partner_compassion_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
</xpath>
<filter name="supplier" position="after">
<separator />
<filter string="Sponsor" name="sponsor" domain="['|', ('category_id.name', 'like', 'Sponsor'), ('category_id.name', 'like', 'Parrain')]"/>
<filter string="Sponsor" name="sponsor" domain="['|', ('category_id.name', '=', 'Sponsor'), ('category_id.name', '=', 'Parrain')]"/>
</filter>
</field>
</record>
Expand Down
4 changes: 3 additions & 1 deletion report_compassion/models/res_partner.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ def _compute_address(self):
for partner in self:
if not partner.is_company:
res = partner.title.shortcut + ' '
res += partner.firstname + ' ' + partner.lastname + '<br/>'
if partner.firstname:
res += partner.firstname + ' '
res += partner.lastname + '<br/>'
else:
res = partner.name + '<br/>'
res += partner.contact_address
Expand Down

0 comments on commit 2ac78e2

Please sign in to comment.