|
- Fiscal Mapping Remark :
+ Fiscal Position:
|
[[ (o.fiscal_position.note and format(o.fiscal_position and o.fiscal_position.note)) or removeParentNode('blockTable') ]]
diff --git a/addons/account/report/account_report.py b/addons/account/report/account_report.py
index 1136300f065..dd8e0a2ce4e 100644
--- a/addons/account/report/account_report.py
+++ b/addons/account/report/account_report.py
@@ -165,7 +165,7 @@ class report_invoice_created(osv.osv):
'amount_untaxed': fields.float('Untaxed', readonly=True),
'amount_total': fields.float('Total', readonly=True),
'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
- 'date_invoice': fields.date('Date Invoiced', readonly=True),
+ 'date_invoice': fields.date('Invoice Date', readonly=True),
'date_due': fields.date('Due Date', readonly=True),
'residual': fields.float('Residual', readonly=True),
'state': fields.selection([
diff --git a/addons/account/report/account_tax_report.py b/addons/account/report/account_tax_report.py
index d9bcabf0ce4..b03aea5c05d 100644
--- a/addons/account/report/account_tax_report.py
+++ b/addons/account/report/account_tax_report.py
@@ -26,195 +26,195 @@ import rml_parse
from report import report_sxw
class tax_report(rml_parse.rml_parse):
- _name = 'report.account.vat.declaration'
- def __init__(self, cr, uid, name, context={}):
- super(tax_report, self).__init__(cr, uid, name, context=context)
- self.localcontext.update({
- 'time': time,
- 'get_period': self._get_period,
- 'get_codes': self._get_codes,
- 'get_general': self._get_general,
- 'get_company': self._get_company,
- 'get_currency': self._get_currency,
- 'get_lines': self._get_lines,
- })
+ _name = 'report.account.vat.declaration'
+ def __init__(self, cr, uid, name, context={}):
+ super(tax_report, self).__init__(cr, uid, name, context=context)
+ self.localcontext.update({
+ 'time': time,
+ 'get_period': self._get_period,
+ 'get_codes': self._get_codes,
+ 'get_general': self._get_general,
+ 'get_company': self._get_company,
+ 'get_currency': self._get_currency,
+ 'get_lines': self._get_lines,
+ })
- def _get_lines(self, based_on, period_list, company_id=False, parent=False, level=0, context={}):
- res = self._get_codes(based_on, company_id, parent, level, period_list, context=context)
+ def _get_lines(self, based_on, period_list, company_id=False, parent=False, level=0, context={}):
+ res = self._get_codes(based_on, company_id, parent, level, period_list, context=context)
- if period_list:
- res = self._add_codes(based_on, res, period_list, context=context)
- else:
- self.cr.execute ("select id from account_fiscalyear")
- fy = self.cr.fetchall()
- self.cr.execute ("select id from account_period where fiscalyear_id = %s",(fy[0][0],))
- periods = self.cr.fetchall()
- for p in periods:
- period_list.append(p[0])
- res = self._add_codes(based_on, res, period_list, context=context)
+ if period_list:
+ res = self._add_codes(based_on, res, period_list, context=context)
+ else:
+ self.cr.execute ("select id from account_fiscalyear")
+ fy = self.cr.fetchall()
+ self.cr.execute ("select id from account_period where fiscalyear_id = %s",(fy[0][0],))
+ periods = self.cr.fetchall()
+ for p in periods:
+ period_list.append(p[0])
+ res = self._add_codes(based_on, res, period_list, context=context)
- i = 0
- top_result = []
- while i < len(res):
+ i = 0
+ top_result = []
+ while i < len(res):
- res_dict = { 'code': res[i][1].code,
- 'name': res[i][1].name,
- 'debit': 0,
- 'credit': 0,
- 'tax_amount': res[i][1].sum_period,
- 'type': 1,
- 'level': res[i][0],
- 'pos': 0
- }
+ res_dict = { 'code': res[i][1].code,
+ 'name': res[i][1].name,
+ 'debit': 0,
+ 'credit': 0,
+ 'tax_amount': res[i][1].sum_period,
+ 'type': 1,
+ 'level': res[i][0],
+ 'pos': 0
+ }
- top_result.append(res_dict)
- res_general = self._get_general(res[i][1].id, period_list, company_id, based_on, context=context)
- ind_general = 0
- while ind_general < len(res_general):
- res_general[ind_general]['type'] = 2
- res_general[ind_general]['pos'] = 0
- res_general[ind_general]['level'] = res_dict['level']
- top_result.append(res_general[ind_general])
- ind_general+=1
- i+=1
- return top_result
- #return array_result
+ top_result.append(res_dict)
+ res_general = self._get_general(res[i][1].id, period_list, company_id, based_on, context=context)
+ ind_general = 0
+ while ind_general < len(res_general):
+ res_general[ind_general]['type'] = 2
+ res_general[ind_general]['pos'] = 0
+ res_general[ind_general]['level'] = res_dict['level']
+ top_result.append(res_general[ind_general])
+ ind_general+=1
+ i+=1
+ return top_result
+ #return array_result
- def _get_period(self, period_id, context={}):
- return self.pool.get('account.period').browse(self.cr, self.uid, period_id, context=context).name
+ def _get_period(self, period_id, context={}):
+ return self.pool.get('account.period').browse(self.cr, self.uid, period_id, context=context).name
- def _get_general(self, tax_code_id, period_list,company_id, based_on, context={}):
- res=[]
- obj_account = self.pool.get('account.account')
- periods_ids = tuple(period_list)
- if based_on == 'payments':
- self.cr.execute('SELECT SUM(line.tax_amount) AS tax_amount, \
- SUM(line.debit) AS debit, \
- SUM(line.credit) AS credit, \
- COUNT(*) AS count, \
- account.id AS account_id, \
- account.name AS name, \
- account.code AS code \
- FROM account_move_line AS line, \
- account_account AS account, \
- account_move AS move \
- LEFT JOIN account_invoice invoice ON \
- (invoice.move_id = move.id) \
- WHERE line.state<>%s \
- AND line.tax_code_id = %s \
- AND line.account_id = account.id \
- AND account.company_id = %s \
- AND move.id = line.move_id \
- AND line.period_id IN %s \
- AND ((invoice.state = %s) \
- OR (invoice.id IS NULL)) \
- GROUP BY account.id,account.name,account.code', ('draft', tax_code_id,
- company_id, periods_ids, 'paid',))
+ def _get_general(self, tax_code_id, period_list,company_id, based_on, context={}):
+ res=[]
+ obj_account = self.pool.get('account.account')
+ periods_ids = tuple(period_list)
+ if based_on == 'payments':
+ self.cr.execute('SELECT SUM(line.tax_amount) AS tax_amount, \
+ SUM(line.debit) AS debit, \
+ SUM(line.credit) AS credit, \
+ COUNT(*) AS count, \
+ account.id AS account_id, \
+ account.name AS name, \
+ account.code AS code \
+ FROM account_move_line AS line, \
+ account_account AS account, \
+ account_move AS move \
+ LEFT JOIN account_invoice invoice ON \
+ (invoice.move_id = move.id) \
+ WHERE line.state<>%s \
+ AND line.tax_code_id = %s \
+ AND line.account_id = account.id \
+ AND account.company_id = %s \
+ AND move.id = line.move_id \
+ AND line.period_id IN %s \
+ AND ((invoice.state = %s) \
+ OR (invoice.id IS NULL)) \
+ GROUP BY account.id,account.name,account.code', ('draft', tax_code_id,
+ company_id, periods_ids, 'paid',))
- else:
- self.cr.execute('SELECT SUM(line.tax_amount) AS tax_amount, \
- SUM(line.debit) AS debit, \
- SUM(line.credit) AS credit, \
- COUNT(*) AS count, \
- account.id AS account_id, \
- account.name AS name, \
- account.code AS code \
- FROM account_move_line AS line, \
- account_account AS account \
- WHERE line.state <> %s \
- AND line.tax_code_id = %s \
- AND line.account_id = account.id \
- AND account.company_id = %s \
- AND line.period_id IN %s\
- AND account.active \
- GROUP BY account.id,account.name,account.code', ('draft', tax_code_id,
- company_id, periods_ids,))
- res = self.cr.dictfetchall()
+ else:
+ self.cr.execute('SELECT SUM(line.tax_amount) AS tax_amount, \
+ SUM(line.debit) AS debit, \
+ SUM(line.credit) AS credit, \
+ COUNT(*) AS count, \
+ account.id AS account_id, \
+ account.name AS name, \
+ account.code AS code \
+ FROM account_move_line AS line, \
+ account_account AS account \
+ WHERE line.state <> %s \
+ AND line.tax_code_id = %s \
+ AND line.account_id = account.id \
+ AND account.company_id = %s \
+ AND line.period_id IN %s\
+ AND account.active \
+ GROUP BY account.id,account.name,account.code', ('draft', tax_code_id,
+ company_id, periods_ids,))
+ res = self.cr.dictfetchall()
- i = 0
- while i= int(accounts[bcl_rup_ind]['level']) and bcl_rup_ind >= 0 ):
- tot_elem = copy.copy(accounts[bcl_rup_ind], context=context)
- res_tot = { 'code': accounts[bcl_rup_ind]['code'],
- 'name': '',
- 'debit': 0,
- 'credit': 0,
- 'tax_amount': accounts[bcl_rup_ind]['tax_amount'],
- 'type': accounts[bcl_rup_ind]['type'],
- 'level': 0,
- 'pos': 0
- }
+ while (bcl_current_level >= int(accounts[bcl_rup_ind]['level']) and bcl_rup_ind >= 0 ):
+ tot_elem = copy.copy(accounts[bcl_rup_ind], context=context)
+ res_tot = { 'code': accounts[bcl_rup_ind]['code'],
+ 'name': '',
+ 'debit': 0,
+ 'credit': 0,
+ 'tax_amount': accounts[bcl_rup_ind]['tax_amount'],
+ 'type': accounts[bcl_rup_ind]['type'],
+ 'level': 0,
+ 'pos': 0
+ }
- if res_tot['type'] == 1:
- # on change le type pour afficher le total
- res_tot['type'] = 2
- result_accounts.append(res_tot)
- bcl_current_level = accounts[bcl_rup_ind]['level']
- bcl_rup_ind -= 1
+ if res_tot['type'] == 1:
+ # on change le type pour afficher le total
+ res_tot['type'] = 2
+ result_accounts.append(res_tot)
+ bcl_current_level = accounts[bcl_rup_ind]['level']
+ bcl_rup_ind -= 1
- old_level = account_elem['level']
- result_accounts.append(account_elem)
- ind+=1
+ old_level = account_elem['level']
+ result_accounts.append(account_elem)
+ ind+=1
- return result_accounts
+ return result_accounts
report_sxw.report_sxw('report.account.vat.declaration', 'account.tax.code',
- 'addons/account/report/account_tax_report.rml', parser=tax_report, header="internal")
+ 'addons/account/report/account_tax_report.rml', parser=tax_report, header="internal")
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index f6d4ec3d88e..24265065b25 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -5,150 +5,13 @@
Accounting / Invoice
-
+
Accounting / Accountant
-
-
+
Accounting / Manager
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Account Entry
diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml
index 5f5d404139a..da59388eb91 100644
--- a/addons/account/wizard/account_move_journal_view.xml
+++ b/addons/account/wizard/account_move_journal_view.xml
@@ -21,17 +21,8 @@
{'journal_type':'sale','view_mode':False}
new
-
-
-
-
-
-
-
-
-
-
-
+
Journal Items
@@ -48,16 +39,6 @@
sequence="16"
groups="group_account_user,group_account_manager"/>
-
-
-
-
-
-
-
-
-
-
Journal Items
account.move.journal
diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml
index a80ffbc05cd..38ed195820b 100644
--- a/addons/account/wizard/account_reconcile_view.xml
+++ b/addons/account/wizard/account_reconcile_view.xml
@@ -58,8 +58,7 @@
-
-
+
diff --git a/addons/account/wizard/account_report_balance_sheet_view.xml b/addons/account/wizard/account_report_balance_sheet_view.xml
index f1c5ef35de9..68a757c6f9b 100644
--- a/addons/account/wizard/account_report_balance_sheet_view.xml
+++ b/addons/account/wizard/account_report_balance_sheet_view.xml
@@ -30,6 +30,7 @@
diff --git a/addons/account/wizard/account_report_general_ledger_view.xml b/addons/account/wizard/account_report_general_ledger_view.xml
index b251252851c..5a6707f82de 100644
--- a/addons/account/wizard/account_report_general_ledger_view.xml
+++ b/addons/account/wizard/account_report_general_ledger_view.xml
@@ -56,6 +56,7 @@
name="General Ledger"
parent="account.final_accounting_reports"
action="action_account_general_ledger_menu"
+ groups="group_account_manager"
id="menu_general_ledger"
/>
diff --git a/addons/account/wizard/account_report_partner_ledger_view.xml b/addons/account/wizard/account_report_partner_ledger_view.xml
index 33f8e765387..c1504f6d3f5 100644
--- a/addons/account/wizard/account_report_partner_ledger_view.xml
+++ b/addons/account/wizard/account_report_partner_ledger_view.xml
@@ -34,6 +34,7 @@
diff --git a/addons/account/wizard/account_tax_chart_view.xml b/addons/account/wizard/account_tax_chart_view.xml
index f60ad394857..4174285d64d 100644
--- a/addons/account/wizard/account_tax_chart_view.xml
+++ b/addons/account/wizard/account_tax_chart_view.xml
@@ -34,12 +34,13 @@
new
-
-
+
diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index c8a6645f744..018c753a7c2 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -10,7 +10,7 @@
-
-
diff --git a/addons/account_voucher/i18n/pl.po b/addons/account_voucher/i18n/pl.po
index a1ddddebc4d..2bde4729e33 100644
--- a/addons/account_voucher/i18n/pl.po
+++ b/addons/account_voucher/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-07 16:41+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \n"
+"PO-Revision-Date: 2010-10-08 07:28+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/invoice.py b/addons/account_voucher/invoice.py
new file mode 100644
index 00000000000..a2cf45391fb
--- /dev/null
+++ b/addons/account_voucher/invoice.py
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+import netsvc
+from osv import fields, osv
+from tools.translate import _
+
+class invoice(osv.osv):
+ _inherit = 'account.invoice'
+ def invoice_pay_customer(self, cr, uid, ids, context={}):
+ if not ids: return []
+ inv = self.browse(cr, uid, ids[0], context=context)
+ return {
+ 'name':_("Pay Invoice"),
+ 'view_mode': 'form',
+ 'view_id': False,
+ 'view_type': 'form',
+ 'res_model': 'account.voucher',
+ 'type': 'ir.actions.act_window',
+ 'nodestroy': True,
+ 'target': 'new',
+ 'domain': '[]',
+ 'context': {
+ 'default_partner_id': inv.partner_id.id,
+ 'default_amount': inv.residual,
+ 'default_name':inv.name,
+ 'close_after_process': True,
+ 'invoice_type':inv.type,
+ 'invoice_id':inv.id,
+ 'default_type': inv.type in ('out_invoice','out_refund') and 'receipt' or 'payment'
+ }
+ }
+
+invoice()
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 1e717a07a33..8169cac31e3 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -219,7 +219,7 @@
-
+
@@ -257,7 +257,7 @@
account.voucher
form
-
@@ -334,7 +334,7 @@
- Sales Payment
+ Customer Payment
account.voucher
form
[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt')]
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 576bf5fa5c7..7bc64a825ae 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -80,7 +80,7 @@
- Sales Payment
+ Customer Payment
account.voucher
form
[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt'), ('partner_id','=',partner_id)]
@@ -111,7 +111,7 @@
-
+
@@ -152,8 +152,8 @@
-
-
+
+
@@ -186,6 +186,7 @@
@@ -203,9 +204,9 @@
account.voucher
form
-
@@ -255,7 +256,7 @@
-
+
@@ -263,7 +264,7 @@
- Vendor Bills
+ Supplier Vouchers
account.voucher
form
[('journal_id.type','in',['purchase','purchase_refund']), ('type','=','purchase')]
@@ -285,7 +286,8 @@
+ action="action_purchase_receipt" parent="account.menu_finance_payables" sequence="10"
+ groups="base.group_extended"/>
diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml
index 6147ee3e158..2eeda3aa370 100644
--- a/addons/analytic/security/analytic_security.xml
+++ b/addons/analytic/security/analytic_security.xml
@@ -7,9 +7,7 @@
[('company_id','=',user.company_id.id)]
-
-
- Analytic Accounting
+
+ Useability / Analytic Accounting
-
diff --git a/addons/auction/auction_demo.xml b/addons/auction/auction_demo.xml
index a26e5355cde..da4989756f9 100644
--- a/addons/auction/auction_demo.xml
+++ b/addons/auction/auction_demo.xml
@@ -10,93 +10,93 @@
- Auction Adjudications
- A0
- view
-
-
-
-
-
-
+ Auction Adjudications
+ A0
+ view
+
+
+
+
+
+
- Auction Adjudication Expenses
- A1
- view
-
-
-
-
-
-
+ Auction Adjudication Expenses
+ A1
+ view
+
+
+
+
+
+
-
- Auction Adjudications
- A7x*
+
+ Auction Adjudications
+ A7x*
- receivable
-
-
-
+ receivable
+
+
+
-
- Auction Adjudication Expenses
- A6x*
-
- payable
-
-
-
+
+ Auction Adjudication Expenses
+ A6x*
+
+ payable
+
+
+
-
- Auction Buyer Costs
- A8x*
- payable
-
-
-
-
-
- Auction Seller Costs
- A9x*
- receivable
-
-
-
-
+
+ Auction Buyer Costs
+ A8x*
+ payable
+
+
+
+
+
+ Auction Seller Costs
+ A9x*
+ receivable
+
+
+
+
-
- Author rights (4%)
- percent
- code
- 0.04
- sabam
-
-
- result = (price_unit>=1250)
-
-
- Buyer Costs (20%)
- percent
- 0.20
- auction
-
-
-
-
- Seller Costs (12%)
- percent
- -0.12
- auction
-
-
-
-
-
- 770.0
- 700.0
-
+
+ Author rights (4%)
+ percent
+ code
+ 0.04
+ sabam
+
+
+ result = (price_unit>=1250)
+
+
+ Buyer Costs (20%)
+ percent
+ 0.20
+ auction
+
+
+
+
+ Seller Costs (12%)
+ percent
+ -0.12
+ auction
+
+
+
+
+
+ 770.0
+ 700.0
+
@@ -106,39 +106,39 @@
- Bruxelles1
- Benoit Mortie1r1
- 1030
-
- info@opensides.be
- (+32)2 211 34 83
- Rue des Palais 44, bte 33
- default
-
-
+ Bruxelles1
+ Benoit Mortie1r1
+ 1030
+
+ info@opensides.be
+ (+32)2 211 34 83
+ Rue des Palais 44, bte 33
+ default
+
+
-
- Avignon CEDEX 091
- Laurent Jacot1
- 84911
-
- contact@tecsas.fr
- (+33)4.32.74.10.57
- 85 rue du traite de Rome
- default
-
-
+
+ Avignon CEDEX 091
+ Laurent Jacot1
+ 84911
+
+ contact@tecsas.fr
+ (+33)4.32.74.10.57
+ 85 rue du traite de Rome
+ default
+
+
-
- Louvain-la-Neuve
- Thomas Passot
- 1348
-
- info@mediapole.net
- (+32).10.45.17.73
- Rue de l'Angelique, 1
-
-
+
+ Louvain-la-Neuve
+ Thomas Passot
+ 1348
+
+ info@mediapole.net
+ (+32).10.45.17.73
+ Rue de l'Angelique, 1
+
+
@@ -331,33 +331,33 @@
-
-
- keep
+
+
+ keep
-
-
- keep
+
+
+ keep
-
-
- keep
+
+
+ keep
-
-
- keep
+
+
+ keep
-
-
- keep
+
+
+ keep
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index 3c8cb5c0278..1cda8ceba60 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -14,8 +14,8 @@
tree
-
-
+
+
@@ -27,10 +27,10 @@
-
+
@@ -344,7 +344,7 @@ to your configuration: from the sales order, from the pickings, etc.
sale.order.line
graph
-
+
@@ -356,7 +356,7 @@ to your configuration: from the sales order, from the pickings, etc.
sale.order.line
tree
-
+
@@ -517,7 +517,8 @@ to your configuration: from the sales order, from the pickings, etc.
src_model="product.product"
groups="base.group_extended"/>
-
+
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index 933200d1883..057e8469431 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -54,10 +54,6 @@ class crm_make_sale(osv.osv_memory):
def view_init(self, cr, uid, fields_list, context=None):
if context is None:
context = {}
- if context.get('active_ids', False) and context['active_ids']:
- for line in self.pool.get('crm.lead').browse(cr, uid, context['active_ids']):
- if not line.section_id:
- raise osv.except_osv(_('Warning !'), _(' Sales Team is not specified.'))
return super(crm_make_sale, self).view_init(cr, uid, fields_list, context=context)
def makeOrder(self, cr, uid, ids, context=None):
diff --git a/addons/sale_crm/wizard/crm_make_sale_view.xml b/addons/sale_crm/wizard/crm_make_sale_view.xml
index ed0b9ef780e..d73a2cee1ef 100644
--- a/addons/sale_crm/wizard/crm_make_sale_view.xml
+++ b/addons/sale_crm/wizard/crm_make_sale_view.xml
@@ -8,12 +8,10 @@
crm.make.sale
form
-
@@ -1687,35 +1689,36 @@
@@ -1753,7 +1756,7 @@
search
-
+
@@ -1790,7 +1793,7 @@
tree,form
['|','&',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','in')]
- {"search_default_receive":1}
+
@@ -1852,7 +1855,7 @@
@@ -1867,7 +1870,7 @@
context="{'location': active_id, 'search_default_future': 1,'search_default_product_id': [active_id]}"
domain="[('state','in',('waiting','confirmed','assigned'))]"
id="act_product_stock_move_futur_open"
- name="Future Stock Moves"
+ name="Future Inventory Moves"
res_model="stock.move"
src_model="product.product"
groups="base.group_extended"/>
@@ -1928,7 +1931,7 @@
- Delivery Products
+ Delivered Products
report.delivery.products.planned
tree
@@ -1941,7 +1944,7 @@
- Delivery Products
+ Delivered Products
report.delivery.products.planned
graph
@@ -1954,7 +1957,7 @@
- Delivery Products Vs Planned
+ Delivered Products Vs Planned
report.delivery.products.planned
ir.actions.act_window
form
@@ -1998,7 +2001,7 @@
tree,form
['|','&',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','out')]
- {"search_default_receive":1}
+
diff --git a/addons/stock/wizard/stock_partial_move_view.xml b/addons/stock/wizard/stock_partial_move_view.xml
index a7b4271a5b2..457ddc34ff7 100644
--- a/addons/stock/wizard/stock_partial_move_view.xml
+++ b/addons/stock/wizard/stock_partial_move_view.xml
@@ -2,7 +2,7 @@
-
- Making Picking
+ Process Picking
stock.partial.picking
form
form
diff --git a/addons/thunderbird/i18n/eu.po b/addons/thunderbird/i18n/eu.po
index 17c268d7652..d5836168c61 100644
--- a/addons/thunderbird/i18n/eu.po
+++ b/addons/thunderbird/i18n/eu.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-11-26 06:05+0000\n"
-"PO-Revision-Date: 2010-10-05 22:18+0000\n"
-"Last-Translator: Ales Zabala Alava (Shagi) \n"
+"PO-Revision-Date: 2010-10-08 07:34+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Basque \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: thunderbird
diff --git a/addons/wiki/i18n/sv.po b/addons/wiki/i18n/sv.po
index 1da34d2bef1..30b8bc8f72e 100644
--- a/addons/wiki/i18n/sv.po
+++ b/addons/wiki/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-07 19:19+0000\n"
+"PO-Revision-Date: 2010-10-08 07:35+0000\n"
"Last-Translator: Anders Eriksson (Mobila System) \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-08 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-09 12:13+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: wiki
|