pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Merge]: Merge with lp:openobject-addons

Browse Source 
bzr revid: rpa@tinyerp.com-20100817050317-unvj5o25fdg7jb7m
This commit is contained in:
rpa (Open ERP)
2010-08-17 10:33:17 +05:30
parent cf80c1d74a 0abd243192
commit fb32e7772e
289 changed files with 1529 additions and 6170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/__openerp__.py
-2
View File
@@ -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",
addons/account/account.py
+8 -5
View File
@@ -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):
addons/account/account_bank_statement.py
+13 -8
View File
@@ -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 = {
addons/account/account_cash_statement.py
+1 -1
View File
@@ -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 = {
addons/account/account_invoice_view.xml
+14 -1
View File
@@ -507,7 +507,20 @@
<act_window domain="[('account_analytic_id', '=', active_id)]" id="act_account_analytic_account_2_account_invoice_line" name="Invoice lines" res_model="account.invoice.line" src_model="account.analytic.account"/>
<act_window domain="[('partner_id', '=', partner_id), ('account_id.type', 'in', ['receivable', 'payable']), ('reconcile_id','=',False)]" id="act_account_invoice_account_move_unreconciled" name="Journal Items" res_model="account.move.line" src_model="account.invoice"/>
<act_window
domain="[('partner_id', '=', partner_id), ('account_id.reconcile', '=', True)]"
context="{'search_default_unreconciled':True}"
id="act_account_invoice_account_move_unreconciled"
name="Items to Reconcile"
res_model="account.move.line"
src_model="account.invoice"/>
<act_window
domain="[('move_id', '=', move_id)]"
id="act_account_invoice_account_move_invoice_link"
name="Invoice Items"
res_model="account.move.line"
src_model="account.invoice"/>
</data>
</openerp>
addons/account/account_move_line.py
+17 -16
View File
@@ -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\',\'&lt;&gt;\',\'view\'), (\'type\',\'&lt;&gt;\',\'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])+'"')
addons/account/account_view.xml
+7 -3
View File
@@ -605,11 +605,11 @@
<field name="name"/>
</tree>
</field>
<group col="5" colspan="4">
<group col="7" colspan="4">
<field name="total_entry"/>
<field name="total_new"/>
<field name="total_balance"/>
<button colspan="2" name="dummy" string="Compute" icon="terp-stock_format-scientific"/>
<button name="dummy" string="Compute" icon="terp-stock_format-scientific"/>
</group>
</form>
</field>
@@ -1057,7 +1057,11 @@
<filter icon="terp-camera_test" string="Posted" domain="[('state','=','valid')]" help="Posted Entry Lines"/>
<filter icon="terp-stock_symbol-selection" string="Unposted" domain="[('move_id.state','=','draft')]" help="Unposted Entry Lines"/>
<separator orientation="vertical"/>
<filter icon="terp-stock_symbol-selection" string="Unreconciled" domain="[('reconcile_id','=',False), ('account_id.type','in',['receivable', 'payable'])]" help="Unreconciled Entry Lines"/>
<filter
icon="terp-stock_symbol-selection"
string="Unreconciled"
domain="[('reconcile_id','=',False), ('account_id.type','in',['receivable', 'payable'])]" help="Unreconciled Journal Items"
name="unreconciled"/>
<separator orientation="vertical"/>
<field name="move_id" select="1" string="Number (Move)"/>
<field name="date" select='1'/>
addons/account/board_account_view.xml
+1
View File
@@ -51,5 +51,6 @@
<menuitem id="menu_dashboard_acc" name="Dashboard" sequence="2" parent="account.menu_finance_reporting"/>
<menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="menu_dashboard_acc" sequence="1"/>
<menuitem icon="terp-account" id="account.menu_finance" name="Accounting" sequence="13" action="open_board_account"/>
</data>
</openerp>
addons/account/data/account_data2.xml
+25
View File
@@ -86,6 +86,12 @@
<field name="field">state</field>
<field eval="14" name="sequence"/>
</record>
<record id="bank_col20" model="account.journal.column">
<field name="view_id" ref="account_journal_bank_view"/>
<field name="name">Reconcile</field>
<field name="field">reconcile_id</field>
<field eval="20" name="sequence"/>
</record>
<record id="account_journal_bank_view_multi" model="account.journal.view">
<field name="name">Bank/Cash Journal (Multi-Currency) View</field>
@@ -166,6 +172,12 @@
<field name="field">state</field>
<field eval="16" name="sequence"/>
</record>
<record id="bank_col20_multi" model="account.journal.column">
<field name="view_id" ref="account_journal_bank_view_multi"/>
<field name="name">Reconcile</field>
<field name="field">reconcile_id</field>
<field eval="20" name="sequence"/>
</record>
<record id="account_journal_view" model="account.journal.view">
@@ -328,6 +340,12 @@
<field name="field">state</field>
<field eval="14" name="sequence"/>
</record>
<record id="sp_journal_col20" model="account.journal.column">
<field name="view_id" ref="account_sp_journal_view"/>
<field name="name">Reconcile</field>
<field name="field">reconcile_id</field>
<field eval="20" name="sequence"/>
</record>
<record id="account_sp_refund_journal_view" model="account.journal.view">
<field name="name">Sale/Purchase Refund Journal View</field>
@@ -420,6 +438,13 @@
<field name="field">state</field>
<field eval="14" name="sequence"/>
</record>
<record id="sp_refund_journal_col20" model="account.journal.column">
<field name="view_id" ref="account_sp_refund_journal_view"/>
<field name="name">Reconcile</field>
<field name="field">reconcile_id</field>
<field eval="20" name="sequence"/>
</record>
<!--
Account Journal Sequences
-->
addons/account/i18n/da.po
+2 -2
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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 <Unknown>\n"
"Language-Team: Danish <da@li.org>\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
addons/account/i18n/de.po
+2 -2
View File
@@ -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 <Unknown>\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
addons/account/i18n/hu.po
+2 -2
View File
@@ -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 <Unknown>\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
addons/account/i18n/it.po
+2 -2
View File
@@ -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 <lorenzo.battistini@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
addons/account/i18n/lt.po
+2 -2
View File
@@ -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 <giedrius.slavinskas@gmail.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
addons/account/i18n/pl.po
+2 -2
View File
@@ -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 <Unknown>\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
addons/account/i18n/sq.po
+2 -2
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: ASTRIT BOKSHI <astritbokshi@gmail.com>\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 <astritbokshi@gmail.com>\n"
"Language-Team: Albanian <sq@li.org>\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
addons/account/i18n/sv.po
+2 -2
View File
@@ -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 <Unknown>\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
addons/account/i18n/tr.po
+2 -2
View File
@@ -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 <omer@barlas.com.tr>\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
addons/account/i18n/zh_CN.po
+174 -174
View File
File diff suppressed because it is too large Load Diff
addons/account/installer.py
+70 -7
View File
@@ -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?
addons/account/report/__init__.py
+1 -2
View File
@@ -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:
addons/account/report/account_account_report.py
-86
View File
@@ -1,86 +0,0 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
# 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 <http://www.gnu.org/licenses/>.
#
##############################################################################
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()
addons/account/report/account_account_report_view.xml
-94
View File
@@ -1,94 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="view_account_account_report_tree" model="ir.ui.view">
<field name="name">account.account.report.tree</field>
<field name="model">account.account.report</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Accounts Analysis">
<field name="name" invisible="1" string="Account"/>
<field name="code" invisible="1"/>
<field name="type" invisible="1"/>
<field name="company_id" invisible="1" group="base.multi_company"/>
<field name="currency_mode" invisible="1"/>
<field name="nbr" sum="#Accounts"/>
<field name="user_type" invisible="1"/>
<field name="parent_account_id" invisible="1"/>
<field name="quantity" sum="Quantity"/>
<field name="amount_total" sum="Total Amount"/>
<field name="credit" sum="Credit"/>
<field name="debit" sum="Debit"/>
<field name="balance" sum="Balance"/>
</tree>
</field>
</record>
<record id="view_account_account_report_graph" model="ir.ui.view">
<field name="name">account.account.report.graph</field>
<field name="model">account.account.report</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Accounts Analysis" type="bar">
<field name="name"/>
<field name="credit" operator="+"/>
<field name="debit" operator="+"/>
<field name="balance" operator="+"/>
</graph>
</field>
</record>
<record id="view_account_account_report_search" model="ir.ui.view">
<field name="name">account.account.report.search</field>
<field name="model">account.account.report</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Accounts Analysis">
<group>
<filter icon="terp-go-today"
string="At Date"
domain="[('currency_mode','=', 'current')]"/>
<filter icon="terp-stock_format-default"
string="Average Rate"
domain="[('currency_mode','=','average')]"/>
<separator orientation="vertical"/>
<field name="name" string="Account"/>
<field name="code"/>
</group>
<newline/>
<group expand="0" string="Group By...">
<filter string="Account" name="Account" icon="terp-folder-orange" context="{'group_by':'name'}"/>
<filter string="Code" icon="terp-stock_format-scientific" context="{'group_by':'code'}"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<separator orientation="vertical"/>
<filter string="Currencies Rate" icon="terp-dolar" context="{'group_by':'currency_mode'}"/>
<filter string="Internal Type" icon="terp-go-home" context="{'group_by':'type'}"/>
<filter string="Account Type" icon="terp-stock_symbol-selection" context="{'group_by':'user_type'}"/>
<filter string="Parent Account" icon="terp-folder-orange" context="{'group_by':'parent_account_id'}"/>
</group>
<newline/>
<group expand="0" string="Extended options..." groups="base.group_extended">
<field name="parent_account_id" />
<separator orientation="vertical"/>
<field name="type" />
<field name="user_type" widget="selection"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
</search>
</field>
</record>
<record id="action_account_account_report" model="ir.actions.act_window">
<field name="name">Accounts Analysis</field>
<field name="res_model">account.account.report</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="context">{"search_default_Account":1,"search_default_At Date":1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="search_view_id" ref="view_account_account_report_search"/>
</record>
<!-- <menuitem action="action_account_account_report" id="menu_action_account_account_report" parent="account.menu_finance_statistic_report_statement" sequence="6"/>-->
</data>
</openerp>
addons/account/report/account_analytic_report.py
-94
View File
@@ -1,94 +0,0 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
# 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 <http://www.gnu.org/licenses/>.
#
##############################################################################
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()
addons/account/report/account_analytic_report_view.xml
-128
View File
@@ -1,128 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="view_analytic_report_tree" model="ir.ui.view">
<field name="name">analytic.report.tree</field>
<field name="model">analytic.report</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Analytic Accounts Analysis">
<field name="parent_id" invisible="1" string="Analytic Account"/>
<field name="product_id" invisible="1"/>
<field name="name" invisible="1"/>
<field name="partner_id" invisible="1"/>
<field name="journal_id" string="Analytic Journal" invisible="1"/>
<field name="user_id" invisible="1"/>
<field name="date_start" invisible="1"/>
<field name="date_end" invisible="1"/>
<field name="total_quantity" sum=" # Total Quantity"/>
<field name="nbr" sum ="# of Lines"/>
<field name="company_id" invisible="1" groups="base.group_multi_company"/>
<field name="type" invisible="1"/>
<field name="debit" sum ="Debit"/>
<field name="credit" sum ="Credit"/>
<field name="balance" sum ="Balance"/>
<field name="state" invisible="1"/>
<field name="day" invisible="1"/>
<field name="month" invisible="1"/>
<field name="year" invisible="1"/>
</tree>
</field>
</record>
<record id="view_analytic_report_search" model="ir.ui.view">
<field name="name">analytic.report.search</field>
<field name="model">analytic.report</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Analytic Accounts Analysis">
<group>
<filter icon="terp-go-year" string=" 365 Days "
domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
help="Analytic Accounts of last 365 days"/>
<filter icon="terp-go-month" string=" 30 Days "
name="This Month"
domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
help="Analytic Accounts of last 30 days"/>
<filter icon="terp-go-week"
string=" 7 Days "
separator="1"
domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')), ('day','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
help="Analytic Accounts during last 7 days"/>
<separator orientation="vertical"/>
<filter icon="terp-document-new"
string="Draft"
domain="[('state','=','draft')]"/>
<filter icon="terp-camera_test"
string="Open"
domain="[('state','=','open')]"/>
<filter icon="terp-gtk-media-pause"
string="Pending"
domain="[('state','=','pending')]"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="product_id" />
<field name="partner_id"/>
<field name="user_id" widget="selection">
<filter icon="terp-folder-orange"
string="My Accounts"
help="My Account"
domain="[('user_id','=',uid)]"/>
</field>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="10" col="12">
<filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
<filter string="Associated Partner" icon="terp-personal+" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'parent_id'}"/>
<filter string="Analytic Journal" icon="terp-folder-green" context="{'group_by':'journal_id'}"/>
<separator orientation="vertical"/>
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
<filter string="Account Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
<filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
<separator orientation="vertical"/>
<filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
<filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
</group>
<newline/>
<group expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
<field name="date_start"/>
<field name="date_end"/>
<separator orientation="vertical"/>
<field name="state"/>
<field name="parent_id"/>
<field name="journal_id" widget="selection"/>
<field name="type"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
</search>
</field>
</record>
<record id="view_account_analytic_report_search" model="ir.ui.view">
<field name="name">account.analytic.report.graph</field>
<field name="model">analytic.report</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Analytic Accounts Analysis" type="bar">
<field name="user_id"/>
<field name="credit" operator="+"/>
<field name="debit" operator="+"/>
<field name="balance" operator="+"/>
<field name="nbr" operator="+"/>
</graph>
</field>
</record>
<record id="action_analytic_report_all" model="ir.actions.act_window">
<field name="name">Analytic Accounts Analysis</field>
<field name="res_model">analytic.report</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="context">{'search_default_This Month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="search_view_id" ref="view_analytic_report_search"/>
</record>
<!-- <menuitem action="action_analytic_report_all" id="menu_action_analytic_report_all" parent="account.menu_finance_statistic_report_statement" sequence="8"/>-->
</data>
</openerp>
addons/account/security/account_security.xml
+119 -2
View File
@@ -13,6 +13,11 @@
<field name="name">Accounting / Manager</field>
</record>
<record model="res.groups" context="{'noadmin':True}" id="group_accounting_accountant">
<field name="name">Accounting / Accountant and Manager</field>
</record>
<!-- <record id="menu_finance_configuration" model="ir.ui.menu">-->
<!-- <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>-->
<!-- </record>-->
@@ -22,7 +27,7 @@
</record>
<record id="menu_finance_legal_statement" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
<field eval="[(6,0,[ref('group_account_manager'),ref('group_account_user')])]" name="groups_id"/>
</record>
<record id="menu_finance_receivables" model="ir.ui.menu">
@@ -30,7 +35,7 @@
</record>
<record id="menu_finance_payables" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_invoice')])]" name="groups_id"/>
<field eval="[(6,0,[ref('group_account_invoice'), ref('group_account_user')])]" name="groups_id"/>
</record>
<record id="menu_automatic_reconcile" model="ir.ui.menu">
@@ -41,6 +46,118 @@
<field eval="[(6,0,[ref('group_account_user'), ref('group_account_manager')])]" name="groups_id"/>
</record>
<record id="menu_eaction_account_moves_sale" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
</record>
<record id="menu_eaction_account_moves_purchase" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
</record>
<record id="menu_action_invoice_tree1" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_user'),ref('group_account_invoice')])]" name="groups_id"/>
</record>
<record id="menu_action_invoice_tree2" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_user'),ref('group_account_invoice')])]" name="groups_id"/>
</record>
<record id="menu_action_invoice_tree3" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_user'),ref('group_account_invoice')])]" name="groups_id"/>
</record>
<record id="menu_action_invoice_tree4" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_user'),ref('group_account_invoice')])]" name="groups_id"/>
</record>
<record id="menu_finance_bank_and_cash" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
</record>
<record id="menu_action_account_tree2" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
</record>
<record id="menu_finance_entries" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
</record>
<record id="menu_action_move_journal_line_form" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
</record>
<record id="menu_eaction_account_moves_all" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
</record>
<record id="menu_dashboard_acc" model="ir.ui.menu">
<field eval="[(6, 0, [ref('group_account_user')])]" name="groups_id"/>
</record>
<record id="final_accounting_reports" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
</record>
<record id="menu_journals_report" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
</record>
<record id="menu_action_tax_code_tree" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
</record>
<record id="menu_action_analytic_account_tree2" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
</record>
<record id="menu_finance_periodical_processing" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
</record>
<record id="menu_general_ledger" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
</record>
<record id="menu_general_Balance_report" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
</record>
<record id="menu_account_bs_report" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
</record>
<record id="menu_account_pl_report" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
</record>
<record id="menu_tax_report" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
</record>
<record id="next_id_22" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
</record>
<record id="next_id_40" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
</record>
<record id="menu_action_account_invoice_report_all" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
</record>
<record id="menu_action_account_entries_report_all" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_user')])]" name="groups_id"/>
</record>
<record id="menu_finance_statistic_report_statement" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_invoice')])]" name="groups_id"/>
</record>
<record id="menu_action_account_invoice_report_all" model="ir.ui.menu">
<field eval="[(6,0,[ref('group_account_invoice')])]" name="groups_id"/>
</record>
<record id="account_move_comp_rule" model="ir.rule">
<field name="name">Account Entry</field>
<field ref="model_account_move" name="model_id"/>
addons/account/security/ir.model.access.csv
+48 -2
View File
@@ -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
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
88 access_report_account_type_sales report.account_type.sales model_report_account_type_sales account.group_account_manager 1 0 0 0
89 access_report_account_sales report.account.sales model_report_account_sales account.group_account_manager 1 0 0 0
90 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
91 access_res_partner_group_account_manager res_partner group_account_manager model_res_partner account.group_account_manager 1 1 1 1
92 access_account_invoice_accountant account.invoice accountant model_account_invoice account.group_account_user 1 0 0 0
93 access_account_tax_code_accountant account.tax.code accountant model_account_tax_code account.group_account_user 1 1 1 1
148 access_account_invoice_line_accountant account.invoice.line accountant model_account_invoice_line account.group_account_user 1 0 0 0
149 access_res_partner_address_accountant res.partner.address accountant base.model_res_partner_address account.group_account_user 1 0 0 0
150 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
151 access_account_account_invoice account.account invoice model_account_account account.group_account_invoice 1 1 1 1
152 access_res_partner_address_invoice res.partner.address invoice base.model_res_partner_address account.group_account_invoice 1 1 1 1
153 access_account_invoice_line_system account.invoice.line system model_account_invoice_line base.group_system 1 0 0 0
156 access_report_account_receivable_invoice report.account.receivable.invoice model_report_account_receivable account.group_account_invoice 1 1 1 1
157 access_report_account_receivable_user report.account.receivable.user model_report_account_receivable account.group_account_user 1 1 1 1
158 access_account_sequence_fiscal_year_invoice account.sequence.fiscalyear invoice model_account_sequence_fiscalyear account.group_account_invoice 1 1 1 1
159 access_account_invoice_report account.invoice.report model_account_invoice_report account.group_account_invoice 1 0 0 0
160 access_account_invoice account.invoice model_account_invoice account.group_accounting_accountant 1 1 1 1
161 access_account_invoice_line account.invoice.line model_account_invoice_line account.group_accounting_accountant 1 1 1 1
162 access_res_partner res.partner base.model_res_partner account.group_accounting_accountant 1 1 1 1
163 access_account_account account.account model_account_account account.group_accounting_accountant 1 0 0 0
164 access_account_account_type account.type model_account_account_type account.group_accounting_accountant 1 0 0 0
165 access_account_tax account.tax model_account_tax account.group_accounting_accountant 1 0 0 0
166 access_account_tax_code account.tax.code model_account_tax_code account.group_accounting_accountant 1 0 0 0
167 access_account_invoice_tax account.invoice.tax model_account_invoice_tax account.group_accounting_accountant 1 0 0 0
168 access_res_partner_address res.partner.address base.model_res_partner_address account.group_accounting_accountant 1 1 1 1
169 access_account_move account.move model_account_move account.group_accounting_accountant 1 1 1 1
170 access_account_move_line account.move.line model_account_move_line account.group_accounting_accountant 1 1 1 1
171 access_res_partner_bank res.partner.bank base.model_res_partner_bank account.group_accounting_accountant 1 0 0 0
172 access_res_partner_event res.partner.event base.model_res_partner_event account.group_accounting_accountant 1 0 0 0
173 access_res_currency_rate res.currency.rate base.model_res_currency_rate account.group_accounting_accountant 1 1 0 0
174 access_res_currency res.currency base.model_res_currency account.group_accounting_accountant 1 1 0 0
175 access_product_template product.template product.model_product_template account.group_accounting_accountant 1 0 0 0
176 access_product_product product.product product.model_product_product account.group_accounting_accountant 1 0 0 0
177 access_product_category product.category product.model_product_category account.group_accounting_accountant 1 0 0 0
178 access_product_pricelist product.pricelist product.model_product_pricelist account.group_accounting_accountant 1 0 0 0
179 access_product_pricelist_version product.pricelist.version product.model_product_pricelist_version account.group_accounting_accountant 1 0 0 0
180 access_product_pricelist_item product.pricelist.item product.model_product_pricelist_item account.group_accounting_accountant 1 0 0 0
181 access_account_payment_term account.payment.term model_account_payment_term account.group_accounting_accountant 1 0 0 0
182 access_res_payterm res.payterm base.model_res_payterm account.group_accounting_accountant 1 0 0 0
183 access_account_payment_term_line account.payment.term.line model_account_payment_term_line account.group_accounting_accountant 1 0 0 0
184 access_account_journal account.journal model_account_journal account.group_accounting_accountant 1 0 0 0
185 access_account_fiscalyear account.fiscalyear model_account_fiscalyear account.group_accounting_accountant 1 0 0 0
186 access_account_period account.period model_account_period account.group_accounting_accountant 1 0 0 0
187 access_account_move_reconcile account.move.reconcile model_account_move_reconcile account.group_accounting_accountant 1 1 1 1
188 access_account_tax_code account.tax.code model_account_tax_code account.group_accounting_accountant 1 0 0 0
189 access_account_bank_statement account.bank.statement model_account_bank_statement account.group_accounting_accountant 1 1 1 1
190 access_account_cashbox_line account.cashbox.line model_account_cashbox_line account.group_accounting_accountant 1 1 1 1
191 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
192 access_account_bank_statement_line account.bank.statement.line model_account_bank_statement_line account.group_accounting_accountant 1 1 1 1
193 access_account_invoice_report account.invoice.report model_account_invoice_report account.group_accounting_accountant 1 0 0 0
194 access_report_account_receivable report.account.receivable model_report_account_receivable account.group_accounting_accountant 1 0 0 0
195 access_temp_range temp.range model_temp_range account.group_accounting_accountant 1 0 0 0
196 access_report_aged_receivable report.aged.receivable model_report_aged_receivable account.group_accounting_accountant 1 0 0 0
197 access_report_invoice_created report.invoice.created model_report_invoice_created account.group_accounting_accountant 1 0 0 0
198 access_account_entries_report account.entries.report model_account_entries_report account.group_accounting_accountant 1 0 0 0
199 access_account_invoice_report account.invoice.report model_account_invoice_report account.group_accounting_accountant 1 0 0 0
200 access_account_journal_view account.journal.view model_account_journal_view account.group_accounting_accountant 1 0 0 0
201 access_account_journal_period account.journal.period model_account_journal_period account.group_accounting_accountant 1 1 1 1
202 access_account_journal_column account.journal.column model_account_journal_column account.group_accounting_accountant 1 1 1 1
203 access_account_analytic_account account.analytic.account analytic.model_account_analytic_account account.group_accounting_accountant 1 0 0 0
204 access_account_analytic_line account.analytic.line analytic.model_account_analytic_line account.group_accounting_accountant 1 0 0 0
205 access_account_analytic_journal account.analytic.journal model_account_analytic_journal account.group_accounting_accountant 1 0 0 0
206 access_account_bank_statement_reconcile account.bank.statement.reconcile model_account_bank_statement_reconcile account.group_accounting_accountant 1 1 1 1
addons/account/wizard/account_change_currency.py
+9 -3
View File
@@ -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:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/account/wizard/account_report_common.py
+1 -1
View File
@@ -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]
addons/account_accountant/__openerp__.py
+1 -1
View File
@@ -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',
addons/account_accountant/account_security.xml
+37 -60
View File
@@ -1,152 +1,129 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="account.menu_action_analytic_account_tree2" model="ir.ui.menu">
<field eval="[(4,ref('account.group_account_user'))]" name="groups_id"/>
</record>
<record id="account.menu_finance_periodical_processing" model="ir.ui.menu">
<field eval="[(4,ref('account.group_account_user'))]" name="groups_id"/>
</record>
<record id="account.menu_account_bs_report" model="ir.ui.menu">
<field eval="[(4,ref('account.group_account_user'))]" name="groups_id"/>
</record>
<record id="account.menu_account_pl_report" model="ir.ui.menu">
<field eval="[(4,ref('account.group_account_user'))]" name="groups_id"/>
</record>
<record id="account.menu_tax_report" model="ir.ui.menu">
<field eval="[(4,ref('account.group_account_user'))]" name="groups_id"/>
</record>
<record id="account.next_id_40" model="ir.ui.menu">
<field eval="[(4,ref('account.group_account_user'))]" name="groups_id"/>
</record>
<!--
Users Groups
-->
<record model="res.groups" id="group_accounting_accountant">
<field name="name">Accounting / Accountant and Manager</field>
</record>
<record id="account.menu_eaction_account_moves_sale" model="ir.ui.menu">
<field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
<field eval="[(4,ref('account.group_accounting_accountant'))]" name="groups_id"/>
</record>
<record id="account.menu_eaction_account_moves_purchase" model="ir.ui.menu">
<field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
<field eval="[(4,ref('account.group_accounting_accountant'))]" name="groups_id"/>
</record>
<record id="account.menu_finance_receivables" model="ir.ui.menu">
<field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
<field eval="[(4,ref('account.group_accounting_accountant'))]" name="groups_id"/>
</record>
<record id="account.menu_finance_payables" model="ir.ui.menu">
<field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
<field eval="[(4,ref('account.group_accounting_accountant'))]" name="groups_id"/>
</record>
<record id="account.menu_action_invoice_tree1" model="ir.ui.menu">
<field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
<field eval="[(4,ref('account.group_accounting_accountant'))]" name="groups_id"/>
</record>
<record id="account.menu_action_invoice_tree2" model="ir.ui.menu">
<field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
<field eval="[(4,ref('account.group_accounting_accountant'))]" name="groups_id"/>
</record>
<record id="account.menu_action_invoice_tree3" model="ir.ui.menu">
<field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
<field eval="[(4,ref('account.group_accounting_accountant'))]" name="groups_id"/>
</record>
<record id="account.menu_action_invoice_tree4" model="ir.ui.menu">
<field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
<field eval="[(4,ref('account.group_accounting_accountant'))]" name="groups_id"/>
</record>
<record id="account.menu_finance_bank_and_cash" model="ir.ui.menu">
<field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
<field eval="[(4,ref('account.group_accounting_accountant'))]" name="groups_id"/>
</record>
<record id="account.menu_finance_charts" model="ir.ui.menu">
<field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
<field eval="[(4,ref('account.group_accounting_accountant'))]" name="groups_id"/>
</record>
<record id="account.menu_action_account_tree2" model="ir.ui.menu">
<field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
<field eval="[(4,ref('account.group_accounting_accountant'))]" name="groups_id"/>
</record>
<record id="account.menu_action_tax_code_tree" model="ir.ui.menu">
<field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
<field eval="[(4,ref('account.group_accounting_accountant'))]" name="groups_id"/>
</record>
<record id="account.menu_finance_entries" model="ir.ui.menu">
<field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
<field eval="[(4,ref('account.group_accounting_accountant'))]" name="groups_id"/>
</record>
<record id="account.menu_action_move_journal_line_form" model="ir.ui.menu">
<field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
<field eval="[(4,ref('account.group_accounting_accountant'))]" name="groups_id"/>
</record>
<record id="account.menu_eaction_account_moves_all" model="ir.ui.menu">
<field eval="[(4,ref('account.group_accounting_accountant'))]" name="groups_id"/>
</record>
<record id="account.menu_finance_reporting" model="ir.ui.menu">
<field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
<field eval="[(4,ref('account.group_accounting_accountant'))]" name="groups_id"/>
</record>
<record id="account.menu_dashboard_acc" model="ir.ui.menu">
<field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
<field eval="[(4,ref('account.group_accounting_accountant'))]" name="groups_id"/>
</record>
<record id="account.menu_board_account" model="ir.ui.menu">
<field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
<field eval="[(4,ref('account.group_accounting_accountant'))]" name="groups_id"/>
</record>
<record id="account.menu_finance_legal_statement" model="ir.ui.menu">
<field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
<field eval="[(4,ref('account.group_accounting_accountant'))]" name="groups_id"/>
</record>
<record id="account.final_accounting_reports" model="ir.ui.menu">
<field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
<field eval="[(4,ref('account.group_accounting_accountant'))]" name="groups_id"/>
</record>
<record id="account.menu_general_ledger" model="ir.ui.menu">
<field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
<field eval="[(4,ref('account.group_accounting_accountant'))]" name="groups_id"/>
</record>
<record id="account.menu_general_Balance_report" model="ir.ui.menu">
<field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
<field eval="[(4,ref('account.group_accounting_accountant'))]" name="groups_id"/>
</record>
<record id="account.menu_tax_report" model="ir.ui.menu">
<field eval="[(4,ref('account.group_accounting_accountant'))]" name="groups_id"/>
</record>
<record id="account.menu_journals_report" model="ir.ui.menu">
<field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
<field eval="[(4,ref('account.group_accounting_accountant'))]" name="groups_id"/>
</record>
<record id="account.menu_finance_generic_reporting" model="ir.ui.menu">
<field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
<field eval="[(4,ref('account.group_accounting_accountant'))]" name="groups_id"/>
</record>
<record id="account.next_id_22" model="ir.ui.menu">
<field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
<field eval="[(4,ref('account.group_accounting_accountant'))]" name="groups_id"/>
</record>
<record id="account.menu_action_account_journal_period_tree" model="ir.ui.menu">
<field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
<field eval="[(4,ref('account.group_accounting_accountant'))]" name="groups_id"/>
</record>
<record id="account.menu_finance_statistic_report_statement" model="ir.ui.menu">
<field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
<field eval="[(4,ref('account.group_accounting_accountant'))]" name="groups_id"/>
</record>
<record id="account.menu_action_account_invoice_report_all" model="ir.ui.menu">
<field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
<field eval="[(4,ref('account.group_accounting_accountant'))]" name="groups_id"/>
</record>
<record id="account.menu_action_account_entries_report_all" model="ir.ui.menu">
<field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
<field eval="[(4,ref('account.group_accounting_accountant'))]" name="groups_id"/>
</record>
<record id="account.menu_action_account_account_report" model="ir.ui.menu">
<field eval="[(4,ref('group_accounting_accountant'))]" name="groups_id"/>
<field eval="[(4,ref('account.group_accounting_accountant'))]" name="groups_id"/>
</record>
</data>
addons/account_analytic_analysis/i18n/bg.po
+2 -2
View File
@@ -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) <fp@tinyerp.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_analysis
addons/account_analytic_analysis/i18n/fi.po
+2 -2
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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 <Unknown>\n"
"Language-Team: Finnish <fi@li.org>\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
addons/account_analytic_analysis/i18n/lt.po
+2 -2
View File
@@ -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 <Unknown>\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
addons/account_analytic_analysis/i18n/tr.po
+2 -2
View File
@@ -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) <fp@tinyerp.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_analysis
addons/account_analytic_default/i18n/lt.po
+2 -2
View File
@@ -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 <Unknown>\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
addons/account_analytic_default/i18n/nb.po
+113
View File
@@ -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 <EMAIL@ADDRESS>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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 <EMAIL@ADDRESS>\n"
"Language-Team: Norwegian Bokmal <nb@li.org>\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"
addons/account_analytic_default/i18n/tr.po
+2 -2
View File
@@ -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) <fp@tinyerp.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:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_default
addons/account_analytic_plans/i18n/it.po
+2 -2
View File
@@ -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 <lorenzo.battistini@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
addons/account_analytic_plans/i18n/lt.po
+2 -2
View File
@@ -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) <fp@tinyerp.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
addons/account_analytic_plans/i18n/tr.po
+2 -2
View File
@@ -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) <fp@tinyerp.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:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
addons/account_budget/i18n/lt.po
+2 -2
View File
@@ -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) <fp@tinyerp.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: account_budget
addons/account_budget/i18n/tr.po
+2 -2
View File
@@ -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 <Unknown>\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
addons/account_cancel/account_cancel_view.xml
-1
View File
@@ -8,7 +8,6 @@
<field name="inherit_id" ref="account.view_account_journal_form"/>
<field name="arch" type="xml">
<field name="entry_posted" position="after">
<!-- <xpath expr="/form/notebook/page[@string='General Information']/group/group/field[@name='centralisation']" position="after">-->
<field name="update_posted"/>
</field>
</field>
addons/account_coda/account_coda.py
+3 -2
View File
@@ -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:
addons/account_coda/i18n/ar.po
+2 -2
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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 <bamuhrez@gmail.com>\n"
"Language-Team: Arabic <ar@li.org>\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
addons/account_coda/wizard/account_coda_import.py
+34 -35
View File
@@ -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:
addons/account_followup/__init__.py
-1
View File
@@ -20,7 +20,6 @@
##############################################################################
import account_followup
import account_followup_report
import wizard
import report
addons/account_followup/__openerp__.py
+2 -2
View File
@@ -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',
addons/account_followup/account_followup_view.xml
+1 -1
View File
@@ -87,7 +87,7 @@
</record>
<menuitem action="action_account_followup_definition_form" id="account_followup_menu" parent="account.menu_finance_configuration" groups="base.group_system"/>
<report auto="False" id="account_followup_followup_report" menu="False" model="account_followup.followup" name="account_followup.followup.print" rml="account_followup/report/rappel.rml" string="Followup Report"/>
<report auto="False" id="account_followup_followup_report" menu="False" model="account_followup.followup" name="account_followup.followup.print" rml="account_followup/report/report_followp_print.rml" string="Followup Report"/>
<record id="account_move_line_partner_tree" model="ir.ui.view">
<field name="name">account.move.line.partner.tree</field>
addons/account_followup/i18n/lt.po
+2 -2
View File
@@ -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) <fp@tinyerp.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:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
addons/account_followup/i18n/tr.po
+2 -2
View File
@@ -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) <fp@tinyerp.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:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
addons/account_followup/report/__init__.py
+3 -2
View File
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@@ -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 <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import report_followup_print
import account_followup_report
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/account_followup/account_followup_report.py → addons/account_followup/report/account_followup_report.py
+3 -7
View File
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
@@ -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 <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@@ -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:
addons/account_followup/account_followup_report.xml → addons/account_followup/report/account_followup_report.xml
View File
addons/account_followup/report/rappel.rml → addons/account_followup/report/report_followp_print.rml
View File
addons/account_followup/report/report_followup_print.py
+1 -1
View File
@@ -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:
addons/account_followup/wizard/account_followup_print.py
+1
View File
@@ -18,6 +18,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import datetime
import time
addons/account_invoice_layout/i18n/lt.po
+2 -2
View File
@@ -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 <Unknown>\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
addons/account_invoice_layout/i18n/tr.po
+2 -2
View File
@@ -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) <fp@tinyerp.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:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
addons/account_payment/i18n/lt.po
+2 -2
View File
@@ -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 <Unknown>\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
addons/account_payment/i18n/tr.po
+2 -2
View File
@@ -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) <fp@tinyerp.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:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
addons/account_report/i18n/lt.po
+2 -2
View File
@@ -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) <fp@tinyerp.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: account_report
addons/account_report/i18n/tr.po
+2 -2
View File
@@ -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) <fp@tinyerp.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: account_report
addons/account_reporting/i18n/lt.po
+2 -2
View File
@@ -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) <fp@tinyerp.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: account_reporting
addons/account_reporting/i18n/tr.po
+2 -2
View File
@@ -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) <fp@tinyerp.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: account_reporting
addons/account_tax_include/account_tax_include.py
+4 -3
View File
@@ -18,6 +18,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
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()
addons/account_tax_include/i18n/tr.po
+2 -2
View File
@@ -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) <fp@tinyerp.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_tax_include
addons/account_voucher/i18n/lt.po
+2 -2
View File
@@ -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) <fp@tinyerp.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: account_voucher
addons/account_voucher/i18n/tr.po
+2 -2
View File
@@ -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) <fp@tinyerp.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: account_voucher
addons/account_voucher/voucher.py
+29 -22
View File
@@ -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)
addons/account_voucher/voucher_view.xml
+15 -9
View File
@@ -10,13 +10,16 @@
<field name="date"/>
<field name="number"/>
<field name="reference"/>
<field name="name"/>
<field name="partner_id"/>
<field name="journal_id"/>
<field name="type" invisible=" not context.get('set_visible',True)"/>
<field name="account_id" />
<field name="account_id"/>
<field name="amount" sum="Total Amount"/>
<field name="period_id"/>
<field name="state"/>
<button name="proforma_voucher" string="Create" states="draft" icon="terp-document-new"/>
<button name="recheck_voucher" string="Approve" states="recheck" icon="terp-check"/>
<button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
</tree>
</field>
</record>
@@ -28,23 +31,24 @@
<field name="arch" type="xml">
<form string="Accounting Voucher">
<group col="6" colspan="4">
<field name="name" colspan="4"/>
<field name="partner_id"/>
<field name="name"/>
<field name="number"/>
<field name="journal_id" select="1" on_change="onchange_journal(journal_id,type)"/>
<field name="account_id" on_change="onchange_account(account_id)"/>
<field name="type" on_change="onchange_journal(journal_id,type)"/>
</group>
<notebook colspan="4">
<page string="Voucher Entry">
<field name="payment_ids" colspan="4" nolabel="1" height="180">
<tree string="Voucher Lines" editable="top">
<field name="partner_id" on_change="onchange_partner(partner_id,type,parent.type, parent.currency_id)"/>
<field name="name" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
<field name="account_id"/>
<field name="name"/>
<field name="type" on_change="onchange_type(partner_id,type,parent.type, parent.currency_id)"/>
<field name="type" on_change="onchange_type(parent.partner_id,type,parent.type, parent.currency_id)"/>
<field name="amount"/>
<field name="account_analytic_id"/>
<field name="ref"/>
<field name="account_analytic_id"/>
</tree>
</field>
<group col="2" colspan="3">
@@ -55,7 +59,7 @@
<separator string="Other Information" colspan="2"/>
<field name="reference" select="1"/>
<field name="date" select="1" on_change="onchange_date(date)"/>
<field name="currency_id" select="1"/>
<field name="currency_id" select="1" attrs="{'readonly':[('type','in',['sale', 'purchase'])]}"/>
</group>
</page>
<page string="Journal Items">
@@ -75,7 +79,7 @@
<button name="recheck_voucher" string="Approve" states="recheck" icon="terp-check"/>
<!-- <button name="audit_complete" string="Audit Pass" states="posted" icon="terp-check"/>-->
<button name="cancel_voucher" string="Cancel" states="draft,proforma,recheck" icon="gtk-cancel"/>
<button name="cancel_to_draft" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
<button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
</group>
</form>
</field>
@@ -107,6 +111,7 @@
</group>
<newline/>
<group expand="0" string="Group By..." col='8' colspan='4'>
<filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
<filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type', 'set_visible':True}"/>
@@ -147,6 +152,7 @@
</group>
<newline/>
<group expand="0" string="Group By..." colspan="12" col="10">
<filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
<filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type', 'set_visible':True}"/>
addons/account_voucher/voucher_workflow.xml
+1
View File
@@ -40,6 +40,7 @@
<record id="act_cancel" model="workflow.activity">
<field name="wkf_id" ref="wkf"/>
<field name="name">cancel</field>
<field name="flow_stop">True</field>
<field name="action">cancel_voucher()</field>
<field name="kind">function</field>
</record>
addons/account_voucher_payment/account_voucher_payment.py
+40 -27
View File
@@ -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
addons/account_voucher_payment/account_voucher_payment_view.xml
+7 -8
View File
@@ -8,16 +8,15 @@
<field name="inherit_id" ref="account_voucher.view_voucher_form"/>
<field name="arch" type="xml">
<field name="payment_ids" position="replace">
<field name="voucher_line_ids" default_get="{'lines': voucher_line_ids}" colspan="4" nolabel="1" height="200">
<field name="voucher_line_ids" colspan="4" nolabel="1" height="200">
<tree string="Voucher Lines" editable="top">
<field name="partner_id" on_change="onchange_partner(partner_id, type, parent.type, parent.currency_id)"/>
<field name="account_id" on_change="onchange_line_account(account_id, type, parent.type)"/>
<field name="name"/>
<field name="invoice_id" context="{'ttype':parent.type}" on_change="onchange_invoice_id(invoice_id, parent.currency_id)" domain="[('partner_id','=',partner_id),('state','=','open'),('residual','&gt;',0.0)]"/>
<field name="type" on_change="onchange_type(partner_id,type,parent.type, parent.currency_id)"/>
<field name="name" on_change="onchange_partner(parent.partner_id,type,parent.type, parent.currency_id)"/>
<field name="account_id"/>
<field name="type" on_change="onchange_type(parent.partner_id,type,parent.type, parent.currency_id)"/>
<field name="move_id" context="{'ttype':parent.type, 'partner_id':parent.partner_id, 'voucher':True}" on_change="onchange_invoice_id(move_id, parent.currency_id)" domain="[('state','=','posted'), ('partner_id','=',parent.partner_id)]"/>
<field name="amount"/>
<field name="account_analytic_id"/>
<field name="ref"/>
<field name="account_analytic_id"/>
</tree>
</field>
</field>
@@ -54,7 +53,7 @@
<field name="type">form</field>
<field name="inherit_id" ref="view_voucher_form"/>
<field name="arch" type="xml">
<button name="cancel_to_draft" position="before">
<button name="action_cancel_draft" position="before">
<button name="%(action_view_account_voucher_unreconcile)d" string="Unreconcile" type="action" states="posted" icon="terp-stock_effects-object-colorize"/>
</button>
</field>
addons/account_voucher_payment/wizard/account_voucher_unreconcile.py
+3 -2
View File
@@ -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 {}
addons/analytic_journal_billing_rate/i18n/tr.po
+2 -2
View File
@@ -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) <fp@tinyerp.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: analytic_journal_billing_rate
addons/analytic_user_function/i18n/tr.po
+2 -2
View File
@@ -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) <fp@tinyerp.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: analytic_user_function
addons/auction/board_auction_view.xml
+2
View File
@@ -111,6 +111,8 @@
action="open_board_auction"
sequence="1"
id="menu_board_auction_open" icon="terp-graph" parent="menu_board_auction"/>
<menuitem name="Auction Management" id="auction.auction_menu_root" icon="terp-purchase" sequence="26" groups="base.group_system" action="open_board_auction"/>
</data>
</openerp>
addons/auction/i18n/lt.po
+2 -2
View File
@@ -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) <fp@tinyerp.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: auction
addons/auction/i18n/nl.po
+2 -2
View File
@@ -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 <Unknown>\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
addons/auction/i18n/tr.po
+2 -2
View File
@@ -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 <Unknown>\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
addons/audittrail/i18n/lt.po
+2 -2
View File
@@ -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 <Unknown>\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
addons/audittrail/i18n/tr.po
+2 -2
View File
@@ -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) <fp@tinyerp.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: audittrail
addons/audittrail/i18n/zh_CN.po
+2 -2
View File
@@ -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 <onetimespeed@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: audittrail
addons/base_contact/i18n/lt.po
+2 -2
View File
@@ -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 <giedrius.slavinskas@gmail.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:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: lt\n"
addons/base_contact/i18n/tr.po
+2 -2
View File
@@ -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 <Unknown>\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
addons/base_contact/i18n/zh_CN.po
+2 -2
View File
@@ -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 <onetimespeed@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:19+0000\n"
"X-Launchpad-Export-Date: 2010-08-16 06:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_contact
addons/base_iban/i18n/tr.po
+2 -2
View File
@@ -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) <fp@tinyerp.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: base_iban
addons/base_module_quality/i18n/tr.po
+2 -2
View File
@@ -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) <fp@tinyerp.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: base_module_quality
addons/base_module_record/i18n/tr.po
+2 -2
View File
@@ -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 <Unknown>\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
addons/base_report_creator/i18n/tr.po
+2 -2
View File
@@ -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) <fp@tinyerp.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: base_report_creator
addons/base_report_designer/i18n/tr.po
+2 -2
View File
@@ -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 <Unknown>\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
addons/base_setup/i18n/tr.po
+2 -2
View File
@@ -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 <Unknown>\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
addons/base_setup/installer.py
+1
View File
@@ -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
addons/base_vat/i18n/tr.po
+2 -2
View File
@@ -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) <fp@tinyerp.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:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_vat
addons/board/i18n/tr.po
+2 -2
View File
@@ -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 <Unknown>\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
addons/crm/board_crm_view.xml
+1
View File
@@ -158,5 +158,6 @@
action="open_board_crm"
sequence="1"
id="menu_board_crm" icon="terp-graph"/>
<menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman,base.group_sale_manager,base.group_system,base.group_partner_manager" action="open_board_crm"/>
</data>
</openerp>
addons/crm/i18n/fi.po
+2 -2
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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 <Unknown>\n"
"Language-Team: Finnish <fi@li.org>\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
addons/crm/i18n/hr.po
+2 -2
View File
@@ -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 <Unknown>\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"

Some files were not shown because too many files have changed in this diff Show More