diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 5ba019b5621..f06123487e2 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -114,8 +114,6 @@ module named account_voucher.
'report/account_invoice_report_view.xml',
'report/account_entries_report_view.xml',
'report/account_report_view.xml',
- 'report/account_analytic_report_view.xml',
- 'report/account_account_report_view.xml',
'report/account_analytic_entries_report_view.xml',
'board_account_view.xml',
"wizard/account_report_profit_loss_view.xml",
diff --git a/addons/account/account.py b/addons/account/account.py
index 17237211581..ff5e8d4db82 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -631,7 +631,7 @@ class account_journal(osv.osv):
'default_debit_account_id': fields.many2one('account.account', 'Default Debit Account', domain="[('type','!=','view')]", help="It acts as a default account for debit amount"),
'centralisation': fields.boolean('Centralised counterpart', help="Check this box to determine that each entry of this journal won't create a new counterpart but will share the same counterpart. This is used in fiscal year closing."),
'update_posted': fields.boolean('Allow Cancelling Entries', help="Check this box if you want to allow the cancellation the entries related to this journal or of the invoice related to this journal"),
- 'group_invoice_lines': fields.boolean('Group invoice lines', help="If this box is checked, the system will try to group the accounting lines when generating them from invoices."),
+ 'group_invoice_lines': fields.boolean('Group Invoice Lines', help="If this box is checked, the system will try to group the accounting lines when generating them from invoices."),
'sequence_id': fields.many2one('ir.sequence', 'Entry Sequence', help="The sequence gives the display order for a list of journals", required=False),
'user_id': fields.many2one('res.users', 'User', help="The user responsible for this journal"),
'groups_id': fields.many2many('res.groups', 'account_journal_group_rel', 'journal_id', 'group_id', 'Groups'),
@@ -1053,12 +1053,15 @@ class account_move(osv.osv):
if not context:
context={}
ids = []
-
if name:
- ids += self.search(cr, user, [('name','=',name)], limit=limit)
- if not ids:
- ids += self.search(cr, user, [('id','=',name)], limit=limit)
+ ids += self.search(cr, user, [('name','ilike',name)]+args, limit=limit, context=context)
+
+ if not ids and name and type(name) == int:
+ ids += self.search(cr, user, [('id','=',name)]+args, limit=limit, context=context)
+ if not ids:
+ ids += self.search(cr, user, args, limit=limit, context=context)
+
return self.name_get(cr, user, ids, context=context)
def name_get(self, cursor, user, ids, context=None):
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 8a8f5556aff..6ddea9645b4 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -131,7 +131,7 @@ class account_bank_statement(osv.osv):
_name = "account.bank.statement"
_description = "Bank Statement"
_columns = {
- 'name': fields.char('Name', size=64, required=True, states={'confirm': [('readonly', True)]}),
+ 'name': fields.char('Name', size=64, required=True, help='if you give the Name other then /, its created Accounting Entries Move will be with same name as statement name. This allows the statement entries to have the same references than the statement itself', states={'confirm': [('readonly', True)]}),
'date': fields.date('Date', required=True, states={'confirm': [('readonly', True)]}),
'journal_id': fields.many2one('account.journal', 'Journal', required=True,
states={'confirm': [('readonly', True)]}, domain=[('type', '=', 'bank')]),
@@ -195,15 +195,17 @@ class account_bank_statement(osv.osv):
self.write(cr, uid, ids, {}, context)
return True
- def button_confirm_bank(self, cr, uid, ids, context={}):
+ def button_confirm_bank(self, cr, uid, ids, context=None):
done = []
res_currency_obj = self.pool.get('res.currency')
res_users_obj = self.pool.get('res.users')
account_move_obj = self.pool.get('account.move')
account_move_line_obj = self.pool.get('account.move.line')
- account_bank_statement_line_obj = \
- self.pool.get('account.bank.statement.line')
+ account_bank_statement_line_obj = self.pool.get('account.bank.statement.line')
+ obj_seq = self.pool.get('ir.sequence')
+ if context is None:
+ context = {}
company_currency_id = res_users_obj.browse(cr, uid, uid,
context=context).company_id.currency_id.id
@@ -369,13 +371,16 @@ class account_bank_statement(osv.osv):
# raise osv.except_osv(_('Error !'), _('Unable to reconcile entry "%s": %.2f') % (move.name, move.amount))
if st.journal_id.entry_posted:
- account_move_obj.write(cr, uid, [move_id], {'state':'posted'})
+ account_move_obj.write(cr, uid, [move_id], {'state': 'posted'})
self.log(cr, uid, st.id, 'Statement %s is confirmed and entries are created.' % st.name)
done.append(st.id)
- next_number = self.pool.get('ir.sequence').get(cr, uid, 'account.bank.statement')
- self.write(cr, uid, [st.id], {'name':next_number}, context)
+ next_number = obj_seq.get(cr, uid, 'account.bank.statement')
+ if not st.name == '/':
+ next_number = st.name + '/' + next_number[-1:]
+ account_move_obj.write(cr, uid, [move_id], {'state': 'posted', 'name': next_number})
+ self.write(cr, uid, [st.id], {'name': next_number}, context=context)
self.write(cr, uid, done, {'state':'confirm'}, context=context)
return True
@@ -647,7 +652,7 @@ class account_bank_statement_line(osv.osv):
res[line.id] = 0.0
return res
- _order = "date,name desc"
+ _order = "statement_id desc, sequence"
_name = "account.bank.statement.line"
_description = "Bank Statement Line"
_columns = {
diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 572144ccf6c..f08f9de2f8f 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -210,7 +210,7 @@ class account_cash_statement(osv.osv):
'balance_end_cash': fields.function(_balance_end_cash, method=True, store=True, string='Balance', help="Closing balance based on cashBox"),
'starting_details_ids': fields.one2many('account.cashbox.line', 'starting_id', string='Opening Cashbox'),
'ending_details_ids': fields.one2many('account.cashbox.line', 'ending_id', string='Closing Cashbox'),
- 'name': fields.char('Name', size=64, required=True, readonly=True),
+ 'name': fields.char('Name', size=64, required=True, readonly=False, help='if you give the Name other then / , its created Accounting Entries Move will be with same name as statement name. This allows the statement entries to have the same references than the statement itself'),
'user_id':fields.many2one('res.users', 'Responsible', required=False),
}
_defaults = {
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 99575c08375..5bcd3b36815 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -507,7 +507,20 @@
-
+
+
+
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 30e40f56a7c..b7bc7cb426f 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -146,7 +146,7 @@ class account_move_line(osv.osv):
def convert_to_period(self, cr, uid, context={}):
period_obj = self.pool.get('account.period')
-
+
#check if the period_id changed in the context from client side
if context.get('period_id', False):
period_id = context.get('period_id')
@@ -157,13 +157,13 @@ class account_move_line(osv.osv):
})
return context
-
+
def _default_get(self, cr, uid, fields, context={}):
-
+
period_obj = self.pool.get('account.period')
context = self.convert_to_period(cr, uid, context)
-
+
# Compute simple values
data = super(account_move_line, self).default_get(cr, uid, fields, context)
# Starts: Manual entry from account.move form
@@ -337,7 +337,7 @@ class account_move_line(osv.osv):
invoice_id = res[line_id]
res[line_id] = (invoice_id, invoice_names[invoice_id])
return res
-
+
def name_get(self, cr, uid, ids, context={}):
if not len(ids):
return []
@@ -572,18 +572,18 @@ class account_move_line(osv.osv):
if journal:
jt = self.pool.get('account.journal').browse(cr, uid, journal).type
#FIXME: Bank and cash journal are such a journal we can not assume a account based on this 2 journals
- # Bank and cash journal can have a payment or receipt transection, and in both type partner account
+ # Bank and cash journal can have a payment or receipt transection, and in both type partner account
# will not be same id payment then payable, and if receipt then receivable
#if jt in ('sale', 'purchase_refund', 'bank', 'cash'):
if jt in ('sale', 'purchase_refund'):
val['account_id'] = self.pool.get('account.fiscal.position').map_account(cr, uid, part and part.property_account_position or False, id2)
elif jt in ('purchase', 'sale_refund', 'expense', 'bank', 'cash'):
val['account_id'] = self.pool.get('account.fiscal.position').map_account(cr, uid, part and part.property_account_position or False, id1)
-
+
if val.get('account_id', False):
d = self.onchange_account_id(cr, uid, ids, val['account_id'])
val.update(d['value'])
-
+
return {'value':val}
def onchange_account_id(self, cr, uid, ids, account_id=False, partner_id=False):
@@ -843,22 +843,23 @@ class account_move_line(osv.osv):
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context={}, toolbar=False, submenu=False):
journal_pool = self.pool.get('account.journal')
-
+
result = super(osv.osv, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
if view_type != 'tree':
#Remove the toolbar from the form view
if view_type == 'form':
- result['toolbar']['action'] = []
+ if result.get('toolbar', False):
+ result['toolbar']['action'] = []
#Restrict the list of journal view in search view
if view_type == 'search':
journal_list = journal_pool.name_search(cr, uid, '', [], context=context)
result['fields']['journal_id']['selection'] = journal_list
return result
-
+
if context.get('view_mode', False):
return result
-
+
fld = []
fields = {}
flds = []
@@ -912,14 +913,14 @@ class account_move_line(osv.osv):
attrs = []
if field == 'debit':
attrs.append('sum="Total debit"')
-
+
elif field == 'credit':
attrs.append('sum="Total credit"')
-
+
elif field == 'account_tax_id':
attrs.append('domain="[(\'parent_id\',\'=\',False)]"')
attrs.append("context=\"{'journal_id':journal_id}\"")
-
+
elif field == 'account_id' and journal.id:
attrs.append('domain="[(\'journal_id\', \'=\', '+str(journal.id)+'),(\'type\',\'<>\',\'view\'), (\'type\',\'<>\',\'closed\')]" on_change="onchange_account_id(account_id, partner_id)"')
@@ -937,7 +938,7 @@ class account_move_line(osv.osv):
if field in ('amount_currency', 'currency_id'):
attrs.append('on_change="onchange_currency(account_id, amount_currency,currency_id, date, journal_id)"')
-
+
if field in widths:
attrs.append('width="'+str(widths[field])+'"')
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 67576d406da..12ac88cfa62 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -605,11 +605,11 @@
-
+
-
+
@@ -1057,7 +1057,11 @@
-
+
diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index ac751e00a72..8e370fd20fe 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -51,5 +51,6 @@
+
diff --git a/addons/account/data/account_data2.xml b/addons/account/data/account_data2.xml
index 9a06727e021..af55e477b42 100644
--- a/addons/account/data/account_data2.xml
+++ b/addons/account/data/account_data2.xml
@@ -86,6 +86,12 @@
state
+
+
+ Reconcile
+ reconcile_id
+
+
Bank/Cash Journal (Multi-Currency) View
@@ -166,6 +172,12 @@
state
+
+
+ Reconcile
+ reconcile_id
+
+
@@ -328,6 +340,12 @@
state
+
+
+ Reconcile
+ reconcile_id
+
+
Sale/Purchase Refund Journal View
@@ -420,6 +438,13 @@
state
+
+
+ Reconcile
+ reconcile_id
+
+
+
diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po
index c6a9ba4502d..f00010c90c3 100644
--- a/addons/account/i18n/da.po
+++ b/addons/account/i18n/da.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-14 08:40+0000\n"
+"PO-Revision-Date: 2010-08-15 12:23+0000\n"
"Last-Translator: OpenERP Administrators \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-15 06:19+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 7a0590e8bfa..209226eaf11 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.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-08-14 09:01+0000\n"
+"PO-Revision-Date: 2010-08-15 10:07+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-08-15 06:19+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po
index 805738048f8..adb5913b8f4 100644
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.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-08-14 08:36+0000\n"
+"PO-Revision-Date: 2010-08-15 11:44+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-08-15 06:19+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index ef40b516c0b..94a52154e3c 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.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-08-14 08:42+0000\n"
+"PO-Revision-Date: 2010-08-15 12:30+0000\n"
"Last-Translator: eLBati - albatos.com \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-08-15 06:19+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/lt.po b/addons/account/i18n/lt.po
index d94a1984389..bf2898beffa 100644
--- a/addons/account/i18n/lt.po
+++ b/addons/account/i18n/lt.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-08-14 08:27+0000\n"
+"PO-Revision-Date: 2010-08-15 11:30+0000\n"
"Last-Translator: Giedrius Slavinskas \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-08-15 06:19+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po
index 2e7c575fe1a..6ed7ab6fb2d 100644
--- a/addons/account/i18n/pl.po
+++ b/addons/account/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-08-14 08:24+0000\n"
+"PO-Revision-Date: 2010-08-15 11:29+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-08-15 06:20+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/sq.po b/addons/account/i18n/sq.po
index 3fc6fee744e..72a70337bc2 100644
--- a/addons/account/i18n/sq.po
+++ b/addons/account/i18n/sq.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: ASTRIT BOKSHI \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-14 09:08+0000\n"
+"PO-Revision-Date: 2010-08-15 10:43+0000\n"
"Last-Translator: bokshas \n"
"Language-Team: Albanian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-15 06:19+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po
index b736ec3b32b..b29f20b63f2 100644
--- a/addons/account/i18n/sv.po
+++ b/addons/account/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-08-14 08:37+0000\n"
+"PO-Revision-Date: 2010-08-15 11:45+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-08-15 06:20+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index 69160df8ded..d5fd779f63c 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.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-08-14 08:38+0000\n"
+"PO-Revision-Date: 2010-08-15 11:53+0000\n"
"Last-Translator: Omer Barlas \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-08-15 06:20+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 889c6342c32..59f6ee6699a 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.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-08-14 07:54+0000\n"
+"PO-Revision-Date: 2010-08-15 11:07+0000\n"
"Last-Translator: Jeff Wang \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-08-15 06:20+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -35,7 +35,7 @@ msgstr "未支付的采购发票"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_entries
msgid "Entries Encoding"
-msgstr "凭证"
+msgstr "录入单据"
#. module: account
#: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form
@@ -82,7 +82,7 @@ msgstr "留空使用审核(发票)日期的会计期间"
#. module: account
#: wizard_view:account.automatic.reconcile,reconcile:0
msgid "Reconciliation result"
-msgstr "对账结果"
+msgstr "核销结果"
#. module: account
#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
@@ -443,7 +443,7 @@ msgstr "状态"
#: model:ir.actions.act_window,name:account.action_invoice_tree13
#: model:ir.ui.menu,name:account.menu_action_invoice_tree13
msgid "Unpaid Supplier Refunds"
-msgstr "未支付的供应商退款"
+msgstr "未支付的供应商红字发票"
#. module: account
#: view:account.tax:0
@@ -454,7 +454,7 @@ msgstr "特殊算法"
#. module: account
#: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
msgid "Confirm statement with/without reconciliation from draft statement"
-msgstr "银行凭证过账"
+msgstr "确认银行单据"
#. module: account
#: wizard_view:account.move.bank.reconcile,init:0
@@ -688,7 +688,7 @@ msgstr "附加信息"
#. module: account
#: selection:account.invoice,type:0
msgid "Customer Refund"
-msgstr "客户退货"
+msgstr "客户红字发票"
#. module: account
#: wizard_view:account.analytic.account.chart,init:0
@@ -823,7 +823,7 @@ msgstr "按照所在国家定义这些类型,这些类型包含更多的科目
#. module: account
#: selection:account.automatic.reconcile,init,power:0
msgid "6"
-msgstr ""
+msgstr "6"
#. module: account
#: model:ir.ui.menu,name:account.next_id_30
@@ -847,7 +847,7 @@ msgstr "辅助核算项目"
#: model:ir.actions.wizard,name:account.wizard_print_journal
#: model:ir.ui.menu,name:account.menu_print_journal
msgid "Print Journal"
-msgstr "打印业务类型"
+msgstr "按业务类型打印凭证"
#. module: account
#: model:ir.model,name:account.model_account_bank_accounts_wizard
@@ -954,7 +954,7 @@ msgstr "默认借方科目"
#: model:ir.actions.act_window,name:account.action_bank_statement_tree
#: model:ir.ui.menu,name:account.menu_bank_statement_tree
msgid "Entries by Statements"
-msgstr "银行单据凭证"
+msgstr "银行单据"
#. module: account
#: model:process.transition,name:account.process_transition_analyticinvoice0
@@ -1085,7 +1085,7 @@ msgstr "补差额金额合计"
#. module: account
#: view:account.tax.template:0
msgid "Compute Code for Taxes included prices"
-msgstr ""
+msgstr "含税价格计算代码"
#. module: account
#: view:account.invoice.tax:0
@@ -1486,7 +1486,7 @@ msgstr ""
#. module: account
#: field:account.journal,refund_journal:0
msgid "Refund Journal"
-msgstr "退款业务类型"
+msgstr "退款(开红字发票)业务类型"
#. module: account
#: model:account.account.type,name:account.account_type_income
@@ -1518,7 +1518,7 @@ msgstr "正数"
#: model:ir.actions.wizard,name:account.wizard_general_journal
#: model:ir.ui.menu,name:account.menu_general_journal
msgid "Print General Journal"
-msgstr "打印全部业务类型凭证"
+msgstr "打印业务类型的凭证"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_chart_template_form
@@ -1660,7 +1660,7 @@ msgstr "最大数量:"
#. module: account
#: wizard_button:account.invoice.refund,init,refund:0
msgid "Refund Invoice"
-msgstr "退款发票"
+msgstr "红字发票"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_period_tree
@@ -1849,7 +1849,7 @@ msgstr "开始日期"
#. module: account
#: model:account.journal,name:account.refund_expenses_journal
msgid "x Expenses Credit Notes Journal"
-msgstr "x 费用贷记业务类型"
+msgstr "x 费用退还业务类型"
#. module: account
#: field:account.analytic.journal,type:0
@@ -1941,7 +1941,7 @@ msgstr "欠供应商金额合计"
#. module: account
#: selection:account.automatic.reconcile,init,power:0
msgid "7"
-msgstr ""
+msgstr "7"
#. module: account
#: model:ir.actions.report.xml,name:account.account_transfers
@@ -1982,13 +1982,13 @@ msgstr " 开始日期"
#. module: account
#: wizard_view:account.analytic.account.journal.report,init:0
msgid "Analytic Journal Report"
-msgstr "辅助核算业务类型报表"
+msgstr "辅助核算类型报表"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree3
#: model:ir.ui.menu,name:account.menu_action_invoice_tree3
msgid "Customer Refunds"
-msgstr "客户退款"
+msgstr "客户红字发票"
#. module: account
#: rml:account.vat.declaration:0
@@ -2088,7 +2088,7 @@ msgstr "天"
#. module: account
#: selection:account.aged.trial.balance,init,direction_selection:0
msgid "Past"
-msgstr ""
+msgstr "过去"
#. module: account
#: field:account.analytic.account,company_currency_id:0
@@ -2270,7 +2270,7 @@ msgstr "负债"
#. module: account
#: selection:account.automatic.reconcile,init,power:0
msgid "2"
-msgstr ""
+msgstr "2"
#. module: account
#: wizard_view:account.chart,init:0
@@ -2344,7 +2344,7 @@ msgstr "科目表模板"
#. module: account
#: model:account.journal,name:account.refund_sales_journal
msgid "Journal d'extourne"
-msgstr "退款业务类型"
+msgstr "退还业务类型"
#. module: account
#: rml:account.journal.period.print:0
@@ -2460,7 +2460,7 @@ msgstr "会计期间从"
#: model:process.node,name:account.process_node_bankstatement0
#: model:process.node,name:account.process_node_supplierbankstatement0
msgid "Bank Statement"
-msgstr "银行单据"
+msgstr "银行对账单"
#. module: account
#: wizard_view:account.invoice.pay,addendum:0
@@ -2679,7 +2679,7 @@ msgstr "价格"
#: rml:account.third_party_ledger:0
#: rml:account.third_party_ledger_other:0
msgid "-"
-msgstr ""
+msgstr "-"
#. module: account
#: rml:account.analytic.account.journal:0
@@ -2808,7 +2808,7 @@ msgstr "贷方汇总"
#. module: account
#: rml:account.overdue:0
msgid "Customer Ref:"
-msgstr "客户关联单号:"
+msgstr "客户关联:"
#. module: account
#: xsl:account.transfer:0
@@ -2858,7 +2858,7 @@ msgstr "辅助核算项目成本和收入"
#. module: account
#: wizard_view:account.invoice.refund,init:0
msgid "Are you sure you want to refund this invoice ?"
-msgstr "你确定要对此发票退款吗?"
+msgstr "你确定要开此红字发票吗?"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_paid_open
@@ -2868,7 +2868,7 @@ msgstr "待处理状态"
#. module: account
#: field:account.journal,entry_posted:0
msgid "Skip 'Draft' State for Created Entries"
-msgstr "跳过'草稿'状态创建分录"
+msgstr "跳过'草稿'状态创建凭证"
#. module: account
#: field:account.invoice.tax,account_id:0
@@ -2904,7 +2904,7 @@ msgstr "1cm 27.7cm 20cm 27.7cm"
#: model:ir.actions.act_window,name:account.action_invoice_tree12
#: model:ir.ui.menu,name:account.menu_action_invoice_tree12
msgid "Draft Supplier Refunds"
-msgstr "供应商退款草稿"
+msgstr "供应商红字发票草稿"
#. module: account
#: model:process.node,name:account.process_node_accountingstatemententries0
@@ -2914,7 +2914,7 @@ msgstr "会计报表"
#. module: account
#: rml:account.overdue:0
msgid "Document: Customer account statement"
-msgstr "文档:客户科目"
+msgstr "文档:客户科目报表"
#. module: account
#: view:product.product:0
@@ -2975,7 +2975,7 @@ msgstr "税事务"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "Analytic Journal -"
-msgstr "辅助核算业务类型 -"
+msgstr "辅助核算类型 -"
#. module: account
#: rml:account.analytic.account.analytic.check:0
@@ -2991,7 +2991,7 @@ msgstr "兑出汇率"
#: model:ir.actions.act_window,name:account.action_invoice_tree10
#: model:ir.ui.menu,name:account.menu_action_invoice_tree10
msgid "Draft Customer Refunds"
-msgstr "客户退款草稿"
+msgstr "客户红字发票草稿"
#. module: account
#: field:account.journal.column,readonly:0
@@ -3086,7 +3086,7 @@ msgstr "设为草稿"
#: help:account.invoice,origin:0
#: help:account.invoice.line,origin:0
msgid "Reference of the document that produced this invoice."
-msgstr "发票上产品的关联文档"
+msgstr "发票上产品的关联单据"
#. module: account
#: selection:account.account,type:0
@@ -3373,24 +3373,24 @@ msgstr "Python代码"
#. module: account
#: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
msgid "Bank statements"
-msgstr "银行银行凭证"
+msgstr "银行对账单"
#. module: account
#: model:ir.ui.menu,name:account.next_id_22
msgid "Partner Accounts"
-msgstr "业务伙伴帐目"
+msgstr "业务伙伴科目"
#. module: account
#: help:account.tax.template,tax_group:0
msgid ""
"If a default tax if given in the partner it only override taxes from account "
"(or product) of the same group."
-msgstr "如果默认税是业务伙伴只覆盖, 税款科目(或产品)在同一分组"
+msgstr "如果默认税是假如业务伙伴只覆盖科目(或产品)在同一分组的税"
#. module: account
#: view:account.bank.statement:0
msgid "Real Entries"
-msgstr "实际分录"
+msgstr "实际凭证"
#. module: account
#: model:process.node,name:account.process_node_importinvoice0
@@ -3407,12 +3407,12 @@ msgstr "创建"
#. module: account
#: model:process.transition.action,name:account.process_transition_action_createentries0
msgid "Create entry"
-msgstr "创建分录"
+msgstr "创建凭证"
#. module: account
#: model:ir.model,name:account.model_account_invoice_line
msgid "Invoice line"
-msgstr "发票明细"
+msgstr "发票行"
#. module: account
#: field:account.account,shortcut:0
@@ -3425,7 +3425,7 @@ msgstr "快捷键"
msgid ""
"All draft account entries in this journal and period will be validated. It "
"means you won't be able to modify their accouting fields."
-msgstr "在业务类型和会计期间中将记账所有草稿分录. 这意味你将不能修改它的会计字段."
+msgstr "在这业务类型和会计期间中将审核所有草稿凭证. 这意味你以后将不能修改它们的会计字段."
#. module: account
#: selection:account.model.line,date:0
@@ -3438,7 +3438,7 @@ msgstr "日期中的一天"
msgid ""
"The amount expressed in an optional other currency if it is a multi-currency "
"entry."
-msgstr "如果它是一个多货币分录这金额表示一个可选的的其它货币"
+msgstr "如果它是一个多货币凭证,这金额表示一个可选的其它货币金额."
#. module: account
#: field:account.tax,parent_id:0
@@ -3453,12 +3453,12 @@ msgstr "上级税科目"
#: field:account.analytic.account,type:0
#: model:ir.model,name:account.model_account_account_type
msgid "Account Type"
-msgstr "科目类型"
+msgstr "类型"
#. module: account
#: view:res.partner:0
msgid "Bank account owner"
-msgstr "银行帐号所有者"
+msgstr "银行账号所有者"
#. module: account
#: wizard_view:account.account.balance.report,checktype:0
@@ -3476,7 +3476,7 @@ msgstr "应收账"
#. module: account
#: wizard_button:account.invoice.pay,addendum,reconcile:0
msgid "Pay and reconcile"
-msgstr "支付和对账"
+msgstr "支付和核销"
#. module: account
#: rml:account.central.journal:0
@@ -3534,12 +3534,12 @@ msgstr "已打印"
#: model:ir.actions.act_window,name:account.action_invoice_tree4_new
#: model:ir.ui.menu,name:account.menu_action_invoice_tree4_new
msgid "New Supplier Refund"
-msgstr "新的供应商退款"
+msgstr "新的供应商红字发票"
#. module: account
#: view:account.model:0
msgid "Entry Model"
-msgstr "分录模型"
+msgstr "凭证模型"
#. module: account
#: wizard_field:account.general.ledger.report,checktype,amount_currency:0
@@ -3554,7 +3554,7 @@ msgstr "科目一览表"
#. module: account
#: field:account.subscription.line,subscription_id:0
msgid "Subscription"
-msgstr "周期性分录"
+msgstr "周期性凭证"
#. module: account
#: field:account.analytic.journal,code:0
@@ -3565,7 +3565,7 @@ msgstr "业务类型代码"
#: wizard_button:account.fiscalyear.close,init,close:0
#: view:account.model:0
msgid "Create entries"
-msgstr "创建分录"
+msgstr "创建凭证"
#. module: account
#: view:account.analytic.line:0
@@ -3597,18 +3597,18 @@ msgstr "数字 #"
msgid ""
"This payment term will be used instead of the default one for the current "
"partner"
-msgstr "当前业务伙伴将替代为这默认的付款条款"
+msgstr "这付款条款将替代为当前业务伙伴默认的."
#. module: account
#: wizard_field:account.invoice.pay,addendum,comment:0
#: wizard_field:account.invoice.pay,init,name:0
msgid "Entry Name"
-msgstr "名称"
+msgstr "凭证名称"
#. module: account
#: help:account.invoice,account_id:0
msgid "The partner account used for this invoice."
-msgstr "用在这发票的业务伙伴"
+msgstr "这发票用这业务伙伴科目"
#. module: account
#: help:account.tax.code,notprintable:0
@@ -3616,7 +3616,7 @@ msgstr "用在这发票的业务伙伴"
msgid ""
"Check this box if you don't want any VAT related to this Tax Code to appear "
"on invoices"
-msgstr "勾选此项, 如果你不想发票显示任何增值税."
+msgstr "如果你不想发票显示任何增值税,勾选此项 ."
#. module: account
#: field:account.account.type,sequence:0
@@ -3645,7 +3645,7 @@ msgstr "明细"
#: wizard_view:account.invoice.refund,init:0
#: model:ir.actions.wizard,name:account.wizard_invoice_refund
msgid "Credit Note"
-msgstr "贷项单"
+msgstr "冲销发票"
#. module: account
#: model:ir.actions.todo,note:account.config_fiscalyear
@@ -3665,14 +3665,14 @@ msgstr "季度"
#. module: account
#: wizard_view:account.move.journal,init:0
msgid "Standard entries"
-msgstr "普通分录"
+msgstr "普通凭证"
#. module: account
#: help:account.account,check_history:0
msgid ""
"Check this box if you want to print all entries when printing the General "
"Ledger, otherwise it will only print its balance."
-msgstr "如果你想打印总账时打印所有分录, 勾选此项. 否则打印它的余额"
+msgstr "如果你想打按全部业务类型打印全部凭证时打印所有凭证, 勾选此项. 否则打印它的余额"
#. module: account
#: model:ir.model,name:account.model_account_payment_term_line
@@ -3683,12 +3683,12 @@ msgstr "付款条款明细"
#: selection:account.config.wizard,period:0
#: field:report.hr.timesheet.invoice.journal,name:0
msgid "Month"
-msgstr "月"
+msgstr "月份"
#. module: account
#: model:ir.model,name:account.model_account_subscription
msgid "Account Subscription"
-msgstr "周期性分录科目"
+msgstr "周期性凭证科目"
#. module: account
#: field:account.model.line,date_maturity:0
@@ -3700,7 +3700,7 @@ msgstr "付款到期日"
#. module: account
#: view:account.subscription:0
msgid "Entry Subscription"
-msgstr "周期性分录"
+msgstr "周期性凭证"
#. module: account
#: selection:account.print.journal.report,init,sort_selection:0
@@ -3728,7 +3728,7 @@ msgstr "选择一览表"
#: selection:account.chart,init,target_move:0
#: model:ir.actions.report.xml,name:account.account_move_line_list
msgid "All Entries"
-msgstr "所有分录"
+msgstr "所有凭证"
#. module: account
#: model:process.node,name:account.process_node_draftinvoices0
@@ -3749,7 +3749,7 @@ msgstr "发票日期"
#. module: account
#: selection:account.account.type,close_method:0
msgid "Unreconciled"
-msgstr "未对账"
+msgstr "反核销"
#. module: account
#: field:account.account,note:0
@@ -3770,20 +3770,20 @@ msgid ""
" Bank statements\n"
" "
msgstr ""
-"财务和会计模块包括:\n"
+"财务和会计模块包括: \n"
" 普通会计\n"
-" 成本/辅助核算会计\n"
-" 第三方会计\n"
-" 税务管理\n"
-" 预算\n"
-" 客户和供应商发票\n"
-" 银行银行凭证\n"
+" 成本/辅助核算会计\n"
+" 第三方会计\n"
+" 税务管理\n"
+" 预算\n"
+" 客户和供应商发票\n"
+" 银行单据\n"
" "
#. module: account
#: field:account.journal,sequence_id:0
msgid "Entry Sequence"
-msgstr "分录序列"
+msgstr "凭证序列"
#. module: account
#: selection:account.account,type:0
@@ -3794,25 +3794,25 @@ msgstr "已关闭"
#. module: account
#: model:process.node,name:account.process_node_paymententries0
msgid "Payment Entries"
-msgstr "付款分录"
+msgstr "付款凭证"
#. module: account
#: help:account.move.line,tax_code_id:0
msgid "The Account can either be a base tax code or tax code account."
-msgstr "可以选基础税事务或税事务科目"
+msgstr "这科目可以是基础税事务或税事务科目"
#. module: account
#: help:account.automatic.reconcile,init,account_ids:0
msgid ""
"If no account is specified, the reconciliation will be made using every "
"accounts that can be reconcilied"
-msgstr "如果没有指定科目,对账将可用任何一个能对账的科目"
+msgstr "如果没有指定科目,核销将可用任何一个能核销的科目"
#. module: account
#: model:ir.actions.act_window,name:account.action_wizard_company_setup_form
#: view:wizard.company.setup:0
msgid "Overdue Payment Report Message"
-msgstr ""
+msgstr "逾期付款报表的消息"
#. module: account
#: selection:account.tax,tax_group:0
@@ -3826,7 +3826,7 @@ msgstr "其它"
#: model:ir.actions.wizard,name:account.wizard_general_ledger_report
#: model:ir.ui.menu,name:account.menu_general_ledger
msgid "General Ledger"
-msgstr "总分类帐"
+msgstr "按全部业务类型打印全部凭证"
#. module: account
#: field:account.journal.view,columns_id:0
@@ -3848,7 +3848,7 @@ msgstr "这会计期间可以重叠"
msgid ""
"This account will be used instead of the default one to value outgoing stock "
"for the current product"
-msgstr "这科目将替换当前产品的默认出仓"
+msgstr "这科目将替换为当前产品的默认出仓"
#. module: account
#: model:process.node,note:account.process_node_manually0
@@ -3877,7 +3877,7 @@ msgstr "留空使用当前日期"
#. module: account
#: rml:account.overdue:0
msgid "."
-msgstr "。"
+msgstr "."
#. module: account
#: field:account.analytic.account,quantity_max:0
@@ -3895,7 +3895,7 @@ msgid ""
"Gives the type of the analytic journal. When a document (eg: an invoice) "
"needs to create analytic entries, Open ERP will look for a matching journal "
"of the same type."
-msgstr "给出这辅助核算分录集的类型. 当单据(如发票)需要创建辅助核算分录. 系统将寻找同一类型匹配的业务类型."
+msgstr "给出这辅助核算类型的类型. 当单据(如发票)需要创建辅助核算凭证. 系统将寻找匹配这类型的辅助核算类型."
#. module: account
#: field:account.journal,groups_id:0
@@ -3916,12 +3916,12 @@ msgstr "代码/日期"
#: field:account.payment.term,active:0
#: field:account.tax,active:0
msgid "Active"
-msgstr "有效"
+msgstr "启用"
#. module: account
#: model:process.node,note:account.process_node_electronicfile0
msgid "Import from your bank statements"
-msgstr "从你的银行银行凭证导入"
+msgstr "从你的银行对账单导入"
#. module: account
#: view:account.chart.template:0
@@ -3936,12 +3936,12 @@ msgstr "客户会计属性"
#. module: account
#: view:account.bank.statement:0
msgid "Select entries"
-msgstr "选择分录"
+msgstr "选择凭证"
#. module: account
#: selection:account.chart,init,target_move:0
msgid "All Posted Entries"
-msgstr "所有已登帐的分录"
+msgstr "所有已登账凭证"
#. module: account
#: wizard_field:account.vat.declaration,init,based_on:0
@@ -4012,7 +4012,7 @@ msgstr "凭证"
#: view:account.bank.statement:0
#: field:account.bank.statement,line_ids:0
msgid "Statement lines"
-msgstr "银行凭证明细"
+msgstr "银行单据明细"
#. module: account
#: field:account.move.line,amount_taxed:0
@@ -4027,7 +4027,7 @@ msgstr "不含税小计"
#. module: account
#: field:account.invoice.line,invoice_id:0
msgid "Invoice Ref"
-msgstr "发票参考"
+msgstr "发票关联单号"
#. module: account
#: field:account.analytic.line,general_account_id:0
@@ -4044,14 +4044,14 @@ msgstr "此行的可选数量表示: 售出产品数量. 这数量虽然不是
#. module: account
#: wizard_field:account.third_party_ledger.report,init,reconcil:0
msgid " Include Reconciled Entries"
-msgstr " 包括已对账分录"
+msgstr " 包括已核销凭证"
#. module: account
#: help:account.move.line,blocked:0
msgid ""
"You can check this box to mark the entry line as a litigation with the "
"associated partner"
-msgstr "你能勾选此项去标记与有关业务伙伴的分录明细存在争议"
+msgstr "你能勾选此项去标记与有相关业务伙伴存在争议的凭证行"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree1
@@ -4083,7 +4083,7 @@ msgstr "一般"
#. module: account
#: rml:account.general.journal:0
msgid "Credit Trans."
-msgstr "信用交易"
+msgstr "赊帐"
#. module: account
#: field:wizard.multi.charts.accounts,seq_journal:0
@@ -4145,13 +4145,13 @@ msgstr "待处理"
#. module: account
#: model:ir.ui.menu,name:account.next_id_29
msgid "Search Entries"
-msgstr "查询业务类型"
+msgstr "查找凭证"
#. module: account
#: model:process.node,note:account.process_node_analytic0
#: model:process.node,note:account.process_node_analyticcost0
msgid "Analytic costs to reinvoice purchases, timesheets, ..."
-msgstr "再开发票, 采购, 时间表的辅助核算成本"
+msgstr "再开发票, 采购, 时间表的成本辅助核算"
#. module: account
#: field:account.account,tax_ids:0
@@ -4183,7 +4183,7 @@ msgstr "报表上显示的会计年度名称"
msgid ""
"This field is used for payable and receivable entries. You can put the limit "
"date for the payment of this entry line."
-msgstr "这字段用于应付和应收分录. 你可以放入该分录明细的付款限定日期"
+msgstr "这字段用于应付和应收凭证. 你可以放入该凭证行的付款限定日期"
#. module: account
#: rml:account.tax.code.entries:0
@@ -4198,7 +4198,7 @@ msgstr "上级左"
#. module: account
#: help:account.journal,sequence_id:0
msgid "The sequence gives the display order for a list of journals"
-msgstr "这序列提供业务类型列表的显示顺序"
+msgstr "这序列提供业务类型的显示顺序"
#. module: account
#: field:account.journal,type_control_ids:0
@@ -4275,7 +4275,7 @@ msgstr "已取消的发票"
#. module: account
#: view:account.subscription:0
msgid "Remove Lines"
-msgstr "删除明细"
+msgstr "删除行"
#. module: account
#: wizard_field:account.general.ledger.report,checktype,soldeinit:0
@@ -4297,7 +4297,7 @@ msgstr "年合计"
#. module: account
#: model:process.transition,note:account.process_transition_filestatement0
msgid "Import file from your bank statement"
-msgstr "从你的银行银行凭证导入文件"
+msgstr "从你的银行对账单导入"
#. module: account
#: field:account.account,type:0
@@ -4314,23 +4314,23 @@ msgstr "9"
#: model:ir.actions.act_window,name:account.action_subscription_form_running
#: model:ir.ui.menu,name:account.menu_action_subscription_form_running
msgid "Running Subscriptions"
-msgstr "运行中的周期性分录"
+msgstr "运行中的周期性凭证"
#. module: account
#: selection:account.move,type:0
msgid "Bank Payment"
-msgstr "银行转帐"
+msgstr "银行付款"
#. module: account
#: selection:account.move,state:0
msgid "Posted"
-msgstr "已登帐"
+msgstr "已登账"
#. module: account
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Credit Notes"
-msgstr "贷项单"
+msgstr "退还"
#. module: account
#: field:account.config.wizard,date2:0
@@ -4342,7 +4342,7 @@ msgstr "结束日期"
#: model:ir.actions.wizard,name:account.wizard_open_closed_fiscalyear
#: model:ir.ui.menu,name:account.menu_wizard_open_closed_fy
msgid "Cancel Opening Entries"
-msgstr "取消开账分录"
+msgstr "取消开账凭证"
#. module: account
#: model:process.transition,name:account.process_transition_invoicemanually0
@@ -4392,7 +4392,7 @@ msgstr "会计年度序列"
#. module: account
#: view:account.model.line:0
msgid "Entry Model Line"
-msgstr "分录模型明细"
+msgstr "凭证模型明细"
#. module: account
#: view:account.tax.template:0
@@ -4402,7 +4402,7 @@ msgstr "税模板"
#. module: account
#: help:account.model,name:0
msgid "This is a model for recurring accounting entries"
-msgstr "这是一个循环分录模型"
+msgstr "这是一个循环凭证模型"
#. module: account
#: wizard_view:account.wizard_paid_open,init:0
@@ -4422,7 +4422,7 @@ msgstr "你确定要打开这发票?"
#. module: account
#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
msgid "Partner Other Ledger"
-msgstr ""
+msgstr "合作伙伴其它分类账"
#. module: account
#: view:res.partner:0
@@ -4461,7 +4461,7 @@ msgstr "应收&应付"
#. module: account
#: rml:account.general.ledger:0
msgid "General Ledger -"
-msgstr "总账 -"
+msgstr "按全部业务类型打印全部凭证 -"
#. module: account
#: field:report.hr.timesheet.invoice.journal,quantity:0
@@ -4487,7 +4487,7 @@ msgstr "合计"
#: model:process.transition,note:account.process_transition_customerinvoice0
#: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
msgid "Number of entries are generated"
-msgstr "产生编号"
+msgstr "生成编号"
#. module: account
#: model:process.transition,name:account.process_transition_suppliervalidentries0
@@ -4500,12 +4500,12 @@ msgstr "审核的凭证"
#: model:ir.actions.wizard,name:account.wizard_line_account_use_model
#: model:ir.ui.menu,name:account.menu_account_use_model
msgid "Create Entries From Models"
-msgstr "按模型创建分录"
+msgstr "按模型创建凭证"
#. module: account
#: field:account.account.template,reconcile:0
msgid "Allow Reconciliation"
-msgstr "允许对账"
+msgstr "允许核销"
#. module: account
#: selection:account.account.balance.report,checktype,state:0
@@ -4519,12 +4519,12 @@ msgstr "按日期"
#: model:ir.actions.act_window,name:account.action_invoice_tree4
#: model:ir.ui.menu,name:account.menu_action_invoice_tree4
msgid "Supplier Refunds"
-msgstr "供应商退款"
+msgstr "供应商红字发票"
#. module: account
#: help:account.model.line,date:0
msgid "The date of the generated entries"
-msgstr "产生的日期"
+msgstr "生成的日期"
#. module: account
#: wizard_button:account.invoice.refund,init,modify_invoice:0
@@ -4546,20 +4546,20 @@ msgstr "辅助核算项目统计"
msgid ""
"This will automatically configure your chart of accounts, bank accounts, "
"taxes and journals according to the selected template"
-msgstr "将根据选择的模板自动设置你的科目一览表、银行帐号、税和业务类型"
+msgstr "将根据选择的模板自动设置你的科目一览表、银行账号、税和业务类型"
#. module: account
#: view:account.bank.statement:0
#: field:account.bank.statement.line,statement_id:0
#: field:account.move.line,statement_id:0
msgid "Statement"
-msgstr "银行凭证"
+msgstr "银行单据"
#. module: account
#: model:ir.actions.act_window,name:account.action_move_line_form_encode_by_move
#: model:ir.ui.menu,name:account.menu_encode_entries_by_move
msgid "Entries Encoding by Move"
-msgstr "会计凭证"
+msgstr "凭证"
#. module: account
#: wizard_view:account.analytic.account.chart,init:0
@@ -4580,13 +4580,13 @@ msgstr "含税价"
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree2
#: model:ir.ui.menu,name:account.account_analytic_journal_entries
msgid "Analytic Entries by Journal"
-msgstr "辅助核算业务类型"
+msgstr "辅助核算类型的辅助核算凭证"
#. module: account
#: model:process.transition,note:account.process_transition_suppliervalidentries0
#: model:process.transition,note:account.process_transition_validentries0
msgid "Valid entries from invoice"
-msgstr "发票有效分录"
+msgstr "发票有效凭证"
#. module: account
#: field:account.account,company_id:0
@@ -4628,7 +4628,7 @@ msgstr "指出如果税额必须在计算下一个税的基础金额里"
#. module: account
#: model:process.node,name:account.process_node_draftstatement0
msgid "Draft statement"
-msgstr "银行凭证草稿"
+msgstr "银行单据草稿"
#. module: account
#: field:account.analytic.journal,name:0
@@ -4638,7 +4638,7 @@ msgstr "业务类型名称"
#. module: account
#: model:process.transition,note:account.process_transition_invoiceimport0
msgid "Import invoice from statement"
-msgstr "从银行凭证导入发票"
+msgstr "从银行单据导入发票"
#. module: account
#: selection:account.automatic.reconcile,init,power:0
@@ -4661,7 +4661,7 @@ msgstr "从发票或者付款导入"
#: model:ir.actions.wizard,name:account.wizard_reconcile_select
#: model:ir.ui.menu,name:account.menu_reconcile_select
msgid "Reconcile entries"
-msgstr "对账分录"
+msgstr "核销凭证"
#. module: account
#: xsl:account.transfer:0
@@ -4671,7 +4671,7 @@ msgstr "改变"
#. module: account
#: field:account.journal.period,icon:0
msgid "Icon"
-msgstr "图标"
+msgstr "icon"
#. module: account
#: model:ir.model,name:account.model_account_journal_period
@@ -4692,7 +4692,7 @@ msgstr "创建月度会计期间"
#. module: account
#: wizard_button:account.aged.trial.balance,init,print:0
msgid "Print Aged Trial Balance"
-msgstr "打印过去的试算表"
+msgstr "打印账龄试算表"
#. module: account
#: field:account.analytic.line,ref:0
@@ -4702,7 +4702,7 @@ msgstr "打印过去的试算表"
#: rml:account.third_party_ledger:0
#: rml:account.third_party_ledger_other:0
msgid "Ref."
-msgstr "原始凭证编号"
+msgstr "关联单号"
#. module: account
#: field:account.invoice,address_invoice_id:0
@@ -4712,7 +4712,7 @@ msgstr "发票地址"
#. module: account
#: rml:account.analytic.account.analytic.check:0
msgid "General Credit"
-msgstr "一般贷方"
+msgstr "贷方"
#. module: account
#: help:account.journal,centralisation:0
@@ -4720,7 +4720,7 @@ msgid ""
"Check this box to determine that each entry of this journal won't create a "
"new counterpart but will share the same counterpart. This is used in fiscal "
"year closing."
-msgstr "勾选此项, 在会计年度关闭时, 确定每个业务类型的分录不会产生新副本, 而是共享同一副本."
+msgstr "在会计年度关闭时, 确定每个业务类型的凭证不会产生新副本, 而是共享同一副本. 勾选此项"
#. module: account
#: selection:account.invoice,state:0
@@ -4731,7 +4731,7 @@ msgstr "已取消"
#: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
#: model:ir.ui.menu,name:account.menu_bank_statement_draft_tree
msgid "Draft statements"
-msgstr "银行凭证草稿"
+msgstr "银行单据草稿"
#. module: account
#: wizard_field:populate_statement_from_inv,init,date:0
@@ -4741,13 +4741,13 @@ msgstr "付款日期"
#. module: account
#: rml:account.journal.period.print:0
msgid "A/c No."
-msgstr "帐号"
+msgstr "A/c No."
#. module: account
#: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree_month
#: model:ir.ui.menu,name:account.report_account_analytic_journal_print_month
msgid "Account cost and revenue by journal (This Month)"
-msgstr "项成本和收入的业务类型(这月)"
+msgstr "(这月)辅助核算类型,项目的成本和收入"
#. module: account
#: selection:account.partner.balance.report,init,result_selection:0
@@ -4758,13 +4758,13 @@ msgstr "应收款科目"
#. module: account
#: wizard_button:account.move.line.unreconcile.select,init,open:0
msgid "Open for unreconciliation"
-msgstr "打开未对账"
+msgstr "打开反核销"
#. module: account
#: field:account.bank.statement.reconcile,statement_line:0
#: model:ir.model,name:account.model_account_bank_statement_line
msgid "Bank Statement Line"
-msgstr "银行银行凭证明细"
+msgstr "银行对账单明细"
#. module: account
#: wizard_button:account.automatic.reconcile,reconcile,end:0
@@ -4781,7 +4781,7 @@ msgstr "控制发票"
#: selection:account.account.template,type:0
#: selection:account.aged.trial.balance,init,result_selection:0
msgid "Receivable"
-msgstr "应收的"
+msgstr "应收款"
#. module: account
#: model:ir.actions.report.xml,name:account.account_account_balance
@@ -4814,7 +4814,7 @@ msgstr "合计:"
#. module: account
#: model:ir.model,name:account.model_account_analytic_journal
msgid "account.analytic.journal"
-msgstr "项. 辅助核算. 业务类型"
+msgstr ""
#. module: account
#: view:account.fiscal.position:0
@@ -4831,13 +4831,13 @@ msgstr "销售税"
#. module: account
#: model:ir.model,name:account.model_account_move_reconcile
msgid "Account Reconciliation"
-msgstr "科目对账"
+msgstr "科目核销"
#. module: account
#: view:account.bank.statement:0
#: selection:account.bank.statement,state:0
msgid "Confirm"
-msgstr "确定"
+msgstr "确认"
#. module: account
#: wizard_view:account.account.balance.report,account_selection:0
@@ -4877,7 +4877,7 @@ msgstr "供应商发票"
#. module: account
#: selection:account.move.line,state:0
msgid "Valid"
-msgstr "有效"
+msgstr "生效"
#. module: account
#: field:account.account,debit:0
@@ -4913,7 +4913,7 @@ msgstr "操作日期"
#. module: account
#: field:account.invoice,invoice_line:0
msgid "Invoice Lines"
-msgstr "发票明细"
+msgstr "发票行"
#. module: account
#: field:account.period,date_start:0
@@ -4928,7 +4928,7 @@ msgstr "新名称"
#. module: account
#: wizard_button:account_use_models,init_form,create:0
msgid "Create Entries"
-msgstr "创建"
+msgstr "创建凭证"
#. module: account
#: field:account.tax,ref_tax_code_id:0
@@ -4949,7 +4949,7 @@ msgstr "连接自动产生的凭证"
#. module: account
#: wizard_field:account.automatic.reconcile,reconcile,reconciled:0
msgid "Reconciled transactions"
-msgstr "已对账交易"
+msgstr "已核销处理"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_reporting
@@ -4966,7 +4966,7 @@ msgstr "/"
#: model:process.node,note:account.process_node_invoiceinvoice0
#: model:process.node,note:account.process_node_supplierinvoiceinvoice0
msgid "Have a number and entries are generated"
-msgstr "生成记录和一个数字"
+msgstr "生成一个数字和记录"
#. module: account
#: rml:account.analytic.account.analytic.check:0
@@ -4981,7 +4981,7 @@ msgstr "科目余额 -"
#. module: account
#: field:account.journal,group_invoice_lines:0
msgid "Group invoice lines"
-msgstr "按发票明细分组"
+msgstr "按发票行分组"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_configuration
@@ -5002,7 +5002,7 @@ msgstr "业务类型"
#. module: account
#: view:account.subscription.line:0
msgid "Subscription lines"
-msgstr "周期性分录明细"
+msgstr "周期性凭证行"
#. module: account
#: field:account.chart.template,property_account_income:0
@@ -5055,7 +5055,7 @@ msgstr "税组"
#: model:ir.actions.act_window,name:account.action_invoice_tree3_new
#: model:ir.ui.menu,name:account.menu_action_invoice_tree3_new
msgid "New Customer Refund"
-msgstr "新的客户退款"
+msgstr "新的客户红字发票"
#. module: account
#: help:wizard.multi.charts.accounts,seq_journal:0
@@ -5074,12 +5074,12 @@ msgstr "导入发票"
#: wizard_view:account.move.line.unreconcile.select,init:0
#: wizard_view:account.reconcile.unreconcile,init:0
msgid "Unreconciliation"
-msgstr "未对账"
+msgstr "反核销"
#. module: account
#: model:ir.model,name:account.model_fiscalyear_seq
msgid "Maintains Invoice sequences with Fiscal Year"
-msgstr "维护发票序列与会计年度"
+msgstr "维持发票序列与会计年度"
#. module: account
#: selection:account.account.balance.report,checktype,display_account:0
@@ -5091,12 +5091,12 @@ msgstr "进展"
#: field:account.tax,domain:0
#: field:account.tax.template,domain:0
msgid "Domain"
-msgstr "域"
+msgstr "隶属"
#. module: account
#: view:account.analytic.account:0
msgid "Account Data"
-msgstr "项信息"
+msgstr "项目数据"
#. module: account
#: view:account.tax.code.template:0
@@ -5106,7 +5106,7 @@ msgstr "税事务科目模板"
#. module: account
#: view:account.subscription:0
msgid "Subscription Periods"
-msgstr "周期性分录的会计期间"
+msgstr "周期性凭证的会计期间"
#. module: account
#: model:process.node,name:account.process_node_manually0
@@ -5124,7 +5124,7 @@ msgstr "手动"
#: model:ir.ui.menu,name:account.menu_finance_invoice
#: wizard_field:populate_statement_from_inv,go,lines:0
msgid "Invoices"
-msgstr "发票"
+msgstr "发票列表"
#. module: account
#: selection:account.partner.balance.report,init,result_selection:0
@@ -5136,7 +5136,7 @@ msgstr "应付款科目"
#: view:account.invoice.line:0
#: field:account.invoice.tax,invoice_id:0
msgid "Invoice Line"
-msgstr "发票明细"
+msgstr "发票行"
#. module: account
#: wizard_field:account.invoice.pay,addendum,writeoff_journal_id:0
@@ -5156,7 +5156,7 @@ msgstr "采购业务类型"
#. module: account
#: selection:account.move,type:0
msgid "Cash Receipt"
-msgstr "现金收入"
+msgstr "现金收据"
#. module: account
#: field:account.fiscal.position.tax,tax_dest_id:0
@@ -5167,7 +5167,7 @@ msgstr "替代的税"
#. module: account
#: model:process.transition,note:account.process_transition_invoicemanually0
msgid "Encode manually statement comes into the draft statement"
-msgstr "从手动转为草稿"
+msgstr "银行单据从手动转为草稿"
#. module: account
#: model:ir.ui.menu,name:account.next_id_43
@@ -5194,7 +5194,7 @@ msgstr "付款"
#. module: account
#: model:process.node,note:account.process_node_accountingstatemententries0
msgid "Accounting entries at statement's confirmation"
-msgstr "在记账银行凭证产生的会计分录"
+msgstr "确认银行单据的凭证"
#. module: account
#: wizard_view:account_use_models,create:0
@@ -5214,7 +5214,7 @@ msgstr "所有"
#. module: account
#: help:account.invoice.tax,tax_code_id:0
msgid "The tax basis of the tax declaration."
-msgstr "税说明的税基"
+msgstr "税说明中的税基"
#. module: account
#: wizard_view:account.account.balance.report,checktype:0
@@ -5251,7 +5251,7 @@ msgstr "已付"
#: model:ir.actions.act_window,name:account.action_invoice_tree11
#: model:ir.ui.menu,name:account.menu_action_invoice_tree11
msgid "Unpaid Customer Refunds"
-msgstr "未支付的客户退款"
+msgstr "未支付的客户红字发票"
#. module: account
#: help:account.invoice,residual:0
@@ -5272,12 +5272,12 @@ msgstr "形式发票"
#. module: account
#: field:account.move.reconcile,line_partial_ids:0
msgid "Partial Entry lines"
-msgstr "部分分录明细"
+msgstr "部分凭证行"
#. module: account
#: help:account.move.line,statement_id:0
msgid "The bank statement used for bank reconciliation"
-msgstr "这银行银行凭证用于银行对帐"
+msgstr "这银行对账单用于对账"
#. module: account
#: view:account.fiscalyear:0
@@ -5287,7 +5287,7 @@ msgstr "会计年度"
#. module: account
#: wizard_button:account.analytic.line,init,open:0
msgid "Open Entries"
-msgstr "打开分录"
+msgstr "打开凭证"
#. module: account
#: selection:account.analytic.account,type:0
@@ -5318,7 +5318,7 @@ msgstr "页"
#: view:account.move:0
#: view:account.move.line:0
msgid "Optional Information"
-msgstr "其它信息"
+msgstr "可选信息"
#. module: account
#: model:ir.actions.act_window,name:account.action_payment_term_form
@@ -5376,7 +5376,7 @@ msgstr "税适用"
#: model:ir.actions.act_window,name:account.action_subscription_form
#: model:ir.ui.menu,name:account.menu_action_subscription_form
msgid "Subscription Entries"
-msgstr "周期性分录"
+msgstr "周期性凭证"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree6
@@ -5435,7 +5435,7 @@ msgstr "余额"
#. module: account
#: rml:account.invoice:0
msgid "Refund"
-msgstr "退款"
+msgstr "红字发票"
#. module: account
#: model:ir.model,name:account.model_account_invoice_tax
@@ -5446,17 +5446,17 @@ msgstr "发票税"
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
#: model:ir.ui.menu,name:account.account_def_analytic_journal
msgid "Analytic Journal Definition"
-msgstr "定义辅助核算业务类型"
+msgstr "定义辅助核算类型"
#. module: account
#: model:ir.model,name:account.model_account_tax_template
msgid "account.tax.template"
-msgstr "科目.税.模板"
+msgstr ""
#. module: account
#: field:wizard.multi.charts.accounts,bank_accounts_id:0
msgid "Bank Accounts"
-msgstr "银行帐号"
+msgstr "银行账号"
#. module: account
#: constraint:account.period:0
@@ -5477,7 +5477,7 @@ msgstr "这序列用于这业务类型的发票号"
#: view:account.move:0
#: view:account.move.line:0
msgid "General Information"
-msgstr "一般信息"
+msgstr "普通信息"
#. module: account
#: help:populate_statement_from_inv,init,journal_id:0
@@ -5490,7 +5490,7 @@ msgstr "这字段允许你选择要过滤的发票的会计业务类型. 如果
#. module: account
#: constraint:account.fiscalyear:0
msgid "Error ! The duration of the Fiscal Year is invalid. "
-msgstr "错误!会计年度的期限无效 "
+msgstr "错误!会计年度无效 "
#. module: account
#: selection:account.analytic.account,state:0
@@ -5533,12 +5533,12 @@ msgstr "成本分类账(只有数量)"
#. module: account
#: wizard_view:account.move.validate,init:0
msgid "Validate Account Entries"
-msgstr "记账"
+msgstr "审核凭证"
#. module: account
#: selection:account.print.journal.report,init,sort_selection:0
msgid "Reference Number"
-msgstr "参考编号"
+msgstr "关联单号数"
#. module: account
#: rml:account.overdue:0
@@ -5696,7 +5696,7 @@ msgstr "科目模型"
#: view:account.invoice:0
#: model:ir.actions.act_window,name:account.act_account_analytic_account_2_account_invoice_line
msgid "Invoice lines"
-msgstr "发票明细"
+msgstr "发票行"
#. module: account
#: selection:account.bank.statement.line,type:0
@@ -5721,25 +5721,25 @@ msgstr "科目.序列.会计年度"
#. module: account
#: wizard_field:account.print.journal.report,init,sort_selection:0
msgid "Entries Sorted By"
-msgstr "分录排序按"
+msgstr "凭证排序按"
#. module: account
#: rml:account.journal.period.print:0
msgid "Print Journal -"
-msgstr "打印业务类型 -"
+msgstr "按业务类型打印凭证 -"
#. module: account
#: field:account.bank.accounts.wizard,bank_account_id:0
#: field:account.chart.template,bank_account_view_id:0
#: field:account.invoice,partner_bank:0
msgid "Bank Account"
-msgstr "银行帐号"
+msgstr "银行账号"
#. module: account
#: model:ir.actions.act_window,name:account.action_model_form
#: model:ir.ui.menu,name:account.menu_action_model_form
msgid "Models Definition"
-msgstr "分录模型定义"
+msgstr "凭证模型定义"
#. module: account
#: model:account.account.type,name:account.account_type_cash_moves
@@ -5772,7 +5772,7 @@ msgstr "会计年度"
#. module: account
#: selection:account.aged.trial.balance,init,direction_selection:0
msgid "Future"
-msgstr "未来"
+msgstr "前景"
#. module: account
#: help:account.account.balance.report,checktype,fiscalyear:0
@@ -5787,18 +5787,18 @@ msgstr "留空为所有开启的会计年度"
#: rml:account.invoice:0
#: selection:account.invoice,type:0
msgid "Supplier Refund"
-msgstr "供应商退款"
+msgstr "供应商红字发票"
#. module: account
#: model:process.transition,note:account.process_transition_entriesreconcile0
#: model:process.transition,note:account.process_transition_supplierentriesreconcile0
msgid "Reconcile Entries."
-msgstr "对账分录"
+msgstr "核销凭证"
#. module: account
#: field:account.subscription.line,move_id:0
msgid "Entry"
-msgstr "分录"
+msgstr "凭证"
#. module: account
#: model:process.node,note:account.process_node_paidinvoice0
@@ -5806,7 +5806,7 @@ msgstr "分录"
#: model:process.transition,note:account.process_transition_reconcilepaid0
#: model:process.transition,note:account.process_transition_supplierreconcilepaid0
msgid "Paid invoice when reconciled."
-msgstr "对账时支付发票"
+msgstr "核销时支付发票"
#. module: account
#: field:account.tax,python_compute_inv:0
@@ -5846,7 +5846,7 @@ msgstr "通常用 1或-1"
#. module: account
#: view:res.partner:0
msgid "Bank Details"
-msgstr "银行详情"
+msgstr "银行信息"
#. module: account
#: field:account.chart.template,property_account_expense:0
@@ -5856,7 +5856,7 @@ msgstr "产品模板的费用科目"
#. module: account
#: rml:account.analytic.account.analytic.check:0
msgid "General Debit"
-msgstr "一般借方"
+msgstr "借方"
#. module: account
#: field:account.analytic.account,code:0
@@ -5888,12 +5888,12 @@ msgstr "财务结构"
#. module: account
#: model:process.process,name:account.process_process_statementprocess0
msgid "Statement Process"
-msgstr "银行凭证处理"
+msgstr "银行单据处理"
#. module: account
#: model:ir.model,name:account.model_account_bank_statement_reconcile
msgid "Statement reconcile"
-msgstr "银行凭证核销"
+msgstr "银行单据对账"
#. module: account
#: wizard_field:account.fiscalyear.close,init,sure:0
@@ -5931,7 +5931,7 @@ msgstr "是"
#: help:account.account,reconcile:0
msgid ""
"Check this if the user is allowed to reconcile entries in this account."
-msgstr "勾选, 如果用户可以在这科目对账分录."
+msgstr "勾选, 如果用户可以在这科目核销凭证."
#. module: account
#: wizard_button:account.subscription.generate,init,generate:0
@@ -6113,7 +6113,7 @@ msgstr "显示对比 %"
#. module: account
#: wizard_view:account.balance.account.balance.report,init:0
msgid "Select Period"
-msgstr ""
+msgstr "选择会计期间"
#. module: account
#: wizard_view:account.balance.account.balance.report,init:0
diff --git a/addons/account/installer.py b/addons/account/installer.py
index c072375aa99..4843f54187c 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -219,10 +219,12 @@ class account_installer(osv.osv_memory):
vals_seq = {
'name': _('Bank Journal '),
'code': 'account.journal',
+ 'prefix': 'BAN/',
+ 'padding': 5
}
seq_id = obj_sequence.create(cr,uid,vals_seq)
- #create the bank journal
+ #create the bank journals
vals_journal = {}
vals_journal['name']= _('Bank Journal ')
vals_journal['code']= _('BNK')
@@ -238,9 +240,21 @@ class account_installer(osv.osv_memory):
obj_journal.create(cr,uid,vals_journal)
for val in record.bank_accounts_id:
- if val.account_type == 'cash':type = cash_type_id
- elif val.account_type == 'bank':type = bank_type_id
- else:type = check_type_id
+ seq_prefix = None
+ seq_padding = 5
+ if val.account_type == 'cash':
+ type = cash_type_id
+ seq_prefix = "CSH/"
+ elif val.account_type == 'bank':
+ type = bank_type_id
+ seq_prefix = "BAN/"
+ elif val.account_type == 'check':
+ type = check_type_id
+ seq_prefix = "CHK/"
+ else:
+ type = check_type_id
+ seq_padding = None
+
vals_bnk = {'name': val.acc_name or '',
'currency_id': val.currency_id.id or False,
'code': str(110400 + code_cnt),
@@ -252,6 +266,8 @@ class account_installer(osv.osv_memory):
vals_seq_child = {
'name': _(vals_bnk['name']),
'code': 'account.journal',
+ 'prefix': seq_prefix,
+ 'padding': seq_padding
}
seq_id = obj_sequence.create(cr, uid, vals_seq_child)
@@ -272,7 +288,7 @@ class account_installer(osv.osv_memory):
code_cnt += 1
- #reactivate the parent_store functionnality on account_account
+ #reactivate the parent_store functionality on account_account
self.pool._init = False
self.pool.get('account.account')._parent_store_compute(cr)
@@ -292,8 +308,20 @@ class account_installer(osv.osv_memory):
seq_id = obj_sequence.search(cr,uid,[('name','=','Account Journal')])[0]
if seq_journal:
- seq_id_sale = obj_sequence.search(cr,uid,[('name','=','Sale Journal')])[0]
- seq_id_purchase = obj_sequence.search(cr,uid,[('name','=','Purchase Journal')])[0]
+ seq_sale = {
+ 'name': 'Sale Journal',
+ 'code': 'account.journal',
+ 'prefix': 'INV/',
+ 'padding': 4
+ }
+ seq_id_sale = obj_sequence.create(cr, uid, seq_sale)
+ seq_purchase = {
+ 'name': 'Purchase Journal',
+ 'code': 'account.journal',
+ 'prefix': 'VEN/',
+ 'padding': 4
+ }
+ seq_id_purchase = obj_sequence.create(cr, uid, seq_purchase)
else:
seq_id_sale = seq_id
seq_id_purchase = seq_id
@@ -323,7 +351,42 @@ class account_installer(osv.osv_memory):
vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.property_account_expense_categ.id]
obj_journal.create(cr,uid,vals_journal)
+
+ # Creating Journals Sales Refund and Purchase Refund
+ vals_journal={}
+ data_id = mod_obj.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_sp_refund_journal_view')])
+ data = mod_obj.browse(cr, uid, data_id[0])
+ view_id = data.res_id
+ seq_id_sale_refund = seq_id_sale
+ seq_id_purchase_refund = seq_id_purchase
+
+ vals_journal['view_id'] = view_id
+
+ #Sales Refund Journal
+ vals_journal['name'] = _('Sales Refund Journal')
+ vals_journal['type'] = 'sale_refund'
+ vals_journal['code'] = _('SCNJ')
+ vals_journal['sequence_id'] = seq_id_sale_refund
+
+ if obj_multi.property_account_receivable:
+ vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.property_account_income_categ.id]
+ vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.property_account_income_categ.id]
+
+ obj_journal.create(cr,uid,vals_journal)
+
+ # Purchase Refund Journal
+ vals_journal['name'] = _('Purchase Refund Journal')
+ vals_journal['type'] = 'purchase_refund'
+ vals_journal['code'] = _('ECNJ')
+ vals_journal['sequence_id'] = seq_id_purchase_refund
+
+ if obj_multi.property_account_payable:
+ vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.property_account_expense_categ.id]
+ vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.property_account_expense_categ.id]
+
+ obj_journal.create(cr,uid,vals_journal)
+
# Bank Journals
view_id_cash = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal View')])[0] #TOFIX: Why put fixed name ?
view_id_cur = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal (Multi-Currency) View')])[0] #TOFIX: why put fixed name?
diff --git a/addons/account/report/__init__.py b/addons/account/report/__init__.py
index 7c908570c2a..15569278e71 100644
--- a/addons/account/report/__init__.py
+++ b/addons/account/report/__init__.py
@@ -35,12 +35,11 @@ import account_balance_landscape
import compare_account_balance
import account_invoice_report
import account_report
-import account_analytic_report
-import account_account_report
import account_entries_report
import account_analytic_entries_report
import voucher_print
import account_balance_sheet
import account_profit_loss
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/report/account_account_report.py b/addons/account/report/account_account_report.py
deleted file mode 100644
index b396521e45c..00000000000
--- a/addons/account/report/account_account_report.py
+++ /dev/null
@@ -1,86 +0,0 @@
-# -*- 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 tools
-from osv import fields,osv
-
-class account_account_report(osv.osv):
- _name = "account.account.report"
- _description = "Account Report"
- _auto = False
- _columns = {
- 'name': fields.char('Name', size=128, readonly=True),
- 'code': fields.char('Code', size=64, readonly=True),
- 'type': fields.selection([
- ('receivable', 'Receivable'),
- ('payable', 'Payable'),
- ('view', 'View'),
- ('consolidation', 'Consolidation'),
- ('other', 'Others'),
- ('closed', 'Closed'),
- ], 'Internal Type', readonly=True),
- 'company_id': fields.many2one('res.company', 'Company', required=True),
- 'currency_mode': fields.selection([('current', 'At Date'), ('average', 'Average Rate')], 'Outgoing Currencies Rate', readonly=True),
- 'user_type': fields.many2one('account.account.type', 'Account Type', readonly=True),
- 'quantity': fields.float('Quantity', readonly=True),
- 'amount_total': fields.float('Total Amount', readonly=True),
- 'credit': fields.float('Credit', readonly=True),
- 'debit': fields.float('Debit', readonly=True),
- 'balance': fields.float('Balance', readonly=True),
- 'nbr': fields.integer('#Accounts', readonly=True),
- 'parent_account_id': fields.many2one('account.account', 'Parent Account', required=True),
- }
- def init(self, cr):
- tools.drop_view_if_exists(cr, 'account_account_report')
- cr.execute("""
- create or replace view account_account_report as (
- select
- min(a.id) as id,
- count(distinct a.id) as nbr,
- a.name,
- a.code,
- a.type as type,
- a.company_id as company_id,
- a.currency_mode as currency_mode,
- a.user_type as user_type,
- a.parent_id as parent_account_id,
- sum(ail.quantity) as quantity,
- sum(ail.price_subtotal) as amount_total,
- sum(m.credit) as credit,
- sum(m.debit) as debit,
- (sum(m.credit)-sum(m.debit)) as balance
- from
- account_account as a
- left join account_move_line as m on m.account_id=a.id
- left join account_invoice_line as ail on ail.account_id=a.id
- left join account_invoice as ai on ai.account_id=a.id
- group by
- a.name,
- a.code,
- a.type,
- a.company_id,
- a.currency_mode,
- a.user_type,
- m.account_id,
- a.parent_id
- )
- """)
-account_account_report()
diff --git a/addons/account/report/account_account_report_view.xml b/addons/account/report/account_account_report_view.xml
deleted file mode 100644
index 521fe37ff4b..00000000000
--- a/addons/account/report/account_account_report_view.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-
-
-
-
- account.account.report.tree
- account.account.report
- tree
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- account.account.report.graph
- account.account.report
- graph
-
-
-
-
-
-
-
-
-
-
-
- account.account.report.search
- account.account.report
- search
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Accounts Analysis
- account.account.report
- form
- tree,graph
- {"search_default_Account":1,"search_default_At Date":1,'group_by_no_leaf':1,'group_by':[]}
-
-
-
-
-
-
-
diff --git a/addons/account/report/account_analytic_report.py b/addons/account/report/account_analytic_report.py
deleted file mode 100644
index a740076ad09..00000000000
--- a/addons/account/report/account_analytic_report.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# -*- 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 tools
-from osv import fields,osv
-
-class analytic_report(osv.osv):
- _name = "analytic.report"
- _description = "Analytic Accounts Statistics"
- _auto = False
- _columns = {
- 'date_start': fields.date('Date Start', readonly=True),
- 'date_end': fields.date('Date End', readonly=True),
- 'name' : fields.char('Analytic Account', size=128, readonly=True),
- 'partner_id' : fields.many2one('res.partner', 'Associated Partner', readonly=True),
- 'journal_id' : fields.many2one('account.analytic.journal', 'Analytic Journal', readonly=True),
- 'parent_id': fields.many2one('account.analytic.account', 'Parent Analytic Account', readonly=True),
- 'user_id' : fields.many2one('res.users', 'Account Manager', readonly=True),
- 'product_id' : fields.many2one('product.product', 'Product', readonly=True),
- 'total_quantity': fields.float('# Total Quantity', readonly=True),
- 'debit' : fields.float('Debit', readonly=True),
- 'credit' : fields.float('Credit', readonly=True),
- 'balance' : fields.float('Balance', 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'),
- ('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True),
- 'day': fields.char('Day', size=128, readonly=True),
- 'nbr':fields.integer('# of Lines', readonly=True),
- 'company_id': fields.many2one('res.company', 'Company', readonly=True),
- 'type': fields.selection([('view','View'), ('normal','Normal')], 'Account Type'),
-
- 'state': fields.selection([('draft','Draft'),
- ('open','Open'),
- ('pending','Pending'),
- ('cancelled', 'Cancelled'),
- ('close','Close'),
- ('template', 'Template')],
- 'State', readonly=True),
-
- }
- _order = 'date_start desc'
- def init(self, cr):
- tools.drop_view_if_exists(cr, 'analytic_report')
- cr.execute("""
- create or replace view analytic_report as (
- select
- min(s.id) as id,
- to_char(s.create_date, 'YYYY') as year,
- to_char(s.create_date, 'MM') as month,
- to_char(s.create_date, 'YYYY-MM-DD') as day,
- l.journal_id,
- l.product_id,
- s.parent_id,
- s.date_start,
- s.date as date_end,
- s.user_id,
- s.company_id,
- s.type,
- s.name,
- s.partner_id,
- sum(s.quantity) as total_quantity,
- s.debit,
- s.credit,
- s.balance,
- count(*) as nbr,
- s.state
- from account_analytic_account s
- left join account_analytic_line l on (s.id=l.account_id)
- GROUP BY s.create_date,s.state,l.journal_id,s.name,
- s.partner_id,s.date_start,s.date,s.user_id,
- s.company_id,s.type,
- s.debit,s.credit,s.balance,s.parent_id,l.product_id
- )
- """)
-analytic_report()
diff --git a/addons/account/report/account_analytic_report_view.xml b/addons/account/report/account_analytic_report_view.xml
deleted file mode 100644
index cb7318fe3e4..00000000000
--- a/addons/account/report/account_analytic_report_view.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-
-
-
-
- analytic.report.tree
- analytic.report
- tree
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- analytic.report.search
- analytic.report
- search
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- account.analytic.report.graph
- analytic.report
- graph
-
-
-
-
-
-
-
-
-
-
-
- Analytic Accounts Analysis
- analytic.report
- form
- tree,graph
- {'search_default_This Month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}
-
-
-
-
-
-
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index f580bdbc92f..1fec339eb84 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -13,6 +13,11 @@
Accounting / Manager
+
+ Accounting / Accountant and Manager
+
+
+
@@ -22,7 +27,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Account Entry
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index 890d4f505ea..71d295eb565 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -88,7 +88,6 @@
"access_report_account_type_sales","report.account_type.sales","model_report_account_type_sales","account.group_account_manager",1,0,0,0
"access_report_account_sales","report.account.sales","model_report_account_sales","account.group_account_manager",1,0,0,0
"access_account_invoice_report","account.invoice.report","model_account_invoice_report","account.group_account_manager",1,1,1,1
-"access_account_account_report_manager","account.account.report","model_account_account_report","account.group_account_manager",1,0,0,0
"access_res_partner_group_account_manager","res_partner group_account_manager","model_res_partner","account.group_account_manager",1,1,1,1
"access_account_invoice_accountant","account.invoice accountant","model_account_invoice","account.group_account_user",1,0,0,0
"access_account_tax_code_accountant","account.tax.code accountant","model_account_tax_code","account.group_account_user",1,1,1,1
@@ -149,7 +148,6 @@
"access_account_invoice_line_accountant","account.invoice.line accountant","model_account_invoice_line","account.group_account_user",1,0,0,0
"access_res_partner_address_accountant","res.partner.address accountant","base.model_res_partner_address","account.group_account_user",1,0,0,0
"access_account_invoice_line_manager","account.invoice.line manager","model_account_invoice_line","account.group_account_manager",1,0,0,0
-"access_analytic_report_manager","analytic.report manager","model_analytic_report","account.group_account_manager",1,1,1,1
"access_account_account_invoice","account.account invoice","model_account_account","account.group_account_invoice",1,1,1,1
"access_res_partner_address_invoice","res.partner.address invoice","base.model_res_partner_address","account.group_account_invoice",1,1,1,1
"access_account_invoice_line_system","account.invoice.line system","model_account_invoice_line","base.group_system",1,0,0,0
@@ -158,3 +156,51 @@
"access_report_account_receivable_invoice","report.account.receivable.invoice","model_report_account_receivable","account.group_account_invoice",1,1,1,1
"access_report_account_receivable_user","report.account.receivable.user","model_report_account_receivable","account.group_account_user",1,1,1,1
"access_account_sequence_fiscal_year_invoice","account.sequence.fiscalyear invoice","model_account_sequence_fiscalyear","account.group_account_invoice",1,1,1,1
+"access_account_invoice_report","account.invoice.report","model_account_invoice_report","account.group_account_invoice",1,0,0,0
+"access_account_invoice","account.invoice","model_account_invoice","account.group_accounting_accountant",1,1,1,1
+"access_account_invoice_line","account.invoice.line","model_account_invoice_line","account.group_accounting_accountant",1,1,1,1
+"access_res_partner","res.partner","base.model_res_partner","account.group_accounting_accountant",1,1,1,1
+"access_account_account","account.account","model_account_account","account.group_accounting_accountant",1,0,0,0
+"access_account_account_type","account.type","model_account_account_type","account.group_accounting_accountant",1,0,0,0
+"access_account_tax","account.tax","model_account_tax","account.group_accounting_accountant",1,0,0,0
+"access_account_tax_code","account.tax.code","model_account_tax_code","account.group_accounting_accountant",1,0,0,0
+"access_account_invoice_tax","account.invoice.tax","model_account_invoice_tax","account.group_accounting_accountant",1,0,0,0
+"access_res_partner_address","res.partner.address","base.model_res_partner_address","account.group_accounting_accountant",1,1,1,1
+"access_account_move","account.move","model_account_move","account.group_accounting_accountant",1,1,1,1
+"access_account_move_line","account.move.line","model_account_move_line","account.group_accounting_accountant",1,1,1,1
+"access_res_partner_bank","res.partner.bank","base.model_res_partner_bank","account.group_accounting_accountant",1,0,0,0
+"access_res_partner_event","res.partner.event","base.model_res_partner_event","account.group_accounting_accountant",1,0,0,0
+"access_res_currency_rate","res.currency.rate","base.model_res_currency_rate","account.group_accounting_accountant",1,1,0,0
+"access_res_currency","res.currency","base.model_res_currency","account.group_accounting_accountant",1,1,0,0
+"access_product_template","product.template","product.model_product_template","account.group_accounting_accountant",1,0,0,0
+"access_product_product","product.product","product.model_product_product","account.group_accounting_accountant",1,0,0,0
+"access_product_category","product.category","product.model_product_category","account.group_accounting_accountant",1,0,0,0
+"access_product_pricelist","product.pricelist","product.model_product_pricelist","account.group_accounting_accountant",1,0,0,0
+"access_product_pricelist_version","product.pricelist.version","product.model_product_pricelist_version","account.group_accounting_accountant",1,0,0,0
+"access_product_pricelist_item","product.pricelist.item","product.model_product_pricelist_item","account.group_accounting_accountant",1,0,0,0
+"access_account_payment_term","account.payment.term","model_account_payment_term","account.group_accounting_accountant",1,0,0,0
+"access_res_payterm","res.payterm","base.model_res_payterm","account.group_accounting_accountant",1,0,0,0
+"access_account_payment_term_line","account.payment.term.line","model_account_payment_term_line","account.group_accounting_accountant",1,0,0,0
+"access_account_journal","account.journal","model_account_journal","account.group_accounting_accountant",1,0,0,0
+"access_account_fiscalyear","account.fiscalyear","model_account_fiscalyear","account.group_accounting_accountant",1,0,0,0
+"access_account_period","account.period","model_account_period","account.group_accounting_accountant",1,0,0,0
+"access_account_move_reconcile","account.move.reconcile","model_account_move_reconcile","account.group_accounting_accountant",1,1,1,1
+"access_account_tax_code","account.tax.code","model_account_tax_code","account.group_accounting_accountant",1,0,0,0
+"access_account_bank_statement","account.bank.statement","model_account_bank_statement","account.group_accounting_accountant",1,1,1,1
+"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_accounting_accountant",1,1,1,1
+"access_account_bank_statement_reconcile_line","account.bank.statement.reconcile.line","model_account_bank_statement_reconcile_line","account.group_accounting_accountant",1,1,1,1
+"access_account_bank_statement_line","account.bank.statement.line","model_account_bank_statement_line","account.group_accounting_accountant",1,1,1,1
+"access_account_invoice_report","account.invoice.report","model_account_invoice_report","account.group_accounting_accountant",1,0,0,0
+"access_report_account_receivable","report.account.receivable","model_report_account_receivable","account.group_accounting_accountant",1,0,0,0
+"access_temp_range","temp.range","model_temp_range","account.group_accounting_accountant",1,0,0,0
+"access_report_aged_receivable","report.aged.receivable","model_report_aged_receivable","account.group_accounting_accountant",1,0,0,0
+"access_report_invoice_created","report.invoice.created","model_report_invoice_created","account.group_accounting_accountant",1,0,0,0
+"access_account_entries_report","account.entries.report","model_account_entries_report","account.group_accounting_accountant",1,0,0,0
+"access_account_invoice_report","account.invoice.report","model_account_invoice_report","account.group_accounting_accountant",1,0,0,0
+"access_account_journal_view","account.journal.view","model_account_journal_view","account.group_accounting_accountant",1,0,0,0
+"access_account_journal_period","account.journal.period","model_account_journal_period","account.group_accounting_accountant",1,1,1,1
+"access_account_journal_column","account.journal.column","model_account_journal_column","account.group_accounting_accountant",1,1,1,1
+"access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","account.group_accounting_accountant",1,0,0,0
+"access_account_analytic_line","account.analytic.line","analytic.model_account_analytic_line","account.group_accounting_accountant",1,0,0,0
+"access_account_analytic_journal","account.analytic.journal","model_account_analytic_journal","account.group_accounting_accountant",1,0,0,0
+"access_account_bank_statement_reconcile","account.bank.statement.reconcile","model_account_bank_statement_reconcile","account.group_accounting_accountant",1,1,1,1
diff --git a/addons/account/wizard/account_change_currency.py b/addons/account/wizard/account_change_currency.py
index 66c6ee55c10..aa6b477d30d 100644
--- a/addons/account/wizard/account_change_currency.py
+++ b/addons/account/wizard/account_change_currency.py
@@ -26,8 +26,8 @@ class account_change_currency(osv.osv_memory):
_name = 'account.change.currency'
_description = 'Change Currency'
_columns = {
- 'currency_id': fields.many2one('res.currency', 'New Currency', required=True),
- }
+ 'currency_id': fields.many2one('res.currency', 'Change to', required=True, help="Select a currency to apply on the invoice"),
+ }
def view_init(self, cr , uid , fields_list, context=None):
obj_inv = self.pool.get('account.invoice')
@@ -56,13 +56,19 @@ class account_change_currency(osv.osv_memory):
new_price = 0
if invoice.company_id.currency_id.id == invoice.currency_id.id:
new_price = line.price_unit * rate
+ if new_price <= 0:
+ raise osv.except_osv(_('Error'), _('New currency is not confirured properly !'))
if invoice.company_id.currency_id.id != invoice.currency_id.id and invoice.company_id.currency_id.id == new_currency:
old_rate = invoice.currency_id.rate
+ if old_rate <= 0:
+ raise osv.except_osv(_('Error'), _('Currnt currency is not confirured properly !'))
new_price = line.price_unit / old_rate
if invoice.company_id.currency_id.id != invoice.currency_id.id and invoice.company_id.currency_id.id != new_currency:
old_rate = invoice.currency_id.rate
+ if old_rate <= 0:
+ raise osv.except_osv(_('Error'), _('Current currency is not confirured properly !'))
new_price = (line.price_unit / old_rate ) * rate
obj_inv_line.write(cr, uid, [line.id], {'price_unit' : new_price})
obj_inv.write(cr, uid, [invoice.id], {'currency_id' : new_currency}, context=context)
@@ -70,4 +76,4 @@ class account_change_currency(osv.osv_memory):
account_change_currency()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py
index 46f72e04332..b9c53eeb4e1 100644
--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@@ -71,7 +71,7 @@ class account_common_report(osv.osv_memory):
(SELECT max(date_start) from account_period WHERE p.fiscalyear_id = f.id)\
OR p.date_stop IN \
(SELECT min(date_stop) from account_period WHERE p.fiscalyear_id = f.id)) \
- AND f.id = ' + str(fiscalyear_id) + ' ')
+ AND f.id = ' + str(fiscalyear_id) + ' order by p.date_start')
periods = [i[0] for i in cr.fetchall()]
if periods:
start_period = periods[0]
diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py
index ab72c57a229..e7aa4f1bbca 100644
--- a/addons/account_accountant/__openerp__.py
+++ b/addons/account_accountant/__openerp__.py
@@ -23,7 +23,7 @@
"version" : "1.1",
"author" : "OpenERP SA",
"category": 'Generic Modules/Accounting',
- "description": """Account Accountant: This module make the account an Invoicing system but not an
+ "description": """Account Accountant: This module makes the account as an Invoicing system but not an
accounting one.
""",
'website': 'http://www.openerp.com',
diff --git a/addons/account_accountant/account_security.xml b/addons/account_accountant/account_security.xml
index 80df9ab37a4..0b167de9853 100644
--- a/addons/account_accountant/account_security.xml
+++ b/addons/account_accountant/account_security.xml
@@ -1,152 +1,129 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Accounting / Accountant and Manager
-
-
+
+
+
-
+
+
+
-
+
diff --git a/addons/account_analytic_analysis/i18n/bg.po b/addons/account_analytic_analysis/i18n/bg.po
index 6ae6b59bada..b057727ca67 100644
--- a/addons/account_analytic_analysis/i18n/bg.po
+++ b/addons/account_analytic_analysis/i18n/bg.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-08-14 09:06+0000\n"
+"PO-Revision-Date: 2010-08-15 10:39+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:20+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/fi.po b/addons/account_analytic_analysis/i18n/fi.po
index f33c5ebe796..abbb834f2e5 100644
--- a/addons/account_analytic_analysis/i18n/fi.po
+++ b/addons/account_analytic_analysis/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-14 09:01+0000\n"
+"PO-Revision-Date: 2010-08-15 10:04+0000\n"
"Last-Translator: OpenERP Administrators \n"
"Language-Team: Finnish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-15 06:20+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/lt.po b/addons/account_analytic_analysis/i18n/lt.po
index f8790c84055..787fcad7484 100644
--- a/addons/account_analytic_analysis/i18n/lt.po
+++ b/addons/account_analytic_analysis/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-14 08:42+0000\n"
+"PO-Revision-Date: 2010-08-15 12:33+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-08-15 06:20+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/tr.po b/addons/account_analytic_analysis/i18n/tr.po
index 2a38d172cb0..933647fb3a4 100644
--- a/addons/account_analytic_analysis/i18n/tr.po
+++ b/addons/account_analytic_analysis/i18n/tr.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-08-14 09:04+0000\n"
+"PO-Revision-Date: 2010-08-15 10:37+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:20+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
diff --git a/addons/account_analytic_default/i18n/lt.po b/addons/account_analytic_default/i18n/lt.po
index 33e1e4883c8..d442fd55ebc 100644
--- a/addons/account_analytic_default/i18n/lt.po
+++ b/addons/account_analytic_default/i18n/lt.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-08-14 09:05+0000\n"
+"PO-Revision-Date: 2010-08-15 10:38+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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/nb.po b/addons/account_analytic_default/i18n/nb.po
new file mode 100644
index 00000000000..89879a1af0d
--- /dev/null
+++ b/addons/account_analytic_default/i18n/nb.po
@@ -0,0 +1,113 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-08-15 11:37+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Norwegian Bokmal \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_form
+#: model:ir.ui.menu,name:account_analytic_default.menu_analytic_defaul_form
+msgid "Analytic Defaults"
+msgstr "Analytisk Forhåndsvalg"
+
+#. module: account_analytic_default
+#: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
+msgid "Account Analytic Default"
+msgstr "Konto Analytisk Forhåndsvalg"
+
+#. module: account_analytic_default
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Ugyldig XML for visningsarkitektur!"
+
+#. module: account_analytic_default
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr "Objektets navn må starte med x_ og ikke inneholde spesialkarakterer!"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Seq"
+msgstr ""
+
+#. module: account_analytic_default
+#: field:account.analytic.default,date_stop:0
+msgid "End Date"
+msgstr "Sluttdato"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,sequence:0
+msgid "Sequence"
+msgstr "Rekkefølge"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,product_id:0
+msgid "Product"
+msgstr "Produkt"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,analytic_id:0
+msgid "Analytic Account"
+msgstr "Analytisk Konto"
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distributions"
+msgstr "Analytisk Fordeling"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,user_id:0
+msgid "User"
+msgstr "Bruker"
+
+#. module: account_analytic_default
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Ugyldig modulnavn i handlingsdefinisjonen."
+
+#. module: account_analytic_default
+#: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open
+msgid "Entries"
+msgstr "Adganger"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_analytic_default
+#: field:account.analytic.default,date_start:0
+msgid "Start Date"
+msgstr "Startdato"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Conditions"
+msgstr ""
+
+#. module: account_analytic_default
+#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
+#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product
+#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user
+msgid "Analytic Rules"
+msgstr "Analytiske Regler"
diff --git a/addons/account_analytic_default/i18n/tr.po b/addons/account_analytic_default/i18n/tr.po
index c8535d51890..d15d776bb02 100644
--- a/addons/account_analytic_default/i18n/tr.po
+++ b/addons/account_analytic_default/i18n/tr.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-08-14 09:04+0000\n"
+"PO-Revision-Date: 2010-08-15 10:33+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_default
diff --git a/addons/account_analytic_plans/i18n/it.po b/addons/account_analytic_plans/i18n/it.po
index d3b76f51909..ab4119a8ce7 100644
--- a/addons/account_analytic_plans/i18n/it.po
+++ b/addons/account_analytic_plans/i18n/it.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-08-14 08:43+0000\n"
+"PO-Revision-Date: 2010-08-15 12:58+0000\n"
"Last-Translator: eLBati - albatos.com \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-08-15 06:20+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/lt.po b/addons/account_analytic_plans/i18n/lt.po
index ccde4145027..773fd4b8fe3 100644
--- a/addons/account_analytic_plans/i18n/lt.po
+++ b/addons/account_analytic_plans/i18n/lt.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-08-14 09:05+0000\n"
+"PO-Revision-Date: 2010-08-15 10:38+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:20+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/tr.po b/addons/account_analytic_plans/i18n/tr.po
index 14372a0c135..3d78ef40c51 100644
--- a/addons/account_analytic_plans/i18n/tr.po
+++ b/addons/account_analytic_plans/i18n/tr.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-08-14 08:14+0000\n"
+"PO-Revision-Date: 2010-08-15 11:14+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_budget/i18n/lt.po b/addons/account_budget/i18n/lt.po
index 27417c3b340..0fa880d632a 100644
--- a/addons/account_budget/i18n/lt.po
+++ b/addons/account_budget/i18n/lt.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-08-14 08:42+0000\n"
+"PO-Revision-Date: 2010-08-15 12:33+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/tr.po b/addons/account_budget/i18n/tr.po
index 30cc668c2cf..addb841db91 100644
--- a/addons/account_budget/i18n/tr.po
+++ b/addons/account_budget/i18n/tr.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-08-14 08:42+0000\n"
+"PO-Revision-Date: 2010-08-15 12:41+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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_cancel/account_cancel_view.xml b/addons/account_cancel/account_cancel_view.xml
index 5f63b6cf6d7..33d72e86502 100644
--- a/addons/account_cancel/account_cancel_view.xml
+++ b/addons/account_cancel/account_cancel_view.xml
@@ -8,7 +8,6 @@
-
diff --git a/addons/account_coda/account_coda.py b/addons/account_coda/account_coda.py
index 43d3db2a0ae..1671c9a53f7 100644
--- a/addons/account_coda/account_coda.py
+++ b/addons/account_coda/account_coda.py
@@ -20,6 +20,7 @@
##############################################################################
import time
+
from osv import osv,fields
class account_coda(osv.osv):
@@ -37,7 +38,7 @@ class account_coda(osv.osv):
'date': time.strftime('%Y-%m-%d'),
'user_id': lambda self,cr,uid,context: uid,
}
-
+
account_coda()
class account_bank_statement(osv.osv):
@@ -45,7 +46,7 @@ class account_bank_statement(osv.osv):
_columns = {
'coda_id':fields.many2one('account.coda', 'Coda'),
}
-
+
account_bank_statement()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_coda/i18n/ar.po b/addons/account_coda/i18n/ar.po
index fb8c6d97324..0268259d63b 100644
--- a/addons/account_coda/i18n/ar.po
+++ b/addons/account_coda/i18n/ar.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-11-24 13:11+0000\n"
-"PO-Revision-Date: 2010-08-14 08:46+0000\n"
+"PO-Revision-Date: 2010-08-15 09:24+0000\n"
"Last-Translator: bamuhrez \n"
"Language-Team: Arabic \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_coda
diff --git a/addons/account_coda/wizard/account_coda_import.py b/addons/account_coda/wizard/account_coda_import.py
index 4d808fbba00..913db0bc4c2 100644
--- a/addons/account_coda/wizard/account_coda_import.py
+++ b/addons/account_coda/wizard/account_coda_import.py
@@ -23,8 +23,7 @@
import time
import base64
-from osv import fields
-from osv import osv
+from osv import fields, osv
from tools.translate import _
def str2date(date_str):
@@ -53,7 +52,7 @@ class account_coda_import(osv.osv_memory):
'coda': fields.binary('Coda File', required=True),
'note':fields.text('Log'),
}
-
+
def coda_parsing(self, cr, uid, ids, context=None):
journal_obj=self.pool.get('account.journal')
@@ -65,10 +64,10 @@ class account_coda_import(osv.osv_memory):
statement_reconcile_obj = self.pool.get('account.bank.statement.reconcile')
account_coda_obj = self.pool.get('account.coda')
mod_obj = self.pool.get('ir.model.data')
-
+
if not context:
context = {}
-
+
data = self.read(cr, uid, ids)[0]
codafile = data['coda']
@@ -86,7 +85,7 @@ class account_coda_import(osv.osv_memory):
str_not=''
str_not1=''
- bank_statements=[]
+ bank_statements = []
bank_statement = {}
recordlist = base64.decodestring(codafile).split('\n')
recordlist.pop()
@@ -196,8 +195,8 @@ class account_coda_import(osv.osv_memory):
try:
bk_st_id =bank_statement_obj.create(cr, uid, {
'journal_id': statement['journal_id'],
- 'date':time.strftime('%Y-%m-%d', time.strptime(statement['date'], "%y/%m/%d")),
- 'period_id':statement['period_id'] or period,
+ 'date': time.strftime('%Y-%m-%d', time.strptime(statement['date'], "%y/%m/%d")),
+ 'period_id': statement['period_id'] or period,
'balance_start': statement["balance_start"],
'balance_end_real': statement["balance_end_real"],
'state': 'draft',
@@ -209,7 +208,7 @@ class account_coda_import(osv.osv_memory):
reconcile_id = False
if line['toreconcile']:
name = line['name'][:3] + '/' + line['name'][3:7] + '/' + line['name'][7:]
- rec_id = pool.get('account.move.line').search(cr, uid, [('name','=', name),('reconcile_id','=',False),('account_id.reconcile','=',True)])
+ rec_id = pool.get('account.move.line').search(cr, uid, [('name', '=', name), ('reconcile_id', '=', False), ('account_id.reconcile', '=', True)])
if rec_id:
reconcile_id = statement_reconcile_obj.create(cr, uid, {
'line_ids': [(6, 0, rec_id)]
@@ -243,13 +242,13 @@ class account_coda_import(osv.osv_memory):
except osv.except_osv, e:
cr.rollback()
- nb_err+=1
+ nb_err += 1
err_log += '\n Application Error : ' + str(e)
raise # REMOVEME
except Exception, e:
cr.rollback()
- nb_err+=1
+ nb_err += 1
err_log += '\n System Error : '+str(e)
raise # REMOVEME
except :
@@ -261,34 +260,34 @@ class account_coda_import(osv.osv_memory):
err_log += '\nNumber of error :'+ str(nb_err) +'\n'
account_coda_obj.create(cr, uid, {
- 'name':codafile,
+ 'name': codafile,
'statement_ids': [(6, 0, bkst_list,)],
- 'note':str_log1+str_not+std_log+err_log,
- 'journal_id':data['journal_id'],
- 'date':time.strftime("%Y-%m-%d"),
- 'user_id':uid,
- })
+ 'note': str_log1+str_not+std_log+err_log,
+ 'journal_id': data['journal_id'],
+ 'date': time.strftime("%Y-%m-%d"),
+ 'user_id': uid,
+ })
test=''
- test=str_log1 + std_log + err_log
- self.write(cr, uid, ids, {'note':test}, context=context)
- extraction= { 'statment_ids':bkst_list}
- context.update({ 'statment_ids':bkst_list})
+ test = str_log1 + std_log + err_log
+ self.write(cr, uid, ids, {'note': test}, context=context)
+ extraction = { 'statment_ids': bkst_list}
+ context.update({ 'statment_ids': bkst_list})
model_data_ids = mod_obj.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'account_coda_note_view')], context=context)
resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-
+
return {
- 'name': _('Result'),
- 'res_id': ids[0],
- 'view_type': 'form',
- 'view_mode': 'form',
- 'res_model': 'account.coda.import',
- 'view_id': False,
- 'target':'new',
- 'views': [(resource_id, 'form')],
- 'context': context,
- 'type': 'ir.actions.act_window',
+ 'name': _('Result'),
+ 'res_id': ids[0],
+ 'view_type': 'form',
+ 'view_mode': 'form',
+ 'res_model': 'account.coda.import',
+ 'view_id': False,
+ 'target': 'new',
+ 'views': [(resource_id, 'form')],
+ 'context': context,
+ 'type': 'ir.actions.act_window',
}
-
+
def action_open_window(self, cr, uid, data, context=None):
if not context:
cotext = {}
@@ -301,7 +300,7 @@ class account_coda_import(osv.osv_memory):
'view_id': False,
'type': 'ir.actions.act_window',
}
-
+
account_coda_import()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_followup/__init__.py b/addons/account_followup/__init__.py
index b0067573a2f..4bfe3186298 100644
--- a/addons/account_followup/__init__.py
+++ b/addons/account_followup/__init__.py
@@ -20,7 +20,6 @@
##############################################################################
import account_followup
-import account_followup_report
import wizard
import report
diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py
index f8772f2e50b..ea2f79c967d 100644
--- a/addons/account_followup/__openerp__.py
+++ b/addons/account_followup/__openerp__.py
@@ -48,12 +48,12 @@
'update_xml': [
'security/ir.model.access.csv',
'wizard/account_followup_print_view.xml',
- 'account_followup_report.xml',
+ 'report/account_followup_report.xml',
'account_followup_view.xml',
'account_followup_data.xml'
],
'demo_xml': ['account_followup_demo.xml'],
- 'test': ['test/account_followup.yml'],
+ 'test': ['test/account_followup.yml'],
'installable': True,
'active': False,
'certificate': '0072481076453',
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index 09ad945327a..4af8021e0e7 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -87,7 +87,7 @@
-
+
account.move.line.partner.tree
diff --git a/addons/account_followup/i18n/lt.po b/addons/account_followup/i18n/lt.po
index b496c2d8616..c2e6fcdc46f 100644
--- a/addons/account_followup/i18n/lt.po
+++ b/addons/account_followup/i18n/lt.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-08-14 08:22+0000\n"
+"PO-Revision-Date: 2010-08-15 11:26+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:19+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/i18n/tr.po b/addons/account_followup/i18n/tr.po
index 4f7b75955c6..eb754d0142e 100644
--- a/addons/account_followup/i18n/tr.po
+++ b/addons/account_followup/i18n/tr.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-08-14 09:04+0000\n"
+"PO-Revision-Date: 2010-08-15 10:27+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:19+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/report/__init__.py b/addons/account_followup/report/__init__.py
index 637237095a5..5d57773762a 100644
--- a/addons/account_followup/report/__init__.py
+++ b/addons/account_followup/report/__init__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,11 +15,12 @@
# 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 .
+# along with this program. If not, see .
#
##############################################################################
import report_followup_print
+import account_followup_report
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_followup/account_followup_report.py b/addons/account_followup/report/account_followup_report.py
similarity index 99%
rename from addons/account_followup/account_followup_report.py
rename to addons/account_followup/report/account_followup_report.py
index 5ce062ebd0b..ab0d75388a2 100644
--- a/addons/account_followup/account_followup_report.py
+++ b/addons/account_followup/report/account_followup_report.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,7 +15,7 @@
# 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 .
+# along with this program. If not, see .
#
##############################################################################
@@ -73,8 +73,4 @@ class account_followup_stat(osv.osv):
)""")
account_followup_stat()
-
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_followup/account_followup_report.xml b/addons/account_followup/report/account_followup_report.xml
similarity index 100%
rename from addons/account_followup/account_followup_report.xml
rename to addons/account_followup/report/account_followup_report.xml
diff --git a/addons/account_followup/report/rappel.rml b/addons/account_followup/report/report_followp_print.rml
similarity index 100%
rename from addons/account_followup/report/rappel.rml
rename to addons/account_followup/report/report_followp_print.rml
diff --git a/addons/account_followup/report/report_followup_print.py b/addons/account_followup/report/report_followup_print.py
index eadb43c729d..2359c31b502 100644
--- a/addons/account_followup/report/report_followup_print.py
+++ b/addons/account_followup/report/report_followup_print.py
@@ -92,7 +92,7 @@ class report_rappel(report_sxw.rml_parse):
return text
report_sxw.report_sxw('report.account_followup.followup.print',
- 'res.partner', 'addons/account_followup/report/rappel.rml',
+ 'res.partner', 'addons/account_followup/report/report_followp_print.rml',
parser=report_rappel)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index 9ff5bde8c1b..99e1533726d 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -18,6 +18,7 @@
# along with this program. If not, see .
#
##############################################################################
+
import datetime
import time
diff --git a/addons/account_invoice_layout/i18n/lt.po b/addons/account_invoice_layout/i18n/lt.po
index 6b89131d7ca..2bb504bfd63 100644
--- a/addons/account_invoice_layout/i18n/lt.po
+++ b/addons/account_invoice_layout/i18n/lt.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-08-14 08:06+0000\n"
+"PO-Revision-Date: 2010-08-15 11:08+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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/tr.po b/addons/account_invoice_layout/i18n/tr.po
index 1e34028d8a2..b0fd5f832aa 100644
--- a/addons/account_invoice_layout/i18n/tr.po
+++ b/addons/account_invoice_layout/i18n/tr.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-08-14 08:43+0000\n"
+"PO-Revision-Date: 2010-08-15 12:53+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_payment/i18n/lt.po b/addons/account_payment/i18n/lt.po
index b58824b35c5..ae98e655c56 100644
--- a/addons/account_payment/i18n/lt.po
+++ b/addons/account_payment/i18n/lt.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-08-14 09:01+0000\n"
+"PO-Revision-Date: 2010-08-15 10:04+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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_payment/i18n/tr.po b/addons/account_payment/i18n/tr.po
index 40a0f69f7fb..46802d15f20 100644
--- a/addons/account_payment/i18n/tr.po
+++ b/addons/account_payment/i18n/tr.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-08-14 09:01+0000\n"
+"PO-Revision-Date: 2010-08-15 10:07+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_report/i18n/lt.po b/addons/account_report/i18n/lt.po
index 0ad2cf3309d..5da1ca64586 100644
--- a/addons/account_report/i18n/lt.po
+++ b/addons/account_report/i18n/lt.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-08-14 08:43+0000\n"
+"PO-Revision-Date: 2010-08-15 12:58+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:18+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/tr.po b/addons/account_report/i18n/tr.po
index 20937b4d020..cfb83f03c5b 100644
--- a/addons/account_report/i18n/tr.po
+++ b/addons/account_report/i18n/tr.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-08-14 08:39+0000\n"
+"PO-Revision-Date: 2010-08-15 12:14+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:18+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_reporting/i18n/lt.po b/addons/account_reporting/i18n/lt.po
index 34df8a6f73b..faabf45d509 100644
--- a/addons/account_reporting/i18n/lt.po
+++ b/addons/account_reporting/i18n/lt.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-08-14 08:39+0000\n"
+"PO-Revision-Date: 2010-08-15 12:00+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/tr.po b/addons/account_reporting/i18n/tr.po
index 0c0c7055da5..a594361c811 100644
--- a/addons/account_reporting/i18n/tr.po
+++ b/addons/account_reporting/i18n/tr.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-08-14 08:39+0000\n"
+"PO-Revision-Date: 2010-08-15 12:08+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_tax_include/account_tax_include.py b/addons/account_tax_include/account_tax_include.py
index 597050f9b2c..ed89207a98e 100644
--- a/addons/account_tax_include/account_tax_include.py
+++ b/addons/account_tax_include/account_tax_include.py
@@ -18,6 +18,7 @@
# along with this program. If not, see .
#
##############################################################################
+
import time
from osv import fields, osv
@@ -28,7 +29,7 @@ class account_invoice(osv.osv):
'price_type': fields.selection([('tax_included','Tax included'),
('tax_excluded','Tax excluded')],
'Price method', required=True, readonly=True,
- states={'draft':[('readonly',False)]}),
+ states={'draft': [('readonly', False)]}),
}
_defaults = {
'price_type': 'tax_excluded',
@@ -96,7 +97,7 @@ class account_invoice_line(osv.osv):
res[line.id]['price_subtotal'] = res[line.id]['price_subtotal_incl']
for tax in tax_obj.compute_inv(cr, uid, line.invoice_line_tax_id, res[line.id]['price_subtotal_incl']/line.quantity, line.quantity):
res[line.id]['price_subtotal'] = res[line.id]['price_subtotal'] - tax['amount']
- res[line.id]['data'].append( tax)
+ res[line.id]['data'].append(tax)
res[line.id]['price_subtotal']= round(res[line.id]['price_subtotal'], dec_obj.precision_get(cr, uid, 'Account'))
res[line.id]['price_subtotal_incl']= round(res[line.id]['price_subtotal_incl'], dec_obj.precision_get(cr, uid, 'Account'))
@@ -164,7 +165,7 @@ class account_invoice_line(osv.osv):
# print "str context:", context
ctx = (context and context.copy()) or {}
- ctx.update({'price_type': ctx.get('price_type','tax_excluded')})
+ ctx.update({'price_type': ctx.get('price_type', 'tax_excluded')})
return super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id=currency_id, context=ctx)
account_invoice_line()
diff --git a/addons/account_tax_include/i18n/tr.po b/addons/account_tax_include/i18n/tr.po
index cb647af2a23..3b053fea648 100644
--- a/addons/account_tax_include/i18n/tr.po
+++ b/addons/account_tax_include/i18n/tr.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-08-14 08:43+0000\n"
+"PO-Revision-Date: 2010-08-15 12:56+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:19+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_voucher/i18n/lt.po b/addons/account_voucher/i18n/lt.po
index f7ed764007e..0199b208ee4 100644
--- a/addons/account_voucher/i18n/lt.po
+++ b/addons/account_voucher/i18n/lt.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-08-14 08:43+0000\n"
+"PO-Revision-Date: 2010-08-15 12:49+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/tr.po b/addons/account_voucher/i18n/tr.po
index 03028c39eda..d1aaa229d92 100644
--- a/addons/account_voucher/i18n/tr.po
+++ b/addons/account_voucher/i18n/tr.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-08-14 08:43+0000\n"
+"PO-Revision-Date: 2010-08-15 12:55+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index b56853f6323..83b7623b2eb 100644
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -20,6 +20,7 @@
##############################################################################
import time
+import netsvc
from osv import fields
from osv import osv
from tools.translate import _
@@ -101,8 +102,10 @@ class account_voucher(osv.osv):
_name = 'account.voucher'
_description = 'Accounting Voucher'
_order = "id desc"
+ _rec_name = 'number'
+
_columns = {
- 'name':fields.char('Name', size=256, required=True, readonly=True, states={'draft':[('readonly',False)]}),
+ 'name':fields.char('Name', size=256, required=False, readonly=True, states={'draft':[('readonly',False)]}),
'type': fields.selection([
('payment', 'Payment'),
('receipt', 'Receipt'),
@@ -146,6 +149,7 @@ class account_voucher(osv.osv):
'journal_id':_get_journal,
'currency_id': _get_currency,
'state': lambda *a: 'draft',
+ 'name': lambda *a: '/',
'date' : lambda *a: time.strftime('%Y-%m-%d'),
'reference_type': lambda *a: "none",
'audit': lambda *a: False,
@@ -273,7 +277,6 @@ class account_voucher(osv.osv):
})
new_line += [tax_line]
-
if new_line:
for line in new_line:
voucher_line_pool.create(dbcr, uid, line)
@@ -296,36 +299,39 @@ class account_voucher(osv.osv):
'state':voucher.state
}
self.write(dbcr, uid, ids, res)
- else:
- raise osv.except_osv(_('Invalid amount !'), _('You can not create Pro-Forma voucher with Total amount <= 0 !'))
+
return True
- def write(self, cr, uid, ids, vals, context={}):
- res = super(account_voucher, self).write(cr, uid, ids, vals, context)
-
- #If there is state says that method called from the work flow signals
- if not 'state' in vals.keys():
- self.open_voucher(cr, uid, ids, context)
-
- return res
+# def write(self, cr, uid, ids, vals, context={}):
+# res = super(account_voucher, self).write(cr, uid, ids, vals, context)
+#
+# #If there is state says that method called from the work flow signals
+# if not 'state' in vals.keys():
+# self.open_voucher(cr, uid, ids, context)
+#
+# return res
def voucher_recheck(self, cr, uid, ids, context={}):
- #self.open_voucher(cr, uid, ids, context)
+# self.open_voucher(cr, uid, ids, context)
self.write(cr, uid, ids, {'state':'recheck'}, context)
return True
def proforma_voucher(self, cr, uid, ids, context={}):
- #self.open_voucher(cr, uid, ids, context)
+# self.open_voucher(cr, uid, ids, context)
self.action_move_line_create(cr, uid, ids)
self.write(cr, uid, ids, {'state':'posted'})
return True
def action_cancel_draft(self, cr, uid, ids, context={}):
+ wf_service = netsvc.LocalService("workflow")
+ for voucher_id in ids:
+ wf_service.trg_create(uid, 'account.voucher', voucher_id, cr)
self.write(cr, uid, ids, {'state':'draft'})
return True
def audit_pass(self, cr, uid, ids, context={}):
move_pool = self.pool.get('account.move')
+
result = True
audit_pass = []
for voucher in self.browse(cr, uid, ids):
@@ -381,6 +387,9 @@ class account_voucher(osv.osv):
if inv.move_id:
continue
+ if not inv.payment_ids:
+ raise osv.except_osv(_('Error !'), _('Please define lines on voucher !'))
+
journal = journal_pool.browse(cr, uid, inv.journal_id.id)
if journal.sequence_id:
name = sequence_pool.get_id(cr, uid, journal.sequence_id.id)
@@ -492,14 +501,14 @@ class account_voucher(osv.osv):
rec = {
'move_id': move_id,
- 'move_ids':[(6, 0,line_ids)]
}
-
+
message = _('Voucher ') + " '" + inv.name + "' "+ _("is confirmed")
self.log(cr, uid, inv.id, message)
self.write(cr, uid, [inv.id], rec)
-
+ move_pool.post(cr, uid, [move_id], context={})
+
return True
def _convert_ref(self, cr, uid, ref):
@@ -551,9 +560,10 @@ class account_voucher_line(osv.osv):
_description = 'Voucher Line'
_columns = {
'voucher_id':fields.many2one('account.voucher', 'Voucher'),
- 'name':fields.char('Description', size=256, required=True),
+ 'name':fields.char('Memo', size=256, required=True),
'account_id':fields.many2one('account.account','Account', required=True, domain=[('type','<>','view')]),
- 'partner_id': fields.many2one('res.partner', 'Partner', change_default=True),
+# 'partner_id': fields.many2one('res.partner', 'Partner', change_default=True),
+ 'partner_id': fields.related('voucher_id','partner_id', type='many2one', relation='res.partner', string='Partner'),
'amount':fields.float('Amount'),
'type':fields.selection([('dr','Debit'),('cr','Credit')], 'Type'),
'ref':fields.char('Reference', size=32),
@@ -599,9 +609,6 @@ class account_voucher_line(osv.osv):
elif ttype == 'cr' and type1 in ('purchase'):
account_id = partner.property_account_payable.id
- else:
- raise osv.except_osv(_('Invalid Configuration !'), _('You can not encode unbalanced entry !'))
-
if company.currency_id != currency:
balance = currency_pool.compute(cr, uid, company.currency_id.id, currency, balance)
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index 3d7c2a77db5..65cce5e29c4 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -10,13 +10,16 @@
-
+
-
+
+
+
+
@@ -28,23 +31,24 @@
@@ -107,6 +111,7 @@
+
@@ -147,6 +152,7 @@
+
diff --git a/addons/account_voucher/voucher_workflow.xml b/addons/account_voucher/voucher_workflow.xml
index 1c9d4f28bee..961032458c9 100644
--- a/addons/account_voucher/voucher_workflow.xml
+++ b/addons/account_voucher/voucher_workflow.xml
@@ -40,6 +40,7 @@
cancel
+ True
cancel_voucher()
function
diff --git a/addons/account_voucher_payment/account_voucher_payment.py b/addons/account_voucher_payment/account_voucher_payment.py
index 4af9b1dd5ef..d8d11e85062 100755
--- a/addons/account_voucher_payment/account_voucher_payment.py
+++ b/addons/account_voucher_payment/account_voucher_payment.py
@@ -22,9 +22,9 @@
from osv import fields, osv
from tools.translate import _
-class account_invoice(osv.osv):
- _inherit = 'account.invoice'
-
+class account_move(osv.osv):
+ _inherit = 'account.move'
+
def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
"""
Returns a list of ids based on search domain {args}
@@ -43,18 +43,22 @@ class account_invoice(osv.osv):
if not context:
context = {}
ttype = context.get('ttype', False)
+ partner = context.get('partner_id', False)
+ voucher = context.get('voucher', False)
+ if voucher and not partner:
+ raise osv.except_osv(_('Invalid Partner !'), _('Please select the partner !'))
+
if ttype and ttype in ('receipt'):
- args += [('type','in', ['out_invoice', 'in_refund'])]
+ args += [('journal_id.type','in', ['sale', 'purchase_refund'])]
elif ttype and ttype in ('payment'):
- args += [('type','in', ['in_invoice', 'out_refund'])]
+ args += [('journal_id.type','in', ['purchase', 'sale_refund'])]
elif ttype and ttype in('sale', 'purchase'):
raise osv.except_osv(_('Invalid action !'), _('You can not reconcile sales, purchase, or journal voucher with invoice !'))
- args += [('type','=', 'do_not_allow_search')]
-
- res = super(account_invoice, self).search(cr, user, args, offset, limit, order, context, count)
+ args += [('journal_id.type','=', 'do_not_allow_search')]
+ res = super(account_move, self).search(cr, user, args, offset, limit, order, context, count)
return res
-account_invoice()
+account_move()
class account_move_line(osv.osv):
_inherit = "account.move.line"
@@ -66,7 +70,7 @@ account_move_line()
class account_voucher(osv.osv):
_inherit = 'account.voucher'
_columns = {
- 'voucher_line_ids':fields.one2many('account.voucher.line', 'voucher_id', 'Voucher Lines', readonly=False, states={'proforma':[('readonly',True)]}),
+ 'voucher_line_ids':fields.one2many('account.voucher.line', 'voucher_id', 'Voucher Lines', readonly=True, states={'draft':[('readonly',False)]}),
}
def action_move_line_create(self, cr, uid, ids, *args):
@@ -84,7 +88,10 @@ class account_voucher(osv.osv):
if inv.move_id:
continue
-
+
+ if not inv.payment_ids:
+ raise osv.except_osv(_('Error !'), _('Please define lines on voucher !'))
+
journal = journal_pool.browse(cr, uid, inv.journal_id.id)
if journal.sequence_id:
name = sequence_pool.get_id(cr, uid, journal.sequence_id.id)
@@ -125,7 +132,7 @@ class account_voucher(osv.osv):
'move_id':move_id ,
'journal_id':inv.journal_id.id,
'period_id':inv.period_id.id,
- 'partner_id':False,
+ 'partner_id':inv.partner_id.id,
'ref':ref,
'date':inv.date
}
@@ -194,9 +201,9 @@ class account_voucher(osv.osv):
move_line_id = move_line_pool.create(cr, uid, move_line)
line_ids += [move_line_id]
- if line.invoice_id and inv.type in ('payment', 'receipt'):
+ if line.move_id and inv.type in ('payment', 'receipt'):
rec_ids += [move_line_id]
- for move_line in line.invoice_id.move_id.line_id:
+ for move_line in line.move_id.line_id:
if line.account_id.id == move_line.account_id.id:
rec_ids += [move_line.id]
@@ -204,15 +211,16 @@ class account_voucher(osv.osv):
move_line_pool.reconcile_partial(cr, uid, rec_ids)
rec = {
- 'move_id': move_id,
+ 'move_id': move_id
}
message = _('Voucher ') + " '" + inv.name + "' "+ _("is confirm")
self.log(cr, uid, inv.id, message)
self.write(cr, uid, [inv.id], rec)
+ move_pool.post(cr, uid, [move_id], context={})
- return True
+ return True
account_voucher()
@@ -225,7 +233,8 @@ class account_voucher_line(osv.osv):
return data
_columns = {
- 'invoice_id' : fields.many2one('account.invoice','Invoice'),
+# 'invoice_id' : fields.many2one('account.invoice','Invoice'),
+ 'move_id' : fields.many2one('account.move','Journal Entry'),
}
def move_line_get_item(self, cr, uid, line, context={}):
@@ -235,9 +244,9 @@ class account_voucher_line(osv.osv):
def onchange_invoice_id(self, cr, uid, ids, invoice_id, currency_id):
currency_pool = self.pool.get('res.currency')
- invoice_pool = self.pool.get('account.invoice')
+ invoice_pool = self.pool.get('account.move')
res = {
- 'amount':0.0
+
}
if not invoice_id:
return {
@@ -245,15 +254,19 @@ class account_voucher_line(osv.osv):
}
else:
invoice = invoice_pool.browse(cr, uid, invoice_id)
- residual = invoice.residual
- if invoice.currency_id.id != currency_id:
- residual = currency_pool.compute(cr, uid, invoice.currency_id.id, currency_id, invoice.residual)
+ residual = invoice.amount
+
+ company_currency = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id
+ currency_diff = company_currency != currency_id
- res.update({
- 'amount': residual,
- 'account_id': invoice.account_id.id,
- 'ref':invoice.number
- })
+ if currency_diff:
+ residual = currency_pool.compute(cr, uid, company_currency, currency_id, residual)
+
+ if residual > 0:
+ res.update({
+ 'amount': residual,
+ 'ref':invoice.name
+ })
return {
'value':res
diff --git a/addons/account_voucher_payment/account_voucher_payment_view.xml b/addons/account_voucher_payment/account_voucher_payment_view.xml
index 6bc1484e81e..12715782819 100755
--- a/addons/account_voucher_payment/account_voucher_payment_view.xml
+++ b/addons/account_voucher_payment/account_voucher_payment_view.xml
@@ -8,16 +8,15 @@
-
+
-
-
-
-
-
+
+
+
+
-
+
@@ -54,7 +53,7 @@
form
-
diff --git a/addons/account_voucher_payment/wizard/account_voucher_unreconcile.py b/addons/account_voucher_payment/wizard/account_voucher_unreconcile.py
index ef30e1af69f..d12bee51894 100644
--- a/addons/account_voucher_payment/wizard/account_voucher_unreconcile.py
+++ b/addons/account_voucher_payment/wizard/account_voucher_unreconcile.py
@@ -52,8 +52,9 @@ class account_voucher_unreconcile(osv.osv_memory):
reconcile_pool.unlink(cr, uid, rec)
if res.remove:
- wf_service = netsvc.LocalService("workflow")
- wf_service.trg_validate(uid, 'account.voucher', context.get('active_id'), 'cancel_voucher', cr)
+ voucher_pool.cancel_voucher(cr, uid, [context.get('active_id')], context)
+# wf_service = netsvc.LocalService("workflow")
+# wf_service.trg_validate(uid, 'account.voucher', context.get('active_id'), 'cancel_voucher', cr)
return {}
diff --git a/addons/analytic_journal_billing_rate/i18n/tr.po b/addons/analytic_journal_billing_rate/i18n/tr.po
index 75ae4be6ae9..0e220211353 100644
--- a/addons/analytic_journal_billing_rate/i18n/tr.po
+++ b/addons/analytic_journal_billing_rate/i18n/tr.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-08-14 09:01+0000\n"
+"PO-Revision-Date: 2010-08-15 10:06+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_user_function/i18n/tr.po b/addons/analytic_user_function/i18n/tr.po
index 6ee1c0516a4..a9194ca901d 100644
--- a/addons/analytic_user_function/i18n/tr.po
+++ b/addons/analytic_user_function/i18n/tr.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-08-14 08:09+0000\n"
+"PO-Revision-Date: 2010-08-15 11:08+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/auction/board_auction_view.xml b/addons/auction/board_auction_view.xml
index 7a233282f2c..8a183c267d8 100644
--- a/addons/auction/board_auction_view.xml
+++ b/addons/auction/board_auction_view.xml
@@ -111,6 +111,8 @@
action="open_board_auction"
sequence="1"
id="menu_board_auction_open" icon="terp-graph" parent="menu_board_auction"/>
+
+
diff --git a/addons/auction/i18n/lt.po b/addons/auction/i18n/lt.po
index 61017f5efa9..4bc61765ff8 100644
--- a/addons/auction/i18n/lt.po
+++ b/addons/auction/i18n/lt.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-08-14 09:13+0000\n"
+"PO-Revision-Date: 2010-08-15 11:06+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/nl.po b/addons/auction/i18n/nl.po
index e15e6232eb8..a40b6a9bd05 100644
--- a/addons/auction/i18n/nl.po
+++ b/addons/auction/i18n/nl.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-08-14 08:43+0000\n"
+"PO-Revision-Date: 2010-08-15 12:52+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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/tr.po b/addons/auction/i18n/tr.po
index 72873f2e634..c1b77212112 100644
--- a/addons/auction/i18n/tr.po
+++ b/addons/auction/i18n/tr.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-08-14 09:02+0000\n"
+"PO-Revision-Date: 2010-08-15 10:08+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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/audittrail/i18n/lt.po b/addons/audittrail/i18n/lt.po
index 4a80997210b..dc7c79df028 100644
--- a/addons/audittrail/i18n/lt.po
+++ b/addons/audittrail/i18n/lt.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-08-14 09:01+0000\n"
+"PO-Revision-Date: 2010-08-15 10:07+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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/tr.po b/addons/audittrail/i18n/tr.po
index 195a95b803e..3256c1d8baa 100644
--- a/addons/audittrail/i18n/tr.po
+++ b/addons/audittrail/i18n/tr.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-08-14 09:03+0000\n"
+"PO-Revision-Date: 2010-08-15 10:13+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/zh_CN.po b/addons/audittrail/i18n/zh_CN.po
index 4256547c7a4..c3cfe46a1d6 100644
--- a/addons/audittrail/i18n/zh_CN.po
+++ b/addons/audittrail/i18n/zh_CN.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-08-14 08:40+0000\n"
+"PO-Revision-Date: 2010-08-15 12:21+0000\n"
"Last-Translator: Black Jack \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/base_contact/i18n/lt.po b/addons/base_contact/i18n/lt.po
index 5497a8c5f77..707fc85fd26 100644
--- a/addons/base_contact/i18n/lt.po
+++ b/addons/base_contact/i18n/lt.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-08-14 08:18+0000\n"
+"PO-Revision-Date: 2010-08-15 11:18+0000\n"
"Last-Translator: Giedrius Slavinskas \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-08-15 06:19+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: lt\n"
diff --git a/addons/base_contact/i18n/tr.po b/addons/base_contact/i18n/tr.po
index 8471c852b95..6e088f027cc 100644
--- a/addons/base_contact/i18n/tr.po
+++ b/addons/base_contact/i18n/tr.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-08-14 09:12+0000\n"
+"PO-Revision-Date: 2010-08-15 10:53+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-08-15 06:19+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_contact
diff --git a/addons/base_contact/i18n/zh_CN.po b/addons/base_contact/i18n/zh_CN.po
index 8fe3c8c94df..a1723bf1709 100644
--- a/addons/base_contact/i18n/zh_CN.po
+++ b/addons/base_contact/i18n/zh_CN.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-08-14 08:39+0000\n"
+"PO-Revision-Date: 2010-08-15 11:53+0000\n"
"Last-Translator: Black Jack \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-08-15 06:19+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_contact
diff --git a/addons/base_iban/i18n/tr.po b/addons/base_iban/i18n/tr.po
index b397be1bbcd..9b6bb7a675a 100644
--- a/addons/base_iban/i18n/tr.po
+++ b/addons/base_iban/i18n/tr.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-08-14 08:38+0000\n"
+"PO-Revision-Date: 2010-08-15 11:48+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:18+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_iban
diff --git a/addons/base_module_quality/i18n/tr.po b/addons/base_module_quality/i18n/tr.po
index c9d42ecb457..11a53fe3705 100644
--- a/addons/base_module_quality/i18n/tr.po
+++ b/addons/base_module_quality/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-14 09:13+0000\n"
+"PO-Revision-Date: 2010-08-15 10:58+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_module_quality
diff --git a/addons/base_module_record/i18n/tr.po b/addons/base_module_record/i18n/tr.po
index 73dd2c3bc64..3f37b5a7f91 100644
--- a/addons/base_module_record/i18n/tr.po
+++ b/addons/base_module_record/i18n/tr.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-08-14 09:02+0000\n"
+"PO-Revision-Date: 2010-08-15 10:10+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-08-15 06:19+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_module_record
diff --git a/addons/base_report_creator/i18n/tr.po b/addons/base_report_creator/i18n/tr.po
index 3343b61e7a3..0790226e2d6 100644
--- a/addons/base_report_creator/i18n/tr.po
+++ b/addons/base_report_creator/i18n/tr.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-08-14 09:13+0000\n"
+"PO-Revision-Date: 2010-08-15 10:53+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_report_creator
diff --git a/addons/base_report_designer/i18n/tr.po b/addons/base_report_designer/i18n/tr.po
index f4c30e7bae1..1b68ffe524f 100644
--- a/addons/base_report_designer/i18n/tr.po
+++ b/addons/base_report_designer/i18n/tr.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-08-14 08:53+0000\n"
+"PO-Revision-Date: 2010-08-15 13:46+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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_report_designer
diff --git a/addons/base_setup/i18n/tr.po b/addons/base_setup/i18n/tr.po
index 7ebb6d2b1a9..c8eb9277733 100644
--- a/addons/base_setup/i18n/tr.po
+++ b/addons/base_setup/i18n/tr.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-08-14 09:03+0000\n"
+"PO-Revision-Date: 2010-08-15 10:21+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-08-15 06:19+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_setup
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 25309ff512a..2886857a45d 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -28,6 +28,7 @@ class base_setup_installer(osv.osv_memory):
_install_if = {
('sale','crm'): ['sale_crm'],
('sale','project'): ['project_mrp'],
+ ('sale',):['account_accountant']
}
_columns = {
# Generic modules
diff --git a/addons/base_vat/i18n/tr.po b/addons/base_vat/i18n/tr.po
index cf468aafde5..cc79ea99cd9 100644
--- a/addons/base_vat/i18n/tr.po
+++ b/addons/base_vat/i18n/tr.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-08-14 08:43+0000\n"
+"PO-Revision-Date: 2010-08-15 12:46+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:19+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_vat
diff --git a/addons/board/i18n/tr.po b/addons/board/i18n/tr.po
index 84ccc3e9d52..51154063c26 100644
--- a/addons/board/i18n/tr.po
+++ b/addons/board/i18n/tr.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-08-14 09:04+0000\n"
+"PO-Revision-Date: 2010-08-15 10:27+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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: board
diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index 9a5217a623a..f0cd7cfdefb 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -158,5 +158,6 @@
action="open_board_crm"
sequence="1"
id="menu_board_crm" icon="terp-graph"/>
+
diff --git a/addons/crm/i18n/fi.po b/addons/crm/i18n/fi.po
index c9f4eec606c..fd7ab24f23e 100644
--- a/addons/crm/i18n/fi.po
+++ b/addons/crm/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-14 08:47+0000\n"
+"PO-Revision-Date: 2010-08-15 09:27+0000\n"
"Last-Translator: OpenERP Administrators \n"
"Language-Team: Finnish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
diff --git a/addons/crm/i18n/hr.po b/addons/crm/i18n/hr.po
index 0df4f4f50c6..fdb93160d0c 100644
--- a/addons/crm/i18n/hr.po
+++ b/addons/crm/i18n/hr.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: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-14 08:52+0000\n"
+"PO-Revision-Date: 2010-08-15 13:29+0000\n"
"Last-Translator: OpenERP Administrators \n"
"Language-Team: Vinteh\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
diff --git a/addons/crm/i18n/lt.po b/addons/crm/i18n/lt.po
index 1e26888e2f7..e543c9173eb 100644
--- a/addons/crm/i18n/lt.po
+++ b/addons/crm/i18n/lt.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: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-14 08:56+0000\n"
+"PO-Revision-Date: 2010-08-15 14:18+0000\n"
"Last-Translator: Giedrius Slavinskas \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-08-15 06:18+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: lt\n"
diff --git a/addons/crm/i18n/pl.po b/addons/crm/i18n/pl.po
index 1b12055d85f..4772eb2172c 100644
--- a/addons/crm/i18n/pl.po
+++ b/addons/crm/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: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-14 08:48+0000\n"
+"PO-Revision-Date: 2010-08-15 09: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-08-15 06:18+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
diff --git a/addons/crm/i18n/pt.po b/addons/crm/i18n/pt.po
index 5f19d74cc38..30d7c52d115 100644
--- a/addons/crm/i18n/pt.po
+++ b/addons/crm/i18n/pt.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: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-14 08:57+0000\n"
+"PO-Revision-Date: 2010-08-15 14:20+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-08-15 06:18+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
diff --git a/addons/crm/i18n/sk.po b/addons/crm/i18n/sk.po
index f9446a1345d..79cb2218ed9 100644
--- a/addons/crm/i18n/sk.po
+++ b/addons/crm/i18n/sk.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-14 08:56+0000\n"
+"PO-Revision-Date: 2010-08-15 14:19+0000\n"
"Last-Translator: Radoslav Sloboda \n"
"Language-Team: Slovak \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
diff --git a/addons/crm/i18n/tr.po b/addons/crm/i18n/tr.po
index 95b30e4e29d..81e67b8ac0d 100644
--- a/addons/crm/i18n/tr.po
+++ b/addons/crm/i18n/tr.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: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-14 08:53+0000\n"
+"PO-Revision-Date: 2010-08-15 13:44+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-08-15 06:19+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
diff --git a/addons/crm_profiling/i18n/tr.po b/addons/crm_profiling/i18n/tr.po
index 1a573f00a1b..0c40c1875a8 100644
--- a/addons/crm_profiling/i18n/tr.po
+++ b/addons/crm_profiling/i18n/tr.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-08-14 08:28+0000\n"
+"PO-Revision-Date: 2010-08-15 11:32+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm_profiling
diff --git a/addons/delivery/i18n/ru.po b/addons/delivery/i18n/ru.po
index ac310fa7df0..f70e860e866 100644
--- a/addons/delivery/i18n/ru.po
+++ b/addons/delivery/i18n/ru.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-08-14 09:03+0000\n"
+"PO-Revision-Date: 2010-08-15 10:15+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-08-15 06:18+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
diff --git a/addons/delivery/i18n/tr.po b/addons/delivery/i18n/tr.po
index d56a37a0deb..9f6fd29ad7e 100644
--- a/addons/delivery/i18n/tr.po
+++ b/addons/delivery/i18n/tr.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-08-14 09:06+0000\n"
+"PO-Revision-Date: 2010-08-15 10:38+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:18+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml
index 930d20a1b52..2bfc5a6f200 100644
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@ -66,6 +66,9 @@
id="menu_reports_document_manager"
icon="terp-graph"/>
+
+
board.document.manager.form1
board.board
diff --git a/addons/document/i18n/mn.po b/addons/document/i18n/mn.po
index 110708e3fe5..8f8e58f096d 100644
--- a/addons/document/i18n/mn.po
+++ b/addons/document/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-14 08:44+0000\n"
+"PO-Revision-Date: 2010-08-15 08:56+0000\n"
"Last-Translator: ub121 \n"
"Language-Team: Mongolian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: document
diff --git a/addons/document/i18n/ru.po b/addons/document/i18n/ru.po
index a17256f5a80..25596c45e09 100644
--- a/addons/document/i18n/ru.po
+++ b/addons/document/i18n/ru.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-08-14 09:01+0000\n"
+"PO-Revision-Date: 2010-08-15 10:06+0000\n"
"Last-Translator: devcode \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: document
diff --git a/addons/document/i18n/tr.po b/addons/document/i18n/tr.po
index 16591a0a606..b7b8b538b46 100644
--- a/addons/document/i18n/tr.po
+++ b/addons/document/i18n/tr.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-08-14 08:31+0000\n"
+"PO-Revision-Date: 2010-08-15 11:38+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: document
diff --git a/addons/document/i18n/zh_CN.po b/addons/document/i18n/zh_CN.po
index 5f16742a546..5824b96630a 100644
--- a/addons/document/i18n/zh_CN.po
+++ b/addons/document/i18n/zh_CN.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-08-14 08:43+0000\n"
+"PO-Revision-Date: 2010-08-15 12:46+0000\n"
"Last-Translator: Black Jack \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: document
diff --git a/addons/document_ics/i18n/tr.po b/addons/document_ics/i18n/tr.po
index 40fc3a34dcb..15970ef9903 100644
--- a/addons/document_ics/i18n/tr.po
+++ b/addons/document_ics/i18n/tr.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-08-14 08:56+0000\n"
+"PO-Revision-Date: 2010-08-15 14:19+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: document_ics
diff --git a/addons/document_ics/i18n/zh_CN.po b/addons/document_ics/i18n/zh_CN.po
index 66a67f5c665..7881a3a7709 100644
--- a/addons/document_ics/i18n/zh_CN.po
+++ b/addons/document_ics/i18n/zh_CN.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-08-14 08:56+0000\n"
+"PO-Revision-Date: 2010-08-15 14:19+0000\n"
"Last-Translator: Black Jack \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: document_ics
diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml
index 57b57ec30fb..2c483a0f9ae 100644
--- a/addons/event/board_association_view.xml
+++ b/addons/event/board_association_view.xml
@@ -91,6 +91,7 @@
sequence="1"
id="menu_board_associations_manager"
icon="terp-graph"/>
+
diff --git a/addons/hr/board_hr_view.xml b/addons/hr/board_hr_view.xml
index 586fa439c4e..6408b11c799 100644
--- a/addons/hr/board_hr_view.xml
+++ b/addons/hr/board_hr_view.xml
@@ -40,5 +40,6 @@
id="menu_hr_project"
parent="menu_hr_dasboard"
sequence="4"/>
+
diff --git a/addons/hr/i18n/lt.po b/addons/hr/i18n/lt.po
index 34c84f0e989..b2bf952b866 100644
--- a/addons/hr/i18n/lt.po
+++ b/addons/hr/i18n/lt.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-08-14 08:56+0000\n"
+"PO-Revision-Date: 2010-08-15 14:19+0000\n"
"Last-Translator: Giedrius Slavinskas \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr
diff --git a/addons/hr/i18n/pt_BR.po b/addons/hr/i18n/pt_BR.po
index e9dabe5f6cf..77035a781d7 100644
--- a/addons/hr/i18n/pt_BR.po
+++ b/addons/hr/i18n/pt_BR.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-08-14 08:52+0000\n"
+"PO-Revision-Date: 2010-08-15 13:23+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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr
diff --git a/addons/hr/i18n/tr.po b/addons/hr/i18n/tr.po
index 6c145f3af51..dd65c5ed7c8 100644
--- a/addons/hr/i18n/tr.po
+++ b/addons/hr/i18n/tr.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-08-14 08:59+0000\n"
+"PO-Revision-Date: 2010-08-15 09:58+0000\n"
"Last-Translator: adsiz_1029@hotmail.com \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr
diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po
index 305d6b7e07d..4bc7a77bee9 100644
--- a/addons/hr/i18n/zh_CN.po
+++ b/addons/hr/i18n/zh_CN.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-08-14 08:47+0000\n"
+"PO-Revision-Date: 2010-08-15 09:24+0000\n"
"Last-Translator: Black Jack \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr
diff --git a/addons/hr_attendance/i18n/fi.po b/addons/hr_attendance/i18n/fi.po
index d300fe2a9aa..b75bc1a426e 100644
--- a/addons/hr_attendance/i18n/fi.po
+++ b/addons/hr_attendance/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-14 08:52+0000\n"
+"PO-Revision-Date: 2010-08-15 13:20+0000\n"
"Last-Translator: OpenERP Administrators \n"
"Language-Team: Finnish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/pt_BR.po b/addons/hr_attendance/i18n/pt_BR.po
index 709bfa47f98..618a368460d 100644
--- a/addons/hr_attendance/i18n/pt_BR.po
+++ b/addons/hr_attendance/i18n/pt_BR.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-08-14 08:53+0000\n"
+"PO-Revision-Date: 2010-08-15 13:47+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/tr.po b/addons/hr_attendance/i18n/tr.po
index 577ff678a00..114233c5d62 100644
--- a/addons/hr_attendance/i18n/tr.po
+++ b/addons/hr_attendance/i18n/tr.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-08-14 08:53+0000\n"
+"PO-Revision-Date: 2010-08-15 13:41+0000\n"
"Last-Translator: Angel Spy \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_attendance
diff --git a/addons/hr_contract/i18n/tr.po b/addons/hr_contract/i18n/tr.po
index 5ea6b065928..3c46285cb20 100644
--- a/addons/hr_contract/i18n/tr.po
+++ b/addons/hr_contract/i18n/tr.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-08-14 09:00+0000\n"
+"PO-Revision-Date: 2010-08-15 09:59+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_contract
diff --git a/addons/hr_expense/i18n/pt_BR.po b/addons/hr_expense/i18n/pt_BR.po
index c91b16061b5..3e6f7d5127b 100644
--- a/addons/hr_expense/i18n/pt_BR.po
+++ b/addons/hr_expense/i18n/pt_BR.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-08-14 08:48+0000\n"
+"PO-Revision-Date: 2010-08-15 09:28+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_expense
diff --git a/addons/hr_expense/i18n/tr.po b/addons/hr_expense/i18n/tr.po
index a842bdec9f1..da507daa642 100644
--- a/addons/hr_expense/i18n/tr.po
+++ b/addons/hr_expense/i18n/tr.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-08-14 08:52+0000\n"
+"PO-Revision-Date: 2010-08-15 13:03+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_expense
diff --git a/addons/hr_holidays/i18n/lt.po b/addons/hr_holidays/i18n/lt.po
index af8e1140255..0e5ce99f9f5 100644
--- a/addons/hr_holidays/i18n/lt.po
+++ b/addons/hr_holidays/i18n/lt.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-08-14 08:52+0000\n"
+"PO-Revision-Date: 2010-08-15 13:23+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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/tr.po b/addons/hr_holidays/i18n/tr.po
index 19c14584332..371c6ed5328 100644
--- a/addons/hr_holidays/i18n/tr.po
+++ b/addons/hr_holidays/i18n/tr.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-08-14 08:47+0000\n"
+"PO-Revision-Date: 2010-08-15 09:24+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_holidays
diff --git a/addons/hr_holidays/i18n/zh_CN.po b/addons/hr_holidays/i18n/zh_CN.po
index 280b1793fe6..3dd29aa20e1 100644
--- a/addons/hr_holidays/i18n/zh_CN.po
+++ b/addons/hr_holidays/i18n/zh_CN.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-08-14 08:47+0000\n"
+"PO-Revision-Date: 2010-08-15 09:27+0000\n"
"Last-Translator: Black Jack \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_holidays
diff --git a/addons/hr_timesheet/i18n/tr.po b/addons/hr_timesheet/i18n/tr.po
index 0d41ee75e26..bfae15dd7e6 100644
--- a/addons/hr_timesheet/i18n/tr.po
+++ b/addons/hr_timesheet/i18n/tr.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-08-14 08:54+0000\n"
+"PO-Revision-Date: 2010-08-15 14:01+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:20+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_timesheet
diff --git a/addons/hr_timesheet_invoice/i18n/tr.po b/addons/hr_timesheet_invoice/i18n/tr.po
index eaa96f8cd92..6a38591718b 100644
--- a/addons/hr_timesheet_invoice/i18n/tr.po
+++ b/addons/hr_timesheet_invoice/i18n/tr.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-08-14 08:51+0000\n"
+"PO-Revision-Date: 2010-08-15 09:47+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_sheet/i18n/lt.po b/addons/hr_timesheet_sheet/i18n/lt.po
index 5430bf1924d..ea0a7a3e917 100644
--- a/addons/hr_timesheet_sheet/i18n/lt.po
+++ b/addons/hr_timesheet_sheet/i18n/lt.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-08-14 08:49+0000\n"
+"PO-Revision-Date: 2010-08-15 09:31+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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/tr.po b/addons/hr_timesheet_sheet/i18n/tr.po
index 431600eb2dd..cd9db72ae96 100644
--- a/addons/hr_timesheet_sheet/i18n/tr.po
+++ b/addons/hr_timesheet_sheet/i18n/tr.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-08-14 08:46+0000\n"
+"PO-Revision-Date: 2010-08-15 09:21+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_timesheet_sheet
diff --git a/addons/idea/i18n/lt.po b/addons/idea/i18n/lt.po
index fc844c0bdc7..3ff4fc3523f 100644
--- a/addons/idea/i18n/lt.po
+++ b/addons/idea/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-14 08:54+0000\n"
+"PO-Revision-Date: 2010-08-15 13:54+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-08-15 06:20+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: idea
diff --git a/addons/idea/i18n/zh_CN.po b/addons/idea/i18n/zh_CN.po
index 4918723caf9..419ecbb0757 100644
--- a/addons/idea/i18n/zh_CN.po
+++ b/addons/idea/i18n/zh_CN.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-08-14 08:57+0000\n"
+"PO-Revision-Date: 2010-08-15 14:21+0000\n"
"Last-Translator: Black Jack \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-08-15 06:20+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: idea
diff --git a/addons/l10n_be/i18n/tr.po b/addons/l10n_be/i18n/tr.po
index 617f16efb17..17851bb480a 100644
--- a/addons/l10n_be/i18n/tr.po
+++ b/addons/l10n_be/i18n/tr.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-08-14 08:58+0000\n"
+"PO-Revision-Date: 2010-08-15 09:55+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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_be
diff --git a/addons/l10n_ch/i18n/it.po b/addons/l10n_ch/i18n/it.po
index eb241bd3cda..7d9b271ac42 100644
--- a/addons/l10n_ch/i18n/it.po
+++ b/addons/l10n_ch/i18n/it.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-08-14 09:01+0000\n"
+"PO-Revision-Date: 2010-08-15 10:02+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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/tr.po b/addons/l10n_ch/i18n/tr.po
index 422a86de63d..a382d494908 100644
--- a/addons/l10n_ch/i18n/tr.po
+++ b/addons/l10n_ch/i18n/tr.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-08-14 08:55+0000\n"
+"PO-Revision-Date: 2010-08-15 14:01+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_ch
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po b/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po
index 59a073c942f..aa66750dcea 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/tr.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-08-14 08:52+0000\n"
+"PO-Revision-Date: 2010-08-15 13:30+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_chart_uk_minimal/i18n/tr.po b/addons/l10n_chart_uk_minimal/i18n/tr.po
index 94dab9a74dd..bef90963bfc 100644
--- a/addons/l10n_chart_uk_minimal/i18n/tr.po
+++ b/addons/l10n_chart_uk_minimal/i18n/tr.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-08-14 08:53+0000\n"
+"PO-Revision-Date: 2010-08-15 13:46+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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_fr/i18n/tr.po b/addons/l10n_fr/i18n/tr.po
index 6c79ad8cc94..c38513963b0 100644
--- a/addons/l10n_fr/i18n/tr.po
+++ b/addons/l10n_fr/i18n/tr.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-08-14 08:47+0000\n"
+"PO-Revision-Date: 2010-08-15 09:25+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:19+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_fr
diff --git a/addons/l10n_lu/i18n/tr.po b/addons/l10n_lu/i18n/tr.po
index 50b2ce08916..58d59abc513 100644
--- a/addons/l10n_lu/i18n/tr.po
+++ b/addons/l10n_lu/i18n/tr.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-08-14 08:58+0000\n"
+"PO-Revision-Date: 2010-08-15 09:51+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_lu
diff --git a/addons/membership/i18n/tr.po b/addons/membership/i18n/tr.po
index 527c35371cc..effe873f013 100644
--- a/addons/membership/i18n/tr.po
+++ b/addons/membership/i18n/tr.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-08-14 08:55+0000\n"
+"PO-Revision-Date: 2010-08-15 14:04+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:18+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: membership
diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index a3cbee71e36..aa8bd2ab69e 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -43,5 +43,8 @@
id="menu_board_manufacturing"
parent="menus_dash_mrp"
sequence="1" groups="mrp.group_mrp_manager,mrp.group_mrp_user"/>
+
diff --git a/addons/mrp/i18n/pt_BR.po b/addons/mrp/i18n/pt_BR.po
index fa7df35cdfd..ba9689c8aec 100644
--- a/addons/mrp/i18n/pt_BR.po
+++ b/addons/mrp/i18n/pt_BR.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-08-14 08:53+0000\n"
+"PO-Revision-Date: 2010-08-15 13:46+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:18+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp
diff --git a/addons/mrp/i18n/tr.po b/addons/mrp/i18n/tr.po
index c76292e39d6..3f6b4687a19 100644
--- a/addons/mrp/i18n/tr.po
+++ b/addons/mrp/i18n/tr.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-08-14 08:58+0000\n"
+"PO-Revision-Date: 2010-08-15 09:57+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-08-15 06:18+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp
diff --git a/addons/mrp/i18n/zh_TW.po b/addons/mrp/i18n/zh_TW.po
index dca241679f5..fb0524c3470 100644
--- a/addons/mrp/i18n/zh_TW.po
+++ b/addons/mrp/i18n/zh_TW.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-08-14 08:57+0000\n"
+"PO-Revision-Date: 2010-08-15 14:21+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-08-15 06:18+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index cc62bfb5aa3..cf952a2660e 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -4,6 +4,7 @@
+
@@ -481,13 +482,13 @@
Procurement
-->
-
-
+
-
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/mrp/process/service_product_process.xml b/addons/mrp/process/service_product_process.xml
index a96a7a7bd4d..5c8fc1066f2 100644
--- a/addons/mrp/process/service_product_process.xml
+++ b/addons/mrp/process/service_product_process.xml
@@ -17,7 +17,7 @@
-->
-
+
@@ -28,7 +28,7 @@
-
+
diff --git a/addons/mrp/process/stockable_product_process.xml b/addons/mrp/process/stockable_product_process.xml
index bb5c36a015a..9dc45f0515f 100644
--- a/addons/mrp/process/stockable_product_process.xml
+++ b/addons/mrp/process/stockable_product_process.xml
@@ -17,7 +17,7 @@
-->
-
+
@@ -28,7 +28,7 @@
-
+
diff --git a/addons/mrp_operations/i18n/tr.po b/addons/mrp_operations/i18n/tr.po
index 7f4f52113d7..9d85023ec97 100644
--- a/addons/mrp_operations/i18n/tr.po
+++ b/addons/mrp_operations/i18n/tr.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-08-14 08:58+0000\n"
+"PO-Revision-Date: 2010-08-15 09:56+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp_operations
diff --git a/addons/mrp_repair/i18n/tr.po b/addons/mrp_repair/i18n/tr.po
index 21e251bee38..0999f3ea9c1 100644
--- a/addons/mrp_repair/i18n/tr.po
+++ b/addons/mrp_repair/i18n/tr.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-08-14 08:52+0000\n"
+"PO-Revision-Date: 2010-08-15 09:48+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp_repair
diff --git a/addons/mrp_subproduct/i18n/tr.po b/addons/mrp_subproduct/i18n/tr.po
index 45a79bdd13c..97c4651f256 100644
--- a/addons/mrp_subproduct/i18n/tr.po
+++ b/addons/mrp_subproduct/i18n/tr.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-08-14 08:53+0000\n"
+"PO-Revision-Date: 2010-08-15 13:34+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp_subproduct
diff --git a/addons/olap/i18n/et.po b/addons/olap/i18n/et.po
index 53217eb9ded..99796d11f52 100644
--- a/addons/olap/i18n/et.po
+++ b/addons/olap/i18n/et.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 05:24+0000\n"
-"PO-Revision-Date: 2010-08-03 08:15+0000\n"
+"PO-Revision-Date: 2010-08-15 18:00+0000\n"
"Last-Translator: lyyser \n"
"Language-Team: Estonian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-12 04:07+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: olap
@@ -103,7 +103,7 @@ msgstr "Salasõna logimiseks"
#: field:olap.application.field,application_id:0
#: field:olap.application.table,application_id:0
msgid "Application Id"
-msgstr ""
+msgstr "Rakenduse ID"
#. module: olap
#: model:ir.actions.todo,note:olap.config_auto_directory
diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index ff55c06f3b6..bd6c7018ca1 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -76,7 +76,7 @@ Main features :
'statement_data.xml',
],
'demo_xml': ['pos_demo.xml','singer_statement_demo.xml','multi_company_stock_data.xml'],
-# 'test':['test/pos_test.yml',],
+ 'test':['test/pos_test.yml',],
'installable': True,
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/i18n/lt.po b/addons/point_of_sale/i18n/lt.po
index 413e6e2ed65..78396ecbfe0 100644
--- a/addons/point_of_sale/i18n/lt.po
+++ b/addons/point_of_sale/i18n/lt.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-08-14 08:47+0000\n"
+"PO-Revision-Date: 2010-08-15 09:24+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:18+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/tr.po b/addons/point_of_sale/i18n/tr.po
index f2d23ac3b10..6f9367afe44 100644
--- a/addons/point_of_sale/i18n/tr.po
+++ b/addons/point_of_sale/i18n/tr.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-08-14 08:57+0000\n"
+"PO-Revision-Date: 2010-08-15 14:21+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:18+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: point_of_sale
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 09865f668a9..a4c3cd9474d 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -1154,6 +1154,13 @@ class pos_order_line(osv.osv):
return {'value': {'notice':'Minimum Discount','price_ded':price*discount*0.01 or 0.0 }}
else :
return {'value': {'notice':'No Discount', 'price_ded':price*discount*0.01 or 0.0}}
+
+ def onchange_qty(self, cr, uid, ids, discount, qty, price, context=None):
+ subtotal = qty * price
+ if discount:
+ subtotal = subtotal - (subtotal * discount / 100)
+ return {'value': {'price_subtotal_incl': subtotal}}
+
_columns = {
'name': fields.char('Line Description', size=512),
'company_id':fields.many2one('res.company', 'Company', required=True),
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 945eba6d2bd..2cd0a02c55e 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -22,7 +22,7 @@
-
+
diff --git a/addons/point_of_sale/test/pos_test.yml b/addons/point_of_sale/test/pos_test.yml
index 360c25b53a5..10c691e86c3 100644
--- a/addons/point_of_sale/test/pos_test.yml
+++ b/addons/point_of_sale/test/pos_test.yml
@@ -170,7 +170,6 @@
type: cash
view_id: account.account_journal_bank_view
-
-
I create property for account payable.
-
@@ -281,8 +280,6 @@
list_price: 170.0
mes_type: fixed
name: LG Viewty Smart
- pricelist_purchase: 'Default Purchase Pricelist (0.00) : 160.00\n'
- pricelist_sale: 'Public Pricelist (0.00) : 170.00\n'
procure_method: make_to_order
property_account_expense: account_account_payable1
property_account_income: account_account_receivable0
@@ -311,7 +308,7 @@
seller_ids:
- delay: 1
name: res_partner_microlinktechnologies0
- qty: 5.0
+ min_qty: 5.0
supply_method: buy
type: product
uom_id: product.product_uom_unit
@@ -374,10 +371,12 @@
-
!record {model: pos.make.payment, id: pos_make_payment_0}:
amount: 1615.0
- journal: 5
+ journal: 7
payment_date: 2010-05-13
payment_name: Payment
product_id: product_product_hppaviliondesktoppcs0
+ pricelist_id: product.list0
+ partner_id: base.res_partner_agrolait
-
I make the payment.
@@ -427,6 +426,9 @@
I click on close button.
-
!python {model: pos.add.product}: |
+ return_obj = self.pool.get('pos.return')
+ context['active_ids'] = [ref("pos_order_pos0")]
+ return_obj.view_init(cr, uid, [],context=context)
self.close_action(cr, uid, [ref("pos_add_product_0")], {"lang": "en_US", "active_model":
"pos.order", "active_ids": [ref("pos_order_pos0")], "tz": False, "active_id": ref("pos_order_pos0"),
})
@@ -436,10 +438,12 @@
-
!record {model: pos.make.payment, id: pos_make_payment_1}:
amount: 680.0
- journal: 5
+ journal: 7
payment_date: 2010-05-13
payment_name: Payment
product_id: product_product_hppaviliondesktoppcs0
+ pricelist_id: product.list0
+ partner_id: base.res_partner_agrolait
-
For payment, I click on Make Payment.
diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index ace38f1f444..7bd4f5e6b41 100644
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -149,10 +149,11 @@ class pos_make_payment(osv.osv_memory):
if order_obj.test_paid(cr, uid, [active_id]):
if data['partner_id'] and invoice_wanted:
order_obj.action_invoice(cr, uid, [active_id], context)
+ order_obj.create_picking(cr, uid, [active_id], context)
if context.get('return'):
order_obj.write(cr, uid, [active_id],{'state':'done'})
else:
- order_obj.write(cr, uid, [active_id],{'state':'paid'})
+ order_obj.write(cr, uid, [active_id],{'state':'paid'})
return self.create_invoice(cr, uid, ids, context)
else:
context.update({'flag': True})
@@ -160,7 +161,7 @@ class pos_make_payment(osv.osv_memory):
if context.get('return'):
order_obj.write(cr, uid, [active_id],{'state':'done'})
else:
- order_obj.write(cr, uid, [active_id],{'state':'paid'})
+ order_obj.write(cr, uid, [active_id],{'state':'paid'})
return self.print_report(cr, uid, ids, context)
if order.amount_paid > 0.0:
@@ -218,11 +219,6 @@ class pos_make_payment(osv.osv_memory):
'num_sale':fields.char('Num.File', size=32),
'pricelist_id': fields.many2one('product.pricelist', 'Pricelist'),
'partner_id': fields.many2one('res.partner', 'Customer'),
- 'invoice_id': fields.many2one('account.invoice', 'Invoice'),
- 'state': fields.selection([('draft', 'Draft'), ('payment', 'Payment'),
- ('advance','Advance'),
- ('paid', 'Paid'), ('done', 'Done'), ('invoiced', 'Invoiced'), ('cancel', 'Cancel')],
- 'State', readonly=True, ),
}
pos_make_payment()
diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
index 72a30daf5ec..776cb8cfb11 100644
--- a/addons/point_of_sale/wizard/pos_return.py
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -317,7 +317,7 @@ class add_product(osv.osv_memory):
invoice_obj=self.pool.get('account.invoice')
picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in', active_ids), ('state', '=', 'done')])
clone_list = []
- date_cur=time.strftime('%Y-%m-%d')
+ date_cur=time.strftime('%Y-%m-%d %H:%M:%S')
uom_obj = self.pool.get('product.uom')
return_boj=self.pool.get('pos.return')
return_id=return_boj.search(cr,uid,[])
diff --git a/addons/process/i18n/tr.po b/addons/process/i18n/tr.po
index c0cc0685e4d..c52c6b1c45a 100644
--- a/addons/process/i18n/tr.po
+++ b/addons/process/i18n/tr.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-08-14 08:48+0000\n"
+"PO-Revision-Date: 2010-08-15 09:28+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:19+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: process
diff --git a/addons/procurement/__openerp__.py b/addons/procurement/__openerp__.py
index 1f11ebcd22e..1cdc1462f89 100644
--- a/addons/procurement/__openerp__.py
+++ b/addons/procurement/__openerp__.py
@@ -38,8 +38,8 @@
'wizard/make_procurement_view.xml',
'wizard/mrp_procurement_view.xml',
'wizard/orderpoint_procurement_view.xml',
- 'procurement_view.xml',
'wizard/schedulers_all_view.xml',
+ 'procurement_view.xml',
'procurement_workflow.xml',
'process/procurement_process.xml',
"company_view.xml",
diff --git a/addons/procurement/process/procurement_process.xml b/addons/procurement/process/procurement_process.xml
index e12c97b2070..d6a1c0a0489 100644
--- a/addons/procurement/process/procurement_process.xml
+++ b/addons/procurement/process/procurement_process.xml
@@ -11,6 +11,16 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index a8afe304ece..cb34068e884 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -4,6 +4,7 @@
+
procurement.order.tree
@@ -67,10 +68,6 @@
-
-
-
-
@@ -263,12 +260,10 @@
res_model="stock.warehouse.orderpoint"
src_model="procurement.order"/>
-
-
-
-
-
-
+
+
+
+
diff --git a/addons/product/i18n/lt.po b/addons/product/i18n/lt.po
index 153092bd396..18ce8ca4226 100644
--- a/addons/product/i18n/lt.po
+++ b/addons/product/i18n/lt.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-08-14 08:58+0000\n"
+"PO-Revision-Date: 2010-08-15 14:21+0000\n"
"Last-Translator: Giedrius Slavinskas \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-08-15 06:20+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: lt\n"
diff --git a/addons/product/i18n/mn.po b/addons/product/i18n/mn.po
index 6062854e93f..265df248bbb 100644
--- a/addons/product/i18n/mn.po
+++ b/addons/product/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-14 08:44+0000\n"
+"PO-Revision-Date: 2010-08-15 08:58+0000\n"
"Last-Translator: ub121 \n"
"Language-Team: Mongolian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-15 06:20+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product
diff --git a/addons/product/i18n/pt_BR.po b/addons/product/i18n/pt_BR.po
index a4330a52f45..01a984c523c 100644
--- a/addons/product/i18n/pt_BR.po
+++ b/addons/product/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-14 08:51+0000\n"
+"PO-Revision-Date: 2010-08-15 09:41+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-08-15 06:20+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product
diff --git a/addons/product/i18n/sr.po b/addons/product/i18n/sr.po
index ce16d1c89b3..b130d168968 100644
--- a/addons/product/i18n/sr.po
+++ b/addons/product/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-14 08:58+0000\n"
+"PO-Revision-Date: 2010-08-15 09:57+0000\n"
"Last-Translator: Sonja Sardelić \n"
"Language-Team: Serbian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-15 06:20+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product
diff --git a/addons/product/i18n/tr.po b/addons/product/i18n/tr.po
index c2b389551bd..76ccca65601 100644
--- a/addons/product/i18n/tr.po
+++ b/addons/product/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-14 08:49+0000\n"
+"PO-Revision-Date: 2010-08-15 09:32+0000\n"
"Last-Translator: Angel Spy \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-08-15 06:20+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product
diff --git a/addons/product/i18n/zh_CN.po b/addons/product/i18n/zh_CN.po
index fce117de0ae..811169d516a 100644
--- a/addons/product/i18n/zh_CN.po
+++ b/addons/product/i18n/zh_CN.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-08-14 08:47+0000\n"
+"PO-Revision-Date: 2010-08-15 09:24+0000\n"
"Last-Translator: Black Jack \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-08-15 06:20+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product
diff --git a/addons/product_margin/i18n/pt_BR.po b/addons/product_margin/i18n/pt_BR.po
index 9cdeabd9cb7..e2b83fe9b68 100644
--- a/addons/product_margin/i18n/pt_BR.po
+++ b/addons/product_margin/i18n/pt_BR.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-08-14 08:51+0000\n"
+"PO-Revision-Date: 2010-08-15 09:43+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product_margin
diff --git a/addons/product_margin/i18n/tr.po b/addons/product_margin/i18n/tr.po
index 287c7333a17..d715c3734c4 100644
--- a/addons/product_margin/i18n/tr.po
+++ b/addons/product_margin/i18n/tr.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-08-14 08:58+0000\n"
+"PO-Revision-Date: 2010-08-15 09:57+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product_margin
diff --git a/addons/profile_accounting/i18n/tr.po b/addons/profile_accounting/i18n/tr.po
index d425a07efbc..4f62c578743 100644
--- a/addons/profile_accounting/i18n/tr.po
+++ b/addons/profile_accounting/i18n/tr.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-08-14 08:47+0000\n"
+"PO-Revision-Date: 2010-08-15 09:24+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:17+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: profile_accounting
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index db2f09963e8..5fb7e7fa858 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -146,5 +146,10 @@
parent="next_id_86"
sequence="1"/>
+
+
diff --git a/addons/project/i18n/lt.po b/addons/project/i18n/lt.po
index 6e7666ddfe9..d69ff274d1c 100644
--- a/addons/project/i18n/lt.po
+++ b/addons/project/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-14 08:58+0000\n"
+"PO-Revision-Date: 2010-08-15 09:50+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-08-15 06:17+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project
diff --git a/addons/project/i18n/ru.po b/addons/project/i18n/ru.po
index 9e9afc7e019..50fe0ecccc9 100644
--- a/addons/project/i18n/ru.po
+++ b/addons/project/i18n/ru.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-08-14 08:51+0000\n"
+"PO-Revision-Date: 2010-08-15 09:37+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-08-15 06:17+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project
diff --git a/addons/project/i18n/tr.po b/addons/project/i18n/tr.po
index d7783a9f293..078a7ff7934 100644
--- a/addons/project/i18n/tr.po
+++ b/addons/project/i18n/tr.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-08-14 08:49+0000\n"
+"PO-Revision-Date: 2010-08-15 09:36+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-08-15 06:17+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project
diff --git a/addons/project_gtd/i18n/tr.po b/addons/project_gtd/i18n/tr.po
index abf15addb55..d03242201c1 100644
--- a/addons/project_gtd/i18n/tr.po
+++ b/addons/project_gtd/i18n/tr.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-08-14 09:00+0000\n"
+"PO-Revision-Date: 2010-08-15 10:02+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_gtd
diff --git a/addons/project_mrp/i18n/tr.po b/addons/project_mrp/i18n/tr.po
index 2606d52b99e..f82d542ad60 100644
--- a/addons/project_mrp/i18n/tr.po
+++ b/addons/project_mrp/i18n/tr.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-08-14 08:57+0000\n"
+"PO-Revision-Date: 2010-08-15 14:21+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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_mrp
diff --git a/addons/project_planning/i18n/hr.po b/addons/project_planning/i18n/hr.po
index 1e9d21babfc..60f8c449911 100644
--- a/addons/project_planning/i18n/hr.po
+++ b/addons/project_planning/i18n/hr.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-08-14 09:05+0000\n"
+"PO-Revision-Date: 2010-08-15 10:38+0000\n"
"Last-Translator: Miro Glavić \n"
"Language-Team: Vinteh\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-15 06:18+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
diff --git a/addons/project_planning/i18n/tr.po b/addons/project_planning/i18n/tr.po
index 3971d698904..710c9433fe2 100644
--- a/addons/project_planning/i18n/tr.po
+++ b/addons/project_planning/i18n/tr.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-08-14 08:39+0000\n"
+"PO-Revision-Date: 2010-08-15 12:08+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:18+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_planning
diff --git a/addons/project_retro_planning/i18n/tr.po b/addons/project_retro_planning/i18n/tr.po
index 8fa50353ab0..8492b8eecc4 100644
--- a/addons/project_retro_planning/i18n/tr.po
+++ b/addons/project_retro_planning/i18n/tr.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-08-14 08:55+0000\n"
+"PO-Revision-Date: 2010-08-15 14:06+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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_retro_planning
diff --git a/addons/project_scrum/i18n/tr.po b/addons/project_scrum/i18n/tr.po
index 56665123c17..5ed5461fdd0 100644
--- a/addons/project_scrum/i18n/tr.po
+++ b/addons/project_scrum/i18n/tr.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-08-14 09:07+0000\n"
+"PO-Revision-Date: 2010-08-15 10:41+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:18+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_scrum
diff --git a/addons/project_timesheet/i18n/tr.po b/addons/project_timesheet/i18n/tr.po
index bf11132d121..31a1d6a9741 100644
--- a/addons/project_timesheet/i18n/tr.po
+++ b/addons/project_timesheet/i18n/tr.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-08-14 08:52+0000\n"
+"PO-Revision-Date: 2010-08-15 13:01+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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_timesheet
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index 1a90dc49e92..f5b131a69f5 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -61,6 +61,7 @@
id="menu_board_purchase"
parent="menu_purchase_deshboard"
sequence="4"/>
+
diff --git a/addons/purchase/i18n/et.po b/addons/purchase/i18n/et.po
index 7a052bcee3e..b7a80f2a63c 100644
--- a/addons/purchase/i18n/et.po
+++ b/addons/purchase/i18n/et.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-08-14 08:51+0000\n"
+"PO-Revision-Date: 2010-08-15 09:37+0000\n"
"Last-Translator: lyyser \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-08-15 06:18+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: purchase
diff --git a/addons/purchase/i18n/lt.po b/addons/purchase/i18n/lt.po
index 9eaa48f5811..e7551c82c8d 100644
--- a/addons/purchase/i18n/lt.po
+++ b/addons/purchase/i18n/lt.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-08-14 08:57+0000\n"
+"PO-Revision-Date: 2010-08-15 14:20+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:18+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: purchase
diff --git a/addons/purchase/i18n/tr.po b/addons/purchase/i18n/tr.po
index cd43f0207d0..e70f047e4cf 100644
--- a/addons/purchase/i18n/tr.po
+++ b/addons/purchase/i18n/tr.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-08-14 08:52+0000\n"
+"PO-Revision-Date: 2010-08-15 13:09+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:18+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: purchase
diff --git a/addons/report_intrastat/i18n/pt_BR.po b/addons/report_intrastat/i18n/pt_BR.po
index 22f9174878d..c7f1c5ab34a 100644
--- a/addons/report_intrastat/i18n/pt_BR.po
+++ b/addons/report_intrastat/i18n/pt_BR.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-08-14 08:54+0000\n"
+"PO-Revision-Date: 2010-08-15 13:53+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:20+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/tr.po b/addons/report_intrastat/i18n/tr.po
index 687844e4e7b..04d0293570b 100644
--- a/addons/report_intrastat/i18n/tr.po
+++ b/addons/report_intrastat/i18n/tr.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-08-14 08:58+0000\n"
+"PO-Revision-Date: 2010-08-15 09:57+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:20+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: report_intrastat
diff --git a/addons/report_intrastat/report_intrastat.py b/addons/report_intrastat/report_intrastat.py
index 532bede5ac3..90c2884cceb 100644
--- a/addons/report_intrastat/report_intrastat.py
+++ b/addons/report_intrastat/report_intrastat.py
@@ -107,7 +107,7 @@ class report_intrastat(osv.osv):
left join account_invoice_line inv_line on inv_line.invoice_id=inv.id
left join (product_template pt
left join product_product pp on (pp.product_tmpl_id = pt.id))
- on (inv_line.product_id = pt.id)
+ on (inv_line.product_id = pp.id)
left join product_uom uom on uom.id=inv_line.uos_id
left join product_uom puom on puom.id = pt.uom_id
left join report_intrastat_code intrastat on pt.intrastat_id = intrastat.id
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 87e16d278a2..1facb90fe94 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -66,7 +66,7 @@
'sale_report.xml',
'stock_view.xml',
'board_sale_view.xml',
-# 'process/sale_process.xml',
+ 'process/sale_process.xml',
],
'demo_xml': ['sale_demo.xml','board_sale_demo.xml'],
'test': [
diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index b25e7e5b1b2..0dfe2a3a63b 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -52,6 +52,6 @@
-
+
diff --git a/addons/sale/i18n/pt_BR.po b/addons/sale/i18n/pt_BR.po
index 8cabcd0a0ed..5c91473e294 100644
--- a/addons/sale/i18n/pt_BR.po
+++ b/addons/sale/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: pt_BR\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-14 08:49+0000\n"
+"PO-Revision-Date: 2010-08-15 09:34+0000\n"
"Last-Translator: Renato Lima - http://www.akretion.com "
"\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-08-15 06:20+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale
diff --git a/addons/sale/i18n/sr.po b/addons/sale/i18n/sr.po
index 62bb5a9ffd1..0a560628deb 100644
--- a/addons/sale/i18n/sr.po
+++ b/addons/sale/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-14 08:55+0000\n"
+"PO-Revision-Date: 2010-08-15 14:11+0000\n"
"Last-Translator: OpenERP Administrators \n"
"Language-Team: Serbian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-15 06:20+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale
diff --git a/addons/sale/i18n/sv.po b/addons/sale/i18n/sv.po
index 74f78cd582c..1b206b45ba1 100644
--- a/addons/sale/i18n/sv.po
+++ b/addons/sale/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-08-14 08:56+0000\n"
+"PO-Revision-Date: 2010-08-15 14:19+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-08-15 06:20+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale
diff --git a/addons/sale/i18n/tr.po b/addons/sale/i18n/tr.po
index 571a749edc4..c148d303170 100644
--- a/addons/sale/i18n/tr.po
+++ b/addons/sale/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-14 08:52+0000\n"
+"PO-Revision-Date: 2010-08-15 13:15+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-08-15 06:20+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale
diff --git a/addons/sale/i18n/uk.po b/addons/sale/i18n/uk.po
index 34f855711a4..d83ff65c216 100644
--- a/addons/sale/i18n/uk.po
+++ b/addons/sale/i18n/uk.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-14 08:57+0000\n"
+"PO-Revision-Date: 2010-08-15 14:21+0000\n"
"Last-Translator: Jay (OpenERP) \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-08-15 06:20+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale
diff --git a/addons/sale/i18n/vi.po b/addons/sale/i18n/vi.po
index ddd63a476c2..f9eab5e4f8c 100644
--- a/addons/sale/i18n/vi.po
+++ b/addons/sale/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-14 08:53+0000\n"
+"PO-Revision-Date: 2010-08-15 13:45+0000\n"
"Last-Translator: Fabien (Open ERP) \n"
"Language-Team: Vietnamese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-15 06:20+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale
diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index 1ebbc267de7..3f0d78c0601 100644
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -63,7 +63,7 @@
-
+
diff --git a/addons/sale/test/advance_invoice.yml b/addons/sale/test/advance_invoice.yml
index 5a8d06c354c..f926548046f 100644
--- a/addons/sale/test/advance_invoice.yml
+++ b/addons/sale/test/advance_invoice.yml
@@ -66,7 +66,7 @@
!python {model: account.invoice}: |
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so5"))
- invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','open')])
+ invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')])
assert invoice_id, "Invoice is not in the open state"
-
Creating a account invoice pay entry.
@@ -100,7 +100,7 @@
!python {model: account.invoice}: |
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so5"))
- invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','paid')])
+ invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','paid')])
assert invoice_id, "Invoice for SO is not in done state."
-
I verify that Paid has been set to true.
@@ -135,7 +135,7 @@
!python {model: account.invoice}: |
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so5"))
- invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','open')])
+ invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')])
assert invoice_id, "Invoice is not in the open state"
-
Creating a account invoice pay entry.
@@ -178,7 +178,7 @@
!python {model: account.invoice}: |
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so5"))
- invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','paid')])
+ invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','paid')])
assert invoice_id, "Invoice for SO is not in done state."
-
I verify that Paid has been set to true.
diff --git a/addons/sale/test/invoice_on_ordered_qty.yml b/addons/sale/test/invoice_on_ordered_qty.yml
index 9056e4cbb83..c845a4cb741 100644
--- a/addons/sale/test/invoice_on_ordered_qty.yml
+++ b/addons/sale/test/invoice_on_ordered_qty.yml
@@ -3,7 +3,7 @@
I create a Sale Order for Slider Mobile for 500 quantity having Shipping Policy 'Shipping & Manual Invoice' and Invoice on 'Ordered quantities'
in order to create an invoice based on the ordered quantity
-
- !record {model: sale.order, id: sale_order_so8}:
+ !record {model: sale.order, id: sale_order_so9}:
date_order: '2010-07-17'
invoice_quantity: order
name: Test_SO006
@@ -29,13 +29,13 @@
-
I confirm the Sale Order.
-
- !workflow {model: sale.order, action: order_confirm, ref: sale_order_so8}
+ !workflow {model: sale.order, action: order_confirm, ref: sale_order_so9}
-
I verify that the picking has been generated for the sale order
-
!python {model: sale.order}: |
- so = self.browse(cr, uid, ref("sale_order_so8"))
- assert so.picking_ids,"Picking has not been generated for sale_order_so8"
+ so = self.browse(cr, uid, ref("sale_order_so9"))
+ assert so.picking_ids,"Picking has not been generated for sale_order_so9"
-
Then I click on the "Products Received" button of Incoming Shipments
-
@@ -47,7 +47,7 @@
!python {model: stock.picking }: |
import time
sale_order_obj = self.pool.get('sale.order')
- so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
+ so = sale_order_obj.browse(cr, uid, ref("sale_order_so9"))
picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
if picking_id:
pick=self.browse(cr,uid,picking_id[0])
@@ -67,33 +67,32 @@
-
I click on Create Invoice button to create the invoice.
-
- !workflow {model: sale.order, action: manual_invoice, ref: sale_order_so8}
+ !workflow {model: sale.order, action: manual_invoice, ref: sale_order_so9}
-
I verify whether the invoice has been generated for SO
-
!python {model: sale.order}: |
- so = self.browse(cr, uid, ref("sale_order_so8"))
- assert so.invoice_ids, "Invoices has not been generated for sale_order_so8"
+ so = self.browse(cr, uid, ref("sale_order_so9"))
+ assert so.invoice_ids, "Invoices has not been generated for sale_order_so9"
-
I verify that an invoice is created on the basis of ordered quantity
-
!python {model: account.invoice}: |
sale_order_obj = self.pool.get('sale.order')
- so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
+ so = sale_order_obj.browse(cr, uid, ref("sale_order_so9"))
for so_lines in so.order_line:
- qty=so_lines.product_uom_qty
- ids = self.search(cr, uid, [('origin', '=', so.name)])
+ qty = so_lines.product_uom_qty
+ ids = self.search(cr, uid, [('origin','=',so.name)])
inv_brw = self.browse(cr,uid,ids)[0]
for inv_lines in inv_brw.invoice_line:
- qty1=inv_lines.quantity
- invoice_id = self.search(cr, uid, [('qty1','=', 'qty') and ('origin', '=', so.name)])
- assert invoice_id, "Quantities are not same"
+ qty1 = inv_lines.quantity
+ assert ('qty1','=','qty'), "Quantities are not same"
-
I open the Invoice for the SO.
-
!python {model: account.invoice}: |
sale_order_obj = self.pool.get('sale.order')
- so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
+ so = sale_order_obj.browse(cr, uid, ref("sale_order_so9"))
import netsvc
wf_service = netsvc.LocalService("workflow")
invoice_ids = so.invoice_ids
@@ -113,7 +112,7 @@
-
!python {model: account.invoice.pay}: |
sale_order_obj = self.pool.get('sale.order')
- so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
+ so = sale_order_obj.browse(cr, uid, ref("sale_order_so9"))
self.wo_check(cr, uid, [ref("account_invoice_pay_tst1")], {"lang": "en_US", "tz":
False, "active_model": 'account.invoice', "active_ids": [so.invoice_ids[0].id], "type":
"out_invoice", "active_id": so.invoice_ids[0].id, })
@@ -130,7 +129,7 @@
-
!python {model: account.invoice.pay.writeoff}: |
sale_order_obj = self.pool.get('sale.order')
- so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
+ so = sale_order_obj.browse(cr, uid, ref("sale_order_so9"))
self.pay_and_reconcile_writeoff(cr, uid, [ref("account_invoice_pay_writeoff_0")],
{"lang": 'en_US', "tz": False, "active_model": 'account.invoice', "active_ids":
[so.invoice_ids[0].id], "type": "out_invoice", "active_id": so.invoice_ids[0].id })
@@ -139,7 +138,7 @@
-
!python {model: account.invoice}: |
sale_order_obj = self.pool.get('sale.order')
- so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
+ so = sale_order_obj.browse(cr, uid, ref("sale_order_so9"))
invoice_ids = so.invoice_ids
for invoice in invoice_ids:
assert (invoice.state) =='paid', "Invoice for SO is not in done state."
@@ -147,5 +146,5 @@
I check that Paid has been set to true.
-
!python {model: sale.order}: |
- sale_id=self.browse(cr, uid, ref("sale_order_so8"))
+ sale_id=self.browse(cr, uid, ref("sale_order_so9"))
assert(sale_id.invoiced == True), "Paid has not been set to true"
\ No newline at end of file
diff --git a/addons/sale/test/invoice_on_shipped_qty.yml b/addons/sale/test/invoice_on_shipped_qty.yml
index 06e90cb9c4b..c399948c004 100644
--- a/addons/sale/test/invoice_on_shipped_qty.yml
+++ b/addons/sale/test/invoice_on_shipped_qty.yml
@@ -103,8 +103,7 @@
inv_brw = self.browse(cr,uid,inv_id)[0]
for inv_lines in inv_brw.invoice_line:
qty1=inv_lines.quantity
- invoice_id = self.search(cr, uid, [('qty1','=', 'qty') and ('origin', '=', so.name)])
- assert invoice_id, "Quantities are not same"
+ assert ('qty1','=','qty'), "Quantities are not same"
-
I open the Invoice for the SO.
-
diff --git a/addons/sale/test/manual_order_policy.yml b/addons/sale/test/manual_order_policy.yml
index 3d7abdcf549..9dd12ed375c 100644
--- a/addons/sale/test/manual_order_policy.yml
+++ b/addons/sale/test/manual_order_policy.yml
@@ -56,7 +56,7 @@
!python {model: account.invoice}: |
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
- invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','open')])
+ invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')])
assert invoice_id, "Invoice is not in the open state"
-
I verify that its Journal Entries has been created
@@ -64,7 +64,7 @@
!python {model: account.invoice}: |
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
- invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','open')])
+ invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')])
inv_brw = self.browse(cr, uid, invoice_id)[0]
assert inv_brw.move_id, "Journal Entries has not been created"
-
@@ -108,7 +108,7 @@
!python {model: account.invoice}: |
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
- invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','paid')])
+ invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','paid')])
assert invoice_id, "Invoice for SO is not in done state."
-
I verify that Paid has been set to true.
@@ -161,7 +161,7 @@
if (mod_brw.state == 'installed'):
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
- proc_ids = self.search(cr, uid, [('origin','=',so.name) and ('state','=','running')])
+ proc_ids = self.search(cr, uid, [('origin','=',so.name),('state','=','running')])
assert proc_ids, _('Procurement is not in the running state!')
-
I verify that a purchase order has been generated
@@ -259,7 +259,7 @@
pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)])
po = pur_obj.browse(cr, uid, pur_id)[0]
picking_obj = self.pool.get('stock.picking')
- ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id ) and ('state', '=', 'done')])
+ ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id ),('state', '=', 'done')])
assert ids, _('Picking is not in the done state!')
-
Then I done the picking
diff --git a/addons/sale/test/picking_order_policy.yml b/addons/sale/test/picking_order_policy.yml
index d973f31d1f3..d9b2500d432 100644
--- a/addons/sale/test/picking_order_policy.yml
+++ b/addons/sale/test/picking_order_policy.yml
@@ -174,7 +174,7 @@
if (mod_brw.state == 'installed'):
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so7"))
- proc_ids = self.search(cr, uid, [('origin','=',so.name) and ('state','=','running')])
+ proc_ids = self.search(cr, uid, [('origin','=',so.name),('state','=','running')])
assert proc_ids, _('Procurement is not in the running state!')
-
I verify that a purchase order has been generated
@@ -271,7 +271,7 @@
pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)])
po = pur_obj.browse(cr, uid, pur_id)[0]
picking_obj = self.pool.get('stock.picking')
- ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id ) and ('state', '=', 'done')])
+ ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id ),('state', '=', 'done')])
assert ids, _('Picking is not in the done state!')
-
I verify that delivery order has been generated for sale order
diff --git a/addons/sale/test/postpaid_order_policy.yml b/addons/sale/test/postpaid_order_policy.yml
index 056a8327435..c4cf24eb419 100644
--- a/addons/sale/test/postpaid_order_policy.yml
+++ b/addons/sale/test/postpaid_order_policy.yml
@@ -139,7 +139,8 @@
if (mod_brw.state == 'installed'):
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
- proc_ids = self.search(cr, uid, [('origin','=',so.name) and ('state','=','running')])
+ proc_ids = self.search(cr, uid, [('origin','=',so.name),('state','=','running')])
+ assert proc_ids, _('Procurement is not in the running state!')
-
I verify that a purchase order has been generated
-
@@ -235,7 +236,7 @@
pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)])
po = pur_obj.browse(cr, uid, pur_id)[0]
picking_obj = self.pool.get('stock.picking')
- ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id ) and ('state', '=', 'done')])
+ ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id ),('state', '=', 'done')])
assert ids, _('Picking is not in the done state!')
-
I verify that a "Picked" has been set to true
diff --git a/addons/sale/test/prepaid_order_policy.yml b/addons/sale/test/prepaid_order_policy.yml
index fd7f04bede0..f5329f1540a 100644
--- a/addons/sale/test/prepaid_order_policy.yml
+++ b/addons/sale/test/prepaid_order_policy.yml
@@ -94,7 +94,7 @@
!python {model: account.invoice}: |
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
- invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','paid')])
+ invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','paid')])
assert invoice_id, "Invoice for SO is not in done state."
-
I check that Paid has been set to true.
@@ -171,7 +171,7 @@
if(mod_brw.state == 'installed'):
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
- proc_ids = self.search(cr, uid, [('origin','=',so.name) and ('state','=','running')])
+ proc_ids = self.search(cr, uid, [('origin','=',so.name),('state','=','running')])
assert proc_ids, _('Procurement is not in the running state!')
-
I verify that a purchase order has been generated
@@ -268,7 +268,7 @@
pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)])
po = pur_obj.browse(cr, uid, pur_id)[0]
picking_obj = self.pool.get('stock.picking')
- ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id ) and ('state', '=', 'done')])
+ ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id ),('state', '=', 'done')])
assert ids, _('Picking is not in the done state!')
-
I verify that a "Picked" has been set to true
diff --git a/addons/sale/test/sale_procurement.yml b/addons/sale/test/sale_procurement.yml
index 4e7d2162421..f7753948339 100644
--- a/addons/sale/test/sale_procurement.yml
+++ b/addons/sale/test/sale_procurement.yml
@@ -68,11 +68,13 @@
-
!workflow {model: sale.order, action: order_confirm, ref: sale_order_so3}
-
- I check that one procurement is generated.
+ I check that procurement is generated.
-
!python {model: procurement.order}: |
from tools.translate import _
- proc_ids = self.search(cr, uid, [('state','=','confirmed')])
+ sale_order_obj = self.pool.get('sale.order')
+ so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
+ proc_ids = self.search(cr, uid, [('origin','=',so.name)])
assert proc_ids, _('No Procurements!')
-
I run the scheduler.
diff --git a/addons/sale/test/so_make_line_invoice.yml b/addons/sale/test/so_make_line_invoice.yml
index 6a5ea58f6da..07c45bec996 100644
--- a/addons/sale/test/so_make_line_invoice.yml
+++ b/addons/sale/test/so_make_line_invoice.yml
@@ -79,7 +79,7 @@
!python {model: account.invoice}: |
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
- invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','open')])
+ invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')])
assert invoice_id, "Invoice is not in the open state"
-
Creating an account invoice pay entry.
@@ -122,7 +122,7 @@
!python {model: account.invoice}: |
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
- invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','paid')])
+ invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','paid')])
assert invoice_id, "Invoice for SO is not in done state."
-
I verify that Paid has been set to true.
@@ -189,7 +189,7 @@
!python {model: account.invoice}: |
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
- invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','open')])
+ invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')])
assert invoice_id, "Invoice is not in the open state"
-
Creating a account invoice pay entry.
@@ -232,7 +232,7 @@
!python {model: account.invoice}: |
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
- invoice_id = self.search(cr, uid, [('origin','=',so.name) and ('state','=','paid')])
+ invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','paid')])
assert invoice_id, "Invoice for SO is not in done state."
-
I verify that Paid has been set to true.
diff --git a/addons/sale_journal/i18n/pl.po b/addons/sale_journal/i18n/pl.po
index e9bf17dc816..be9205427e7 100644
--- a/addons/sale_journal/i18n/pl.po
+++ b/addons/sale_journal/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-08-14 08:51+0000\n"
+"PO-Revision-Date: 2010-08-15 09:44+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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale_journal
diff --git a/addons/sale_journal/i18n/tr.po b/addons/sale_journal/i18n/tr.po
index f4d1b97b33d..2514288616f 100644
--- a/addons/sale_journal/i18n/tr.po
+++ b/addons/sale_journal/i18n/tr.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-08-14 08:53+0000\n"
+"PO-Revision-Date: 2010-08-15 13:46+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale_journal
diff --git a/addons/sale_layout/i18n/et.po b/addons/sale_layout/i18n/et.po
new file mode 100644
index 00000000000..ae9c358c668
--- /dev/null
+++ b/addons/sale_layout/i18n/et.po
@@ -0,0 +1,279 @@
+# Estonian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2009-11-26 08:45+0000\n"
+"PO-Revision-Date: 2010-08-15 17:57+0000\n"
+"Last-Translator: lyyser \n"
+"Language-Team: Estonian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Sub Total"
+msgstr "Vahesumma"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Title"
+msgstr "Pealkiri"
+
+#. module: sale_layout
+#: model:ir.module.module,shortdesc:sale_layout.module_meta_information
+msgid "sale_layout"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Disc. (%)"
+msgstr "Allahindl. (%)"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Note"
+msgstr "Märkus"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Unit Price"
+msgstr "Ühiku hind"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Order N°"
+msgstr "Korraldus Nr."
+
+#. module: sale_layout
+#: field:sale.order,abstract_line_ids:0
+msgid "Order Lines"
+msgstr "Korralduse read"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Disc.(%)"
+msgstr "Allah. (%)"
+
+#. module: sale_layout
+#: field:sale.order.line,layout_type:0
+msgid "Layout Type"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Seq."
+msgstr "Jär."
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Product"
+msgstr "Toode"
+
+#. module: sale_layout
+#: model:ir.module.module,description:sale_layout.module_meta_information
+msgid ""
+"\n"
+" This module provides some features to improve the layout of the Sale "
+"Order.\n"
+"\n"
+" It gives you the possibility to\n"
+" * order all the lines of an sale order\n"
+" * add titles, comment lines, sub total lines\n"
+" * draw horizontal lines and put page breaks \n"
+"\n"
+" "
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Description"
+msgstr "Kirjeldus"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Manual Description"
+msgstr "Manuaalne kirjeldus"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Our Salesman"
+msgstr "Meie müügimees"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Automatic Declaration"
+msgstr "Automaatne deklareerimine"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Invoice Lines"
+msgstr "Arve read"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Quantity"
+msgstr "Kogus"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Quotation N°"
+msgstr "Hinnapakkumine Nr"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "VAT"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Make Invoice"
+msgstr "Loo arve"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Properties"
+msgstr "Seaded"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Invoice address :"
+msgstr "Arveaadress :"
+
+#. module: sale_layout
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Vigane XML vaate arhitektuurile!"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Page Break"
+msgstr "Leheküljepiir"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Notes"
+msgstr "Märkused"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Date Ordered"
+msgstr "Tellimuse kuupäev"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Shipping address :"
+msgstr "Tarneaadress :"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Taxes"
+msgstr "Maksud"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Net Total :"
+msgstr "Netosumma:"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Tel. :"
+msgstr "Tel:"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Total :"
+msgstr "Kokku :"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Payment Terms"
+msgstr "Makse tingimused"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "History"
+msgstr "Ajalugu"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sale Order Lines"
+msgstr "Müügikorralduse read"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Separator Line"
+msgstr "Eraldusjoon"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Your Reference"
+msgstr "Sinu viide"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sales order lines"
+msgstr "Müügikorralduste read"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Qty"
+msgstr "Kogus"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "States"
+msgstr ""
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "TVA :"
+msgstr "KM:"
+
+#. module: sale_layout
+#: model:ir.actions.report.xml,name:sale_layout.sale_order_1
+msgid "Order with Layout"
+msgstr ""
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Täiendav info"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "UoM"
+msgstr "Mõõtühik"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Fax :"
+msgstr "Faks :"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Order Line"
+msgstr "Korralduse rida"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Price"
+msgstr "Hind"
+
+#. module: sale_layout
+#: rml:sale.order.layout:0
+msgid "Taxes :"
+msgstr "Maksud :"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr "Lao liikumised"
diff --git a/addons/sale_layout/sale_layout_view.xml b/addons/sale_layout/sale_layout_view.xml
index 41ab5d33900..f184f79da49 100755
--- a/addons/sale_layout/sale_layout_view.xml
+++ b/addons/sale_layout/sale_layout_view.xml
@@ -21,6 +21,7 @@
sale.order.form.inherit_1
sale.order
+ 30
form
diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index df33d91a2a3..5704df7685b 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -45,6 +45,7 @@
+
diff --git a/addons/stock/i18n/bs.po b/addons/stock/i18n/bs.po
index 13a4c5c6a08..f73707fbfdc 100644
--- a/addons/stock/i18n/bs.po
+++ b/addons/stock/i18n/bs.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-08-14 08:50+0000\n"
+"PO-Revision-Date: 2010-08-15 09:36+0000\n"
"Last-Translator: adnan \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-08-15 06:17+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock
diff --git a/addons/stock/i18n/de.po b/addons/stock/i18n/de.po
index d9f6d9cd475..d2622c9dac8 100644
--- a/addons/stock/i18n/de.po
+++ b/addons/stock/i18n/de.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-08-14 08:35+0000\n"
+"PO-Revision-Date: 2010-08-15 11:44+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-08-15 06:17+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock
diff --git a/addons/stock/i18n/it.po b/addons/stock/i18n/it.po
index d8c3487749c..daefdc181dd 100644
--- a/addons/stock/i18n/it.po
+++ b/addons/stock/i18n/it.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-08-14 09:07+0000\n"
+"PO-Revision-Date: 2010-08-15 10:42+0000\n"
"Last-Translator: Davide Corio - Domsense \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-08-15 06:17+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock
diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po
index a153ab7cbd4..698a6354ab2 100644
--- a/addons/stock/i18n/pl.po
+++ b/addons/stock/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-08-14 08:59+0000\n"
+"PO-Revision-Date: 2010-08-15 09:58+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-08-15 06:18+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock
diff --git a/addons/stock/i18n/pt_BR.po b/addons/stock/i18n/pt_BR.po
index 42c7d48fca0..65b9ce94e26 100644
--- a/addons/stock/i18n/pt_BR.po
+++ b/addons/stock/i18n/pt_BR.po
@@ -7,14 +7,14 @@ 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-08-14 08:52+0000\n"
+"PO-Revision-Date: 2010-08-15 13:04+0000\n"
"Last-Translator: Renato Lima - http://www.akretion.com "
"\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-08-15 06:18+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock
diff --git a/addons/stock/i18n/tr.po b/addons/stock/i18n/tr.po
index eef0a7f155a..10393d8880f 100644
--- a/addons/stock/i18n/tr.po
+++ b/addons/stock/i18n/tr.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-08-14 08:55+0000\n"
+"PO-Revision-Date: 2010-08-15 14:16+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-08-15 06:18+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock
diff --git a/addons/stock_invoice_directly/i18n/tr.po b/addons/stock_invoice_directly/i18n/tr.po
index a172e3fc06c..5bdc7074027 100644
--- a/addons/stock_invoice_directly/i18n/tr.po
+++ b/addons/stock_invoice_directly/i18n/tr.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-08-14 09:06+0000\n"
+"PO-Revision-Date: 2010-08-15 10:40+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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock_invoice_directly
diff --git a/addons/stock_location/i18n/tr.po b/addons/stock_location/i18n/tr.po
index b77bfed3e36..af1632bfdbf 100644
--- a/addons/stock_location/i18n/tr.po
+++ b/addons/stock_location/i18n/tr.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-08-14 09:01+0000\n"
+"PO-Revision-Date: 2010-08-15 10:04+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock_location
diff --git a/addons/stock_no_autopicking/i18n/tr.po b/addons/stock_no_autopicking/i18n/tr.po
index 44039c4ed34..9e9a5d7270e 100644
--- a/addons/stock_no_autopicking/i18n/tr.po
+++ b/addons/stock_no_autopicking/i18n/tr.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-08-14 09:13+0000\n"
+"PO-Revision-Date: 2010-08-15 10:53+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock_no_autopicking
diff --git a/addons/subscription/i18n/tr.po b/addons/subscription/i18n/tr.po
index 33deaeb9f9f..57dbcc20c7b 100644
--- a/addons/subscription/i18n/tr.po
+++ b/addons/subscription/i18n/tr.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-08-14 08:43+0000\n"
+"PO-Revision-Date: 2010-08-15 12:44+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:18+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: subscription
diff --git a/addons/thunderbird/partner/partner.py b/addons/thunderbird/partner/partner.py
index 4e5baf25904..d1a64e76150 100644
--- a/addons/thunderbird/partner/partner.py
+++ b/addons/thunderbird/partner/partner.py
@@ -139,6 +139,10 @@ class thunderbird_partner(osv.osv_memory):
def create_contact(self,cr,user,vals):
dictcreate = dict(vals)
+ # Set False value if 'undefined'. Thunerbird set 'undefined' if user did not set any value.
+ for key in dictcreate:
+ if dictcreate[key] == 'undefined':
+ dictcreate[key] = False
if not eval(dictcreate.get('partner_id')):
dictcreate.update({'partner_id': False})
create_id = self.pool.get('res.partner.address').create(cr, user, dictcreate)
diff --git a/addons/thunderbird/plugin/chrome.manifest b/addons/thunderbird/plugin/chrome.manifest
deleted file mode 100755
index 5fa9c2f5754..00000000000
--- a/addons/thunderbird/plugin/chrome.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-content openerp_plugin jar:chrome/openerp_plugin.jar!/content/
-overlay chrome://messenger/content/messenger.xul chrome://openerp_plugin/content/overlay.xul
-locale openerp_plugin en-US jar:chrome/openerp_plugin.jar!/locale/en-US/
-skin openerp_plugin classic/1.0 jar:chrome/openerp_plugin.jar!/skin/
-#style chrome://global/content/customizeToolbar.xul chrome://openerp_plugin/skin/overlay.css
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin.jar b/addons/thunderbird/plugin/chrome/openerp_plugin.jar
deleted file mode 100644
index 986c9fa7551..00000000000
Binary files a/addons/thunderbird/plugin/chrome/openerp_plugin.jar and /dev/null differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/content/address.xul b/addons/thunderbird/plugin/chrome/openerp_plugin/content/address.xul
deleted file mode 100644
index 2d6f0e2dec1..00000000000
--- a/addons/thunderbird/plugin/chrome/openerp_plugin/content/address.xul
+++ /dev/null
@@ -1,117 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/content/config.js b/addons/thunderbird/plugin/chrome/openerp_plugin/content/config.js
deleted file mode 100755
index 5757897de96..00000000000
--- a/addons/thunderbird/plugin/chrome/openerp_plugin/content/config.js
+++ /dev/null
@@ -1,163 +0,0 @@
-
-function config_close()
-{
- //window.close("chrome://openerp_plugin/content/config_change.xul", "", "chrome");
- //ksa
- window.close("chrome://openerp_plugin/content/config_change.xul", "", "chrome");
- window.open("chrome://openerp_plugin/content/config.xul", "", "chrome");
-}
-
-//set the value of the configuration fields
-function config_change_load()
-{
- var s = getServer();
- var a =s.split(':');
- if (String(a)=="" || String(a)=="undefined"){
- document.getElementById('txtcurl').value = "localhost"
- document.getElementById('txtcport').value = "8069"
- }
- else
- {
- len = a[1];
- var url = "";
- for (i=0;i0){
- var objectcharpref = '';
- var imagecharpref = '';
- var objcharpref = '';
- var nodelist = document.getElementById("listObjectListBox").selectedItem.childNodes
- var childnode = document.getElementById("listObjectListBox").childNodes
- for(i=2;i
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- &develop.value;
-
-
- &information.value;
- &openerp.value;
- &axelor.value;
- &tinyerp.value;
-
-
- Copyright © 2006-TODAY OpenERP SA All Rights Reserved.
- OpenERP is a trademark of the OpenERP SA Company. OpenERP Web is jointly developed by OpenERP SA and Axelor.
- Licenced under the terms of OpenERP Public License (OEPL) v1.1 (https://tiny.odoo.com/LICENSE.txt)
-
-
-
-
-
-
-
-
-
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/content/config_change.xul b/addons/thunderbird/plugin/chrome/openerp_plugin/content/config_change.xul
deleted file mode 100644
index 1e23652d98b..00000000000
--- a/addons/thunderbird/plugin/chrome/openerp_plugin/content/config_change.xul
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- Openerp Connection
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/content/create.xul b/addons/thunderbird/plugin/chrome/openerp_plugin/content/create.xul
deleted file mode 100644
index d3d551d63e8..00000000000
--- a/addons/thunderbird/plugin/chrome/openerp_plugin/content/create.xul
+++ /dev/null
@@ -1,109 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/content/createpartner.xul b/addons/thunderbird/plugin/chrome/openerp_plugin/content/createpartner.xul
deleted file mode 100644
index abc23a5b430..00000000000
--- a/addons/thunderbird/plugin/chrome/openerp_plugin/content/createpartner.xul
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- &name.value;
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/content/exportTools.js b/addons/thunderbird/plugin/chrome/openerp_plugin/content/exportTools.js
deleted file mode 100644
index 7da3701b1f3..00000000000
--- a/addons/thunderbird/plugin/chrome/openerp_plugin/content/exportTools.js
+++ /dev/null
@@ -1,248 +0,0 @@
-
-var MBstrBundleService = Components.classes["@mozilla.org/intl/stringbundle;1"].
- getService(Components.interfaces.nsIStringBundleService);
-var mboximportbundle = MBstrBundleService.createBundle("chrome://openerp_plugin/locale/mboximport.properties");
-
-
-function saveMsgAsEML(msguri,file,append,uriArray,hdrArray,fileArray) {
-
- var myEMLlistner = {
-
- scriptStream : null,
- emailtext : "",
-
- QueryInterface : function(iid) {
- if (iid.equals(Components.interfaces.nsIStreamListener) ||
- iid.equals(Components.interfaces.nsIMsgHeaderSink) ||
- iid.equals(Components.interfaces.nsISupports))
- return this;
-
- throw Components.results.NS_NOINTERFACE;
- return 0;
- },
-
- onStartRequest : function (aRequest, aContext) {
- this.scriptStream = Components.classes['@mozilla.org/binaryinputstream;1'].createInstance(Components.interfaces.nsIBinaryInputStream);
- },
-
- onStopRequest : function (aRequest, aContext, aStatusCode) {
- this.scriptStream = null;
-
- if (append) {
- if (this.emailtext != "") {
- var data = this.emailtext + "\n";
- // Some Imap servers don't add to the message the "From" prologue
- if (data && ! data.match(/^From/)) {
- var now = new Date;
- var prologue = "From - " + now.toString() + "\n";
- data = prologue+data;
- }
- data = IETescapeBeginningFrom(data);
- }
- var fileClone = file.clone();
- IETwriteDataOnDisk(fileClone,data,true,this.sub,null);
- }
- else {
- if (! hdrArray)
- var sub = getSubjectForHdr(hdr);
- else {
- var parts = hdrArray[IETexported].split("§][§^^§");
- var sub = parts[4];
- }
-
- var data = this.emailtext.replace(/^From.+\r?\n]/, "");
- data = IETescapeBeginningFrom(data);
- var clone = file.clone();
- // The name is taken from the subject "corrected"
- clone.append(sub+".eml");
- clone.createUnique(0,0644);
- var time = (hdr.dateInSeconds)*1000;
- IETwriteDataOnDisk(clone,data,false,null,time);
- }
- IETexported = IETexported + 1;
- IETwritestatus(mboximportbundle.GetStringFromName("exported")+" "+IETexported+" "+mboximportbundle.GetStringFromName("msgs")+" "+IETtotal);
-
- if (IETexported < IETtotal) {
- if (fileArray) {
- var nextUri = uriArray[IETexported];
- var nextFile = fileArray[IETexported];
- }
- else if (! hdrArray) {
- var nextUri = uriArray[IETexported];
- var nextFile = file;
- }
- else {
- parts = hdrArray[IETexported].split("§][§^^§");
- var nextUri = parts[5];
- var nextFile = file;
- }
- saveMsgAsEML(nextUri,nextFile,append,uriArray,hdrArray,fileArray);
- }
- else {
- IETexported = 0;
- IETtotal = 0;
- }
- },
-
- onDataAvailable : function (aRequest, aContext, aInputStream, aOffset, aCount) {
- this.scriptStream.setInputStream(aInputStream);
- var chunk = this.scriptStream.readBytes(aCount);
- this.emailtext += chunk;
- }
- };
- var mms = messenger.messageServiceFromURI(msguri).QueryInterface(Components.interfaces.nsIMsgMessageService);
- var hdr = mms.messageURIToMsgHdr(msguri);
- mms.streamMessage(msguri, myEMLlistner, msgWindow, null, false, null);
-}
-
-
-function nametoascii(str) {
- if (! gPrefBranch.getBoolPref("mboximport.export.filenames_toascii")) {
- str = str.replace(/[\x00-\x19]/g,"_");
- return str.replace(/[\/\\:,<>*\?\"\|]/g,"_");
- }
- if (str)
- str = str.replace(/[^a-zA-Z0-9]/g,"_");
- else
- str = "Undefinied_or_empty";
- return str;
-}
-
-
-function IETwriteDataOnDisk(file,data,append,name,time) {
- var foStream = Components.classes["@mozilla.org/network/file-output-stream;1"]
- .createInstance(Components.interfaces.nsIFileOutputStream);
- if (append) {
- file.append(name);
- foStream.init(file, 0x02 | 0x08 | 0x10, 0664, 0); // write, create, append
- }
- else
- foStream.init(file, 0x02 | 0x08 | 0x20, 0664, 0); // write, create, truncate
- if (data)
- foStream.write(data,data.length);
- foStream.close();
- var prefs = Components.classes["@mozilla.org/preferences-service;1"]
- .getService(Components.interfaces.nsIPrefBranch);
- if (time && prefs.getBoolPref("mboximport.export.set_filetime"))
- file.lastModifiedTime = time;
-}
-
-
-
-function IETescapeBeginningFrom(data) {
- // Workaround to fix the "From " in beginning line problem in body messages
- // See https://bugzilla.mozilla.org/show_bug.cgi?id=119441 and
- // https://bugzilla.mozilla.org/show_bug.cgi?id=194382
- // TB2 has uncorrect beahviour with html messages
- // This is not very fine, but I didnt' find anything better...
- var datacorrected = data.replace(/\nFrom /g, "\n From ");
- return datacorrected;
-}
-
-
-function getPredefinedFolder(type) {
- var prefs = Components.classes["@mozilla.org/preferences-service;1"]
- .getService(Components.interfaces.nsIPrefBranch);
- // type 0 = folder
- // type 1 = all messages
- // type 2 = selected messages
-
- var use_dir = "mboximport.exportMSG.use_dir";
-
- var dir_path="";
- if(navigator.userAgent.indexOf('Linux')!= -1){
- dir_path ="/tmp"
- }
- else if(navigator.userAgent.indexOf('Win')!= -1){
- dir_path ="C:\\"
- }
- else if(navigator.userAgent.indexOf('Mac OS X')!= -1){
- dir_path ="/tmp"
- }
- try {
- var localFile = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
- localFile.initWithPath(dir_path);
- return localFile;
-
- }
- catch(e) {
- return null;
- }
-}
-
-function getSubjectForHdr(hdr) {
- var emlNameType = gPrefBranch.getIntPref("mboximport.exportEML.filename_format");
- var mustcorrectname = gPrefBranch.getBoolPref("mboximport.export.filenames_toascii");
- var subMaxLen = gPrefBranch.getIntPref("mboximport.subject.max_length")-1;
- if (hdr.mime2DecodedSubject)
-
- var subj = hdr.mime2DecodedSubject.substring(0, subMaxLen);
- else
- var subj =IETnosub;
- subj = nametoascii(subj);
- var dateInSec = hdr.dateInSeconds;
- var msgDate8601string = dateInSecondsTo8601(dateInSec);
- var key = hdr.messageKey;
- if (emlNameType == 2) {
- var pattern = gPrefBranch.getCharPref("mboximport.export.filename_pattern");
- pattern = pattern.replace("%s",subj);
- pattern = pattern.replace("%k",key);
- pattern = pattern.replace("%d", msgDate8601string);
- pattern = pattern.replace(/-%e/g, "");
- pattern = pattern.replace(/[\x00-\x19]/g,"_");
- var fname = pattern;
- }
- else {
-
- var fname = msgDate8601string+"-"+subj+"-"+hdr.messageKey;
- }
- setFileName(fname)
- fname = fname.replace(/[\x00-\x19]/g,"_");
- if (mustcorrectname)
- fname = nametoascii(fname);
- else
- fname = fname.replace(/[\/\\:,<>*\?\"\|]/g,"_");
- return fname;
-}
-
-function dateInSecondsTo8601(secs) {
- var addTime = gPrefBranch.getBoolPref("mboximport.export.filenames_addtime");
- var msgDate = new Date(secs*1000);
- var msgDate8601 = msgDate.getFullYear();
- if (msgDate.getMonth() < 9)
- var month = "0"+(msgDate.getMonth()+1);
- else
- var month = msgDate.getMonth()+1;
- if (msgDate.getDate() < 10)
- var day = "0"+ msgDate.getDate();
- else
- var day = msgDate.getDate();
- var msgDate8601string = msgDate8601.toString()+month.toString()+day.toString();
- if (addTime && gPrefBranch.getIntPref("mboximport.exportEML.filename_format") == 2) {
- if (msgDate.getHours() < 10)
- var hours = "0"+msgDate.getHours();
- else
- var hours = msgDate.getHours();
- if (msgDate.getMinutes() < 10)
- var min = "0"+msgDate.getMinutes();
- else
- var min = msgDate.getMinutes();
- msgDate8601string += "-"+ hours.toString() + min.toString();
- }
- return msgDate8601string;
-}
-
-function IETwritestatus(text) {
- document.getElementById("statusText").setAttribute("label", text);
- var prefs = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch);
- var delay = prefs.getIntPref("mboximport.delay.clean_statusbar");
- if (delay > 0)
- window.setTimeout(function(){IETdeletestatus(text);}, delay);
-}
-
-function IETdeletestatus(text) {
- if (document.getElementById("statusText").getAttribute("label") == text)
- document.getElementById("statusText").setAttribute("label", "");
-}
-
-
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/content/loaddata.js b/addons/thunderbird/plugin/chrome/openerp_plugin/content/loaddata.js
deleted file mode 100755
index 93d21f56f5c..00000000000
--- a/addons/thunderbird/plugin/chrome/openerp_plugin/content/loaddata.js
+++ /dev/null
@@ -1,134 +0,0 @@
-//gives the preference branch instance
-var preferenceBranch = getPref();
-
-//returns the selected checkbox for searching
-function getnamesearch()
-{
- var checkboxlist = [];
- var j=0;
- var objectlist = preferenceBranch.getCharPref("object").split(',');
- if (objectlist[0]!=''){
- for (var i=1;i<=objectlist.length;i++)
- {
- if(document.getElementById('cbx'+i) && document.getElementById('cbx'+i).checked == true)
- {
- checkboxlist[j] = objectlist[i-1] //document.getElementById('cbx'+i).label;
- j++;
- }
- }
- }
- return checkboxlist;
-}
-//function to set the text value for the selected partner for contact creation
-function selectPartner(){
- if(document.getElementById('listPartnerBox').selectedItem){
- var listselectedItem = document.getElementById('listPartnerBox').selectedItem;
- var value = listselectedItem.firstChild.getAttribute('label');
- setPartnerId(listselectedItem.value);
- document.getElementById('txtselectpartner').setAttribute('value',value);
- window.opener.document.getElementById('txtselectpartner').setAttribute('value',value);
- }
- else{
- window.opener.document.getElementById('txtselectpartner').setAttribute('value','');
- }
-}
-
-//function for the intialization procedure //used while loading and unloading of the window
-var myPrefObserver =
-{
- //set the intial value of the email for the text field in plugin window and also loads the listbox of objects with image
- loaddata: function()
- {
- setTimeout("listSearchDocumentAttachment()", 0)
- },
-
- //set the initial value of name and email field of create contact window
- createContact: function()
- {
- document.getElementById("txtname").value = getSenderName();
- document.getElementById("txtemail").value = getSenderEmail();
- document.getElementById("country").value = getAllCountry();
- document.getElementById("state").value = getAllState();
- setPartnerId(0);
- },
-
- //sets the value of email information in preferences and adds observer for the window
- register: function()
- {
- appendDbList()
- preferenceBranch.addObserver("", myPrefObserver, false);
- document.getElementById("txturl").value = getServer();
- var s = document.getElementById('txturl').value;
- var a =s.split(':');
- setPort(a[a.length-1]);
- document.getElementById("txtusername").value = getUsername();
- document.getElementById("txtpassword").value = getPassword();
- document.getElementById("DBlist_text").value = getDbName();
- if(getPref().getCharPref("object") != ''){
- var objectlist = getPref().getCharPref("object").split(',');
- var imagelist = getPref().getCharPref("imagename").split(',');
- var obj = getPref().getCharPref("listobject").split(',');
- if(objectlist.length>0){
- for(i=0;i 2)
- {
- var emlsArray = gFolderDisplay.selectedMessages;
- }
- else
- {
- var emlsArray = GetSelectedMessages();
- }
-
- IETtotal = emlsArray.length;
- IETexported = 0;
- var msguri = emlsArray[0];
-
- if(GetNumSelectedMessages() < 1 || GetNumSelectedMessages() > 1){
- alert("You must select only one mail to archive");
- return false
- }
-
- //gives the selected email uri
- var messageUri= gDBView.URIForFirstSelectedMessage;
-
- var messenger = Components.classes['@mozilla.org/messenger;1'].createInstance(Components.interfaces.nsIMessenger);
-
- //gives the selected email object
- var message = messenger.messageServiceFromURI(messageUri).messageURIToMsgHdr(messageUri);
-
-
- if (version > 2)
- {
- m_uri = message.folder.getUriForMsg(message);
- saveMsgAsEML(m_uri,file,false,emlsArray,null);
- }
- else
- {
- saveMsgAsEML(msguri,file,false,emlsArray,null);
- }
-
- //gives the received email date
- var stdate = new Date(message.date / 1000);
-
- //functionality to split the author name and email
- if(message.author.charAt(0) == '"'){
- sendername = message.author.split('"')[1].split('"')[0];
- }
- else if(message.author.indexOf('<')!=-1){
- sendername = message.author.split('<')[0];
- }
- else{
- sendername = message.author;
- }
- if(message.author.indexOf('<')!=-1){
- senderemail = message.author.split('<')[1].split('>')[0];
- }
- else{
- senderemail = message.author
- }
-
- //gives the receiver email address
- receiveremail = message.mime2DecodedRecipients;
-
- //parsing the received date in the particular format
- receivedDate = stdate.getFullYear()+'/'+(stdate.getMonth()+1)+'/'+stdate.getDate();
-
- //gives the selected email subject
- subject = message.subject;
-
- //gives the selected email cclist
- cclist = message.ccList;
-
- //gives the selected email message body in text format
- if (version > 2)
- {
- var listener = Components.classes["@mozilla.org/network/sync-stream-listener;1"].createInstance(Components.interfaces.nsISyncStreamListener);
- var uri = message.folder.getUriForMsg(message);
- messenger.messageServiceFromURI(uri)
- .streamMessage(uri, listener, null, null, false, "");
- var folder = message.folder;
- messagebody = folder.getMsgTextFromStream(listener.inputStream,message.Charset,65536,32768,false,true,{})
- }
- else
- {
- messagebody = getMessageBrowser().docShell.contentViewer.DOMDocument.body.textContent;
- }
- //gives the selected email message body in html format
- msghtmlbody = ""// getMessageBrowser().docShell.contentViewer.DOMDocument.body.innerHTML;
-
- //set the initial information for the selected email
- setSenderEmail(senderemail);
- setSenderName(sendername);
- setReceiverEmail(receiveremail);
- setSubject(subject);
- setReceivedDate(receivedDate);
- setCCList(cclist);
- setMessageBody(messagebody);
- getPref().setCharPref('displayName','');
- getPref().setCharPref('attachmentdata','');
- name = [];
- test = [];
- getPref().setCharPref('attachmentlength',currentAttachments.length);
- //retrieving the information for the selected email's attachment
- if(currentAttachments.length > 0){
- for(i=0;i 1){
- alert("You must select only one mail For Open Contact Detail");
- return false
- }
-
- //gives the selected email uri
- var messageUri= gDBView.URIForFirstSelectedMessage;
-
- var messenger = Components.classes['@mozilla.org/messenger;1'].createInstance(Components.interfaces.nsIMessenger);
-
- //gives the selected email object
- var message = messenger.messageServiceFromURI(messageUri).messageURIToMsgHdr(messageUri);
-
- //functionality to split the author name and email
- if(message.author.charAt(0) == '"'){
- sendername = message.author.split('"')[1].split('"')[0];
- }
- else if(message.author.indexOf('<')!=-1){
- sendername = message.author.split('<')[0];
- }
- else{
- sendername = message.author;
- }
- if(message.author.indexOf('<')!=-1){
- senderemail = message.author.split('<')[1].split('>')[0];
- }
- else{
- senderemail = message.author
- }
-
- //set the initial information for the selected email
- setSenderEmail(senderemail);
- setSenderName(sendername);
- setPartnerName("");
- setStreet("");
- setStreet2("");
- setZipCode("");
- setCity("");
- setOfficenumber("");
- setFax("");
- setMobilenumber("");
-
- if (getmodule_install() == "no")
- {
- alert("Please install the thunderbird module on your '" + getDbName() +"' database and try again !");
- return false
- }
- window.open("chrome://openerp_plugin/content/address.xul", "", "chrome, resizable=yes");
-
-}
-
-//function to open the configuration window
-var Config = {
- onLoad: function() {
- // initialization code
- this.initialized = true;
- },
-
- onMenuItemCommand: function() {
- window.open("chrome://openerp_plugin/content/config.xul", "", "chrome");
- }
-};
-window.addEventListener("load", function(e) { Config.onLoad(e); }, false);
-
-//function to open the plugin window for searching the records for a particular object
-var Plugin = {
- onLoad: function() {
- this.initialized = true;
- },
-
- onMenuItemCommand: function() {
- window.open("chrome://openerp_plugin/content/plugin.xul", "", "chrome, resizable=yes");
- }
-};
-window.addEventListener("load", function(e) { Plugin.onLoad(e); }, false);
-
-//function to open the window for creating a new partner contact
-var Create = {
- onLoad: function(){
- this.initialized=true;
- },
-
- onMenuItemCommand: function(){
- window.open("chrome://openerp_plugin/content/create.xul", "", "chrome");
- }
-};
-window.addEventListener("load", function(e) { Create.onLoad(e); }, false);
-
-var Address = {
- onLoad: function(){
- this.initialized=true;
- },
-
- onMenuItemCommand: function(){
- open_contact();
- searchContact();
- }
-};
-
-
-//function to open the window for selecting the partner for a new contact creation
-var Select = {
- onLoad: function(){
- this.initialized=true;
- },
-
- onMenuItemCommand: function(){
- window.open("chrome://openerp_plugin/content/selectpartner.xul", "", "chrome");
- }
-};
-
-var CreatePartner = {
- onLoad: function(){
- this.initialized=true;
- },
-
- onMenuItemCommand: function(){
- window.open("chrome://openerp_plugin/content/createpartner.xul", "", "chrome");
- }
-};
-window.addEventListener("load", function(e) { CreatePartner.onLoad(e); }, false);
-
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/content/overlay.xul b/addons/thunderbird/plugin/chrome/openerp_plugin/content/overlay.xul
deleted file mode 100755
index c48dc0d70b9..00000000000
--- a/addons/thunderbird/plugin/chrome/openerp_plugin/content/overlay.xul
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/content/plugin.xul b/addons/thunderbird/plugin/chrome/openerp_plugin/content/plugin.xul
deleted file mode 100644
index 45c552452bb..00000000000
--- a/addons/thunderbird/plugin/chrome/openerp_plugin/content/plugin.xul
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Documents
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/content/selectpartner.xul b/addons/thunderbird/plugin/chrome/openerp_plugin/content/selectpartner.xul
deleted file mode 100644
index f0512339a40..00000000000
--- a/addons/thunderbird/plugin/chrome/openerp_plugin/content/selectpartner.xul
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/content/static.js b/addons/thunderbird/plugin/chrome/openerp_plugin/content/static.js
deleted file mode 100644
index c44c5bf7bb4..00000000000
--- a/addons/thunderbird/plugin/chrome/openerp_plugin/content/static.js
+++ /dev/null
@@ -1,19 +0,0 @@
-
-//function to check all the checkbox
-function selectAllCheckbox()
-{
- var objectlist = preferenceBranch.getCharPref("object").split(',');
- if(objectlist.length == 1 && objectlist[0]==''){
- return false;
- }
- for (var i=1;i<=objectlist.length;i++)
- {
- var checkboxobj = document.getElementById('cbx'+i);
- if (!checkboxobj)
- continue
- if(document.getElementById('cbxselectall').checked == true)
- checkboxobj.checked = true;
- else
- checkboxobj.checked = false;
- }
-}
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js b/addons/thunderbird/plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js
deleted file mode 100755
index b5057a8cd09..00000000000
--- a/addons/thunderbird/plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js
+++ /dev/null
@@ -1,2046 +0,0 @@
-/**
-* Global instance stored here
-*/
-
-var xmlRpcClient;
-
-//Service name on server like /common,/db etc...
-var strServerService;
-
-//temporary variables
-var strobject;
-
-//Array
-var arrDbList = new Array();
-var arrPartnerList = new Array();
-var arrFinalList = new Array();
-
-
-var contentType = new Array();
-var uri = new Array();
-var url = new Array();
-var name = new Array();
-var attach_eml ="no";
-var popup_display = "yes"
-var rpc= {
- servers: {},
- addserver: function(name,ip,port,path) {
- netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
- this.servers[name]= {
- ip: ip,
- port: port,
- path: path,
- avaible: true,
- sock: Components.classes['@mozilla.org/xml-rpc/client;1'].createInstance(Components.interfaces.nsIXmlRpcClient)};
- },
- getany: function(rpcval,n) {
- netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
- var t = ['PRUint8','PRUint16','PRInt16','PRInt32','PRBool','Char','CString','Float','Double','PRTime','InputStream','Array','Dictionary'];
- for (var i=0; i0)
- for (var i=0; i"+params[0];
- msg+= "\n3. Your server may not be launched or connected to the network.";
- }
- func_out([false,'error '+status,msg]);
- } };
- var p = [];
- for (var i=0; i>>>"+result)
- }
-}
-
-//Sets the preference service
-function getPref(){
- var prefService = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService);
- var branchobj = prefService.getBranch("extensions.tiny.");
- branchobj.QueryInterface(Components.interfaces.nsIPrefBranch2);
- return branchobj
-}
-
-function setFileName(fname){
- getPref().setCharPref('fname',fname);
-}
-
-//set attachment file save or not
-function setAttachment(argAttac){
- getPref().setCharPref('attachment',argAttac);
-}
-
-//set preference value for server url
-function setServer(argServer){
- getPref().setCharPref('serverurl',argServer);
-}
-
-//set preference value for server port
-function setPort(argPort){
- getPref().setCharPref('serverport',argPort)
-}
-
-//set preference value of database name for data searching and selection
-function setDbName(argDbName){
- getPref().setCharPref('serverdbname',argDbName);
-}
-
-//set preference value of username for login
-function setUsername(argUsername){
- getPref().setCharPref('username',argUsername);
-}
-
-//set preference value of password for login
-function setPassword(argPassword){
- getPref().setCharPref('password',argPassword);
-}
-
-//set preference value for storing partner id
-function setPartnerId(argPartnerId){
- getPref().setCharPref('partnerid',argPartnerId)
-}
-
-//set preference value for Resource Id
-function setResourceId(argResourceId){
- getPref().setCharPref('res_id',argResourceId)
-}
-//set server service
-function setServerService(argServerService){
- strServerService = argServerService;
-}
-
-//set preference value for sender email
-function setSenderEmail(argSenderEmail){
- getPref().setCharPref('senderemail',argSenderEmail)
-}
-
-//set preference value for receiver email
-function setReceiverEmail(argReceiverEmail){
- getPref().setCharPref('receiveremail',argReceiverEmail)
-}
-
-//set preference value for sender name
-function setSenderName(argSenderName){
- getPref().setCharPref('sendername',argSenderName)
-}
-
-//set preference value for email subject
-function setSubject(argSubject){
- getPref().setCharPref('subject',argSubject)
-}
-
-//set preference value for email received date
-function setReceivedDate(argReceivedDate){
- getPref().setCharPref('receiveddate',argReceivedDate)
-}
-
-//set preference value for storing contact id which is used while storing mail contents after creating a new partner contact
-function setContactId(argContactId){
- getPref().setCharPref('contactid',argContactId)
-}
-
-//set preference value for storing attachment option in config
-function setAttachValue(argAttachValue){
- getPref().setCharPref('attachvalue',argAttachValue)
-}
-
-//set preference value for email cclist
-function setCCList(argCCList){
- getPref().setCharPref('cclist',argCCList)
-}
-
-//set preference value for email message body
-function setMessageBody(argMessageBody){
- getPref().setCharPref('messagebody',argMessageBody)
-}
-
-//set preference value for Partner Name
-function setPartnerName(argPartnerName){
- getPref().setCharPref('partnername',argPartnerName)
-}
-
-//set preference value for Contact Name
-function setContactName(argContactName){
- getPref().setCharPref('contactname',argContactName)
-}
-
-//set preference value for street
-function setStreet(argStreet){
- getPref().setCharPref('street',argStreet)
-}
-
-//set preference value for street2
-function setStreet2(argStreet2){
- getPref().setCharPref('street2',argStreet2)
-}
-
-//set preference value for zipcode
-function setZipCode(argZipcode){
- getPref().setCharPref('zipcode',argZipcode)
-}
-
-//set preference value for Office Number
-function setOfficenumber(argOfficenumber){
- getPref().setCharPref('officeno',argOfficenumber)
-}
-
-//set preference value for Phone Number
-function setMobilenumber(argMobilenumber){
- getPref().setCharPref('phoneno',argMobilenumber)
-}
-
-//set preference value for Fax
-function setFax(argFax){
- getPref().setCharPref('fax',argFax)
-}
-
-//set preference value for city
-function setCity(argCity){
- getPref().setCharPref('city',argCity)
-}
-
-//set preference value for country
-function setCountry(argCountry){
- getPref().setCharPref('country',argCountry)
-}
-
-//set preference value for state
-function setState(argState){
- getPref().setCharPref('state',argState)
-}
-
-
-//set the value for the whole server url
-function setServerUrl(argServerUrl)
-{
- var seperateUrl = argServerUrl.split(':');
- setServer(seperateUrl.slice(0,seperateUrl.length-1).join(":"));
- setPort(seperateUrl[seperateUrl.length-1]);
-}
-
-//set preference value for storing user id
-function setUserId(argUserId){
- getPref().setIntPref('userid',argUserId);
-}
-
-//set database list is displaye or not
-function setDBList(argDBList){
- getPref().setCharPref('db_list',argDBList)
-}
-
-//set server connect or not
-function setconnect_server(argconnect_server){
- getPref().setCharPref('connect_server',argconnect_server)
-}
-
-//set module install or not
-function setmodule_install(argconnect_module){
- getPref().setCharPref('module_install',argconnect_module)
-}
-
-//get module install or not
-function getmodule_install(){
- return getPref().getCharPref('module_install');
-}
-
-
-//get server connect or not
-function getconnect_server(){
- return getPref().getCharPref('connect_server');
-}
-
-
-//get partner id
-function getPartnerId(){
- return getPref().getCharPref('partnerid');
-}
-//get database list is displaye or not
-function getDBList(){
- return getPref().getCharPref('db_list');
-}
-
-function getFileName(){
- return getPref().getCharPref('fname');
-}
-
-//get attachment save or not
-function getAttachment(){
- return getPref().getCharPref('attachment');
-}
-
-//get serverurl
-function getServer(){
- return getPref().getCharPref('serverurl');
-}
-
-//get server port
-function getPort(){
- return getPref().getCharPref('serverport');
-}
-
-//get database name
-function getDbName(){
- return getPref().getCharPref('serverdbname');
-}
-
-//get username from config settings
-function getUsername(){
- return getPref().getCharPref('username');
-}
-
-//get password from config settings
-function getPassword(){
- return getPref().getCharPref('password');
-}
-
-//get serverservice
-function getServerService(){
- return strServerService;
-
-}
-
-//get sender email
-function getSenderEmail(){
- return getPref().getCharPref('senderemail');
-}
-
-//get receiver email
-function getReceiverEmail(){
- return getPref().getCharPref('receiveremail');
-}
-
-//get resource id
-function getResourceId(){
- return getPref().getCharPref('res_id');
-}
-
-
-//get sender name
-function getSenderName(){
- str = getPref().getCharPref('sendername');
- if(!str.toString().match(/=?utf-8?q?/))
- {
- return str;
- }
- else
- {
-
- string = str.replace(/[\'Š',\'Ž',\'š',\'ž',\'Ÿ',\'À',\'Á',\'Â',\'Ã',\'Ä',\'Å',\'Ç',\'È',\'É',\'Ê',\'Ë',\'Ì',\'Í',\'Î',\'Ï',\'Ñ',\'Ò',\'Ó',\'Ô',\'Õ',\'Ö',\'Ø',\'Ù',\'Ú',\'Û',\'Ü',\'Ý',\'à',\'á',\'â',\'ã',\'ä',\'å',\'ç',\'è',\'é',\'ê',\'ë',\'ì',\'í',\'î',\'ï',\'ñ',\'ò',\'ó',\'ô',\'õ',\'ö',\'ø',\'ù',\'ú',\'û',\'ü',\'ý',\'ÿ',\'Þ',\'þ',\'Ð',\'ð',\'ß',\'Œ',\'œ',\'Æ',\'æ',\'µ']/g,'"',"'",'“','”',"\n","\r",'_/',"'S','Z','s','z','Y','A','A','A','A','A','A','C','E','E','E','E','I','I','I','I','N','O','O','O','O','O','O','U','U','U','U','Y','a','a','a','a','a','a','c','e','e','e','e','i','i','i','i','n','o','o','o','o','o','o','u','u','u','u','y','y','TH','th','DH','dh','ss','OE','oe','AE','ae','u','','','','','','','-'");
-
- var utftext = "";
- var encoded_string = "";
- var convertedString = "";
- for (var n = 0; n < string.length; n++)
- {
- var c = string.charCodeAt(n);
- if (c < 128) {
- utftext += String.fromCharCode(c);
- }
- }
-
- encoded_string = encode64(utftext);
- return encoded_string;
- }
-}
-
-//ger partner name
-function getPartnerName(){
- return getPref().getCharPref('partnername');
-}
-
-//get contact name
-function getContactName(){
- return getPref().getCharPref('contactname');
-}
-
-
-//get street name
-function getStreet(){
- return getPref().getCharPref('street');
-}
-
-//get street2 name
-function getStreet2(){
- return getPref().getCharPref('street2');
-}
-
-//get zip code
-function getZipCode(){
- return getPref().getCharPref('zipcode');
-}
-
-//get city name
-function getCity(){
- return getPref().getCharPref('city');
-}
-
-//get country name
-function getCountry(){
- return getPref().getCharPref('country');
-}
-
-//get state name
-function getState(){
- return getPref().getCharPref('state');
-}
-
-//get office no
-function getOfficenumber(){
- return getPref().getCharPref('officeno');
-}
-
-//get mobile no
-function getMobilenumber(){
- return getPref().getCharPref('phoneno');
-}
-
-//get fax no
-function getFax(){
- return getPref().getCharPref('fax');
-}
-
-
-//get email subject
-function getSubject(){
- return getPref().getCharPref('subject');
-}
-
-//get email received date
-function getReceivedDate(){
- return getPref().getCharPref('receiveddate');
-}
-
-//get contact id which is used while storing mail contents after creating a new partner contact
-function getContactId(){
- return getPref().getCharPref('contactid');
-}
-
-//get attachment option information from the configuration settings
-function getAttachValue(){
- return getPref().getCharPref('attachvalue');
-}
-
-//get email cclist information
-function getCCList(){
- return getPref().getCharPref('cclist');
-}
-
-//get email message body
-function getMessageBody(){
- return getPref().getCharPref('messagebody');
-}
-
-//get the whole server path
-function getServerUrl(){
- return getServer()+":"+getPort()+"/"+getServerService();
-}
-
-//get user id for the xmlrpc request
-function getUserId(){
- return getPref().getIntPref('userid');
-}
-
-//Creates and returns and instance of the XML-RPC client
-function getClient() {
- // Enable correct security
- netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
- return Components.classes['@mozilla.org/xml-rpc/client;1'].createInstance(Components.interfaces.nsIXmlRpcClient);
-}
-
-//returns the xmlrpc client instance
-function getXmlRpc() {
- if (!xmlRpcClient) {
- xmlRpcClient = getClient();
- }
-
- // Initialize the client with the URL
- xmlRpcClient.init(getServerUrl());
- return xmlRpcClient;
-}
-
-// function to get all basic parameters
-function getBasicList(){
- var branchobj = getPref();
- arrBasicList = [];
- arrBasicList[0] = branchobj.getCharPref("serverdbname");
- arrBasicList[1] = branchobj.getIntPref('userid');
- arrBasicList[2] = branchobj.getCharPref("password");
- arrBasicList[3] = getServer()
- arrBasicList[4] = getPort()
- return arrBasicList
-}
-
-function createMenuItem_db(aLabel) {
- const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
- var item = document.createElementNS(XUL_NS, "menuitem"); // create a new XUL menuitem
- item.setAttribute("label", aLabel);
- item.setAttribute("value", aLabel);
- return item;
-}
-
-//xmlrpc request handler for getting the list of database
-var listDbHandler = {
- onResult: function(client, context, result) {
- setconnect_server("true")
- netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
- var arrMethodList = result.QueryInterface(Components.interfaces.nsISupportsArray);
- // Set the number of results
- var count = arrMethodList.Count();
- // Loop through the results, adding items to the list
- for (i = 0; i < count; i++) {
- var strlDbName = arrMethodList.QueryElementAt(i, Components.interfaces.nsISupportsCString);
- arrDbList[i] = strlDbName.data;
- }
- var database = ""
- if (count > 0)
- {
- setDBList("true")
- var label = document.getElementById("database_option");
- var vbox = document.createElement("vbox");
- var hbox = document.createElement("hbox");
- var label1 = document.createElement("label");
- label1.setAttribute("width","80");
- label1.setAttribute("value","Database:");
- label1.setAttribute("id","label111");
- var menu1 = document.createElement("menulist");
- var menupopup1 = document.createElement("menupopup");
- menu1.setAttribute("id","DBlist");
- menu1.setAttribute("width","300");
- var menuitem1 = document.createElement("menuitem");
- database = arrDbList[0]
- menuitem1.setAttribute("label", arrDbList[0]);
- menuitem1.setAttribute("value", arrDbList[0]);
- menupopup1.appendChild(menuitem1);
- menu1.appendChild(menupopup1)
- hbox.appendChild(label1);
- hbox.appendChild(menu1);
- vbox.appendChild(hbox);
- label.appendChild(vbox);
-
- var d = document.getElementById("first");
- var d_nested = document.getElementById("lbldb_list1");
- var throwawayNode = d.removeChild(d_nested);
- var d_nested = document.getElementById("DBlist_text");
- var throwawayNode = d.removeChild(d_nested);
-
-
- }
- else
- {
- setDBList("false")
- }
- // Loop through the results, adding items to the list
- if (count)
- {
- const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
- var popup = document.getElementById("DBlist"); // a element
- var arrsec=new Array()
- for (var i=0;i element
- for (i=0;i element
- for (i=0;i element
- for (i=0;i0){
- temp.AppendElement(test1);
- }
- return temp;
-}
-
-//function to search and fillup section selection box
-function createMenuItem(aLabel) {
- const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
- var item = document.createElementNS(XUL_NS, "menuitem"); // create a new XUL menuitem
- item.setAttribute("label", aLabel[1]);
- item.setAttribute("value", aLabel[0]);
- return item;
-}
-
-
-function listinstallmodule( result ) {
- if ( rpc.onfault( result ) )
- {
- setmodule_install('no')
- }
-}
-
-function module_install()
-{
- setmodule_install("yes")
- var branchobj = getPref();
- setServerService('xmlrpc/object');
- netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
- var xmlRpcClient = getXmlRpc();
- strDbName = branchobj.getCharPref("serverdbname");
- struid = branchobj.getIntPref('userid');
- strpass = branchobj.getCharPref("password");
- strmethod = 'search';
- strobj = 'thunderbird.partner'; // TOFIX: Find module 'thunderbird' into 'module.module' model.
- var temp = new Array()
- server=getServer()
- port=getPort()
- basicList=getBasicList()
- rpc.addserver('object',basicList[3] , basicList[4],'/xmlrpc/object');
- srcids=rpc.ask( 'object', 'execute', [basicList[0],basicList[1],basicList[2],strobj,strmethod,[]],listinstallmodule)
-}
-
-
-var listSearchContactHandler = {
- onResult: function(client, context, result) {
- netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
- var sendername = getSenderEmail();
- var arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray);
- var count = arrIdList.Count();
- for (i = 0; i < count; i++) {
- var strlResult = arrIdList.QueryElementAt(i, Components.interfaces.nsISupportsArray);
- var strlSearchResult = strlResult.QueryElementAt(0, Components.interfaces.nsISupportsCString);
- var strlSearchResultValue = strlResult.QueryElementAt(1, Components.interfaces.nsISupportsCString);
- if(strlSearchResult=="partner_name"){
- setPartnerName(strlSearchResultValue);
- var t = getPartnerName();}
-
- if(strlSearchResult=="contactname"){
- setSenderName(strlSearchResultValue);
- var t = getSenderName();}
-
- if(strlSearchResult=="street"){
- setStreet(strlSearchResultValue);
- var t = getStreet();}
-
- if(strlSearchResult=="street2"){
- setStreet2(strlSearchResultValue);
- var t = getStreet2();}
-
- if(strlSearchResult=="zip"){
- setZipCode(strlSearchResultValue);
- var t = getZipCode();}
-
- if(strlSearchResult=="city"){
- setCity(strlSearchResultValue);
- var t = getCity();}
-
- if(strlSearchResult=="phone"){
- setOfficenumber(strlSearchResultValue);
- var t = getOfficenumber();}
-
- if(strlSearchResult=="fax"){
- setFax(strlSearchResultValue);
- var t = getFax();}
-
- if(strlSearchResult=="mobile"){
- setMobilenumber(strlSearchResultValue);
- var t = getMobilenumber();}
-
- if(strlSearchResult=="email" && strlSearchResultValue!=''){
- setSenderEmail(strlSearchResultValue);
- var t = getSenderEmail();}
-
- if(strlSearchResult=="res_id"){
- setResourceId(strlSearchResultValue);
- var t = getResourceId();}
- }
- },
- onFault: function (client, ctxt, fault) {
-
- },
-
- onError: function (client, ctxt, status, errorMsg) {
-
- }
-
-}
-var listSearchContactdetailHandler = {
- onResult: function(client, context, result) {
- netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
- // var sendername = getSenderEmail();
- var sendername = document.getElementById("txtemail").value
- var arrIdList = result.QueryInterface(Components.interfaces.nsISupportsArray);
- var count = arrIdList.Count();
- for (i = 0; i < count; i++) {
- var strlResult = arrIdList.QueryElementAt(i, Components.interfaces.nsISupportsArray);
- var strlSearchResult = strlResult.QueryElementAt(0, Components.interfaces.nsISupportsCString);
- var strlSearchResultValue = strlResult.QueryElementAt(1, Components.interfaces.nsISupportsCString);
- if(strlSearchResult=="email" && strlSearchResultValue=='')
- {
- alert("Contact is not Available")
- document.getElementById("txtemail").value = sendername;
- }
- if(strlSearchResult=="partner_name"){
- document.getElementById("txtname").value =strlSearchResultValue;}
-
- if(strlSearchResult=="contactname"){
- document.getElementById("txtcontactname").value =strlSearchResultValue;}
-
- if(strlSearchResult=="street"){
- document.getElementById("txtstreet").value =strlSearchResultValue;}
-
- if(strlSearchResult=="street2"){
- document.getElementById("txtstreet2").value =strlSearchResultValue;}
- if(strlSearchResult=="zip"){
- document.getElementById("txtzip").value =strlSearchResultValue;}
-
- if(strlSearchResult=="city"){
- document.getElementById("txtcity").value =strlSearchResultValue;}
- if(strlSearchResult=="phone"){
- document.getElementById("txtoffice").value =strlSearchResultValue;}
-
- if(strlSearchResult=="fax"){
- document.getElementById("txtfax").value =strlSearchResultValue;}
-
- if(strlSearchResult=="mobile"){
- document.getElementById("txtmobile").value =strlSearchResultValue;}
-
- if(strlSearchResult=="email"&& strlSearchResultValue!=''){
- document.getElementById("txtemail").value =strlSearchResultValue;}
-
- if(strlSearchResult=="res_id"){
- setResourceId(strlSearchResultValue);
- var t = getResourceId();}
-
- }
- },
- onFault: function (client, ctxt, fault) {
-
- },
-
- onError: function (client, ctxt, status, errorMsg) {
-
- }
-
-}
-
-function searchContactdetail()
-{
- var branchobj = getPref();
- setServerService('xmlrpc/object');
- netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
- arrFinalList = [];
- var xmlRpcClient = getXmlRpc();
- var cmbSearchList = document.getElementById('listSearchBox');
- var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
- strDbName.data = branchobj.getCharPref("serverdbname");
- var struid = xmlRpcClient.createType(xmlRpcClient.INT,{});
- struid.data = branchobj.getIntPref('userid');
- var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
- strpass.data = branchobj.getCharPref("password");
- var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
- strobj.data = 'thunderbird.partner';
- var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
- strmethod.data = 'search_contact';
- var strname = xmlRpcClient.createType(xmlRpcClient.STRING,{});
- strname.data =document.getElementById("txtemail").value;
- xmlRpcClient.asyncCall(listSearchContactdetailHandler,cmbSearchList,'execute',[ strDbName,struid,strpass,strobj,strmethod,strname ],6);
-}
-
-//xmlrpc request handler for getting the search results for the particular selected check box object
-var listSearchCheckboxHandler = {
- onResult: function(client, context, result) {
- netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
- var arrMethodList = result.QueryInterface(Components.interfaces.nsISupportsArray);
- // Set the number of results
- var count = arrMethodList.Count();
- var close=0;
- if(count == 0 && popup_display != "no"){
- alert("No records Found");
- return false;
- }
- else if(count ==2 )
- {
- if (arrMethodList.QueryElementAt(0, Components.interfaces.nsISupportsCString)=="error")
- {
- close =1;
- }
- }
- popup_display = "yes"
- // Loop through the results, adding items to the list
- var arr1 = new Array();
- var arr2 = new Array();
- var flag1 = 0;
- var flag2 = 0;
- var er ="";
- var er_val =new Array();
- for (i = 0; i < count; i++)
- {
- if(i%2==0){
- if (arrMethodList.QueryElementAt(i, Components.interfaces.nsISupportsCString)=="error")
- {
- er = arrMethodList.QueryElementAt(i, Components.interfaces.nsISupportsCString);
- er_val[0] =arrMethodList.QueryElementAt(i+1, Components.interfaces.nsISupportsArray);
- i +=1;
- continue;
- }
- arr1[flag1] = arrMethodList.QueryElementAt(i, Components.interfaces.nsISupportsCString);
- flag1++;
- }
- else{
- arr2[flag2] = arrMethodList.QueryElementAt(i, Components.interfaces.nsISupportsArray);
- flag2++;
- }
- }
- if (er)
- {
- var arrSearchList1 = new Array();
- for(j=0;j element
-
- if (String(popup) != "null"){
- object=popup.value;
- if (object == undefined) { alert("select At Least one Document !")}
- else{
- var branchobj = getPref();
- setServerService('xmlrpc/object');
- netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
- var xmlRpcClient = getXmlRpc();
- var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
- strDbName.data = branchobj.getCharPref("serverdbname");
- var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
- struids.data = branchobj.getIntPref('userid');
- var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
- strpass.data = branchobj.getCharPref("password");
- var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
- strmethod.data = 'process_email';
- var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
- strobj.data = 'thunderbird.partner';
- var eml_string = parse_eml()
- var a = ['model', 'message'];
- var b = [object, eml_string];
- var arrofarr = dictcontact(a,b);
- xmlRpcClient.asyncCall(listArchiveHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
- alert("Mail Archive Successfully");
- }
- window.close();
- }
- else
- {
- alert(" select At Least one Document !")
- }
-}
-
-
-//xmlrpc request handler for creating a new contact
-var listCreateContactHandler = {
- onResult: function(client, context, result) {
- netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
- var createId = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
- setContactId(createId);
- alert("Contact Created Successfully.");
- window.close();
- },
- onFault: function (client, ctxt, fault) {
-
- },
-
- onError: function (client, ctxt, status, errorMsg) {
-
- }
-}
-
-var listUpdateContactHandler = {
- onResult: function(client, context, result) {
- netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
- alert("Contact Update Successfully.");
- window.close();
- var partnerId = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
- setResourceId(partnerId);
- window.close();
- },
- onFault: function (client, ctxt, fault) {
-
- },
-
- onError: function (client, ctxt, status, errorMsg) {
-
- }
-}
-
-//function to create a new contact
-function createContact(){
- var branchobj = getPref();
- setServerService('xmlrpc/object');
- netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
- var xmlRpcClient = getXmlRpc();
- var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
- strDbName.data = branchobj.getCharPref("serverdbname");
- var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
- struids.data = branchobj.getIntPref('userid');
- var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
- strpass.data = branchobj.getCharPref("password");
- var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
- strmethod.data = 'create_contact';
- var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
- strobj.data = 'thunderbird.partner';
- var a = ['partner_id','name','street','street2','zip','city','country_id','state_id','phone','fax','mobile','email'];
- var b = [getPartnerId(),getSenderName(),document.getElementById("txtstreet").value,document.getElementById("txtstreet2").value,document.getElementById("txtzip").value, document.getElementById("txtcity").value,document.getElementById("country").value,document.getElementById("state").value,document.getElementById("txtoffice").value,document.getElementById("txtfax").value,document.getElementById("txtmobile").value,document.getElementById("txtemail").value];
- var arrofarr = dictcontact(a,b);
- xmlRpcClient.asyncCall(listCreateContactHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
-}
-
-function UpdateContact(){
- var branchobj = getPref();
- setServerService('xmlrpc/object');
- netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
- var xmlRpcClient = getXmlRpc();
- var strDbName = xmlRpcClient.createType(xmlRpcClient.STRING,{});
- strDbName.data = branchobj.getCharPref("serverdbname");
- var struids = xmlRpcClient.createType(xmlRpcClient.INT,{});
- struids.data = branchobj.getIntPref('userid');
- var strpass = xmlRpcClient.createType(xmlRpcClient.STRING,{});
- strpass.data = branchobj.getCharPref("password");
- var strmethod = xmlRpcClient.createType(xmlRpcClient.STRING,{});
- strmethod.data = 'update_contact';
- var strobj = xmlRpcClient.createType(xmlRpcClient.STRING,{});
- strobj.data = 'thunderbird.partner';
- var a = ['res_id','partner_id','name','street','street2','zip','city','country_id','state_id','phone','fax','mobile','email'];
- var b = [getResourceId(),getPartnerName(),document.getElementById("txtcontactname").value,document.getElementById("txtstreet").value,document.getElementById("txtstreet2").value,document.getElementById("txtzip").value, document.getElementById("txtcity").value,document.getElementById("country").value,document.getElementById("state").value,document.getElementById("txtoffice").value,document.getElementById("txtfax").value,document.getElementById("txtmobile").value,document.getElementById("txtemail").value];
- var arrofarr = dictcontact(a,b);
- xmlRpcClient.asyncCall(listUpdateContactHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
-}
-
-//xmlrpc request handler for creating a attachment record
-var listAttachHandler = {
- onResult: function(client, context, result) {
- netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect UniversalBrowserAccess');
- var createId = result.QueryInterface(Components.interfaces.nsISupportsPRInt32);
-
- },
- onFault: function (client, ctxt, fault) {
-
- },
-
- onError: function (client, ctxt, status, errorMsg) {
-
- }
-}
-
-
-//function to encode the string into base64
-var base64chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'.split("");
-function base64_encode (s)
- {
- // the result/encrypted string, the padding string, and the pad count
- var r = ""; var p = ""; var c = s.length % 3;
-
- // add a right zero pad to make this string a multiple of 3 characters
- if (c > 0) { for (; c < 3; c++) { p += '='; s += "\0"; } }
-
- // increment over the length of the string, three characters at a time
- for (c = 0; c < s.length; c += 3) {
-
- // we add newlines after every 76 output characters, according to the MIME specs
- if (c > 0 && (c / 3 * 4) % 76 == 0) { r += "\r\n"; }
-
- // these three 8-bit (ASCII) characters become one 24-bit number
- var n = (s.charCodeAt(c) << 16) + (s.charCodeAt(c+1) << 8) + s.charCodeAt(c+2);
-
- // this 24-bit number gets separated into four 6-bit numbers
- n = [(n >>> 18) & 63, (n >>> 12) & 63, (n >>> 6) & 63, n & 63];
-
- // those four 6-bit numbers are used as indices into the base64 character list
- r += base64chars[n[0]] + base64chars[n[1]] + base64chars[n[2]] + base64chars[n[3]];
-
- // add the actual padding string, after removing the zero pad
- } return r.substring(0, r.length - p.length) + p;
- }
-
-//function to encode the string into base64
-var keyStr = "ABCDEFGHIJKLMNOP" +
- "QRSTUVWXYZabcdef" +
- "ghijklmnopqrstuv" +
- "wxyz0123456789+/" +
- "="+"-_.!~*'()";
-
-function encode64(input) {
-var output = "";
-var chr1, chr2, chr3 = "";
-var enc1, enc2, enc3, enc4 = "";
-var i = 0;
-
-do {
- chr1 = input.charCodeAt(i++);
- chr2 = input.charCodeAt(i++);
- chr3 = input.charCodeAt(i++);
-
- enc1 = chr1 >> 2;
- enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
- enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
- enc4 = chr3 & 63;
-
- if (isNaN(chr2)) {
- enc3 = enc4 = 64;
- } else if (isNaN(chr3)) {
- enc4 = 64;
- }
-
- output = output +
- keyStr.charAt(enc1) +
- keyStr.charAt(enc2) +
- keyStr.charAt(enc3) +
- keyStr.charAt(enc4);
- chr1 = chr2 = chr3 = "";
- enc1 = enc2 = enc3 = enc4 = "";
-} while (i < input.length);
-
-return output;
-}
-
-
-//function to read the contents of the attachment files from the temp folder
-function createInstance(name,test){
- var encoded_string = '';
- var file_name = ''
-
- for(i=0;i element
- object=popup.value;
- resobj.data = object;
- var a = ['object'];
- var b = [getPref().getCharPref("object")];
- var arrofarr = dictcontact(a,b);
- xmlRpcClient.asyncCall(listsearchAttachmentHandler,null,'execute',[strDbName,struids,strpass,strobj,strmethod,arrofarr],6);
-}
-
-
-//function to create a new attachment record
-
-function win_close()
-{
- var fpath =""
- if(navigator.userAgent.indexOf('Linux')!= -1){
- fpath ="/tmp/"
- }
- else if(navigator.userAgent.indexOf('Win')!= -1){
- fpath ="C:\\"
- }
- else if(navigator.userAgent.indexOf('Mac OS X')!= -1){
- fpath ="/tmp/"
- }
- try
- {
- name = fpath + getFileName() +".eml"
-
- var file = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
- file.initWithPath( name );
- file.remove(true);
- window.close();
- }
- catch(err)
- {
- window.close();
- }
-}
-
-function attachmentWidnowOpen(msg)
-{
-
- if (msg=="create")
- {
- var popup = document.getElementById("section").selectedItem; // a element
- if (String(popup) != "null"){
- object=popup.value;
- if (object=="" || object == undefined) { alert("select at least one document !")}
- else{
- create_archivemail()
- }
- }
- else
- {
- alert("select at least one Document !")
- }
- }
- else if (msg=="upload")
- {
- if(document.getElementById('listSearchBox').selectedItem)
- {
- upload_archivemail()
- }
- else{
- alert("Please select at least one record");
- }
- }
-}
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/address.dtd b/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/address.dtd
deleted file mode 100644
index 3b5b95e2a32..00000000000
--- a/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/address.dtd
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/config.dtd b/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/config.dtd
deleted file mode 100755
index 23cd94efa05..00000000000
--- a/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/config.dtd
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/config_change.dtd b/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/config_change.dtd
deleted file mode 100644
index a926d3a980d..00000000000
--- a/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/config_change.dtd
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/create.dtd b/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/create.dtd
deleted file mode 100644
index 181d408a3e9..00000000000
--- a/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/create.dtd
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/createpartner.dtd b/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/createpartner.dtd
deleted file mode 100644
index 67b32b32907..00000000000
--- a/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/createpartner.dtd
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/mboximport.properties b/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/mboximport.properties
deleted file mode 100644
index 33845423f7d..00000000000
--- a/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/mboximport.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-nomboxfile=není mbox souborem
-folderexists=Není možné importovat: složka se stejným názvem již existuje
-fileexists=Není možné importovat: soubor se stejným názvem již existuje
-nowritable=Není možné importovat: nemáte právo zápisu do složky
-exportOK=Export byl úspěšně dokončen
-isNewsgroup=Tato funkce není dostupná: export složky z IMAP účtů nebo diskuzních \nskupin je možný, pouze pokud je nastavené čtení v režimu Offline
-nofolder=Nebyla vybrána žádná cílová složka
-badfolder=Není možné importovat do této složky (typ IMAP nebo diskuzní skupina)
-exportAccount=Export všech složek
-exportFolder=Export složky
-filePickerImport=Výběr souboru k importu
-filePickerExport=Výběr cílové složky
-extensions.{3ed8cc52-86fc-4613-9026-c1ef969da4c3}.description=Umožňuje import a export souborů ve formátu mbox a eml
-virtualfolder=Toto je virtuální složka. Pro export jejich\nzpráv musíte tyto zprávy nejdříve\nzkopírovat do normální složky.
-searchdir=Vyberte složku, ve které budou vyhledány mbox soubory
-confirmimport=Chcete importovat soubor?
-endscan=Konec prohledávání složek
-internalerror=Není možné provést import, protože nastala neznámá chyba
-exportstart=Probíhá export, čekejte prosím...
-exported=Exportovalo se
-msgs=zpráv z
-nosubjectmsg=bez_predmetu
-messsubdir=zprávy
-badfolder2=Není možné importovat do této složky (IMAP nebo diskuzní skupina nebo virtuální složka)
-temp_error=Není možné importovat: nastala chyba při vytváření dočasného souboru
-importEMLstart=Pobíhá import, čekejte prosím...
-numEML=Naimportovány eml soubory:
-CSVseparator=,
-noEML=No eml file found in this directory
-backupWarning=During this operation, the program could be\nunresponsive for some minutes.\nDo you want to go on?\n
-noWaring=Don't show again this warning
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd b/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd
deleted file mode 100755
index a2345f0aaaf..00000000000
--- a/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/overlay.dtd
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/plugin.dtd b/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/plugin.dtd
deleted file mode 100644
index ed26728b0d0..00000000000
--- a/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/plugin.dtd
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/selectpartner.dtd b/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/selectpartner.dtd
deleted file mode 100644
index e6a62c16003..00000000000
--- a/addons/thunderbird/plugin/chrome/openerp_plugin/locale/en-US/selectpartner.dtd
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Account.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Account.png
deleted file mode 100644
index b13f2b0f523..00000000000
Binary files a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Account.png and /dev/null differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Archive.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Archive.png
deleted file mode 100644
index 5aa6a958d37..00000000000
Binary files a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Archive.png and /dev/null differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Case.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Case.png
deleted file mode 100644
index 9b950b8ea9d..00000000000
Binary files a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Case.png and /dev/null differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Contact.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Contact.png
deleted file mode 100644
index 9bd6f9f6059..00000000000
Binary files a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Contact.png and /dev/null differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Create.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Create.png
deleted file mode 100644
index 1ab240c32cb..00000000000
Binary files a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Create.png and /dev/null differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Error.gif b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Error.gif
deleted file mode 100644
index 38c3523781b..00000000000
Binary files a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Error.gif and /dev/null differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Invoice.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Invoice.png
deleted file mode 100644
index 4551107ec3b..00000000000
Binary files a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Invoice.png and /dev/null differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Move.gif b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Move.gif
deleted file mode 100644
index 401bf861213..00000000000
Binary files a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Move.gif and /dev/null differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/MoveDown.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/MoveDown.png
deleted file mode 100644
index 3761ff1e747..00000000000
Binary files a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/MoveDown.png and /dev/null differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/MoveLeft.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/MoveLeft.png
deleted file mode 100644
index 031d7532673..00000000000
Binary files a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/MoveLeft.png and /dev/null differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/NEWT.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/NEWT.png
deleted file mode 100644
index 373464bd53e..00000000000
Binary files a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/NEWT.png and /dev/null differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/NEWT1.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/NEWT1.png
deleted file mode 100644
index 2daac224a51..00000000000
Binary files a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/NEWT1.png and /dev/null differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Partner.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Partner.png
deleted file mode 100644
index c661339598e..00000000000
Binary files a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Partner.png and /dev/null differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Product.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Product.png
deleted file mode 100644
index 51451e422ae..00000000000
Binary files a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Product.png and /dev/null differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Project.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Project.png
deleted file mode 100644
index 0f8ea2af8f5..00000000000
Binary files a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Project.png and /dev/null differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Sale.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Sale.png
deleted file mode 100644
index 1b0b44f890e..00000000000
Binary files a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Sale.png and /dev/null differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Search.gif b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Search.gif
deleted file mode 100644
index b29c3cf1054..00000000000
Binary files a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Search.gif and /dev/null differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Success.gif b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Success.gif
deleted file mode 100644
index fb3bff729c5..00000000000
Binary files a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Success.gif and /dev/null differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Task.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Task.png
deleted file mode 100644
index 52056b1e713..00000000000
Binary files a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/Task.png and /dev/null differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/developped_by.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/developped_by.png
deleted file mode 100644
index 54dc465b421..00000000000
Binary files a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/developped_by.png and /dev/null differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/document-new.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/document-new.png
deleted file mode 100755
index bdbe31c4bff..00000000000
Binary files a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/document-new.png and /dev/null differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/openerp-icon.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/openerp-icon.png
deleted file mode 100644
index e2b45b52211..00000000000
Binary files a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/openerp-icon.png and /dev/null differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/overlay.css b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/overlay.css
deleted file mode 100755
index 1f71b8fdcbe..00000000000
--- a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/overlay.css
+++ /dev/null
@@ -1,3 +0,0 @@
-menuitem#tiny-plugin {
- color: red !important;
-}
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/partner.png b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/partner.png
deleted file mode 100644
index 37b29e13382..00000000000
Binary files a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/partner.png and /dev/null differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/perform.gif b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/perform.gif
deleted file mode 100644
index 16cc3873858..00000000000
Binary files a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/perform.gif and /dev/null differ
diff --git a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/tinyerp-icon.ico b/addons/thunderbird/plugin/chrome/openerp_plugin/skin/tinyerp-icon.ico
deleted file mode 100644
index b1e78c0047e..00000000000
Binary files a/addons/thunderbird/plugin/chrome/openerp_plugin/skin/tinyerp-icon.ico and /dev/null differ
diff --git a/addons/thunderbird/plugin/components/nsXmlRpcClient.js b/addons/thunderbird/plugin/components/nsXmlRpcClient.js
deleted file mode 100755
index 40347a9993d..00000000000
--- a/addons/thunderbird/plugin/components/nsXmlRpcClient.js
+++ /dev/null
@@ -1,1039 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla XML-RPC Client component.
- *
- * The Initial Developer of the Original Code is
- * Digital Creations 2, Inc.
- * Portions created by the Initial Developer are Copyright (C) 2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Martijn Pieters (original author)
- * Samuel Sieb
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * nsXmlRpcClient XPCOM component
- * Version: $Revision: 1.39 $
- *
- * $Id: nsXmlRpcClient.js,v 1.39 2006/10/24 16:02:01 silver%warwickcompsoc.co.uk Exp $
- */
-
-/*
- * Constants
- */
-const XMLRPCCLIENT_CONTRACTID = '@mozilla.org/xml-rpc/client;1';
-const XMLRPCCLIENT_CID =
- Components.ID('{4d7d15c0-3747-4f7f-b6b3-792a5ea1a9aa}');
-const XMLRPCCLIENT_IID = Components.interfaces.nsIXmlRpcClient;
-
-const XMLRPCFAULT_CONTRACTID = '@mozilla.org/xml-rpc/fault;1';
-const XMLRPCFAULT_CID =
- Components.ID('{691cb864-0a7e-448c-98ee-4a7f359cf145}');
-const XMLRPCFAULT_IID = Components.interfaces.nsIXmlRpcFault;
-
-const XMLHTTPREQUEST_CONTRACTID = '@mozilla.org/xmlextras/xmlhttprequest;1';
-
-const NSICHANNEL = Components.interfaces.nsIChannel;
-
-const DEBUG = false;
-const DEBUGPARSE = false;
-
-const DOMNode = Components.interfaces.nsIDOMNode;
-/*
- * Class definitions
- */
-
-/* The nsXmlRpcFault class constructor. */
-function nsXmlRpcFault() {}
-
-/* the nsXmlRpcFault class def */
-nsXmlRpcFault.prototype = {
- faultCode: 0,
- faultString: '',
-
- init: function(faultCode, faultString) {
- this.faultCode = faultCode;
- this.faultString = faultString;
- },
-
- toString: function() {
- return '';
- },
-
- // nsISupports interface
- QueryInterface: function(iid) {
- if (!iid.equals(Components.interfaces.nsISupports) &&
- !iid.equals(XMLRPCFAULT_IID))
- throw Components.results.NS_ERROR_NO_INTERFACE;
- return this;
- }
-};
-
-/* The nsXmlRpcClient class constructor. */
-function nsXmlRpcClient() {}
-
-/* the nsXmlRpcClient class def */
-nsXmlRpcClient.prototype = {
- _serverUrl: null,
- _useAuth: false,
-
- init: function(serverURL) {
- this._serverUrl = serverURL;
- this._encoding = "UTF-8";
- },
-
- setAuthentication: function(username, password){
- if ((typeof username == "string") &&
- (typeof password == "string")){
- this._useAuth = true;
- this._username = username;
- this._password = password;
- }
- },
-
- clearAuthentication: function(){
- this._useAuth = false;
- },
-
- setEncoding: function(encoding){
- this._encoding = encoding;
- },
-
- get serverUrl() { return this._serverUrl; },
-
- // Internal copy of the status
- _status: null,
- _listener: null,
-
- asyncCall: function(listener, context, methodName, methodArgs, count) {
- debug('asyncCall');
- // Check for call in progress.
- if (this._inProgress)
- return;
- //throw Components.Exception('Call in progress!');
-
- // Check for the server URL;
- if (!this._serverUrl)
- throw Components.Exception('Not initialized');
-
- this._inProgress = true;
-
- // Clear state.
- this._foundFault = false;
- this._passwordTried = false;
- this._result = null;
- this._fault = null;
- this._status = null;
- this._responseStatus = null;
- this._responseString = null;
- this._listener = listener;
- this._seenStart = false;
- this._context = context;
-
- debug('Arguments: ' + methodArgs);
-
- // Generate request body
- var xmlWriter = new XMLWriter(this._encoding);
- this._generateRequestBody(xmlWriter, methodName, methodArgs);
-
- var requestBody = xmlWriter.data;
-
- debug('Request: ' + requestBody);
-
- this.xmlhttp = Components.classes[XMLHTTPREQUEST_CONTRACTID]
- .createInstance(Components.interfaces.nsIXMLHttpRequest);
- if (this._useAuth) {
- this.xmlhttp.open('POST', this._serverUrl, true,
- this._username, this._password);
- } else {
- this.xmlhttp.open('POST', this._serverUrl);
- }
- this.xmlhttp.onload = this._onload;
- this.xmlhttp.onerror = this._onerror;
- this.xmlhttp.parent = this;
- this.xmlhttp.setRequestHeader('Content-Type','text/xml');
- this.xmlhttp.send(requestBody);
- var chan = this.xmlhttp.channel.QueryInterface(NSICHANNEL);
- chan.notificationCallbacks = this;
- },
-
- _onload: function(e) {
- var result;
- var parent = e.target.parent;
- parent._inProgress = false;
- parent._responseStatus = e.target.status;
- parent._responseString = e.target.statusText;
- if (!e.target.responseXML) {
- if (e.target.status) {
- try {
- parent._listener.onError(parent, parent._context,
- Components.results.NS_ERROR_FAILURE,
- 'Server returned status ' + e.target.status);
- } catch (ex) {
- debug('Exception in listener.onError: ' + ex);
- }
- } else {
- try {
- parent._listener.onError(parent, parent._context,
- Components.results.NS_ERROR_FAILURE,
- 'Unknown network error');
- } catch (ex) {
- debug('Exception in listener.onError: ' + ex);
- }
- }
- return;
- }
- try {
- e.target.responseXML.normalize();
- result = parent.parse(e.target.responseXML);
- } catch (ex) {
- try {
- parent._listener.onError(parent, parent._context,
- ex.result, ex.message);
- } catch (ex) {
- debug('Exception in listener.onError: ' + ex);
- }
- return;
- }
- if (parent._foundFault) {
- parent._fault = result;
- try {
- parent._listener.onFault(parent, parent._context, result);
- } catch(ex) {
- debug('Exception in listener.onFault: ' + ex);
- }
- } else {
- parent._result = result.value;
- try {
- parent._listener.onResult(parent, parent._context,
- result.value);
- } catch (ex) {
- debug('Exception in listener.onResult: ' + ex);
- }
- }
- },
-
- _onerror: function(e) {
- var parent = e.target.parent;
- parent._inProgress = false;
- try {
- parent._listener.onError(parent, parent._context,
- Components.results.NS_ERROR_FAILURE,
- 'Unknown network error');
- } catch (ex) {
- debug('Exception in listener.onError: ' + ex);
- }
- },
-
- _foundFault: false,
-
- _fault: null,
- _result: null,
- _responseStatus: null,
- _responseString: null,
-
- get fault() { return this._fault; },
- get result() { return this._result; },
- get responseStatus() { return this._responseStatus; },
- get responseString() { return this._responseString; },
-
- /* Convenience. Create an appropriate XPCOM object for a given type */
- INT: 1,
- BOOLEAN: 2,
- STRING: 3,
- DOUBLE: 4,
- DATETIME: 5,
- ARRAY: 6,
- STRUCT: 7,
- BASE64: 8, // Not part of nsIXmlRpcClient interface, internal use.
- createType: function(type, uuid) {
- const SUPPORTSID = '@mozilla.org/supports-';
- switch(type) {
- case this.INT:
- uuid.value = Components.interfaces.nsISupportsPRInt32
- return createInstance(SUPPORTSID + 'PRInt32;1',
- 'nsISupportsPRInt32');
-
- case this.BOOLEAN:
- uuid.value = Components.interfaces.nsISupportsPRBool
- return createInstance(SUPPORTSID + 'PRBool;1',
- 'nsISupportsPRBool');
-
- case this.STRING:
- uuid.value = Components.interfaces.nsISupportsCString
- return createInstance(SUPPORTSID + 'cstring;1',
- 'nsISupportsCString');
-
- case this.DOUBLE:
- uuid.value = Components.interfaces.nsISupportsDouble
- return createInstance(SUPPORTSID + 'double;1',
- 'nsISupportsDouble');
-
- case this.DATETIME:
- uuid.value = Components.interfaces.nsISupportsPRTime
- return createInstance(SUPPORTSID + 'PRTime;1',
- 'nsISupportsPRTime');
-
- case this.ARRAY:
- uuid.value = Components.interfaces.nsISupportsArray
- return createInstance(SUPPORTSID + 'array;1',
- 'nsISupportsArray');
-
- case this.STRUCT:
- uuid.value = Components.interfaces.nsIDictionary
- return createInstance('@mozilla.org/dictionary;1',
- 'nsIDictionary');
-
- default: throw Components.Exception('Unsupported type');
- }
- },
-
- // nsISupports interface
- QueryInterface: function(iid) {
- if (!iid.equals(Components.interfaces.nsISupports) &&
- !iid.equals(XMLRPCCLIENT_IID) &&
- !iid.equals(Components.interfaces.nsIInterfaceRequestor))
- throw Components.results.NS_ERROR_NO_INTERFACE;
- return this;
- },
-
- // nsIInterfaceRequester interface
- getInterface: function(iid, result){
- if (iid.equals(Components.interfaces.nsIAuthPrompt)){
- return this;
- }
- Components.returnCode = Components.results.NS_ERROR_NO_INTERFACE;
- return null;
- },
-
- // nsIAuthPrompt interface
- _passwordTried: false,
- promptUsernameAndPassword: function(dialogTitle, text, passwordRealm,
- savePassword, user, pwd){
-
- if (this._useAuth){
- if (this._passwordTried){
- return false;
- }
- user.value = this._username;
- pwd.value = this._password;
- this._passwordTried = true;
- return true;
- }
- return false;
- },
-
- /* Generate the XML-RPC request body */
- _generateRequestBody: function(writer, methodName, methodArgs) {
- writer.startElement('methodCall');
-
- writer.startElement('methodName');
- writer.write(methodName);
- writer.endElement('methodName');
-
- writer.startElement('params');
- for (var i = 0; i < methodArgs.length; i++) {
- writer.startElement('param');
- this._generateArgumentBody(writer, methodArgs[i]);
- writer.endElement('param');
- }
- writer.endElement('params');
-
- writer.endElement('methodCall');
- },
-
- /* Write out a XML-RPC parameter value */
- _generateArgumentBody: function(writer, obj) {
- writer.startElement('value');
- var sType = this._typeOf(obj);
- switch (sType) {
- case 'PRUint8':
- case 'PRUint16':
- case 'PRInt16':
- case 'PRInt32':
- obj=obj.QueryInterface(Components.interfaces['nsISupports' +
- sType]);
- writer.startElement('i4');
- writer.write(obj.toString());
- writer.endElement('i4');
- break;
-
- case 'PRBool':
- obj=obj.QueryInterface(Components.interfaces.nsISupportsPRBool);
- writer.startElement('boolean');
- writer.write(obj.data ? '1' : '0');
- writer.endElement('boolean');
- break;
-
- case 'Char':
- case 'CString':
- obj=obj.QueryInterface(Components.interfaces['nsISupports' +
- sType]);
- writer.startElement('string');
- writer.write(obj.toString());
- writer.endElement('string');
- break;
-
- case 'Float':
- case 'Double':
- obj=obj.QueryInterface(Components.interfaces['nsISupports' +
- sType]);
- writer.startElement('double');
- writer.write(obj.toString());
- writer.endElement('double');
- break;
-
- case 'PRTime':
- obj = obj.QueryInterface(
- Components.interfaces.nsISupportsPRTime);
- var date = new Date(obj.data)
- writer.startElement('dateTime.iso8601');
- writer.write(iso8601Format(date));
- writer.endElement('dateTime.iso8601');
- break;
-
- case 'InputStream':
- obj = obj.QueryInterface(Components.interfaces.nsIInputStream);
- obj = toScriptableStream(obj);
- writer.startElement('base64');
- streamToBase64(obj, writer);
- writer.endElement('base64');
- break;
-
- case 'Array':
- obj = obj.QueryInterface(
- Components.interfaces.nsISupportsArray);
- writer.startElement('array');
- writer.startElement('data');
- for (var i = 0; i < obj.Count(); i++)
- this._generateArgumentBody(writer, obj.GetElementAt(i));
- writer.endElement('data');
- writer.endElement('array');
- break;
-
- case 'Dictionary':
- obj = obj.QueryInterface(Components.interfaces.nsIDictionary);
- writer.startElement('struct');
- var keys = obj.getKeys({});
- for (var k = 0; k < keys.length; k++) {
- writer.startElement('member');
- writer.startElement('name');
- writer.write(keys[k]);
- writer.endElement('name');
- this._generateArgumentBody(writer, obj.getValue(keys[k]));
- writer.endElement('member');
- }
- writer.endElement('struct');
- break;
-
- default:
- throw Components.Exception('Unsupported argument', null, null,
- obj);
- }
-
- writer.endElement('value');
- },
-
- /* Determine type of a nsISupports primitive, array or dictionary. */
- _typeOf: function(obj) {
- // XPConnect alows JS to pass in anything, because we are a regular
- // JS object to it. So we have to test rigorously.
- if (typeof obj != 'object') return 'Unknown';
-
- // Anything else not nsISupports is not allowed.
- if (typeof obj.QueryInterface != 'function') return 'Unknown';
-
- // Now we will have to eliminate by trying all possebilities.
- try {
- obj.QueryInterface(Components.interfaces.nsISupportsPRUint8);
- return 'PRUint8';
- } catch(e) {}
-
- try {
- obj.QueryInterface(Components.interfaces.nsISupportsPRUint16);
- return 'PRUint16';
- } catch(e) {}
-
- try {
- obj.QueryInterface(Components.interfaces.nsISupportsPRInt16);
- return 'PRInt16';
- } catch(e) {}
-
- try {
- obj.QueryInterface(Components.interfaces.nsISupportsPRInt32);
- return 'PRInt32';
- } catch(e) {}
-
- try {
- obj.QueryInterface(Components.interfaces.nsISupportsPRBool);
- return 'PRBool';
- } catch(e) {}
-
- try {
- obj.QueryInterface(Components.interfaces.nsISupportsChar);
- return 'Char';
- } catch(e) {}
-
- try {
- obj.QueryInterface(Components.interfaces.nsISupportsCString);
- return 'CString';
- } catch(e) {}
-
- try {
- obj.QueryInterface(Components.interfaces.nsISupportsFloat);
- return 'Float';
- } catch(e) {}
-
- try {
- obj.QueryInterface(Components.interfaces.nsISupportsDouble);
- return 'Double';
- } catch(e) {}
-
- try {
- obj.QueryInterface(Components.interfaces.nsISupportsPRTime);
- return 'PRTime';
- } catch(e) {}
-
- try {
- obj.QueryInterface(Components.interfaces.nsIInputStream);
- return 'InputStream';
- } catch(e) {}
-
- try {
- obj.QueryInterface(Components.interfaces.nsISupportsArray);
- return 'Array';
- } catch(e) {}
-
- try {
- obj.QueryInterface(Components.interfaces.nsIDictionary);
- return 'Dictionary';
- } catch(e) {}
-
- // Not a supported type
- return 'Unknown';
- },
-
- // Response parsing state
- _valueStack: [],
- _currValue: null,
- _cdata: null,
-
- parse: function(doc) {
- var node = doc.firstChild;
- var result;
- if (node.nodeType == DOMNode.TEXT_NODE)
- node = node.nextSibling;
- if ((node.nodeType != DOMNode.ELEMENT_NODE) ||
- (node.nodeName != 'methodResponse')) {
- throw Components.Exception('Expecting a methodResponse', null, null,
- doc);
- }
- node = node.firstChild;
- if (node.nodeType == DOMNode.TEXT_NODE)
- node = node.nextSibling;
- if (node.nodeType != DOMNode.ELEMENT_NODE)
- throw Components.Exception('Expecting a params or fault', null,
- null, doc);
- if (node.nodeName == 'params') {
- node = node.firstChild;
- if (node.nodeType == DOMNode.TEXT_NODE)
- node = node.nextSibling;
- if ((node.nodeType != DOMNode.ELEMENT_NODE) ||
- (node.nodeName != 'param')) {
- throw Components.Exception('Expecting a param', null, null,
- doc);
- }
- result = this.parseValue(node.firstChild);
- } else if (node.nodeName == 'fault') {
- this._foundFault = true;
- result = this.parseFault(node.firstChild);
- } else {
- throw Components.Exception('Expecting a params or fault', null,
- null, doc);
- }
- debug('Parse finished');
- return result;
- },
-
- parseValue: function(node) {
- var cValue = new Value();
- if (node && (node.nodeType == DOMNode.TEXT_NODE))
- node = node.nextSibling;
- if (!node || (node.nodeType != DOMNode.ELEMENT_NODE) ||
- (node.nodeName != 'value')) {
- throw Components.Exception('Expecting a value', null, null, node);
- }
- node = node.firstChild;
- if (!node)
- return cValue;
- if (node.nodeType == DOMNode.TEXT_NODE){
- if (!node.nextSibling) {
- cValue.value = node.nodeValue;
- return cValue;
- } else {
- node = node.nextSibling;
- }
- }
- if (node.nodeType != DOMNode.ELEMENT_NODE)
- throw Components.Exception('Expecting a value type', null, null,
- node);
- switch (node.nodeName) {
- case 'string':
- cValue.value = this.parseString(node.firstChild);
- break;
- case 'i4':
- case 'int':
- cValue.type = this.INT;
- cValue.value = this.parseString(node.firstChild);
- break;
- case 'boolean':
- cValue.type = this.BOOLEAN;
- cValue.value = this.parseString(node.firstChild);
- break;
- case 'double':
- cValue.type = this.DOUBLE;
- cValue.value = this.parseString(node.firstChild);
- break;
- case 'dateTime.iso8601':
- cValue.type = this.DATETIME;
- cValue.value = this.parseString(node.firstChild);
- break;
- case 'base64':
- cValue.type = this.BASE64;
- cValue.value = this.parseString(node.firstChild);
- break;
- case 'struct':
- cValue.type = this.STRUCT;
- this.parseStruct(cValue, node.firstChild);
- break;
- case 'array':
- cValue.type = this.ARRAY;
- this.parseArray(cValue, node.firstChild);
- break;
- default:
- throw Components.Exception('Expecting a value type', null, null,
- node);
- }
- return cValue;
- },
-
- parseString: function(node) {
- value = '';
- while (node) {
- if (node.nodeType != DOMNode.TEXT_NODE)
- throw Components.Exception('Expecting a text node', null, null,
- node);
- value += node.nodeValue;
- node = node.nextSibling;
- }
- return value;
- },
-
- parseStruct: function(struct, node) {
- while (node) {
- if (node.nodeType == DOMNode.TEXT_NODE)
- node = node.nextSibling;
- if (!node)
- return;
- if ((node.nodeType != DOMNode.ELEMENT_NODE) ||
- (node.nodeName != 'member')) {
- throw Components.Exception('Expecting a member', null, null,
- node);
- }
- this.parseMember(struct, node.firstChild);
- node = node.nextSibling;
- }
- },
-
- parseMember: function(struct, node) {
- var cValue;
- if (node.nodeType == DOMNode.TEXT_NODE)
- node = node.nextSibling;
- if (!node || (node.nodeType != DOMNode.ELEMENT_NODE) ||
- (node.nodeName != 'name')) {
- throw Components.Exception('Expecting a name', null, null, node);
- }
- struct.name = this.parseString(node.firstChild);
- cValue = this.parseValue(node.nextSibling);
- struct.appendValue(cValue.value);
- },
-
- parseArray: function(array, node) {
- if (node.nodeType == DOMNode.TEXT_NODE)
- node = node.nextSibling;
- if (!node || (node.nodeType != DOMNode.ELEMENT_NODE) ||
- (node.nodeName != 'data')) {
- throw Components.Exception('Expecting array data', null, null, node);
- }
- for (node = node.firstChild; node; node = node.nextSibling) {
- if (node.nodeType == DOMNode.TEXT_NODE)
- continue;
- array.appendValue(this.parseValue(node).value);
- }
- },
-
- parseFault: function(node) {
- var fault = createInstance(XMLRPCFAULT_CONTRACTID, 'nsIXmlRpcFault');
- var cValue = this.parseValue(node);
- if ((cValue.type != this.STRUCT) ||
- (!cValue.value.hasKey('faultCode')) ||
- (!cValue.value.hasKey('faultString'))) {
- throw Components.Exception('Invalid fault', null, null, node);
- }
- fault.init(cValue.value.getValue('faultCode').data,
- cValue.value.getValue('faultString').data);
- return fault;
- }
-};
-
-/* The XMLWriter class constructor */
-function XMLWriter(encoding) {
- if (!encoding)
- encoding = "UTF-8";
- this.data = '';
-}
-
-/* The XMLWriter class def */
-XMLWriter.prototype = {
- data: '',
-
- startElement: function(element) {
- this.data += '<' + element + '>';
- },
-
- endElement: function(element) {
- this.data += '' + element + '>';
- },
-
- write: function(text) {
- for (var i = 0; i < text.length; i++) {
- var c = text[i];
- switch (c) {
- case '<':
- this.data += '<';
- break;
- case '&':
- this.data += '&';
- break;
- default:
- this.data += c;
- }
- }
- },
-
- markup: function(text) { this.data += text }
-};
-
-/* The Value class contructor */
-function Value() { this.type = this.STRING; };
-
-/* The Value class def */
-Value.prototype = {
- INT: nsXmlRpcClient.prototype.INT,
- BOOLEAN: nsXmlRpcClient.prototype.BOOLEAN,
- STRING: nsXmlRpcClient.prototype.STRING,
- DOUBLE: nsXmlRpcClient.prototype.DOUBLE,
- DATETIME: nsXmlRpcClient.prototype.DATETIME,
- ARRAY: nsXmlRpcClient.prototype.ARRAY,
- STRUCT: nsXmlRpcClient.prototype.STRUCT,
- BASE64: nsXmlRpcClient.prototype.BASE64,
-
- _createType: nsXmlRpcClient.prototype.createType,
-
- name: null,
-
- _value: null,
- get value() { return this._value; },
- set value(val) {
- // accepts [0-9]+ or x[0-9a-fA-F]+ and returns the character.
- function entityTrans(substr, code) {
- return String.fromCharCode("0" + code);
- }
-
- switch (this.type) {
- case this.STRING:
- val = val.replace(/([0-9]+);/g, entityTrans);
- val = val.replace(/(x[0-9a-fA-F]+);/g, entityTrans);
- val = val.replace(/</g, '<');
- val = val.replace(/>/g, '>');
- val = val.replace(/&/g, '&');
- this._value.data = val;
- break;
-
- case this.BOOLEAN:
- this._value.data = (val == 1);
- break;
-
- case this.DATETIME:
- this._value.data = Date.UTC(val.slice(0, 4),
- val.slice(4, 6) - 1, val.slice(6, 8), val.slice(9, 11),
- val.slice(12, 14), val.slice(15));
- break;
-
- case this.BASE64:
- this._value.data = base64ToString(val);
- break;
-
- default:
- this._value.data = val;
- }
- },
-
- _type: null,
- get type() { return this._type; },
- set type(type) {
- this._type = type;
- if (type == this.BASE64)
- this._value = this._createType(this.STRING, {});
- else this._value = this._createType(type, {});
- },
-
- appendValue: function(val) {
- switch (this.type) {
- case this.ARRAY:
- this.value.AppendElement(val);
- break;
-
- case this.STRUCT:
- this.value.setValue(this.name, val);
- break;
- }
- }
-};
-
-/*
- * Objects
- */
-
-/* nsXmlRpcClient Module (for XPCOM registration) */
-var nsXmlRpcClientModule = {
- registerSelf: function(compMgr, fileSpec, location, type) {
- compMgr = compMgr.QueryInterface(Components.interfaces.nsIComponentRegistrar);
-
- compMgr.registerFactoryLocation(XMLRPCCLIENT_CID,
- 'XML-RPC Client JS component',
- XMLRPCCLIENT_CONTRACTID,
- fileSpec,
- location,
- type);
- compMgr.registerFactoryLocation(XMLRPCFAULT_CID,
- 'XML-RPC Fault JS component',
- XMLRPCFAULT_CONTRACTID,
- fileSpec,
- location,
- type);
- },
-
- getClassObject: function(compMgr, cid, iid) {
- if (!cid.equals(XMLRPCCLIENT_CID) && !cid.equals(XMLRPCFAULT_CID))
- throw Components.results.NS_ERROR_NO_INTERFACE;
-
- if (!iid.equals(Components.interfaces.nsIFactory))
- throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
-
- if (cid.equals(XMLRPCCLIENT_CID))
- return nsXmlRpcClientFactory
- else return nsXmlRpcFaultFactory;
- },
-
- canUnload: function(compMgr) { return true; }
-};
-
-/* nsXmlRpcClient Class Factory */
-var nsXmlRpcClientFactory = {
- createInstance: function(outer, iid) {
- if (outer != null)
- throw Components.results.NS_ERROR_NO_AGGREGATION;
-
- if (!iid.equals(XMLRPCCLIENT_IID) &&
- !iid.equals(Components.interfaces.nsISupports))
- throw Components.results.NS_ERROR_INVALID_ARG;
-
- return new nsXmlRpcClient();
- }
-}
-
-/* nsXmlRpcFault Class Factory */
-var nsXmlRpcFaultFactory = {
- createInstance: function(outer, iid) {
- if (outer != null)
- throw Components.results.NS_ERROR_NO_AGGREGATION;
-
- if (!iid.equals(XMLRPCFAULT_IID) &&
- !iid.equals(Components.interfaces.nsISupports))
- throw Components.results.NS_ERROR_INVALID_ARG;
-
- return new nsXmlRpcFault();
- }
-}
-
-/*
- * Functions
- */
-
-/* module initialisation */
-function NSGetModule(comMgr, fileSpec) { return nsXmlRpcClientModule; }
-
-/* Create an instance of the given ContractID, with given interface */
-function createInstance(contractId, intf) {
- return Components.classes[contractId]
- .createInstance(Components.interfaces[intf]);
-}
-
-/* Get a pointer to a service indicated by the ContractID, with given interface */
-function getService(contractId, intf) {
- return Components.classes[contractId]
- .getService(Components.interfaces[intf]);
-}
-
-/* Convert an inputstream to a scriptable inputstream */
-function toScriptableStream(input) {
- var SIStream = Components.Constructor(
- '@mozilla.org/scriptableinputstream;1',
- 'nsIScriptableInputStream', 'init');
- return new SIStream(input);
-}
-
-/* format a Date object into a iso8601 datetime string, UTC time */
-function iso8601Format(date) {
- var datetime = date.getUTCFullYear();
- var month = String(date.getUTCMonth() + 1);
- datetime += (month.length == 1 ? '0' + month : month);
- var day = date.getUTCDate();
- datetime += (day < 10 ? '0' + day : day);
-
- datetime += 'T';
-
- var hour = date.getUTCHours();
- datetime += (hour < 10 ? '0' + hour : hour) + ':';
- var minutes = date.getUTCMinutes();
- datetime += (minutes < 10 ? '0' + minutes : minutes) + ':';
- var seconds = date.getUTCSeconds();
- datetime += (seconds < 10 ? '0' + seconds : seconds);
-
- return datetime;
-}
-
-/* Convert a stream to Base64, writing it away to a string writer */
-const BASE64CHUNK = 255; // Has to be dividable by 3!!
-function streamToBase64(stream, writer) {
- while (stream.available()) {
- var data = [];
- while (data.length < BASE64CHUNK && stream.available()) {
- var d = stream.read(1).charCodeAt(0);
- // reading a 0 results in NaN, compensate.
- data = data.concat(isNaN(d) ? 0 : d);
- }
- writer.write(toBase64(data));
- }
-}
-
-/* Convert data (an array of integers) to a Base64 string. */
-const toBase64Table = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz' +
- '0123456789+/';
-const base64Pad = '=';
-function toBase64(data) {
- var result = '';
- var length = data.length;
- var i;
- // Convert every three bytes to 4 ascii characters.
- for (i = 0; i < (length - 2); i += 3) {
- result += toBase64Table[data[i] >> 2];
- result += toBase64Table[((data[i] & 0x03) << 4) + (data[i+1] >> 4)];
- result += toBase64Table[((data[i+1] & 0x0f) << 2) + (data[i+2] >> 6)];
- result += toBase64Table[data[i+2] & 0x3f];
- }
-
- // Convert the remaining 1 or 2 bytes, pad out to 4 characters.
- if (length%3) {
- i = length - (length%3);
- result += toBase64Table[data[i] >> 2];
- if ((length%3) == 2) {
- result += toBase64Table[((data[i] & 0x03) << 4) + (data[i+1] >> 4)];
- result += toBase64Table[(data[i+1] & 0x0f) << 2];
- result += base64Pad;
- } else {
- result += toBase64Table[(data[i] & 0x03) << 4];
- result += base64Pad + base64Pad;
- }
- }
-
- return result;
-}
-
-/* Convert Base64 data to a string */
-const toBinaryTable = [
- -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
- -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
- -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,62, -1,-1,-1,63,
- 52,53,54,55, 56,57,58,59, 60,61,-1,-1, -1, 0,-1,-1,
- -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10, 11,12,13,14,
- 15,16,17,18, 19,20,21,22, 23,24,25,-1, -1,-1,-1,-1,
- -1,26,27,28, 29,30,31,32, 33,34,35,36, 37,38,39,40,
- 41,42,43,44, 45,46,47,48, 49,50,51,-1, -1,-1,-1,-1
-];
-function base64ToString(data) {
- var result = '';
- var leftbits = 0; // number of bits decoded, but yet to be appended
- var leftdata = 0; // bits decoded, but yet to be appended
-
- // Convert one by one.
- for (var i = 0; i < data.length; i++) {
- var c = toBinaryTable[data.charCodeAt(i) & 0x7f];
- var padding = (data[i] == base64Pad);
- // Skip illegal characters and whitespace
- if (c == -1) continue;
-
- // Collect data into leftdata, update bitcount
- leftdata = (leftdata << 6) | c;
- leftbits += 6;
-
- // If we have 8 or more bits, append 8 bits to the result
- if (leftbits >= 8) {
- leftbits -= 8;
- // Append if not padding.
- if (!padding)
- result += String.fromCharCode((leftdata >> leftbits) & 0xff);
- leftdata &= (1 << leftbits) - 1;
- }
- }
-
- // If there are any bits left, the base64 string was corrupted
- if (leftbits)
- throw Components.Exception('Corrupted base64 string');
-
- return result;
-}
-
-if (DEBUG) debug = function(msg) {
- dump(' -- XML-RPC client -- : ' + msg + '\n');
-};
-else debug = function() {}
-
-// vim:sw=4:sr:sta:et:sts:
diff --git a/addons/thunderbird/plugin/components/xml-rpc.xpt b/addons/thunderbird/plugin/components/xml-rpc.xpt
deleted file mode 100755
index 8e59aa20c85..00000000000
Binary files a/addons/thunderbird/plugin/components/xml-rpc.xpt and /dev/null differ
diff --git a/addons/thunderbird/plugin/defaults/preferences/tiny.js b/addons/thunderbird/plugin/defaults/preferences/tiny.js
deleted file mode 100755
index ca8332c868e..00000000000
--- a/addons/thunderbird/plugin/defaults/preferences/tiny.js
+++ /dev/null
@@ -1,56 +0,0 @@
-
-pref("extensions.tiny.serverurl", "http://localhost");
-pref("extensions.tiny.serverport", "8069");
-pref("extensions.tiny.serverdbname", "terp");
-pref("extensions.tiny.username","admin");
-pref("extensions.tiny.password","admin");
-pref("extensions.tiny.senderemail","");
-pref("extensions.tiny.sendername","");
-pref("extensions.tiny.receiveremail","");
-pref("extensions.tiny.subject","");
-pref("extensions.tiny.receiveddate","");
-pref("extensions.tiny.partnerid","");
-pref("extensions.tiny.contactid","");
-pref("extensions.tiny.attachvalue","");
-pref("extensions.tiny.cclist","");
-pref("extensions.tiny.messagebody","");
-pref("extensions.tiny.displayName","");
-pref("extensions.tiny.attachmentdata","");
-pref("extensions.tiny.userid",3);
-pref("extensions.tiny.partnername","");
-pref("extensions.tiny.officeno","");
-pref("extensions.tiny.phoneno","");
-pref("extensions.tiny.address","");
-pref("extensions.tiny.listobject","Partner,Partner Address,Accout Invoice,Project,Product,Account,Sale Order,Project Task");
-pref("extensions.tiny.object","res.partner,res.partner.address,account.invoice,project.project,product.product,account.account,sale.order,project.task");
-pref("extensions.tiny.imagename","chrome://openerp_plugin/skin/Partner.png,chrome://openerp_plugin/skin/Contact.png,chrome://openerp_plugin/skin/Invoice.png,chrome://openerp_plugin/skin/Project.png,chrome://openerp_plugin/skin/Product.png,chrome://openerp_plugin/skin/Account.png,chrome://openerp_plugin/skin/Sale.png,chrome://openerp_plugin/skin/Case.png,chrome://openerp_plugin/skin/Task.png");
-pref("extensions.tiny.attachmentlength","");
-pref("extensions.tiny.attachment","");
-pref("extensions.tiny.db_list","false");
-pref("extensions.tiny.connect_server","false");
-pref("extensions.tiny.module_install","yes");
-pref("extensions.tiny.serverprotocol", "false");
-
-
-
-pref("mboximport.export.filenames_toascii", false);
-pref("mboximport.export.overwrite", false);
-pref("mboximport.confirm.before_mbox_import", true);
-pref("mboximport.clipboard.always_just_text", false);
-pref("mboximport.export.HTML_as_displayed", false);
-pref("mboximport.exportEML.filename_format", 0);
-pref("mboximport.delay.clean_statusbar", 5000);
-pref("mboximport.subject.max_length", 50);
-pref("mboximport.author.max_length", 50);
-pref("mboximport.recipients.max_length", 50);
-pref("extensions.{3ed8cc52-86fc-4613-9026-c1ef969da4c3}.description", "chrome://mboximport/locale/mboximport.properties");
-pref("mboximport.export.set_filetime", false);
-pref("mboximport.exportEML.use_dir", false);
-pref("mboximport.exportMBOX.use_dir", false);
-pref("mboximport.exportMSG.use_dir", false);
-pref("mboximport.export.filenames_addtime", false);
-pref("mboximport.export_all.warning1", true);
-pref("mboximport.export_all.warning2", true);
-
-pref("mboximport.exportMSG.dir", "/tmp");
-
diff --git a/addons/thunderbird/plugin/install.js b/addons/thunderbird/plugin/install.js
deleted file mode 100755
index 50e4b301e32..00000000000
--- a/addons/thunderbird/plugin/install.js
+++ /dev/null
@@ -1,105 +0,0 @@
-// constants
-const APP_DISPLAY_NAME = "OpenERP Thunderbird Plugins";
-const APP_NAME = "OpenERP";
-const APP_VERSION = "1.0";
-const WARNING = "WARNING: You need administrator privileges to install OpenERP Thunderbird Plugin. It will be installed in the application directory for all users.";
-const VERSION_ERROR = "This extension can only be installed in a version higher than 2.0";
-const NOT_WRITABLE_ERROR = "This extension requires write access to the application directory to install properly."
-const locales = [
- "en-US",
- null
-];
-
-// Gecko 1.7 doesn't support custom button labels
-var incompatible = (typeof Install.BUTTON_POS_0 == "undefined");
-if (incompatible)
- alert(VERSION_ERROR);
-
-if (!incompatible) {
- // Check whether all directories can be accessed
- var dirList = [
- getFolder("Components"),
- getFolder(getFolder("Program", "defaults"), "pref")
- ];
- for (var i = 0; i < dirList.length; i++)
- if (!File.isWritable(dirList[i]))
- incompatible = true;
-
- if (incompatible)
- alert(NOT_WRITABLE_ERROR);
-}
-
-if (!incompatible && confirm(WARNING, APP_DISPLAY_NAME)) {
- /* Pre-Install Cleanup (for prior versions) */
-
- // List of files to be checked
- var checkFiles = [
- [getFolder("Components"), "nsXmlRpcClient.js"], // Root component
- [getFolder("Components"), "xml-rpc.xpt"], // Component interface
- ];
-
- // Remove any existing files
- initInstall("pre-install", "/rename", "0.0"); // open dummy-install
- for (var i = 0 ; i < checkFiles.length ; i++) {
- var currentDir = checkFiles[i][0];
- var name = checkFiles[i][1];
- var oldFile = getFolder(currentDir, name);
-
- // Find a name to rename the file into
- var newName = name + "-uninstalled";
- for (var n = 1; File.exists(oldFile) && File.exists(getFolder(currentDir, newName)); n++)
- newName = name + n + "-uninstalled";
-
- if (File.exists(oldFile))
- File.rename(oldFile, newName);
- }
- performInstall(); // commit renamed files
-
- /* Main part of the installation */
-
- var chromeType = DELAYED_CHROME;
-
- var files = [
- ["components/nsXmlRpcClient.js", getFolder("Components")],
- ["components/xml-rpc.xpt", getFolder("Components")],
- ["defaults/preferences/tiny.js", getFolder(getFolder("Program", "defaults"), "pref")],
- ];
-
- // initialize our install
- initInstall(APP_NAME, APP_PACKAGE, APP_VERSION);
-
- // Add files
- for (var i = 0; i < files.length; i++)
- addFile(APP_NAME, APP_VERSION, files[i][0], files[i][1], null);
-
- try {
- var err = registerChrome(CONTENT | chromeType, jar, "content/");
- if (err != SUCCESS)
- throw "Chrome registration for content failed (error code " + err + ").";
-
- err = registerChrome(SKIN | chromeType, jar, "skin/classic/");
- if (err != SUCCESS)
- throw "Chrome registration for skin failed (error code " + err + ").";
-
- for (i = 0; i < locales.length; i++) {
- if (!locales[i])
- continue;
-
- err = registerChrome(LOCALE | chromeType, jar, "locale/" + locales[i] + "/");
- if (err != SUCCESS)
- throw "Chrome registration for " + locales[i] + " locale failed (error code " + err + ").";
- }
-
- var err = performInstall();
- if (err != SUCCESS && err != 999)
- throw "Committing installation failed (error code " + err + ").";
-
- alert("OpenERP Thunderbird Plugin " + APP_VERSION + " is now installed.\n" +
- "It will become active after you restart your browser.");
- }
- catch (ex) {
- alert("Installation failed: " + ex + "\n" +
- "You probably don't have the necessary permissions (log in as system administrator).");
- cancelInstall(err);
- }
-}
diff --git a/addons/thunderbird/plugin/install.rdf b/addons/thunderbird/plugin/install.rdf
deleted file mode 100755
index 07fdd116744..00000000000
--- a/addons/thunderbird/plugin/install.rdf
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- {d57f315a-9f5d-4366-a530-a769a4a8c949}
- chrome://openerp_plugin/skin/tinyerp-icon.ico
- OpenERP Plugin for Thunderbird 2.0
- 1.0
- OpenERP Thunderbird Integration
- OpenERP SA
-
- http://openerp.com
-
-
-
- {3550f703-e582-4d05-9a08-453d09bdfdc6}
- 2.0
- 3.0.*
-
-
-
-
diff --git a/addons/thunderbird/plugin/openerp_plugin.xpi b/addons/thunderbird/plugin/openerp_plugin.xpi
index 0f9243510d2..99292b2283b 100644
Binary files a/addons/thunderbird/plugin/openerp_plugin.xpi and b/addons/thunderbird/plugin/openerp_plugin.xpi differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/install.rdf b/addons/thunderbird/plugin/openerp_plugin/install.rdf
index 07fdd116744..b46c10c433b 100755
--- a/addons/thunderbird/plugin/openerp_plugin/install.rdf
+++ b/addons/thunderbird/plugin/openerp_plugin/install.rdf
@@ -4,7 +4,7 @@
{d57f315a-9f5d-4366-a530-a769a4a8c949}
chrome://openerp_plugin/skin/tinyerp-icon.ico
- OpenERP Plugin for Thunderbird 2.0
+ OpenERP Plugin
1.0
OpenERP Thunderbird Integration
OpenERP SA
@@ -15,7 +15,7 @@
{3550f703-e582-4d05-9a08-453d09bdfdc6}
2.0
- 3.0.*
+ 3.1.*
diff --git a/addons/warning/i18n/tr.po b/addons/warning/i18n/tr.po
index 376214fc47f..1da04d51457 100644
--- a/addons/warning/i18n/tr.po
+++ b/addons/warning/i18n/tr.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-08-14 09:03+0000\n"
+"PO-Revision-Date: 2010-08-15 10:13+0000\n"
"Last-Translator: Fabien (Open ERP) \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: warning
diff --git a/addons/wiki/i18n/tr.po b/addons/wiki/i18n/tr.po
index bf960f651fa..a65f8a71423 100644
--- a/addons/wiki/i18n/tr.po
+++ b/addons/wiki/i18n/tr.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-08-14 08:39+0000\n"
+"PO-Revision-Date: 2010-08-15 12:08+0000\n"
"Last-Translator: adsiz_1029@hotmail.com \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-08-15 06:21+0000\n"
+"X-Launchpad-Export-Date: 2010-08-16 06:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: wiki