pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] Forward-port 8.0 up to 2fc7eed0d8

Browse Source
This commit is contained in:
Olivier Dony
2017-05-30 13:52:05 +02:00
parent 7dc2ed94c3 2fc7eed0d8
commit 7b5af174a5
8 changed files with 52 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account_payment/account_payment.py
+1 -1
View File
@@ -329,7 +329,7 @@ class payment_line(osv.osv):
'date': _get_date,
}
_sql_constraints = [
('name_uniq', 'UNIQUE(name)', 'The payment line name must be unique!'),
('name_uniq', 'UNIQUE(name, company_id)', 'The payment line name must be unique per company!'),
]
def onchange_move_line(self, cr, uid, ids, move_line_id, payment_type, date_prefered, date_scheduled, currency=False, company_currency=False, context=None):
addons/crm/res_partner.py
+1 -1
View File
@@ -54,7 +54,7 @@ class res_partner(osv.osv):
'opportunity_ids': fields.one2many('crm.lead', 'partner_id',\
'Opportunities', domain=[('type', '=', 'opportunity')]),
'meeting_ids': fields.many2many('calendar.event', 'calendar_event_res_partner_rel','res_partner_id', 'calendar_event_id',
'Meetings'),
'Meetings', copy=False),
'phonecall_ids': fields.one2many('crm.phonecall', 'partner_id',\
'Phonecalls'),
'opportunity_count': fields.function(_opportunity_meeting_phonecall_count, string="Opportunity", type='integer', multi='opp_meet'),
addons/hw_posbox_homepage/controllers/main.py
+13 -4
View File
@@ -57,9 +57,7 @@ index_template = """
<p>
If you need to grant remote debugging access to a developer, you can do it <a href='/remote_connect'>here</a>.
</p>
<p>
If you need to display the current customer basket on another device, you can do it <a href='/point_of_sale/display'>here</a>.
</p>
%s
<p>
The PosBox software installed on this posbox is <b>version 16</b>,
the posbox version number is independent from Odoo. You can upgrade
@@ -74,10 +72,21 @@ index_template = """
class PosboxHomepage(openerp.addons.web.controllers.main.Home):
def get_hw_screen_message(self):
return """
<p>
The activate the customer display feature, you will need to reinstall the PosBox software.
You can find the latest images on the <a href="http://nightly.odoo.com/master/posbox/">Odoo Nightly builds</a> website.
Make sure to download at least the version 16.<br/>
Odoo version 11, or above, is required to use the customer display feature.
</p>
"""
@http.route('/', type='http', auth='none', website=True)
def index(self):
#return request.render('hw_posbox_homepage.index',mimetype='text/html')
return index_template
return index_template % self.get_hw_screen_message()
@http.route('/wifi', type='http', auth='none', website=True)
def wifi(self):
addons/hw_scanner/controllers/main.py
+4 -1
View File
@@ -120,7 +120,10 @@ class Scanner(Thread):
def get_devices(self):
try:
if not evdev:
return None
return []
if not os.path.isdir(self.input_dir):
return []
new_devices = [device for device in listdir(self.input_dir)
if join(self.input_dir, device) not in [dev.evdev.fn for dev in self.open_devices]]
addons/hw_screen/controllers/main.py
+9
View File
@@ -23,6 +23,7 @@
from openerp import http
from openerp.tools import config
from openerp.addons.web.controllers import main as web
from openerp.addons.hw_posbox_homepage.controllers import main as homepage
import logging
import netifaces as ni
@@ -35,6 +36,14 @@ self_port = str(config['xmlrpc_port'] or 8069)
_logger = logging.getLogger(__name__)
class Homepage(homepage.PosboxHomepage):
def get_hw_screen_message(self):
return """
<p>
If you need to display the current customer basket on another device, you can do it <a href='/point_of_sale/display'>here</a>.
</p>
"""
class HardwareScreen(web.Home):
addons/mrp/mrp.py
+7 -2
View File
@@ -1215,8 +1215,13 @@ class mrp_production(osv.osv):
source_location_id = production.location_src_id.id
prod_location_id = source_location_id
prev_move= False
if production.bom_id.routing_id and production.bom_id.routing_id.location_id and production.bom_id.routing_id.location_id.id != source_location_id:
source_location_id = production.bom_id.routing_id.location_id.id
if production.routing_id:
routing = production.routing_id
else:
routing = production.bom_id.routing_id
if routing and routing.location_id and routing.location_id.id != source_location_id:
source_location_id = routing.location_id.id
prev_move = True
destination_location_id = production.product_id.property_stock_production.id
doc/cla/corporate/savoirfairelinux.md
+16 -13
View File
@@ -1,4 +1,4 @@
Canada, France, 8-2-2015
Canada, France, 2017-05-12
Savoir-faire Linux agrees to the terms of the Odoo Corporate Contributor License
Agreement v1.0.
@@ -8,22 +8,25 @@ declaration.
Signed,
Maxime Chambreuil partners@savoirfairelinux.com https://github.com/savoirfairelinux
Jérome Boisvert-Chouinard jerome.boisvertchouinard@savoirfairelinux.com https://github.com/jbchouinard
List of contributors:
Agathe Mollé agathe.molle@savoirfairelinux.com https://github.com/Ehtaga
Bruno Joliveau bruno.joliveau@savoirfairelinux.com https://github.com/bjoliveau
David Cormier david.cormier@savoirfairelinux.com https://github.com/cormier
David Dufresne david.dufresne@savoirfairelinux.com https://github.com/dufresnedavid
Davin Baragiotta davin.baragiotta@savoirfairelinux.com https://github.com/giotta
El Hadji Dem elhadji.dem@savoirfairelinux.com https://github.com/ehdem
Guillaume Auger guillaume.auger@savoirfairelinux.com https://github.com/jehog
Jérome Boisvert-Chouinard jerome.boisvertchouinard@savoirfairelinux.com https://github.com/jbchouinard
Joao Alfredo Gama Batista joao.gama@savoirfairelinux.com https://github.com/joaoalf
Jordi Riera jordi.riera@savoirfairelinux.com https://github.com/foutoucour
Julien Roux julien.roux@savoirfairelinux.com https://github.com/jrouxsfl
Loïc Faure-Lacroix loic.lacroix@savoirfairelinux.com https://github.com/llacroix
Maxime Chambreuil maxime.chambreuil@savoirfairelinux.com https://github.com/max3903
Pierre Gault pierre.gault@savoirfairelinux.com https://github.com/gaultp
Julie Moussu julie.mousse@savoirfairelinux.com https://github.com/JulieSFL
Pierre Lamarche pierre.lamarche@savoirfairelinux.com https://github.com/plamarche
Sandy Carter sandy.carter@savoirfairelinux.com https://github.com/bwrsandman
Vincent Vinet vincent.vinet@savoirfairelinux.com https://github.com/veloutin
David Cormier david.cormier@savoirfairelinux.com https://github.com/cormier (up to 2017-05-12)
Davin Baragiotta davin.baragiotta@savoirfairelinux.com https://github.com/giotta (up to 2017-05-12)
El Hadji Dem elhadji.dem@savoirfairelinux.com https://github.com/ehdem (up to 2017-05-12)
Guillaume Auger guillaume.auger@savoirfairelinux.com https://github.com/jehog (up to 2017-05-12)
Jordi Riera jordi.riera@savoirfairelinux.com https://github.com/foutoucour (up to 2017-05-12)
Julien Roux julien.roux@savoirfairelinux.com https://github.com/jrouxsfl (up to 2017-05-12)
Loïc Faure-Lacroix loic.lacroix@savoirfairelinux.com https://github.com/llacroix (up to 2017-05-12)
Maxime Chambreuil maxime.chambreuil@savoirfairelinux.com https://github.com/max3903 (up to 2017-05-12)
Pierre Gault pierre.gault@savoirfairelinux.com https://github.com/gaultp (up to 2017-05-12)
Sandy Carter sandy.carter@savoirfairelinux.com https://github.com/bwrsandman (up to 2017-05-12)
Vincent Vinet vincent.vinet@savoirfairelinux.com https://github.com/veloutin (up to 2017-05-12)
doc/cla/individual/JesusVMayor.md
+1 -1
View File
@@ -9,4 +9,4 @@ declaration.
Signed,
Jesús Ventosinos Mayor jesus@pexego.es https://github.com/jesusVMayor
Jesús Ventosinos Mayor jesus@comunitea.com https://github.com/jesusVMayor