diff --git a/addons/account/data/account_data.xml b/addons/account/data/account_data.xml
index 949d03324f3..9d2e65a3a4c 100644
--- a/addons/account/data/account_data.xml
+++ b/addons/account/data/account_data.xml
@@ -30,7 +30,6 @@
diff --git a/addons/account_payment/__openerp__.py b/addons/account_payment/__openerp__.py
index 66d0201b2fe..4c3c8f045e3 100644
--- a/addons/account_payment/__openerp__.py
+++ b/addons/account_payment/__openerp__.py
@@ -53,7 +53,6 @@ have a new option to import payment orders as bank statement lines.
'account_payment_view.xml',
'account_payment_workflow.xml',
'account_payment_sequence.xml',
- 'account_invoice_view.xml',
'account_payment_report.xml',
],
'demo': ['account_payment_demo.xml'],
diff --git a/addons/account_payment/account_invoice.py b/addons/account_payment/account_invoice.py
index 7c8560fc9e8..bcce77a54ce 100644
--- a/addons/account_payment/account_invoice.py
+++ b/addons/account_payment/account_invoice.py
@@ -19,9 +19,8 @@
#
##############################################################################
-from datetime import datetime
from openerp.tools.translate import _
-from openerp.osv import fields, osv
+from openerp.osv import osv
class Invoice(osv.osv):
_inherit = 'account.invoice'
@@ -43,28 +42,6 @@ class Invoice(osv.osv):
raise osv.except_osv(_('Error!'), _("You cannot cancel an invoice which has already been imported in a payment order. Remove it from the following payment order : %s."%(payment_order_name)))
return super(Invoice, self).action_cancel(cr, uid, ids, context=context)
- def _amount_to_pay(self, cursor, user, ids, name, args, context=None):
- '''Return the amount still to pay regarding all the payment orders'''
- if not ids:
- return {}
- res = {}
- for invoice in self.browse(cursor, user, ids, context=context):
- res[invoice.id] = 0.0
- if invoice.move_id:
- for line in invoice.move_id.line_id:
- if not line.date_maturity or \
- datetime.strptime(line.date_maturity, '%Y-%m-%d') \
- < datetime.today():
- res[invoice.id] += line.amount_to_pay
- return res
-
- _columns = {
- 'amount_to_pay': fields.function(_amount_to_pay,
- type='float', string='Amount to be paid',
- help='The amount which should be paid at the current date\n' \
- 'minus the amount which is already in payment order'),
- }
-
Invoice()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_payment/account_invoice_view.xml b/addons/account_payment/account_invoice_view.xml
deleted file mode 100644
index ebb6bcbf965..00000000000
--- a/addons/account_payment/account_invoice_view.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
+ A password reset has been requested for this user. An email containing the following link has been sent:
+
+ An invitation email containing the following subscription link has been sent:
+
\n" +" Here you can track all the product receptions of purchase\n" +" orders where the invoicing is \"Based on Incoming " +"Shipments\",\n" +" and for which you have not received a supplier invoice yet.\n" +" You can generate a supplier invoice based on those " +"receptions.\n" +"
\n" +" " +msgstr "" + +#. module: purchase +#: view:purchase.report:0 +#: field:purchase.report,price_average:0 +msgid "Average Price" +msgstr "" + +#. module: purchase +#: view:purchase.order:0 +msgid "Purchase order which are in the exception state" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group +msgid "Merge Purchase orders" +msgstr "" + +#. module: purchase +#: view:purchase.report:0 +#: field:purchase.report,price_total:0 +msgid "Total Price" +msgstr "" + +#. module: purchase +#: view:purchase.order:0 +#: field:purchase.order,minimum_planned_date:0 +#: report:purchase.quotation:0 +#: field:purchase.report,expected_date:0 +msgid "Expected Date" +msgstr "" + +#. module: purchase +#: report:purchase.order:0 +msgid "Shipping address :" +msgstr "" + +#. module: purchase +#: view:purchase.order:0 +msgid "Confirm Order" +msgstr "" + +#. module: purchase +#: field:purchase.config.settings,module_warning:0 +msgid "Alerts by products or supplier" +msgstr "" + +#. module: purchase +#: field:purchase.order,name:0 +#: view:purchase.order.line:0 +#: field:purchase.order.line,order_id:0 +msgid "Order Reference" +msgstr "" + +#. module: purchase +#: view:purchase.config.settings:0 +msgid "Invoicing Process" +msgstr "" + +#. module: purchase +#: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0 +msgid "Approbation" +msgstr "" + +#. module: purchase +#: help:purchase.config.settings,group_uom:0 +msgid "" +"Allows you to select and maintain different units of measure for products." +msgstr "" + +#. module: purchase +#: help:purchase.order,minimum_planned_date:0 +msgid "" +"This is computed as the minimum scheduled date of all purchase order lines' " +"products." +msgstr "" + +#. module: purchase +#: code:addons/purchase/purchase.py:260 +#, python-format +msgid "In order to delete a purchase order, you must cancel it first." +msgstr "" + +#. module: purchase +#: view:product.product:0 +msgid "When you sell this product, OpenERP will trigger" +msgstr "" + +#. module: purchase +#: view:purchase.order:0 +msgid "Approved purchase orders" +msgstr "" + +#. module: purchase +#: model:email.template,subject:purchase.email_template_edi_purchase +msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })" +msgstr "" + +#. module: purchase +#: view:purchase.order:0 +msgid "Total Untaxed amount" +msgstr "" + +#. module: purchase +#: view:purchase.report:0 +#: field:purchase.report,category_id:0 +msgid "Category" +msgstr "" + +#. module: purchase +#: model:process.transition,note:purchase.process_transition_purchaseinvoice0 +msgid "" +"A purchase order generates a supplier invoice, as soon as it is confirmed by " +"the buyer. Depending on the Invoicing control of the purchase order, the " +"invoice is based on received or on ordered quantities." +msgstr "" + +#. module: purchase +#: view:purchase.order:0 +#: field:purchase.order,state:0 +#: view:purchase.order.line:0 +#: field:purchase.order.line,state:0 +#: view:purchase.report:0 +msgid "Status" +msgstr "" + +#. module: purchase +#: selection:purchase.report,month:0 +msgid "August" +msgstr "" + +#. module: purchase +#: view:product.product:0 +msgid "to" +msgstr "" + +#. module: purchase +#: selection:purchase.report,month:0 +msgid "June" +msgstr "" + +#. module: purchase +#: model:ir.model,name:purchase.model_purchase_report +msgid "Purchases Orders" +msgstr "" + +#. module: purchase +#: help:account.config.settings,group_analytic_account_for_purchases:0 +#: help:purchase.config.settings,group_analytic_account_for_purchases:0 +msgid "Allows you to specify an analytic account on purchase orders." +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,help:purchase.action_invoice_pending +msgid "" +"\n" +" Click to create a draft invoice.\n" +"
\n" +" Use this menu to control the invoices to be received from your\n" +" supplier. OpenERP generates draft invoices from your purchase\n" +" orders or receptions, according to your settings.\n" +"
\n" +" Once you receive a supplier invoice, you can match it with the\n" +" draft invoice and validate it.\n" +"
\n" +" " +msgstr "" + +#. module: purchase +#: selection:purchase.report,month:0 +msgid "October" +msgstr "" + +#. module: purchase +#: code:addons/purchase/purchase.py:1024 +#, python-format +msgid "" +"The product \"%s\" has been defined with your company as reseller which " +"seems to be a configuration error!" +msgstr "" + +#. module: purchase +#: view:product.product:0 +msgid "When you sell this service to a customer," +msgstr "" + +#. module: purchase +#: model:process.transition,note:purchase.process_transition_createpackinglist0 +msgid "A pick list is generated to track the incoming products." +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.purchase_rfq +#: model:ir.ui.menu,name:purchase.menu_purchase_rfq +#: view:purchase.order:0 +#: view:purchase.report:0 +msgid "Quotations" +msgstr "" + +#. module: purchase +#: view:purchase.order.line_invoice:0 +msgid "Do you want to generate the supplier invoices?" +msgstr "" + +#. module: purchase +#: field:purchase.order.line,product_qty:0 +#: view:purchase.report:0 +#: field:purchase.report,quantity:0 +msgid "Quantity" +msgstr "" + +#. module: purchase +#: field:purchase.order,fiscal_position:0 +msgid "Fiscal Position" +msgstr "" + +#. module: purchase +#: field:purchase.config.settings,default_invoice_method:0 +msgid "Default invoicing control method" +msgstr "" + +#. module: purchase +#: model:ir.model,name:purchase.model_stock_picking_in +#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4 +#: view:purchase.order:0 +msgid "Incoming Shipments" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,help:purchase.act_res_partner_2_supplier_invoices +msgid "" +"\n" +" Click here to record a supplier invoice.\n" +"
\n" +" Supplier invoices can be pre-generated based on " +"purchase\n" +" orders or receptions. This allows you to control " +"invoices\n" +" you receive from your supplier according to the draft\n" +" document in OpenERP.\n" +"
\n" +" " +msgstr "" + +#. module: purchase +#: view:purchase.order:0 +#: view:purchase.order.line:0 +msgid "Search Purchase Order" +msgstr "" + +#. module: purchase +#: report:purchase.order:0 +msgid "Date Req." +msgstr "" + +#. module: purchase +#: view:purchase.order:0 +#: view:purchase.order.line:0 +msgid "Purchase Order Lines" +msgstr "" + +#. module: purchase +#: help:purchase.order,dest_address_id:0 +msgid "" +"Put an address if you want to deliver directly from the supplier to the " +"customer. Otherwise, keep empty to deliver to your own company." +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2 +msgid "" +"\n" +" Here you can track all the lines of purchase orders where " +"the\n" +" invoicing is \"Based on Purchase Order Lines\", and for " +"which you\n" +" have not received a supplier invoice yet. You can generate " +"a\n" +" draft supplier invoice based on the lines from this list.\n" +"
\n" +" " +msgstr "" + +#. module: purchase +#: field:purchase.order.line,date_planned:0 +msgid "Scheduled Date" +msgstr "" + +#. module: purchase +#: field:purchase.order,currency_id:0 +msgid "Currency" +msgstr "" + +#. module: purchase +#: field:purchase.order,journal_id:0 +msgid "Journal" +msgstr "" + +#. module: purchase +#: view:board.board:0 +#: model:ir.actions.act_window,name:purchase.purchase_draft +msgid "Request for Quotations" +msgstr "" + +#. module: purchase +#: field:purchase.order.line,move_ids:0 +msgid "Reservation" +msgstr "" + +#. module: purchase +#: view:purchase.order:0 +msgid "Purchase orders that include lines not invoiced." +msgstr "" + +#. module: purchase +#: view:product.product:0 +#: field:product.template,purchase_ok:0 +msgid "Can be Purchased" +msgstr "" + +#. module: purchase +#: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move +msgid "Incoming Products" +msgstr "" + +#. module: purchase +#: view:purchase.order:0 +msgid "Request for Quotation " +msgstr "" + +#. module: purchase +#: help:purchase.order,partner_ref:0 +msgid "" +"Reference of the sales order or quotation sent by your supplier. It's mainly " +"used to do the matching when you receive the products as this reference is " +"usually written on the delivery order sent by your supplier." +msgstr "" + +#. module: purchase +#: view:purchase.config.settings:0 +#: view:purchase.order.group:0 +#: view:purchase.order.line_invoice:0 +msgid "or" +msgstr "" + +#. module: purchase +#: field:res.company,po_lead:0 +msgid "Purchase Lead Time" +msgstr "" + +#. module: purchase +#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0 +msgid "" +"The invoice is created automatically if the Invoice control of the purchase " +"order is 'On order'. The invoice can also be generated manually by the " +"accountant (Invoice control = Manual)." +msgstr "" + +#. module: purchase +#: model:mail.message.subtype,name:purchase.mt_rfq_approved +msgid "RFQ Approved" +msgstr "" + +#. module: purchase +#: view:purchase.config.settings:0 +msgid "Apply" +msgstr "" + +#. module: purchase +#: field:purchase.order,amount_untaxed:0 +msgid "Untaxed Amount" +msgstr "" + +#. module: purchase +#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 +msgid "" +"The buyer has to approve the RFQ before being sent to the supplier. The RFQ " +"becomes a confirmed Purchase Order." +msgstr "" + +#. module: purchase +#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed +msgid "RFQ Confirmed" +msgstr "" + +#. module: purchase +#: view:purchase.order:0 +msgid "Customer Address" +msgstr "" + +#. module: purchase +#: selection:purchase.order,state:0 +msgid "RFQ Sent" +msgstr "" + +#. module: purchase +#: view:purchase.order:0 +msgid "Not Invoiced" +msgstr "" + +#. module: purchase +#: view:purchase.order:0 +#: field:purchase.order,partner_id:0 +#: view:purchase.order.line:0 +#: view:purchase.report:0 +#: field:purchase.report,partner_id:0 +msgid "Supplier" +msgstr "" + +#. module: purchase +#: code:addons/purchase/purchase.py:525 +#, python-format +msgid "Define expense account for this company: \"%s\" (id:%d)." +msgstr "" + +#. module: purchase +#: model:process.transition,name:purchase.process_transition_packinginvoice0 +#: model:process.transition,name:purchase.process_transition_productrecept0 +msgid "From a Pick list" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph +#: view:purchase.report:0 +msgid "Monthly Purchase by Category" +msgstr "" + +#. module: purchase +#: field:purchase.order.line,price_subtotal:0 +msgid "Subtotal" +msgstr "" + +#. module: purchase +#: field:purchase.order,shipped:0 +msgid "Received" +msgstr "" + +#. module: purchase +#: view:purchase.order:0 +msgid "Purchase order which are in draft state" +msgstr "" + +#. module: purchase +#: view:product.product:0 +msgid "Suppliers" +msgstr "" + +#. module: purchase +#: view:product.product:0 +msgid "To Purchase" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,help:purchase.purchase_form_action +msgid "" +"\n" +" Click to create a quotation that will be converted into a " +"purchase order. \n" +"
\n" +" Use this menu to search within your purchase orders by\n" +" references, supplier, products, etc. For each purchase " +"order,\n" +" you can track the related discussion with the supplier, " +"control\n" +" the products received and control the supplier invoices.\n" +"
\n" +" " +msgstr "" + +#. module: purchase +#: view:purchase.order.line:0 +msgid "Invoices and Receptions" +msgstr "" + +#. module: purchase +#: model:process.transition,note:purchase.process_transition_packinginvoice0 +msgid "" +"A Pick list generates an invoice. Depending on the Invoicing control of the " +"sales order, the invoice is based on delivered or on ordered quantities." +msgstr "" + +#. module: purchase +#: view:purchase.report:0 +#: field:purchase.report,nbr:0 +msgid "# of Lines" +msgstr "" + +#. module: purchase +#: code:addons/purchase/wizard/purchase_line_invoice.py:106 +#, python-format +msgid "Define expense account for this product: \"%s\" (id:%d)." +msgstr "" + +#. module: purchase +#: view:purchase.order:0 +msgid "(update)" +msgstr "" + +#. module: purchase +#: view:purchase.order:0 +msgid "Calendar View" +msgstr "" + +#. module: purchase +#: help:purchase.order,shipped:0 +msgid "It indicates that a picking has been done" +msgstr "" + +#. module: purchase +#: code:addons/purchase/purchase.py:579 +#: code:addons/purchase/purchase.py:586 +#, python-format +msgid "Unable to cancel this purchase order." +msgstr "" + +#. module: purchase +#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice +msgid "Invoice Control" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po +msgid "" +"Reception Analysis allows you to easily check and analyse your company order " +"receptions and the performance of your supplier's deliveries." +msgstr "" + +#. module: purchase +#: view:purchase.order:0 +msgid "Print" +msgstr "" + +#. module: purchase +#: field:purchase.order,order_line:0 +msgid "Order Lines" +msgstr "" + +#. module: purchase +#: help:purchase.order,name:0 +msgid "" +"Unique number of the purchase order, computed automatically when the " +"purchase order is created." +msgstr "" + +#. module: purchase +#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase +#: model:ir.ui.menu,name:purchase.menu_purchase_config_pricelist +msgid "Pricelists" +msgstr "" + +#. module: purchase +#: model:product.pricelist.type,name:purchase.pricelist_type_purchase +#: field:res.partner,property_product_pricelist_purchase:0 +msgid "Purchase Pricelist" +msgstr "" + +#. module: purchase +#: report:purchase.order:0 +msgid "Total :" +msgstr "" + +#. module: purchase +#: field:purchase.order,pricelist_id:0 +#: field:purchase.report,pricelist_id:0 +msgid "Pricelist" +msgstr "" + +#. module: purchase +#: selection:purchase.order,state:0 +msgid "Draft PO" +msgstr "" + +#. module: purchase +#: code:addons/purchase/purchase.py:941 +#: code:addons/purchase/purchase.py:956 +#: code:addons/purchase/purchase.py:960 +#: code:addons/purchase/wizard/purchase_order_group.py:47 +#, python-format +msgid "Warning!" +msgstr "" + +#. module: purchase +#: model:process.node,name:purchase.process_node_draftpurchaseorder0 +#: model:process.node,name:purchase.process_node_draftpurchaseorder1 +msgid "RFQ" +msgstr "" + +#. module: purchase +#: report:purchase.order:0 +#: view:purchase.order:0 +#: field:purchase.order,date_order:0 +#: field:purchase.order.line,date_order:0 +#: field:purchase.report,date:0 +msgid "Order Date" +msgstr "" + +#. module: purchase +#: field:purchase.config.settings,group_uom:0 +msgid "Manage different units of measure for products" +msgstr "" + +#. module: purchase +#: model:process.node,name:purchase.process_node_invoiceafterpacking0 +#: model:process.node,name:purchase.process_node_invoicecontrol0 +msgid "Draft Invoice" +msgstr "" + +#. module: purchase +#: help:purchase.order,amount_tax:0 +msgid "The tax amount" +msgstr "" + +#. module: purchase +#: field:purchase.order,shipped_rate:0 +msgid "Received Ratio" +msgstr "" + +#. module: purchase +#: selection:purchase.report,month:0 +msgid "September" +msgstr "" + +#. module: purchase +#: selection:purchase.report,state:0 +msgid "Waiting Supplier Ack" +msgstr "" + +#. module: purchase +#: report:purchase.quotation:0 +msgid "Request for Quotation :" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice +#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4_picking_to_invoice +msgid "On Incoming Shipments" +msgstr "" + +#. module: purchase +#: report:purchase.order:0 +msgid "Taxes :" +msgstr "" + +#. module: purchase +#: view:purchase.order.line:0 +msgid "Stock Moves" +msgstr "" + +#. module: purchase +#: code:addons/purchase/purchase.py:1156 +#, python-format +msgid "Draft Purchase Order created" +msgstr "" + +#. module: purchase +#: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase +msgid "Product Categories" +msgstr "" + +#. module: purchase +#: help:purchase.order,invoiced:0 +msgid "It indicates that an invoice has been paid" +msgstr "" + +#. module: purchase +#: field:purchase.order,notes:0 +msgid "Terms and Conditions" +msgstr "" + +#. module: purchase +#: help:purchase.order,date_order:0 +msgid "Date on which this document has been created." +msgstr "" + +#. module: purchase +#: field:purchase.order,message_is_follower:0 +msgid "Is a Follower" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph +#: view:purchase.report:0 +msgid "Total Qty and Amount by month" +msgstr "" + +#. module: purchase +#: view:purchase.report:0 +msgid "Extended Filters..." +msgstr "" + +#. module: purchase +#: code:addons/purchase/wizard/purchase_order_group.py:48 +#, python-format +msgid "Please select multiple order to merge in the list view." +msgstr "" + +#. module: purchase +#: view:purchase.order:0 +msgid "Exception" +msgstr "" + +#. module: purchase +#: model:ir.ui.menu,name:purchase.menu_purchase_partner_cat +msgid "Address Book" +msgstr "" + +#. module: purchase +#: model:ir.model,name:purchase.model_res_company +msgid "Companies" +msgstr "" + +#. module: purchase +#: view:purchase.order.group:0 +msgid "Are you sure you want to merge these orders?" +msgstr "" + +#. module: purchase +#: field:account.config.settings,module_purchase_analytic_plans:0 +msgid "Use multiple analytic accounts on orders" +msgstr "" + +#. module: purchase +#: view:product.product:0 +msgid "will be created in order to subcontract the job" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree +#: model:ir.actions.act_window,name:purchase.open_board_purchase +#: model:ir.ui.menu,name:purchase.menu_board_purchase +#: model:ir.ui.menu,name:purchase.menu_purchase_config +#: view:res.partner:0 +msgid "Purchases" +msgstr "" + +#. module: purchase +#: view:purchase.report:0 +#: field:purchase.report,delay:0 +msgid "Days to Validate" +msgstr "" + +#. module: purchase +#: view:purchase.config.settings:0 +msgid "Supplier Features" +msgstr "" + +#. module: purchase +#: report:purchase.order:0 +#: report:purchase.quotation:0 +msgid "Qty" +msgstr "" + +#. module: purchase +#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0 +#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0 +#: view:purchase.config.settings:0 +#: view:purchase.order.group:0 +#: view:purchase.order.line_invoice:0 +msgid "Cancel" +msgstr "" + +#. module: purchase +#: sql_constraint:purchase.order:0 +msgid "Order Reference must be unique per Company!" +msgstr "" + +#. module: purchase +#: model:process.transition,name:purchase.process_transition_purchaseinvoice0 +msgid "From a purchase order" +msgstr "" + +#. module: purchase +#: model:ir.actions.report.xml,name:purchase.report_purchase_quotation +#: selection:purchase.report,state:0 +msgid "Request for Quotation" +msgstr "" + +#. module: purchase +#: view:purchase.report:0 +msgid "Order of Month" +msgstr "" + +#. module: purchase +#: report:purchase.order:0 +#: field:purchase.order.line,price_unit:0 +msgid "Unit Price" +msgstr "" + +#. module: purchase +#: field:purchase.order,date_approve:0 +#: field:purchase.report,date_approve:0 +msgid "Date Approved" +msgstr "" + +#. module: purchase +#: view:product.product:0 +msgid "a draft purchase order" +msgstr "" + +#. module: purchase +#: model:email.template,body_html:purchase.email_template_edi_purchase +msgid "" +"\n" +"Hello$ ${object.partner_id.name},
\n" +" \n" +"Here is a ${object.state in ('draft', 'sent') and 'request for " +"quotation' or 'purchase 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.partner_ref:\n"
+" Your reference: ${object.partner_ref}
\n"
+" % endif\n"
+" % if object.validator:\n"
+" Your contact: ${object.validator.name}\n"
+" % endif\n"
+"
If you have any question, do not hesitate to contact us.
\n" +"Thank you!
\n" +"\n" +" Click to add a pricelist version.\n" +"
\n" +" There can be more than one version of a pricelist, each of\n" +" these must be valid during a certain period of time. Some\n" +" examples of versions: Main Prices, 2010, 2011, Summer " +"Sales,\n" +" etc.\n" +"
\n" +" " +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice +msgid "Create invoices" +msgstr "" + +#. module: purchase +#: model:ir.model,name:purchase.model_purchase_order_line_invoice +msgid "Purchase Order Line Make Invoice" +msgstr "" + +#. module: purchase +#: code:addons/purchase/purchase.py:1141 +#, python-format +msgid "PO: %s" +msgstr "" + +#. module: purchase +#: view:purchase.order:0 +msgid "Send by EMail" +msgstr "" + +#. module: purchase +#: code:addons/purchase/purchase.py:515 +#, python-format +msgid "Define purchase journal for this company: \"%s\" (id:%d)." +msgstr "" + +#. module: purchase +#: view:purchase.order:0 +msgid "Purchase Order " +msgstr "" + +#. module: purchase +#: help:purchase.config.settings,group_costing_method:0 +msgid "Allows you to compute product cost price based on average cost." +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_purchase_configuration +#: view:purchase.config.settings:0 +msgid "Configure Purchases" +msgstr "" + +#. module: purchase +#: view:purchase.order:0 +msgid "Untaxed" +msgstr "" + +#. module: purchase +#: model:process.transition,name:purchase.process_transition_createpackinglist0 +msgid "Pick list generated" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2 +#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft +msgid "On Purchase Order Lines" +msgstr "" + +#. module: purchase +#: report:purchase.quotation:0 +msgid "TVA:" +msgstr "" + +#. module: purchase +#: help:purchase.order,picking_ids:0 +msgid "" +"This is the list of incoming shipments that have been generated for this " +"purchase order." +msgstr "" + +#. module: purchase +#: field:purchase.config.settings,module_purchase_double_validation:0 +msgid "Force two levels of approvals" +msgstr "" + +#. module: purchase +#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type +msgid "Price Types" +msgstr "" + +#. module: purchase +#: help:purchase.order,date_approve:0 +msgid "Date on which purchase order has been approved" +msgstr "" + +#. module: purchase +#: model:process.node,name:purchase.process_node_approvepurchaseorder0 +#: view:purchase.order:0 +#: selection:purchase.report,state:0 +msgid "Approved" +msgstr "" + +#. module: purchase +#: selection:purchase.order,state:0 +#: selection:purchase.order.line,state:0 +#: selection:purchase.report,state:0 +msgid "Done" +msgstr "" + +#. module: purchase +#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0 +#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0 +msgid "Invoice" +msgstr "" + +#. module: purchase +#: model:process.node,note:purchase.process_node_purchaseorder0 +msgid "Confirmed purchase order to invoice" +msgstr "" + +#. module: purchase +#: model:process.node,note:purchase.process_node_productrecept0 +msgid "Incoming products to control" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,help:purchase.purchase_rfq +msgid "" +"\n" +" Click to create a request for quotation.\n" +"
\n" +" The quotation contains the history of the " +"discussion/negociation\n" +" you had with your supplier. Once confirmed, a request for\n" +" quotation is converted into a purchase order.\n" +"
\n" +" Most propositions of purchase orders are created " +"automatically\n" +" by OpenERP based on inventory needs.\n" +"
\n" +" " +msgstr "" + +#. module: purchase +#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0 +msgid "The supplier approves the Purchase Order." +msgstr "" + +#. module: purchase +#: code:addons/purchase/wizard/purchase_order_group.py:80 +#: model:ir.actions.act_window,name:purchase.purchase_form_action +#: model:ir.ui.menu,name:purchase.menu_purchase_form_action +#: view:purchase.order:0 +#: view:purchase.report:0 +#: view:res.partner:0 +#, python-format +msgid "Purchase Orders" +msgstr "" + +#. module: purchase +#: field:purchase.order,origin:0 +msgid "Source Document" +msgstr "" + +#. module: purchase +#: view:purchase.order.group:0 +msgid "Merge orders" +msgstr "" + +#. module: purchase +#: field:purchase.config.settings,module_purchase_analytic_plans:0 +msgid "Use multiple analytic accounts on purchase orders" +msgstr "" + +#. module: purchase +#: model:ir.ui.menu,name:purchase.menu_procurement_management +#: model:process.process,name:purchase.process_process_purchaseprocess0 +msgid "Purchase" +msgstr "" + +#. module: purchase +#: field:purchase.order,create_uid:0 +#: view:purchase.report:0 +#: field:purchase.report,user_id:0 +msgid "Responsible" +msgstr "" + +#. module: purchase +#: view:purchase.order:0 +msgid "Manually Corrected" +msgstr "" + +#. module: purchase +#: field:purchase.config.settings,group_costing_method:0 +msgid "Compute product cost price based on average cost" +msgstr "" + +#. module: purchase +#: code:addons/purchase/purchase.py:350 +#: code:addons/purchase/wizard/purchase_line_invoice.py:137 +#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices +#: view:res.partner:0 +#, python-format +msgid "Supplier Invoices" +msgstr "" + +#. module: purchase +#: field:purchase.order,product_id:0 +#: view:purchase.order.line:0 +#: field:purchase.order.line,product_id:0 +#: view:purchase.report:0 +#: field:purchase.report,product_id:0 +msgid "Product" +msgstr "" + +#. module: purchase +#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0 +#: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1 +msgid "Confirmation" +msgstr "" + +#. module: purchase +#: report:purchase.order:0 +msgid "TIN :" +msgstr "" + +#. module: purchase +#: model:ir.ui.menu,name:purchase.menu_product_by_category_purchase_form +msgid "Products by Category" +msgstr "" + +#. module: purchase +#: help:purchase.order.line,state:0 +msgid "" +" * The 'Draft' status is set automatically when purchase order in draft " +"status. \n" +"* The 'Confirmed' status is set automatically as confirm when purchase order " +"in confirm status. \n" +"* The 'Done' status is set automatically when purchase order is set as done. " +" \n" +"* The 'Cancelled' status is set automatically when user cancel purchase " +"order." +msgstr "" + +#. module: purchase +#: field:purchase.order,invoiced:0 +msgid "Invoice Received" +msgstr "" + +#. module: purchase +#: field:purchase.order,invoice_method:0 +msgid "Invoicing Control" +msgstr "" + +#. module: purchase +#: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0 +msgid "Approve" +msgstr "" + +#. module: purchase +#: view:purchase.report:0 +msgid "Reference UOM" +msgstr "" + +#. module: purchase +#: selection:purchase.report,month:0 +msgid "May" +msgstr "" + +#. module: purchase +#: model:res.groups,name:purchase.group_purchase_manager +msgid "Manager" +msgstr "" + +#. module: purchase +#: selection:purchase.order,invoice_method:0 +msgid "Based on Purchase Order lines" +msgstr "" + +#. module: purchase +#: field:purchase.order,amount_total:0 +msgid "Total" +msgstr "" + +#. module: purchase +#: help:account.config.settings,module_purchase_analytic_plans:0 +#: help:purchase.config.settings,module_purchase_analytic_plans:0 +msgid "" +"Allows the user to maintain several analysis plans. These let you split " +"lines on a purchase order between several accounts and analytic plans.\n" +" This installs the module purchase_analytic_plans." +msgstr "" + +#. module: purchase +#: field:purchase.order,location_id:0 +#: view:purchase.report:0 +#: field:purchase.report,location_id:0 +msgid "Destination" +msgstr "" + +#. module: purchase +#: field:purchase.order,dest_address_id:0 +msgid "Customer Address (Direct Delivery)" +msgstr "" + +#. module: purchase +#: model:ir.actions.client,name:purchase.action_client_purchase_menu +msgid "Open Purchase Menu" +msgstr "" + +#. module: purchase +#: code:addons/purchase/purchase.py:1028 +#, python-format +msgid "No address defined for the supplier" +msgstr "" + +#. module: purchase +#: field:purchase.order,company_id:0 +#: field:purchase.order.line,company_id:0 +#: view:purchase.report:0 +#: field:purchase.report,company_id:0 +msgid "Company" +msgstr "" + +#. module: purchase +#: selection:purchase.order,state:0 +#: selection:purchase.report,state:0 +msgid "Invoice Exception" +msgstr "" + +#. module: purchase +#: help:res.partner,property_product_pricelist_purchase:0 +msgid "" +"This pricelist will be used, instead of the default one, for purchases from " +"the current partner" +msgstr "" + +#. module: purchase +#: report:purchase.order:0 +msgid "Fax :" +msgstr "" + +#. module: purchase +#: model:ir.model,name:purchase.model_stock_partial_picking +msgid "Partial Picking Processing Wizard" +msgstr "" + +#. module: purchase +#: model:product.pricelist.version,name:purchase.ver0 +msgid "Default Purchase Pricelist Version" +msgstr "" + +#. module: purchase +#: selection:purchase.order,invoice_method:0 +msgid "Based on generated draft invoice" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po +#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po +msgid "Receptions Analysis" +msgstr "" + +#. module: purchase +#: field:purchase.order,message_ids:0 +msgid "Messages" +msgstr "" + +#. module: purchase +#: model:ir.actions.report.xml,name:purchase.report_purchase_order +#: model:ir.model,name:purchase.model_purchase_order +#: model:process.node,name:purchase.process_node_purchaseorder0 +#: field:procurement.order,purchase_id:0 +#: view:purchase.config.settings:0 +#: view:purchase.order:0 +#: selection:purchase.order,state:0 +#: field:res.partner,purchase_order_ids:0 +#: model:res.request.link,name:purchase.req_link_purchase_order +#: field:stock.picking,purchase_id:0 +#: field:stock.picking.in,purchase_id:0 +msgid "Purchase Order" +msgstr "" + +#. module: purchase +#: code:addons/purchase/purchase.py:320 +#: code:addons/purchase/purchase.py:456 +#: code:addons/purchase/purchase.py:514 +#: code:addons/purchase/purchase.py:525 +#: code:addons/purchase/wizard/purchase_line_invoice.py:105 +#, python-format +msgid "Error!" +msgstr "" + +#. module: purchase +#: report:purchase.order:0 +msgid "Net Total :" +msgstr "" + +#. module: purchase +#: help:purchase.order,state:0 +msgid "" +"The status of the purchase order or the quotation request. A quotation is a " +"purchase order in a 'Draft' status. Then the order has to be confirmed by " +"the user, the status switch to 'Confirmed'. Then the supplier must confirm " +"the order to change the status to 'Approved'. When the purchase order is " +"paid and received, the status becomes 'Done'. If a cancel action occurs in " +"the invoice or in the reception of goods, the status becomes in exception." +msgstr "" + +#. module: purchase +#: selection:purchase.order,state:0 +#: selection:purchase.order.line,state:0 +#: selection:purchase.report,state:0 +msgid "Cancelled" +msgstr "" + +#. module: purchase +#: field:res.partner,purchase_order_count:0 +msgid "# of Purchase Order" +msgstr "" + +#. module: purchase +#: model:ir.model,name:purchase.model_mail_compose_message +msgid "Email composition wizard" +msgstr "" + +#. module: purchase +#: report:purchase.quotation:0 +msgid "Tel.:" +msgstr "" + +#. module: purchase +#: view:purchase.order:0 +msgid "Resend Purchase Order" +msgstr "" + +#. module: purchase +#: report:purchase.order:0 +msgid "Net Price" +msgstr "" + +#. module: purchase +#: model:ir.model,name:purchase.model_purchase_order_line +#: view:purchase.order.line:0 +#: field:stock.move,purchase_line_id:0 +msgid "Purchase Order Line" +msgstr "" + +#. module: purchase +#: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0 +#: view:purchase.order.line_invoice:0 +msgid "Confirm" +msgstr "" + +#. module: purchase +#: selection:purchase.config.settings,default_invoice_method:0 +msgid "Based on receptions" +msgstr "" + +#. module: purchase +#: field:purchase.order,partner_ref:0 +msgid "Supplier Reference" +msgstr "" + +#. module: purchase +#: model:process.transition,note:purchase.process_transition_productrecept0 +msgid "" +"A Pick list generates a supplier invoice. Depending on the Invoicing control " +"of the purchase order, the invoice is based on received or on ordered " +"quantities." +msgstr "" + +#. module: purchase +#: field:purchase.order,message_follower_ids:0 +msgid "Followers" +msgstr "" + +#. module: purchase +#: help:purchase.config.settings,module_purchase_requisition:0 +msgid "" +"Purchase Requisitions are used when you want to request quotations from " +"several suppliers for a given set of products.\n" +" You can configure per product if you directly do a Request for " +"Quotation\n" +" to one supplier or if you want a purchase requisition to " +"negotiate with several suppliers." +msgstr "" + +#. module: purchase +#: field:purchase.order.line,invoice_lines:0 +msgid "Invoice Lines" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all +msgid "" +"Purchase Analysis allows you to easily check and analyse your company " +"purchase history and performance. From this menu you can track your " +"negotiation performance, the delivery performance of your suppliers, etc." +msgstr "" + +#. module: purchase +#: model:email.template,report_name:purchase.email_template_edi_purchase +msgid "RFQ_${(object.name or '').replace('/','_')}" +msgstr "" + +#. module: purchase +#: code:addons/purchase/purchase.py:956 +#, python-format +msgid "The selected supplier only sells this product by %s" +msgstr "" + +#. module: purchase +#: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0 +msgid "Create invoice" +msgstr "" + +#. module: purchase +#: field:purchase.order.line,move_dest_id:0 +msgid "Reservation Destination" +msgstr "" + +#. module: purchase +#: model:ir.ui.menu,name:purchase.menu_purchase_config_purchase +msgid "Configuration" +msgstr "" + +#. module: purchase +#: help:purchase.config.settings,module_purchase_double_validation:0 +msgid "" +"Provide a double validation mechanism for purchases exceeding minimum " +"amount.\n" +" This installs the module purchase_double_validation." +msgstr "" + +#. module: purchase +#: code:addons/purchase/edi/purchase_order.py:132 +#, python-format +msgid "EDI Pricelist (%s)" +msgstr "" + +#. module: purchase +#: view:purchase.report:0 +#: field:purchase.report,product_uom:0 +msgid "Reference Unit of Measure" +msgstr "" + +#. module: purchase +#: model:process.node,note:purchase.process_node_packinginvoice0 +msgid "Outgoing products to invoice" +msgstr "" + +#. module: purchase +#: report:purchase.order:0 +#: field:purchase.report,validator:0 +msgid "Validated By" +msgstr "" + +#. module: purchase +#: view:purchase.report:0 +#: field:purchase.report,delay_pass:0 +msgid "Days to Deliver" +msgstr "" + +#. module: purchase +#: selection:purchase.report,month:0 +msgid "April" +msgstr "" + +#. module: purchase +#: view:purchase.order:0 +#: field:purchase.order,invoice_ids:0 +msgid "Invoices" +msgstr "" + +#. module: purchase +#: selection:purchase.report,month:0 +msgid "December" +msgstr "" + +#. module: purchase +#: view:purchase.report:0 +msgid "Total Orders Lines by User per month" +msgstr "" + +#. module: purchase +#: help:purchase.order,amount_untaxed:0 +msgid "The amount without tax" +msgstr "" + +#. module: purchase +#: model:process.node,note:purchase.process_node_packinglist0 +msgid "List of ordered products." +msgstr "" + +#. module: purchase +#: view:purchase.order:0 +msgid "Incoming Shipments & Invoices" +msgstr "" + +#. module: purchase +#: selection:purchase.order,state:0 +msgid "Waiting Approval" +msgstr "" + +#. module: purchase +#: help:purchase.order,amount_total:0 +msgid "The total amount" +msgstr "" + +#. module: purchase +#: field:purchase.order,invoiced_rate:0 +#: field:purchase.order.line,invoiced:0 +msgid "Invoiced" +msgstr "" + +#. module: purchase +#: model:process.node,name:purchase.process_node_confirmpurchaseorder0 +#: selection:purchase.order.line,state:0 +msgid "Confirmed" +msgstr "" + +#. module: purchase +#: selection:purchase.order.line,state:0 +msgid "Draft" +msgstr "" + +#. module: purchase +#: model:ir.model,name:purchase.model_purchase_order_group +msgid "Purchase Order Merge" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_email_templates +msgid "Email Templates" +msgstr "" + +#. module: purchase +#: model:res.groups,name:purchase.group_purchase_user +msgid "User" +msgstr "" + +#. module: purchase +#: selection:purchase.report,month:0 +msgid "November" +msgstr "" + +#. module: purchase +#: view:purchase.order.line:0 +msgid "Manual Invoices" +msgstr "" + +#. module: purchase +#: report:purchase.order:0 +msgid "Our Order Reference" +msgstr "" + +#. module: purchase +#: selection:purchase.report,month:0 +msgid "January" +msgstr "" + +#. module: purchase +#: help:purchase.order,invoice_method:0 +msgid "" +"Based on Purchase Order lines: place individual lines in 'Invoice Control > " +"Based on P.O. lines' from where you can selectively create an invoice.\n" +"Based on generated invoice: create a draft invoice you can validate later.\n" +"Bases on incoming shipments: let you create an invoice when receptions are " +"validated." +msgstr "" + +#. module: purchase +#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form +msgid "Partner Categories" +msgstr "" + +#. module: purchase +#: field:purchase.report,state:0 +msgid "Order Status" +msgstr "" + +#. module: purchase +#: report:purchase.order:0 +msgid "Request for Quotation N°" +msgstr "" + +#. module: purchase +#: view:purchase.config.settings:0 +msgid "Invoicing Settings" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all +msgid "Total Orders by User per month" +msgstr "" + +#. module: purchase +#: selection:purchase.order,invoice_method:0 +msgid "Based on incoming shipments" +msgstr "" + +#. module: purchase +#: code:addons/purchase/purchase.py:1018 +#, python-format +msgid "No default supplier defined for this product" +msgstr "" + +#. module: purchase +#: view:purchase.report:0 +#: field:purchase.report,warehouse_id:0 +msgid "Warehouse" +msgstr "" + +#. module: purchase +#: code:addons/purchase/purchase.py:960 +#, python-format +msgid "" +"The selected supplier has a minimal quantity set to %s %s, you should not " +"purchase less." +msgstr "" + +#. module: purchase +#: report:purchase.order:0 +#: field:purchase.order.line,name:0 +#: report:purchase.quotation:0 +msgid "Description" +msgstr "" + +#. module: purchase +#: report:purchase.quotation:0 +msgid "Expected Delivery address:" +msgstr "" + +#. module: purchase +#: selection:purchase.report,month:0 +msgid "February" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_invoice_pending +#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice +msgid "On Draft Invoices" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all +#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all +msgid "Purchase Analysis" +msgstr "" + +#. module: purchase +#: report:purchase.order:0 +msgid "Your Order Reference" +msgstr "" + +#. module: purchase +#: report:purchase.order:0 +msgid "Purchase Order Confirmation N°" +msgstr "" + +#. module: purchase +#: view:purchase.order:0 +msgid "Total amount" +msgstr "" + +#. module: purchase +#: model:ir.model,name:purchase.model_product_template +msgid "Product Template" +msgstr "" + +#. module: purchase +#: view:purchase.order.group:0 +msgid "" +" Please note that: \n" +" \n" +" Orders will only be merged if: \n" +" * Purchase Orders are in draft \n" +" * Purchase Orders belong to the same supplier \n" +" * Purchase Orders are have same stock location, same pricelist \n" +" \n" +" Lines will only be merged if: \n" +" * Order lines are exactly the same except for the product,quantity and unit " +"\n" +" " +msgstr "" + +#. module: purchase +#: field:purchase.order,message_summary:0 +msgid "Summary" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,name:purchase.purchase_pricelist_version_action +#: model:ir.ui.menu,name:purchase.menu_purchase_pricelist_version_action +msgid "Pricelist Versions" +msgstr "" + +#. module: purchase +#: field:purchase.order,payment_term_id:0 +msgid "Payment Term" +msgstr "" + +#. module: purchase +#: view:purchase.order:0 +msgid "Purchase orders which are in draft state" +msgstr "" + +#. module: purchase +#: view:purchase.report:0 +#: field:purchase.report,name:0 +msgid "Year" +msgstr "" + +#. module: purchase +#: selection:purchase.config.settings,default_invoice_method:0 +msgid "Based on purchase order lines" +msgstr "" + +#. module: purchase +#: model:ir.actions.act_window,help:purchase.act_res_partner_2_purchase_order +msgid "" +"\n" +" This supplier has no purchase order. Click to create a " +"new RfQ.\n" +"
\n" +" The request for quotation is the first step of the " +"purchases flow. Once\n" +" converted into a purchase order, you will be able to " +"control the reception\n" +" of the products and the supplier invoice.\n" +"
\n" +" " +msgstr "" + +#. module: purchase +#: view:purchase.report:0 +msgid "Orders" +msgstr "" diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 09ee8d5e3fd..bf9e9484b9f 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -729,7 +729,7 @@ class sale_order_line(osv.osv): 'salesman_id':fields.related('order_id', 'user_id', type='many2one', relation='res.users', store=True, string='Salesperson'), 'company_id': fields.related('order_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True), } - _order = 'order_id desc, sequence' + _order = 'order_id desc, sequence, id' _defaults = { 'product_uom' : _get_uom_id, 'discount': 0.0, diff --git a/addons/sale_analytic_plans/i18n/es_CO.po b/addons/sale_analytic_plans/i18n/es_CO.po new file mode 100644 index 00000000000..e10a4c9df00 --- /dev/null +++ b/addons/sale_analytic_plans/i18n/es_CO.po @@ -0,0 +1,33 @@ +# Spanish (Colombia) translation for openobject-addons +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR