odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[Merge] 

bzr revid: vir@tinyerp.com-20100802053842-nbs7j7jz2yvm52g2
This commit is contained in:
Vir (Open ERP) 2010-08-02 11:08:42 +05:30
parent c293ecd45d ef0a3c9563
commit df1548eb54
96 changed files with 1147 additions and 920 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
addons/account/account.py
View File

@ -629,8 +629,8 @@ class account_journal(osv.osv):
'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'),
'entry_posted': fields.boolean('Skip \'Draft\' State for Created Entries', help='Check this box if you don\'t want new account moves to pass through the \'draft\' state and instead goes directly to the \'posted state\' without any manual validation.'),
'company_id': fields.many2one('res.company', 'Company', required=True, select=1, help="Company related to this journal"),
# 'invoice_sequence_id': fields.many2one('ir.sequence', 'Invoice Sequence', \
# help="The sequence used for invoice numbers in this journal."),
'invoice_sequence_id': fields.many2one('ir.sequence', 'Invoice Sequence', \
help="The sequence used for invoice numbers in this journal."),
'allow_date':fields.boolean('Check Date not in the Period', help= 'If set to True then do not accept the entry if the entry date is not into the period dates'),
}
@ -695,13 +695,13 @@ class account_journal(osv.osv):
'sequence_id':seq_id
})
# if journal.type in journal_type and not journal.invoice_sequence_id:
# res_ids = date_pool.search(cr, uid, [('model','=','ir.sequence'), ('name','=',journal_seq.get(journal.type, 'sale'))])
# inv_seq_id = date_pool.browse(cr, uid, res_ids[0]).res_id
# inv_seq_id
# res.update({
# 'invoice_sequence_id':inv_seq_id
# })
if journal.type in journal_type and not journal.invoice_sequence_id:
res_ids = date_pool.search(cr, uid, [('model','=','ir.sequence'), ('name','=',journal_seq.get(journal.type, 'sale'))])
inv_seq_id = date_pool.browse(cr, uid, res_ids[0]).res_id
inv_seq_id
res.update({
'invoice_sequence_id':inv_seq_id
})
result = self.write(cr, uid, [journal.id], res)
@ -1620,13 +1620,41 @@ class account_tax(osv.osv):
'type_tax_use': fields.selection([('sale','Sale'),('purchase','Purchase'),('all','All')], 'Tax Application', required=True)
}
def search(self, cr, uid, args, offset=0, limit=None, order=None,
context=None, count=False):
def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
"""
Returns a list of tupples containing id, name, as internally it is called {def name_get}
result format : {[(id, name), (id, name), ...]}
@param cr: A database cursor
@param user: ID of the user currently logged in
@param name: name to search
@param args: other arguments
@param operator: default operator is 'ilike', it can be changed
@param context: context arguments, like lang, time zone
@param limit: Returns first 'n' ids of complete result, default is 80.
@return: Returns a list of tupples containing id and name
"""
if not args:
args=[]
if not context:
context={}
ids = []
ids = self.search(cr, user, args, limit=limit, context=context)
return self.name_get(cr, user, ids, context=context)
def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
if context and context.has_key('type'):
if context['type'] in ('out_invoice','out_refund'):
args.append(('type_tax_use','in',['sale','all']))
elif context['type'] in ('in_invoice','in_refund'):
args.append(('type_tax_use','in',['purchase','all']))
if context.get('type') in ('out_invoice','out_refund'):
args += [('type_tax_use','in',['sale','all'])]
elif context.get('type') in ('in_invoice','in_refund'):
args += [('type_tax_use','in',['purchase','all'])]
if context and context.has_key('journal_id'):
args += [('type_tax_use','in',[context.get('journal_id'),'all'])]
return super(account_tax, self).search(cr, uid, args, offset, limit, order, context, count)
def name_get(self, cr, uid, ids, context={}):
@ -1643,6 +1671,7 @@ class account_tax(osv.osv):
if user.company_id:
return user.company_id.id
return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
_defaults = {
'python_compute': lambda *a: '''# price_unit\n# address : res.partner.address object or False\n# product : product.product object or None\n# partner : res.partner object or None\n\nresult = price_unit * 0.10''',
'python_compute_inv': lambda *a: '''# price_unit\n# address : res.partner.address object or False\n# product : product.product object or False\n\nresult = price_unit * 0.10''',

15
addons/account/account_bank_statement.py
View File

@ -49,9 +49,16 @@ class account_bank_statement(osv.osv):
}
def _default_journal_id(self, cr, uid, context={}):
if context.get('journal_id', False):
return context['journal_id']
return False
journal_pool = self.pool.get('account.journal')
journal_type = context.get('journal_type', False)
journal_id = False
if journal_type:
ids = journal_pool.search(cr, uid, [('type', '=', journal_type)])
if ids:
journal_id = ids[0]
return journal_id
def _default_balance_start(self, cr, uid, context={}):
cr.execute('select id from account_bank_statement where journal_id=%s order by date desc limit 1', (1,))
@ -128,7 +135,7 @@ class account_bank_statement(osv.osv):
'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', '=', 'cash')]),
states={'confirm': [('readonly', True)]}, domain=[('type', '=', 'bank')]),
'period_id': fields.many2one('account.period', 'Period', required=True,
states={'confirm':[('readonly', True)]}),
'balance_start': fields.float('Starting Balance', digits_compute=dp.get_precision('Account'),

58
addons/account/account_cash_statement.py
View File

@ -118,18 +118,18 @@ class account_cash_statement(osv.osv):
res2[statement.id]=encoding_total
return res2
def _default_journal_id(self, cr, uid, context={}):
# def _default_journal_id(self, cr, uid, context={}):
""" To get default journal for the object"
@param name: Names of fields.
@return: journal
"""
company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
journal = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', company_id)])
if journal:
return journal[0]
else:
return False
# """ To get default journal for the object"
# @param name: Names of fields.
# @return: journal
# """
# company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
# journal = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', company_id)])
# if journal:
# return journal[0]
# else:
# return False
def _end_balance(self, cursor, user, ids, name, attr, context=None):
res_currency_obj = self.pool.get('res.currency')
@ -174,7 +174,7 @@ class account_cash_statement(osv.osv):
return company_id
def _get_cash_box_lines(self, cr, uid, ids, context={}):
def _get_cash_open_box_lines(self, cr, uid, ids, context={}):
res = []
curr = [1, 2, 5, 10, 20, 50, 100, 500]
for rs in curr:
@ -182,12 +182,23 @@ class account_cash_statement(osv.osv):
'pieces':rs,
'number':0
}
res.append((0,0,dct))
res.append(dct)
return res
def _get_cash_close_box_lines(self, cr, uid, ids, context={}):
res = []
curr = [1, 2, 5, 10, 20, 50, 100, 500]
for rs in curr:
dct = {
'pieces':rs,
'number':0
}
res.append((0, 0, dct))
return res
_columns = {
'company_id':fields.many2one('res.company', 'Company', required=False),
'journal_id': fields.many2one('account.journal', 'Journal', required=True),
'journal_id': fields.many2one('account.journal', 'Journal', required=True, domain=[('type', '=', 'cash')]),
'balance_end_real': fields.float('Closing Balance', digits_compute=dp.get_precision('Account'), states={'confirm':[('readonly', True)]}, help="closing balance entered by the cashbox verifier"),
'state': fields.selection(
[('draft', 'Draft'),
@ -206,11 +217,10 @@ class account_cash_statement(osv.osv):
'state': lambda *a: 'draft',
'name': lambda *a: '/',
'date': lambda *a:time.strftime("%Y-%m-%d %H:%M:%S"),
'journal_id': _default_journal_id,
'user_id': lambda self, cr, uid, context=None: uid,
'company_id': _get_company,
'starting_details_ids':_get_cash_box_lines,
'ending_details_ids':_get_cash_box_lines
'starting_details_ids':_get_cash_open_box_lines,
'ending_details_ids':_get_cash_open_box_lines
}
def create(self, cr, uid, vals, context=None):
@ -224,7 +234,19 @@ class account_cash_statement(osv.osv):
open_jrnl = self.search(cr, uid, sql)
if open_jrnl:
raise osv.except_osv('Error', _('You can not have two open register for the same journal'))
if self.pool.get('account.journal').browse(cr, uid, vals['journal_id']).type == 'cash':
lines = end_lines = self._get_cash_close_box_lines(cr, uid, [], context)
vals.update({
'ending_details_ids':lines
})
else:
vals.update({
'ending_details_ids':False,
'starting_details_ids':False
})
res_id = super(account_cash_statement, self).create(cr, uid, vals, context=context)
self.write(cr, uid, [res_id], {})
return res_id
def write(self, cr, uid, ids, vals, context=None):

4
addons/account/account_invoice_view.xml
View File

@ -138,7 +138,7 @@
<button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
<button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="gtk-ok"/>
<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="terp-gtk-stop"/>
<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
<button name="%(action_account_invoice_refund)d" type='action' string='Credit Note' states='open,paid' icon="gtk-execute"/>
</tree>
@ -216,7 +216,7 @@
<button name="%(action_account_invoice_refund)d" type='action' string='Credit Note' states='open,paid' icon="gtk-execute"/>
<button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="gtk-ok"/>
<button name="%(action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="terp-gtk-stop"/>
<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
</group>
</group>

12
addons/account/account_move_line.py
View File

@ -873,20 +873,14 @@ class account_move_line(osv.osv):
elif field == 'credit':
attrs.append('sum="Total credit"')
elif field == 'account_tax_id':
attrs.append('domain="[(\'parent_id\',\'=\',False), (\'type_tax_use\',\'=\',context.get(journal_id.type, \'sale\'))]"')
attrs.append('domain="[(\'parent_id\',\'=\',False)]"')
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)"')
elif field == 'partner_id':
attrs.append('on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"')
# elif field == 'date':
# attrs.append('on_change="onchange_date(date)"')
elif field == 'journal_id':
attrs.append("context=\"{'journal_id':journal_id.type}\"")
# if field.readonly:
# attrs.append('readonly="1"')
# if field.required:
# attrs.append('required="1"')
# else:
# attrs.append('required="0"')
if field in ('amount_currency','currency_id'):
attrs.append('on_change="onchange_currency(account_id, amount_currency,currency_id, date, journal_id)"')

90
addons/account/account_view.xml
View File

@ -152,12 +152,16 @@
</group>
<notebook colspan="4">
<page string="General Information">
<newline/>
<field name="currency_id"/>
<field name="active"/>
<field name="currency_mode"/>
<field name="reconcile"/>
<newline/>
<group col="2" colspan="2">
<separator string="Currency" colspan="2"/>
<field name="currency_id"/>
<field name="currency_mode" attrs="{'readonly': [('currency_id','=',False)]}"/>
</group>
<group col="2" colspan="2">
<separator string="Reconcile" colspan="2"/>
<field name="reconcile"/>
<!-- <field name="active"/>-->
</group>
<separator string="Default Taxes" colspan="4"/>
<field colspan="4" name="tax_ids" nolabel="1" domain="[('parent_id','=',False)]"/>
<separator string="Consolidated Children" colspan="4"/>
@ -388,14 +392,15 @@
<field name="centralisation" groups="base.group_extended"/>
<field name="entry_posted"/>
</group>
<group colspan="2" col="2">
<separator string="Invoicing Data" colspan="4"/>
<field name="invoice_sequence_id"/>
<field name="group_invoice_lines"/>
</group>
<group colspan="2" col="2" groups="base.group_extended">
<separator string="Sequence" colspan="4"/>
<field name="sequence_id"/>
</group>
<group colspan="2" col="2">
<separator string="Invoicing Data" colspan="4"/>
<field name="group_invoice_lines"/>
</group>
</page>
<page string="Entry Controls" groups="base.group_extended">
<separator colspan="4" string="Accounts Type Allowed (empty for no control)"/>
@ -455,7 +460,7 @@
<field name="state"/>
<button type="object" string="Open" name="button_open" states="draft" icon="terp-camera_test"/>
<button type="object" string="Confirm" name="button_confirm_bank" states="open" icon="terp-gtk-go-back-rtl"/>
<button type="object" string="Cancel" name="button_cancel" states="confirm" icon="terp-gtk-stop"/>
<button type="object" string="Cancel" name="button_cancel" states="confirm" icon="gtk-cancel"/>
</tree>
</field>
</record>
@ -530,12 +535,16 @@
<field colspan="4" name="move_line_ids" nolabel="1"/>
</page>
</notebook>
<group col="7" colspan="4">
<group col="8" colspan="4">
<field name="state"/>
<field name="balance_end"/>
<button name="%(action_view_account_statement_from_invoice_lines)d"
string="Import Invoice" type="action" attrs="{'invisible':[('state','=','confirm')]}"/>
<button name="button_dummy" states="draft" string="Compute" icon="terp-stock_format-scientific"/>
<button name="button_confirm_bank" states="draft" string="Confirm" type="object" icon="terp-camera_test"/>
<button name="button_cancel" states="confirm" string="Cancel" type="object" icon="terp-gtk-stop"/>
<button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
</group>
</form>
</field>
@ -546,6 +555,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
<field name="domain">[('journal_id.type', '=', 'bank')]</field>
<field name="context">{'journal_type':'bank'}</field>
</record>
<record model="ir.actions.act_window.view" id="action_bank_statement_tree_bank">
<field name="sequence" eval="1"/>
@ -1261,7 +1271,7 @@
<group col="4" colspan="4">
<field name="state" select="1"/>
<button name="button_validate" states="draft" string="Approve" type="object" icon="terp-camera_test"/>
<button name="button_cancel" states="posted" string="Cancel" type="object" icon="terp-gtk-stop"/>
<button name="button_cancel" states="posted" string="Cancel" type="object" icon="gtk-cancel"/>
</group>
</page>
</notebook>
@ -1481,7 +1491,7 @@
<field name="balance_end"/>
<button name="button_dummy" states="draft" string="Compute" icon="terp-stock_format-scientific"/>
<button name="button_confirm" states="draft" string="Confirm" type="object" icon="terp-camera_test"/>
<button name="button_cancel" states="confirm" string="Cancel" type="object" icon="terp-gtk-stop"/>
<button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
</group>
</form>
</field>
@ -1649,7 +1659,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem action="action_model_form" id="menu_action_model_form" parent="account.menu_configuration_misc"/>
<menuitem action="action_model_form" id="menu_action_model_form" sequence="5" parent="account.menu_configuration_misc"/>
<!--
# Payment Terms
@ -1779,39 +1789,46 @@
<field name="model">account.subscription</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Entry Subscription">
<field name="name" select="1"/>
<field name="ref" select="1"/>
<separator colspan="4" string="Subscription Periods"/>
<field name="date_start" select="1"/>
<field name="period_total"/>
<field name="period_nbr"/>
<field name="period_type"/>
<field name="model_id"/>
<form string="Recurring">
<group col="6" colspan="4">
<field name="name" select="1"/>
<field name="model_id"/>
<field name="ref" select="1"/>
</group>
<group col="2" colspan="2">
<separator colspan="4" string="Starts on"/>
<field name="date_start" select="1"/>
<field name="period_total"/>
</group>
<group col="2" colspan="2">
<separator colspan="4" string="Valid Up to"/>
<field name="period_nbr"/>
<field name="period_type"/>
</group>
<group col="2" colspan="2">
<button name="compute" states="draft,running" string="Compute" type="object" icon="terp-stock_format-scientific"/>
<button name="remove_line" states="running" string="Remove Lines" type="object" icon="gtk-remove"/>
</group>
<separator colspan="4" string="Subscription Lines"/>
<field colspan="4" name="lines_id" widget="one2many_list" nolabel="1"/>
<separator colspan="4" string="State"/>
<field name="state"/>
<group col="1" colspan="2">
<group col="6" colspan="4">
<field name="state"/>
<button name="state_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert" />
<button name="compute" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
<button name="remove_line" states="running" string="Remove Lines" type="object" icon="gtk-remove"/>
</group>
</form>
</field>
</record>
<record id="action_subscription_form" model="ir.actions.act_window">
<field name="name">Subscription Entries</field>
<field name="name">Recurring Lines</field>
<field name="res_model">account.subscription</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<!-- <menuitem action="action_subscription_form" id="menu_action_subscription_form" parent="account.menu_finance_recurrent_entries"/>-->
<menuitem action="action_subscription_form" id="menu_action_subscription_form" sequence="5" parent="account.menu_configuration_misc"/>
<record id="action_subscription_form_running" model="ir.actions.act_window">
<field name="name">Running Subscriptions</field>
@ -2433,7 +2450,7 @@
<field name="state"/>
<button type="object" string="Open" name="button_open" states="draft" icon="terp-camera_test"/>
<button type="object" string="Confirm" name="button_confirm_bank" states="open" icon="terp-gtk-go-back-rtl"/>
<button type="object" string="Cancel" name="button_cancel" states="confirm" icon="terp-gtk-stop"/>
<button type="object" string="Cancel" name="button_cancel" states="confirm" icon="gtk-cancel"/>
</tree>
</field>
</record>
@ -2537,7 +2554,7 @@
<field name="state" colspan="4"/>
<button name="button_confirm_cash" states="open" string="Close CashBox" icon="terp-check" type="object"/>
<button name="button_open" states="draft" string="Open CashBox" icon="terp-document-new" type="object"/>
<button name="button_cancel" states="confirm,open" string="Cancel" icon="terp-gtk-stop" type="object" groups="base.group_extended"/>
<button name="button_cancel" states="confirm,open" string="Cancel" icon="gtk-cancel" type="object" groups="base.group_extended"/>
</group>
</form>
</field>
@ -2563,6 +2580,7 @@
<field name="view_id" ref="view_cash_statement_tree"/>
<field name="search_view_id" ref="view_account_bank_statement_filter"/>
<field name="domain">[('journal_id.type', '=', 'cash')]</field>
<field name="context">{'journal_type':'cash'}</field>
</record>
<record model="ir.actions.act_window.view" id="act_cash_statement1_all">
<field name="sequence" eval="1"/>

293
addons/account/i18n/bs.po
View File

File diff suppressed because it is too large Load Diff

92
addons/account/i18n/pl.po
View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-07-21 07:21+0000\n"
"PO-Revision-Date: 2010-08-01 09:31+0000\n"
"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <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-07-22 03:56+0000\n"
"X-Launchpad-Export-Date: 2010-08-02 03:49+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -24,7 +24,7 @@ msgstr "Nazwa wewnętrzna"
#. module: account
#: view:account.tax.code:0
msgid "Account Tax Code"
msgstr "Kod podatkowy konta"
msgstr "Rejestr podatkowy"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree9
@ -96,7 +96,7 @@ msgstr "Zapisy nieuzgodnione"
#: field:account.tax,base_code_id:0
#: field:account.tax.template,base_code_id:0
msgid "Base Code"
msgstr "Kod bazowy"
msgstr "Rejestr podstawy"
#. module: account
#: view:account.account:0
@ -130,7 +130,7 @@ msgstr "Pozostało"
#: field:account.tax.template,base_sign:0
#: field:account.tax.template,ref_base_sign:0
msgid "Base Code Sign"
msgstr "Znak dla podstawy"
msgstr "Znak dla rejestru podstawy"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_unreconcile_select
@ -516,7 +516,7 @@ msgstr "Statystyka zapisów analitycznych"
#: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
#: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
msgid "Tax Code Templates"
msgstr "Szablony kodów podatkowych"
msgstr "Szablony rejestrów podatkowych"
#. module: account
#: view:account.invoice:0
@ -559,7 +559,7 @@ msgstr "Włącz do wartości bazowej"
#: field:account.tax,ref_base_code_id:0
#: field:account.tax.template,ref_base_code_id:0
msgid "Refund Base Code"
msgstr "Podstawa zwrotu"
msgstr "Rejestr podstawy dla korekt"
#. module: account
#: view:account.invoice.line:0
@ -722,7 +722,7 @@ msgstr "Wybierz okres do analizy"
#: field:account.tax.template,ref_tax_sign:0
#: field:account.tax.template,tax_sign:0
msgid "Tax Code Sign"
msgstr "Znak kodu podatkowego"
msgstr "Znak dla rejestru podatku"
#. module: account
#: help:res.partner,credit:0
@ -753,7 +753,7 @@ msgstr "Nazwa pola"
#: field:account.tax.code,sign:0
#: field:account.tax.code.template,sign:0
msgid "Sign for parent"
msgstr "Znak dla nadrzędnego"
msgstr "Znak do nadrzędnego"
#. module: account
#: field:account.fiscalyear,end_journal_period_id:0
@ -963,7 +963,7 @@ msgstr "Data końcowa"
#. module: account
#: field:account.invoice.tax,base_amount:0
msgid "Base Code Amount"
msgstr "Kwota kodu podstawowego"
msgstr "Kwota do rejestru podstawy"
#. module: account
#: help:account.journal,user_id:0
@ -1054,7 +1054,7 @@ msgstr "Podrzędne"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Fiscal Position Taxes Mapping"
msgstr "Mapowanie podatków obszarów podatkowych"
msgstr "Mapowanie podatków wg obszarów podatkowych"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@ -1119,7 +1119,7 @@ msgstr "Wylicz kod dla cen z podatkiem"
#: model:ir.actions.act_window,name:account.action_tax_code_list
#: model:ir.ui.menu,name:account.menu_action_tax_code_list
msgid "Tax codes"
msgstr "Rejestr podatkowy"
msgstr "Rejestry podatkowe"
#. module: account
#: field:account.fiscal.position.template,chart_template_id:0
@ -1542,7 +1542,7 @@ msgstr "Tel. :"
#. module: account
#: field:account.invoice.tax,tax_amount:0
msgid "Tax Code Amount"
msgstr "Kwota podatku"
msgstr "Kwota do rejestru podatku"
#. module: account
#: selection:account.account.type,sign:0
@ -1911,7 +1911,7 @@ msgstr "Kwota bez podatku"
#: field:account.tax,account_collected_id:0
#: field:account.tax.template,account_collected_id:0
msgid "Invoice Tax Account"
msgstr "Konto podatkowe faktury"
msgstr "Konto podatku dla faktur"
#. module: account
#: view:account.move.line:0
@ -2184,7 +2184,7 @@ msgstr "Komunikat przeterminowanych płatności"
#: model:ir.actions.act_window,name:account.action_tax_code_tree
#: model:ir.ui.menu,name:account.menu_action_tax_code_tree
msgid "Chart of Taxes"
msgstr "Schemat podatków"
msgstr "Struktura ewidencji podatkowej"
#. module: account
#: field:account.payment.term.line,value_amount:0
@ -2323,7 +2323,7 @@ msgstr ""
#. module: account
#: help:account.invoice.tax,base_code_id:0
msgid "The account basis of the tax declaration."
msgstr "Konto podstawy do deklaracji podatkowej"
msgstr "Rejestr podstawy podatku"
#. module: account
#: rml:account.analytic.account.journal:0
@ -2413,7 +2413,7 @@ msgstr "i dzienniki"
#. module: account
#: view:account.tax:0
msgid "Account Tax"
msgstr "Konto podatkowe"
msgstr "Podatki"
#. module: account
#: field:account.analytic.line,move_id:0
@ -2603,7 +2603,7 @@ msgstr "Nazwa typu konta"
#: help:account.tax.template,ref_tax_code_id:0
#: help:account.tax.template,tax_code_id:0
msgid "Use this code for the VAT declaration."
msgstr "Użyj tego kodu do deklaracji VAT."
msgstr "Użyj tego rejestru do deklaracji VAT."
#. module: account
#: field:account.move.line,blocked:0
@ -2683,7 +2683,7 @@ msgstr "Komunikat przeterminowanej płatności"
#. module: account
#: model:ir.model,name:account.model_account_tax_code_template
msgid "Tax Code Template"
msgstr "Szablon kodu podatkowego"
msgstr "Szablon rejestru podatkowego"
#. module: account
#: rml:account.partner.balance:0
@ -2933,7 +2933,7 @@ msgstr "Pomiń stan 'Projekt' dla tworzonych zapisów"
#: field:account.invoice.tax,account_id:0
#: field:account.move.line,tax_code_id:0
msgid "Tax Account"
msgstr "Konto Podatkowe"
msgstr "Konto/rejestr podatkowy"
#. module: account
#: model:process.transition,note:account.process_transition_statemententries0
@ -3029,7 +3029,7 @@ msgstr "Centralizacja"
#: field:account.tax.template,tax_code_id:0
#: model:ir.model,name:account.model_account_tax_code
msgid "Tax Code"
msgstr "Kod podatku"
msgstr "Rejestr podatku"
#. module: account
#: rml:account.analytic.account.journal:0
@ -3353,7 +3353,7 @@ msgstr "30 dni od końca miesiąca"
#. module: account
#: field:account.chart.template,tax_code_root_id:0
msgid "Root Tax Code"
msgstr "Główny kod podatkowy"
msgstr "Główny rejestr podatkowy"
#. module: account
#: constraint:account.invoice:0
@ -3375,7 +3375,7 @@ msgstr "Zapis"
#: field:account.fiscal.position.tax,tax_src_id:0
#: field:account.fiscal.position.tax.template,tax_src_id:0
msgid "Tax Source"
msgstr "Źródło podatku"
msgstr "Podatek źródłowy"
#. module: account
#: model:ir.actions.report.xml,name:account.account_analytic_account_balance
@ -3516,7 +3516,7 @@ msgstr "Wartość wyrażona w drugiej walucie, jeśli zapis jest wielowalutowy."
#: field:account.tax,parent_id:0
#: field:account.tax.template,parent_id:0
msgid "Parent Tax Account"
msgstr "Nadrzędne konto podatkowe"
msgstr "Podatek nadrzędny"
#. module: account
#: field:account.account,user_type:0
@ -3689,8 +3689,8 @@ msgid ""
"Check this box if you don't want any VAT related to this Tax Code to appear "
"on invoices"
msgstr ""
"Zaznacz tę opcję, jeśli nie chcesz, aby jakikolwiek VAT związany z tym kodem "
"podatkowym pojawił się na fakturach."
"Zaznacz tę opcję, jeśli nie chcesz, aby jakikolwiek VAT związany z tym "
"rejestrem podatkowym pojawił się na fakturach."
#. module: account
#: field:account.account.type,sequence:0
@ -3815,7 +3815,7 @@ msgstr "Projekty faktur"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Fiscal Position Template Tax Mapping"
msgstr "Mapowanie szablonów podatków obszarów podatkowych"
msgstr "Mapowanie podatków wg szablonów obszarów podatkowych"
#. module: account
#: rml:account.invoice:0
@ -3875,7 +3875,7 @@ msgstr "Zapisy płatności"
#. module: account
#: help:account.move.line,tax_code_id:0
msgid "The Account can either be a base tax code or tax code account."
msgstr "Konto musi być dla podstawy lub podatku."
msgstr "To może być rejestr podatku lub podstawy podatku."
#. module: account
#: help:account.automatic.reconcile,init,account_ids:0
@ -4080,13 +4080,13 @@ msgstr ""
#: field:account.tax,account_paid_id:0
#: field:account.tax.template,account_paid_id:0
msgid "Refund Tax Account"
msgstr "Konto zwrotów podatku"
msgstr "Konto podatku dla korekt"
#. module: account
#: field:account.tax.code,child_ids:0
#: field:account.tax.code.template,child_ids:0
msgid "Child Codes"
msgstr "Kody podrzędne"
msgstr "Rejestry podrzędne"
#. module: account
#: field:account.invoice,move_name:0
@ -4102,7 +4102,7 @@ msgstr "Pozycje wyciągu"
#. module: account
#: field:account.move.line,amount_taxed:0
msgid "Taxed Amount"
msgstr "Kwota opodatkowana"
msgstr ""
#. module: account
#: field:account.invoice.line,price_subtotal:0
@ -4468,16 +4468,12 @@ msgid ""
"to the higher ones. The order is important if you have a tax with several "
"tax children. In this case, the evaluation order is important."
msgstr ""
"Pole numeracji jest stosowane do porządkowania pozycji podatków od numeru "
"najniższego do najwyższego. Kolejność jest istotna jeśli są podatki z "
"kilkoma podatkami podrzędnymi. W takim przypadku ważna jest kolejność "
"obliczania."
#. module: account
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Tax Declaration"
msgstr "Deklaracja podatkowa"
msgstr "Rejestry podatkowe"
#. module: account
#: model:process.transition,name:account.process_transition_filestatement0
@ -4497,7 +4493,7 @@ msgstr "Pozycja modelu zapisu"
#. module: account
#: view:account.tax.template:0
msgid "Account Tax Template"
msgstr "Szablon konta podatkowego"
msgstr "Szablon podatku"
#. module: account
#: help:account.model,name:0
@ -5044,12 +5040,12 @@ msgstr "Utwórz zapisy"
#: field:account.tax,ref_tax_code_id:0
#: field:account.tax.template,ref_tax_code_id:0
msgid "Refund Tax Code"
msgstr "Kod zwrotu podatku"
msgstr "Rejestr podatku w korektach"
#. module: account
#: field:account.invoice.tax,name:0
msgid "Tax Description"
msgstr "Opis podatku"
msgstr "Podatek"
#. module: account
#: help:account.invoice,move_id:0
@ -5213,7 +5209,7 @@ msgstr "Dane konta"
#. module: account
#: view:account.tax.code.template:0
msgid "Account Tax Code Template"
msgstr "Szablon kodu konta podatkowego"
msgstr "Szablon rejestru konta podatkowego"
#. module: account
#: view:account.subscription:0
@ -5274,7 +5270,7 @@ msgstr "Potwierdzenie gotówki"
#: field:account.fiscal.position.tax,tax_dest_id:0
#: field:account.fiscal.position.tax.template,tax_dest_id:0
msgid "Replacement Tax"
msgstr "Podatek zamienny"
msgstr "Podatek docelowy"
#. module: account
#: model:process.transition,note:account.process_transition_invoicemanually0
@ -5326,7 +5322,7 @@ msgstr "Wszystkie zapisy konta"
#. module: account
#: help:account.invoice.tax,tax_code_id:0
msgid "The tax basis of the tax declaration."
msgstr "Podatek bazowy deklaracji podatkowej"
msgstr "Rejestr podstawy podatku do ewidencji podatkowej."
#. module: account
#: wizard_view:account.account.balance.report,checktype:0
@ -5464,9 +5460,9 @@ msgid ""
"amount.If the tax account is base tax code, this field "
"will contain the basic amount(without tax)."
msgstr ""
"Jeśli konto podatkowe jest kontem podatku, to pole będzie zawierało kwotę "
"podatku. Jeśli konto podatkowe jest kontem podstawy, to pole zawiera wartość "
"bazową (bez podatku)."
"Jeśli konto/rejestr podatkowy jest rejestrem podatku, to pole będzie "
"zawierało kwotę podatku. Jeśli konto/rejestr podatkowy jest rejestrem "
"podstawy, to pole zawiera wartość bazową (bez podatku)."
#. module: account
#: view:account.bank.statement:0
@ -5676,7 +5672,7 @@ msgstr "Zapisy otwartych dzienników analitycznych"
#. module: account
#: view:account.invoice.tax:0
msgid "Manual Invoice Taxes"
msgstr "Podatki ręcznych faktur"
msgstr "Ręczne podatki faktur"
#. module: account
#: field:account.model.line,date:0
@ -5748,7 +5744,7 @@ msgstr ""
#. module: account
#: field:account.tax,child_ids:0
msgid "Child Tax Accounts"
msgstr "Konta podatków podrzędnych"
msgstr "Podatki podrzędne"
#. module: account
#: field:account.account,parent_right:0
@ -5932,7 +5928,7 @@ msgstr "Faktura zapłacona przy uzgadnianiu"
#: field:account.tax,python_compute_inv:0
#: field:account.tax.template,python_compute_inv:0
msgid "Python Code (reverse)"
msgstr ""
msgstr "Kod Pythona (reverse)"
#. module: account
#: model:ir.module.module,shortdesc:account.module_meta_information

9
addons/account/installer.py
View File

@ -81,7 +81,7 @@ class account_installer(osv.osv_memory):
'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Bank Accounts',required=True),
'sale_tax':fields.float('Sale Tax(%)'),
'purchase_tax':fields.float('Purchase Tax(%)')
}
}
_defaults = {
'date_start': lambda *a: time.strftime('%Y-01-01'),
'date_stop': lambda *a: time.strftime('%Y-12-31'),
@ -90,7 +90,7 @@ class account_installer(osv.osv_memory):
'purchase_tax':lambda *a:0.0,
#'charts':'configurable',
'bank_accounts_id':_get_default_accounts
}
}
def on_change_tax(self, cr, uid, id, tax):
return{'value':{'purchase_tax':tax}}
@ -115,6 +115,7 @@ class account_installer(osv.osv_memory):
obj_acc_template = self.pool.get('account.account.template')
obj_fiscal_position_template = self.pool.get('account.fiscal.position.template')
obj_fiscal_position = self.pool.get('account.fiscal.position')
data_pool = self.pool.get('ir.model.data')
company_id = self.pool.get('res.users').browse(cr, uid, [uid], context)[0].company_id
seq_journal = True
@ -298,8 +299,8 @@ class account_installer(osv.osv_memory):
# Creating Journals Sales and Purchase
vals_journal={}
data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_sp_journal_view')])
data = data_pool.browse(cr, uid, data_id[0])
data_id = mod_obj.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_sp_journal_view')])
data = mod_obj.browse(cr, uid, data_id[0])
view_id = data.res_id
seq_id = obj_sequence.search(cr,uid,[('name','=','Account Journal')])[0]

64
addons/account/invoice.py
View File

@ -231,8 +231,8 @@ class account_invoice(osv.osv):
('in_refund','Supplier Refund'),
],'Type', readonly=True, select=True, change_default=True),
'number': fields.related('move_id','name', type='char', readonly=True, size=64, relation='account.move', store=True, string='Number'),
#'number': fields.char('Invoice Number', size=32, readonly=True, help="Unique number of the invoice, computed automatically when the invoice is created."),
# 'number': fields.related('move_id','name', type='char', readonly=True, size=64, relation='account.move', store=True, string='Number'),
'number': fields.char('Invoice Number', size=32, readonly=True, help="Unique number of the invoice, computed automatically when the invoice is created."),
'reference': fields.char('Invoice Reference', size=64, help="The partner reference of this invoice."),
'reference_type': fields.selection(_get_reference_type, 'Reference Type',
required=True, readonly=True, states={'draft':[('readonly',False)]}),
@ -769,7 +769,7 @@ class account_invoice(osv.osv):
cur_obj = self.pool.get('res.currency')
context = {}
for inv in self.browse(cr, uid, ids):
if not inv.journal_id.sequence_id:
if not inv.journal_id.invoice_sequence_id:
raise osv.except_osv(_('Error !'), _('Please define sequence on invoice journal'))
if not inv.invoice_line:
raise osv.except_osv(_('No Invoice Lines !'), _('Please create some invoice lines.'))
@ -927,35 +927,45 @@ class account_invoice(osv.osv):
}
def action_number(self, cr, uid, ids, *args):
#TODO: not correct fix but required a frech values before reading it.
self.write(cr, uid, ids, {})
# #TODO: not correct fix but required a frech values before reading it.
# self.write(cr, uid, ids, {})
#
cr.execute('SELECT id, type, number, move_id, reference ' \
'FROM account_invoice ' \
'WHERE id IN ('+','.join(map(str,ids))+')')
obj_inv = self.browse(cr, uid, ids)[0]
for obj_inv in self.browse(cr, uid, ids):
id = obj_inv.id
invtype = obj_inv.type
number = obj_inv.number
move_id = obj_inv.move_id and obj_inv.move_id.id or False
reference = obj_inv.reference or ''
if invtype in ('in_invoice', 'in_refund'):
ref = reference
else:
ref = self._convert_ref(cr, uid, number)
cr.execute('UPDATE account_move SET ref=%s ' \
'WHERE id=%s AND (ref is null OR ref = \'\')',
(ref, move_id))
cr.execute('UPDATE account_move_line SET ref=%s ' \
'WHERE move_id=%s AND (ref is null OR ref = \'\')',
(ref, move_id))
cr.execute('UPDATE account_analytic_line SET ref=%s ' \
'FROM account_move_line ' \
'WHERE account_move_line.move_id = %s ' \
'AND account_analytic_line.move_id = account_move_line.id',
for (id, invtype, number, move_id, reference) in cr.fetchall():
if not number:
if obj_inv.journal_id.invoice_sequence_id:
sid = obj_inv.journal_id.invoice_sequence_id.id
number = self.pool.get('ir.sequence').get_id(cr, uid, sid, 'id', {'fiscalyear_id': obj_inv.period_id.fiscalyear_id.id})
else:
number = self.pool.get('ir.sequence').get(cr, uid, 'account.invoice.' + invtype)
if invtype in ('in_invoice', 'in_refund'):
ref = reference
else:
ref = self._convert_ref(cr, uid, number)
cr.execute('UPDATE account_invoice SET number=%s ' \
'WHERE id=%s', (number, id))
cr.execute('UPDATE account_move SET ref=%s ' \
'WHERE id=%s AND (ref is null OR ref = \'\')',
(ref, move_id))
cr.execute('UPDATE account_move_line SET ref=%s ' \
'WHERE move_id=%s AND (ref is null OR ref = \'\')',
(ref, move_id))
cr.execute('UPDATE account_analytic_line SET ref=%s ' \
'FROM account_move_line ' \
'WHERE account_move_line.move_id = %s ' \
'AND account_analytic_line.move_id = account_move_line.id',
(ref, move_id))
for inv_id, name in self.name_get(cr, uid, [id]):
message = _('Invoice ') + " '" + name + "' "+ _("is validated.")
self.log(cr, uid, inv_id, message)
return True
def action_cancel(self, cr, uid, ids, *args):

8
addons/account/project/project_view.xml
View File

@ -54,13 +54,13 @@
<tree toolbar="True" colors="red:(date&lt;=current_date);black:(date&gt;current_date)" string="Analytic account">
<field name="name"/>
<field name="code"/>
<field name="quantity"/>
<field name="quantity_max"/>
<field name="debit"/>
<field name="credit"/>
<field name="balance"/>
<field name="company_currency_id"/>
<!-- <field name="date"/>-->
<!-- <field name="debit"/>-->
<!-- <field name="credit"/>-->
<!-- <field name="quantity"/>-->
<!-- <field name="quantity_max"/>-->
<!-- <field name="parent_id" invisible="1"/>-->
<!-- <field name="type" invisible="1"/>-->
<!-- <field name="partner_id" invisible="1"/>-->

2
addons/account/report/account_analytic_entries_report_view.xml
View File

@ -71,7 +71,7 @@
<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
</group>
<newline/>
<group expand="0" string="Extended options..." groups="base.group_extended">
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<field name="currency_id" widget="selection"/>
<field name="general_account_id" widget="selection"/>
<field name="product_uom_id" widget="selection"/>

2
addons/account/report/account_entries_report_view.xml
View File

@ -93,7 +93,7 @@
<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
</group>
<newline/>
<group expand="0" string="Extended options..." groups="base.group_extended">
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<field name="journal_id"/>
<field name="fiscalyear_id"/>
<field name="period_id"/>

2
addons/account/report/account_invoice_report_view.xml
View File

@ -113,7 +113,7 @@
<filter string="Year" name="year" icon="terp-go-year" context="{'group_by':'year'}"/>
</group>
<newline/>
<group expand="0" string="Extended options..." groups="base.group_extended">
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<field name="product_id"/>
<field name="account_id"/>
<separator orientation="vertical"/>

2
addons/account/wizard/account_balance_report.py
View File

@ -109,7 +109,6 @@ class account_balance_report(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.account.balance',
'datas': data,
'nodestroy':True,
}
def _check_date(self, cr, uid, data, context=None):
@ -128,7 +127,6 @@ class account_balance_report(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.account.balance',
'datas': data,
'nodestroy':True,
}
else:
raise osv.except_osv(_('UserError'),_('Date not in a defined fiscal year'))

2
addons/account/wizard/account_bs_report.py
View File

@ -139,14 +139,12 @@ class account_bs_report(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.balancesheet.horizontal',
'datas': data,
'nodestroy':True,
}
else:
return {
'type': 'ir.actions.report.xml',
'report_name': 'account.balancesheet',
'datas': data,
'nodestroy':True,
}
else:
raise osv.except_osv(_('UserError'),_('Date not in a defined fiscal year'))

1
addons/account/wizard/account_central_journal.py
View File

@ -52,7 +52,6 @@ class account_central_journal(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.central.journal',
'datas': datas,
'nodestroy':True,
}
account_central_journal()

8
addons/account/wizard/account_compare_account_balance_report.py
View File

@ -74,14 +74,12 @@ class account_compare_account_balance_report(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.account.balance.landscape',
'datas': data,
'nodestroy':True,
}
else:
return {
'type': 'ir.actions.report.xml',
'report_name': 'account.balance.account.balance',
'datas': data,
'nodestroy':True,
}
if data['form']['format_perc']==1:
if len(data['form']['fiscalyear'])<=2:
@ -90,14 +88,12 @@ class account_compare_account_balance_report(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.account.balance.landscape',
'datas': data,
'nodestroy':True,
}
else:
return {
'type': 'ir.actions.report.xml',
'report_name': 'account.balance.account.balance',
'datas': data,
'nodestroy':True,
}
else:
if len(data['form']['fiscalyear'])==3:
@ -106,7 +102,6 @@ class account_compare_account_balance_report(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.account.balance.landscape',
'datas': data,
'nodestroy':True,
}
else:
raise osv.except_osv(_('Warning !'), _('You might have done following mistakes. Please correct them and try again. \n 1. You have selected more than 3 years in any case. \n 2. You have not selected Percentage option, but you have selected more than 2 years. \n You can select maximum 3 years. Please check again. \n 3. You have selected Percentage option with more than 2 years, but you have not selected landscape format. You have to select Landscape option. Please Check it.'))
@ -119,7 +114,6 @@ class account_compare_account_balance_report(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.account.balance.landscape',
'datas': data,
'nodestroy':True,
}
else:
raise osv.except_osv(_('Warning !'), _('You might have done following mistakes. Please correct them and try again. \n 1. You have selected more than 3 years in any case. \n 2. You have not selected Percentage option, but you have selected more than 2 years. \n You can select maximum 3 years. Please check again. \n 3. You have selected Percentage option with more than 2 years, but you have not selected landscape format. You have to select Landscape option. Please Check it.'))
@ -129,14 +123,12 @@ class account_compare_account_balance_report(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.account.balance.landscape',
'datas': data,
'nodestroy':True,
}
else:
return {
'type': 'ir.actions.report.xml',
'report_name': 'account.balance.account.balance',
'datas': data,
'nodestroy':True,
}
account_compare_account_balance_report()

1
addons/account/wizard/account_general_journal.py
View File

@ -52,7 +52,6 @@ class account_general_journal(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.general.journal',
'datas': datas,
'nodestroy':True,
}
account_general_journal()

4
addons/account/wizard/account_general_ledger_report.py
View File

@ -107,14 +107,12 @@ class account_general_ledger_report(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.general.ledger_landscape',
'datas': data,
'nodestroy':True,
}
else:
return {
'type': 'ir.actions.report.xml',
'report_name': 'account.general.ledger',
'datas': data,
'nodestroy':True,
}
else:
raise osv.except_osv(_('UserError'),_('Date not in a defined fiscal year'))
@ -141,14 +139,12 @@ class account_general_ledger_report(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.general.ledger_landscape',
'datas': data,
'nodestroy':True,
}
else:
return {
'type': 'ir.actions.report.xml',
'report_name': 'account.general.ledger',
'datas': data,
'nodestroy':True,
}
account_general_ledger_report()

2
addons/account/wizard/account_invoice_state_view.xml
View File

@ -44,7 +44,7 @@
<separator string="Cancel Selected Invoices" colspan="4"/>
<group colspan="4" col="6">
<button icon="terp-dialog-close" special="cancel" string="Close"/>
<button icon="terp-gtk-stop" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1"/>
<button icon="gtk-cancel" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1"/>
</group>
</form>
</field>

2
addons/account/wizard/account_journal_select_view.xml
View File

@ -11,7 +11,7 @@
<label string="Are you sure you want to open Journal Entries?" colspan="4"/>
<separator string="" colspan="4" />
<group colspan="4" col="6">
<button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object"/>
</group>
</form>

2
addons/account/wizard/account_move_bank_reconcile_view.xml
View File

@ -13,7 +13,7 @@
<separator string="" colspan="4" />
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="terp-gtk-go-back-rtl" string="Open for bank reconciliation" name="action_open_window" type="object"/>
</group>
</form>

2
addons/account/wizard/account_move_journal_view.xml
View File

@ -16,7 +16,7 @@
<separator string="" colspan="4" />
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="terp-gtk-go-back-rtl" string="Open Journal" name="action_open_window" type="object"/>
</group>
</form>

2
addons/account/wizard/account_move_line_reconcile_select_view.xml
View File

@ -13,7 +13,7 @@
<separator string="" colspan="4" />
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<button icon="terp-gtk-stop" special="cancel" string="Cancel" />
<button icon="gtk-cancel" special="cancel" string="Cancel" />
<button icon="terp-gtk-go-back-rtl"
string="Open for Reconciliation" name="action_open_window"
type="object" />

2
addons/account/wizard/account_move_line_select_view.xml
View File

@ -11,7 +11,7 @@
<label string="Are you sure you want to open Account move line entries!" colspan="4"/>
<separator string="" colspan="4" />
<group colspan="4" col="6">
<button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="terp-gtk-go-back-rtl" string="Open Entries" name="open_window" type="object" default_focus="1"/>
</group>
</form>

2
addons/account/wizard/account_move_line_unreconcile_select_view.xml
View File

@ -13,7 +13,7 @@
<separator string="" colspan="4" />
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<button icon="terp-gtk-stop" special="cancel" string="Cancel" />
<button icon="gtk-cancel" special="cancel" string="Cancel" />
<button icon="terp-gtk-go-back-rtl"
string="Open For Unreconciliation" name="action_open_window"
type="object" />

2
addons/account/wizard/account_open_closed_fiscalyear_view.xml
View File

@ -13,7 +13,7 @@
<separator string="" colspan="4" />
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="terp-gtk-go-back-rtl" string="Open" name="remove_entries" type="object"/>
</group>
</form>

2
addons/account/wizard/account_partner_balance_report.py
View File

@ -82,7 +82,6 @@ class account_partner_balance(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.partner.balance',
'datas': data,
'nodestroy':True,
}
def _check_date(self, cr, uid, data, context):
@ -98,7 +97,6 @@ class account_partner_balance(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.partner.balance',
'datas': data,
'nodestroy':True,
}
else:
raise osv.except_osv(_('UserError'),_('Date not in a defined fiscal year'))

2
addons/account/wizard/account_partner_balance_report_view.xml
View File

@ -33,7 +33,7 @@
<group colspan="4" col="6">
<separator colspan="4"/>
<newline/>
<button special="cancel" string="Cancel" icon="terp-gtk-stop"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="check_state" string="Print" type="object" icon="gtk-print"/>
</group>
</group>

2
addons/account/wizard/account_pl_report.py
View File

@ -136,14 +136,12 @@ class account_pl_report(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'pl.account.horizontal',
'datas': data,
'nodestroy':True,
}
else:
return {
'type': 'ir.actions.report.xml',
'report_name': 'pl.account',
'datas': data,
'nodestroy':True,
}
else:
raise osv.except_osv(_('UserError'),_('Date not in a defined fiscal year'))

1
addons/account/wizard/account_print_journal.py
View File

@ -59,7 +59,6 @@ class account_print_journal(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.journal.period.print',
'datas': datas,
'nodestroy':True,
}
account_print_journal()

146
addons/account/wizard/account_reconcile_view.xml
View File

@ -2,30 +2,30 @@
<openerp>
<data>
<!-- <record id="view_account_move_line_reconcile_prompt" model="ir.ui.view">-->
<!-- <record id="view_account_move_line_reconcile_prompt" model="ir.ui.view">-->
<!-- <field name="name">account.move.line.reconcile.prompt.form</field>-->
<!-- <field name="model">account.move.line.reconcile.prompt</field>-->
<!-- <field name="type">form</field>-->
<!-- <field name="arch" type="xml">-->
<!-- <form string="Reconciliation">-->
<!-- <separator string="Are you sure you want to reconcile entries?" colspan="4"/>-->
<!-- <group colspan="4" col="6">-->
<!-- <label string ="" colspan="2"/>-->
<!-- <separator string="Are you sure you want to reconcile entries?" colspan="4"/>-->
<!-- <group colspan="4" col="6">-->
<!-- <label string ="" colspan="2"/>-->
<!---->
<!-- <button icon="gtk-cancel" special="cancel" string="Cancel"/>-->
<!-- <button icon="gtk-ok" string="Ok" name="ask_reconcilation" type="object" default_focus="1"/>-->
<!-- <button icon="gtk-cancel" special="cancel" string="Cancel"/>-->
<!-- <button icon="gtk-ok" string="Ok" name="ask_reconcilation" type="object" default_focus="1"/>-->
<!-- </group>-->
<!-- </form>-->
<!-- </field>-->
<!-- </record>-->
<!-- <record id="action_view_account_move_line_reconcile_prompt" model="ir.actions.act_window">-->
<!-- <field name="name">Reconcile Entries</field>-->
<!-- <record id="action_view_account_move_line_reconcile_prompt" model="ir.actions.act_window">-->
<!-- <field name="name">Reconcile Entries</field>-->
<!-- <field name="res_model">account.move.line.reconcile.prompt</field>-->
<!-- <field name="view_type">form</field>-->
<!-- <field name="view_mode">tree,form</field>-->
<!-- <field name="view_id" ref="view_account_move_line_reconcile_prompt"/>-->
<!-- <field name="target">new</field>-->
<!-- <field name="view_id" ref="view_account_move_line_reconcile_prompt"/>-->
<!-- <field name="target">new</field>-->
<!-- </record>-->
<!-- <record model="ir.values" id="action_account_move_line_reconcile_prompt_values">-->
@ -36,41 +36,41 @@
<!-- <field name="value" eval="'ir.actions.act_window,' +str(ref('action_view_account_move_line_reconcile_prompt'))" />-->
<!-- <field name="key">action</field>-->
<!-- <field name="model">account.move.line</field>-->
<!-- </record>-->
<record id="view_account_move_line_reconcile_full" model="ir.ui.view">
<!-- </record>-->
<record id="view_account_move_line_reconcile_full" model="ir.ui.view">
<field name="name">account.move.line.reconcile.full.form</field>
<field name="model">account.move.line.reconcile</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Reconciliation">
<group height="210" width="550">
<separator string="Reconciliation transactions" colspan="4"/>
<field name="trans_nbr"/>
<newline/>
<field name="credit"/>
<field name="debit"/>
<separator string="Write-Off" colspan="4"/>
<field name="writeoff"/>
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}"/>
<button icon="gtk-ok" string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/>
<button icon="gtk-ok" string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/>
</group>
</group>
<group height="210" width="550">
<separator string="Reconciliation transactions" colspan="4"/>
<field name="trans_nbr"/>
<newline/>
<field name="credit"/>
<field name="debit"/>
<separator string="Write-Off" colspan="4"/>
<field name="writeoff"/>
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}"/>
<button icon="gtk-ok" string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/>
<button icon="gtk-ok" string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/>
</group>
</group>
</form>
</field>
</record>
<record id="action_view_account_move_line_reconcile" model="ir.actions.act_window">
<field name="name">Reconcile Entries</field>
<record id="action_view_account_move_line_reconcile" model="ir.actions.act_window">
<field name="name">Reconcile Entries</field>
<field name="res_model">account.move.line.reconcile</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_account_move_line_reconcile_full"/>
<field name="target">new</field>
<field name="view_id" ref="view_account_move_line_reconcile_full"/>
<field name="target">new</field>
</record>
<record model="ir.values" id="action_account_move_line_reconcile_prompt_values">
@ -81,72 +81,72 @@
<field name="value" eval="'ir.actions.act_window,' +str(ref('action_view_account_move_line_reconcile'))" />
<field name="key">action</field>
<field name="model">account.move.line</field>
</record>
<!-- <record id="view_account_move_line_reconcile_full" model="ir.ui.view">-->
</record>
<!-- <record id="view_account_move_line_reconcile_full" model="ir.ui.view">-->
<!-- <field name="name">account.move.line.reconcile.full.form</field>-->
<!-- <field name="model">account.move.line.reconcile</field>-->
<!-- <field name="type">form</field>-->
<!-- <field name="arch" type="xml">-->
<!-- <form string="Reconciliation">-->
<!-- <separator string="Reconciliation transactions" colspan="4"/>-->
<!-- <field name="trans_nbr"/>-->
<!-- <newline/>-->
<!-- <field name="credit"/>-->
<!-- <field name="debit"/>-->
<!-- <separator string="Write-Off" colspan="4"/>-->
<!-- <field name="writeoff"/>-->
<!-- <group colspan="4" col="6">-->
<!-- <label string ="" colspan="2"/>-->
<!-- <button icon="gtk-cancel" special="cancel" string="Cancel"/>-->
<!-- <button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1"/>-->
<!-- <separator string="Reconciliation transactions" colspan="4"/>-->
<!-- <field name="trans_nbr"/>-->
<!-- <newline/>-->
<!-- <field name="credit"/>-->
<!-- <field name="debit"/>-->
<!-- <separator string="Write-Off" colspan="4"/>-->
<!-- <field name="writeoff"/>-->
<!-- <group colspan="4" col="6">-->
<!-- <label string ="" colspan="2"/>-->
<!-- <button icon="gtk-cancel" special="cancel" string="Cancel"/>-->
<!-- <button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1"/>-->
<!-- </group>-->
<!-- </form>-->
<!-- </field>-->
<!-- </record>-->
<!---->
<!-- <record id="view_account_move_line_reconcile_partial" model="ir.ui.view">-->
<!-- <record id="view_account_move_line_reconcile_partial" model="ir.ui.view">-->
<!-- <field name="name">account.move.line.reconcile.partial.form</field>-->
<!-- <field name="model">account.move.line.reconcile</field>-->
<!-- <field name="type">form</field>-->
<!-- <field name="arch" type="xml">-->
<!-- <form string="Reconciliation">-->
<!-- <separator string="Reconciliation transactions" colspan="4"/>-->
<!-- <field name="trans_nbr"/>-->
<!-- <newline/>-->
<!-- <field name="credit"/>-->
<!-- <field name="debit"/>-->
<!-- <separator string="Write-Off" colspan="4"/>-->
<!-- <field name="writeoff"/>-->
<!-- <group colspan="4" col="6">-->
<!-- <label string ="" colspan="2"/>-->
<!-- <button icon="gtk-cancel" special="cancel" string="Cancel"/>-->
<!-- <button icon="gtk-ok" string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" default_focus="1"/>-->
<!-- <button icon="gtk-ok" string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object"/>-->
<!-- <separator string="Reconciliation transactions" colspan="4"/>-->
<!-- <field name="trans_nbr"/>-->
<!-- <newline/>-->
<!-- <field name="credit"/>-->
<!-- <field name="debit"/>-->
<!-- <separator string="Write-Off" colspan="4"/>-->
<!-- <field name="writeoff"/>-->
<!-- <group colspan="4" col="6">-->
<!-- <label string ="" colspan="2"/>-->
<!-- <button icon="gtk-cancel" special="cancel" string="Cancel"/>-->
<!-- <button icon="gtk-ok" string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" default_focus="1"/>-->
<!-- <button icon="gtk-ok" string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object"/>-->
<!-- </group>-->
<!-- </form>-->
<!-- </field>-->
<!-- </record>-->
<record id="account_move_line_reconcile_writeoff" model="ir.ui.view">
<record id="account_move_line_reconcile_writeoff" model="ir.ui.view">
<field name="name">account.move.line.reconcile.writeoff.form</field>
<field name="model">account.move.line.reconcile.writeoff</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Information addendum">
<separator string="Write-Off Move" colspan="4"/>
<field name="journal_id"/>
<field name="writeoff_acc_id" domain="[('type', '&lt;&gt;', 'view')]"/>
<field name="date_p"/>
<field name="comment"/>
<separator string="Analytic" colspan="4"/>
<field name="analytic_id"/>
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile" type="object" default_focus="1"/>
<separator string="Write-Off Move" colspan="4"/>
<field name="journal_id"/>
<field name="writeoff_acc_id" domain="[('type', '&lt;&gt;', 'view')]"/>
<field name="date_p"/>
<field name="comment"/>
<separator string="Analytic" colspan="4"/>
<field name="analytic_id"/>
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile" type="object" default_focus="1"/>
</group>
</form>
</field>
</record>
</data>
</data>
</openerp>

3
addons/account/wizard/account_third_party_ledger.py
View File

@ -97,14 +97,12 @@ class account_partner_ledger(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.third_party_ledger',
'datas': data,
'nodestroy':True,
}
else:
return {
'type': 'ir.actions.report.xml',
'report_name': 'account.third_party_ledger_other',
'datas': data,
'nodestroy':True,
}
def _check_date(self, cr, uid, data, context=None):
@ -122,7 +120,6 @@ class account_partner_ledger(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.third_party_ledger',
'datas': data,
'nodestroy':True,
}
else:
raise osv.except_osv(_('UserError'),_('Date not in a defined fiscal year'))

2
addons/account/wizard/account_use_model_view.xml
View File

@ -70,7 +70,7 @@
<group colspan="4" col="6" width="300" height="70">
<label string = "Are you sure you want to create entries?" colspan="2"/>
<newline/>
<button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1'/>
</group>
</form>

61
addons/account/wizard/account_vat.py
View File

@ -22,43 +22,42 @@
from osv import osv, fields
class account_vat_declaration(osv.osv_memory):
_name = 'account.vat.declaration'
_description = 'Account Vat Declaration'
_name = 'account.vat.declaration'
_description = 'Account Vat Declaration'
_columns = {
_columns = {
'based_on': fields.selection([('invoices','Invoices'),
('payments','Payments'),],
'Based On', required=True),
('payments','Payments'),],
'Based On', required=True),
'company_id': fields.many2one('res.company', 'Company', required=True),
'periods': fields.many2many('account.period', 'vat_period_rel', 'vat_id', 'period_id', 'Periods', help="All periods if empty"),
}
'periods': fields.many2many('account.period', 'vat_period_rel', 'vat_id', 'period_id', 'Periods', help="All periods if empty"),
}
def _get_company(self, cr, uid, context={}):
user_obj = self.pool.get('res.users')
company_obj = self.pool.get('res.company')
user = user_obj.browse(cr, uid, uid, context=context)
if user.company_id:
return user.company_id.id
else:
return company_obj.search(cr, uid, [('parent_id', '=', False)])[0]
def _get_company(self, cr, uid, context={}):
user_obj = self.pool.get('res.users')
company_obj = self.pool.get('res.company')
user = user_obj.browse(cr, uid, uid, context=context)
if user.company_id:
return user.company_id.id
else:
return company_obj.search(cr, uid, [('parent_id', '=', False)])[0]
_defaults = {
'based_on': 'invoices',
'company_id': _get_company
}
_defaults = {
'based_on': 'invoices',
'company_id': _get_company
}
def create_vat(self, cr, uid, ids, context={}):
if context is None:
context = {}
datas = {'ids': context.get('active_ids', [])}
datas['model'] = 'account.tax.code'
datas['form'] = self.read(cr, uid, ids)[0]
return {
'type': 'ir.actions.report.xml',
'report_name': 'account.vat.declaration',
'datas': datas,
'nodestroy':True,
}
def create_vat(self, cr, uid, ids, context={}):
if context is None:
context = {}
datas = {'ids': context.get('active_ids', [])}
datas['model'] = 'account.tax.code'
datas['form'] = self.read(cr, uid, ids)[0]
return {
'type': 'ir.actions.report.xml',
'report_name': 'account.vat.declaration',
'datas': datas,
}
account_vat_declaration()

9
addons/account_analytic_analysis/i18n/bs.po
View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-02-12 13:13+0000\n"
"Last-Translator: Tarik_985 <Unknown>\n"
"PO-Revision-Date: 2010-08-01 11:50+0000\n"
"Last-Translator: Bojan Markovic <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-06-22 04:09+0000\n"
"X-Launchpad-Export-Date: 2010-08-02 03:49+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
@ -200,6 +200,9 @@ msgid ""
"important data for project manager of services companies.\n"
"Add menu to show relevant information for each manager."
msgstr ""
"Izmijeni analitički pregled konta da prikazuje\n"
"bitne podatke za projekt menadžere uslužnih poduzeća.\n"
"Dodaj meni za prikazivanje relevantnih informacija za svakog menadžera."
#. module: account_analytic_analysis
#: field:account.analytic.account,hours_qtt_non_invoiced:0

1
addons/account_analytic_plans/wizard/account_crossovered_analytic.py
View File

@ -67,7 +67,6 @@ class account_crossovered_analytic(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.analytic.account.crossovered.analytic',
'datas': datas,
'nodestroy': True
}
account_crossovered_analytic()

165
addons/account_followup/i18n/bs.po
View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-07-07 09:15+0000\n"
"PO-Revision-Date: 2010-08-01 15:26+0000\n"
"Last-Translator: Bojan Markovic <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-07-08 03:50+0000\n"
"X-Launchpad-Export-Date: 2010-08-02 03:49+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
@ -35,22 +35,22 @@ msgstr "Refernca kupca:"
#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
#: model:ir.ui.menu,name:account_followup.menu_account_move_open_unreconcile_payable
msgid "All payable entries"
msgstr ""
msgstr "Sve stavke dugovanja"
#. module: account_followup
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr ""
msgstr "Neispravan naziv modela u definiciji zadatka."
#. module: account_followup
#: field:account_followup.followup.line,description:0
msgid "Printed Message"
msgstr ""
msgstr "Ispisana poruka"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Amount In Currency"
msgstr ""
msgstr "Iznos u valuti"
#. module: account_followup
#: rml:account_followup.followup.print:0
@ -66,7 +66,7 @@ msgstr "Ukupan dug"
#: view:account_followup.followup.line:0
#: wizard_view:account_followup.followup.print.all,next:0
msgid "%(user_signature)s: User name"
msgstr ""
msgstr "%(user_signature)s: Korisničko ime"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
@ -77,12 +77,12 @@ msgstr "Izabeeri partnere"
#: view:account_followup.followup:0
#: field:account_followup.followup,followup_line:0
msgid "Follow-Up"
msgstr ""
msgstr "Opomena"
#. module: account_followup
#: field:account_followup.stat,debit:0
msgid "Debit"
msgstr ""
msgstr "Dugovanje"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
@ -92,39 +92,39 @@ msgstr "E-mail Postavke"
#. module: account_followup
#: field:account_followup.stat,account_type:0
msgid "Account Type"
msgstr "Vrsta Računa"
msgstr "Vrsta konta"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Ref"
msgstr ""
msgstr "Referenca"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
msgid "%(followup_amount)s: Total Amount Due"
msgstr "%(followup_amount): Ukupan dospjeli iznos"
msgstr "%(followup_amount)s: Ukupan dospjeli iznos"
#. module: account_followup
#: view:account_followup.followup.line:0
#: wizard_view:account_followup.followup.print.all,next:0
msgid "%(date)s: Current Date"
msgstr ""
msgstr "%(date)s: Trenutni datum"
#. module: account_followup
#: field:account.move.line,followup_date:0
msgid "Latest Follow-up"
msgstr ""
msgstr "Poslijednja opomena"
#. module: account_followup
#: field:account_followup.followup.line,followup_id:0
#: field:account_followup.stat,followup_id:0
msgid "Follow Ups"
msgstr ""
msgstr "Opomene"
#. module: account_followup
#: wizard_field:account_followup.followup.print.all,init,date:0
msgid "Follow-up Sending Date"
msgstr ""
msgstr "Datum slanja opomene"
#. module: account_followup
#: view:account_followup.followup:0
@ -136,17 +136,17 @@ msgstr "Opis"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Balance:"
msgstr "Balans:"
msgstr "Saldo"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "VAT:"
msgstr "VAT:"
msgstr "PDV:"
#. module: account_followup
#: field:account_followup.followup,company_id:0
msgid "Company"
msgstr "Kompanija"
msgstr "Poduzeće"
#. module: account_followup
#: rml:account_followup.followup.print:0
@ -156,7 +156,7 @@ msgstr "Datum Fakture"
#. module: account_followup
#: wizard_field:account_followup.followup.print.all,next,email_subject:0
msgid "Email Subject"
msgstr ""
msgstr "Predmet email-a"
#. module: account_followup
#: rml:account_followup.followup.print:0
@ -166,27 +166,27 @@ msgstr "Plaćeno"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
msgid "%(line)s: Account Move lines"
msgstr ""
msgstr "%(line)s: Stavke unosa na kontu"
#. module: account_followup
#: field:account_followup.stat,date_followup:0
msgid "Latest followup"
msgstr ""
msgstr "Poslijednja opomena"
#. module: account_followup
#: view:account.move.line:0
msgid "Partner entries"
msgstr ""
msgstr "Stavke partnera"
#. module: account_followup
#: model:ir.model,name:account_followup.model_account_followup_followup_line
msgid "Follow-Ups Criteria"
msgstr ""
msgstr "Kriteriji opomena"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
msgid "Partner Selection"
msgstr "Biranje Partnera"
msgstr "Odabir Partnera"
#. module: account_followup
#: constraint:ir.ui.view:0
@ -196,17 +196,17 @@ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
#. module: account_followup
#: field:account_followup.followup.line,start:0
msgid "Type of Term"
msgstr ""
msgstr "Vrsta uvjeta"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,init:0
msgid "Follow-up and Date Selection"
msgstr ""
msgstr "Odabir datuma i opomene"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
msgid "Select partners to remind"
msgstr ""
msgstr "Odaberite partnere za opomenu"
#. module: account_followup
#: rml:account_followup.followup.print:0
@ -230,6 +230,19 @@ msgid ""
"Best Regards,\n"
"\t\t\t"
msgstr ""
"\n"
"Poštovani %(partner_name)s,\n"
"\n"
"Zanemarite ovu poruku ukoliko je u pitanju naša greška. Izgleda da je "
"slijedeći iznos ostao neplaćen. Molimo Vas da poduzmete mjere potrebne da se "
"ovaj dug izmiri u narednih 8 dana.\n"
"\n"
"Ukoliko ste izvršili uplatu nako što je ova poruka poslana, molimo vas da "
"zanemarite ovu poruku. Ne ustručavajte se kontaktirati nas na broj: (br. "
"telefona).\n"
"\n"
"Srdačan pozdrav.\n"
"\t\t\t"
#. module: account_followup
#: constraint:ir.model:0
@ -247,55 +260,55 @@ msgstr "U redu"
#: field:account_followup.followup,name:0
#: field:account_followup.followup.line,name:0
msgid "Name"
msgstr "Ime"
msgstr "Naziv"
#. module: account_followup
#: field:account_followup.stat,date_move:0
msgid "First move"
msgstr ""
msgstr "Prvo knjiženje"
#. module: account_followup
#: selection:account_followup.followup.line,start:0
msgid "End of Month"
msgstr "Kraj Mjeseca"
msgstr "Kraj mjeseca"
#. module: account_followup
#: view:account_followup.followup.line:0
#: wizard_view:account_followup.followup.print.all,next:0
msgid "%(company_name)s: User's Company name"
msgstr ""
msgstr "%(company_name)s: Naziv poduzeća korisnika"
#. module: account_followup
#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all
#: model:ir.ui.menu,name:account_followup.menu_account_move_open_unreconcile
msgid "All receivable entries"
msgstr ""
msgstr "Sve stavke potraživanja"
#. module: account_followup
#: view:account_followup.followup:0
msgid "Lines"
msgstr "Linije"
msgstr "Stavke"
#. module: account_followup
#: model:ir.actions.wizard,name:account_followup.action_account_followup_all_wizard
#: model:ir.ui.menu,name:account_followup.account_followup_wizard_menu
msgid "Send followups"
msgstr "Pošaljite napomene"
msgstr "Pošaljite opomene"
#. module: account_followup
#: field:account.move.line,followup_line_id:0
msgid "Follow-up Level"
msgstr "Stupanj napomene"
msgstr "Stupanj opomene"
#. module: account_followup
#: field:account_followup.stat,credit:0
msgid "Credit"
msgstr ""
msgstr "Potraživanje"
#. module: account_followup
#: model:ir.model,name:account_followup.model_account_followup_stat
msgid "Followup statistics"
msgstr ""
msgstr "Statistike opomena"
#. module: account_followup
#: wizard_button:account_followup.followup.print.all,init,next:0
@ -305,49 +318,49 @@ msgstr "Nastavi"
#. module: account_followup
#: model:ir.module.module,shortdesc:account_followup.module_meta_information
msgid "Accounting follow-ups management"
msgstr ""
msgstr "Upravljanje računovodstvenim opomenama"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,summary:0
#: wizard_field:account_followup.followup.print.all,summary,summary:0
msgid "Summary"
msgstr ""
msgstr "Sažetak"
#. module: account_followup
#: view:account_followup.followup.line:0
msgid "Follow-Up Lines"
msgstr ""
msgstr "Stavke opomene"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Document : Customer account statement"
msgstr ""
msgstr "Dokument : Izvod konta kupca"
#. module: account_followup
#: view:account_followup.stat:0
msgid "Follow-Up lines"
msgstr ""
msgstr "Stavke opomene"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
msgid "%(company_currency)s: User's Company Currency"
msgstr "%(company_currency): Valuta poduzeća korisnika"
msgstr "%(company_currency)s: Valuta poduzeća korisnika"
#. module: account_followup
#: field:account_followup.stat,balance:0
msgid "Balance"
msgstr "Balans"
msgstr "Saldo"
#. module: account_followup
#: help:account_followup.followup.print.all,init,date:0
msgid ""
"This field allow you to select a forecast date to plan your follow-ups"
msgstr ""
msgstr "Ovo polje omogućuje odabir budućeg datuma za planiranje opomena"
#. module: account_followup
#: view:account.move.line:0
msgid "Total credit"
msgstr ""
msgstr "Ukupno potražuje"
#. module: account_followup
#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
@ -373,16 +386,35 @@ msgid ""
"Best Regards,\n"
"\t\t\t"
msgstr ""
"\n"
"Poštovani %(partner_name)s,\n"
"\n"
"Razočarani smo što ste, usprkos našoj napomeni, sada u ozbiljnom "
"prekoračenju plaćanja.\n"
"\n"
"Neophodno je da odmah izmirite svoja dugovanja, u suprotnom morati ćemo "
"razmotriti obustavljanje naše suradnje.\n"
"\n"
"Molimo Vas da poduzmete neophodne mjere da se dugovanje izmiri odmah.\n"
"\n"
"Ukoliko postoje problemi sa plaćanjem kojih mi možda nismo svjesni, ne "
"ustručavajte se kontaktirati naše računovodstvo na broj (br. tel.) tako da "
"odmah pristupimo rješavanju problema.\n"
"\n"
"Detalji dospjelih potraživanje su ispod.\n"
"\n"
"Srdačan pozdrav,\n"
"\t\t\t"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Sub-Total:"
msgstr ""
msgstr "Suma:"
#. module: account_followup
#: selection:account_followup.followup.line,start:0
msgid "Net Days"
msgstr ""
msgstr "Ukupno dana"
#. module: account_followup
#: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
@ -391,7 +423,7 @@ msgstr ""
#: model:ir.ui.menu,name:account_followup.account_followup_menu
#: model:ir.ui.menu,name:account_followup.menu_action_followup_stat
msgid "Follow-Ups"
msgstr ""
msgstr "Opomene"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
@ -402,17 +434,17 @@ msgstr "E-mail tekst"
#. module: account_followup
#: field:account_followup.stat,date_move_last:0
msgid "Last move"
msgstr ""
msgstr "Poslijenje knjiženje"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Maturity"
msgstr "Dospijeće"
msgstr "Dospjelost"
#. module: account_followup
#: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
msgid "Followup Report"
msgstr "Izvještaj o napomenama"
msgstr "Izvještaj o opomenama"
#. module: account_followup
#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
@ -434,17 +466,34 @@ msgid ""
"Best Regards,\n"
"\t\t\t"
msgstr ""
"\n"
"Poštovani %(partner_name)s,\n"
"\n"
"Usprkos slanju nekoliko napomena, vaš dug nije izmiren.\n"
"\n"
"Ukoliko ne izvršite uplatu dugovanja u narednih 8 dana, poduzeti ćemo "
"zakonom predviđene mjere za povrat duga bez daljih upozorenja.\n"
"\n"
"Vjerujemo da do toga neće morati doći te Vam ponovo dostavljamo detalje "
"dospjelih potraživanja.\n"
"\n"
"U slučaju bilo kakvih nejasnoća vezanih uz ovo pitanje, ne ustručavajte se "
"kontaktirati naše računovodstvo na \n"
"(br. tel.)\n"
"\n"
"S poštovanjem.\n"
"\t\t\t"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Maturity Date"
msgstr "Datum Dospijeać"
msgstr "Datum dospjelosti"
#. module: account_followup
#: view:account_followup.followup.line:0
#: wizard_view:account_followup.followup.print.all,next:0
msgid "Legend"
msgstr ""
msgstr "Legenda"
#. module: account_followup
#: field:account_followup.followup.line,sequence:0
@ -460,7 +509,7 @@ msgstr "%(heading)s: Zaglavlje retka izmjena"
#: view:account_followup.followup.line:0
#: wizard_view:account_followup.followup.print.all,next:0
msgid "%(partner_name)s: Partner name"
msgstr ""
msgstr "%(partner_name)s: Naziv partnera"
#. module: account_followup
#: wizard_field:account_followup.followup.print.all,next,email_conf:0
@ -470,7 +519,7 @@ msgstr "Pošalji e-mail potvrdu"
#. module: account_followup
#: wizard_field:account_followup.followup.print.all,init,followup_id:0
msgid "Follow-up"
msgstr ""
msgstr "Opomena"
#. module: account_followup
#: field:account_followup.stat,name:0
@ -491,4 +540,4 @@ msgstr "Dani kašnjenja"
#. module: account_followup
#: wizard_button:account_followup.followup.print.all,next,print:0
msgid "Print Follow Ups & Send Mails"
msgstr ""
msgstr "Ispiši opomene i pošalji email-ove"

1
addons/account_followup/wizard/account_followup_print.py
View File

@ -304,7 +304,6 @@ class account_followup_print_all(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account_followup.followup.print',
'datas': datas,
'nodestroy': True
}
account_followup_print_all()

14
addons/account_invoice_layout/i18n/bs.po
View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-07-07 09:53+0000\n"
"PO-Revision-Date: 2010-08-01 12:20+0000\n"
"Last-Translator: Bojan Markovic <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-07-08 03:50+0000\n"
"X-Launchpad-Export-Date: 2010-08-02 03:49+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
@ -36,7 +36,7 @@ msgstr ""
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Cancelled Invoice"
msgstr "Poništena faktura"
msgstr "Opozvana faktura"
#. module: account_invoice_layout
#: selection:account.invoice.line,state:0
@ -93,7 +93,7 @@ msgstr "Napomeni po porukama"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "PRO-FORMA"
msgstr "PRO-FORMA"
msgstr "Pro-forma"
#. module: account_invoice_layout
#: field:account.invoice,abstract_line_ids:0
@ -113,7 +113,7 @@ msgstr "Poruka napomene"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Customer Ref:"
msgstr "Referenca kupca"
msgstr "Referenca kupca:"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
@ -183,7 +183,7 @@ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
#. module: account_invoice_layout
#: selection:account.invoice.line,state:0
msgid "Page Break"
msgstr ""
msgstr "Prelom stranice"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
@ -263,7 +263,7 @@ msgstr "Faktura dobavljača"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0
msgid "Note :"
msgstr ""
msgstr "Napomena :"
#. module: account_invoice_layout
#: rml:account.invoice.layout:0

142
addons/account_report/i18n/bs.po
View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-07-09 06:46+0000\n"
"PO-Revision-Date: 2010-08-01 17:48+0000\n"
"Last-Translator: Bojan Markovic <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-07-10 04:02+0000\n"
"X-Launchpad-Export-Date: 2010-08-02 03:49+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
@ -21,7 +21,7 @@ msgstr ""
#: selection:account.report.report,type:0
#: model:ir.model,name:account_report.model_account_report_history
msgid "Indicator"
msgstr ""
msgstr "Indikator"
#. module: account_report
#: wizard_field:print.indicators.pdf,init,file:0
@ -81,7 +81,7 @@ msgstr "= Limit indikatora dobrote:"
#. module: account_report
#: view:account.report.report:0
msgid "Very bad"
msgstr ""
msgstr "Vrlo loše"
#. module: account_report
#: field:account.report.history,val:0
@ -92,38 +92,38 @@ msgstr "Vrijednost"
#. module: account_report
#: view:account.report.report:0
msgid "= Badness Indicator Limit:"
msgstr ""
msgstr "= Limit indikatora za loše:"
#. module: account_report
#: view:account.report.report:0
#: selection:account.report.report,status:0
msgid "Bad"
msgstr ""
msgstr "Loše"
#. module: account_report
#: wizard_view:print.indicators.pdf,init:0
msgid "Select the PDF file on which Indicators will be printed."
msgstr ""
msgstr "Odaberi PDF datoteku na kojoj će indikatori biti ispisani"
#. module: account_report
#: view:account.report.report:0
msgid "> Goodness Indicator Limit:"
msgstr ""
msgstr "> Limit indikatora dobrog:"
#. module: account_report
#: field:account.report.report,badness_limit:0
msgid "Badness Indicator Limit"
msgstr ""
msgstr "Limit indikatora lošeg"
#. module: account_report
#: selection:account.report.report,status:0
msgid "Very Bad"
msgstr ""
msgstr "Vrlo loše"
#. module: account_report
#: model:ir.actions.act_window,name:account_report.account_report_history_record_structure
msgid "Indicator history"
msgstr ""
msgstr "Istorija indikatora"
#. module: account_report
#: view:account.report.report:0
@ -143,7 +143,7 @@ msgstr "Fiskalni izvod"
#. module: account_report
#: wizard_button:print.indicators,init,next:0
msgid "Next"
msgstr ""
msgstr "Slijedeći"
#. module: account_report
#: model:ir.module.module,shortdesc:account_report.module_meta_information
@ -154,12 +154,12 @@ msgstr "Izvještavanje za računovodstvo"
#: wizard_button:print.indicators,next,print:0
#: wizard_button:print.indicators.pdf,init,print:0
msgid "Print"
msgstr ""
msgstr "Ispis"
#. module: account_report
#: field:account.report.report,type:0
msgid "Type"
msgstr ""
msgstr "Vrsta"
#. module: account_report
#: model:ir.actions.report.xml,name:account_report.report_indicator_pdf
@ -169,18 +169,18 @@ msgstr "Ispiši indikatore u PDF"
#. module: account_report
#: view:account.report.report:0
msgid "Account Tax Code:"
msgstr ""
msgstr "Porezni broj konta"
#. module: account_report
#: view:account.report.report:0
#: selection:account.report.report,status:0
msgid "Good"
msgstr ""
msgstr "Dobro"
#. module: account_report
#: view:account.report.history:0
msgid "Account Report History"
msgstr ""
msgstr "Istorija izvještaja konta"
#. module: account_report
#: constraint:ir.ui.view:0
@ -190,12 +190,12 @@ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
#. module: account_report
#: help:account.report.report,badness_limit:0
msgid "This Value sets the limit of badness."
msgstr ""
msgstr "Ova vrijednost postavlja limit lošeg."
#. module: account_report
#: wizard_field:print.indicators,init,select_base:0
msgid "Choose Criteria"
msgstr ""
msgstr "Odaberite kriterij"
#. module: account_report
#: view:account.report.report:0
@ -205,39 +205,39 @@ msgstr ""
#. module: account_report
#: view:account.report.report:0
msgid "Account Credit:"
msgstr ""
msgstr "Potraživanje konta:"
#. module: account_report
#: wizard_view:print.indicators,init:0
msgid "Select the criteria based on which Indicators will be printed."
msgstr ""
msgstr "Odaberite kriterije prema kojima će indikatori biti ispisani."
#. module: account_report
#: view:account.report.report:0
msgid "< Badness Indicator Limit:"
msgstr ""
msgstr "< Limit indikatora lođeg:"
#. module: account_report
#: view:account.report.report:0
#: selection:account.report.report,status:0
msgid "Very Good"
msgstr ""
msgstr "Vrlo dobro"
#. module: account_report
#: field:account.report.report,note:0
msgid "Note"
msgstr ""
msgstr "Bilješka"
#. module: account_report
#: rml:accounting.report:0
#: rml:print.indicators:0
msgid "Currency:"
msgstr ""
msgstr "Valuta:"
#. module: account_report
#: field:account.report.report,status:0
msgid "Status"
msgstr ""
msgstr "Status"
#. module: account_report
#: help:account.report.report,disp_tree:0
@ -245,6 +245,9 @@ msgid ""
"When the indicators are printed, if one indicator is set with this field to "
"True, then it will display one more graphs with all its children in tree"
msgstr ""
"Kad su indikatori ispisani, ako je jedan od indikatora postavljen sa ovim "
"poljem, prikazat će jedan ili više grafova sa svim svojim podindikatorima u "
"stablu."
#. module: account_report
#: selection:account.report.report,status:0
@ -254,32 +257,32 @@ msgstr "Normalno"
#. module: account_report
#: view:account.report.report:0
msgid "Example: (balance(['6','45'],-1) - credit(['7'])) / report('RPT1')"
msgstr ""
msgstr "Npr: (balance(['6','45'],-1) - credit(['7'])) / report('RPT1')"
#. module: account_report
#: field:account.report.report,active:0
msgid "Active"
msgstr ""
msgstr "Aktivan"
#. module: account_report
#: field:account.report.report,disp_tree:0
msgid "Display Tree"
msgstr ""
msgstr "Prikaz stabla"
#. module: account_report
#: selection:print.indicators,init,select_base:0
msgid "Based On Fiscal Years"
msgstr ""
msgstr "Bazirano na fiskalnim godinama"
#. module: account_report
#: model:ir.model,name:account_report.model_account_report_report
msgid "Account reporting"
msgstr ""
msgstr "Izvještavanje za konto"
#. module: account_report
#: view:account.report.report:0
msgid "Account Balance:"
msgstr ""
msgstr "Saldo konta:"
#. module: account_report
#: rml:print.indicators:0
@ -299,62 +302,63 @@ msgstr "Izraz"
#. module: account_report
#: view:account.report.report:0
msgid "Accounting reporting"
msgstr ""
msgstr "Izvještavanje za računovodsvto"
#. module: account_report
#: model:ir.actions.act_window,name:account_report.action_account_report_form
#: model:ir.ui.menu,name:account_report.menu_action_account_report_form
msgid "New Reporting Item Formula"
msgstr ""
msgstr "Formula nove stavke izvještavanja"
#. module: account_report
#: field:account.report.report,code:0
#: rml:accounting.report:0
msgid "Code"
msgstr ""
msgstr "Šifra"
#. module: account_report
#: field:account.report.history,tmp:0
msgid "temp"
msgstr ""
msgstr "temp"
#. module: account_report
#: field:account.report.history,period_id:0
msgid "Period"
msgstr ""
msgstr "Period"
#. module: account_report
#: view:account.report.report:0
msgid "General"
msgstr ""
msgstr "Općenito"
#. module: account_report
#: view:account.report.report:0
msgid "Legend of operators"
msgstr ""
msgstr "Legenda operatora"
#. module: account_report
#: wizard_button:print.indicators,init,end:0
#: wizard_button:print.indicators,next,end:0
#: wizard_button:print.indicators.pdf,init,end:0
msgid "Cancel"
msgstr ""
msgstr "Otkaži"
#. module: account_report
#: field:account.report.report,child_ids:0
msgid "Children"
msgstr ""
msgstr "Potomci"
#. module: account_report
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
"Naziv objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
#. module: account_report
#: help:account.report.report,goodness_limit:0
msgid "This Value sets the limit of goodness."
msgstr ""
msgstr "Ova vrijednost postavlja limit za dobro."
#. module: account_report
#: model:ir.actions.wizard,name:account_report.wizard_print_indicators
@ -362,7 +366,7 @@ msgstr ""
#: wizard_view:print.indicators,init:0
#: wizard_view:print.indicators,next:0
msgid "Print Indicators"
msgstr ""
msgstr "Ispis indikatora"
#. module: account_report
#: view:account.report.report:0
@ -373,12 +377,12 @@ msgstr ""
#: rml:accounting.report:0
#: rml:print.indicators:0
msgid "Printing date:"
msgstr ""
msgstr "Datum ispisa:"
#. module: account_report
#: model:ir.actions.wizard,name:account_report.wizard_indicators_with_pdf
msgid "Indicators in PDF"
msgstr ""
msgstr "Indikatori u PDF-u"
#. module: account_report
#: rml:accounting.report:0
@ -389,18 +393,18 @@ msgstr ""
#. module: account_report
#: rml:accounting.report:0
msgid "Accounting Report"
msgstr ""
msgstr "Računovodstveni izvještaj"
#. module: account_report
#: field:account.report.report,goodness_limit:0
msgid "Goodness Indicator Limit"
msgstr ""
msgstr "Limit indikatora dobroga"
#. module: account_report
#: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_other
#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_other
msgid "Other reports"
msgstr ""
msgstr "Ostali izvještaji"
#. module: account_report
#: view:account.report.report:0
@ -408,6 +412,8 @@ msgid ""
"Note: The second arguement 'fiscalyear' and 'period' are optional "
"arguements.If the value is -1,previous fiscalyear or period is considered."
msgstr ""
"Napomena: Drugi argumenti 'fiscalyear' i 'period' su opcionalni. Ako je "
"vrijdnost -1, uzima se prethodna fiskalna gofina odn. period."
#. module: account_report
#: rml:print.indicators:0
@ -418,41 +424,41 @@ msgstr ""
#: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_fiscal
#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_fiscal
msgid "Fiscal Statements reporting"
msgstr ""
msgstr "Izještavanje fiskalnim izvodima"
#. module: account_report
#: selection:print.indicators,init,select_base:0
msgid "Based on Fiscal Periods"
msgstr ""
msgstr "Bazirano na fiskalnim periodima"
#. module: account_report
#: model:ir.actions.report.xml,name:account_report.report_print_indicators
#: rml:print.indicators:0
msgid "Indicators"
msgstr ""
msgstr "Indikatori"
#. module: account_report
#: wizard_view:print.indicators.pdf,init:0
msgid "Print Indicators with PDF"
msgstr ""
msgstr "Ipis indikatora u PDF"
#. module: account_report
#: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_indicator
#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_indicator
msgid "Indicators reporting"
msgstr ""
msgstr "Izvještavanje indikatora"
#. module: account_report
#: field:account.report.report,name:0
#: rml:accounting.report:0
#: rml:print.indicators:0
msgid "Name"
msgstr ""
msgstr "Naziv"
#. module: account_report
#: wizard_field:print.indicators,next,base_selection:0
msgid "Select Criteria"
msgstr ""
msgstr "Odaberite kriterij"
#. module: account_report
#: view:account.report.report:0
@ -462,7 +468,7 @@ msgstr ""
#. module: account_report
#: field:account.report.history,fiscalyear_id:0
msgid "Fiscal Year"
msgstr ""
msgstr "Fisklana godina"
#. module: account_report
#: model:ir.actions.act_window,name:account_report.action_account_report_tree
@ -470,22 +476,22 @@ msgstr ""
#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_define
#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view
msgid "Custom reporting"
msgstr ""
msgstr "Prilagođeno izvještavanje"
#. module: account_report
#: rml:print.indicators:0
msgid "Page"
msgstr ""
msgstr "Stranica"
#. module: account_report
#: selection:account.report.report,type:0
msgid "View"
msgstr ""
msgstr "Prikaz"
#. module: account_report
#: rml:print.indicators:0
msgid "Indicators -"
msgstr ""
msgstr "Indikatori -"
#. module: account_report
#: help:account.report.report,disp_graph:0
@ -493,26 +499,28 @@ msgid ""
"If the field is set to True, information will be printed as a Graph, "
"otherwise as an array."
msgstr ""
"Ukoliko je ovo polje postavljeno, informacija će biti ispisana kao grafikon. "
"U suprotnom, biti će ispisana kao niz."
#. module: account_report
#: view:account.report.report:0
msgid "Return value for status"
msgstr ""
msgstr "Povratna vrijednost statusa"
#. module: account_report
#: field:account.report.report,sequence:0
msgid "Sequence"
msgstr ""
msgstr "Sekvenca"
#. module: account_report
#: rml:accounting.report:0
msgid "Amount"
msgstr ""
msgstr "Iznos"
#. module: account_report
#: rml:print.indicators:0
msgid "1cm 27.7cm 20cm 27.7cm"
msgstr ""
msgstr "1cm 27.7cm 20cm 27.7cm"
#. module: account_report
#: model:ir.module.module,description:account_report.module_meta_information
@ -522,8 +530,12 @@ msgid ""
" Indicators\n"
" "
msgstr ""
"Finansijsko i računovodstveno izvještavanje\n"
" Fiskalni izvodi\n"
" Indikator\n"
" "
#. module: account_report
#: selection:account.report.report,type:0
msgid "Fiscal Statement"
msgstr ""
msgstr "Fiskalni izvod"

73
addons/account_reporting/i18n/bs.po
View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-07-07 09:23+0000\n"
"PO-Revision-Date: 2010-08-01 17:51+0000\n"
"Last-Translator: Bojan Markovic <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-07-08 03:50+0000\n"
"X-Launchpad-Export-Date: 2010-08-02 03:49+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
@ -26,37 +26,38 @@ msgstr "šifra"
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
"Naziv objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
msgid "Helvetica-Bold"
msgstr ""
msgstr "Helvetica-Bold"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
msgid "Helvetica"
msgstr ""
msgstr "Helvetica"
#. module: account_reporting
#: field:account.report.bs,note:0
msgid "Note"
msgstr ""
msgstr "Bilješka"
#. module: account_reporting
#: field:account.report.bs,report_type:0
msgid "Report Type"
msgstr ""
msgstr "Vrsta izvještaja"
#. module: account_reporting
#: model:ir.ui.menu,name:account_reporting.action_account_report_bs_form
#: model:ir.ui.menu,name:account_reporting.menu_finan_config_BSheet
msgid "Balance Sheet Report"
msgstr ""
msgstr "Bilansni izvješaj"
#. module: account_reporting
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr ""
msgstr "Neispravan naziv modela u definiciji zadatka."
#. module: account_reporting
#: selection:account.report.bs,font_style:0
@ -66,27 +67,27 @@ msgstr "Courier"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
msgid "Courier-BoldOblique"
msgstr ""
msgstr "Courier-BoldOblique"
#. module: account_reporting
#: wizard_button:account.account.balancesheet.report,init,report:0
msgid "Print BalanceSheet"
msgstr ""
msgstr "Ispis bilansnog izvještaja"
#. module: account_reporting
#: help:account.account.balancesheet.report,init,periods:0
msgid "All periods if empty"
msgstr ""
msgstr "Ako je prazno, sva razdoblja"
#. module: account_reporting
#: field:account.report.bs,color_font:0
msgid "Font Color"
msgstr ""
msgstr "Boja slova"
#. module: account_reporting
#: selection:account.report.bs,report_type:0
msgid "Report Objects With Accounts and child of Accounts"
msgstr ""
msgstr "Objekti izvještaja sa kontima i podkontima"
#. module: account_reporting
#: model:ir.module.module,description:account_reporting.module_meta_information
@ -94,6 +95,8 @@ msgid ""
"Financial and accounting reporting\n"
" Balance Sheet Report"
msgstr ""
"Finansijsko i računovodstveno izvještavanje\n"
" Bilansni izvještaj"
#. module: account_reporting
#: selection:account.report.bs,report_type:0
@ -103,7 +106,7 @@ msgstr "Objekti izvještaja sa kontima"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
msgid "Courier-Oblique"
msgstr ""
msgstr "Courier-Oblique"
#. module: account_reporting
#: constraint:ir.ui.view:0
@ -114,32 +117,32 @@ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
#: field:account.report.bs,name:0
#: field:color.rml,name:0
msgid "Name"
msgstr ""
msgstr "Naziv"
#. module: account_reporting
#: view:account.report.bs:0
msgid "Account reporting"
msgstr ""
msgstr "Računovodstveno izvještavanje"
#. module: account_reporting
#: model:ir.ui.menu,name:account_reporting.bs_report_action_form
msgid "Balance Sheet Report Form"
msgstr ""
msgstr "Forma bilansnog izvještaja"
#. module: account_reporting
#: view:account.report.bs:0
msgid "Notes"
msgstr ""
msgstr "Bilješke"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
msgid "Times-BoldItalic"
msgstr ""
msgstr "Times-BoldItalic"
#. module: account_reporting
#: model:ir.model,name:account_reporting.model_account_report_bs
msgid "Account reporting for Balance Sheet"
msgstr ""
msgstr "Računovodstveno izvještavanje za bilansu stanja"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
@ -154,32 +157,32 @@ msgstr "Times-Italic"
#. module: account_reporting
#: selection:account.report.bs,report_type:0
msgid "Report Objects Only"
msgstr ""
msgstr "Samo objekti izvještaja"
#. module: account_reporting
#: model:ir.model,name:account_reporting.model_color_rml
msgid "Rml Colors"
msgstr ""
msgstr "Rml boje"
#. module: account_reporting
#: model:ir.module.module,shortdesc:account_reporting.module_meta_information
msgid "Reporting of Balancesheet for accounting"
msgstr ""
msgstr "Bilansno izvještavanje za računovodstvo"
#. module: account_reporting
#: field:account.report.bs,code:0
msgid "Code"
msgstr ""
msgstr "Šifra"
#. module: account_reporting
#: field:account.report.bs,parent_id:0
msgid "Parent"
msgstr ""
msgstr "Roditelj"
#. module: account_reporting
#: field:account.report.bs,sequence:0
msgid "Sequence"
msgstr ""
msgstr "Sekvenca"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
@ -194,13 +197,13 @@ msgstr "Općenito"
#. module: account_reporting
#: wizard_field:account.account.balancesheet.report,init,fiscalyear:0
msgid "Fiscal year"
msgstr ""
msgstr "Fiskalna godina"
#. module: account_reporting
#: view:account.report.bs:0
#: field:account.report.bs,account_id:0
msgid "Accounts"
msgstr ""
msgstr "Konta"
#. module: account_reporting
#: wizard_field:account.account.balancesheet.report,init,periods:0
@ -210,34 +213,34 @@ msgstr "Periodi"
#. module: account_reporting
#: field:account.report.bs,color_back:0
msgid "Back Color"
msgstr ""
msgstr "Boja pozadine"
#. module: account_reporting
#: field:account.report.bs,child_id:0
msgid "Children"
msgstr ""
msgstr "Potomci"
#. module: account_reporting
#: wizard_button:account.account.balancesheet.report,init,end:0
msgid "Cancel"
msgstr ""
msgstr "Otkaži"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
msgid "Times-Roman"
msgstr ""
msgstr "Times-Roman"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
msgid "Helvetica-Oblique"
msgstr ""
msgstr "Helvetica-Oblique"
#. module: account_reporting
#: field:account.report.bs,font_style:0
msgid "Font"
msgstr ""
msgstr "Font"
#. module: account_reporting
#: wizard_view:account.account.balancesheet.report,init:0
msgid "Customize Report"
msgstr ""
msgstr "Prilagodite izvještaj"

19
addons/account_voucher/voucher.py
View File

@ -269,8 +269,16 @@ class account_voucher(osv.osv):
continue
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)
if inv.type in ('journal_pur_voucher', 'journal_sale_vou'):
if journal.invoice_sequence_id:
name = sequence_pool.get_id(cr, uid, journal.invoice_sequence_id.id)
else:
raise osv.except_osv(_('Error !'), _('Please define invoice sequence on %s journal !' % (journal.name)))
else:
if journal.sequence_id:
name = sequence_pool.get_id(cr, uid, journal.sequence_id.id)
else:
raise osv.except_osv(_('Error !'), _('Please define sequence on journal !'))
ref = False
if inv.type in ('journal_pur_voucher', 'bank_rec_voucher', 'rec_voucher'):
@ -462,25 +470,24 @@ class account_voucher_line(osv.osv):
account_id = False
partner = partner_pool.browse(cr, uid, partner_id)
balance = 0.0
if type1 in ('rec_voucher','bank_rec_voucher', 'journal_voucher'):
if type1 in ('rec_voucher', 'bank_rec_voucher', 'journal_voucher'):
account_id = partner.property_account_receivable.id
balance = partner.credit
ttype = 'cr'
elif type1 in ('pay_voucher','bank_pay_voucher','cont_voucher') :
elif type1 in ('pay_voucher', 'bank_pay_voucher', 'journal_voucher') :
account_id = partner.property_account_payable.id
balance = partner.debit
ttype = 'dr'
elif type1 in ('journal_sale_vou') :
account_id = partner.property_account_receivable.id
balance = partner.credit
ttype = 'dr'
elif type1 in ('journal_pur_voucher') :
account_id = partner.property_account_payable.id
balance = partner.debit
ttype = 'cr'
if company.currency_id != currency:

4
addons/account_voucher/voucher_view.xml
View File

@ -89,7 +89,7 @@
<filter icon="terp-check" string="Proforma" domain="[('state','=','proforma')]" help="Proforma Vouchers"/>
<filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
<filter icon="terp-stock_effects-object-colorize" string="Reviewed" domain="[('state','=','audit')]" groups="base.group_extended" help="To Review"/>
<filter icon="terp-gtk-stop" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Vouchers" groups="base.group_extended"/>
<filter icon="gtk-cancel" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Vouchers" groups="base.group_extended"/>
<separator orientation="vertical"/>
<field name="reference" select="1"/>
<field name="number" select='1'/>
@ -126,7 +126,7 @@
<filter icon="terp-check" string="Proforma" domain="[('state','=','proforma')]" help="Proforma Vouchers"/>
<filter icon="terp-camera_test" string="Posted" domain="[('state','=','audit')]" help="Posted Vouchers"/>
<filter icon="terp-stock_effects-object-colorize" string="To Review" domain="[('state','=','posted')]" groups="base.group_extended" help="To Review"/>
<filter icon="terp-gtk-stop" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Vouchers" groups="base.group_extended"/>
<filter icon="gtk-cancel" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Vouchers" groups="base.group_extended"/>
<separator orientation="vertical"/>
<field name="reference" select="1"/>
<field name="number" select='1'/>

20
addons/account_voucher_payment/account_voucher_payment.py
View File

@ -40,13 +40,15 @@ class account_invoice(osv.osv):
@return: Returns a list of ids based on search domain
"""
if not context:
context = {}
ttype = context.get('ttype', False)
if ttype and ttype in ('rec_voucher', 'bank_rec_voucher'):
args += [('type','in', ['out_invoice', 'in_refund'])]
elif ttype and ttype in ('pay_voucher', 'bank_pay_voucher'):
args += [('type','in', ['in_invoice', 'out_refund'])]
elif ttype and ttype in('journal_sale_vou', 'journal_pur_voucher', 'journal_voucher'):
raise osv.except_osv(_('Invalid action !'), _('You can not reconcile sales, purchase, or journal entry with invoice !'))
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)
@ -79,13 +81,21 @@ class account_voucher(osv.osv):
invoice_pool = self.pool.get('account.invoice')
for inv in self.browse(cr, uid, ids):
if inv.move_id:
continue
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)
if inv.type in ('journal_pur_voucher', 'journal_sale_vou'):
if journal.invoice_sequence_id:
name = sequence_pool.get_id(cr, uid, journal.invoice_sequence_id.id)
else:
raise osv.except_osv(_('Error !'), _('Please define invoice sequence on %s journal !' % (journal.name)))
else:
if journal.sequence_id:
name = sequence_pool.get_id(cr, uid, journal.sequence_id.id)
else:
raise osv.except_osv(_('Error !'), _('Please define sequence on journal !'))
ref = False
if inv.type in ('journal_pur_voucher', 'bank_rec_voucher', 'rec_voucher'):

2
addons/crm/__openerp__.py
View File

@ -124,7 +124,7 @@ Create dashboard for CRM that includes:
],
'test': [
'test/test_crm_lead.yml',
#'test/test_crm_meeting.yml',
'test/test_crm_meeting.yml',
'test/test_crm_opportunity.yml',
'test/test_crm_phonecall.yml',
],

14
addons/crm/crm_lead.py
View File

@ -163,11 +163,6 @@ class crm_lead(osv.osv, crm_case):
'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
}
def create(self, cr, uid, vals, context=None):
if not vals.get('stage_id',False):
raise osv.except_osv('Error', _('There is no stage defined for this Sales Team'))
return super(crm_lead, self).create(cr, uid, vals, context=context)
def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
"""This function returns value of partner email based on Partner Address
@param self: The object pointer
@ -181,7 +176,7 @@ class crm_lead(osv.osv, crm_case):
return {'value': {'email_from': False, 'country_id': False}}
address = self.pool.get('res.partner.address').browse(cr, uid, add)
return {'value': {'email_from': address.email, 'phone': address.phone, 'country_id': address.country_id.id}}
def case_open(self, cr, uid, ids, *args):
"""Overrides cancel for crm_case for setting Open Date
@param self: The object pointer
@ -194,9 +189,10 @@ class crm_lead(osv.osv, crm_case):
res = super(crm_lead, self).case_open(cr, uid, ids, *args)
if old_state == 'draft':
stage_id = super(crm_lead, self).stage_next(cr, uid, ids, *args)
if not stage_id:
raise osv.except_osv(_('Warning !'), _('There is no stage defined for this Sale Team.'))
value = self.onchange_stage_id(cr, uid, ids, stage_id, context={})['value']
if stage_id:
value = self.onchange_stage_id(cr, uid, ids, stage_id, context={})['value']
else:
value = {}
value.update({'date_open': time.strftime('%Y-%m-%d %H:%M:%S'), 'stage_id': stage_id})
self.write(cr, uid, ids, value)

28
addons/crm/crm_lead_view.xml
View File

@ -317,20 +317,6 @@
help="Show Sales Team"/>
</field>
<newline/>
<group expand="0" string="Extended options..." groups="base.group_extended">
<field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
<field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
<separator orientation="vertical"/>
<field name="country_id" context="{'invisible_country': False}">
<filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
</field>
<separator orientation="vertical"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<newline/>
<field name="create_date" string="Creation Date"/>
<field name="date_closed"/>
</group>
<newline/>
<group expand="0" string="Group By...">
<filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
@ -343,6 +329,20 @@
<filter string="Creation" icon="terp-go-month"
domain="[]" context="{'group_by':'create_date'}" />
</group>
<newline/>
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
<field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
<separator orientation="vertical"/>
<field name="country_id" context="{'invisible_country': False}">
<filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
</field>
<separator orientation="vertical"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<newline/>
<field name="create_date" string="Creation Date"/>
<field name="date_closed"/>
</group>
</search>
</field>
</record>

28
addons/crm/crm_opportunity_view.xml
View File

@ -309,20 +309,6 @@
help="Show Sales Team"/>
</field>
<newline/>
<group expand="0" string="Extended options..." groups="base.group_extended">
<field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
<field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
<separator orientation="vertical"/>
<field name="country_id" context="{'invisible_country': False}">
<filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
</field>
<separator orientation="vertical"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<newline/>
<field name="create_date" string="Creation Date"/>
<field name="date_closed"/>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="16">
<filter string="Stage" icon="terp-stage" domain="[]"
context="{'group_by':'stage_id'}" />
@ -345,6 +331,20 @@
help="Expected Closing" domain="[]"
context="{'group_by':'date_deadline'}" />
</group>
<newline/>
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
<field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
<separator orientation="vertical"/>
<field name="country_id" context="{'invisible_country': False}">
<filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
</field>
<separator orientation="vertical"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<newline/>
<field name="create_date" string="Creation Date"/>
<field name="date_closed"/>
</group>
</search>
</field>
</record>

2
addons/crm/report/crm_lead_report_view.xml
View File

@ -131,7 +131,7 @@
domain="[]" context="{'group_by':'name'}" />
</group>
<newline/>
<group expand="0" string="Extended options..." groups="base.group_extended">
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<field name="partner_id"/>
<separator orientation="vertical"/>
<field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]" />

2
addons/crm/report/crm_phonecall_report_view.xml
View File

@ -145,7 +145,7 @@
</group>
<newline/>
<group expand="0" string="Extended options..." groups="base.group_extended">
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<field name="partner_id"/>
<separator orientation="vertical"/>
<field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>

9
addons/crm/test/test_crm_meeting.yml
View File

@ -55,8 +55,8 @@
I will search for one of the recurrent event and count the number of meeting.
-
!python {model: crm.meeting}: |
ids = self.search(cr, uid, [('date', '>=', '2010-05-21 00:00:00'), ('date', '<=', '2010-04-21 00:00:00')] )
assert len(ids) == 9
ids = self.search(cr, uid, [('date', '>=', '2010-04-21 00:00:00'), ('date', '<=', '2010-05-21 00:00:00')] )
assert len(ids) == 10
- |
Now If I want to edit meetings information for all occurence I click on "Edit All" button.
@ -81,11 +81,6 @@
partner_id: base.res_partner_9
user_ids:
- base.user_demo
- |
If I set Send mail boolean as True I can see that an email is send to
specified email address with proper meeting information.
-
#This is not working for send mail boolean as True.
-
I click on "Invite" button of "Invite attendee" wizard.
-

1
addons/crm/test/test_crm_phonecall.yml
View File

@ -72,7 +72,6 @@
partner_address_id: base.res_partner_address_1
partner_id: base.res_partner_9
phonecall_id: 'crm_phonecall_interviewcall0'
rrule_type: weekly
state: open
- |

4
addons/crm_claim/report/crm_claim_report_view.xml
View File

@ -162,12 +162,12 @@
domain="[]" context="{'group_by':'name'}" />
</group>
<newline/>
<group expand="0" string="Extended options..." groups="base.group_extended">
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<filter icon="terp-dialog-close"
string="Done"
domain="[('state','=','done')]"/>
<filter icon="terp-gtk-stop"
<filter icon="gtk-cancel"
string="Cancel"
domain="[('state','=','cancel')]"/>

4
addons/crm_fundraising/report/crm_fundraising_report_view.xml
View File

@ -153,12 +153,12 @@
</group>
<newline/>
<group expand="0" string="Extended options..." groups="base.group_extended">
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<filter icon="terp-dialog-close"
string="Done"
domain="[('state','=','done')]"/>
<filter icon="terp-gtk-stop"
<filter icon="gtk-cancel"
string="Cancel"
domain="[('state','=','cancel')]"/>

2
addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
View File

@ -144,7 +144,7 @@
</group>
<newline/>
<group expand="0" string="Extended options..." groups="base.group_extended">
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<filter string="Priority" icon="terp-rating-rated"
domain="[]" context="{'group_by':'priority'}" />
</group>

26
addons/document/test/document_test2.yml
View File

@ -1,10 +1,10 @@
-
In order to test the document management
-
I make sure the default installation has some storage and root directory.
In order to test the document management I make sure the default installation has some storage.
-
!assert {model: document.storage, id: storage_default }:
- id != False
-
I make sure the default installation has some root directory.
-
!assert {model: document.directory, id: dir_root}:
- storage_id != False
@ -19,11 +19,12 @@
defaults work)
-
!record {model: ir.attachment, id: file_test1 }:
name: Test file
name: Test file.txt
-
I delete the attachment from the root folder
-
!delete {model: ir.attachment, id: file_test1, search: }
!python {model: ir.attachment}: |
self.unlink(cr, uid, [ref('file_test1')])
-
I create an attachment into the Testing folder.
-
@ -34,13 +35,13 @@
I update the attachment with data, namely "abcd"
-
!record {model: ir.attachment, id: file_test2 }:
datas: "abcd"
datas: "YWJjZA==\n"
-
I test that the datas of the attachment are correct
-
!assert {model: ir.attachment, id: file_test2 }:
- datas == "abcd\n"
- file_size == 5
- datas == "YWJjZA==\n"
- file_size == 4
- file_type == 'text/plain'
-
I rename the attachment.
@ -57,9 +58,9 @@
I create an attachment to a 3rd resource, eg. a res.country
-
!record {model: ir.attachment, id: attach_3rd }:
name: 'Res country attachment.txt'
name: 'Country attachment.txt'
parent_id: dir_tests
datas: 'defg'
datas: "Q291bnRyeSBhdHRhY2htZW50IGNvbnRlbnQ=\n"
res_model: res.country
res_id: !eval ref("base.za")
-
@ -69,4 +70,7 @@
ids = self.search(cr, uid, [('res_model', '=', 'res.country'), ('res_id', '=', ref("base.za"))])
assert ids == [ ref("attach_3rd")], ids
-
!delete {model: ir.attachment, id: attach_3rd, search: }
I delete the attachment
-
!python {model: ir.attachment}: |
self.unlink(cr, uid, [ref('attach_3rd')])

3
addons/document_ics/document_ics_config_wizard.xml
View File

@ -23,6 +23,9 @@
<attribute name='rowspan'>15</attribute>
<attribute name='string'></attribute>
</xpath>
<xpath expr="//button[@name='action_next']" position="attributes">
<attribute name="string">Configure</attribute>
</xpath>
<group string="res_config_contents" position="replace">
<field name="meeting"/>
<field name="opportunity"/>

8
addons/hr/i18n/fr.po
View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-11-17 07:24+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"PO-Revision-Date: 2010-07-30 14:35+0000\n"
"Last-Translator: Julien Thewys (OpenERP) <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-06-22 04:15+0000\n"
"X-Launchpad-Export-Date: 2010-07-31 03:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr
@ -57,7 +57,7 @@ msgstr "Parents"
#. module: hr
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr "Nom de Modèle non valide pour la définition de l'action."
msgstr "Nom de modèle invalide pour la définition de l'action."
#. module: hr
#: view:hr.department:0

2
addons/hr_evaluation/report/hr_evaluation_report_view.xml
View File

@ -74,7 +74,7 @@
<filter string="Year" icon="terp-go-month" context="{'group_by':'year'}"/>
</group>
<newline/>
<group expand="0" string="Extended options..." groups="base.group_extended">
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<field name="rating"/>
<separator orientation="vertical"/>
<field name="deadline"/>

103
addons/hr_evaluation/test/test_hr_evaluation.yml
View File

@ -1,16 +1,14 @@
- |
-
In order to test hr_evaluation module for OpenERP, I will create plan then create evaluation under that plan.
-
|
Given that I have "R & D" Department for employee.
-
I create new Department.
-
!record {model: hr.department, id: hr_department_rd0}:
manager_id: base.user_root
name: 'R & D '
-
|
Given that I have Employee “Mark Johnson” which take Interview.
select "R & D" Department.
name: 'R & D'
-
I create a new employee.
-
!record {model: hr.employee, id: hr_employee_employee0}:
address_home_id: base.res_partner_address_1
@ -20,32 +18,31 @@
name: Mark Johnson
user_id: base.user_root
department_id: 'hr_department_rd0'
- |
I create new employee “Phil Graves ” and select "Mark Johnson" as
Manager.
-
-
I create another new employee and assign first one as it's Manager.
-
!record {model: hr.employee, id: hr_employee_employee1}:
address_home_id: base.res_partner_address_3000
company_id: base.main_company
gender: male
name: Phil Graves
name: Phil Graves
user_id: base.user_demo
parent_id: 'hr_employee_employee0'
- |
I Create "Employee Evaluation" survey for Manager's Evaluation Plan.
-
I Create an "Employee Evaluation" survey for Manager's Evaluation Plan.
-
!record {model: 'survey', id: survey_0}:
title: 'Employee Evaluation'
max_response_limit: 20
response_user: 2
- |
I Create "Employee Evaluation" page in "Employee Evaluation" survey.
-
I Create an "Employee Evaluation" page in "Employee Evaluation" survey.
-
!record {model: 'survey.page', id: survey_employee_page_0}:
title: 'Employee Evaluation'
survey_id: survey_0
- |
-
I Create "What is your Name" question in "Employee Evaluation" survey page.
-
!record {model: 'survey.question', id: survey_p_question_0}:
@ -53,7 +50,7 @@
type: 'single_textbox'
sequence: 1
page_id: survey_employee_page_0
- |
-
I Create "What is your gender" Question in "Employee Evaluation" survey page.
-
!record {model: 'survey.question', id: survey_p_question_1}:
@ -62,30 +59,30 @@
sequence: 2
is_require_answer: true
page_id: survey_employee_page_0
- |
-
I Create "Male" answer in question "What is your gender?"
-
!record {model: 'survey.answer', id: survey_p_1_1}:
answer: 'Male'
sequence: 1
question_id : survey_p_question_1
- |
-
I Create "Female" answer in question "What is your gender?"
-
!record {model: 'survey.answer', id: survey_p_1_2}:
answer: 'Female'
sequence: 2
question_id : survey_p_question_1
- |
Now Survey set in open state.
-
I set the survey in open state.
-
!python {model: survey}: |
self.survey_open(cr, uid, [ref("survey_0")], context)
- |
I creating a Evaluation plan and select "Employee Evaluation" survey for "Send to Subordinates" and "Final interview with Manager" Phase.
-
-
I create an Evaluation plan and select "Employee Evaluation" survey for "Send to Subordinates" and "Final interview with Manager" Phase.
-
!record {model: hr_evaluation.plan, id: hr_evaluation_plan_managersplan0}:
company_id: base.main_company
month_first: 3
@ -99,54 +96,52 @@
name: Final Interview with manager
sequence: 2
survey_id: 'survey_0'
- |
Now I create Evaluation for "Phil Graves" Employee under "Manager Evaluation Plan".
-
-
I create an Evaluation for employee under "Manager Evaluation Plan".
-
!record {model: hr_evaluation.evaluation, id: hr_evaluation_evaluation_0}:
date: '2010-06-28'
employee_id: 'hr_employee_employee1'
plan_id: 'hr_evaluation_plan_managersplan0'
progress: 0.0
state: draft
- |
I check that Evaluation is in "Draft" state.
-
I check that evaluation is in "Draft" state.
-
!assert {model: hr_evaluation.evaluation, id: hr_evaluation_evaluation_0}:
- state == 'draft'
- |
I start Evaluation process by click on "Start Evaluation" button.
- state == 'draft'
-
I start the evaluation process by click on "Start Evaluation" button.
-
!python {model: hr_evaluation.evaluation}: |
self.button_plan_in_progress(cr, uid, [ref('hr_evaluation_evaluation_0')])
self.button_plan_in_progress(cr, uid, [ref('hr_evaluation_evaluation_0')])
- |
After that Manager Evaluation plan is In Progress.
I close this servey request by giving answer of survey question.
-
I close this servey request by giving answer of survey question.
-
!python {model: hr.evaluation.interview}: |
self.survey_req_done(cr, uid, [ref('hr_evaluation_evaluation_0')])
- |
I click on "Final Validation" button to finalize Evaluation.
-
-
I click on "Final Validation" button to finalise evaluation.
-
!python {model: hr_evaluation.evaluation}: |
self.button_final_validation(cr, uid, [ref("hr_evaluation.hr_evaluation_evaluation_0")],
{"active_ids": [ref("hr_evaluation.menu_open_view_hr_evaluation_tree")]})
- |
-
I check that state is "Final Validation".
-
!assert {model: hr_evaluation.evaluation, id: hr_evaluation_evaluation_0}:
- state == 'progress'
- |
!assert {model: hr_evaluation.evaluation, id: hr_evaluation_evaluation_0}:
- state == 'progress'
-
Give Rating "Meet expectations" by selecting overall Rating.
-
-
!record {model: hr_evaluation.evaluation, id: hr_evaluation.hr_evaluation_evaluation_0}:
rating: '2'
- |
-
I close this Evaluation by click on "Done" button of this wizard.
-
-
!python {model: hr_evaluation.evaluation}: |
self.button_done(cr, uid, [ref("hr_evaluation.hr_evaluation_evaluation_0")], {"active_ids": [ref("hr_evaluation.menu_open_view_hr_evaluation_tree")]})

42
addons/hr_expense/test/test_hr_expense.yml
View File

@ -1,27 +1,27 @@
- |
In order to test hr_expenses for OpenERP, I create expense for employee and manage employee's expenses.
- |
Creating unit of measure category "Working Time".
-
In order to test hr_expenses for OpenERP, I create expenses for employee and manage employee's expenses.
-
I create an unit of measure category "Working Time".
-
!record {model: product.uom.categ, id: product_uom_categ_workingtime0}:
name: Working Time.
- |
Given that I have employee "Marc John" and his address.
-
I create a new employee.
-
!record {model: hr.employee, id: hr.employee1}:
address_home_id: base.res_partner_address_1
address_id: base.main_address
- |
I create product unit of measure "Hour".
-
I create product unit of measure "Hour".
-
!record {model: product.uom, id: product_uom_hour0}:
category_id: 'product_uom_categ_workingtime0'
factor: 8.0
name: Hour
rounding: 0.01
- |
Creating a product "travel" and select uom "Hour" and category "Working Time".
-
I Create a product "travel".
-
!record {model: product.product, id: product_product_travel0}:
categ_id: product.product_category_services
@ -41,8 +41,8 @@
weight: 0.0
weight_net: 0.0
- |
Now I create Expense "September Expenses" for Marc John.And select product "travel".
-
I create an expense.
-
!record {model: hr.expense.expense, id: hr_expense_expense_september0}:
company_id: base.main_company
@ -58,38 +58,38 @@
uom_id: product.product_uom_unit
unit_amount: 700.0
user_id: base.user_root
- |
I check that expenses on "draft" state.
-
I check that expense is in "Draft" state.
-
!assert {model: hr.expense.expense, id: hr_expense_expense_september0}:
- state == 'draft'
- |
-
I confirm this expenses by click on "Confirm" button.
-
!workflow {model: hr.expense.expense, action: confirm, ref: hr_expense_expense_september0}
- |
-
I check that state is "Waiting Confirmation".
-
!assert {model: hr.expense.expense, id: hr_expense_expense_september0}:
- state == 'confirm'
- |
-
I accept this expense by click on "Accept" button.
-
!workflow {model: hr.expense.expense, action: validate, ref: hr_expense_expense_september0}
- |
-
I invoiced this expenses by click on "Invoice" button.
-
!workflow {model: hr.expense.expense, action: invoice, ref: hr_expense_expense_september0}
- |
-
I check that state is "Invoiced"
-
!assert {model: hr.expense.expense, id: hr_expense_expense_september0}:
- state == 'invoiced'
- |
Now I check that Invoice is created for that expenses.
-
I check that Invoice is created for the expense.
-
!python {model: hr.expense.expense}: |
exp = self.browse(cr, uid, [ref('hr_expense_expense_september0')])[0]

2
addons/hr_holidays/report/available_holidays_view.xml
View File

@ -71,7 +71,7 @@
<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
</group>
<newline/>
<group expand="0" string="Extended options..." colspan="10" col="12">
<group expand="0" string="Extended Filters..." colspan="10" col="12">
<field name="holiday_status_id" widget="selection"/>
<field name="department_id" widget="selection"/>
</group>

4
addons/hr_holidays/report/hr_holidays_report_view.xml
View File

@ -56,7 +56,7 @@
help = "Draft and Confirmed leaves"/>
<filter string="Validated" icon="terp-camera_test" domain="[('state','=','validate')]"
help = "Pending Leaves"/>
<filter icon="terp-gtk-stop" string="Cancelled" domain="[('state','=','cancel')]"/>
<filter icon="gtk-cancel" string="Cancelled" domain="[('state','=','cancel')]"/>
<separator orientation="vertical"/>
<field name="department_id"/>
<field name="employee_id"/>
@ -80,7 +80,7 @@
<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
</group>
<newline/>
<group expand="0" string="Extended options..." colspan="10" col="12">
<group expand="0" string="Extended Filters..." colspan="10" col="12">
<field name="holiday_status_id"/>
<field name="category_id"/>
<separator orientation="vertical"/>

12
addons/hr_payroll/hr_payroll_demo.xml
View File

@ -8,6 +8,7 @@
<field name="name">Marketing Executive</field>
<field name="company_id" ref="base.main_company"/>
</record>
<record id="hr_payslip_line_houserantallowance1" model="hr.payslip.line">
<field name="amount_type">per</field>
<field name="account_id" ref="account.a_expense"/>
@ -19,6 +20,7 @@
<field name="function_id" ref="hr_payroll.structure_001"/>
<field name="name">House Rant Allowance</field>
</record>
<record id="hr_payslip_line_convanceallowance1" model="hr.payslip.line">
<field name="amount_type">fix</field>
<field name="account_id" ref="account.a_expense"/>
@ -30,6 +32,7 @@
<field name="function_id" ref="hr_payroll.structure_001"/>
<field name="name">Convance Allowance</field>
</record>
<record id="hr_payslip_line_professionaltax1" model="hr.payslip.line">
<field name="amount_type">fix</field>
<field name="account_id" ref="account.a_pay"/>
@ -41,6 +44,7 @@
<field name="function_id" ref="hr_payroll.structure_001"/>
<field name="name">Professional Tax</field>
</record>
<record id="hr_payslip_line_providentfund1" model="hr.payslip.line">
<field name="amount_type">per</field>
<field name="account_id" ref="account.a_pay"/>
@ -52,7 +56,7 @@
<field name="function_id" ref="hr_payroll.structure_001"/>
<field name="name">Provident Fund</field>
</record>
<!-- Employee -->
<record id="hr_employee_bonamy0" model="hr.employee">
<field eval="0" name="manager"/>
@ -62,7 +66,7 @@
<field name="name">Bonamy</field>
<field name="resource_type">user</field>
</record>
<!-- Employee Contract -->
<record id="hr_contract_firstcontract1" model="hr.contract">
<field name="wage_type_id" ref="hr_contract.hr_contract_monthly_gross"/>
@ -74,7 +78,7 @@
<field eval="4000.0" name="wage"/>
<field eval="5" name="working_days_per_week"/>
</record>
<!-- Payslip -->
<record id="hr_payslip_salaryslipofbonamyforjune0" model="hr.payslip">
<field name="number">SLIP/001</field>
@ -87,6 +91,6 @@
<field name="bank_journal_id" ref="account.bank_journal"/>
<field name="name">Salary Slip of Bonamy for June-2010</field>
</record>
</data>
</openerp>

14
addons/hr_payroll/test/payment_advice.yml
View File

@ -2,7 +2,7 @@
I test the 'Payment Advice' in order to check the hr_payroll in OpenERP
-
I create a new employee “Richie”
-
-
!record {model: hr.employee, id: hr_employee_richie0}:
address_home_id: base.res_partner_address_1
address_id: base.res_partner_address_9
@ -27,8 +27,8 @@
salary_account: account.a_recv
vehicle_distance: 0.0
-
Then I create a new payment advice record
-
I create a new payment advice record
-
!record {model: hr.payroll.advice, id: hr_payroll_advice_advice0}:
account_id: account.cash
line_ids:
@ -38,15 +38,15 @@
flag: C
name: Axis Bank
name: advice1
-
In order to confirm a sheet I click on "Confirm Sheet" button
-
-
I confirmed the sheet by click on "Confirm Sheet" button.
-
!python {model: hr.payroll.advice}: |
self.confirm_sheet(cr, uid, [ref("hr_payroll_advice_advice0")], {"lang": "en_US",
"active_model": "ir.ui.menu", "active_ids": [ref("hr_payroll.hr_menu_payment_advice")],
"tz": False, "active_id": ref("hr_payroll.hr_menu_payment_advice")})
-
I check that a state has transferred from draft to confirm
I check that a state is "Confirm"
-
!python {model: hr.payroll.advice}: |
from tools.translate import _

12
addons/hr_payroll/test/payroll_register.yml
View File

@ -2,7 +2,7 @@
I test the 'Payroll Register' in order to check the hr_payroll in OpenERP
-
I create a new employee “Keith”
-
-
!record {model: hr.employee, id: hr_employee_keith0}:
address_home_id: base.res_partner_address_3
address_id: base.res_partner_address_9
@ -27,7 +27,7 @@
salary_account: account.a_recv
vehicle_distance: 0.0
-
I create a payroll register record
I create a payroll register record.
-
!record {model: hr.payroll.register, id: hr_payroll_register_payroll0}:
bank_journal_id: account.bank_journal
@ -38,8 +38,8 @@
bank_journal_id: account.bank_journal
journal_id: account.expenses_journal
name: payroll1
-
I click on Compute button
-
I click on Compute button.
-
!python {model: hr.payroll.register}: |
self.compute_sheet(cr, uid, [ref("hr_payroll_register_payroll0")], {"lang": "en_US",
@ -47,7 +47,7 @@
[ref("hr_payroll.hr_menu_payroll_register")], "section_id": False, "active_id":
ref("hr_payroll.hr_menu_payroll_register"), })
-
Then I click on Verify Sheet button
Then I click on Verify Sheet button.
-
!python {model: hr.payroll.register}: |
self.verify_sheet(cr, uid, [ref("hr_payroll_register_payroll0")], {"lang": "en_US",
@ -60,4 +60,4 @@
!python {model: hr.payroll.register}: |
from tools.translate import _
reg_brw=self.browse(cr, uid, ref("hr_payroll_register_payroll0"))
assert(reg_brw.state == 'hr_check'), _('State not changed!')
assert(reg_brw.state == 'hr_check'), _('State not changed!')

51
addons/hr_payroll/test/payslip.yml
View File

@ -1,8 +1,16 @@
-
I test the 'Payment Advice' in order to check the hr_payroll in OpenERP
-
I Create a bank record
-
!record {model: res.partner.bank, id: res_partner_bank_0}:
acc_number: '987654321'
partner_id: base.res_partner_desertic_hispafuentes
sequence: 0.0
state: bank
-
I create a new employee “Richard”
-
-
!record {model: hr.employee, id: hr_employee_richard0}:
address_home_id: base.res_partner_address_2
address_id: base.res_partner_address_9
@ -24,10 +32,11 @@
name: Richard
pg_joining: '2009-12-01'
property_bank_account: account.cash
bank_account_id: res_partner_bank_0
salary_account: account.a_recv
vehicle_distance: 0.0
-
I create a new payroll structure for software developer
I create a new payroll structure for software developer
-
!record {model: hr.payroll.structure, id: hr_payroll_structure_softwaredeveloper0}:
code: SD
@ -75,58 +84,60 @@
name: Software Developer
-
I create a employee payslip record
-
-
!record {model: hr.payslip, id: hr_payslip_0}:
bank_journal_id: account.bank_journal
employee_id: hr_payroll.hr_employee_richard0
journal_id: account.expenses_journal
-
-
I click on 'Compute Sheet' button
-
-
!workflow {model: hr.payslip, action: compute_sheet, ref: hr_payslip_0}
-
-
just to test
-
!python {model: hr.payslip}: |
self.compute_sheet(cr, uid, [ref("hr_payslip_0")], {"lang": "en_US", "tz": False,
"active_model": "ir.ui.menu", "department_id": False, "active_ids": [ref("hr_payroll.menu_department_tree")],
"section_id": False, "active_id": ref("hr_payroll.menu_department_tree"),
})
-
I check that an order which was in the "New Slip" state has transit to "Wating for Verification" state
I check that the order is now in "Waiting for Verification" state
-
!python {model: hr.payslip}: |
from tools.translate import _
payslip_brw=self.browse(cr, uid, ref("hr_payslip_0"))
assert(payslip_brw.state == 'draft'), _('State not changed!')
assert(payslip_brw.state == 'draft'), _('State not changed!')
-
I click on Verify Sheet button.
-
Then I click on Verify Sheet button
-
!workflow {model: hr.payslip, action: verify_sheet, ref: hr_payslip_0}
-
I check that an order which was in the "Wating for Verification" state has transit to "Wating for HR Verification" state
I check that the order is in the "Waiting for HR Verification" state
-
!python {model: hr.payslip}: |
from tools.translate import _
payslip_brw=self.browse(cr, uid, ref("hr_payslip_0"))
assert(payslip_brw.state == 'hr_check'), _('State not changed!')
assert(payslip_brw.state == 'hr_check'), _('State not changed!')
-
Then I click on Complete HR Checking button
I click on Complete HR Checking button.
-
!workflow {model: hr.payslip, action: final_verify_sheet, ref: hr_payslip_0}
-
I check that an order which was in the "'Wating for HR Verification'" state has transit to "Confirm Sheet" state
I check that the order is in "Confirm Sheet" state.
-
!python {model: hr.payslip}: |
from tools.translate import _
payslip_brw=self.browse(cr, uid, ref("hr_payslip_0"))
assert(payslip_brw.state == 'confirm'), _('State not changed!')
-
Then I click on Pay Salary button
-
assert(payslip_brw.state == 'confirm'), _('State not changed!')
-
I click on Pay Salary button
-
!workflow {model: hr.payslip, action: process_sheet, ref: hr_payslip_0}
-
I check that an order which was in the "Confirm Sheet" state has transit to "Paid Salary" state
I check that the order is in "Paid Salary" state.
-
!python {model: hr.payslip}: |
from tools.translate import _
payslip_brw=self.browse(cr, uid, ref("hr_payslip_0"))
assert(payslip_brw.state == 'done'), _('State not changed!')
assert(payslip_brw.state == 'done'), _('State not changed!')

1
addons/hr_payroll/wizard/hr_payroll_employees_detail.py
View File

@ -63,7 +63,6 @@ class hr_payroll_employees_detail(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'employees.salary',
'datas': datas,
'nodestroy':True,
}
hr_payroll_employees_detail()

1
addons/hr_payroll/wizard/hr_payroll_year_salary.py
View File

@ -65,7 +65,6 @@ class hr_payroll_year_salary(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'year.salary',
'datas': datas,
'nodestroy':True,
}
hr_payroll_year_salary()

2
addons/hr_recruitment/report/hr_recruitment_report_view.xml
View File

@ -101,7 +101,7 @@
</group>
<newline/>
<group expand="0" string="Extended options..." groups="base.group_extended">
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<field name="state"/>
<separator orientation="vertical"/>
<field name="date"/>

112
addons/hr_recruitment/test/test_hr_recruitment.yml
View File

@ -1,91 +1,86 @@
- |
In order to test hr_recruitment module for OpenERP, I will create applicants form, Manages job positions and the recruitement process.
- |
I create job position for employee to manage job position.
-
|
For that First I create Department "R & D" in Department form for which I make recruitment.
-
In order to test hr_recruitment module for OpenERP, I will create applicants form, Manages job positions and the recruitment process.
-
I create a department.
-
!record {model: hr.department, id: hr_department_rd0}:
manager_id: base.user_root
name: 'R & D '
- |
Now I will create new Job Position. I will check successfull creation of new Job Position by adding the information.
-
-
I create new Job Position.
-
!record {model: hr.job, id: hr_job_jea0}:
department_id: 'hr_department_rd0'
description: 'Position of Junier Application Engineer '
description: 'Position of Jr. Application Engineer'
expected_employees: 5
name: 'JEA '
- |
Given that I have stage "Initial Jobs Demand".
-
name: 'JAE '
-
I create a recruitment stage "Initial Jobs Demand".
-
!record {model: hr.recruitment.stage, id: hr_recrutiment_stage_first0}:
name: 'Initial Jobs Demand'
sequence: 1
- |
I create applicants for "Fresher" and specify job information for that applicant.
-
sequence: 1
-
I create an applicant.
-
!record {model: hr.applicant, id: hr_applicant_fresher0}:
availability: 0.0
department_id: hr.dep_it
name: Fresher
partner_address_id: base.res_partner_address_tang
partner_id: base.res_partner_asus
partner_name: Jose
partner_phone: '999666735'
partner_name: Marion Jones
partner_phone: '1111112223'
response: 0.0
salary_expected: 0.0
salary_proposed: 0.0
stage_id: crm.stage_lead3
type_id: hr_recruitment.type_job2
stage_id: hr_recrutiment_stage_first0
- |
I check that applicant is on "draft" state.
stage_id: hr_recrutiment_stage_first0
type_id: hr_recruitment.degree_licenced
-
I check that applicant is on "draft" state.
-
!assert {model: hr.applicant, id: hr_applicant_fresher0}:
- state == 'draft'
- |
I start progress by click on "In Progress" button.
-
- state == 'draft'
-
I change the state by click on "In Progress" button.
-
!python {model: hr.applicant}: |
self.case_open(cr, uid, [ref("hr_applicant_fresher0")], {"active_ids": [ref("hr_recruitment.menu_crm_case_categ0_act_job")],
})
})
- |
Given that I have case category "Employee".
-
I create a new case category.
-
!record {model: crm.case.categ, id: crm_case_categ_employee0}:
name: 'Employee'
- |
I make phonecall for this applicant by click on "Schedule a Phone Call" button.
-
!record {model: hr.recruitment.job2phonecall, id: hr_recruitment_forinterview0}:
I schedule a phonecall for this applicant by click on "Schedule a Phone Call" button.
-
!record {model: hr.recruitment.job2phonecall, id: hr_recruitment_forinterview0}:
user_id: base.user_root
deadline: '05/28/2010 11:51:00'
note: 'For interview.'
category_id: 'crm_case_categ_employee0'
- |
-
I click on "Schedule phonecall" button of this wizard.
-
!python {model: hr.recruitment.job2phonecall}: |
self.make_phonecall(cr, uid, [ref('hr_recruitment_forinterview0')], {'active_ids': [ref('hr_applicant_fresher0')]})
- |
I schedule meeting for interview of this applicant by click on "Schdule Meeting" button.
-
self.make_phonecall(cr, uid, [ref('hr_recruitment_forinterview0')], {'active_ids': [ref('hr_applicant_fresher0')]})
-
I schedule meeting for interview of this applicant by click on "Schedule Meeting" button.
-
!python {model: hr.applicant}: |
self.action_makeMeeting(cr, uid, [ref('hr_recruitment_forinterview0')])
- |
I can see that Meeting's calendar view is shown.
then I click on the date on which I want schedule meeting.
I fill proper data for that meeting and save it.
-
-
I create an entry for the meeting with the applicant.
-
!record {model: crm.meeting, id: crm_meeting_fresher0}:
alarm_id: base_calendar.alarm1
count: 0.0
@ -101,15 +96,14 @@
rrule_type: none
state: open
user_id: base.user_root
- |
After Meeting of this applicant , I hired employee by click on "Hired" button of this form.
-
-
On a successful meeting with the applicant, I hired employee by click on "Hired" button.
-
!python {model: hr.applicant}: |
self.case_close(cr, uid, [ref('hr_applicant_fresher0')])
- |
I check that applicant state is "done".
-
I check that applicant state is "Hired".
-
!assert {model: hr.applicant, id: hr_applicant_fresher0}:
- state == 'done'

3
addons/hr_timesheet_invoice/hr_timesheet_invoice.py
View File

@ -154,9 +154,10 @@ class account_invoice(osv.osv):
inv = self.browse(cr, uid, [id])[0]
if inv.type == 'in_invoice':
obj_analytic_account = self.pool.get('account.analytic.account')
for il in iml:
if il['account_analytic_id']:
to_invoice = self.pool.get('account.analytic.account').read(cr, uid, [il['account_analytic_id']], ['to_invoice'])[0]['to_invoice']
to_invoice = obj_analytic_account.read(cr, uid, [il['account_analytic_id']], ['to_invoice'])[0]['to_invoice']
if to_invoice:
il['analytic_lines'][0][2]['to_invoice'] = to_invoice[0]
return iml

2
addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
View File

@ -81,7 +81,7 @@
<filter string="Year" icon="terp-go-year" context="{'group_by':'name'}"/>
</group>
<newline/>
<group expand="0" string="Extended options..." colspan="10" col="12">
<group expand="0" string="Extended Filters..." colspan="10" col="12">
<field name="date"/>
<separator orientation="vertical"/>
<field name="invoice_id" widget="selection"/>

63
addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
View File

@ -1,8 +1,8 @@
- |
-
In order to test hr_timesheet_invoice in OpenERP, I create account line to manage invoice based on costs.
- |
In order to test flow, I create analytic line for sednacom analytic account.
-
-
I create an account analytic line.
-
!record {model: account.analytic.line, id: account_analytic_line_developyamlforhrmodule0}:
account_id: account.analytic_sednacom
amount: -1.0
@ -17,17 +17,16 @@
unit_amount: 5.00
user_id: base.user_root
- |
Give partner name and price list in analytic account.
-
-
Assign partner name and price list in analytic account.
-
!record {model: account.analytic.account, id: account.analytic_sednacom}:
partner_id: base.res_partner_9
pricelist_id: product.list0
- |
-
I create invoice on analytic Line using "Invoice analytic Line" wizard.
Give date , detail of each work , time spend on that work on this wizard.
-
-
!record {model: hr.timesheet.invoice.create, id: hr_timesheet_invoice_create_0}:
accounts:
- account.analytic_sednacom
@ -36,54 +35,50 @@
price: 1
product: hr_timesheet.product_consultant
time: 1
- |
-
I click on "Create Invoice" button of "Invoice analytic Line" wizard to create invoice.
-
-
!python {model: hr.timesheet.invoice.create}: |
self.do_create(cr, uid, [ref("hr_timesheet_invoice_create_0")], {"active_ids": [ref("hr_timesheet_invoice.account_analytic_line_developyamlforhrmodule0")]})
- |
I check that Invoice is create for this timesheet.
-
I check that Invoice is created for this timesheet.
-
!python {model: account.analytic.line}: |
exp = self.browse(cr, uid, [ref('account_analytic_line_developyamlforhrmodule0')])[0]
analytic_account_obj = self.pool.get('account.analytic.account')
data = self.pool.get('hr.timesheet.invoice.create').read(cr, uid, [ref("hr_timesheet_invoice_create_0")], [], context)[0]
account_ids = data['accounts']
for account in analytic_account_obj.browse(cr, uid, account_ids, context):
partner = account.partner_id.id
invoice_obj = self.pool.get('account.invoice')
invoice_ids = invoice_obj.search(cr, uid, [('partner_id', '=', partner)])
invoice_id = invoice_obj.browse(cr, uid, invoice_ids)[0]
for invoice in invoice_id.invoice_line:
product = invoice.product_id.id
product_exp = data['product']
assert product == product_exp
- |
I creating a final invoice for "Sednacom" analytic account.
-
-
I create final invoice for this analytic account.
-
!record {model: hr.timesheet.invoice.create.final, id: hr_timesheet_invoice_create_final_0}:
balance_product: hr_timesheet.product_consultant
date: 1
name: 1
price: 1
time: 1
- |
I click on "Create Invoice" button to create Invoice.
-
-
I click on "Create Invoice" button to create Invoice.
-
!python {model: hr.timesheet.invoice.create.final}: |
self.do_create(cr, uid, [ref("hr_timesheet_invoice_create_final_0")], {"active_ids": [ref("account.analytic_sednacom")]})
- |
I can also make some theoretical revenue reports.
- |
I can also see timesheet profit using Timesheet profit report.
-
I can also make some theoretical revenue reports.
-
I can also see timesheet profit using Timesheet profit report.

4
addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
View File

@ -166,7 +166,7 @@ class hr_timesheet_invoice_create(osv.osv_memory):
#
# Compute for lines
#
cr.execute("SELECT * FROM account_analytic_line WHERE account_id = %s and id IN %s AND product_id=%s and to_invoice=%s ORDER BY account_analytic_line.date", (account.id, tuple(data['ids']), product_id, factor_id))
cr.execute("SELECT * FROM account_analytic_line WHERE account_id = %s and id IN %s AND product_id=%s and to_invoice=%s ORDER BY account_analytic_line.date", (account.id, tuple(context['active_ids']), product_id, factor_id))
line_ids = cr.dictfetchall()
note = []
@ -188,7 +188,7 @@ class hr_timesheet_invoice_create(osv.osv_memory):
curr_line['note'] = "\n".join(map(lambda x: unicode(x) or '',note))
invoice_line_obj.create(cr, uid, curr_line, context=context)
cr.execute("update account_analytic_line set invoice_id=%s WHERE account_id = %s and id IN %s" ,(last_invoice, account.id,tuple(data['ids'])))
cr.execute("update account_analytic_line set invoice_id=%s WHERE account_id = %s and id IN %s" ,(last_invoice, account.id, tuple(context['active_ids'])))
invoice_obj.button_reset_taxes(cr, uid, [last_invoice], context)

2
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
View File

@ -180,7 +180,7 @@
<group col="4" colspan="2">
<button name="button_confirm" states="draft" string="Confirm" type="object" icon="terp-gtk-jump-to-rtl"/>
<button name="action_set_to_draft" states="done" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
<button name="cancel" states="confirm" string="Refuse" type="workflow" icon="terp-gtk-stop"/>
<button name="cancel" states="confirm" string="Refuse" type="workflow" icon="gtk-cancel"/>
<button name="done" states="confirm" string="Accept" type="workflow" icon="terp-camera_test"/>
</group>
</form>

2
addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
View File

@ -72,7 +72,7 @@
<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
</group>
<newline/>
<group expand="0" string="Extended options..." groups="base.group_extended">
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<field name="general_account_id"/>
<field name="product_id"/>
<field name="journal_id"/>

2
addons/hr_timesheet_sheet/report/timesheet_report_view.xml
View File

@ -96,7 +96,7 @@
<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
</group>
<newline/>
<group expand="0" string="Extended options..." groups="base.group_extended">
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<field name="general_account_id"/>
<field name="to_invoice" widget="selection"/>
<separator orientation="vertical"/>

1
addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
View File

@ -99,6 +99,7 @@
-
!python {model: hr_timesheet_sheet.sheet}: |
uid = ref('base.user_root')
import netsvc
for sheet in self.browse(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')]):
di = sheet.user_id.company_id.timesheet_max_difference
if (abs(sheet.total_difference) < di) or not di:

2
addons/lunch/lunch_view.xml
View File

@ -62,7 +62,7 @@
name="%(action_lunch_order_cancel)d"
string="Cancel Order"
type="action" states="confirmed"
icon="terp-gtk-stop" />
icon="gtk-cancel" />
</tree>
</field>
</record>

1
addons/marketing_campaign/marketing_campaign.py
View File

@ -674,7 +674,6 @@ class marketing_campaign_workitem(osv.osv):
'type' : 'ir.actions.report.xml',
'report_name': wi_obj.activity_id.report_id.report_name,
'datas' : datas,
'nodestroy': True,
}
else:
raise osv.except_osv(_('No preview'),_('The current step for this item has no email or report to preview.'))

3
addons/mrp/mrp.py
View File

@ -60,7 +60,8 @@ class mrp_workcenter(osv.osv):
'resource_id': fields.many2one('resource.resource','Resource',ondelete='cascade'),
}
_defaults = {
'capacity_per_cycle': lambda *a: 1.0,
'capacity_per_cycle': 1.0,
'resource_type': 'material',
}
mrp_workcenter()

2
addons/mrp/report/mrp_production_order_view.xml
View File

@ -86,7 +86,7 @@
<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
</group>
<newline/>
<group expand="0" string="Extended options..." groups="base.group_extended">
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<filter icon="terp-emblem-important" string="Picking Exception" domain="[('state','=','picking_except')]"/>
<filter icon="terp-gtk-media-pause" string="Waiting Goods" domain="[('state','=','confirmed')]"/>
<filter icon="terp-camera_test" string="Ready to Produce" domain="[('state','=','ready')]"/>

2
addons/point_of_sale/report/report_pos_order_view.xml
View File

@ -86,7 +86,7 @@
<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
</group>
<newline/>
<group expand="0" string="Extended options..." groups="base.group_extended">
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<field name="date_validation"/>
<field name="date_payment"/>
</group>

2
addons/product/product_view.xml
View File

@ -27,7 +27,7 @@
<filter string='Type' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'type'}" />
</group>
<newline/>
<group expand="0" string="Extended options..." groups="base.group_extended">
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<field name="pricelist_id" widget="selection" context="{'pricelist': self}" />
</group>
</search>

54
addons/product_manufacturer/i18n/et.po
View File

@ -8,99 +8,99 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-11-25 13:27+0000\n"
"PO-Revision-Date: 2010-06-25 18:10+0000\n"
"PO-Revision-Date: 2010-07-30 09:04+0000\n"
"Last-Translator: lyyser <logard.1961@gmail.com>\n"
"Language-Team: Estonian <et@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-06-26 03:58+0000\n"
"X-Launchpad-Export-Date: 2010-07-31 03:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product_electronic
#: model:ir.module.module,description:product_electronic.module_meta_information
#. module: product_manufacturer
#: model:ir.module.module,description:product_manufacturer.module_meta_information
msgid "A module that add manufacturers and attributes on the product form"
msgstr ""
#. module: product_electronic
#. module: product_manufacturer
#: field:product.product,manufacturer_pref:0
msgid "Manufacturer product code"
msgstr "Tootja tootekood"
#. module: product_electronic
#. module: product_manufacturer
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "Vigane XML vaate arhitektuurile!"
#. module: product_electronic
#: view:product.electronic.attribute:0
#. module: product_manufacturer
#: view:product.manufacturer.attribute:0
msgid "Product Template Name"
msgstr "Toote Malli nimi"
#. module: product_electronic
#. module: product_manufacturer
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
"Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
#. module: product_electronic
#: model:ir.model,name:product_electronic.model_product_electronic_attribute
#. module: product_manufacturer
#: model:ir.model,name:product_manufacturer.model_product_electronic_attribute
msgid "Product attributes"
msgstr "Toote omadused"
#. module: product_electronic
#. module: product_manufacturer
#: view:product.product:0
msgid "Manufacturing data"
msgstr "Tootmise andmed"
#. module: product_electronic
#. module: product_manufacturer
#: view:product.product:0
msgid "Product reference"
msgstr "Toote viide"
#. module: product_electronic
#: field:product.electronic.attribute,name:0
#. module: product_manufacturer
#: field:product.manufacturer.attribute,name:0
msgid "Attribute"
msgstr "Atribuut"
#. module: product_electronic
#: field:product.electronic.attribute,product_id:0
#. module: product_manufacturer
#: field:product.manufacturer.attribute,product_id:0
msgid "Product"
msgstr "Toode"
#. module: product_electronic
#: field:product.electronic.attribute,value:0
#. module: product_manufacturer
#: field:product.manufacturer.attribute,value:0
msgid "Value"
msgstr "Väärtus"
#. module: product_electronic
#. module: product_manufacturer
#: view:product.product:0
msgid "Manufacturing Data"
msgstr "Valmistusandmeid"
#. module: product_electronic
#. module: product_manufacturer
#: view:product.product:0
msgid "Product name"
msgstr "Toote nimi"
#. module: product_electronic
#. module: product_manufacturer
#: view:product.product:0
#: field:product.product,attribute_ids:0
msgid "Attributes"
msgstr "Omadused"
#. module: product_electronic
#: model:ir.module.module,shortdesc:product_electronic.module_meta_information
#. module: product_manufacturer
#: model:ir.module.module,shortdesc:product_manufacturer.module_meta_information
msgid "Products Attributes & Manufacturers"
msgstr ""
#. module: product_electronic
#. module: product_manufacturer
#: field:product.product,manufacturer_pname:0
msgid "Manufacturer product name"
msgstr "Toote nimetus"
#. module: product_electronic
#. module: product_manufacturer
#: field:product.product,manufacturer:0
msgid "Manufacturer"
msgstr "Tootja"
msgstr "Valmistaja"

2
addons/project/report/project_report_view.xml
View File

@ -123,7 +123,7 @@
<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">
<group expand="0" string="Extended Filters..." colspan="10" col="12" groups="base.group_extended">
<field name="type" widget="selection"/>
<separator orientation="vertical"/>
<field name="date_start"/>

2
addons/project_issue/report/project_issue_report_view.xml
View File

@ -130,7 +130,7 @@
</group>
<newline/>
<group expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended">
<group expand="0" string="Extended Filters..." colspan="10" col="12" groups="base.group_extended">
<field name="partner_id"/>
<field name="assigned_to" widget="selection"/>
<separator orientation="vertical"/>

4
addons/project_long_term/project_long_term.py
View File

@ -190,6 +190,8 @@ class project_phase(osv.osv):
return super(project_phase, self).write(cr, uid, ids, vals, context=context)
# Consider calendar and efficiency if the phase is performed by a resource
# otherwise consider the project's working calendar
if isinstance(ids, (int, long)):
ids = [ids]
phase = self.browse(cr, uid, ids[0], context=context)
calendar_id = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False
resource_id = resource_obj.search(cr, uid, [('user_id', '=', phase.responsible_id.id)],context=context)
@ -246,7 +248,7 @@ class project_resource_allocation(osv.osv):
_rec_name = 'resource_id'
_columns = {
'resource_id': fields.many2one('resource.resource', 'Resource', required=True),
'phase_id': fields.many2one('project.phase', 'Project Phase', required=True),
'phase_id': fields.many2one('project.phase', 'Project Phase', ondelete='cascade', required=True),
'phase_id_date_start': fields.related('phase_id', 'date_start', type='date', string='Starting Date of the phase'),
'phase_id_date_end': fields.related('phase_id', 'date_end', type='date', string='Ending Date of the phase'),
'useability': fields.float('Usability', help="Usability of this resource for this project phase in percentage (=50%)"),

2
addons/sale/report/sale_report_view.xml
View File

@ -104,7 +104,7 @@
<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
</group>
<newline/>
<group expand="0" string="Extended options..." groups="base.group_extended">
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<field name="date"/>
<field name="date_confirm"/>
<separator orientation="vertical"/>

2
addons/sale_margin/report/report_margin_view.xml
View File

@ -50,7 +50,7 @@
<filter string="Year" icon="terp-account" context="{'group_by':'year'}"/>
</group>
<newline/>
<group expand="0" string="Extended options..." groups="base.group_extended">
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<field name="date" string="Date Invoiced"/>
<separator orientation="vertical"/>
<field name="partner_id" widget="selection"/>

4
addons/stock/report/report_stock_move_view.xml
View File

@ -103,7 +103,7 @@
<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
</group>
<newline/>
<group expand="0" string="Extended options..." groups="base.group_extended">
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<field name="location_id" widget = "selection"/>
<field name="location_dest_id" widget = "selection"/>
<separator orientation="vertical"/>
@ -201,7 +201,7 @@
<filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
</group>
<newline/>
<group expand="0" string="Extended options..." groups="base.group_extended">
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<field name="partner_id" context="{'contact_display':'partner'}"/>
<field name="prodlot_id"/>
<field name="state"/>

2
addons/stock/report/report_stock_picking_view.xml
View File

@ -90,7 +90,7 @@
<filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}"/>
</group>
<newline/>
<group expand="0" string="Extended options..." groups="base.group_extended">
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<field name="product_id"/>
<separator orientation="vertical"/>
<field name="type"/>

2
addons/survey/survey.py
View File

@ -124,7 +124,6 @@ class survey(osv.osv):
'type': 'ir.actions.report.xml',
'report_name': 'survey.browse.response',
'datas': datas,
'nodestroy': True,
'context' : context
}
else:
@ -135,7 +134,6 @@ class survey(osv.osv):
'type': 'ir.actions.report.xml',
'report_name': 'survey.form',
'datas': datas,
'nodestroy':True,
'context' : context
}
return report