From 780bdb4a293267ef28b4f6f505766a9348571acd Mon Sep 17 00:00:00 2001 From: "Rucha (Open ERP)" Date: Thu, 26 Jul 2012 17:09:14 +0530 Subject: [PATCH] [IMP]: product: Changed xml_id of product in data file from product_product_0 to product_product_consultant to identify this record easily when accessing from py bzr revid: rpa@tinyerp.com-20120726113914-gvpo9rx7fan77w3f --- addons/hr_timesheet/hr_timesheet.py | 2 +- addons/hr_timesheet/hr_timesheet_data.xml | 2 +- addons/hr_timesheet/hr_timesheet_demo.xml | 14 +++++++------- .../test/test_hr_timesheet_invoice.yml | 4 ++-- .../test/test_hr_timesheet_sheet.yml | 6 +++--- addons/product/product_data.xml | 2 +- addons/product/product_demo.xml | 2 +- addons/product/product_image_demo.xml | 2 +- .../project_timesheet/project_timesheet_demo.xml | 14 +++++++------- addons/sale/res_config.py | 4 ++-- addons/sale/sale_demo.xml | 4 ++-- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py index 80949a696ff..448e0486259 100644 --- a/addons/hr_timesheet/hr_timesheet.py +++ b/addons/hr_timesheet/hr_timesheet.py @@ -46,7 +46,7 @@ class hr_employee(osv.osv): def _getEmployeeProduct(self, cr, uid, context=None): md = self.pool.get('ir.model.data') try: - result = md.get_object_reference(cr, uid, 'product', 'product_product_0') + result = md.get_object_reference(cr, uid, 'product', 'product_product_consultant') return result[1] except ValueError: pass diff --git a/addons/hr_timesheet/hr_timesheet_data.xml b/addons/hr_timesheet/hr_timesheet_data.xml index 50c86c93a5e..e6714827a83 100644 --- a/addons/hr_timesheet/hr_timesheet_data.xml +++ b/addons/hr_timesheet/hr_timesheet_data.xml @@ -9,7 +9,7 @@ - + diff --git a/addons/hr_timesheet/hr_timesheet_demo.xml b/addons/hr_timesheet/hr_timesheet_demo.xml index 9cca4f96fda..b6773dbbdd6 100644 --- a/addons/hr_timesheet/hr_timesheet_demo.xml +++ b/addons/hr_timesheet/hr_timesheet_demo.xml @@ -3,13 +3,13 @@ - + - + @@ -30,7 +30,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -56,7 +56,7 @@ - + @@ -69,7 +69,7 @@ - + @@ -82,7 +82,7 @@ - + diff --git a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml index c76a5d60a6b..91520da56a2 100644 --- a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml +++ b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml @@ -9,7 +9,7 @@ general_account_id: account.a_expense journal_id: hr_timesheet.analytic_journal name: develop yaml for hr module - product_id: product.product_product_0 + product_id: product.product_product_consultant product_uom_id: product.product_uom_hour to_invoice: hr_timesheet_invoice.timesheet_invoice_factor2 unit_amount: 5.00 @@ -37,7 +37,7 @@ date: 1 name: 1 price: 1 - product: product.product_product_0 + product: product.product_product_consultant time: 1 - diff --git a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml index ffebb046a71..f4f9326890f 100644 --- a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml +++ b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml @@ -10,7 +10,7 @@ I assign this product(Service on Timesheet) and journal(Timesheet Journal) to employee "Quentin Paolino" - !record {model: hr.employee, id: hr.employee_qdp}: - product_id: product.product_product_0 + product_id: product.product_product_consultant journal_id: hr_timesheet.analytic_journal - I create my current timesheet for employee "Quentin Paolinon". @@ -72,7 +72,7 @@ user_id: base.user_qdp unit_amount: 6.00 amount: -90.00 - product_id: product.product_product_0 + product_id: product.product_product_consultant general_account_id: account.a_expense journal_id: hr_timesheet.analytic_journal - @@ -99,7 +99,7 @@ unit_amount: 2.00 user_id: base.user_qdp amount: -90.00 - product_id: product.product_product_0 + product_id: product.product_product_consultant general_account_id: account.a_expense journal_id: hr_timesheet.analytic_journal - diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml index c8683f0d339..9c90d31ab33 100644 --- a/addons/product/product_data.xml +++ b/addons/product/product_data.xml @@ -185,7 +185,7 @@ parameter) will see those record just disappear. - + 75.0 30.0 diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml index f5f537e160f..6b0a84f8ad5 100644 --- a/addons/product/product_demo.xml +++ b/addons/product/product_demo.xml @@ -84,7 +84,7 @@ Resource: product.product --> - + diff --git a/addons/product/product_image_demo.xml b/addons/product/product_image_demo.xml index 53e847a1c1a..9f147136a24 100644 --- a/addons/product/product_image_demo.xml +++ b/addons/product/product_image_demo.xml @@ -2,7 +2,7 @@ - + /9j/4AAQSkZJRgABAQEAZABkAAD/4Qw6RXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAABAAAAYgEbAAUAAAABAAAAagEoAAMAAAABAAIAAAExAAIAAAALAAAAcgEyAAIAAAAUAAAAfodpAAQAAAABAAAAkgAAANQAAABkAAAAAQAAAGQAAAABR0lNUCAyLjYuOAAAMjAxMjowNzowMyAxODoxNTowNAAABZAAAAcAAAAEMDIxMKAAAAcAAAAEMDEwMKABAAMAAAAB//8AAKACAAQAAAABAAAAnaADAAQAAAABAAAAfQAAAAAABgEDAAMAAAABAAYAAAEaAAUAAAABAAABIgEbAAUAAAABAAABKgEoAAMAAAABAAIAAAIBAAQAAAABAAABMgICAAQAAAABAAALAAAAAAAAAABkAAAAAQAAAGQAAAAB/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/wAALCABjAH0BAREA/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/9oACAEBAAA/APf6KKKKKjeeOMHe4GKYl3byNtWZCfTNT0VXN2m4gHOKxpPETRysvlqQDWrp2oR6hAZEGCp2sPQ1coooornn1SWTzyDgLIVUD0FUn12e3IffkAjIPcV1o5GaRztRj6CuRkuXkspZCxyTk1gXN5JGrMHII716TaOZLOFyclo1J/KpT0Nc/FNliD1ya5u8kxO/1roPB777a69pR/Ksj4p+Itc8NeHo7zR4FKM+ye4xuMIPQgdOTxk9OPWuc+DXibUNYvdVg1K9mumCpMjSPnGSQQPTtXr2aWg1whulVLtScMs7ZH4msa9ug6bFPLEKPzr1NeBTZeYnH+ya85OoxrZSoXUFSMiucvdQQqwDAk9Oa9fjnisNHSa4cRxwwhpGbgKAOSa8d1z48yx6i9rommQyxhsCa4Y8/wDARj+db1r4shFtDNcYikkQO6EEbSRnoeaxrjxJaSSsyyrgn1r0LwMrtorXLKVWeQsmRjKgAZ/nWl4lmtbfw5qM15HHJbpbuzpIMqwx0Ir5e8PXM+n3YvbNmjkicNGVOBwc4+navqfRNUh1rRrTUID+7njD4/unuD7g5FaFVL7Ubewj3zttX1rzvWtGM+qXF1ZaoUhnO/ywAQG+vpVDT9KktdWgub+6M9rEwcxoACzA5GSe1dzc+NtJt7dpA7vIAT5Kr83Az9Kx31TWdfsbi7ilGnadGcb4xukk45we1cq2jaLJASmoXU7t95nfGD+FZ8Gm6bpWow6hNL9ojgbd5U8hCEjoT9Kf48+KtlrPhm40XT4JvtNwVV3U/LgMCQO5zjHTvWD8D9EXUfF13e3FtHLDaxHmRM7XJ4xnvwa9c8S3dpYakq3tlDI8q/u5ivOB2rnnj0m5be1tH69BV2b4iw6JtjlYXCrwUBAZR9a4nxp4r13XrVvPgmtNMZwi2yKd8pIyu4dSD27Vz8vgXxla6VLqH9htHaonmiMSrvC4yflznPfFdF8N/idZ6Lo9xZ3+4oJA8YHO0n7w/kfxr309K4XxVqNpc2zWF+HiIz8wO1gfUetclYWd5vNvHexPEigo8mQSv4VSi1aG6vWtY5WuQrYaWPlEI6hv5fjVPWtbtorFY7Fo2uRKwdgc/KeCM9uP1rodI+IGkweHIdKNyBOke2RZ02+Ye5HYisOS1hvHE2l3Igjkchsgsgb2rh/GNwNLvPsp1P7ZPjLIE2hP6VV8L6ta22javNOkfnkoI5WGWXrwPTnBr1f4caXq/ha2bXbx0az1hBMbdVw8b84J+owfxrb1rX7HWD9nuNrrn5R0ZT6j0NchfaP4gcypYPB9nU4DmUK5H49K8+v9QWwvBAfnuxKFbcchTnn/APXXtng4z+JfEcOseWTZW0bIZGHDvxgD6cnPavTiilCpAI9K8Lg+Dh1HWNbk3PZQLqEn2cdN8ZwRj2GSK9Yu/EAxss4xK7IWR2yFbHv+I/yK4vxHYtroMmpylkQBowfl8vuR+g/WuK1PxRaW+nyw2s6PNCnlZU5B9Oe9chZwXk9i4JkjgOWW3jO3P1PU12Pg3wFc+KI5JROlpaQP5RyuXJwDwOneuX8S6LLoWu3uk3mHaB/kcrjzIyMq2Pp/I1L4a8S2unabPpUrbWicyxHHr1Fc/cWf9uapJeyqQrccfxY6H8q7XwN8KdP8Vrd3Fxf3FrHbyKvlwqCHyM556V6L4w8U6R4e0O30uxYXM1qBGiBsgYGMMfX6V40mt3sXiux1vUpVMQnUPCowoQ8dPbOfwrvvEeqq1vcW8EzK1zlQ8fbI61jeHPA2n67qFvp115iJKSWlQ/PkAnOT9K948O+HrLwzpEem2HmGFCTmVtzEnqSa1qTFYUGks6hcCKPOcAc/lWD470aF9GtrdAf3lwFc55YYPFcA2h2luNghXA9qry2qIMIoA+lXtD8dp4Q0m9tYrR5ruafejNxGo2gcnueOn61wuv6ze+ItTl1G+YSTsoX5FwFUZwAPTk/nUekaSGDSyxgs5zyK2jaJGmFUAe1em/CNMWGrD1mT/wBBNeWeNPD2oeHfFt1bC3kmhuZDJZuFLBlY5x9QciseLwzeXlx/puR6oDn8zXX2mj+WFLMzEADJOa7Hwdb+V4ks+Om7/wBBNeq5ooorB8UoHtrTPafP/jprzrUz5ccj+gJrJgeO802O8jYNHKMqRXcfDW1guNH1JJ4Y5V+19HQMPuL61J450Oze3sbeC1hiVpWLCOMLnj2rgbixS0VgqgbaoQ7bm0+0IQUJIB9cV6L8Jxi01X/rsn/oJrqvFESy6YgIBPmD+Rrhb7TIoZAVQAkA8VQjUG4MIxuxmt7w0m3xFafVv/QTXo1FFLisTxKP9Gtv+u39DXm+tf8AHvP/ALp/lXNeF/8AkSdN/wBxv/QjXpvwwH/Er1H/AK+//ZFrX8VD95Y5/wCeh/lXnOrrxKPrXLeG+fCcB/6ayj/x816f8KRi01X/AK7J/wCgmus8Rf8AHhH/ANdR/I1y2pqNy/7orjLJj/wn95Hk7PsSEDPGdxrsfD4/4qK1+rf+gmvQqKKdWH4nOLS3/wCu39DXm2sn/Rpv90/yrnPCp/4orTv91v8A0I16Z8MiBpeo5/5+v/ZFrX8UEGSxx/fb+Ved6x/y1/GuV8M5/wCETh/67S/+hmvTvhVxa6r/ANdk/wDQTXWeIsGwj/66j+RrmNS5K/7orirLA+Il7/14J/6Ea7PQP+Rhtfq3/oJr0DFGDRg+lOrA8TuDaQcjiX+hrzjWCPs8wyOVNc14Z/deEbKKT5Xj3q6nqpDHiu68CaitvYXiA533GR/3yBW3q9yZ5LPPZz/KuL1fpJ+Nct4ZP/FKRf8AXaX/ANDNeifDe6SCDUgxwTKn8q6vWrpZbJFB/wCWg/kawtQOdv8AuiuKs/8Akot5/wBeKf8AoRrtNB/5GG1+rf8AoJr0IUUUEZrO1LSIdTt2hmZwh/utg1zNx8NdNuBiWa8kX+6055/KoR8MNEj3FbTluT87cn860bTwnb6bCI7SBIlHQKKoazoWqzRo1kyCWNty+YeD7HFcxe+GPFN4jL5VlCW43GRmx+AArN034ba7p9kbQanAYi7OAbckqScnHzdK6fQvDNxo0DLJO8zu25227QT9KvapeC0st0qkIjBmPtWfPqtlcwrLFcxMhUchxXDQ69YwfEK6keQiFrRIxKFJTcCSRnp3rufD1+t3rMUlsrusYJLBTjkY6/jXotuZWGXBGatUUUUUUUhA9KTYp6qKYY0/uimNGhP3RVaazt5eHhRgeoIzWb/wjOhs5kOlWhY9T5Q5q5DptlAoWK1iRR0CqBV6OCJQCqAGrAAHSlor/9n/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/wAALCAB9AJ0BAREA/8QAHgAAAgEFAQEBAAAAAAAAAAAABwgGAAMEBQkBAgr/xABSEAABAwMDAgMDBAoMDAcAAAABAgMEBQYRAAchEjEIE0EiUWEUcYGRCRUjMkJisbKz8BYkM0NScpKTo6TB0RclNFNVZIKDoaK08TdFY2VzdNL/2gAIAQEAAD8A6p6rVarVarXnPpqioDjXhUkfhDVdQz686+tVq26620krcUAAMnWvlV2JHivygoKDCeogDvqGnd+C24UvQvZB7pXg4/v1KLYvCj3S26ae4Q6xjzWl8KTnt841vtVqtVqtVrV3DXYVuU1yq1BwpabISABkqUeyR8+o9Pv8Q+hSW2/bQFlJGcZ5xnI7aw2d2aciQ01UWfKbcWEeYnPsZOAT8NT9JBJA9ONenjUTv253bejxWIikoemLXhR/BSn74j4+0NDi8LpqLDMRYdWCpkKXg8knPOfq1C3d0rgovXLh1B4KbGQCokH4Eeo0yttVUV23qZWggIE+GzK6R6daArH0Z1sjqNX1LManxUhRAdkhKvm6VH+zUWmyeukTBnILRzz79BaoyUofUCrkK4BOptsBNU7elWj9RwaYlfTn1DqR/bo+yXW2GFvOrShCElSlKUAAAMkkngD59I5vH9lCse2ai9b+zlui9JTbnlKq8h5UalAg+15agFOv8eqUhB9FaaPw+boO70bPWrug/EYiO3BTW5L8ZkkpYfBKHWwTyQFpUOeRoi6rVaGm+rym7epaQThdTQDj1AbWdQi5Z3lqHtfvTePcAUjQ4vSreRR5DiXeUJJzn46cSPnykk5yQMknvxq4e2hTvdILE2he1gFMk/TlrQ6vua38mhq8wfuAJ50I6/VAiM8EnjoP1acvaVfm7YWk4TkqokIk/wC5TqVKWlPBUM6hO60hLFIgvZ5TNCcZ55QvUJXU0GjzE9YJDR9fdoN1OopU+s59T66nnhqf+VX5Wl54apSQfnU+P/zpk320utKbWhKkqBBSoZBB9CPUa45eO7woSfDvuCjcOyGIrVh3fO6GIqnwhdLnKCnFMdJGfJ9lSkKGekK6CB0jLIfY4vEXbsS1KJ4e6jTp0aoOvVGZS6m4tPyWb1uF9bKEk+YhYCncAjpUWzgnOn/T8D6dtfWvDxoR+JaX9rbKp9UUoBuLVWusk4wFNuD8uNCC5b0p8hLL7UlBStlChhXGOn/voeXFXG6ulmmR3At2a+zGQlPOVLcSkfl0/bY6U4zwngce7VOOtoPStWCR20B/FFcVNokG3ak9OZTl6Q2E+aAopUlJ6gk8kexjPbke/S93dvLbcuFDbbqbPmBghaC4AQfm0LLi3Jp78dcSJI81+QPIYbQcqcdXhKEJH4RUogAdyTxzrpnZNMfoNnUSgvjDtOp0WGsd8LQ0lJ7d/aB1yz8b3j8vuv3fUbA2humXRLfpsh2F8tpznlPz1NqKXHi6n2g2VhQQlJAIHUcnAEd8FFheI66Lme3aiWvclbovyKUmTUqlKWBKJTkBgvq6pCwoJx0dQ+I4GmId3Tv9yLMTTbErT4wtpaFRlNKQpJwUkLIIIIIx+oG1T3KuqGVu1W1KxHKSSoKirV0/yc6crwm2Ld1CoNQvG9KO7Spdf8hMWE8oF5qKjKgpwDPSVlZITnIA5wTgMA64hA9pYB+Jxrl39lW3KjV7ciz9uaQ+zINv09+XIcZWlYYmSnUIS0spJ8tQQz1YODhY9+l7tOqVSy5FGrNEnBqtUGUzUILqjj9sNK6wFfBRyD70qOu0G1m4FJ3SsChbg0VWIdcgtSkIPdpZGHGlfjIWFJI96dS3ViZLahx1yHclKBkgDJ0JtwK9Yu6ls1uwam+ny32glwfKfJfQoEFDjZSDhSVAEcn3EHONK494eqZAjJixL8rElbfs+YqT98PQ9PT0j6OB7tZu2W2dO27v2JfNxzZdzM04Jdgw3paWG2JIOUyMJThwgDhCuAcHuBplnvE3tlFhuPT6hKjy0JHRA+Tlx95RCiEt9BwokIVjkcpI0LpHiH3M3euiJZe09OYoTb89USTNeCX5UdDfUVvEH7mhPDZx7RUl0Y6Vahd4bPbSUK5m427VduW4Km71tuT5U8oU6tQ4SvHtY6UpA9rugHUfuDbzZiYwY9MoUVptCcNktpK8Y/hkdX1k/wDHUYta2bD2ou6LuPbsWlN1KloV5TlQZS+ywDglaQtWG3OOHE4UMnBwTqUX99lFodBt2oUel2eiq3C82tpmVFlFqChSkkdZ6wXDgngJBBx3GuWUiLKq9ThU5qO69Kk9MZpspUFPLW4UpIz36upODnH1a/QZt7ZFXtbZ62rLkywup0ShQqet1DfQ2t1plKDhA4AynsPn0Cqzvu5LqM+1q7EjJn0t4xnx0cKwBhWPTIIOtSi4qDMJW7T2D1c4AGDqzVd/4W1kRJptWdaWAQzCSsr85Q5wGySMfHAwPUd9De/fGlvPvPEi2ftZQkW8iY8imz6uw6ryRIcBKWzKUAhjqwce0M5A6z2KoUXbfcrcy8axtbtbZE24bpbLzdYkSSGm4S8kLL7zh6W/a7EklRx0hWsjeXw2eJ/YWzGtw9yLMjoo7LzUWVLp9Ual/JlLGErdSnlLZVx1dgSB3PJ38EfjmtPauwqvbN7okPQHJyZtOSz7RYdcBEls+5PUlCx8XF66mnUMue9KVR35sOpgKCW0JKerB6VJ7/T/AGaSLcW0bloV1O31YV0u1SnttLRIpchQEptPVnqQvs4B26VYUMcFXpcpcncepU1NSatOqhlSAQ88nymxwcEqV6Z7kZwSM41qFXZDqtSFtyrhYTWFP4bpjj3lqksABTikqSTj7mtXbs41wTzi7dT9vUax7irAy9Vo1TTIprcjhlh5KUupJSOXEqcBJSTjlYHc63ngn3UpEit3LdVwVKlwH6oUMUilPyA3NQPLS88kMqAJbSVdIUCclBGONSbxAzLN3YkD7ZOrp8+OpCmJ8RWFoUk+yFJ+9WMg5SRz6HS/KtzeZ2ZJo9tU2nVQx1dInP1NuMwRjIUpKleZnBGRjvkDOl+3xqF/2ZNbh7iTYz7r3X5DcOal5gKTjqGEgYOCO4B761HhSkWXdG8Mhy/aNGrEeDQ5s6FFl+1HMttTeC6jssJQtZCVcZAPOMak8ejbqbnbpUiobI2X+yKobTS2KqxEjhCltUtMhtTTKG1kF1LTpUlKE5UlPAHHHXKn720p21Y8l1baKkllKZcYn22nQMKGD3+HoePjpe906Nbe4tVfuClKYpVyEYL4HS1MA+9Q6BnnHAWORx6aWe6L+3KpaZFPpdkVyOWFqjuTX6a+431p7+UkD7p6+1kI96jjQerVUI82t3pVH1uPE9TLjnW+9+KojgJH8BICfeD30fdit4aPN8L0i2pgahQ6lMqSVoSoJ81K3lhDh95ACcE/wBjgHT9+Fi0ZFvbL27JrtGYg16rRk1OrqQwlt1+Q5ylbxABW4G+gZJJwAO2NEC/7IoG41m1qxrnipk0yvQXqdLbUMgtuJKSfnGQQfQga4t7NeCndTcSzZ1espYbep1w1Ggz1uNKWHlRA0lLg+JK3AfX2ee2u3z8yMw2XHZDTYHcrWEj6z20ve/17WFWaGuLToL1UrDg+RwKpFcUyzGkOFxLRW+PZWnzm+hSAF4UQDjOlWsam3/TL5nwL/qjL1OebeYhKS0W0ukpCkk84PslQPqFI+OtdvZuVVbW2vk2VQrgRT6nOaWxGfWoFSVAZ9jP4fSFfVn00u9n7ry6DQ2xt7b32znsoWpy4a9lQbKgOtTaSfMXkp96EnHY8a8kXDdNUbC7luGXUZr6w48tZCEBZ4CGm0+ygAYACQSda276BVaNOhUW7KBV6PMmxftlAFQhPRFvMpV0+eypYSo4UMZScg49+tUm/NwaJVKSqZe1Rl0VqayJrEnDrnyfrHWEuEdWQnI5JPbTkXbdFNtRL1zUySkxHae240tpQ6FAJyFcdwU4765y3/Bue9NyK3UG5yqoZckvtzFu9SPJWOpCU+4JTxj0xrZ2Ht5vHS7gks7Y2nWbmqcqAtmQikwXJL0VlSkAr6EAlKSelOTgZxzzrqh9i72N3G2l28u2rbp2VKtup3HVGHGG6i0hMxxhpog9aeVIQVK9lCiOQo4GeYh4kdwdvdsoc1VzVdxqql15MGBCPVNdws4wAR0J96lkJ5HzEO+DfdSp7v7gV6m3Y6YwpEAVGIyVcvtl0oIUcDqKcpycDPV27Enq5d0KhYVn1yoQi/IehsyH40dtxQU4UpJCBjnkjHzaRG4bEvTemo1C7rweZp02qIClxYIPShQSBkkn2lYAz8edNL4E/B7vhQNw6BX95ds24lr0JhbjCapIZV1vBBDJRGQtRJCylYUrAGPfjXUFptLfCc49fn19KGRjWnoFq29acFdMtqkx6XEckPSlsxGvLQp51ZcdcIT+EpalKJ9SToI1BF0XTFhTbpllL8aUpEyC4kGE8yEqaX0I/gudLbyCskoX3IBI1htWmZ78qLR6e7JM2Uua60B1oDrhBUoJPCQpQ6u4GSpQ5Ok53p3duq5Z8m19tLbQwWHSh2tz8ny3EnGWWknkggYUtXccJ9NBu97F3I3EcjN3I7D+TNlC3vKbOXVJ9QDwnJz21vYW3sWBRlUlbSktLb8pYSelWDweRznTM/Y8rGtoX9eNQqVLYny6ZT4C4MuahLrkVS3HQtTaiPYUrpTlScHjvqTfZR7es+dtpat0uVSKxd9CriE0mOpY86bEk+xLaCB7RQlIQ4T2BaA7qGuY91ynUUuUmPw4EENnH4QPs8HvyO2pFbdS3WqNkxbYkVFuQy2SGHljC22iSfLGOCBk49wOPTW7tnb5NBhJQtI8zoyrA7n9RpvPsccARd8LlWE4KrXWAc/62z8RoneNTxg3HsldUPbO3Ka5FkVGjCqGrJALigXlt+UyFeylSenKnCFEZACRjqHOW4pxr9Wk3ZeLxVIlLLqwVlx1w5zypWVKPJySe5+OtNtxuVMszfGhXhbkNQjt+ZT6m01yFQnR0rJx6pPSsD3p0wlyXdUr4qDJpj0iPGYfK1HoIQ+kpUkowfwec5+GpDbtDDTaB5QA9eP192uq1O6UQWAB2aR2/ijWT1j3HVdY+Oq6x7jqFwLCZWErrDhcxj7i2cJ/2ldz/AMNSiLToUFpMeDGbYbGPZbSAM+/4/Trn1T7Pix6IqepgFb8uS51e/LitaSfDbYJR5SR8NRupRELyrowO3GsOx7536sNy7HNjbUl1BybEiN1aoQIPy2VTmgpwoU2zz98SsFzoc6ensO+g5X7a3ivm4np1Zti8qzXJxy+7Kpst6S4M59pS0dQA93CRzgDUKFlVaoVhmLNiLaQhQcW2R7X044zoyUS3UwoyEhoYQMdOOdZMqEOnKW8/R20fvsfjAb3ruEY72w4M4/1lnRb8fPhbqniAsKBXrDjJcvWzy6/TWlKCfl8dePOiFauAo9KVIJIHUnpJAVnXN+D4b90KozJqV+U2bbzbS1NCnyE4muKSSCFJ58pAIIGfbPoAOTPrH2WgUdlsGnoTg5x0jOfXk8/Xk+/RTp9ox2UgIZHHHYa3rFFDIBSgAAZ7a6Lwx0xI+B2aQP8AlGruc416nXhxnVY47aoDBBz6j6NJbPiIbtuKhKMfdJBOPT2zoN7k3HBtKF9t6o+2zFQ4EuLWcBIUQOfrx9Or8+mGPTWHXyCt5sO4B7dQyB8dF7wHNhF83/njMCndv/le04VZbzR5/tuH9qu91fiK1ziTt3Dao6KqYyQt5wjqx7gD/bqIXQmNQ4jkt7pQ01krV7h79YjMJUiks1M/uclPW2T+Ej0I0bPAQnp3ruHGMfsYX/1TOn7HJ5+GlauO2o9Vuqu+ayFATZhwff5qtC+pW+zFfKENAYH4IyBrUwOmTPVAbwXAfaAOtrKihpgno5xg+7T4Rf8AJWB/6aPzRq6QBwQdejXg199HuOq6B66TusIT9oGekch179IdKR40MjZiuqT3C2P06NFSoHqtyjK6s5psZR+lsaLXgTSBfF9n1NPp36V7TgVYf4rmZScfJ3c5/inSXTYrYsqPhAwHFfmjS2+JNsp2supaAUkUuVyOP3s6z7XKn9rLOkOcqdosVROe/wBzH92jV4DEhO9dwADGbYX/ANUzp9T2z79L2UF26q6VgY+XTB/Sq0NK5HSX3MfEDH06Be1FUnzfEZuZQpMlTkOnMQTEaPZoLYSpQT85JOi5U2+lBz3JBGNPBCH7UZJ/zSPzRq8ARqte9Xw1d14dJxWXMUVtAI/dX/q6zpSvGdxstXgf4TH6ZOinKSlVtUbH+jYuf5pOi34FQRfN+dyDAp+D/vXtODVyTTJgKTj5O7z/ALB0mstKE2RHwfw1fmjS0+JP/wAKbtx/oqVn+bOs2zwj/BFZQKv/ACON+Zo1eBLjey4OBhNtLH9ZZ0+eDnt2P92l8bz+yiuhXH7dmfpFaHNcR92X0g9v79L3s6nPil3Z6u4i00/1ZGjTVUAoV1A576d2J/krJI/e0/k1dOq49dVn3fk1e14e2kyrRKaUgD0cf/POlQ8Z+P8AAtXuQcFnP88jRPcdzbNG9T9rIoH80nRa8EMpEa8b6cWrn7X08/0jumyqlZaXTJiSMftZ31/EOlImK6bJj4Hdw/kGlp8SfO1d2jHakyj/AEZ1m2YgL2jso/8AskYf8ujV4GlhneevKJ4NtrHP/wBpnT2NyUqPskEcaAYUk3TXOR7UyX+kVofVsnz3Ph20u+0CynxT7sccmJTR/V0aNtV4bVk/rxp2oKQqIzn/ADaPzRrICEgY1RbSdeeUn46+j276xZE1tkjKwAfU+nxPw0m9dkMCEqMXOl1h+Q06hXCm1hZyD7v+2lh8U1JkXXtjWbdovS5UJTRdjslQBd8oh1SQTxkpQQB6nA7nUlg3hblTs2iT4dVjraNNjJKg6klKg2AQRnhQPcHkY9NTbwu3zCjXBdEynzmXGpDUWIktuBXUtJWpQBB5xlP16Z4XFKmQJC1rICmXDyr8Q6DMhwrs6Ngg/dFfkGlv8SOTtXdvUMH7UyuMfiHWRZLpO0NlEHj7SRs/yBoqeEetN0XdmsyHCAldBUgH4mQ0f7NOVEvJp0hTLhPIzoZRny5cFVdwPakyTg/xzqF1klTi1Ec4Ol22gBHiq3VyO0Wmf9OjRuqw+5qPGMc6dqCtIisjI/c04/kjWT8de6rXh1hTqaia0WlOLAUMHCsaD14eFTby76q9WpxrjMx/l1yHWZDAd/jJSoA6hjngO2XVNFRl2mqqSUjCXKlPkSyke4JccIx8MY1db8E2y8TrXF2tt5BJzkU5o5PvwRqU0bY2jWvFTEoNCiU9hP3rcaKhofUkAat1SyK62hfyNpxShyEqwEn4aXmp7ZeI6gKl0miWpR6zR1vKejKXVkx346T+ArrR0rA7A8EevOhxffhp8SW41NkW/UKZa9EgTUlEkuz3ZrikK7pCUIQnn4q9ONVafg/36ty2INpObkUSVCp7QYjLdorvnJbB4SSHgDjtyM4A9caKG0nh3r23r8qp1q6n6rPmhKXXWIyY6QhJyEhPUo4ySe+T69tGeE65SUZUyolPBKyc6h9KvSjm66nSZUlLUxK3XiheQVJUSpKhnuDnv8Naus1CJ1LUXUnvwD6fqdKptZujZcLxabnR5dfhMmWiGxHW48lKXVtMNpcCSe5Csg/No9yL2tupzmaLTqvDkTJa0ttMtvpUskkAnAOekdyfdpxrfqU2oNNlpt/ykgBKlJxn9f176mUVLxSFLynPodZWq1Wq1Wq15jOqKQe4B1bXHaWclA+rVlVPhL++jIz78asrodPcHLWPm1aXQYJP3nYaxnqBTyofck8/DWvnWZSJSFea3xjOAMaF16+FbaC932ajW6RKTMaP3GXFmOR32v4jiCFDWmT4MNo1tqZqFRu+otJIHlyrilKSR7iErHH5dbSD4PPDvCbDY2stx8J5Bfpzbp+fKgTn6dTu2NjNsbaIkW7ZtFpjjaQEqiU9ppQA9AUgHU8hwGI7aQ2MJHAGs0DHbXuq1//Z diff --git a/addons/project_timesheet/project_timesheet_demo.xml b/addons/project_timesheet/project_timesheet_demo.xml index ee2c672df1d..ff2a411282f 100644 --- a/addons/project_timesheet/project_timesheet_demo.xml +++ b/addons/project_timesheet/project_timesheet_demo.xml @@ -4,13 +4,13 @@ - + - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -36,7 +36,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py index 3ffa190abab..b86d0b884c3 100644 --- a/addons/sale/res_config.py +++ b/addons/sale/res_config.py @@ -119,7 +119,7 @@ class sale_configuration(osv.osv_memory): user = self.pool.get('res.users').browse(cr, uid, uid, context) res['time_unit'] = user.company_id.project_time_mode_id.id else: - product = ir_model_data.get_object(cr, uid, 'product', 'product_product_0') + product = ir_model_data.get_object(cr, uid, 'product', 'product_product_consultant') res['time_unit'] = product.uom_id.id return res @@ -157,7 +157,7 @@ class sale_configuration(osv.osv_memory): ir_values.set_default(cr, uid, 'sale.order', 'picking_policy', default_picking_policy) if wizard.time_unit: - product = ir_model_data.get_object(cr, uid, 'product', 'product_product_0') + product = ir_model_data.get_object(cr, uid, 'product', 'product_product_consultant') product.write({'uom_id': wizard.time_unit.id, 'uom_po_id': wizard.time_unit.id}) if wizard.module_project and wizard.time_unit: diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml index 491148997b2..8288c204a71 100644 --- a/addons/sale/sale_demo.xml +++ b/addons/sale/sale_demo.xml @@ -55,7 +55,7 @@ Service on demand - + 24 24 @@ -118,7 +118,7 @@ Service on demand - + 16 16