diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py index 0481a2a3e20..484ec43bab3 100644 --- a/addons/event_sale/__openerp__.py +++ b/addons/event_sale/__openerp__.py @@ -38,7 +38,7 @@ when you confirm your sale order it will automatically create a registration for this event. """, 'author': 'OpenERP SA', - 'depends': ['event','sale','sale_crm'], + 'depends': ['event', 'sale_crm'], 'data': ['event_sale_view.xml'], 'demo': ['event_demo.xml'], 'test': ['test/confirm.yml'], diff --git a/addons/multi_company/__openerp__.py b/addons/multi_company/__openerp__.py index eb882604d22..501740188db 100644 --- a/addons/multi_company/__openerp__.py +++ b/addons/multi_company/__openerp__.py @@ -34,7 +34,7 @@ This module is the base module for other multi-company modules. 'website': 'http://www.openerp.com/', 'depends': [ 'base', - 'sale', + 'sale_stock', 'project', ], 'data': ['res_company_view.xml'], diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py index bf0ced67a0f..e9dd628243b 100644 --- a/addons/point_of_sale/__openerp__.py +++ b/addons/point_of_sale/__openerp__.py @@ -49,7 +49,7 @@ Main Features """, 'author': 'OpenERP SA', 'images': ['images/cash_registers.jpeg', 'images/pos_analysis.jpeg','images/register_analysis.jpeg','images/sale_order_pos.jpeg','images/product_pos.jpeg'], - 'depends': ['sale'], + 'depends': ['sale_stock'], 'data': [ 'security/point_of_sale_security.xml', 'security/ir.model.access.csv', diff --git a/addons/portal_sale/__openerp__.py b/addons/portal_sale/__openerp__.py index 764eb7b938d..8d7cd8b3935 100644 --- a/addons/portal_sale/__openerp__.py +++ b/addons/portal_sale/__openerp__.py @@ -30,7 +30,7 @@ This module adds sale menu and features to your portal if sale and portal are in ======================================================================================== """, 'author': 'OpenERP SA', - 'depends': ['sale','portal'], + 'depends': ['sale_stock','portal'], 'data': [ 'security/portal_security.xml', 'portal_sale_view.xml', diff --git a/addons/procurement/__openerp__.py b/addons/procurement/__openerp__.py index 21f83b8dafc..e797766eb40 100644 --- a/addons/procurement/__openerp__.py +++ b/addons/procurement/__openerp__.py @@ -60,7 +60,7 @@ depending on the product's configuration. 'demo': ['stock_orderpoint.xml'], 'test': ['test/procurement.yml'], 'installable': True, - 'auto_install': False, + 'auto_install': True, 'certificate': '00954248826881074509', 'images': ['images/compute_schedulers.jpeg','images/config_companies_sched.jpeg', 'images/minimum_stock_rules.jpeg'], } diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml index 33d8698ce3d..729f107b755 100644 --- a/addons/project_mrp/process/project_mrp_process.xml +++ b/addons/project_mrp/process/project_mrp_process.xml @@ -51,7 +51,7 @@ - + diff --git a/addons/sale/__init__.py b/addons/sale/__init__.py index fe19b7fa609..5a7b4b499df 100644 --- a/addons/sale/__init__.py +++ b/addons/sale/__init__.py @@ -24,11 +24,9 @@ #---------------------------------------------------------- import sale -import stock import res_partner import wizard import report -import company import edi import res_config diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py index 6a0769b7da3..13f0fb53696 100644 --- a/addons/sale/__openerp__.py +++ b/addons/sale/__openerp__.py @@ -35,8 +35,10 @@ It handles the full sales workflow: * **Quotation** -> **Sales order** -> **Invoice** -Preferences +Preferences (only with Warehouse Management installed) ----------- +If you also installed the Warehouse Management, you can deal with the following preferences: + * Shipping: Choice of delivery at once or partial delivery * Invoicing: choose how invoices will be paid * Incoterms: International Commercial terms @@ -55,15 +57,14 @@ The Dashboard for the Sales Manager will include """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', - 'images': ['images/deliveries_to_invoice.jpeg','images/sale_dashboard.jpeg','images/Sale_order_line_to_invoice.jpeg','images/sale_order.jpeg','images/sales_analysis.jpeg'], - 'depends': ['stock', 'procurement', 'board', 'account_voucher'], + 'images': ['images/sale_dashboard.jpeg','images/Sale_order_line_to_invoice.jpeg','images/sale_order.jpeg','images/sales_analysis.jpeg'], + 'depends': ['account_voucher'], 'data': [ 'wizard/sale_make_invoice_advance.xml', 'wizard/sale_line_invoice.xml', 'wizard/sale_make_invoice.xml', 'security/sale_security.xml', 'security/ir.model.access.csv', - 'company_view.xml', 'sale_workflow.xml', 'sale_sequence.xml', 'sale_report.xml', @@ -71,7 +72,6 @@ The Dashboard for the Sales Manager will include 'sale_view.xml', 'res_partner_view.xml', 'report/sale_report_view.xml', - 'stock_view.xml', 'process/sale_process.xml', 'board_sale_view.xml', 'edi/sale_order_action_data.xml', @@ -80,9 +80,7 @@ The Dashboard for the Sales Manager will include 'demo': ['sale_demo.xml'], 'test': [ 'test/sale_order_demo.yml', - 'test/picking_order_policy.yml', 'test/manual_order_policy.yml', - 'test/prepaid_order_policy.yml', 'test/cancel_order.yml', 'test/delete_order.yml', 'test/edi_sale_order.yml', diff --git a/addons/sale/edi/sale_order.py b/addons/sale/edi/sale_order.py index b850922cbb2..edec15a86ae 100644 --- a/addons/sale/edi/sale_order.py +++ b/addons/sale/edi/sale_order.py @@ -185,16 +185,9 @@ class sale_order(osv.osv, EDIMixin): order_lines = edi_document['order_line'] for order_line in order_lines: - self._edi_requires_attributes(('date_planned', 'product_id', 'product_uom', 'product_qty', 'price_unit'), order_line) + self._edi_requires_attributes(( 'product_id', 'product_uom', 'product_qty', 'price_unit'), order_line) order_line['product_uom_qty'] = order_line['product_qty'] del order_line['product_qty'] - date_planned = order_line.pop('date_planned') - delay = 0 - if date_order and date_planned: - # no security_days buffer, this is the promised date given by supplier - delay = (datetime.strptime(date_planned, DEFAULT_SERVER_DATE_FORMAT) - \ - datetime.strptime(date_order, DEFAULT_SERVER_DATE_FORMAT)).days - order_line['delay'] = delay # discard web preview fields, if present order_line.pop('price_subtotal', None) @@ -216,11 +209,6 @@ class sale_order_line(osv.osv, EDIMixin): edi_doc.update(product_uom=line.product_uos, product_qty=line.product_uos_qty) - # company.security_days is for internal use, so customer should only - # see the expected date_planned based on line.delay - date_planned = datetime.strptime(line.order_id.date_order, DEFAULT_SERVER_DATE_FORMAT) + \ - relativedelta(days=line.delay or 0.0) - edi_doc['date_planned'] = date_planned.strftime(DEFAULT_SERVER_DATE_FORMAT) edi_doc_list.append(edi_doc) return edi_doc_list diff --git a/addons/sale/edi/sale_order_action_data.xml b/addons/sale/edi/sale_order_action_data.xml index c818a3a22ab..9796d0bda16 100644 --- a/addons/sale/edi/sale_order_action_data.xml +++ b/addons/sale/edi/sale_order_action_data.xml @@ -1,15 +1,6 @@ - - - if not object.partner_id.opt_out: object.edi_export_and_email(template_ext_id='sale.email_template_edi_sale', context=context) - code - ir.actions.server - - True - Auto-email confirmed sale orders - @@ -25,14 +16,9 @@ - - - - - - diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot index 393b3e59db3..53d2e09585b 100644 --- a/addons/sale/i18n/sale.pot +++ b/addons/sale/i18n/sale.pot @@ -1,1062 +1,24 @@ -# #-#-#-#-# sale.pot (OpenERP Server 6.1rc1) #-#-#-#-# # Translation of OpenERP Server. # This file contains the translation of the following modules: -# * sale +# * sale # -# #-#-#-#-# sale.pot.web (PROJECT VERSION) #-#-#-#-# -# Translations template for PROJECT. -# Copyright (C) 2012 ORGANIZATION -# This file is distributed under the same license as the PROJECT project. -# FIRST AUTHOR , 2012. -# -#, fuzzy msgid "" msgstr "" -"#-#-#-#-# sale.pot (OpenERP Server 6.1rc1) #-#-#-#-#\n" -"Project-Id-Version: OpenERP Server 6.1rc1\n" +"Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-08 00:35+0000\n" -"PO-Revision-Date: 2012-02-08 00:35+0000\n" +"POT-Creation-Date: 2012-09-20 07:29+0000\n" +"PO-Revision-Date: 2012-09-20 07:29+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" -"#-#-#-#-# sale.pot.web (PROJECT VERSION) #-#-#-#-#\n" -"Project-Id-Version: PROJECT VERSION\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-02-08 01:37+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.6\n" #. module: sale -#: field:sale.config.picking_policy,timesheet:0 -msgid "Based on Timesheet" -msgstr "" - -#. module: sale -#: view:sale.order.line:0 -msgid "" -"Sale Order Lines that are confirmed, done or in exception state and haven't " -"yet been invoiced" -msgstr "" - -#. module: sale -#: view:board.board:0 -#: model:ir.actions.act_window,name:sale.action_sales_by_salesman -msgid "Sales by Salesman in last 90 days" -msgstr "" - -#. module: sale -#: help:sale.order,picking_policy:0 -msgid "" -"If you don't have enough stock available to deliver all at once, do you " -"accept partial shipments or not?" -msgstr "" - -#. module: sale -#: view:sale.order:0 -msgid "UoS" -msgstr "" - -#. module: sale -#: help:sale.order,partner_shipping_id:0 -msgid "Shipping address for current sales order." -msgstr "" - -#. module: sale -#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0 -msgid "Quantity" -msgstr "" - -#. module: sale -#: view:sale.report:0 field:sale.report,day:0 -msgid "Day" -msgstr "" - -#. module: sale -#: model:process.transition.action,name:sale.process_transition_action_cancelorder0 -#: view:sale.order:0 -msgid "Cancel Order" -msgstr "" - -#. module: sale -#: code:addons/sale/sale.py:638 +#: code:addons/sale/wizard/sale_make_invoice_advance.py:215 #, python-format -msgid "The quotation '%s' has been converted to a sales order." -msgstr "" - -#. module: sale -#: view:sale.order:0 -msgid "Print Quotation" -msgstr "" - -#. module: sale -#: code:addons/sale/wizard/sale_make_invoice.py:42 -#, python-format -msgid "Warning !" -msgstr "" - -#. module: sale -#: report:sale.order:0 -msgid "Tax" -msgstr "" - -#. module: sale -#: model:process.node,note:sale.process_node_saleorderprocurement0 -msgid "Drives procurement orders for every sales order line." -msgstr "" - -#. module: sale -#: view:sale.report:0 field:sale.report,analytic_account_id:0 -#: field:sale.shop,project_id:0 -msgid "Analytic Account" -msgstr "" - -#. module: sale -#: model:ir.actions.act_window,help:sale.action_order_line_tree2 -msgid "" -"Here is a list of each sales order line to be invoiced. You can invoice " -"sales orders partially, by lines of sales order. You do not need this list " -"if you invoice from the delivery orders or if you invoice sales totally." -msgstr "" - -#. module: sale -#: code:addons/sale/sale.py:295 -#, python-format -msgid "" -"In order to delete a confirmed sale order, you must cancel it before ! To " -"cancel a sale order, you must first cancel related picking or delivery " -"orders." -msgstr "" - -#. module: sale -#: model:process.node,name:sale.process_node_saleprocurement0 -msgid "Procurement Order" -msgstr "" - -#. module: sale -#: view:sale.report:0 field:sale.report,partner_id:0 -msgid "Partner" -msgstr "" - -#. module: sale -#: selection:sale.order,order_policy:0 -msgid "Invoice based on deliveries" -msgstr "" - -#. module: sale -#: view:sale.order:0 -msgid "Order Line" -msgstr "" - -#. module: sale -#: model:ir.actions.act_window,help:sale.action_order_form -msgid "" -"Sales Orders help you manage quotations and orders from your customers. " -"OpenERP suggests that you start by creating a quotation. Once it is " -"confirmed, the quotation will be converted into a Sales Order. OpenERP can " -"handle several types of products so that a sales order may trigger tasks, " -"delivery orders, manufacturing orders, purchases and so on. Based on the " -"configuration of the sales order, a draft invoice will be generated so that " -"you just have to confirm it when you want to bill your customer." -msgstr "" - -#. module: sale -#: help:sale.order,invoice_quantity:0 -msgid "" -"The sale order will automatically create the invoice proposition (draft " -"invoice). Ordered and delivered quantities may not be the same. You have to " -"choose if you want your invoice based on ordered or shipped quantities. If " -"the product is a service, shipped quantities means hours spent on the " -"associated tasks." -msgstr "" - -#. module: sale -#: field:sale.shop,payment_default_id:0 -msgid "Default Payment Term" -msgstr "" - -#. module: sale -#: field:sale.config.picking_policy,deli_orders:0 -msgid "Based on Delivery Orders" -msgstr "" - -#. module: sale -#: field:sale.config.picking_policy,time_unit:0 -msgid "Main Working Time Unit" -msgstr "" - -#. module: sale -#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0 -#: view:sale.report:0 -msgid "State" -msgstr "" - -#. module: sale -#: report:sale.order:0 -msgid "Disc.(%)" -msgstr "" - -#. module: sale -#: view:sale.report:0 field:sale.report,price_total:0 -msgid "Total Price" -msgstr "" - -#. module: sale -#: help:sale.make.invoice,grouped:0 -msgid "Check the box to group the invoices for the same customers" -msgstr "" - -#. module: sale -#: view:sale.order:0 -msgid "My Sale Orders" -msgstr "" - -#. module: sale -#: selection:sale.order,invoice_quantity:0 -msgid "Ordered Quantities" -msgstr "" - -#. module: sale -#: view:sale.report:0 -msgid "Sales by Salesman" -msgstr "" - -#. module: sale -#: field:sale.order.line,move_ids:0 -msgid "Inventory Moves" -msgstr "" - -#. module: sale -#: field:sale.order,name:0 field:sale.order.line,order_id:0 -msgid "Order Reference" -msgstr "" - -#. module: sale -#: view:sale.order:0 -msgid "Other Information" -msgstr "" - -#. module: sale -#: view:sale.order:0 -msgid "Dates" -msgstr "" - -#. module: sale -#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0 -msgid "" -"The invoice is created automatically if the shipping policy is 'Invoice from " -"pick' or 'Invoice on order after delivery'." -msgstr "" - -#. module: sale -#: field:sale.config.picking_policy,task_work:0 -msgid "Based on Tasks' Work" -msgstr "" - -#. module: sale -#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order -msgid "Quotations and Sales" -msgstr "" - -#. module: sale -#: model:ir.model,name:sale.model_sale_make_invoice -msgid "Sales Make Invoice" -msgstr "" - -#. module: sale -#: code:addons/sale/sale.py:330 -#, python-format -msgid "Pricelist Warning!" -msgstr "" - -#. module: sale -#: field:sale.order.line,discount:0 -msgid "Discount (%)" -msgstr "" - -#. module: sale -#: view:board.board:0 -#: model:ir.actions.act_window,name:sale.action_quotation_for_sale -msgid "My Quotations" -msgstr "" - -#. module: sale -#: view:board.board:0 -#: model:ir.actions.act_window,name:sale.open_board_sales_manager -#: model:ir.ui.menu,name:sale.menu_board_sales_manager -msgid "Sales Manager Dashboard" -msgstr "" - -#. module: sale -#: field:sale.order.line,product_packaging:0 -msgid "Packaging" -msgstr "" - -#. module: sale -#: model:process.transition,name:sale.process_transition_saleinvoice0 -msgid "From a sales order" -msgstr "" - -#. module: sale -#: field:sale.shop,name:0 -msgid "Shop Name" -msgstr "" - -#. module: sale -#: help:sale.order,order_policy:0 -msgid "" -"The Invoice Policy is used to synchronise invoice and delivery operations.\n" -" - The 'Pay before delivery' choice will first generate the invoice and " -"then generate the picking order after the payment of this invoice.\n" -" - The 'Deliver & Invoice on demand' will create the picking order directly " -"and wait for the user to manually click on the 'Invoice' button to generate " -"the draft invoice based on the sale order or the sale order lines.\n" -" - The 'Invoice on order after delivery' choice will generate the draft " -"invoice based on sales order after all picking lists have been finished.\n" -" - The 'Invoice based on deliveries' choice is used to create an invoice " -"during the picking process." -msgstr "" - -#. module: sale -#: code:addons/sale/sale.py:1171 -#, python-format -msgid "No Customer Defined !" -msgstr "" - -#. module: sale -#: model:ir.actions.act_window,name:sale.action_order_tree2 -msgid "Sales in Exception" -msgstr "" - -#. module: sale -#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277 -#: code:addons/sale/wizard/sale_make_invoice_advance.py:70 -#, python-format -msgid "Configuration Error !" -msgstr "" - -#. module: sale -#: view:sale.order:0 -msgid "Conditions" -msgstr "" - -#. module: sale -#: code:addons/sale/sale.py:1034 -#, python-format -msgid "" -"There is no income category account defined in default Properties for " -"Product Category or Fiscal Position is not defined !" -msgstr "" - -#. module: sale -#: selection:sale.report,month:0 -msgid "August" -msgstr "" - -#. module: sale -#: constraint:stock.move:0 -msgid "You try to assign a lot which is not from the same product" -msgstr "" - -#. module: sale -#: code:addons/sale/sale.py:655 -#, python-format -msgid "invalid mode for test_state" -msgstr "" - -#. module: sale -#: selection:sale.report,month:0 -msgid "June" -msgstr "" - -#. module: sale -#: code:addons/sale/sale.py:617 -#, python-format -msgid "Could not cancel this sales order !" -msgstr "" - -#. module: sale -#: model:ir.model,name:sale.model_sale_report -msgid "Sales Orders Statistics" -msgstr "" - -#. module: sale -#: help:sale.order,project_id:0 -msgid "The analytic account related to a sales order." -msgstr "" - -#. module: sale -#: selection:sale.report,month:0 -msgid "October" -msgstr "" - -#. module: sale -#: sql_constraint:stock.picking:0 -msgid "Reference must be unique per Company!" -msgstr "" - -#. module: sale -#: view:board.board:0 view:sale.order:0 view:sale.report:0 -msgid "Quotations" -msgstr "" - -#. module: sale -#: help:sale.order,pricelist_id:0 -msgid "Pricelist for current sales order." -msgstr "" - -#. module: sale -#: report:sale.order:0 -msgid "TVA :" -msgstr "" - -#. module: sale -#: help:sale.order.line,delay:0 -msgid "" -"Number of days between the order confirmation the shipping of the products " -"to the customer" -msgstr "" - -#. module: sale -#: report:sale.order:0 -msgid "Quotation Date" -msgstr "" - -#. module: sale -#: field:sale.order,fiscal_position:0 -msgid "Fiscal Position" -msgstr "" - -#. module: sale -#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0 -msgid "UoM" -msgstr "" - -#. module: sale -#: field:sale.order.line,number_packages:0 -msgid "Number Packages" -msgstr "" - -#. module: sale -#: selection:sale.order,state:0 selection:sale.report,state:0 -msgid "In Progress" -msgstr "" - -#. module: sale -#: model:process.transition,note:sale.process_transition_confirmquotation0 -msgid "" -"The salesman confirms the quotation. The state of the sales order becomes " -"'In progress' or 'Manual in progress'." -msgstr "" - -#. module: sale -#: code:addons/sale/sale.py:1074 -#, python-format -msgid "You cannot cancel a sale order line that has already been invoiced!" -msgstr "" - -#. module: sale -#: code:addons/sale/sale.py:1079 -#, python-format -msgid "You must first cancel stock moves attached to this sales order line." -msgstr "" - -#. module: sale -#: code:addons/sale/sale.py:1147 -#, python-format -msgid "(n/a)" -msgstr "" - -#. module: sale -#: help:sale.advance.payment.inv,product_id:0 -msgid "" -"Select a product of type service which is called 'Advance Product'. You may " -"have to create it and set it as a default value on this field." -msgstr "" - -#. module: sale -#: report:sale.order:0 -msgid "Tel. :" -msgstr "" - -#. module: sale -#: code:addons/sale/wizard/sale_make_invoice_advance.py:64 -#, python-format -msgid "" -"You cannot make an advance on a sales order " -"that is defined as 'Automatic Invoice after delivery'." -msgstr "" - -#. module: sale -#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0 -#: field:sale.order.line,notes:0 -msgid "Notes" -msgstr "" - -#. module: sale -#: sql_constraint:res.company:0 -msgid "The company name must be unique !" -msgstr "" - -#. module: sale -#: help:sale.order,partner_invoice_id:0 -msgid "Invoice address for current sales order." -msgstr "" - -#. module: sale -#: view:sale.report:0 -msgid "Month-1" -msgstr "" - -#. module: sale -#: view:sale.report:0 -msgid "Ordered month of the sales order" -msgstr "" - -#. module: sale -#: code:addons/sale/sale.py:504 -#, python-format -msgid "" -"You cannot group sales having different currencies for the same partner." -msgstr "" - -#. module: sale -#: selection:sale.order,picking_policy:0 -msgid "Deliver each product when available" -msgstr "" - -#. module: sale -#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0 -msgid "Invoiced" -msgstr "" - -#. module: sale -#: model:process.node,name:sale.process_node_deliveryorder0 -msgid "Delivery Order" -msgstr "" - -#. module: sale -#: field:sale.order,date_confirm:0 -msgid "Confirmation Date" -msgstr "" - -#. module: sale -#: field:sale.order,incoterm:0 -msgid "Incoterm" -msgstr "" - -#. module: sale -#: field:sale.order.line,address_allotment_id:0 -msgid "Allotment Partner" -msgstr "" - -#. module: sale -#: selection:sale.report,month:0 -msgid "March" -msgstr "" - -#. module: sale -#: constraint:stock.move:0 -msgid "You can not move products from or to a location of the type view." -msgstr "" - -#. module: sale -#: field:sale.config.picking_policy,sale_orders:0 -msgid "Based on Sales Orders" -msgstr "" - -#. module: sale -#: help:sale.order,amount_total:0 -msgid "The total amount." -msgstr "" - -#. module: sale -#: field:sale.order.line,price_subtotal:0 -msgid "Subtotal" -msgstr "" - -#. module: sale -#: report:sale.order:0 -msgid "Invoice address :" -msgstr "" - -#. module: sale -#: field:sale.order.line,sequence:0 -msgid "Line Sequence" -msgstr "" - -#. module: sale -#: model:process.transition,note:sale.process_transition_saleorderprocurement0 -msgid "" -"For every sales order line, a procurement order is created to supply the " -"sold product." -msgstr "" - -#. module: sale -#: help:sale.order,incoterm:0 -msgid "" -"Incoterm which stands for 'International Commercial terms' implies its a " -"series of sales terms which are used in the commercial transaction." -msgstr "" - -#. module: sale -#: field:sale.order,partner_invoice_id:0 -msgid "Invoice Address" -msgstr "" - -#. module: sale -#: view:sale.order.line:0 -msgid "Search Uninvoiced Lines" -msgstr "" - -#. module: sale -#: model:ir.actions.report.xml,name:sale.report_sale_order -msgid "Quotation / Order" -msgstr "" - -#. module: sale -#: view:sale.report:0 field:sale.report,nbr:0 -msgid "# of Lines" -msgstr "" - -#. module: sale -#: model:ir.model,name:sale.model_sale_open_invoice -msgid "Sales Open Invoice" -msgstr "" - -#. module: sale -#: model:ir.model,name:sale.model_sale_order_line -#: field:stock.move,sale_line_id:0 -msgid "Sales Order Line" -msgstr "" - -#. module: sale -#: field:sale.shop,warehouse_id:0 -msgid "Warehouse" -msgstr "" - -#. module: sale -#: report:sale.order:0 -msgid "Order N°" -msgstr "" - -#. module: sale -#: field:sale.order,order_line:0 -msgid "Order Lines" -msgstr "" - -#. module: sale -#: view:sale.order:0 -msgid "Untaxed amount" -msgstr "" - -#. module: sale -#: model:ir.actions.act_window,name:sale.action_order_line_tree2 -#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines -msgid "Lines to Invoice" -msgstr "" - -#. module: sale -#: field:sale.order.line,product_uom_qty:0 -msgid "Quantity (UoM)" -msgstr "" - -#. module: sale -#: field:sale.order,create_date:0 -msgid "Creation Date" -msgstr "" - -#. module: sale -#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc -msgid "Miscellaneous" -msgstr "" - -#. module: sale -#: model:ir.actions.act_window,name:sale.action_order_line_tree3 -msgid "Uninvoiced and Delivered Lines" -msgstr "" - -#. module: sale -#: report:sale.order:0 -msgid "Total :" -msgstr "" - -#. module: sale -#: view:sale.report:0 -msgid "My Sales" -msgstr "" - -#. module: sale -#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074 -#: code:addons/sale/sale.py:1303 -#, python-format -msgid "Invalid action !" -msgstr "" - -#. module: sale -#: view:sale.order:0 -msgid "Extra Info" -msgstr "" - -#. module: sale -#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0 -#: field:sale.shop,pricelist_id:0 -msgid "Pricelist" -msgstr "" - -#. module: sale -#: view:sale.report:0 field:sale.report,product_uom_qty:0 -msgid "# of Qty" -msgstr "" - -#. module: sale -#: code:addons/sale/sale.py:1327 -#, python-format -msgid "Hour" -msgstr "" - -#. module: sale -#: view:sale.order:0 -msgid "Order Date" -msgstr "" - -#. module: sale -#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0 -#: field:sale.report,shipped_qty_1:0 -msgid "Shipped" -msgstr "" - -#. module: sale -#: model:ir.actions.act_window,name:sale.action_order_tree5 -msgid "All Quotations" -msgstr "" - -#. module: sale -#: view:sale.config.picking_policy:0 -msgid "Options" -msgstr "" - -#. module: sale -#: selection:sale.report,month:0 -msgid "September" -msgstr "" - -#. module: sale -#: code:addons/sale/sale.py:632 -#, python-format -msgid "You cannot confirm a sale order which has no line." -msgstr "" - -#. module: sale -#: code:addons/sale/sale.py:1259 -#, python-format -msgid "" -"You have to select a pricelist or a customer in the sales form !\n" -"Please set one before choosing a product." -msgstr "" - -#. module: sale -#: view:sale.report:0 field:sale.report,categ_id:0 -msgid "Category of Product" -msgstr "" - -#. module: sale -#: report:sale.order:0 -msgid "Taxes :" -msgstr "" - -#. module: sale -#: view:sale.order:0 -msgid "Stock Moves" -msgstr "" - -#. module: sale -#: field:sale.order,state:0 field:sale.report,state:0 -msgid "Order State" -msgstr "" - -#. module: sale -#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0 -msgid "Do you really want to create the invoice(s)?" -msgstr "" - -#. module: sale -#: view:sale.report:0 -msgid "Sales By Month" -msgstr "" - -#. module: sale -#: code:addons/sale/sale.py:1078 -#, python-format -msgid "Could not cancel sales order line!" -msgstr "" - -#. module: sale -#: field:res.company,security_lead:0 -msgid "Security Days" -msgstr "" - -#. module: sale -#: model:process.transition,name:sale.process_transition_saleorderprocurement0 -msgid "Procurement of sold material" -msgstr "" - -#. module: sale -#: view:sale.order:0 -msgid "Create Final Invoice" -msgstr "" - -#. module: sale -#: field:sale.order,partner_shipping_id:0 -msgid "Shipping Address" -msgstr "" - -#. module: sale -#: help:sale.order,shipped:0 -msgid "" -"It indicates that the sales order has been delivered. This field is updated " -"only after the scheduler(s) have been launched." -msgstr "" - -#. module: sale -#: field:sale.order,date_order:0 -msgid "Date" -msgstr "" - -#. module: sale -#: view:sale.report:0 -msgid "Extended Filters..." -msgstr "" - -#. module: sale -#: selection:sale.order.line,state:0 -msgid "Exception" -msgstr "" - -#. module: sale -#: model:ir.model,name:sale.model_res_company -msgid "Companies" -msgstr "" - -#. module: sale -#: help:sale.order,state:0 -msgid "" -"Gives the state of the quotation or sales order. \n" -"The exception state is automatically set when a cancel operation occurs in " -"the invoice validation (Invoice Exception) or in the picking list process " -"(Shipping Exception). \n" -"The 'Waiting Schedule' state is set when the invoice is confirmed but " -"waiting for the scheduler to run on the order date." -msgstr "" - -#. module: sale -#: code:addons/sale/sale.py:1272 -#, python-format -msgid "No valid pricelist line found ! :" -msgstr "" - -#. module: sale -#: view:sale.order:0 -msgid "History" -msgstr "" - -#. module: sale -#: selection:sale.order,order_policy:0 -msgid "Invoice on order after delivery" -msgstr "" - -#. module: sale -#: help:sale.order,invoice_ids:0 -msgid "" -"This is the list of invoices that have been generated for this sales order. " -"The same sales order may have been invoiced in several times (by line for " -"example)." -msgstr "" - -#. module: sale -#: report:sale.order:0 -msgid "Your Reference" -msgstr "" - -#. module: sale -#: help:sale.order,partner_order_id:0 -msgid "" -"The name and address of the contact who requested the order or quotation." -msgstr "" - -#. module: sale -#: help:res.company,security_lead:0 -msgid "" -"This is the days added to what you promise to customers for security purpose" -msgstr "" - -#. module: sale -#: view:sale.order.line:0 -msgid "Qty" -msgstr "" - -#. module: sale -#: view:sale.order:0 -msgid "References" -msgstr "" - -#. module: sale -#: view:sale.order.line:0 -msgid "My Sales Order Lines" -msgstr "" - -#. module: sale -#: model:process.transition.action,name:sale.process_transition_action_cancel0 -#: model:process.transition.action,name:sale.process_transition_action_cancel1 -#: model:process.transition.action,name:sale.process_transition_action_cancel2 -#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0 -#: view:sale.order.line:0 view:sale.order.line.make.invoice:0 -msgid "Cancel" -msgstr "" - -#. module: sale -#: sql_constraint:sale.order:0 -msgid "Order Reference must be unique per Company!" -msgstr "" - -#. module: sale -#: model:process.transition,name:sale.process_transition_invoice0 -#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0 -#: model:process.transition.action,name:sale.process_transition_action_createinvoice0 -#: view:sale.advance.payment.inv:0 view:sale.order.line:0 -msgid "Create Invoice" -msgstr "" - -#. module: sale -#: view:sale.order:0 -msgid "Total Tax Excluded" -msgstr "" - -#. module: sale -#: view:sale.order.line:0 -msgid "Order reference" -msgstr "" - -#. module: sale -#: view:sale.open.invoice:0 -msgid "You invoice has been successfully created!" -msgstr "" - -#. module: sale -#: view:sale.report:0 -msgid "Sales by Partner" -msgstr "" - -#. module: sale -#: field:sale.order,partner_order_id:0 -msgid "Ordering Contact" -msgstr "" - -#. module: sale -#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice -#: view:sale.open.invoice:0 -msgid "Open Invoice" -msgstr "" - -#. module: sale -#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale -msgid "Auto-email confirmed sale orders" -msgstr "" - -#. module: sale -#: code:addons/sale/sale.py:413 -#, python-format -msgid "There is no sales journal defined for this company: \"%s\" (id:%d)" -msgstr "" - -#. module: sale -#: model:process.transition.action,name:sale.process_transition_action_forceassignation0 -msgid "Force Assignation" -msgstr "" - -#. module: sale -#: selection:sale.order.line,type:0 -msgid "on order" -msgstr "" - -#. module: sale -#: model:process.node,note:sale.process_node_invoiceafterdelivery0 -msgid "Based on the shipped or on the ordered quantities." -msgstr "" - -#. module: sale -#: selection:sale.order,picking_policy:0 -msgid "Deliver all products at once" -msgstr "" - -#. module: sale -#: field:sale.order,picking_ids:0 -msgid "Related Picking" -msgstr "" - -#. module: sale -#: field:sale.config.picking_policy,name:0 -msgid "Name" -msgstr "" - -#. module: sale -#: report:sale.order:0 -msgid "Shipping address :" -msgstr "" - -#. module: sale -#: view:board.board:0 -#: model:ir.actions.act_window,name:sale.action_sales_by_partner -msgid "Sales per Customer in last 90 days" -msgstr "" - -#. module: sale -#: model:process.node,note:sale.process_node_quotation0 -msgid "Draft state of sales order" -msgstr "" - -#. module: sale -#: model:process.transition,name:sale.process_transition_deliver0 -msgid "Create Delivery Order" -msgstr "" - -#. module: sale -#: code:addons/sale/sale.py:1303 -#, python-format -msgid "Cannot delete a sales order line which is in state '%s'!" -msgstr "" - -#. module: sale -#: view:sale.order:0 -msgid "Qty(UoS)" -msgstr "" - -#. module: sale -#: view:sale.order:0 -msgid "Total Tax Included" -msgstr "" - -#. module: sale -#: model:process.transition,name:sale.process_transition_packing0 -msgid "Create Pick List" -msgstr "" - -#. module: sale -#: view:sale.report:0 -msgid "Ordered date of the sales order" -msgstr "" - -#. module: sale -#: view:sale.report:0 -msgid "Sales by Product Category" +msgid "Advance Invoice" msgstr "" #. module: sale @@ -1065,605 +27,213 @@ msgid "Confirm Quotation" msgstr "" #. module: sale -#: code:addons/sale/wizard/sale_make_invoice_advance.py:63 -#, python-format -msgid "Error" -msgstr "" - -#. module: sale -#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0 -msgid "Group By..." -msgstr "" - -#. module: sale -#: view:sale.order:0 -msgid "Recreate Invoice" -msgstr "" - -#. module: sale -#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice -#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice -msgid "Deliveries to Invoice" -msgstr "" - -#. module: sale -#: selection:sale.order,state:0 selection:sale.report,state:0 -msgid "Waiting Schedule" -msgstr "" - -#. module: sale -#: field:sale.order.line,type:0 -msgid "Procurement Method" -msgstr "" - -#. module: sale -#: model:process.node,name:sale.process_node_packinglist0 -msgid "Pick List" -msgstr "" - -#. module: sale -#: view:sale.order:0 -msgid "Set to Draft" -msgstr "" - -#. module: sale -#: model:process.node,note:sale.process_node_packinglist0 -msgid "Document of the move to the output or to the customer." -msgstr "" - -#. module: sale -#: model:email.template,body:sale.email_template_edi_sale -msgid "" -"\n" -"Hello${object.partner_order_id.name and ' ' or ''}${object.partner_order_id." -"name or ''},\n" -"\n" -"Here is your order confirmation for ${object.partner_id.name}:\n" -" | Order number: *${object.name}*\n" -" | Order total: *${object.amount_total} ${object.pricelist_id." -"currency_id.name}*\n" -" | Order date: ${object.date_order}\n" -" % if object.origin:\n" -" | Order reference: ${object.origin}\n" -" % endif\n" -" % if object.client_order_ref:\n" -" | Your reference: ${object.client_order_ref}
\n" -" % endif\n" -" | Your contact: ${object.user_id.name} ${object.user_id.user_email " -"and '<%s>'%(object.user_id.user_email) or ''}\n" -"\n" -"You can view the order confirmation, download it and even pay online using " -"the following link:\n" -" ${ctx.get('edi_web_url_view') or 'n/a'}\n" -"\n" -"% if object.order_policy in ('prepaid','manual') and object.company_id." -"paypal_account:\n" -"<% \n" -"comp_name = quote(object.company_id.name)\n" -"order_name = quote(object.name)\n" -"paypal_account = quote(object.company_id.paypal_account)\n" -"order_amount = quote(str(object.amount_total))\n" -"cur_name = quote(object.pricelist_id.currency_id.name)\n" -"paypal_url = \"https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=" -"%s&item_name=%s%%20Order%%20%s&invoice=%s&amount=%s\" \\\n" -" \"¤cy_code=" -"%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow_%s\" % \\\n" -" (paypal_account,comp_name,order_name,order_name,order_amount," -"cur_name,cur_name)\n" -"%>\n" -"It is also possible to directly pay with Paypal:\n" -" ${paypal_url}\n" -"% endif\n" -"\n" -"If you have any question, do not hesitate to contact us.\n" -"\n" -"\n" -"Thank you for choosing ${object.company_id.name}!\n" -"\n" -"\n" -"--\n" -"${object.user_id.name} ${object.user_id.user_email and '<%s>'%(object." -"user_id.user_email) or ''}\n" -"${object.company_id.name}\n" -"% if object.company_id.street:\n" -"${object.company_id.street or ''}\n" -"% endif\n" -"% if object.company_id.street2:\n" -"${object.company_id.street2}\n" -"% endif\n" -"% if object.company_id.city or object.company_id.zip:\n" -"${object.company_id.zip or ''} ${object.company_id.city or ''}\n" -"% endif\n" -"% if object.company_id.country_id:\n" -"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) " -"or ''} ${object.company_id.country_id.name or ''}\n" -"% endif\n" -"% if object.company_id.phone:\n" -"Phone: ${object.company_id.phone}\n" -"% endif\n" -"% if object.company_id.website:\n" -"${object.company_id.website or ''}\n" -"% endif\n" -" " -msgstr "" - -#. module: sale -#: model:process.transition.action,name:sale.process_transition_action_validate0 -msgid "Validate" -msgstr "" - -#. module: sale -#: view:sale.order:0 -msgid "Confirm Order" -msgstr "" - -#. module: sale -#: model:process.transition,name:sale.process_transition_saleprocurement0 -msgid "Create Procurement Order" -msgstr "" - -#. module: sale -#: view:sale.order:0 field:sale.order,amount_tax:0 -#: field:sale.order.line,tax_id:0 -msgid "Taxes" -msgstr "" - -#. module: sale -#: view:sale.order:0 -msgid "Sales Order ready to be invoiced" -msgstr "" - -#. module: sale -#: help:sale.order,create_date:0 -msgid "Date on which sales order is created." -msgstr "" - -#. module: sale -#: model:ir.model,name:sale.model_stock_move -msgid "Stock Move" -msgstr "" - -#. module: sale -#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0 -msgid "Create Invoices" -msgstr "" - -#. module: sale -#: view:sale.report:0 -msgid "Sales order created in current month" -msgstr "" - -#. module: sale -#: report:sale.order:0 -msgid "Fax :" -msgstr "" - -#. module: sale -#: help:sale.order.line,type:0 -msgid "" -"If 'on order', it triggers a procurement when the sale order is confirmed to " -"create a task, purchase order or manufacturing order linked to this sale " -"order line." -msgstr "" - -#. module: sale -#: field:sale.advance.payment.inv,amount:0 -msgid "Advance Amount" -msgstr "" - -#. module: sale -#: field:sale.config.picking_policy,charge_delivery:0 -msgid "Do you charge the delivery?" -msgstr "" - -#. module: sale -#: selection:sale.order,invoice_quantity:0 -msgid "Shipped Quantities" -msgstr "" - -#. module: sale -#: selection:sale.config.picking_policy,order_policy:0 -msgid "Invoice Based on Sales Orders" -msgstr "" - -#. module: sale -#: code:addons/sale/sale.py:331 -#, python-format -msgid "" -"If you change the pricelist of this order (and eventually the currency), " -"prices of existing order lines will not be updated." -msgstr "" - -#. module: sale -#: model:ir.model,name:sale.model_stock_picking -msgid "Picking List" -msgstr "" - -#. module: sale -#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503 -#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016 -#: code:addons/sale/sale.py:1033 -#, python-format -msgid "Error !" -msgstr "" - -#. module: sale -#: code:addons/sale/sale.py:603 -#, python-format -msgid "Could not cancel sales order !" -msgstr "" - -#. module: sale -#: view:sale.order:0 -msgid "Qty(UoM)" -msgstr "" - -#. module: sale -#: view:sale.report:0 -msgid "Ordered Year of the sales order" -msgstr "" - -#. module: sale -#: selection:sale.report,month:0 -msgid "July" -msgstr "" - -#. module: sale -#: field:sale.order.line,procurement_id:0 -msgid "Procurement" -msgstr "" - -#. module: sale -#: selection:sale.order,state:0 selection:sale.report,state:0 -msgid "Shipping Exception" -msgstr "" - -#. module: sale -#: code:addons/sale/sale.py:1156 -#, python-format -msgid "Picking Information ! : " -msgstr "" - -#. module: sale -#: field:sale.make.invoice,grouped:0 -msgid "Group the invoices" -msgstr "" - -#. module: sale -#: field:sale.order,order_policy:0 -msgid "Invoice Policy" -msgstr "" - -#. module: sale -#: model:ir.actions.act_window,name:sale.action_config_picking_policy -#: view:sale.config.picking_policy:0 -msgid "Setup your Invoicing Method" -msgstr "" - -#. module: sale -#: model:process.node,note:sale.process_node_invoice0 -msgid "To be reviewed by the accountant." -msgstr "" - -#. module: sale -#: view:sale.report:0 -msgid "Reference UoM" -msgstr "" - -#. module: sale -#: view:sale.config.picking_policy:0 -msgid "" -"This tool will help you to install the right module and configure the system " -"according to the method you use to invoice your customers." -msgstr "" - -#. module: sale -#: model:ir.model,name:sale.model_sale_order_line_make_invoice -msgid "Sale OrderLine Make_invoice" -msgstr "" - -#. module: sale -#: selection:sale.order,state:0 selection:sale.report,state:0 -msgid "Invoice Exception" -msgstr "" - -#. module: sale -#: model:process.node,note:sale.process_node_saleorder0 -msgid "Drives procurement and invoicing" -msgstr "" - -#. module: sale -#: field:sale.order,invoiced:0 -msgid "Paid" -msgstr "" - -#. module: sale -#: model:ir.actions.act_window,name:sale.action_order_report_all -#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0 -msgid "Sales Analysis" -msgstr "" - -#. module: sale -#: code:addons/sale/sale.py:1151 -#, python-format -msgid "" -"You selected a quantity of %d Units.\n" -"But it's not compatible with the selected packaging.\n" -"Here is a proposition of quantities according to the packaging:\n" -"EAN: %s Quantity: %s Type of ul: %s" -msgstr "" - -#. module: sale -#: view:sale.order:0 -msgid "Recreate Packing" -msgstr "" - -#. module: sale -#: view:sale.order:0 field:sale.order.line,property_ids:0 -msgid "Properties" -msgstr "" - -#. module: sale -#: model:process.node,name:sale.process_node_quotation0 -#: selection:sale.order,state:0 selection:sale.report,state:0 -msgid "Quotation" -msgstr "" - -#. module: sale -#: model:process.transition,note:sale.process_transition_invoice0 -msgid "" -"The Salesman creates an invoice manually, if the sales order shipping policy " -"is 'Shipping and Manual in Progress'. The invoice is created automatically " -"if the shipping policy is 'Payment before Delivery'." -msgstr "" - -#. module: sale -#: help:sale.config.picking_policy,order_policy:0 -msgid "You can generate invoices based on sales orders or based on shippings." -msgstr "" - -#. module: sale -#: view:sale.order.line:0 -msgid "Confirmed sale order lines, not yet delivered" -msgstr "" - -#. module: sale -#: code:addons/sale/sale.py:473 -#, python-format -msgid "Customer Invoices" -msgstr "" - -#. module: sale -#: model:process.process,name:sale.process_process_salesprocess0 -#: view:sale.order:0 view:sale.report:0 -msgid "Sales" -msgstr "" - -#. module: sale -#: report:sale.order:0 field:sale.order.line,price_unit:0 -msgid "Unit Price" -msgstr "" - -#. module: sale -#: selection:sale.order,state:0 view:sale.order.line:0 -#: selection:sale.order.line,state:0 selection:sale.report,state:0 -msgid "Done" -msgstr "" - -#. module: sale -#: model:process.node,name:sale.process_node_invoice0 -#: model:process.node,name:sale.process_node_invoiceafterdelivery0 -msgid "Invoice" -msgstr "" - -#. module: sale -#: code:addons/sale/sale.py:1171 -#, python-format -msgid "" -"You have to select a customer in the sales form !\n" -"Please set one customer before choosing a product." -msgstr "" - -#. module: sale -#: field:sale.order,origin:0 -msgid "Source Document" -msgstr "" - -#. module: sale -#: view:sale.order.line:0 -msgid "To Do" -msgstr "" - -#. module: sale -#: field:sale.order,picking_policy:0 -msgid "Picking Policy" -msgstr "" - -#. module: sale -#: model:process.node,note:sale.process_node_deliveryorder0 -msgid "Document of the move to the customer." -msgstr "" - -#. module: sale -#: help:sale.order,amount_untaxed:0 -msgid "The amount without tax." -msgstr "" - -#. module: sale -#: code:addons/sale/sale.py:604 -#, python-format -msgid "You must first cancel all picking attached to this sales order." -msgstr "" - -#. module: sale -#: model:ir.model,name:sale.model_sale_advance_payment_inv -msgid "Sales Advance Payment Invoice" -msgstr "" - -#. module: sale -#: view:sale.report:0 field:sale.report,month:0 -msgid "Month" -msgstr "" - -#. module: sale -#: model:email.template,subject:sale.email_template_edi_sale -msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })" -msgstr "" - -#. module: sale -#: view:sale.order.line:0 field:sale.order.line,product_id:0 -#: view:sale.report:0 field:sale.report,product_id:0 -msgid "Product" -msgstr "" - -#. module: sale -#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0 -msgid "Cancel Assignation" -msgstr "" - -#. module: sale -#: model:ir.model,name:sale.model_sale_config_picking_policy -msgid "sale.config.picking_policy" -msgstr "" - -#. module: sale -#: view:account.invoice.report:0 view:board.board:0 -#: model:ir.actions.act_window,name:sale.action_turnover_by_month -msgid "Monthly Turnover" -msgstr "" - -#. module: sale -#: field:sale.order,invoice_quantity:0 -msgid "Invoice on" -msgstr "" - -#. module: sale -#: report:sale.order:0 -msgid "Date Ordered" -msgstr "" - -#. module: sale -#: field:sale.order.line,product_uos:0 -msgid "Product UoS" -msgstr "" - -#. module: sale -#: selection:sale.report,state:0 -msgid "Manual In Progress" -msgstr "" - -#. module: sale -#: field:sale.order.line,product_uom:0 -msgid "Product UoM" -msgstr "" - -#. module: sale -#: view:sale.order:0 -msgid "Logistic" -msgstr "" - -#. module: sale -#: view:sale.order.line:0 -msgid "Order" -msgstr "" - -#. module: sale -#: code:addons/sale/sale.py:1017 -#: code:addons/sale/wizard/sale_make_invoice_advance.py:71 -#, python-format -msgid "There is no income account defined for this product: \"%s\" (id:%d)" -msgstr "" - -#. module: sale -#: view:sale.order:0 -msgid "Ignore Exception" -msgstr "" - -#. module: sale -#: model:process.transition,note:sale.process_transition_saleinvoice0 -msgid "" -"Depending on the Invoicing control of the sales order, the invoice can be " -"based on delivered or on ordered quantities. Thus, a sales order can " -"generates an invoice or a delivery order as soon as it is confirmed by the " -"salesman." -msgstr "" - -#. module: sale -#: code:addons/sale/sale.py:1251 -#, python-format -msgid "" -"You plan to sell %.2f %s but you only have %.2f %s available !\n" -"The real stock is %.2f %s. (without reservations)" -msgstr "" - -#. module: sale -#: view:sale.order:0 -msgid "States" -msgstr "" - -#. module: sale -#: view:sale.config.picking_policy:0 -msgid "res_config_contents" -msgstr "" - -#. module: sale -#: field:sale.order,client_order_ref:0 -msgid "Customer Reference" -msgstr "" - -#. module: sale -#: field:sale.order,amount_total:0 view:sale.order.line:0 -msgid "Total" -msgstr "" - -#. module: sale -#: report:sale.order:0 view:sale.order.line:0 -msgid "Price" -msgstr "" - -#. module: sale -#: model:process.transition,note:sale.process_transition_deliver0 -msgid "" -"Depending on the configuration of the location Output, the move between the " -"output area and the customer is done through the Delivery Order manually or " -"automatically." -msgstr "" - -#. module: sale -#: selection:sale.order,order_policy:0 -msgid "Pay before delivery" -msgstr "" - -#. module: sale -#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales +#: view:board.board:0 msgid "Sales Dashboard" msgstr "" #. module: sale -#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice -#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice -#: view:sale.order:0 -msgid "Make Invoices" +#: model:email.template,body_html:sale.email_template_edi_sale +msgid "\n" +"
\n" +"\n" +"

Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},

\n" +" \n" +"

Here is your ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'} from ${object.company_id.name}:

\n" +"\n" +"

\n" +"   REFERENCES
\n" +"   Order number: ${object.name}
\n" +"   Order total: ${object.amount_total} ${object.pricelist_id.currency_id.name}
\n" +"   Order date: ${object.date_order}
\n" +" % if object.origin:\n" +"   Order reference: ${object.origin}
\n" +" % endif\n" +" % if object.client_order_ref:\n" +"   Your reference: ${object.client_order_ref}
\n" +" % endif\n" +"   Your contact: ${object.user_id.name}\n" +"

\n" +"\n" +"

\n" +" You can view the ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'} document, download it and pay online using the following link:\n" +"

\n" +" View Order\n" +"\n" +" % if object.order_policy in ('prepaid','manual') and object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n" +" <%\n" +" comp_name = quote(object.company_id.name)\n" +" order_name = quote(object.name)\n" +" paypal_account = quote(object.company_id.paypal_account)\n" +" order_amount = quote(str(object.amount_total))\n" +" cur_name = quote(object.pricelist_id.currency_id.name)\n" +" paypal_url = \"https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s\" \\\n" +" \"&invoice=%s&amount=%s&currency_code=%s&button_subtype=services&no_note=1\" \\\n" +" \"&bn=OpenERP_Order_PayNow_%s\" % \\\n" +" (paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_name)\n" +" %>\n" +"
\n" +"

It is also possible to directly pay with Paypal:

\n" +" \n" +" \n" +" \n" +" % endif\n" +"\n" +"
\n" +"

If you have any question, do not hesitate to contact us.

\n" +"

Thank you for choosing ${object.company_id.name or 'us'}!

\n" +"
\n" +"
\n" +"
\n" +"

\n" +" ${object.company_id.name}

\n" +"
\n" +"
\n" +" \n" +" % if object.company_id.street:\n" +" ${object.company_id.street}
\n" +" % endif\n" +" % if object.company_id.street2:\n" +" ${object.company_id.street2}
\n" +" % endif\n" +" % if object.company_id.city or object.company_id.zip:\n" +" ${object.company_id.zip} ${object.company_id.city}
\n" +" % endif\n" +" % if object.company_id.country_id:\n" +" ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}
\n" +" % endif\n" +" \n" +" % if object.company_id.phone:\n" +"
\n" +" Phone:  ${object.company_id.phone}\n" +"
\n" +" % endif\n" +" % if object.company_id.website:\n" +"
\n" +" Web : ${object.company_id.website}\n" +"
\n" +" %endif\n" +"

\n" +"
\n" +"
\n" +" " msgstr "" #. module: sale -#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0 +#: model:ir.actions.act_window,name:sale.action_order_line_tree2 +#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines +msgid "Order Lines to Invoice" +msgstr "" + +#. module: sale +#: field:sale.order,date_confirm:0 +msgid "Confirmation Date" +msgstr "" + +#. module: sale +#: view:sale.order:0 +#: view:sale.order.line:0 +#: view:sale.report:0 +msgid "Group By..." +msgstr "" + +#. module: sale +#: view:sale.order.line:0 +msgid "Sale Order Lines that are confirmed, done or in exception state and haven't yet been invoiced" +msgstr "" + +#. module: sale +#: field:sale.order.line,address_allotment_id:0 +msgid "Allotment Partner" +msgstr "" + +#. module: sale +#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv +msgid "Invoice Order" +msgstr "" + +#. module: sale +#: help:sale.config.settings,group_sale_delivery_address:0 +msgid "Allows you to specify different delivery and invoice addresses on a sale order." +msgstr "" + +#. module: sale +#: code:addons/sale/wizard/sale_make_invoice_advance.py:160 +#: code:addons/sale/wizard/sale_make_invoice_advance.py:162 +#, python-format +msgid "Advance of %s %s" +msgstr "" + +#. module: sale +#: view:sale.config.settings:0 +msgid "Contract Feature" +msgstr "" + +#. module: sale +#: field:sale.report,state:0 +msgid "Order State" +msgstr "" + +#. module: sale +#: help:sale.config.settings,module_account_analytic_analysis:0 +msgid "Allows to define your customer contracts conditions: invoicing\n" +" method (fixed price, on timesheet, advance invoice), the exact pricing\n" +" (650€/day for a developer), the duration (one year support contract).\n" +" You will be able to follow the progress of the contract and invoice automatically.\n" +" It installs the account_analytic_analysis module." +msgstr "" + +#. module: sale +#: view:sale.order:0 +#: view:sale.order.line:0 msgid "To Invoice" msgstr "" +#. module: sale +#: view:sale.order.line:0 +#: field:sale.report,product_uom:0 +msgid "Unit of Measure" +msgstr "" + #. module: sale #: help:sale.order,date_confirm:0 msgid "Date on which sales order is confirmed." msgstr "" +#. module: sale +#: model:ir.actions.act_window,name:sale.action_order_tree5 +#: model:ir.ui.menu,name:sale.menu_sale_quotations +#: view:sale.order:0 +#: view:sale.report:0 +msgid "Quotations" +msgstr "" + +#. module: sale +#: selection:sale.report,month:0 +msgid "March" +msgstr "" + +#. module: sale +#: code:addons/sale/sale.py:558 +#, python-format +msgid "First cancel all invoices attached to this sales order." +msgstr "" + +#. module: sale +#: selection:sale.advance.payment.inv,advance_payment_method:0 +msgid "Invoice the whole sale order" +msgstr "" + #. module: sale #: field:sale.order,project_id:0 msgid "Contract/Analytic Account" msgstr "" #. module: sale -#: field:sale.order,company_id:0 field:sale.order.line,company_id:0 -#: view:sale.report:0 field:sale.report,company_id:0 +#: field:sale.order,company_id:0 +#: field:sale.order.line,company_id:0 +#: view:sale.report:0 +#: field:sale.report,company_id:0 #: field:sale.shop,company_id:0 msgid "Company" msgstr "" @@ -1673,27 +243,150 @@ msgstr "" msgid "Invoice Date" msgstr "" +#. module: sale +#: model:ir.actions.act_window,name:sale.action_order_line_tree3 +msgid "Uninvoiced and Delivered Lines" +msgstr "" + #. module: sale #: help:sale.advance.payment.inv,amount:0 msgid "The amount to be invoiced in advance." msgstr "" #. module: sale -#: code:addons/sale/sale.py:1269 +#: selection:sale.order,state:0 +#: selection:sale.report,state:0 +msgid "Invoice Exception" +msgstr "" + +#. module: sale +#: view:account.config.settings:0 +msgid "0" +msgstr "" + +#. module: sale +#: selection:sale.order,state:0 +msgid "Draft Quotation" +msgstr "" + +#. module: sale +#: code:addons/sale/wizard/sale_make_invoice_advance.py:124 #, python-format -msgid "" -"Couldn't find a pricelist line matching this product and quantity.\n" -"You have to change either the product, the quantity or the pricelist." +msgid "You cannot make an advance on a sales order that is defined as 'Automatic Invoice after delivery'." msgstr "" #. module: sale -#: help:sale.order,picking_ids:0 -msgid "This is a list of picking that has been generated for this sales order." +#: help:sale.order,amount_total:0 +msgid "The total amount." msgstr "" #. module: sale -#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0 -msgid "Create invoices" +#: view:sale.report:0 +#: field:sale.report,analytic_account_id:0 +#: field:sale.shop,project_id:0 +msgid "Analytic Account" +msgstr "" + +#. module: sale +#: field:sale.config.settings,module_sale_journal:0 +msgid "Allow batch invoicing of delivery orders through journals" +msgstr "" + +#. module: sale +#: field:sale.order.line,price_subtotal:0 +msgid "Subtotal" +msgstr "" + +#. module: sale +#: field:sale.config.settings,group_discount_per_so_line:0 +msgid "Allow setting a discount on the sale order lines" +msgstr "" + +#. module: sale +#: model:process.transition.action,name:sale.process_transition_action_cancelorder0 +msgid "Cancel Order" +msgstr "" + +#. module: sale +#: field:sale.order.line,th_weight:0 +msgid "Weight" +msgstr "" + +#. module: sale +#: view:sale.config.settings:0 +msgid "Warehouse Features" +msgstr "" + +#. module: sale +#: view:sale.order:0 +msgid "Quotation " +msgstr "" + +#. module: sale +#: field:sale.order.line,product_uom:0 +msgid "Unit of Measure " +msgstr "" + +#. module: sale +#: code:addons/sale/wizard/sale_make_invoice_advance.py:148 +#, python-format +msgid "Incorrect Data" +msgstr "" + +#. module: sale +#: code:addons/sale/wizard/sale_make_invoice_advance.py:149 +#, python-format +msgid "The value of Advance Amount must be positive." +msgstr "" + +#. module: sale +#: help:sale.advance.payment.inv,advance_payment_method:0 +msgid "Use All to create the final invoice.\n" +" Use Percentage to invoice a percentage of the total amount.\n" +" Use Fixed Price to invoice a specific amound in advance.\n" +" Use Some Order Lines to invoice a selection of the sale order lines." +msgstr "" + +#. module: sale +#: selection:sale.order,state:0 +msgid "Sale Order" +msgstr "" + +#. module: sale +#: field:sale.order,message_ids:0 +msgid "Messages" +msgstr "" + +#. module: sale +#: selection:sale.report,month:0 +msgid "September" +msgstr "" + +#. module: sale +#: field:sale.order,amount_tax:0 +#: field:sale.order.line,tax_id:0 +msgid "Taxes" +msgstr "" + +#. module: sale +#: field:sale.order,amount_untaxed:0 +msgid "Untaxed Amount" +msgstr "" + +#. module: sale +#: field:sale.config.settings,module_project:0 +msgid "Project" +msgstr "" + +#. module: sale +#: code:addons/sale/sale.py:319 +#: code:addons/sale/sale.py:459 +#: code:addons/sale/sale.py:591 +#: code:addons/sale/sale.py:765 +#: code:addons/sale/sale.py:782 +#: code:addons/sale/wizard/sale_make_invoice_advance.py:123 +#, python-format +msgid "Error!" msgstr "" #. module: sale @@ -1702,7 +395,16 @@ msgid "Net Total :" msgstr "" #. module: sale -#: selection:sale.order,state:0 selection:sale.order.line,state:0 +#: help:sale.config.settings,module_analytic_user_function:0 +msgid "Allows you to define what is the default function of a specific user on a given account.\n" +" This is mostly used when a user encodes his timesheet. The values are retrieved and the fields are auto-filled.\n" +" But the possibility to change these values is still available.\n" +" This installs the module analytic_user_function." +msgstr "" + +#. module: sale +#: selection:sale.order,state:0 +#: selection:sale.order.line,state:0 #: selection:sale.report,state:0 msgid "Cancelled" msgstr "" @@ -1712,36 +414,128 @@ msgstr "" msgid "Sales Order Lines related to a Sales Order of mine" msgstr "" +#. module: sale +#: selection:sale.order,state:0 +msgid "Quotation Sent" +msgstr "" + +#. module: sale +#: help:sale.order,message_unread:0 +msgid "If checked new messages require your attention." +msgstr "" + +#. module: sale +#: field:sale.order,amount_total:0 +#: view:sale.order.line:0 +msgid "Total" +msgstr "" + #. module: sale #: model:ir.actions.act_window,name:sale.action_shop_form -#: model:ir.ui.menu,name:sale.menu_action_shop_form field:sale.order,shop_id:0 -#: view:sale.report:0 field:sale.report,shop_id:0 +#: field:sale.order,shop_id:0 +#: view:sale.report:0 +#: field:sale.report,shop_id:0 msgid "Shop" msgstr "" +#. module: sale +#: model:ir.actions.act_window,name:sale.action_order_tree2 +msgid "Sales in Exception" +msgstr "" + +#. module: sale +#: field:sale.order,partner_invoice_id:0 +msgid "Invoice Address" +msgstr "" + +#. module: sale +#: help:sale.order,create_date:0 +msgid "Date on which sales order is created." +msgstr "" + +#. module: sale +#: view:res.partner:0 +msgid "False" +msgstr "" + +#. module: sale +#: view:sale.order:0 +msgid "Recreate Invoice" +msgstr "" + +#. module: sale +#: view:sale.make.invoice:0 +#: view:sale.order.line.make.invoice:0 +msgid "Create Invoices" +msgstr "" + +#. module: sale +#: report:sale.order:0 +msgid "Tax" +msgstr "" + +#. module: sale +#: code:addons/sale/sale.py:986 +#, python-format +msgid "Invalid Action!" +msgstr "" + +#. module: sale +#: view:sale.report:0 +msgid "Reference Unit of Measure" +msgstr "" + #. module: sale #: field:sale.report,date_confirm:0 msgid "Date Confirm" msgstr "" #. module: sale -#: code:addons/sale/wizard/sale_line_invoice.py:113 -#, python-format -msgid "Warning" +#: view:sale.report:0 +#: field:sale.report,nbr:0 +msgid "# of Lines" msgstr "" #. module: sale -#: view:board.board:0 -#: model:ir.actions.act_window,name:sale.action_view_sales_by_month -msgid "Sales by Month" +#: help:sale.order,message_summary:0 +msgid "Holds the Chatter summary (number of messages, ...). This summary is directly in html format in order to be inserted in kanban views." msgstr "" #. module: sale +#: field:sale.config.settings,group_sale_delivery_address:0 +msgid "Allow a different address for delivery and invoicing " +msgstr "" + +#. module: sale +#: view:sale.report:0 +#: field:sale.report,product_uom_qty:0 +msgid "# of Qty" +msgstr "" + +#. module: sale +#: report:sale.order:0 +msgid "Fax :" +msgstr "" + +#. module: sale +#: view:sale.order:0 +msgid "(update)" +msgstr "" + +#. module: sale +#: help:sale.config.settings,group_discount_per_so_line:0 +msgid "Allows you to apply some discount per sale order line." +msgstr "" + +#. module: sale +#: code:addons/sale/sale.py:578 #: model:ir.model,name:sale.model_sale_order #: model:process.node,name:sale.process_node_order0 #: model:process.node,name:sale.process_node_saleorder0 -#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0 -#: field:stock.picking,sale_id:0 +#: field:res.partner,sale_order_ids:0 +#: model:res.request.link,name:sale.req_link_sale_order +#: view:sale.order:0 +#, python-format msgid "Sales Order" msgstr "" @@ -1756,12 +550,8 @@ msgid "Sale Order Lines that are in 'done' state" msgstr "" #. module: sale -#: model:process.transition,note:sale.process_transition_packing0 -msgid "" -"The Pick List form is created as soon as the sales order is confirmed, in " -"the same time as the procurement order. It represents the assignment of " -"parts to the sales order. There is 1 pick list by sales order line which " -"evolves with the availability of parts." +#: field:sale.advance.payment.inv,amount:0 +msgid "Advance Amount" msgstr "" #. module: sale @@ -1770,117 +560,105 @@ msgid "Confirmed" msgstr "" #. module: sale -#: field:sale.config.picking_policy,order_policy:0 -msgid "Main Method Based On" +#: field:sale.config.settings,module_analytic_user_function:0 +msgid "One employee can have different roles per contract" +msgstr "" + +#. module: sale +#: field:sale.order,note:0 +msgid "Terms and conditions" +msgstr "" + +#. module: sale +#: field:sale.shop,payment_default_id:0 +msgid "Default Payment Term" msgstr "" #. module: sale #: model:process.transition.action,name:sale.process_transition_action_confirm0 +#: view:sale.order:0 msgid "Confirm" msgstr "" -#. module: sale -#: constraint:res.company:0 -msgid "Error! You can not create recursive companies." -msgstr "" - -#. module: sale -#: view:board.board:0 -#: model:ir.actions.act_window,name:sale.action_sales_product_total_price -msgid "Sales by Product's Category in last 90 days" -msgstr "" - -#. module: sale -#: view:sale.order:0 field:sale.order.line,invoice_lines:0 -msgid "Invoice Lines" -msgstr "" - -#. module: sale -#: model:ir.actions.act_window,name:sale.action_order_line_product_tree -#: view:sale.order:0 view:sale.order.line:0 -msgid "Sales Order Lines" -msgstr "" - -#. module: sale -#: field:sale.order.line,delay:0 -msgid "Delivery Lead Time" -msgstr "" - -#. module: sale -#: view:res.company:0 -msgid "Configuration" -msgstr "" - -#. module: sale -#: code:addons/sale/edi/sale_order.py:146 -#, python-format -msgid "EDI Pricelist (%s)" -msgstr "" - #. module: sale #: view:sale.order:0 -msgid "Print Order" +msgid "Unread messages" +msgstr "" + +#. module: sale +#: field:sale.order,partner_shipping_id:0 +msgid "Shipping Address" +msgstr "" + +#. module: sale +#: view:sale.order.line:0 +msgid "Sale Order Lines ready to be invoiced" +msgstr "" + +#. module: sale +#: view:account.invoice.report:0 +#: view:board.board:0 +#: model:ir.actions.act_window,name:sale.action_turnover_by_month +msgid "Monthly Turnover" msgstr "" #. module: sale #: view:sale.report:0 -msgid "Sales order created in current year" +#: field:sale.report,year:0 +msgid "Year" msgstr "" #. module: sale -#: code:addons/sale/wizard/sale_line_invoice.py:113 -#, python-format -msgid "" -"Invoice cannot be created for this Sales Order Line due to one of the " -"following reasons:\n" -"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n" -"2.The Sales Order Line is Invoiced!" +#: field:sale.config.settings,group_uom:0 +msgid "Allow using different units of measures" msgstr "" #. module: sale -#: view:sale.order.line:0 -msgid "Sale order lines done" +#: view:sale.order:0 +msgid "Sales Order that haven't yet been confirmed" msgstr "" #. module: sale -#: field:sale.order.line,th_weight:0 -msgid "Weight" +#: field:sale.order,message_unread:0 +msgid "Unread Messages" msgstr "" #. module: sale -#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0 -msgid "Invoices" +#: view:sale.order:0 +msgid "Print" msgstr "" #. module: sale -#: selection:sale.report,month:0 -msgid "December" +#: report:sale.order:0 +msgid "Order N°" msgstr "" #. module: sale -#: field:sale.config.picking_policy,config_logo:0 -msgid "Image" +#: view:sale.order:0 +#: field:sale.order,order_line:0 +msgid "Order Lines" msgstr "" #. module: sale -#: model:process.transition,note:sale.process_transition_saleprocurement0 -msgid "" -"A procurement order is automatically created as soon as a sales order is " -"confirmed or as the invoice is paid. It drives the purchasing and the " -"production of products regarding to the rules and to the sales order's " -"parameters. " +#: report:sale.order:0 +msgid "Disc.(%)" msgstr "" #. module: sale -#: view:sale.order.line:0 -msgid "Uninvoiced" +#: field:sale.order,name:0 +#: field:sale.order.line,order_id:0 +msgid "Order Reference" msgstr "" #. module: sale -#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0 -#: view:sale.order.line:0 field:sale.order.line,salesman_id:0 -#: view:sale.report:0 field:sale.report,user_id:0 -msgid "Salesman" +#: field:sale.order.line,invoice_lines:0 +msgid "Invoice Lines" +msgstr "" + +#. module: sale +#: view:sale.report:0 +#: field:sale.report,price_total:0 +msgid "Total Price" msgstr "" #. module: sale @@ -1889,22 +667,437 @@ msgid "Old Quotations" msgstr "" #. module: sale -#: field:sale.order,amount_untaxed:0 -msgid "Untaxed Amount" +#: help:sale.config.settings,module_sale_journal:0 +msgid "Allows you to categorize your sales and deliveries (picking lists) between different journals,\n" +" and perform batch operations on journals.\n" +" This installs the module sale_journal." msgstr "" #. module: sale -#: code:addons/sale/wizard/sale_make_invoice_advance.py:170 -#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv -#: view:sale.advance.payment.inv:0 view:sale.order:0 -#, python-format -msgid "Advance Invoice" +#: help:sale.make.invoice,grouped:0 +msgid "Check the box to group the invoices for the same customers" msgstr "" #. module: sale -#: code:addons/sale/sale.py:624 +#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice +#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice +msgid "Make Invoices" +msgstr "" + +#. module: sale +#: model:ir.actions.server,name:sale.actions_server_sale_order_read +msgid "Mark read" +msgstr "" + +#. module: sale +#: code:addons/sale/res_config.py:89 #, python-format -msgid "The sales order '%s' has been cancelled." +msgid "Hour" +msgstr "" + +#. module: sale +#: field:res.partner,sale_order_count:0 +msgid "# of Sales Order" +msgstr "" + +#. module: sale +#: help:sale.config.settings,timesheet:0 +msgid "For modifying account analytic view to show important data to project manager of services companies.\n" +" You can also view the report of account analytic summary user-wise as well as month wise.\n" +" This installs the module account_analytic_analysis." +msgstr "" + +#. module: sale +#: field:sale.order,create_date:0 +msgid "Creation Date" +msgstr "" + +#. module: sale +#: selection:sale.order,state:0 +#: selection:sale.report,state:0 +msgid "Waiting Schedule" +msgstr "" + +#. module: sale +#: help:sale.order,partner_invoice_id:0 +msgid "Invoice address for current sales order." +msgstr "" + +#. module: sale +#: selection:sale.order,invoice_quantity:0 +msgid "Ordered Quantities" +msgstr "" + +#. module: sale +#: view:sale.report:0 +msgid "Ordered Year of the sales order" +msgstr "" + +#. module: sale +#: field:sale.config.settings,module_sale_stock:0 +msgid "Sale and Warehouse Management" +msgstr "" + +#. module: sale +#: model:ir.model,name:sale.model_sale_config_settings +msgid "sale.config.settings" +msgstr "" + +#. module: sale +#: field:sale.advance.payment.inv,qtty:0 +#: report:sale.order:0 +#: field:sale.order.line,product_uom_qty:0 +msgid "Quantity" +msgstr "" + +#. module: sale +#: report:sale.order:0 +msgid "Total :" +msgstr "" + +#. module: sale +#: view:sale.report:0 +msgid "My Sales" +msgstr "" + +#. module: sale +#: code:addons/sale/sale.py:253 +#: code:addons/sale/sale.py:822 +#, python-format +msgid "Invalid action !" +msgstr "" + +#. module: sale +#: field:sale.order,fiscal_position:0 +msgid "Fiscal Position" +msgstr "" + +#. module: sale +#: selection:sale.report,month:0 +msgid "July" +msgstr "" + +#. module: sale +#: field:account.config.settings,module_sale_analytic_plans:0 +msgid "Several analytic accounts on sales" +msgstr "" + +#. module: sale +#: view:sale.config.settings:0 +msgid "Default Options" +msgstr "" + +#. module: sale +#: code:addons/sale/sale.py:963 +#: code:addons/sale/wizard/sale_make_invoice_advance.py:138 +#: code:addons/sale/wizard/sale_make_invoice_advance.py:142 +#, python-format +msgid "Configuration Error!" +msgstr "" + +#. module: sale +#: field:account.config.settings,group_analytic_account_for_sales:0 +msgid "Analytic accounting for sales" +msgstr "" + +#. module: sale +#: view:sale.order:0 +msgid "UoS" +msgstr "" + +#. module: sale +#: view:sale.advance.payment.inv:0 +msgid "After clicking 'Show Lines to Invoice', select lines to invoice and create the invoice from the 'More' dropdown menu." +msgstr "" + +#. module: sale +#: code:addons/sale/edi/sale_order.py:151 +#, python-format +msgid "EDI Pricelist (%s)" +msgstr "" + +#. module: sale +#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order +msgid "

\n" +" Click to create a quotation or sale order for this customer.\n" +"

\n" +" OpenERP will help you efficiently handle the complete sale flow:\n" +" quotation, sale order, delivery, invoicing and\n" +" payment.\n" +"

\n" +" The social feature helps you organize discussions on each sale\n" +" order, and allow your customer to keep track of the evolution\n" +" of the sale order.\n" +"

\n" +" " +msgstr "" + +#. module: sale +#: view:sale.config.settings:0 +msgid "Invoicing Process" +msgstr "" + +#. module: sale +#: report:sale.order:0 +msgid "Quotation Date" +msgstr "" + +#. module: sale +#: view:sale.order:0 +msgid "Order Date" +msgstr "" + +#. module: sale +#: help:sale.order,order_policy:0 +msgid "This field controls how invoice and delivery operations are synchronized.\n" +" - With 'Before Delivery', a draft invoice is created, and it must be paid before delivery." +msgstr "" + +#. module: sale +#: view:sale.order:0 +msgid "Sales Order done" +msgstr "" + +#. module: sale +#: code:addons/sale/sale.py:320 +#, python-format +msgid "Please define sales journal for this company: \"%s\" (id:%d)." +msgstr "" + +#. module: sale +#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order +#: view:res.partner:0 +msgid "Quotations and Sales" +msgstr "" + +#. module: sale +#: help:sale.config.settings,group_uom:0 +msgid "Allows you to select and maintain different units of measure for products." +msgstr "" + +#. module: sale +#: model:ir.model,name:sale.model_res_partner +#: view:sale.report:0 +#: field:sale.report,partner_id:0 +msgid "Partner" +msgstr "" + +#. module: sale +#: view:sale.advance.payment.inv:0 +msgid "Create and View Invoice" +msgstr "" + +#. module: sale +#: code:addons/sale/sale.py:655 +#, python-format +msgid "Sale Order for %s has been done" +msgstr "" + +#. module: sale +#: model:ir.actions.act_window,help:sale.action_shop_form +msgid "

\n" +" Click to define a new sale shop.\n" +"

\n" +" Each quotation or sale order must be linked to a shop. The\n" +" shop also defines the warehouse from which the products will be\n" +" delivered for each particular sales.\n" +"

\n" +" " +msgstr "" + +#. module: sale +#: model:ir.model,name:sale.model_sale_make_invoice +msgid "Sales Make Invoice" +msgstr "" + +#. module: sale +#: model:ir.actions.act_window,help:sale.action_order_tree5 +msgid "

\n" +" Click to create a quotation, the first step of a new sale.\n" +"

\n" +" OpenERP will help you handle efficiently the complete sale flow:\n" +" from the quotation to the sale order, the\n" +" delivery, the invoicing and the payment collection.\n" +"

\n" +" The social feature helps you organize discussions on each sale\n" +" order, and allow your customers to keep track of the evolution\n" +" of the sale order.\n" +"

\n" +" " +msgstr "" + +#. module: sale +#: field:sale.order.line,discount:0 +msgid "Discount (%)" +msgstr "" + +#. module: sale +#: code:addons/sale/wizard/sale_line_invoice.py:111 +#, python-format +msgid "Invoice cannot be created for this Sales Order Line due to one of the following reasons:\n" +"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n" +"2.The Sales Order Line is Invoiced!" +msgstr "" + +#. module: sale +#: code:addons/sale/sale.py:783 +#, python-format +msgid "There is no Fiscal Position defined or Income category account defined for default properties of Product categories." +msgstr "" + +#. module: sale +#: view:sale.order.line:0 +msgid "Sale order lines done" +msgstr "" + +#. module: sale +#: view:board.board:0 +#: model:ir.actions.act_window,name:sale.action_quotation_for_sale +msgid "My Quotations" +msgstr "" + +#. module: sale +#: view:sale.advance.payment.inv:0 +msgid "Invoice Sale Order" +msgstr "" + +#. module: sale +#: selection:sale.report,month:0 +msgid "December" +msgstr "" + +#. module: sale +#: view:sale.config.settings:0 +msgid "Contracts Management" +msgstr "" + +#. module: sale +#: view:sale.order.line:0 +msgid "Shipped" +msgstr "" + +#. module: sale +#: view:sale.report:0 +#: field:sale.report,month:0 +msgid "Month" +msgstr "" + +#. module: sale +#: model:email.template,subject:sale.email_template_edi_sale +msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })" +msgstr "" + +#. module: sale +#: field:sale.order.line,sequence:0 +msgid "Sequence" +msgstr "" + +#. module: sale +#: code:addons/sale/sale.py:591 +#, python-format +msgid "You cannot confirm a sale order which has no line." +msgstr "" + +#. module: sale +#: view:sale.order.line:0 +msgid "Uninvoiced" +msgstr "" + +#. module: sale +#: view:sale.report:0 +#: field:sale.report,categ_id:0 +msgid "Category of Product" +msgstr "" + +#. module: sale +#: code:addons/sale/sale.py:557 +#, python-format +msgid "Cannot cancel this sales order!" +msgstr "" + +#. module: sale +#: help:sale.order,invoice_exists:0 +msgid "It indicates that sale order has at least one invoice." +msgstr "" + +#. module: sale +#: model:ir.model,name:sale.model_mail_message +msgid "Message" +msgstr "" + +#. module: sale +#: field:sale.config.settings,module_warning:0 +msgid "Allow configuring alerts by customer or products" +msgstr "" + +#. module: sale +#: field:sale.shop,name:0 +msgid "Shop Name" +msgstr "" + +#. module: sale +#: code:addons/sale/sale.py:253 +#, python-format +msgid "In order to delete a confirmed sale order, you must cancel it before !" +msgstr "" + +#. module: sale +#: report:sale.order:0 +msgid "Taxes :" +msgstr "" + +#. module: sale +#: code:addons/sale/sale.py:658 +#, python-format +msgid "Invoice has been paid." +msgstr "" + +#. module: sale +#: model:res.groups,name:sale.group_analytic_accounting +msgid "Analytic Accounting for Sales" +msgstr "" + +#. module: sale +#: model:ir.model,name:sale.model_sale_advance_payment_inv +msgid "Sales Advance Payment Invoice" +msgstr "" + +#. module: sale +#: model:ir.actions.client,name:sale.action_client_sale_menu +msgid "Open Sale Menu" +msgstr "" + +#. module: sale +#: selection:sale.report,state:0 +msgid "In Progress" +msgstr "" + +#. module: sale +#: code:addons/sale/sale.py:867 +#, python-format +msgid "No Customer Defined !" +msgstr "" + +#. module: sale +#: view:sale.make.invoice:0 +#: view:sale.order.line.make.invoice:0 +msgid "Create invoices" +msgstr "" + +#. module: sale +#: help:sale.order,invoice_quantity:0 +msgid "The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you want your invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks." +msgstr "" + +#. module: sale +#: code:addons/sale/wizard/sale_make_invoice_advance.py:153 +#, python-format +msgid "Advance of %s %%" +msgstr "" + +#. module: sale +#: model:ir.model,name:sale.model_sale_order_line_make_invoice +msgid "Sale OrderLine Make_invoice" msgstr "" #. module: sale @@ -1912,20 +1105,37 @@ msgstr "" msgid "Draft" msgstr "" +#. module: sale +#: field:sale.order,invoiced:0 +msgid "Paid" +msgstr "" + +#. module: sale +#: help:sale.order.line,sequence:0 +msgid "Gives the sequence order when displaying a list of sales order lines." +msgstr "" + #. module: sale #: help:sale.order.line,state:0 -msgid "" -"* The 'Draft' state is set when the related sales order in draft " -"state. \n" -"* The 'Confirmed' state is set when the related sales order is " -"confirmed. \n" -"* The 'Exception' state is set when the related sales order is set as " -"exception. \n" -"* The 'Done' state is set when the sales order line has been " -"picked. \n" +msgid "* The 'Draft' state is set when the related sales order in draft state. \n" +"* The 'Confirmed' state is set when the related sales order is confirmed. \n" +"* The 'Exception' state is set when the related sales order is set as exception. \n" +"* The 'Done' state is set when the sales order line has been picked. \n" "* The 'Cancelled' state is set when a user cancel the sales order related." msgstr "" +#. module: sale +#: model:ir.actions.act_window,name:sale.action_order_form +#: model:ir.ui.menu,name:sale.menu_sale_order +#: view:sale.order:0 +msgid "Sales Orders" +msgstr "" + +#. module: sale +#: field:sale.make.invoice,grouped:0 +msgid "Group the invoices" +msgstr "" + #. module: sale #: help:sale.order,amount_tax:0 msgid "The tax amount." @@ -1933,55 +1143,156 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Packings" -msgstr "" - -#. module: sale +#: field:sale.order,state:0 #: view:sale.order.line:0 -msgid "Sale Order Lines ready to be invoiced" +#: field:sale.order.line,state:0 +#: view:sale.report:0 +msgid "Status" msgstr "" #. module: sale -#: view:sale.report:0 -msgid "Sales order created in last month" +#: selection:sale.order,order_policy:0 +msgid "On Demand" +msgstr "" + +#. module: sale +#: selection:sale.report,month:0 +msgid "August" +msgstr "" + +#. module: sale +#: view:sale.order:0 +msgid "Sale Order " +msgstr "" + +#. module: sale +#: model:process.node,note:sale.process_node_saleorder0 +msgid "Drives procurement and invoicing" +msgstr "" + +#. module: sale +#: model:ir.actions.act_window,help:sale.action_order_form +msgid "

\n" +" Click to create a quotation that can be converted into a sale\n" +" order.\n" +"

\n" +" OpenERP will help you efficiently handle the complete sales flow:\n" +" quotation, sale order, delivery, invoicing and payment.\n" +"

\n" +" " +msgstr "" + +#. module: sale +#: selection:sale.report,month:0 +msgid "June" msgstr "" #. module: sale #: model:ir.actions.act_window,name:sale.action_email_templates -#: model:ir.ui.menu,name:sale.menu_email_templates msgid "Email Templates" msgstr "" #. module: sale -#: model:ir.actions.act_window,name:sale.action_order_form -#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0 -msgid "Sales Orders" +#: view:sale.order.line:0 +msgid "Order" msgstr "" #. module: sale -#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0 +#: code:addons/sale/sale.py:647 +#, python-format +msgid "Quotation for %s converted to Sale Order of %s %s." +msgstr "" + +#. module: sale +#: view:sale.order:0 +msgid "we should put a config wizard for these two fields" +msgstr "" + +#. module: sale +#: field:sale.order,message_is_follower:0 +msgid "Is a Follower" +msgstr "" + +#. module: sale +#: code:addons/sale/sale.py:261 +#, python-format +msgid "Pricelist Warning!" +msgstr "" + +#. module: sale +#: model:ir.model,name:sale.model_sale_shop +#: view:sale.shop:0 msgid "Sales Shop" msgstr "" +#. module: sale +#: model:ir.model,name:sale.model_sale_report +msgid "Sales Orders Statistics" +msgstr "" + +#. module: sale +#: field:sale.order,date_order:0 +msgid "Date" +msgstr "" + +#. module: sale +#: model:ir.model,name:sale.model_sale_order_line +msgid "Sales Order Line" +msgstr "" + #. module: sale #: selection:sale.report,month:0 msgid "November" msgstr "" +#. module: sale +#: view:sale.report:0 +msgid "Extended Filters..." +msgstr "" + +#. module: sale +#: code:addons/sale/wizard/sale_line_invoice.py:111 +#: code:addons/sale/wizard/sale_make_invoice.py:42 +#, python-format +msgid "Warning!" +msgstr "" + +#. module: sale +#: field:sale.order,message_comment_ids:0 +#: help:sale.order,message_comment_ids:0 +msgid "Comments and emails" +msgstr "" + #. module: sale #: field:sale.advance.payment.inv,product_id:0 msgid "Advance Product" msgstr "" #. module: sale -#: view:sale.order:0 -msgid "Compute" +#: selection:sale.order.line,state:0 +msgid "Exception" msgstr "" #. module: sale -#: code:addons/sale/sale.py:618 -#, python-format -msgid "You must first cancel all invoices attached to this sales order." +#: selection:sale.report,month:0 +msgid "October" +msgstr "" + +#. module: sale +#: model:process.transition,note:sale.process_transition_invoice0 +msgid "The Salesman creates an invoice manually, if the sales order shipping policy is 'Shipping and Manual in Progress'. The invoice is created automatically if the shipping policy is 'Payment before Delivery'." +msgstr "" + +#. module: sale +#: help:sale.config.settings,module_sale_stock:0 +msgid "Allows you to Make Quotation, Sale Order using different Order policy and Manage Related Stock.\n" +" This installs the module sale_stock." +msgstr "" + +#. module: sale +#: help:sale.advance.payment.inv,product_id:0 +msgid "Select a product of type service which is called 'Advance Product'.\n" +" You may have to create it and set it as a default value on this field." msgstr "" #. module: sale @@ -1994,31 +1305,89 @@ msgstr "" msgid "Sales Order in Progress" msgstr "" +#. module: sale +#: field:sale.order,message_summary:0 +msgid "Summary" +msgstr "" + +#. module: sale +#: field:sale.config.settings,timesheet:0 +msgid "Prepare invoices based on timesheets" +msgstr "" + +#. module: sale +#: code:addons/sale/sale.py:651 +#, python-format +msgid "Sale Order for %s cancelled." +msgstr "" + +#. module: sale +#: field:sale.advance.payment.inv,advance_payment_method:0 +msgid "What do you want to invoice?" +msgstr "" + +#. module: sale +#: field:sale.config.settings,group_sale_pricelist:0 +msgid "Use pricelists to adapt your price per customers" +msgstr "" + +#. module: sale +#: model:process.transition,note:sale.process_transition_confirmquotation0 +msgid "The salesman confirms the quotation. The state of the sales order becomes 'In progress' or 'Manual in progress'." +msgstr "" + #. module: sale #: help:sale.order,origin:0 msgid "Reference of the document that generated this sales order request." msgstr "" #. module: sale -#: view:sale.report:0 field:sale.report,delay:0 +#: code:addons/sale/sale.py:958 +#, python-format +msgid "No valid pricelist line found ! :" +msgstr "" + +#. module: sale +#: help:sale.config.settings,module_warning:0 +msgid "Allow to configure warnings on products and trigger them when a user wants to sale a given product or a given customer.\n" +" Example: Product: this product is deprecated, do not purchase more than 5.\n" +" Supplier: don't forget to ask for an express delivery." +msgstr "" + +#. module: sale +#: view:sale.report:0 +#: field:sale.report,delay:0 msgid "Commitment Delay" msgstr "" #. module: sale -#: selection:sale.order,order_policy:0 -msgid "Deliver & invoice on demand" +#: view:sale.order.line:0 +msgid "Confirmed sale order lines, not yet delivered" msgstr "" #. module: sale -#: model:process.node,note:sale.process_node_saleprocurement0 -msgid "" -"One Procurement order for each sales order line and for each of the " -"components." +#: view:sale.order:0 +msgid "History" msgstr "" #. module: sale -#: model:process.transition.action,name:sale.process_transition_action_assign0 -msgid "Assign" +#: field:sale.config.settings,module_sale_margin:0 +msgid "Display margins on sales orders" +msgstr "" + +#. module: sale +#: help:sale.order,invoice_ids:0 +msgid "This is the list of invoices that have been generated for this sales order. The same sales order may have been invoiced in several times (by line for example)." +msgstr "" + +#. module: sale +#: report:sale.order:0 +msgid "Your Reference" +msgstr "" + +#. module: sale +#: view:sale.advance.payment.inv:0 +msgid "Show Lines to Invoice" msgstr "" #. module: sale @@ -2026,56 +1395,217 @@ msgstr "" msgid "Date Order" msgstr "" +#. module: sale +#: field:sale.order,pricelist_id:0 +#: field:sale.report,pricelist_id:0 +#: field:sale.shop,pricelist_id:0 +msgid "Pricelist" +msgstr "" + +#. module: sale +#: report:sale.order:0 +msgid "TVA :" +msgstr "" + +#. module: sale +#: code:addons/sale/sale.py:401 +#, python-format +msgid "Customer Invoices" +msgstr "" + #. module: sale #: model:process.node,note:sale.process_node_order0 msgid "Confirmed sales order to invoice." msgstr "" #. module: sale +#: model:ir.actions.act_window,name:sale.action_order_line_product_tree #: view:sale.order:0 -msgid "Sales Order that haven't yet been confirmed" +#: view:sale.order.line:0 +msgid "Sales Order Lines" msgstr "" #. module: sale -#: code:addons/sale/sale.py:322 +#: model:ir.actions.act_window,name:sale.open_board_sales +#: model:ir.ui.menu,name:sale.menu_dashboard_sales +#: model:process.process,name:sale.process_process_salesprocess0 +#: view:res.partner:0 +#: view:sale.order:0 +#: view:sale.report:0 +msgid "Sales" +msgstr "" + +#. module: sale +#: code:addons/sale/sale.py:262 #, python-format -msgid "The sales order '%s' has been set in draft state." +msgid "If you change the pricelist of this order (and eventually the currency), prices of existing order lines will not be updated." msgstr "" #. module: sale -#: selection:sale.order.line,type:0 -msgid "from stock" +#: view:sale.report:0 +#: field:sale.report,day:0 +msgid "Day" msgstr "" #. module: sale -#: view:sale.open.invoice:0 -msgid "Close" +#: view:sale.order:0 +#: field:sale.order,invoice_ids:0 +msgid "Invoices" msgstr "" #. module: sale -#: code:addons/sale/sale.py:1261 +#: report:sale.order:0 +#: field:sale.order.line,price_unit:0 +msgid "Unit Price" +msgstr "" + +#. module: sale +#: view:sale.order:0 +#: selection:sale.order,state:0 +#: view:sale.order.line:0 +#: selection:sale.order.line,state:0 +#: selection:sale.report,state:0 +msgid "Done" +msgstr "" + +#. module: sale +#: report:sale.order:0 +msgid "Invoice address :" +msgstr "" + +#. module: sale +#: model:process.node,name:sale.process_node_invoice0 +#: view:sale.order:0 +msgid "Invoice" +msgstr "" + +#. module: sale +#: view:sale.order.line:0 +msgid "My Sales Order Lines" +msgstr "" + +#. module: sale +#: model:process.transition.action,name:sale.process_transition_action_cancel0 +#: view:sale.advance.payment.inv:0 +#: view:sale.make.invoice:0 +#: view:sale.order:0 +#: view:sale.order.line:0 +#: view:sale.order.line.make.invoice:0 +msgid "Cancel" +msgstr "" + +#. module: sale +#: field:sale.order,message_follower_ids:0 +msgid "Followers" +msgstr "" + +#. module: sale +#: code:addons/sale/sale.py:947 #, python-format msgid "No Pricelist ! : " msgstr "" #. module: sale -#: field:sale.order,shipped:0 -msgid "Delivered" +#: model:process.node,name:sale.process_node_quotation0 +#: selection:sale.report,state:0 +msgid "Quotation" msgstr "" #. module: sale -#: constraint:stock.move:0 -msgid "You must assign a production lot for this product" +#: view:sale.order.line:0 +msgid "Search Uninvoiced Lines" msgstr "" #. module: sale -#: model:ir.actions.act_window,help:sale.action_shop_form -msgid "" -"If you have more than one shop reselling your company products, you can " -"create and manage that from here. Whenever you will record a new quotation " -"or sales order, it has to be linked to a shop. The shop also defines the " -"warehouse from which the products will be delivered for each particular " -"sales." +#: model:ir.model,name:sale.model_account_config_settings +msgid "account.config.settings" +msgstr "" + +#. module: sale +#: sql_constraint:sale.order:0 +msgid "Order Reference must be unique per Company!" +msgstr "" + +#. module: sale +#: model:ir.actions.act_window,help:sale.action_order_line_tree2 +msgid "

\n" +" Here is a list of each sales order line to be invoiced. You can\n" +" invoice sales orders partially, by lines of sales order. You do\n" +" not need this list if you invoice from the delivery orders or\n" +" if you invoice sales totally.\n" +"

\n" +" " +msgstr "" + +#. module: sale +#: view:sale.config.settings:0 +msgid "Product Features" +msgstr "" + +#. module: sale +#: view:sale.order.line:0 +msgid "To Do" +msgstr "" + +#. module: sale +#: report:sale.order:0 +msgid "Shipping address :" +msgstr "" + +#. module: sale +#: code:addons/sale/sale.py:460 +#, python-format +msgid "You cannot group sales having different currencies for the same partner." +msgstr "" + +#. module: sale +#: code:addons/sale/sale.py:663 +#, python-format +msgid "Draft Invoice of %s %s waiting for validation." +msgstr "" + +#. module: sale +#: field:sale.config.settings,module_account_analytic_analysis:0 +msgid "Use contracts management" +msgstr "" + +#. module: sale +#: code:addons/sale/sale.py:955 +#, python-format +msgid "Cannot find a pricelist line matching this product and quantity.\n" +"You have to change either the product, the quantity or the pricelist." +msgstr "" + +#. module: sale +#: model:ir.actions.act_window,name:sale.action_order_report_all +#: model:ir.ui.menu,name:sale.menu_report_product_all +#: view:sale.report:0 +msgid "Sales Analysis" +msgstr "" + +#. module: sale +#: help:sale.order,pricelist_id:0 +msgid "Pricelist for current sales order." +msgstr "" + +#. module: sale +#: model:process.transition,name:sale.process_transition_invoice0 +#: model:process.transition.action,name:sale.process_transition_action_createinvoice0 +#: view:sale.advance.payment.inv:0 +#: view:sale.order:0 +#: field:sale.order,order_policy:0 +#: view:sale.order.line:0 +msgid "Create Invoice" +msgstr "" + +#. module: sale +#: help:sale.order,amount_untaxed:0 +msgid "The amount without tax." +msgstr "" + +#. module: sale +#: view:sale.order.line:0 +msgid "Order reference" msgstr "" #. module: sale @@ -2084,17 +1614,144 @@ msgid "It indicates that an invoice has been paid." msgstr "" #. module: sale -#: report:sale.order:0 field:sale.order.line,name:0 +#: code:addons/sale/sale.py:822 +#, python-format +msgid "You cannot cancel a sale order line that has already been invoiced!" +msgstr "" + +#. module: sale +#: selection:sale.advance.payment.inv,advance_payment_method:0 +msgid "Percentage" +msgstr "" + +#. module: sale +#: report:sale.order:0 +#: view:sale.order:0 +#: field:sale.order,user_id:0 +#: view:sale.order.line:0 +#: field:sale.order.line,salesman_id:0 +#: view:sale.report:0 +#: field:sale.report,user_id:0 +msgid "Salesperson" +msgstr "" + +#. module: sale +#: view:sale.order.line:0 +#: field:sale.order.line,product_id:0 +#: view:sale.report:0 +#: field:sale.report,product_id:0 +msgid "Product" +msgstr "" + +#. module: sale +#: view:sale.advance.payment.inv:0 +#: view:sale.order:0 +msgid "%" +msgstr "" + +#. module: sale +#: report:sale.order:0 msgid "Description" msgstr "" +#. module: sale +#: code:addons/sale/wizard/sale_make_invoice_advance.py:143 +#, python-format +msgid "There is no income account defined for this product: \"%s\" (id:%d)." +msgstr "" + #. module: sale #: selection:sale.report,month:0 msgid "May" msgstr "" #. module: sale -#: view:sale.order:0 field:sale.order,partner_id:0 +#: code:addons/sale/sale.py:766 +#, python-format +msgid "Please define income account for this product: \"%s\" (id:%d)." +msgstr "" + +#. module: sale +#: report:sale.order:0 +msgid "Price" +msgstr "" + +#. module: sale +#: model:ir.actions.act_window,help:sale.action_order_report_all +msgid "This report performs analysis on your quotations and sales orders. Analysis check your sales revenues and sort it by different group criteria (salesman, partner, product, etc.) Use this report to perform analysis on sales not having invoiced yet. If you want to analyse your turnover, you should use the Invoice Analysis report in the Accounting application." +msgstr "" + +#. module: sale +#: help:sale.order,state:0 +msgid "Gives the state of the quotation or sales order. \n" +"The exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception). \n" +"The 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the order date." +msgstr "" + +#. module: sale +#: report:sale.order:0 +msgid "Tel. :" +msgstr "" + +#. module: sale +#: view:sale.make.invoice:0 +#: view:sale.order.line.make.invoice:0 +msgid "Do you really want to create the invoice(s)?" +msgstr "" + +#. module: sale +#: view:sale.order:0 +msgid "Other Information" +msgstr "" + +#. module: sale +#: view:res.partner:0 +msgid "sale.group_delivery_invoice_address" +msgstr "" + +#. module: sale +#: view:sale.order.line:0 +msgid "Qty" +msgstr "" + +#. module: sale +#: model:process.node,note:sale.process_node_invoice0 +msgid "To be reviewed by the accountant." +msgstr "" + +#. module: sale +#: view:sale.order:0 +msgid "Send by Mail" +msgstr "" + +#. module: sale +#: model:res.groups,name:sale.group_mrp_properties +msgid "Properties on lines" +msgstr "" + +#. module: sale +#: help:sale.order,partner_shipping_id:0 +msgid "Shipping address for current sales order." +msgstr "" + +#. module: sale +#: selection:sale.order,state:0 +msgid "Sale to Invoice" +msgstr "" + +#. module: sale +#: model:ir.actions.report.xml,name:sale.report_sale_order +msgid "Quotation / Order" +msgstr "" + +#. module: sale +#: view:sale.order:0 +msgid "Inbox" +msgstr "" + +#. module: sale +#: view:sale.order:0 +#: field:sale.order,partner_id:0 #: field:sale.order.line,order_partner_id:0 msgid "Customer" msgstr "" @@ -2109,45 +1766,181 @@ msgstr "" msgid "February" msgstr "" +#. module: sale +#: field:sale.order,invoice_quantity:0 +msgid "Invoice on" +msgstr "" + +#. module: sale +#: selection:sale.advance.payment.inv,advance_payment_method:0 +msgid "Fixed price (deposit)" +msgstr "" + +#. module: sale +#: code:addons/sale/wizard/sale_make_invoice_advance.py:139 +#, python-format +msgid "There is no income account defined as global property." +msgstr "" + +#. module: sale +#: report:sale.order:0 +msgid "Date Ordered" +msgstr "" + +#. module: sale +#: field:sale.order.line,product_uos:0 +msgid "Product UoS" +msgstr "" + +#. module: sale +#: help:account.config.settings,group_analytic_account_for_sales:0 +msgid "Allows you to specify an analytic account on sale orders." +msgstr "" + +#. module: sale +#: model:process.node,note:sale.process_node_quotation0 +msgid "Draft state of sales order" +msgstr "" + +#. module: sale +#: field:sale.order,origin:0 +msgid "Source Document" +msgstr "" + #. module: sale #: selection:sale.report,month:0 msgid "April" msgstr "" #. module: sale -#: view:sale.shop:0 -msgid "Accounting" +#: selection:sale.report,state:0 +msgid "Manual In Progress" msgstr "" #. module: sale -#: view:sale.order:0 view:sale.order.line:0 +#: model:ir.actions.server,name:sale.actions_server_sale_order_unread +msgid "Mark unread" +msgstr "" + +#. module: sale +#: code:addons/sale/sale.py:643 +#, python-format +msgid "Quotation for %s created." +msgstr "" + +#. module: sale +#: model:res.groups,name:sale.group_delivery_invoice_address +msgid "Addresses in Sale Orders" +msgstr "" + +#. module: sale +#: field:sale.config.settings,time_unit:0 +msgid "The default working time unit for services is" +msgstr "" + +#. module: sale +#: view:sale.order:0 +msgid "My Sale Orders" +msgstr "" + +#. module: sale +#: model:res.groups,name:sale.group_invoice_so_lines +msgid "Enable Invoicing Sale order lines" +msgstr "" + +#. module: sale +#: help:sale.order,message_ids:0 +msgid "Messages and communication history" +msgstr "" + +#. module: sale +#: view:sale.order:0 +#: view:sale.order.line:0 msgid "Search Sales Order" msgstr "" #. module: sale -#: model:process.node,name:sale.process_node_saleorderprocurement0 -msgid "Sales Order Requisition" +#: view:sale.config.settings:0 +msgid "Use contract to be able to manage your services with\n" +" multiple invoicing as part of the same contract with\n" +" your customer." msgstr "" #. module: sale -#: code:addons/sale/sale.py:1255 +#: view:sale.report:0 +msgid "Ordered month of the sales order" +msgstr "" + +#. module: sale +#: code:addons/sale/sale.py:945 #, python-format -msgid "Not enough stock ! : " +msgid "You have to select a pricelist or a customer in the sales form !\n" +"Please set one before choosing a product." msgstr "" #. module: sale -#: report:sale.order:0 field:sale.order,payment_term:0 +#: model:process.transition,name:sale.process_transition_saleinvoice0 +msgid "From a sales order" +msgstr "" + +#. module: sale +#: view:sale.order:0 +msgid "Ignore Exception" +msgstr "" + +#. module: sale +#: model:process.transition,note:sale.process_transition_saleinvoice0 +msgid "Depending on the Invoicing control of the sales order, the invoice can be based on delivered or on ordered quantities. Thus, a sales order can generates an invoice or a delivery order as soon as it is confirmed by the salesman." +msgstr "" + +#. module: sale +#: selection:sale.advance.payment.inv,advance_payment_method:0 +msgid "Some order lines" +msgstr "" + +#. module: sale +#: code:addons/sale/sale.py:986 +#, python-format +msgid "Cannot delete a sales order line which is in state '%s'." +msgstr "" + +#. module: sale +#: help:sale.order,project_id:0 +msgid "The analytic account related to a sales order." +msgstr "" + +#. module: sale +#: report:sale.order:0 +#: field:sale.order,payment_term:0 msgid "Payment Term" msgstr "" #. module: sale -#: model:ir.actions.act_window,help:sale.action_order_report_all -msgid "" -"This report performs analysis on your quotations and sales orders. Analysis " -"check your sales revenues and sort it by different group criteria (salesman, " -"partner, product, etc.) Use this report to perform analysis on sales not " -"having invoiced yet. If you want to analyse your turnover, you should use " -"the Invoice Analysis report in the Accounting application." +#: view:sale.order:0 +msgid "Sales Order ready to be invoiced" +msgstr "" + +#. module: sale +#: help:account.config.settings,module_sale_analytic_plans:0 +msgid "This allows install module sale_analytic_plans." +msgstr "" + +#. module: sale +#: view:sale.advance.payment.inv:0 +#: view:sale.make.invoice:0 +#: view:sale.order.line.make.invoice:0 +msgid "or" +msgstr "" + +#. module: sale +#: field:sale.order.line,name:0 +msgid "Product Description" +msgstr "" + +#. module: sale +#: help:sale.config.settings,group_sale_pricelist:0 +msgid "Allows to manage different prices based on rules per category of customers.\n" +" Example: 10% for retailers, promotion of 5 EUR on this product, etc." msgstr "" #. module: sale @@ -2156,16 +1949,54 @@ msgid "Quotation N°" msgstr "" #. module: sale -#: field:sale.order,picked_rate:0 view:sale.report:0 +#: model:res.groups,name:sale.group_discount_per_so_line +msgid "Discount on lines" +msgstr "" + +#. module: sale +#: field:sale.order,client_order_ref:0 +msgid "Customer Reference" +msgstr "" + +#. module: sale +#: view:sale.report:0 msgid "Picked" msgstr "" #. module: sale -#: view:sale.report:0 field:sale.report,year:0 -msgid "Year" +#: help:sale.config.settings,module_sale_margin:0 +msgid "This adds the 'Margin' on sales order.\n" +" This gives the profitability by calculating the difference between the Unit Price and Cost Price.\n" +" This installs the module sale_margin." msgstr "" #. module: sale -#: selection:sale.config.picking_policy,order_policy:0 -msgid "Invoice Based on Deliveries" +#: code:addons/sale/sale.py:867 +#, python-format +msgid "Before choosing a product,\n" +" select a customer in the sales form." +msgstr "" + +#. module: sale +#: view:sale.order:0 +msgid "Total Tax Included" +msgstr "" + +#. module: sale +#: field:sale.order,invoice_exists:0 +#: field:sale.order,invoiced_rate:0 +#: field:sale.order.line,invoiced:0 +msgid "Invoiced" +msgstr "" + +#. module: sale +#: view:sale.advance.payment.inv:0 +msgid "Select how you want to invoice this order. This\n" +" will create a draft invoice that can be modified\n" +" before validation." +msgstr "" + +#. module: sale +#: view:sale.report:0 +msgid "Ordered date of the sales order" msgstr "" diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml index b688f2aeb7f..706d42913de 100644 --- a/addons/sale/process/sale_process.xml +++ b/addons/sale/process/sale_process.xml @@ -28,18 +28,6 @@ - - - - - - - - - - - - @@ -62,38 +50,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -106,29 +62,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -142,29 +75,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -175,21 +85,6 @@ - - - - - - - - - - - - - - - @@ -216,49 +111,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py index 6beac7cfd38..3048b1414cd 100644 --- a/addons/sale/report/sale_report.py +++ b/addons/sale/report/sale_report.py @@ -30,8 +30,6 @@ class sale_report(osv.osv): _columns = { 'date': fields.date('Date Order', readonly=True), 'date_confirm': fields.date('Date Confirm', readonly=True), - 'shipped': fields.boolean('Shipped', readonly=True), - 'shipped_qty_1': fields.integer('Shipped', readonly=True), 'year': fields.char('Year', size=4, readonly=True), 'month': fields.selection([('01', 'January'), ('02', 'February'), ('03', 'March'), ('04', 'April'), ('05', 'May'), ('06', 'June'), ('07', 'July'), ('08', 'August'), ('09', 'September'), @@ -54,7 +52,6 @@ class sale_report(osv.osv): ('waiting_date', 'Waiting Schedule'), ('manual', 'Manual In Progress'), ('progress', 'In Progress'), - ('shipping_except', 'Shipping Exception'), ('invoice_except', 'Invoice Exception'), ('done', 'Done'), ('cancel', 'Cancelled') @@ -63,6 +60,7 @@ class sale_report(osv.osv): 'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True), } _order = 'date desc' + def init(self, cr): tools.drop_view_if_exists(cr, 'sale_report') cr.execute(""" @@ -86,8 +84,6 @@ class sale_report(osv.osv): extract(epoch from avg(date_trunc('day',s.date_confirm)-date_trunc('day',s.create_date)))/(24*60*60)::decimal(16,2) as delay, s.state, t.categ_id as categ_id, - s.shipped, - s.shipped::integer as shipped_qty_1, s.pricelist_id as pricelist_id, s.project_id as analytic_account_id from @@ -110,7 +106,6 @@ class sale_report(osv.osv): s.shop_id, s.company_id, s.state, - s.shipped, s.pricelist_id, s.project_id ) diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml index 2a60a9157dd..a7153f57a9e 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -20,7 +20,6 @@ - diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py index d84bc3595f5..843e1fd3343 100644 --- a/addons/sale/res_config.py +++ b/addons/sale/res_config.py @@ -27,17 +27,9 @@ class sale_configuration(osv.osv_memory): _inherit = 'sale.config.settings' _columns = { - 'group_invoice_so_lines': fields.boolean('Generate invoices based on the sale order', + 'group_invoice_so_lines': fields.boolean('Generate invoices based on the sale order lines', implied_group='sale.group_invoice_so_lines', help="To allow your salesman to make invoices for sale order lines using the menu 'Lines to Invoice'."), - 'group_invoice_deli_orders': fields.boolean('Generate invoices after and based on delivery orders', - implied_group='sale.group_invoice_deli_orders', - help="To allow your salesman to make invoices for Delivery Orders using the menu 'Deliveries to Invoice'."), - 'task_work': fields.boolean("Prepare invoices based on task's activities", - help="""Lets you transfer the entries under tasks defined for Project Management to - the Timesheet line entries for particular date and particular user with the effect of creating, editing and deleting either ways - and to automatically creates project tasks from procurement lines. - This installs the modules project_timesheet and project_mrp."""), 'timesheet': fields.boolean('Prepare invoices based on timesheets', help = """For modifying account analytic view to show important data to project manager of services companies. You can also view the report of account analytic summary user-wise as well as month wise. @@ -48,17 +40,7 @@ class sale_configuration(osv.osv_memory): (650€/day for a developer), the duration (one year support contract). You will be able to follow the progress of the contract and invoice automatically. It installs the account_analytic_analysis module."""), - 'default_order_policy': fields.selection( - [('manual', 'Invoice based on sales orders'), ('picking', 'Invoice based on deliveries')], - 'The default invoicing method is', default_model='sale.order', - help="You can generate invoices based on sales orders or based on shippings."), - 'module_delivery': fields.boolean('Allow adding shipping costs', - help ="""Allows you to add delivery methods in sale orders and delivery orders. - You can define your own carrier and delivery grids for prices. - This installs the module delivery."""), 'time_unit': fields.many2one('product.uom', 'The default working time unit for services is'), - 'default_picking_policy' : fields.boolean("Deliver all at once when all products are available.", - help = "Sales order by default will be configured to deliver all products at once instead of delivering each product when it is available. This may have an impact on the shipping price."), 'group_sale_pricelist':fields.boolean("Use pricelists to adapt your price per customers", implied_group='product.group_sale_pricelist', help="""Allows to manage different prices based on rules per category of customers. @@ -69,15 +51,9 @@ class sale_configuration(osv.osv_memory): 'group_sale_delivery_address': fields.boolean("Allow a different address for delivery and invoicing ", implied_group='sale.group_delivery_invoice_address', help="Allows you to specify different delivery and invoice addresses on a sale order."), - 'group_mrp_properties': fields.boolean('Product properties on order lines', - implied_group='sale.group_mrp_properties', - help="Allows you to tag sale order lines with properties."), 'group_discount_per_so_line': fields.boolean("Allow setting a discount on the sale order lines", implied_group='sale.group_discount_per_so_line', help="Allows you to apply some discount per sale order line."), - 'group_multiple_shops': fields.boolean("Manage multiple shops", - implied_group='stock.group_locations', - help="This allows to configure and use multiple shops."), 'module_warning': fields.boolean("Allow configuring alerts by customer or products", help="""Allow to configure warnings on products and trigger them when a user wants to sale a given product or a given customer. Example: Product: this product is deprecated, do not purchase more than 5. @@ -95,16 +71,15 @@ class sale_configuration(osv.osv_memory): This is mostly used when a user encodes his timesheet. The values are retrieved and the fields are auto-filled. But the possibility to change these values is still available. This installs the module analytic_user_function."""), - 'module_project_timesheet': fields.boolean("Project Timesheet"), - 'module_project_mrp': fields.boolean("Project MRP"), 'module_project': fields.boolean("Project"), + 'module_sale_stock': fields.boolean("Sale and Warehouse Management", + help="""Allows you to Make Quotation, Sale Order using different Order policy and Manage Related Stock. + This installs the module sale_stock."""), } def default_get(self, cr, uid, fields, context=None): ir_model_data = self.pool.get('ir.model.data') res = super(sale_configuration, self).default_get(cr, uid, fields, context) - # task_work, time_unit depend on other fields - res['task_work'] = res.get('module_project_mrp') and res.get('module_project_timesheet') if res.get('module_project'): user = self.pool.get('res.users').browse(cr, uid, uid, context) res['time_unit'] = user.company_id.project_time_mode_id.id @@ -113,31 +88,18 @@ class sale_configuration(osv.osv_memory): res['time_unit'] = product.uom_id.id return res - def get_default_sale_config(self, cr, uid, ids, context=None): - ir_values = self.pool.get('ir.values') - default_picking_policy = ir_values.get_default(cr, uid, 'sale.order', 'picking_policy') - return { - 'default_picking_policy': default_picking_policy == 'one', - } - def _get_default_time_unit(self, cr, uid, context=None): ids = self.pool.get('product.uom').search(cr, uid, [('name', '=', _('Hour'))], context=context) return ids and ids[0] or False _defaults = { - 'default_order_policy': 'manual', 'time_unit': _get_default_time_unit, } - def set_sale_defaults(self, cr, uid, ids, context=None): - ir_values = self.pool.get('ir.values') ir_model_data = self.pool.get('ir.model.data') wizard = self.browse(cr, uid, ids)[0] - default_picking_policy = 'one' if wizard.default_picking_policy else 'direct' - 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_consultant') product.write({'uom_id': wizard.time_unit.id, 'uom_po_id': wizard.time_unit.id}) @@ -145,14 +107,7 @@ class sale_configuration(osv.osv_memory): if wizard.module_project and wizard.time_unit: user = self.pool.get('res.users').browse(cr, uid, uid, context) user.company_id.write({'project_time_mode_id': wizard.time_unit.id}) - - return {} - - def onchange_invoice_methods(self, cr, uid, ids, group_invoice_so_lines, group_invoice_deli_orders, context=None): - if not group_invoice_deli_orders: - return {'value': {'default_order_policy': 'manual'}} - if not group_invoice_so_lines: - return {'value': {'default_order_policy': 'picking'}} + return {} def onchange_task_work(self, cr, uid, ids, task_work, context=None): @@ -167,8 +122,6 @@ class sale_configuration(osv.osv_memory): 'module_account_analytic_analysis': timesheet, }} - - class account_config_settings(osv.osv_memory): _inherit = 'account.config.settings' _columns = { diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml index e07fcccedb2..9ebbc36f8de 100644 --- a/addons/sale/res_config_view.xml +++ b/addons/sale/res_config_view.xml @@ -16,39 +16,21 @@