Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

12.0 07415dfe3f899e51c1acae6ff319c45f1e1b4925 #682

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ sudo: false
cache: pip

addons:
# odoo 12.0+ uses command "INSERT ... ON CONFLICT ...", which is available in 9.5+ only
postgresql: "9.5"
apt:
packages:
- expect-dev # provides unbuffer utility
Expand Down
2 changes: 2 additions & 0 deletions auth_signup_confirmation/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ <h2>Need our service?</h2>
<ul>
<li><a href="mailto:apps@it-projects.info">apps@it-projects.info <i class="fa fa-envelope-o"></i></a></li>
<li><a href="https://www.it-projects.info/page/website.contactus " target="_blank">https://www.it-projects.info/page/website.contactus <i class="fa fa-list-alt"></i></a></li>
<li><a href="https://m.me/itprojectsllc" target="_blank">https://m.me/itprojectsllc <i class="fa fa-facebook-square"></i></a></li>
<li>skype@it-projects.info <i class="fa fa-skype"></i></li>
</ul>
</div>
</div>
Expand Down
2 changes: 2 additions & 0 deletions auth_signup_confirmation_crm/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ <h2>Need our service?</h2>
<ul>
<li><a href="mailto:apps@it-projects.info">apps@it-projects.info <i class="fa fa-envelope-o"></i></a></li>
<li><a href="https://www.it-projects.info/page/website.contactus " target="_blank">https://www.it-projects.info/page/website.contactus <i class="fa fa-list-alt"></i></a></li>
<li><a href="https://m.me/itprojectsllc" target="_blank">https://m.me/itprojectsllc <i class="fa fa-facebook-square"></i></a></li>
<li>skype@it-projects.info <i class="fa fa-skype"></i></li>
</ul>
</div>
</div>
Expand Down
5 changes: 3 additions & 2 deletions autostaging_base/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ <h2>More information</h2>
</p>
</div>
</div>
</section>
</section>-->


<section class="oe_container">
Expand All @@ -143,9 +143,10 @@ <h2>Need our service?</h2>
<li><a href="mailto:apps@it-projects.info">apps@it-projects.info <i class="fa fa-envelope-o"></i></a></li>
<li><a href="https://www.it-projects.info/page/website.contactus " target="_blank">
https://www.it-projects.info/page/website.contactus <i class="fa fa-list-alt"></i></a></li>
<li><a href="https://m.me/itprojectsllc" target="_blank">https://m.me/itprojectsllc <i class="fa fa-facebook-square"></i></a></li>
<li>skype@it-projects.info <i class="fa fa-skype"></i></li>
</ul>
</div>
</div>
</section>

-->
2 changes: 2 additions & 0 deletions autostaging_project_task/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ <h2>Need our service?</h2>
<ul>
<li><a href="mailto:apps@it-projects.info">apps@it-projects.info <i class="fa fa-envelope-o"></i></a></li>
<li><a href="https://www.it-projects.info/page/website.contactus " target="_blank">https://www.it-projects.info/page/website.contactus <i class="fa fa-list-alt"></i></a></li>
<li><a href="https://m.me/itprojectsllc" target="_blank">https://m.me/itprojectsllc <i class="fa fa-facebook-square"></i></a></li>
<li>skype@it-projects.info <i class="fa fa-skype"></i></li>
</ul>
</div>
<div class="oe_span4">
Expand Down
53 changes: 53 additions & 0 deletions barcode_widget/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,56 @@ <h3 class="oe_slogan">How to use it ?</h3>
</div>
</section>

<section class="oe_container">
<div class="oe_row oe_spaced">
<div class="oe_span8">
<h2>Need our service?</h2>
<p class="oe_mt32">Contact us by <a href="mailto:apps@it-projects.info">email</a> or fill out <a href="https://www.it-projects.info/page/website.contactus " target="_blank">request form</a></p>
<ul>
<li><a href="mailto:apps@it-projects.info">apps@it-projects.info <i class="fa fa-envelope-o"></i></a></li>
<li><a href="https://www.it-projects.info/page/website.contactus " target="_blank">https://www.it-projects.info/page/website.contactus <i class="fa fa-list-alt"></i></a></li>
<li><a href="https://m.me/itprojectsllc" target="_blank">https://m.me/itprojectsllc <i class="fa fa-facebook-square"></i></a></li>
<li>skype@it-projects.info <i class="fa fa-skype"></i></li>
</ul>
</div>
<div class="oe_span4">
<div class="stamp" style="width:200px;">
<div style="margin-top: 15px;
position: relative;
font-family:'Vollkorn', serif;
font-size: 16px;
line-height: 25px;
text-transform: uppercase;
font-weight: bold;
color: #75526b;
border: 3px dashed #75526b;
float: left;
padding: 4px 12px;
-webkit-transform: rotate(6deg);
-o-transform: rotate(6deg);
-moz-transform: rotate(6deg);
-ms-transform: rotate(6deg);">
Tested on Odoo<br/>12.0 community
</div>
<!--<div style="margin-top: 15px;
position: relative;
font-family:'Vollkorn', serif;
font-size: 16px;
line-height: 25px;
text-transform: uppercase;
font-weight: bold;
color: #75526b;
border: 3px dashed #75526b;
float: left;
padding: 4px 12px;
-webkit-transform: rotate(3deg);
-o-transform: rotate(3deg);
-moz-transform: rotate(3deg);
-ms-transform: rotate(3deg);">
Tested on Odoo<br/>12.0 enterprise
</div>-->
</div>
</div>
</div>
</section>

2 changes: 2 additions & 0 deletions base_attendance/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ <h2>Need our service?</h2>
<ul>
<li><a href="mailto:apps@it-projects.info">apps@it-projects.info <i class="fa fa-envelope-o"></i></a></li>
<li><a href="https://www.it-projects.info/page/website.contactus " target="_blank">https://www.it-projects.info/page/website.contactus <i class="fa fa-list-alt"></i></a></li>
<li><a href="https://m.me/itprojectsllc" target="_blank">https://m.me/itprojectsllc <i class="fa fa-facebook-square"></i></a></li>
<li>skype@it-projects.info <i class="fa fa-skype"></i></li>
</ul>
</div>
<div class="oe_span4">
Expand Down
39 changes: 0 additions & 39 deletions base_groupby_extra/i18n/es_CR.po

This file was deleted.

39 changes: 0 additions & 39 deletions base_groupby_extra/i18n/fr.po

This file was deleted.

2 changes: 2 additions & 0 deletions base_import_map/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ <h2>Need our service?</h2>
<ul>
<li><a href="mailto:apps@it-projects.info">apps@it-projects.info <i class="fa fa-envelope-o"></i></a></li>
<li><a href="https://www.it-projects.info/page/website.contactus " target="_blank">https://www.it-projects.info/page/website.contactus <i class="fa fa-list-alt"></i></a></li>
<li><a href="https://m.me/itprojectsllc" target="_blank">https://m.me/itprojectsllc <i class="fa fa-facebook-square"></i></a></li>
<li>skype@it-projects.info <i class="fa fa-skype"></i></li>
</ul>
</div>
</div>
Expand Down
2 changes: 2 additions & 0 deletions crm_next_action/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ <h2>Need our service?</h2>
<li><a href="mailto:apps@it-projects.info">apps@it-projects.info <i class="fa fa-envelope-o"></i></a></li>
<li><a href="https://www.it-projects.info/page/website.contactus " target="_blank">
https://www.it-projects.info/page/website.contactus <i class="fa fa-list-alt"></i></a></li>
<li><a href="https://m.me/itprojectsllc" target="_blank">https://m.me/itprojectsllc <i class="fa fa-facebook-square"></i></a></li>
<li>skype@it-projects.info <i class="fa fa-skype"></i></li>
</ul>
</div>
</div>
Expand Down
54 changes: 25 additions & 29 deletions currency_rate_update/company.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,36 +18,36 @@
#
#

from openerp import fields, orm
from openerp import fields, models


class ResCompany(orm.Model):
class ResCompany(models.Model):

"""override company to add currency update"""

def _multi_curr_enable(self, cr, uid, ids, field_name, arg, context=None):
def _multi_curr_enable(self, field_name, arg):
"check if multi company currency is enabled"
result = {}
if self.pool.get('ir.model.fields').search(cr, uid, [('name', '=', 'company_id'), ('model', '=', 'res.currency')]) == []:
if not self.env['ir.model.fields'].search([('name', '=', 'company_id'), ('model', '=', 'res.currency')]):
enable = 0
else:
enable = 1
for id in ids:
result[id] = enable
for company in self:
result[company.id] = enable
return result

def button_refresh_currency(self, cr, uid, ids, context=None):
def button_refresh_currency(self):
"""Refrech the currency !!for all the company
now"""
currency_updater_obj = self.pool.get('currency.rate.update')
currency_updater_obj = self.env['currency.rate.update']
try:
currency_updater_obj.run_currency_update(cr, uid)
currency_updater_obj.run_currency_update()
except Exception as e:
raise e
# print "ok"
return True

def write(self, cr, uid, ids, vals, context=None):
def write(self, vals):
"""handle the activation of the currecny update on compagnies.
There are two ways of implementing multi_company currency,
the currency is shared or not. The module take care of the two
Expand All @@ -57,41 +57,37 @@ def write(self, cr, uid, ids, vals, context=None):
If yours currency are not share you will be able to activate the
auto update on each separated company"""
save_cron = {}
for company in self.browse(cr, uid, ids, context=context):
for company in self:
if 'auto_currency_up' in vals:
enable = company.multi_company_currency_enable
compagnies = self.search(cr, uid, [])
compagnies = self.search()
activate_cron = 'f'
value = vals.get('auto_currency_up')
if not value:
for comp in compagnies:
if self.browse(cr, uid, comp).auto_currency_up:
if comp.auto_currency_up:
activate_cron = 't'
break
save_cron.update({'active': activate_cron})
else:
for comp in compagnies:
if comp != company.id and not enable:
if self.browse(cr, uid, comp).multi_company_currency_enable:
if comp.id != company.id and not enable:
if comp.multi_company_currency_enable:
raise Exception('Yon can not activate auto currency ' +
'update on more thant one company with this ' +
'multi company configuration')
for comp in compagnies:
if self.browse(cr, uid, comp).auto_currency_up:
if comp.auto_currency_up:
activate_cron = 't'
break
save_cron.update({'active': activate_cron})

if 'interval_type' in vals:
save_cron.update({'interval_type': vals.get('interval_type')})
if save_cron:
self.pool.get('currency.rate.update').save_cron(
cr,
uid,
save_cron
)
self.env['currency.rate.update'].save_cron(save_cron)

return super(ResCompany, self).write(cr, uid, ids, vals, context=context)
return super(ResCompany, self).write(vals)

_inherit = "res.company"

Expand All @@ -115,12 +111,12 @@ def write(self, cr, uid, ids, vals, context=None):
)
# function field that allows to know the
# mutli company currency implementation
multi_company_currency_enable = fields.Function(
_multi_curr_enable,
method=True,
type='boolean',
string="Multi company currency",
help='if this case is not check you can' +
' not set currency is active on two company'
multi_company_currency_enable = fields.Boolean(
compute=_multi_curr_enable,
method=True,
type='boolean',
string="Multi company currency",
help='if this case is not check you can' +
' not set currency is active on two company'
)

Loading