From d280a8380277365d4f9313eb8c7cdcf87ebeb78b Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Wed, 19 May 2010 15:37:21 +0530 Subject: [PATCH 1/5] [IMP] point_of_sale: Improve the yml statement bzr revid: sbh@tinyerp.com-20100519100721-m94wgrgxjr7t514k --- addons/point_of_sale/test/pos_test.yml | 95 ++++++++++++-------------- 1 file changed, 45 insertions(+), 50 deletions(-) diff --git a/addons/point_of_sale/test/pos_test.yml b/addons/point_of_sale/test/pos_test.yml index eaafc9c8b2a..2303ccff00e 100644 --- a/addons/point_of_sale/test/pos_test.yml +++ b/addons/point_of_sale/test/pos_test.yml @@ -4,7 +4,7 @@ - I configure all details for the customer,Salesman and Product ,Account. - - Creating an account.account.type record + I create View Account Type. - !record {model: account.account.type, id: account_account_type_view0}: close_method: none @@ -14,7 +14,7 @@ - - Creating an account.account.type record + I create Income Account Type. - !record {model: account.account.type, id: account_account_type_income0}: close_method: unreconciled @@ -24,7 +24,7 @@ - - Creating an account.account.type record + I create Expense Account Type. - !record {model: account.account.type, id: account_account_type_expense0}: close_method: unreconciled @@ -34,7 +34,7 @@ - - Creating an account.account.type record + I create Cash Account Type. - !record {model: account.account.type, id: account_account_type_cash0}: close_method: balance @@ -44,7 +44,7 @@ - - Creating an account.account record + I create Minimal Chart Account. - !record {model: account.account, id: account_account_minimalchart0}: code: '0' @@ -56,7 +56,7 @@ type: view user_type: account_account_type_view0 - - Creating an account.account record + I create Payable Account. - !record {model: account.account, id: account_account_payable1}: code: AP @@ -72,7 +72,7 @@ - - Creating an account.account record + I create Receivable Account. - !record {model: account.account, id: account_account_receivable0}: code: AR @@ -88,7 +88,7 @@ - - Creating an account.account record + I create Cash Account. - !record {model: account.account, id: account_account_cash0}: code: C @@ -103,7 +103,7 @@ - - Creating an account.account record + I create Purchases Account. - !record {model: account.account, id: account_account_purchases0}: code: P @@ -116,7 +116,7 @@ type: other user_type: account_account_type_expense0 - - Creating an account.account record + I create Sales Account. - !record {model: account.account, id: account_account_sales0}: code: S @@ -130,7 +130,7 @@ user_type: account_account_type_income0 - - Creating an account.journal record + I create Purchase Journal. - !record {model: account.journal, id: account_journal_purchasejournal0}: code: PUJ @@ -144,7 +144,7 @@ - - Creating an account.journal record + I create Sale Journal. - !record {model: account.journal, id: account_journal_salejournal0}: code: SAJ @@ -158,7 +158,7 @@ - - Creating an account.journal record + I create Bank Journal. - !record {model: account.journal, id: account_journal_bankjournal0}: code: BNK @@ -172,7 +172,7 @@ - - Creating a ir.property record + I create property for account payable. - !record {model: ir.property, id: ir_property_propertyaccountexpensecateg0}: company_id: base.main_company @@ -182,7 +182,7 @@ - - Creating a ir.property record + I create property for account receivable. - !record {model: ir.property, id: ir_property_propertyaccountincomecateg0}: company_id: base.main_company @@ -190,12 +190,12 @@ name: property_account_income_categ value_reference: account.account,6 - - Creating a res.partner.category record + I create Partner category Customers. - !record {model: res.partner.category, id: res_partner_category_customers0}: name: Customers - - Creating an res.partner record + I create partner - !record {model: res.partner, id: res_partner_cleartrail0}: category_id: @@ -204,7 +204,7 @@ - - Creating an res.partner.address record + I create partner address. - !record {model: res.partner.address, id: res_partner_address_1}: partner_id: res_partner_cleartrail0 @@ -213,7 +213,7 @@ - - Creating an res.partner.address record + I create partner invoice address. - !record {model: res.partner.address, id: res_partner_address_2}: partner_id: res_partner_cleartrail0 @@ -221,21 +221,18 @@ - - Creating an res.partner.address record + I create partner delivery address. - !record {model: res.partner.address, id: res_partner_address_3}: partner_id: res_partner_cleartrail0 street: sangam house 15 B palasia, A B Road type: delivery - - Customer Cleartrail has specific instrument requirements regarding the stockable products -- - Creating an product.category record - !record {model: product.category, id: product_category_allproductssellable0}: name: Mobile Products Sellable - - Creating a res.partner record + I create partner. - !record {model: res.partner, id: res_partner_microlinktechnologies0}: address: @@ -246,23 +243,20 @@ supplier: true - - Creating a res.partner.address record + I create partner address . - !record {model: res.partner.address, id: res_partner_address_0}: country_id: base.in partner_id: res_partner_microlinktechnologies0 street: Ash House, Ash Road title: Ms. - - - - - Creating an product.category record + I create product category . - !record {model: product.category, id: product_category_services0}: name: Mobile Services - - Creating an product.template record + I create product template . - !record {model: product.template, id: product_template_lgviewtysmart0}: categ_id: product_category_allproductssellable0 @@ -278,7 +272,7 @@ uom_po_id: product.product_uom_unit - - Creating an product.product record + I create product LG Viewty Smart. - !record {model: product.product, id: product_product_lgviewtysmart0}: categ_id: product_category_allproductssellable0 @@ -296,13 +290,15 @@ supply_method: produce type: product uom_id: product.product_uom_unit - uom_po_id: product.product_uom_unit + uom_po_id: product.product_uom_unit +- + I create product category . - !record {model: product.category, id: product_category_computer0}: name: Computer - - Creating a product.product record + I create product HP Pavilion Desktop PCs - !record {model: product.product, id: product_product_hppaviliondesktoppcs0}: categ_id: product_category_computer0 @@ -322,8 +318,10 @@ property_account_expense: account_account_payable1 property_account_income: account_account_receivable0 - - Creating a pos.order record -- +- + I create New Order with adding the details of Salesman and "Product" as LG Viewty Smart Quantity as 10. +- + !record {model: pos.order, id: pos_order_pos0}: company_id: base.main_company date_order: '2010-05-13 15:02:48' @@ -357,13 +355,13 @@ ref("pos_order_pos0"), }) - - Creating a pos.open.statement record + I Open the registered . - !record {model: pos.open.statement, id: pos_open_statement_0}: {} - - Performing an osv_memory action open_statement on module pos.open.statement + I Open the statement. - !python {model: pos.open.statement}: | self.open_statement(cr, uid, [ref("pos_open_statement_0")], {"lang": "en_US", "active_model": @@ -371,7 +369,7 @@ False, "active_id": ref("point_of_sale.menu_open_statement"), }) - - Creating a pos.make.payment record + I click on the wizard "Make Payment" - !record {model: pos.make.payment, id: pos_make_payment_0}: amount: 1615.0 @@ -381,7 +379,7 @@ product_id: product_product_hppaviliondesktoppcs0 - - For payment I click on Make Payment. + I make the payment. - !python {model: pos.make.payment}: | self.check(cr, uid, [ref("pos_make_payment_0")], {"lang": "en_US", "active_model": @@ -399,16 +397,16 @@ - 1. Cancel 2.Return Goods and Exchange 3.Return without Refund - - When i click on Return Goods and Exchange + When i click on Return Goods and Exchange . - Then allows me to define the quantity of products, which will return to the stock. - - Creating a pos.return record + I click on Return Picking button. - !record {model: pos.return, id: pos_return_0}: {} - - Performing an osv_memory action create_returns on module pos.return + I Return the product. - !python {model: pos.return}: | self.create_returns(cr, uid, [ref("pos_return_0")], {"lang": "en_US", "active_model": @@ -419,7 +417,7 @@ - Then allows me to define the quantity of products, which will return to the stock. - - I have select the HP Pavilion Desktop PCs for exchange + I have select the HP Pavilion Desktop PCs for exchange. - !record {model: pos.add.product, id: pos_add_product_0}: product_id: product_product_hppaviliondesktoppcs0 @@ -433,7 +431,7 @@ }) - - Creating a pos.make.payment record + I create payment. - !record {model: pos.make.payment, id: pos_make_payment_1}: amount: 680.0 @@ -451,12 +449,10 @@ False, "active_id": ref("pos_order_pos0"), }) - - Creating a pos.return record + To check the Return without Refund . I click button "Return without Refund ". - !record {model: pos.return, id: pos_return_0}: {} -- - To check the Return without Refund . I click button "Return without Refund ". - The quantity which are selected in Return lines wizard are refunded.. - @@ -465,13 +461,12 @@ "pos.order", "active_ids": [ref("pos_order_pos0")], "tz": False, "active_id": ref("pos_order_pos0"), }) - - Creating a pos.confirm record + To Close order I use the wizard "Sale Confirm". - !record {model: pos.confirm, id: pos_confirm_0}: {} - - - I have close this order + I have close this order. - !python {model: pos.confirm}: | self.action_confirm(cr, uid, [ref("pos_confirm_0")], {"lang": "en_US", "active_model": From 3b7c13c1421c0927d18b397425f6bada4b5508b1 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Wed, 19 May 2010 15:59:46 +0530 Subject: [PATCH 2/5] [IMP] point_of_sale,delivery, purchase_requisition: Improve the yml statement bzr revid: sbh@tinyerp.com-20100519102946-b04oip1tyrl5c0hx --- addons/delivery/test/delivery_test.yml | 14 ++++++------- addons/point_of_sale/test/pos_test.yml | 2 +- .../test/purchase_requisition.yml | 21 ++++++++----------- .../test/purchase_requisition_exclusive.yml | 16 +++++++------- 4 files changed, 25 insertions(+), 28 deletions(-) diff --git a/addons/delivery/test/delivery_test.yml b/addons/delivery/test/delivery_test.yml index 700ff046a0e..cbc30822368 100644 --- a/addons/delivery/test/delivery_test.yml +++ b/addons/delivery/test/delivery_test.yml @@ -5,9 +5,9 @@ Delivery based on delivered quantities. - - I create the partner associated with the transport + I create the partner associated with the transport. - - Creating a res.partner record + I create partner. - !record {model: res.partner, id: res_partner_thepost0}: address: @@ -37,7 +37,7 @@ - - I create the Delivery Method + I create the Delivery Method. - !record {model: delivery.carrier, id: delivery_carrier_theopenerpexperss0}: name: The OpenERP Experss @@ -45,7 +45,7 @@ product_id: product_product_deliverybypost0 - I create a delivery grid record and define the region for which the tariffs in the grid will be applicable. - Then set the condition for which this rule is applicable + Then set the condition for which this rule is applicable. - !record {model: delivery.grid, id: delivery_grid_weight0}: carrier_id: delivery_carrier_theopenerpexperss0 @@ -76,7 +76,7 @@ sequence: 1 - - To check the Delivery based on order quantities , I have created sale order and picking_policy is direct + To check the Delivery based on order quantities , I have created sale order and picking_policy is direct . - !record {model: sale.order, id: sale_order_so0}: date_order: '2010-05-11' @@ -150,13 +150,13 @@ - !workflow {model: sale.order, action: order_confirm, ref: sale_order_test_complete0} - - Creating a stock.invoice.onshipping record + I Create stock.invoice.onshipping - !record {model: stock.invoice.onshipping, id: stock_invoice_onshipping_0}: journal_id: account.sales_journal type: out_invoice - - Create a Invoice form picking. + I Create Invoice form picking. - !python {model: stock.invoice.onshipping}: | so=self.pool.get('sale.order').browse(cr,uid,ref('sale_order_test_complete0')) diff --git a/addons/point_of_sale/test/pos_test.yml b/addons/point_of_sale/test/pos_test.yml index 2303ccff00e..427362cc459 100644 --- a/addons/point_of_sale/test/pos_test.yml +++ b/addons/point_of_sale/test/pos_test.yml @@ -317,7 +317,7 @@ uom_po_id: product.product_uom_unit property_account_expense: account_account_payable1 property_account_income: account_account_receivable0 -- + - I create New Order with adding the details of Salesman and "Product" as LG Viewty Smart Quantity as 10. - diff --git a/addons/purchase_requisition/test/purchase_requisition.yml b/addons/purchase_requisition/test/purchase_requisition.yml index 6a8d52ed201..ff3f10bc425 100644 --- a/addons/purchase_requisition/test/purchase_requisition.yml +++ b/addons/purchase_requisition/test/purchase_requisition.yml @@ -27,7 +27,7 @@ weight_net: 0.0 list_price: 100.0 - - Then I sell 5 Laptop ACER to the customer Agrolait, sale order TEST/TENDER/0001 + Then I sell 5 Laptop ACER to the customer Agrolait, sale order TEST/TENDER/0001. - !record {model: sale.order, id: sale_order_testtender0}: date_order: '2010-05-10' @@ -54,7 +54,7 @@ shop_id: sale.shop - - Performing a workflow action order_confirm on module sale.order + I confirm the sale order. - !workflow {model: sale.order, action: order_confirm, ref: sale_order_testtender0} @@ -66,17 +66,14 @@ proc_obj._procure_confirm(cr,uid) - On the purchase tender, I create a new purchase order for the supplier 'DistriPC' by clicking on - -- - Creating a purchase.requisition.partner record - + the button 'New RfQ'. This opens a window to ask me the supplier and I set DistriPC . - !record {model: purchase.requisition.partner, id: purchase_requisition_partner_0}: partner_address_id: base.res_partner_address_7 partner_id: base.res_partner_4 - - Performing an osv_memory action create_order on module purchase.requisition.partner + I create a new purchase order . - !python {model: purchase.requisition.partner}: | @@ -120,7 +117,7 @@ line_obj.write(cr, uid, order_line1, {'product_qty':2}) line_obj.write(cr, uid, order_line2, {'product_qty':3}) - - I confirm and validate both purchase orders + I confirm and validate both purchase orders. - !python {model: purchase.order}: | @@ -132,7 +129,7 @@ wf_service.trg_validate(uid, 'purchase.order',id,'purchase_approve', cr) - - I check that the delivery order of the customer is in state 'Waiting Goods' + I check that the delivery order of the customer is in state 'Waiting Goods'. - !python {model: stock.picking }: | @@ -143,7 +140,7 @@ assert(pick.move_lines[0].state=='wating'),'Order is not wating"' - - I receive the order of the supplier Asustek from the Incoming Products menu + I receive the order of the supplier Asustek from the Incoming Products menu. - !python {model: stock.picking }: | @@ -167,7 +164,7 @@ } self.do_partial(cr, uid, picking_id,partial_datas) - - I receive the order of the supplier DistriPC from the Incoming Shipments menu + I receive the order of the supplier DistriPC from the Incoming Shipments menu. - !python {model: stock.picking }: | @@ -189,7 +186,7 @@ } self.do_partial(cr, uid, picking_id,partial_datas) - - Now, I can check that the delivery order of the customer is in the state Available + Now, I can check that the delivery order of the customer is in the state Available. - !python {model: stock.picking }: | diff --git a/addons/purchase_requisition/test/purchase_requisition_exclusive.yml b/addons/purchase_requisition/test/purchase_requisition_exclusive.yml index 030b80b2260..42eb34ea725 100644 --- a/addons/purchase_requisition/test/purchase_requisition_exclusive.yml +++ b/addons/purchase_requisition/test/purchase_requisition_exclusive.yml @@ -50,19 +50,19 @@ pricelist_id: product.list0 shop_id: sale.shop - - Performing a workflow action order_confirm on module sale.order + I confirm sale order. - !workflow {model: sale.order, action: order_confirm, ref: sale_order_testtender1} - - I launch he scheduler to compute all procurements, and planify all requisitions orders + I launch he scheduler to compute all procurements, and planify all requisitions orders. - !python {model: mrp.procurement.compute.all}: | proc_obj = self.pool.get('mrp.procurement') proc_obj._procure_confirm(cr,uid) - I should find a purchase requisition with the origin 'TEST/TENDER/0002', that includes a request for - 5 Laptop ACER, and a purchase order on the default supplier for this product + 5 Laptop ACER, and a purchase order on the default supplier for this product. - !python {model: purchase.requisition}: | requisition_ids =self.search(cr, uid, [('origin','=','TEST/TENDER/0002')]) @@ -70,16 +70,16 @@ assert len(requisition_ids), "Purchase requisition hasn't Created" - On the purchase tender, I create a new purchase order for the supplier 'DistriPC' by clicking on - the button 'New RfQ'. This opens a window to ask me the supplier and I set DistriPC + the button 'New RfQ'. This opens a window to ask me the supplier and I set DistriPC . - - Creating a purchase.requisition.partner record + I Create purchase.requisition.partner . - !record {model: purchase.requisition.partner, id: purchase_requisition_partner_0}: partner_address_id: base.res_partner_address_7 partner_id: base.res_partner_4 - - Performing an osv_memory action create_order on module purchase.requisition.partner + I create a new purchase order for the supplier 'DistriPC'. - !python {model: purchase.requisition.partner}: | req_obj = self.pool.get('purchase.requisition') @@ -91,11 +91,11 @@ - I set the purchase tender as 'Exclusive' - - !python {model: purchase.requisition}: | + !python {model: purchase.requisition}: | ids =self.search(cr, uid, [('origin','=','TEST/TENDER/0002')]) self.write(cr,uid,ids[0],{'exclusive': 'exclusive' }) - - I confirm and validate the RfQ of ASUStek + I confirm and validate the RfQ of ASUStek. - !python {model: purchase.order}: | partner_id=self.pool.get('res.partner').search(cr,uid,[('name','=','ASUStek')])[0] From 21d71d4d96f3bdfe340a1e0459ef3d0e20810db8 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Wed, 19 May 2010 16:18:42 +0530 Subject: [PATCH 3/5] [IMP] stock : Improve the yml statement bzr revid: sbh@tinyerp.com-20100519104842-2xbh3qs7yk9ni5ol --- addons/stock/test/stock_test.yml | 56 +++++++++++++------------------- 1 file changed, 23 insertions(+), 33 deletions(-) diff --git a/addons/stock/test/stock_test.yml b/addons/stock/test/stock_test.yml index 0922c2f975e..6a9bf3ff9f3 100644 --- a/addons/stock/test/stock_test.yml +++ b/addons/stock/test/stock_test.yml @@ -4,7 +4,7 @@ create physical inventory ,fill inventory lines from location,split inventory line into production lot - - Creating a account.account.type record + I create Asset Account Type. - !record {model: account.account.type, id: account_account_type_asset0}: close_method: balance @@ -12,18 +12,8 @@ name: Asset sign: 1 - - - Creating a account.account.type record -- - !record {model: account.account.type, id: account_account_type_liability0}: - close_method: balance - code: liability - name: Liability - sign: 1 - -- - Creating a account.account.type record + I create Income Account Type. - !record {model: account.account.type, id: account_account_type_income0}: close_method: unreconciled @@ -33,7 +23,7 @@ - - Creating a account.account.type record + I create Expense Account Type. - !record {model: account.account.type, id: account_account_type_expense0}: close_method: unreconciled @@ -41,7 +31,7 @@ name: Expense sign: 1 - - Creating a account.account.type record + I create Cash Account Type. - !record {model: account.account.type, id: account_account_type_cash0}: close_method: balance @@ -51,7 +41,7 @@ - - Creating a account.account.type record + I create Receivable Account Type. - !record {model: account.account.type, id: account_account_type_receivable0}: close_method: balance @@ -60,7 +50,7 @@ sign: 1 - - Creating a account.account record + I create Receivable Account . - !record {model: account.account, id: account_account_receivable0}: code: '40000' @@ -72,7 +62,7 @@ type: receivable user_type: account_account_type_receivable0 - - Creating a account.account record + I create Payable Account. - !record {model: account.account, id: account_account_payable0}: code: '440000' @@ -84,7 +74,7 @@ type: payable user_type: account_account_type_expense0 - - Creating a account.journal record + I create Purchase Journal. - !record {model: account.journal, id: account_journal_purchasejournal0}: code: pur @@ -95,18 +85,18 @@ view_id: account.account_journal_bank_view - - Creating a account.journal record + I create Sale Journal. - !record {model: account.journal, id: account_journal_salejouran0}: code: sal company_id: base.main_company - name: Sale Jouran + name: Sale Journal sequence_id: account.sequence_sale_journal type: sale view_id: account.account_journal_view - - Creating a account.account record + I create Expense Account. - !record {model: account.account, id: account_account_expenseaccount0}: code: Expe @@ -118,7 +108,7 @@ type: consolidation user_type: account_account_type_asset0 - - Creating a account.account record + I create Product Sale Account. - !record {model: account.account, id: account_account_productsale0}: code: '001' @@ -130,7 +120,7 @@ - - Creating a account.account record + I create Product Purchase Account. - !record {model: account.account, id: account_account_productpurchase0}: code: '0002' @@ -141,7 +131,7 @@ user_type: account_account_type_expense0 - - Creating a res.partner record + I create partner. - !record {model: res.partner, id: res_partner_shawtrust0}: address: @@ -152,7 +142,7 @@ property_account_payable: account_account_payable0 property_account_receivable: account_account_receivable0 - - Creating a res.partner record + I create partner. - !record {model: res.partner, id: res_partner_diasorinltd0}: address: @@ -163,7 +153,7 @@ - - Creating a res.partner record + I create partner. - !record {model: res.partner, id: res_partner_microlinktechnologies0}: address: @@ -174,7 +164,7 @@ supplier: true - - Creating a res.partner.address record + I create partner address. - !record {model: res.partner.address, id: res_partner_address_0}: country_id: base.in @@ -184,13 +174,13 @@ - - Creating a product.category record + I create product.category . - !record {model: product.category, id: product_category_computer0}: name: Computer - - Creating a product.product record + I create product HP Pavilion Desktop PCs . - !record {model: product.product, id: product_product_hppaviliondesktoppcs0}: categ_id: stock.product_category_computer0 @@ -211,7 +201,7 @@ property_account_income: account_account_productsale0 - - Creating a product.product record + I create product HP CD writers. - !record {model: product.product, id: product_product_hpcdwriters0}: categ_id: stock.product_category_computer0 @@ -259,7 +249,7 @@ !python {model: stock.inventory}: | self.action_done(cr,uid,[ref('stock_inventory_physicalinventoy0')]) - - Creating a stock.fill.inventory record + I create stock.fill.inventory . - !record {model: stock.fill.inventory, id: stock_fill_inventory_0}: location_id: stock.stock_location_stock @@ -273,7 +263,7 @@ [ref("stock_inventory_physicalinventoy0")], "active_id": ref("stock_inventory_physicalinventoy0"), }) - - Creating a stock.move.split record. + I create stock.move.split record. - !record {model: stock.move.split, id: stock_move_split_0}: line_ids: @@ -283,7 +273,7 @@ - - Split into production line. + I Split into production line. - !python {model: stock.move.split}: | move_obj=self.pool.get('stock.move') From 0cfb77445ffd84b94172dddbc294250cc9e88e39 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Wed, 19 May 2010 17:14:36 +0530 Subject: [PATCH 4/5] Task-ID 506:put help tooltips for pruchase_requisition module in installer wizard and change and improve the label of button in quotation tab bzr revid: sbh@tinyerp.com-20100519114436-il3v5xl7w9ivuj09 --- addons/purchase/wizard/purchase_installer.py | 2 +- addons/purchase_requisition/purchase_requisition_view.xml | 2 +- .../wizard/purchase_requisition_partner_view.xml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/purchase/wizard/purchase_installer.py b/addons/purchase/wizard/purchase_installer.py index da2c3f41cca..a6e25375bc1 100644 --- a/addons/purchase/wizard/purchase_installer.py +++ b/addons/purchase/wizard/purchase_installer.py @@ -25,7 +25,7 @@ class purchase_installer(osv.osv_memory): _inherit = 'res.config.installer' _columns = { - 'purchase_requisition':fields.boolean('Purchase Requisition'), + 'purchase_requisition':fields.boolean('Purchase Requisition',help="Manage your Purchase Requisition and regroup and allow you to easily keep track and order all your purchase orders."), } purchase_installer() diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml index 96488f4eb72..174bfe11bf2 100644 --- a/addons/purchase_requisition/purchase_requisition_view.xml +++ b/addons/purchase_requisition/purchase_requisition_view.xml @@ -72,7 +72,7 @@ -