[MERGE] forward port of branch 8.0 up to 19b5ba2

9 files changed, 16 insertions, 14 deletions

diff --git a/addons/account/account_bank.py b/addons/account/account_bank.py
index 27fc338072e..059940f86ee 100644
--- a/addons/account/account_bank.py
+++ b/addons/account/account_bank.py
@@ -69,7 +69,8 @@ class bank(osv.osv):
                 # No liquidity account exists, no template available
                 if not ids: continue
 
-                ref_acc_bank = obj_acc.browse(cr, uid, ids[0], context=context).parent_id
+                sibbling_acc_bank = obj_acc.browse(cr, uid, ids[0], context=context)
+                ref_acc_bank = sibbling_acc_bank.parent_id
                 while True:
                     new_code = str(ref_acc_bank.code.ljust(dig-len(str(current_num)), '0')) + str(current_num)
                     ids = obj_acc.search(cr, uid, [('code', '=', new_code), ('company_id', '=', bank.company_id.id)])
@@ -81,7 +82,7 @@ class bank(osv.osv):
                     'name': name,
                     'code': new_code,
                     'type': 'liquidity',
-                    'user_type': ref_acc_bank.user_type.id,
+                    'user_type': sibbling_acc_bank.user_type.id,
                     'reconcile': False,
                     'parent_id': ref_acc_bank.id,
                     'company_id': bank.company_id.id,
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index b91af7b4653..190359bbffd 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -342,7 +342,6 @@
                     <filter string="New Mail" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <group expand="0" string="Group By">
                         <filter string="Interviewer" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Survey" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'survey_id'}"/>
                         <filter string="Status" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                </search>
diff --git a/addons/point_of_sale/tools/posbox/overwrite_before_init/etc/ld.so.preload b/addons/point_of_sale/tools/posbox/overwrite_before_init/etc/ld.so.preload
index 5e9332843b5..cfa850b8356 100644
--- a/addons/point_of_sale/tools/posbox/overwrite_before_init/etc/ld.so.preload
+++ b/addons/point_of_sale/tools/posbox/overwrite_before_init/etc/ld.so.preload
@@ -1,2 +1 @@
-# the used qemu-kernel doesn't work well with this library, so get rid of it
 #/usr/lib/arm-linux-gnueabihf/libcofi_rpi.so
diff --git a/addons/point_of_sale/tools/posbox/posbox_create_image.sh b/addons/point_of_sale/tools/posbox/posbox_create_image.sh
index 2a2a0dd9425..9e65410f8fe 100755
--- a/addons/point_of_sale/tools/posbox/posbox_create_image.sh
+++ b/addons/point_of_sale/tools/posbox/posbox_create_image.sh
@@ -59,7 +59,11 @@ umount "${MOUNT_POINT}"
 
 # from http://paulscott.co.za/blog/full-raspberry-pi-raspbian-emulation-with-qemu/
 # ssh pi@localhost -p10022
-qemu-system-arm -kernel kernel-qemu -cpu arm1176 -m 256 -M versatilepb -no-reboot -serial stdio -append "root=/dev/sda2 panic=1 rootfstype=ext4 rw" -hda posbox.img -net user,hostfwd=tcp::10022-:22,hostfwd=tcp::18069-:8069 -net nic
+QEMU_OPTS=(-kernel kernel-qemu -cpu arm1176 -m 256 -M versatilepb -no-reboot -serial stdio -append 'root=/dev/sda2 panic=1 rootfstype=ext4 rw' -hda posbox.img -net user,hostfwd=tcp::10022-:22,hostfwd=tcp::18069-:8069 -net nic)
+if [ -z ${DISPLAY:-} ] ; then
+    QEMU_OPTS+=(-nographic)
+fi
+qemu-system-arm "${QEMU_OPTS[@]}"
 
 mount "${LOOP_MAPPER_PATH}" "${MOUNT_POINT}"
 cp -av "${OVERWRITE_FILES_AFTER_INIT_DIR}"/* "${MOUNT_POINT}"
diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index a5a01d41ae9..9d3e0f3aecb 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -188,7 +188,7 @@ class Website(openerp.addons.web.controllers.main.Home):
             request.registry['website.menu'].create(
                 request.cr, request.uid, {
                     'name': path,
-                    'url': "/page/" + xml_id,
+                    'url': "/page/" + xml_id[8:],
                     'parent_id': request.website.menu_id.id,
                     'website_id': request.website.id,
                 }, context=request.context)
diff --git a/addons/website/data/data.xml b/addons/website/data/data.xml
index 1c1567a310c..519f01844c6 100644
--- a/addons/website/data/data.xml
+++ b/addons/website/data/data.xml
@@ -24,7 +24,7 @@
 
         <record id="menu_contactus" model="website.menu">
             <field name="name">Contact us</field>
-            <field name="url">/page/website.contactus</field>
+            <field name="url">/page/contactus</field>
             <field name="parent_id" ref="website.main_menu"/>
             <field name="sequence" type="int">60</field>
             <field name="website_id" ref="default_website"/>
@@ -79,7 +79,7 @@
         </record>
         <record id="action_website_homepage" model="ir.actions.act_url">
             <field name="name">Website Homepage</field>
-            <field name="url">/page/website.homepage</field>
+            <field name="url">/page/homepage</field>
             <field name="target">self</field>
         </record>
 
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 19292f32467..6fc55be8e96 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -134,16 +134,15 @@
 
 <template id="submenu" name="Submenu">
     <li t-if="not submenu.child_id" t-att-class="
-        ((submenu.url and submenu.url != '/' and request.httprequest.path.startswith(submenu.url)) or
-         request.httprequest.path == submenu.url) and 'active'
+        'active' if submenu.url and submenu.url != '/' and request.httprequest.path == submenu.url.replace('/page/website.', '/page/') else None
         ">
         <a t-att-href="(website.menu_id.child_id[0] == submenu) and '/' or submenu.url" t-ignore="true" t-att-target="'_blank' if submenu.new_window else None">
             <span t-field="submenu.name"/>
         </a>
     </li>
     <li t-if="submenu.child_id" t-attf-class="dropdown #{
-        ((submenu.url and submenu.url != '/' and [1 for submenu in submenu.child_id if request.httprequest.path.startswith(submenu.url)]) or
-         request.httprequest.path == submenu.url) and 'active'
+        (submenu.url and submenu.url != '/' and any([request.httprequest.path == child.url.replace('/page/website.', '/page/') for child in submenu.child_id]) or
+         request.httprequest.path == submenu.url.replace('/page/website.', '/page/')) and 'active'
         }">
         <a class="dropdown-toggle" data-toggle="dropdown" href="#">
             <span t-field="submenu.name"/> <span class="caret" t-ignore="true"></span>
diff --git a/addons/website_crm/data/website_crm_data.xml b/addons/website_crm/data/website_crm_data.xml
index ada2e73e71d..8d6c916fffa 100644
--- a/addons/website_crm/data/website_crm_data.xml
+++ b/addons/website_crm/data/website_crm_data.xml
@@ -5,7 +5,7 @@
         <record id="action_open_website" model="ir.actions.act_url">
             <field name="name">Website Contact Form</field>
             <field name="target">self</field>
-            <field name="url">/page/website.contactus</field>
+            <field name="url">/page/contactus</field>
         </record>
         <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_open_website"/>
diff --git a/addons/website_hr/data/website_hr_data.xml b/addons/website_hr/data/website_hr_data.xml
index 161b875556a..5afe68add8f 100644
--- a/addons/website_hr/data/website_hr_data.xml
+++ b/addons/website_hr/data/website_hr_data.xml
@@ -5,7 +5,7 @@
         <record id="action_open_website" model="ir.actions.act_url">
             <field name="name">Website About</field>
             <field name="target">self</field>
-            <field name="url">/page/website.aboutus</field>
+            <field name="url">/page/aboutus</field>
         </record>
         <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_open_website"/>