diff --git a/addons/account/account.py b/addons/account/account.py
index 1520c4f06460e4910f950f7bd3ff0d3e19cc0392..8ef5004df047f16803f35b6b7db3b1089a1eeb78 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1215,7 +1215,8 @@ class account_move(osv.osv):
#
# TODO: Check if period is closed !
#
- def create(self, cr, uid, vals, context={}):
+ def create(self, cr, uid, vals, context=None):
+ context = context or {}
if 'line_id' in vals and context.get('copy'):
for l in vals['line_id']:
if not l[0]:
@@ -1256,6 +1257,7 @@ class account_move(osv.osv):
return result
def copy(self, cr, uid, id, default={}, context={}):
+ context = context or {}
default.update({
'state':'draft',
'name':'/',
@@ -1265,7 +1267,8 @@ class account_move(osv.osv):
})
return super(account_move, self).copy(cr, uid, id, default, context)
- def unlink(self, cr, uid, ids, context={}, check=True):
+ def unlink(self, cr, uid, ids, context=None, check=True):
+ context = context or {}
toremove = []
obj_move_line = self.pool.get('account.move.line')
for move in self.browse(cr, uid, ids, context):
@@ -1605,7 +1608,7 @@ class account_tax_code(osv.osv):
if isinstance(ids, (int, long)):
ids = [ids]
reads = self.read(cr, uid, ids, ['name','code'], context, load='_classic_write')
- return [(x['id'], (x['code'] and x['code'] + ' - ' or '') + x['name']) \
+ return [(x['id'], (x['code'] and (x['code'] + ' - ') or '') + x['name']) \
for x in reads]
def _default_company(self, cr, uid, context={}):
@@ -2019,7 +2022,7 @@ class account_model(osv.osv):
}
_defaults = {
- 'legend': lambda self, cr, uid, context:_('You can specify year, month and date in the name of the model using the following labels:\n\n%(year)s : To Specify Year \n%(month)s : To Specify Month \n%(date)s : Current Date\n\ne.g. My model on %(date)s'),
+ 'legend': lambda self, cr, uid, context:_('You can specify year, month and date in the name of the model using the following labels:\n\n%(year)s: To Specify Year \n%(month)s: To Specify Month \n%(date)s: Current Date\n\ne.g. My model on %(date)s'),
}
def generate(self, cr, uid, ids, datas={}, context=None):
move_ids = []
@@ -2221,7 +2224,7 @@ class account_subscription_line(osv.osv):
account_subscription_line()
# ---------------------------------------------------------------
-# Account Templates : Account, Tax, Tax Code and chart. + Wizard
+# Account Templates: Account, Tax, Tax Code and chart. + Wizard
# ---------------------------------------------------------------
class account_tax_template(osv.osv):
@@ -2394,7 +2397,7 @@ class account_chart_template(osv.osv):
'property_account_income_categ': fields.many2one('account.account.template','Income Category Account'),
'property_account_expense': fields.many2one('account.account.template','Expense Account on Product Template'),
'property_account_income': fields.many2one('account.account.template','Income Account on Product Template'),
- 'property_reserve_and_surplus_account': fields.many2one('account.account.template', 'Reserve and Profit/Loss Account', domain=[('type', '=', 'payable')], help='This Account is used for transferring Profit/Loss(If It is Profit : Amount will be added, Loss : Amount will be deducted.), Which is calculated from Profilt & Loss Report'),
+ 'property_reserve_and_surplus_account': fields.many2one('account.account.template', 'Reserve and Profit/Loss Account', domain=[('type', '=', 'payable')], help='This Account is used for transferring Profit/Loss(If It is Profit: Amount will be added, Loss: Amount will be deducted.), Which is calculated from Profilt & Loss Report'),
}
account_chart_template()
@@ -2544,9 +2547,17 @@ class wizard_multi_charts_accounts(osv.osv_memory):
if ids:
return ids[0]
return False
+
+ def _get_default_accounts(self, cr, uid, context=None):
+ accounts = [{'acc_name':'Current','account_type':'bank'},
+ {'acc_name':'Deposit','account_type':'bank'},
+ {'acc_name':'Cash','account_type':'cash'}]
+ return accounts
+
_defaults = {
'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, [uid], c)[0].company_id.id,
'chart_template_id': _get_chart,
+ 'bank_accounts_id': _get_default_accounts,
'code_digits': 6,
'seq_journal': True
}
diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index a982ca511822cf132907777e8c84c1736696b869..f3c2b71122f025058b24500714308b1a0f78d786 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -24,8 +24,6 @@ import time
from osv import fields
from osv import osv
from tools.translate import _
-import tools
-from tools import config
class account_analytic_line(osv.osv):
_inherit = 'account.analytic.line'
@@ -82,12 +80,13 @@ class account_analytic_line(osv.osv):
return {}
product_obj = self.pool.get('product.product')
analytic_journal_obj =self.pool.get('account.analytic.journal')
+ company_obj = self.pool.get('res.company')
+ product_price_type_obj = self.pool.get('product.price.type')
j_id = analytic_journal_obj.browse(cr, uid, journal_id, context=context)
prod = product_obj.browse(cr, uid, prod_id)
if not company_id:
company_id = j_id.company_id.id
result = 0.0
- is_purchase = False
if j_id.type <> 'sale':
a = prod.product_tmpl_id.property_account_expense.id
@@ -99,8 +98,6 @@ class account_analytic_line(osv.osv):
'for this product: "%s" (id:%d)') % \
(prod.name, prod.id,))
amount_unit = prod.price_get('standard_price', context)[prod.id]
- is_purchase = True
-
else:
a = prod.product_tmpl_id.property_account_income.id
if not a:
@@ -128,9 +125,8 @@ class account_analytic_line(osv.osv):
if pricetype.field == 'list_price':
flag = True
amount_unit = prod.price_get(pricetype.field, context)[prod.id]
- amount = amount_unit*unit_amount or 1.0
prec = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
- amount = amount_unit*unit_amount or 1.0
+ amount = amount_unit*unit or 1.0
result = round(amount, prec)
if not flag:
result *= -1
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 0b240663943997ffb283d4f5d0a13903f75d04b6..cf50a1ab62eeab6e0ac8484c4baa8a31e1728846 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -378,7 +378,7 @@ class account_bank_statement(osv.osv):
self.create_move_from_st_line(cr, uid, st_line.id, company_currency_id, st_line_number, context)
self.write(cr, uid, [st.id], {'name': st_number}, context=context)
- self.log(cr, uid, st.id, 'Statement %s is confirmed and entries are created.' % st_number)
+ self.log(cr, uid, st.id, _('Statement %s is confirmed, journal items are created.') % (st_number,))
done.append(st.id)
return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
@@ -501,4 +501,4 @@ class account_bank_statement_line(osv.osv):
account_bank_statement_line()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 18484a7d1c81cdd802dc5a816140ef7e4c8c4aca..28d2f5a06a6e03afba1e761d98decc62ec933d5a 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -430,7 +430,7 @@
<field name="domain">[('type','=','out_invoice')]</field>
<field name="context">{'type':'out_invoice', 'journal_type': 'sale'}</field>
<field name="search_view_id" ref="view_account_invoice_filter"/>
- <field name="help">Most of customer invoices are automatically generated in draft mode by OpenERP flows, following a purchase order for instance. Review, confirm or cancel, pay or refund your customers' invoices here. A manual invoice can be created here.</field>
+ <field name="help">Customer Invoices allows you create and manage invoices issued to your customers. OpenERP generates draft of invoices automatically so that you only have to confirm them before sending them to your customers.</field>
</record>
@@ -458,7 +458,7 @@
<field name="domain">[('type','=','in_invoice')]</field>
<field name="context">{'type':'in_invoice', 'journal_type': 'purchase'}</field>
<field name="search_view_id" ref="view_account_invoice_filter"/>
- <field name="help">Proposal for supplier invoices are usually automatically generate by OpenERP, following a procurement order or a production order for instance. To consult and to check for, or to manually create a customer invoice, use this menu. You can review, confirm or cancel, pay or refund an invoice from the view from of the invoices.</field>
+ <field name="help">Supplier Invoices allows you to enter and manage invoices issued by your suppliers. OpenERP generates draft of supplier invoices automatically so that you can control what you received from your supplier according to what you purchased or received.</field>
</record>
<menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="menu_finance_payables"/>
@@ -471,7 +471,7 @@
<field name="domain">[('type','=','out_refund')]</field>
<field name="context">{'type':'out_refund', 'journal_type': 'sale_refund'}</field>
<field name="search_view_id" ref="view_account_invoice_filter"/>
- <field name="help">A customer refund is a credit note to your customer that cancel invoice or a part of it.</field>
+ <field name="help">Customer Refunds helps you manage the credit notes issued/to be issued for your customers. A refund invoice is a document that cancels an invoice or a part of it. You can easily generate refunds and reconcile them from the invoice form.</field>
</record>
<record id="action_invoice_tree3_view1" model="ir.actions.act_window.view">
@@ -510,22 +510,5 @@
res_model="account.invoice"
src_model="account.journal"/>
- <act_window
- domain="[('account_id.reconcile', '=', True)]"
- context="{'search_default_unreconciled':True,'search_default_partner_id':[partner_id]}"
- id="act_account_invoice_account_move_unreconciled"
- groups="base.group_extended"
- name="Items to Reconcile"
- res_model="account.move.line"
- src_model="account.invoice"/>
-
- <act_window
- context="{'search_default_move_id':move_id, 'search_default_unreconciled':False,}"
- id="act_account_invoice_account_move_invoice_link"
- name="Invoice Items"
- groups="base.group_extended"
- res_model="account.move.line"
- src_model="account.invoice"/>
-
</data>
</openerp>
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index d9b78795998159596e2d8b0f1312a959a209ad03..b10ced65e885cf484d2418a982eb94738d5559e4 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -26,6 +26,7 @@ from osv import fields, osv
from tools.translate import _
import decimal_precision as dp
import tools
+from operator import itemgetter
class account_move_line(osv.osv):
_name = "account.move.line"
@@ -863,9 +864,8 @@ class account_move_line(osv.osv):
result['toolbar']['action'] = []
#Restrict the list of journal view in search view
- if view_type == 'search':
- journal_list = journal_pool.name_search(cr, uid, '', [], context=context)
- result['fields']['journal_id']['selection'] = journal_list
+ if view_type == 'search' and result['fields'].get('journal_id', False):
+ result['fields']['journal_id']['selection'] = journal_pool.name_search(cr, uid, '', [], context=context)
return result
if context.get('view_mode', False):
@@ -887,21 +887,20 @@ class account_move_line(osv.osv):
for field in journal.view_id.columns_id:
if not field.field in fields:
fields[field.field] = [journal.id]
- fld.append((field.field, field.sequence))
+ fld.append((field.field, field.sequence, field.name))
flds.append(field.field)
common_fields[field.field] = 1
else:
fields.get(field.field).append(journal.id)
common_fields[field.field] = common_fields[field.field] + 1
- fld.append(('period_id', 3))
- fld.append(('journal_id', 10))
+ fld.append(('period_id', 3, 'Period'))
+ fld.append(('journal_id', 10, 'Journal'))
flds.append('period_id')
flds.append('journal_id')
fields['period_id'] = all_journal
fields['journal_id'] = all_journal
- from operator import itemgetter
fld = sorted(fld, key=itemgetter(1))
widths = {
@@ -955,7 +954,7 @@ class account_move_line(osv.osv):
if field in widths:
attrs.append('width="'+str(widths[field])+'"')
-
+ attrs.append('string="'+field_it[2]+'"')
attrs.append("invisible=\"context.get('visible_id') not in %s\"" % (fields.get(field)))
xml += '''<field name="%s" %s/>\n''' % (field,' '.join(attrs))
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index d4e51b7e19459536a331d4406e03261ef5c95812..8217522715e52ffbcd9b5922e1f35cef886efe5d 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -23,8 +23,8 @@
<separator colspan="4" string="Periods"/>
<field colspan="4" name="period_ids" nolabel="1" widget="one2many_list">
<form string="Period">
- <field name="name" select="1"/>
- <field name="code" select="1"/>
+ <field name="name"/>
+ <field name="code"/>
<field name="date_start"/>
<field name="date_stop"/>
<field name="special"/>
@@ -59,7 +59,7 @@
<search string="Search Fiscalyear">
<group>
<filter string="Open" domain="[('state','=','draft')]" icon="terp-camera_test"/>
- <filter string="Closed" domain="[('state','=','done')]" icon="terp-dialog_close"/>
+ <filter string="Closed" domain="[('state','=','done')]" icon="terp-dialog-close"/>
<separator orientation="vertical"/>
<field name="code"/>
<field name="name"/>
@@ -237,16 +237,16 @@
</field>
</record>
<record id="view_treasory_graph" model="ir.ui.view">
- <field name="name">account.treasory.graph</field>
- <field name="model">account.account</field>
- <field name="type">graph</field>
- <field name="arch" type="xml">
- <graph string="Treasory Analysis" type="bar">
- <field name="name"/>
- <field name="balance" operator="+"/>
- </graph>
+ <field name="name">account.treasory.graph</field>
+ <field name="model">account.account</field>
+ <field name="type">graph</field>
+ <field name="arch" type="xml">
+ <graph string="Treasory Analysis" type="bar">
+ <field name="name"/>
+ <field name="balance" operator="+"/>
+ </graph>
</field>
- </record>
+ </record>
<record id="action_account_form" model="ir.actions.act_window">
<field name="name">Accounts</field>
<field name="res_model">account.account</field>
@@ -314,13 +314,33 @@
</field>
</record>
+ <record id="view_account_journal_view_search" model="ir.ui.view">
+ <field name="name">account.journal.view.search</field>
+ <field name="model">account.journal.view</field>
+ <field name="type">search</field>
+ <field name="arch" type="xml">
+ <search string="Journal View">
+ <field name="name"/>
+ </search>
+ </field>
+ </record>
+ <record id="view_account_journal_view_tree" model="ir.ui.view">
+ <field name="name">account.journal.view.tree</field>
+ <field name="model">account.journal.view</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <tree string="Journal View">
+ <field name="name"/>
+ </tree>
+ </field>
+ </record>
<record id="view_account_journal_view_form" model="ir.ui.view">
<field name="name">account.journal.view.form</field>
<field name="model">account.journal.view</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Journal View">
- <field name="name" select="1"/>
+ <field name="name"/>
<field colspan="4" name="columns_id" nolabel="1" widget="one2many_list"/>
</form>
</field>
@@ -330,7 +350,9 @@
<field name="res_model">account.journal.view</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
+ <field name="search_view_id" ref="view_account_journal_view_search"/>
</record>
+
<menuitem action="action_account_journal_view" id="menu_action_account_journal_view" parent="account.menu_low_level"/>
<!--
@@ -369,8 +391,9 @@
</group>
<newline/>
<group expand="0" string="Group By...">
- <filter string="Type" context="{'group_by':'type'}" icon="terp-stock_effects-object-colorize"/>
<filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/>
+ <separator orientation="vertical"/>
+ <filter string="Type" context="{'group_by':'type'}" icon="terp-stock_effects-object-colorize"/>
</group>
</tree>
</field>
@@ -612,6 +635,7 @@
<field name="domain">[('journal_id.type', '=', 'bank')]</field>
<field name="context">{'journal_type':'bank'}</field>
<field name="search_view_id" ref="view_bank_statement_search"/>
+ <field name="help">A bank statement is a summary of all financial transactions occurring over a given period of time on a deposit account, a credit card, or any other type of account. Start by encoding the starting and closing balance, then record all lines of your statement. When you are in the Payment column of the a line, you can press F1 to open the reconciliation form.</field>
</record>
<record model="ir.actions.act_window.view" id="action_bank_statement_tree_bank">
<field name="sequence" eval="1"/>
@@ -664,6 +688,18 @@
<!--
Account Types
-->
+ <record id="view_account_type_search" model="ir.ui.view">
+ <field name="name">account.account.type.search</field>
+ <field name="model">account.account.type</field>
+ <field name="type">search</field>
+ <field name="arch" type="xml">
+ <search string="Account Type">
+ <field name="name"/>
+ <field name="code"/>
+ </search>
+ </field>
+ </record>
+
<record id="view_account_type_tree" model="ir.ui.view">
<field name="name">account.account.type.tree</field>
<field name="model">account.account.type</field>
@@ -705,6 +741,7 @@
<field name="res_model">account.account.type</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
+ <field name="search_view_id" ref="view_account_type_search"/>
</record>
<menuitem action="action_account_type_form" groups="base.group_extended" id="menu_action_account_type_form" parent="menu_low_level"/>
<!--
@@ -754,6 +791,19 @@
<!--
Tax Codes
-->
+ <record id="view_tax_code_search" model="ir.ui.view">
+ <field name="name">account.tax.code.search</field>
+ <field name="model">account.tax.code</field>
+ <field name="type">search</field>
+ <field name="arch" type="xml">
+ <search string="Account Tax Code">
+ <field name="name"/>
+ <field name="code"/>
+ <field name="parent_id"/>
+ <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+ </search>
+ </field>
+ </record>
<record id="view_tax_code_tree" model="ir.ui.view">
<field name="name">account.tax.code.tree</field>
<field name="model">account.tax.code</field>
@@ -777,10 +827,10 @@
<field name="arch" type="xml">
<form string="Account Tax Code">
<group col="6" colspan="4">
- <field name="name" select="1"/>
- <field name="code" select="1"/>
- <field name="parent_id" select="1"/>
- <field name="company_id" select="1" groups="base.group_multi_company"/>
+ <field name="name"/>
+ <field name="code"/>
+ <field name="parent_id"/>
+ <field name="company_id" groups="base.group_multi_company"/>
</group>
<group colspan="2" col="2">
<separator string="Reporting Configuration" colspan="4"/>
@@ -803,6 +853,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_tax_code_tree"/>
+ <field name="search_view_id" ref="view_tax_code_search"/>
</record>
<menuitem id="next_id_27" name="Taxes" parent="account.menu_finance_accounting"/>
<menuitem action="action_tax_code_list" id="menu_action_tax_code_list" parent="menu_low_level" sequence="12"/>
@@ -834,7 +885,6 @@
<field name="name"/>
<field name="description"/>
</group>
- <newline/>
</search>
</field>
</record>
@@ -845,9 +895,9 @@
<field name="arch" type="xml">
<form string="Account Tax">
<group colspan="4" col="6">
- <field name="name" select="1"/>
- <field name="description" select="1"/>
- <field name="type_tax_use"/>
+ <field name="name"/>
+ <field name="description"/>
+ <field name="type_tax_use"/>
<field name="price_include"/>
<field name="active"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
@@ -881,8 +931,8 @@
</page>
<page groups="base.group_extended" string="Special Computation">
<separator colspan="4" string="Applicability Options"/>
- <field name="applicable_type"/>
- <field name="domain"/>
+ <field name="applicable_type"/>
+ <field name="domain"/>
<separator colspan="4" string="Applicable Code (if type=code)"/>
<field colspan="4" name="python_applicable" nolabel="1" attrs="{'readonly':[('applicable_type','=','true')], 'required':[('applicable_type','=','code')]}"/>
<separator colspan="4" string="Compute Code (if type=code)"/>
@@ -907,7 +957,7 @@
<field name="domain">[('parent_id','=',False)]</field>
<field name="view_type">tree</field>
<field name="view_id" ref="view_tax_code_tree"/>
- <field name="help">Chart of Taxes is a tree view reflecting the structure of the Tax Cases (or tax codes) and shows the current tax situation. The tax chart represents the amount of each area of the tax declaration for your country. It’s presented in a hierarchical structure, which can be modified to fit your needs.</field>
+ <field name="help">The chart of taxes is used to generate your periodic tax statement. You will see here the taxes with codes related to your legal statement according to your country.</field>
</record>
<!--
@@ -1139,6 +1189,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_account_move_line_filter"/>
+ <field name="help">This view is used by accountants in order to record entries massively in OpenERP. If you want to record a supplier invoice, start by recording the line of the expense account, OpenERP will propose to you automatically the Tax related to this account and the counter-part "Account Payable".</field>
</record>
<menuitem
@@ -1227,24 +1278,24 @@
<field name="arch" type="xml">
<form string="Journal Entries">
<group colspan="4" col="6">
- <field name="name" select="1" readonly="True"/>
- <field name="ref" select="1"/>
+ <field name="name" readonly="True"/>
+ <field name="ref"/>
<field name="to_check" groups="base.group_extended"/>
- <field name="journal_id" select="1"/>
+ <field name="journal_id"/>
<field name="period_id"/>
- <field name="date" select="1"/>
+ <field name="date"/>
<field name="company_id" required="1" groups="base.group_multi_company"/>
- <field name="partner_id" invisible="1" select="1"/>
- <field name="amount" invisible="1" select="1"/>
+ <field name="partner_id" invisible="1"/>
+ <field name="amount" invisible="1"/>
</group>
<notebook colspan="4">
<page string="Journal Items">
<field colspan="4" name="line_id" nolabel="1" height="250" widget="one2many_list" default_get="{'lines':line_id ,'journal':journal_id }">
<form string="Journal Item">
<group col="6" colspan="4">
- <field name="name" select="1"/>
+ <field name="name"/>
<field name="ref"/>
- <field name="partner_id" select="1" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
+ <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
<field name="journal_id"/>
<field name="period_id"/>
@@ -1254,7 +1305,7 @@
<page string="Information">
<group col="2" colspan="2">
<separator colspan="2" string="Amount"/>
- <field name="account_id" select="1" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
+ <field name="account_id" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
<field name="debit"/>
<field name="credit"/>
<field name="quantity"/>
@@ -1269,7 +1320,7 @@
<group col="2" colspan="2">
<separator colspan="2" string="Dates"/>
- <field name="date" select="1"/>
+ <field name="date"/>
<field name="date_maturity"/>
<field name="date_created"/>
</group>
@@ -1355,15 +1406,15 @@
<separator orientation="vertical"/>
<filter icon="terp-stock_zoom" string="To Review" domain="[('to_check','=',True)]" groups="base.group_extended" help="Journal Entries to Review"/>
<separator orientation="vertical"/>
- <field name="name" select="1"/>
- <field name="ref" select="1"/>
- <field name="partner_id" select='1'/>
- <field name="date" select='1'/>
+ <field name="name"/>
+ <field name="ref"/>
+ <field name="partner_id"/>
+ <field name="date"/>
</group>
<newline/>
<group col='8' colspan='4'>
- <field name="journal_id" widget="selection" select='1'/>
- <field name="period_id" select='1'/>
+ <field name="journal_id" widget="selection"/>
+ <field name="period_id"/>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="12" col="10">
@@ -1386,6 +1437,7 @@
<field name="view_mode">tree,form,graph</field>
<field name="view_id" ref="view_move_tree"/>
<field name="search_view_id" ref="view_account_move_filter"/>
+ <field name="help">A journal entry consists of several journal items, each of which is either a debit or a credit. OpenERP creates automatically one journal entry per accounting document: invoices, refund, supplier payment, bank statements, etc.</field>
</record>
<menuitem
@@ -1471,7 +1523,7 @@
<field name="type"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency)"/>
<field domain="[('journal_id', '=', parent.journal_id)]" name="account_id"/>
- <field name="analytic_account_id" groups="base.group_extended" />
+ <field name="analytic_account_id" groups="analytic.group_analytic_accounting" />
<field name="amount"/>
<field context="{'partner_id': partner_id, 'amount': amount, 'account_id': account_id, 'date':date}" name="reconcile_id"/>
</form>
@@ -1603,9 +1655,9 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Journal Entry Model">
- <field name="name" select="1"/>
- <field name="journal_id" select="1"/>
- <field name="company_id" select="1" widget='selection' groups="base.group_multi_company"/>
+ <field name="name"/>
+ <field name="journal_id"/>
+ <field name="company_id" widget='selection' groups="base.group_multi_company"/>
<field colspan="4" nolabel="1" name="lines_id" height="250" widget="one2many_list"/>
<separator string="Legend" colspan="4"/>
<field name="legend" colspan="4" nolabel="1"/>
@@ -1641,7 +1693,7 @@
<separator orientation="vertical"/>
<field name="name"/>
<field name="journal_id" widget="selection"/>
- <field name="company_id" groups="base.group_multi_company"/>
+ <field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
<newline/>
<group expand="0" string="Group By...">
@@ -1723,6 +1775,18 @@
</field>
</record>
+ <record id="view_payment_term_search" model="ir.ui.view">
+ <field name="name">account.payment.term.search</field>
+ <field name="model">account.payment.term</field>
+ <field name="type">search</field>
+ <field name="arch" type="xml">
+ <search string="Payment Term">
+ <field name="name"/>
+ <field name="active"/>
+ </search>
+ </field>
+ </record>
+
<record id="view_payment_term_form" model="ir.ui.view">
<field name="name">account.payment.term.form</field>
<field name="model">account.payment.term</field>
@@ -1745,6 +1809,7 @@
<field name="res_model">account.payment.term</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
+ <field name="search_view_id" ref="view_payment_term_search"/>
</record>
<menuitem action="action_payment_term_form"
id="menu_action_payment_term_form" parent="menu_configuration_misc"
@@ -2084,6 +2149,7 @@
<field name="res_model">account.account.template</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,search</field>
+ <field name="search_view_id" ref="view_account_template_search"/>
</record>
<menuitem action="action_account_template_form" id="menu_action_account_template_form" parent="account_template_accounts"/>
@@ -2243,7 +2309,6 @@
<filter icon="terp-sale" string="Sale" domain="[('type_tax_use','=','sale')]" help="Taxes used in Sales"/>
<filter icon="terp-purchase" string="Purchase" domain="[('type_tax_use','=','purchase')]" help="Taxes used in Purchases"/>
<separator orientation="vertical"/>
- <separator orientation="vertical"/>
<field name="name"/>
<field name="description"/>
<field name="chart_template_id"/>
@@ -2257,6 +2322,7 @@
<field name="res_model">account.tax.template</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
+ <field name="search_view_id" ref="view_account_tax_template_search"/>
</record>
<menuitem action="action_account_tax_template_form" id="menu_action_account_tax_template_form" parent="account_template_taxes" sequence="13"/>
@@ -2317,6 +2383,7 @@
<field name="res_model">account.tax.code.template</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,search</field>
+ <field name="search_view_id" ref="view_tax_code_template_search"/>
</record>
<menuitem action="action_account_tax_code_template_form" id="menu_action_account_tax_code_template_form" parent="account_template_taxes" sequence="14"/>
@@ -2346,23 +2413,22 @@
<attribute name='string'></attribute>
</xpath>
<group string="res_config_contents" position="replace">
- <field name="company_id" widget="selection"/>
- <field name ="code_digits" />
- <field name="chart_template_id" widget="selection"/>
- <field name ="seq_journal" />
- <field colspan="4" mode="tree" name="bank_accounts_id"
- nolabel="1" widget="one2many_list">
- <form string="Bank Information">
- <field name="acc_name"/>
- <field name="account_type"/>
- <field name="currency_id" widget="selection"/>
- </form>
- <tree editable="bottom" string="Bank Information">
- <field name="acc_name"/>
- <field name="account_type"/>
- <field name="currency_id" widget="selection"/>
- </tree>
- </field>
+ <field name="company_id" widget="selection"/>
+ <field name ="code_digits" groups="base.group_extended"/>
+ <field name="chart_template_id" widget="selection"/>
+ <field name ="seq_journal" groups="base.group_extended"/>
+ <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list">
+ <form string="Bank Information">
+ <field name="acc_name"/>
+ <field name="account_type"/>
+ <field name="currency_id" widget="selection" groups="base.group_extended"/>
+ </form>
+ <tree editable="bottom" string="Bank Information">
+ <field name="acc_name"/>
+ <field name="account_type"/>
+ <field name="currency_id" widget="selection" groups="base.group_extended"/>
+ </tree>
+ </field>
</group>
</data>
</field>
@@ -2378,7 +2444,7 @@
<field name="target">new</field>
</record>
- <menuitem name="New Company Financial Setting" parent="account.account_template_folder"
+ <menuitem name="New Company Financial Setting" parent="account.menu_finance_accounting"
groups="group_account_manager"
action="account.action_account_configuration_installer" id="menu_wizard"/>
@@ -2396,13 +2462,24 @@
<!-- Fiscal Position Templates -->
+ <record id="view_account_position_template_search" model="ir.ui.view">
+ <field name="name">account.fiscal.position.template.search</field>
+ <field name="model">account.fiscal.position.template</field>
+ <field name="type">search</field>
+ <field name="arch" type="xml">
+ <search string="Fiscal Position">
+ <field name="name"/>
+ </search>
+ </field>
+ </record>
+
<record id="view_account_position_template_form" model="ir.ui.view">
<field name="name">account.fiscal.position.template.form</field>
<field name="model">account.fiscal.position.template</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Fiscal Position Template">
- <field name="name" select="1"/>
+ <field name="name"/>
<field name="chart_template_id"/>
<newline/>
<field name="tax_ids" colspan="4" nolabel="1">
@@ -2444,6 +2521,7 @@
<field name="res_model">account.fiscal.position.template</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
+ <field name="search_view_id" ref="view_account_position_template_search"/>
</record>
<menuitem
@@ -2599,6 +2677,7 @@
<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>
+ <field name="help">Cash Register allows you to manage cash entries in your cash journals.</field>
</record>
<record model="ir.actions.act_window.view" id="act_cash_statement1_all">
<field name="sequence" eval="1"/>
diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index 89767eb15075b9664472d4ce229c2edea9a1ff37..ade29ef6f83cf325c718a4a7252ed0038540a246 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -44,7 +44,7 @@
<form string="Account Board">
<hpaned>
<child1>
- <action colspan="4" height="160" width="400" name="%(account.action_invoice_tree1)d" string="Draft Customer Invoices" domain="[('state','=','draft'),('type','=','out_invoice')]"/>
+ <action colspan="4" height="160" width="400" name="%(account.action_invoice_tree1)d" string="Customer Invoices to Validate" domain="[('state','=','draft'),('type','=','out_invoice')]"/>
<action colspan="4" height="160" width="400" name="%(action_company_analysis_tree)d" string="Company Analysis" />
</child1>
<child2>
@@ -68,6 +68,6 @@
<menuitem id="menu_dashboard_acc" name="Dashboard" sequence="2" parent="account.menu_finance_reporting" groups="group_account_user,group_account_manager"/>
<menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="menu_dashboard_acc" sequence="1"/>
-
+
</data>
</openerp>
diff --git a/addons/account/company.py b/addons/account/company.py
index 8e14fe53c3a9522763da00e643169e5691498d45..0a3cc15663ab35e9c53eafea69a3a62c1b197166 100644
--- a/addons/account/company.py
+++ b/addons/account/company.py
@@ -33,7 +33,7 @@ class res_company(osv.osv):
method=True,
view_load=True,
domain="[('type', '=', 'payable')]",
- help="This Account is used for transferring Profit/Loss(If It is Profit : Amount will be added, Loss : Amount will be deducted.), Which is calculated from Profit & Loss Report"),
+ help="This Account is used for transferring Profit/Loss(If It is Profit: Amount will be added, Loss : Amount will be deducted.), Which is calculated from Profit & Loss Report"),
}
_defaults = {
diff --git a/addons/account/data/account_data2.xml b/addons/account/data/account_data2.xml
index 870500db057ff851085cc1648e58a66d393ff306..38bdd4b2b2c304f8575604e4b1680e03c65fdaf6 100644
--- a/addons/account/data/account_data2.xml
+++ b/addons/account/data/account_data2.xml
@@ -2,6 +2,11 @@
<openerp>
<data noupdate="1">
+ <record id="analytic_journal_sale" model="account.analytic.journal">
+ <field name="name">Sales</field>
+ <field name="type">sale</field>
+ </record>
+
<!--
Payment term
-->
@@ -465,13 +470,42 @@
<field eval="3" name="padding"/>
<field name="prefix">SAJ/%(year)s/</field>
</record>
+ <record id="sequence_refund_sales_journal" model="ir.sequence">
+ <field name="name">Sales Credit Note Journal</field>
+ <field name="code">account.journal</field>
+ <field eval="3" name="padding"/>
+ <field name="prefix">SCNJ/%(year)s/</field>
+ </record>
<record id="sequence_purchase_journal" model="ir.sequence">
<field name="name">Purchase Journal</field>
<field name="code">account.journal</field>
<field eval="3" name="padding"/>
<field name="prefix">EXJ/%(year)s/</field>
</record>
-
+ <record id="sequence_refund_purchase_journal" model="ir.sequence">
+ <field name="name">Expenses Credit Notes Journal</field>
+ <field name="code">account.journal</field>
+ <field eval="3" name="padding"/>
+ <field name="prefix">ECNJ/%(year)s/</field>
+ </record>
+ <record id="sequence_bank_journal" model="ir.sequence">
+ <field name="name">Bank Journal</field>
+ <field name="code">account.journal</field>
+ <field eval="3" name="padding"/>
+ <field name="prefix">BNK/%(year)s/</field>
+ </record>
+ <record id="sequence_check_journal" model="ir.sequence">
+ <field name="name">Checks Journal</field>
+ <field name="code">account.journal</field>
+ <field eval="3" name="padding"/>
+ <field name="prefix">CHK/%(year)s/</field>
+ </record>
+ <record id="sequence_cash_journal" model="ir.sequence">
+ <field name="name">Cash Journal</field>
+ <field name="code">account.journal</field>
+ <field eval="3" name="padding"/>
+ <field name="prefix">CSH/%(year)s/</field>
+ </record>
<!--
Account Statement Sequences
-->
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 764420e668905fef6fce992b515a58cfc9f5325b..87c8a37254d50d1be2b2a264e6ef146cca1385f8 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -357,7 +357,7 @@
<field name="type">sale_refund</field>
<field eval="True" name="refund_journal"/>
<field name="view_id" ref="account_sp_refund_journal_view"/>
- <field name="sequence_id" ref="sequence_sale_journal"/>
+ <field name="sequence_id" ref="sequence_refund_sales_journal"/>
<field model="account.account" name="default_credit_account_id" ref="a_sale"/>
<field model="account.account" name="default_debit_account_id" ref="a_sale"/>
<field name="analytic_journal_id" ref="cose_journal_sale"/>
@@ -381,7 +381,7 @@
<field name="type">purchase_refund</field>
<field eval="True" name="refund_journal"/>
<field name="view_id" ref="account_sp_refund_journal_view"/>
- <field name="sequence_id" ref="sequence_purchase_journal"/>
+ <field name="sequence_id" ref="sequence_refund_purchase_journal"/>
<field model="account.account" name="default_debit_account_id" ref="a_expense"/>
<field model="account.account" name="default_credit_account_id" ref="a_expense"/>
<field name="analytic_journal_id" ref="exp"/>
@@ -393,7 +393,7 @@
<field name="code">BNK</field>
<field name="type">bank</field>
<field name="view_id" ref="account_journal_bank_view"/>
- <field name="sequence_id" ref="sequence_journal"/>
+ <field name="sequence_id" ref="sequence_bank_journal"/>
<field model="account.account" name="default_debit_account_id" ref="cash"/>
<field model="account.account" name="default_credit_account_id" ref="cash"/>
<field name="analytic_journal_id" ref="sit"/>
@@ -404,7 +404,7 @@
<field name="code">CHK</field>
<field name="type">bank</field>
<field name="view_id" ref="account_journal_bank_view"/>
- <field name="sequence_id" ref="sequence_journal"/>
+ <field name="sequence_id" ref="sequence_check_journal"/>
<field model="account.account" name="default_debit_account_id" ref="cash"/>
<field model="account.account" name="default_credit_account_id" ref="cash"/>
<field name="analytic_journal_id" ref="sit"/>
@@ -415,7 +415,7 @@
<field name="code">CSH</field>
<field name="type">cash</field>
<field name="view_id" ref="account_journal_bank_view"/>
- <field name="sequence_id" ref="sequence_journal"/>
+ <field name="sequence_id" ref="sequence_cash_journal"/>
<field model="account.account" name="default_debit_account_id" ref="cash"/>
<field model="account.account" name="default_credit_account_id" ref="cash"/>
<field name="analytic_journal_id" ref="sit"/>
diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po
index a34f7c100c0343f4a4bc4b4160ed044b446a47e4..c4109588ca04f1f2f995d838c2d5851fffb8e973 100644
--- a/addons/account/i18n/hr.po
+++ b/addons/account/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-13 15:51+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-14 07:28+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-14 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po
index a2e5ce8ef6b6a8b5543193cc5dcdd67af34ef9c2..ea1d2cfeba4ea58e5c85c96e56dfa1880742a70c 100644
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-12 07:43+0000\n"
+"PO-Revision-Date: 2010-10-17 07:44+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Mongolian <mn@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-10-13 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-10-18 04:55+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -647,7 +647,7 @@ msgstr "Харилцагчийн төлбөрийн нөхцөл"
#. module: account
#: view:account.move.reconcile:0
msgid "Account Entry Reconcile"
-msgstr "ДанÑны бичилт гүйцÑÑлт"
+msgstr "ДанÑны бичилт бууралт"
#. module: account
#: wizard_button:account.move.bank.reconcile,init,open:0
@@ -706,7 +706,7 @@ msgstr "ÐÑмÑлт мÑдÑÑлÑл"
#. module: account
#: selection:account.invoice,type:0
msgid "Customer Refund"
-msgstr "Худалдан авагчийн буцаалт"
+msgstr "ҮйлчлүүлÑгчийн буцаалт"
#. module: account
#: wizard_view:account.analytic.account.chart,init:0
@@ -724,7 +724,7 @@ msgstr "Татварын ангилалын Ñ‚ÑмдÑг"
#. module: account
#: help:res.partner,credit:0
msgid "Total amount this customer owes you."
-msgstr "ÐÐ½Ñ Ñ…ÑƒÐ´Ð°Ð»Ð´Ð°Ð½ Ð°Ð²Ð°Ð³Ñ‡Ð°Ð°Ñ Ð°Ð²Ð°Ñ… нийт авлагын дүн."
+msgstr "ÐÐ½Ñ Ò¯Ð¹Ð»Ñ‡Ð»Ò¯Ò¯Ð»ÑгчÑÑÑ Ð°Ð²Ð°Ñ… нийт авлагын дүн."
#. module: account
#: view:account.move.line:0
@@ -1067,7 +1067,7 @@ msgstr "ТөлÑөн дүн"
#: model:process.transition,name:account.process_transition_customerinvoice0
#: model:process.transition,name:account.process_transition_suppliercustomerinvoice0
msgid "Customer Invoice"
-msgstr "Худалдан авагчийн нÑÑ…ÑмжлÑл"
+msgstr "ҮйлчлүүлÑгчийн нÑÑ…ÑмжлÑл"
#. module: account
#: wizard_view:account.open_closed_fiscalyear,init:0
@@ -1401,7 +1401,7 @@ msgstr "Ðлектроник файл"
#. module: account
#: view:res.partner:0
msgid "Customer Credit"
-msgstr "Худалдан авагчийн кредит"
+msgstr "ҮйлчлүүлÑгчийн кредит"
#. module: account
#: field:account.invoice,tax_line:0
@@ -1881,7 +1881,7 @@ msgstr "ÐхлÑÑ… огноо"
#. module: account
#: model:account.journal,name:account.refund_expenses_journal
msgid "x Expenses Credit Notes Journal"
-msgstr ""
+msgstr "Зардлыг кредитийн журналд Ñ‚ÑмдÑглÑÑ…"
#. module: account
#: field:account.analytic.journal,type:0
@@ -1930,7 +1930,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_invoice_tree5
#: model:ir.ui.menu,name:account.menu_invoice_draft
msgid "Draft Customer Invoices"
-msgstr "Худалдан авагчийн ноорог нÑÑ…ÑмжлÑл"
+msgstr "ҮйлчлүүлÑгчийн ноорог нÑÑ…ÑмжлÑл"
#. module: account
#: model:ir.model,name:account.model_account_subscription_line
@@ -2020,7 +2020,7 @@ msgstr "Ðналитик журналын тайлан"
#: model:ir.actions.act_window,name:account.action_invoice_tree3
#: model:ir.ui.menu,name:account.menu_action_invoice_tree3
msgid "Customer Refunds"
-msgstr "Худалдан авагчийн буцаалт"
+msgstr "ҮйлчлүүлÑгчийн буцаалт"
#. module: account
#: rml:account.vat.declaration:0
@@ -2096,7 +2096,7 @@ msgstr "Өгөгдлүүд"
#. module: account
#: model:process.process,name:account.process_process_invoiceprocess0
msgid "Customer Invoice Process"
-msgstr "Худалдан авагчийн нÑÑ…ÑмжлÑлийн Ñвц"
+msgstr "ҮйлчлүүлÑгчийн нÑÑ…ÑмжлÑлийн Ñвц"
#. module: account
#: rml:account.invoice:0
@@ -2476,7 +2476,7 @@ msgstr "Журнал нÑÑÑ…"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "KI"
-msgstr ""
+msgstr "KI"
#. module: account
#: model:ir.actions.wizard,name:account.action_account_analytic_line
@@ -2732,7 +2732,7 @@ msgstr "-"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "asgfas"
-msgstr ""
+msgstr "asgfas"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
@@ -2859,7 +2859,7 @@ msgstr "Зарлага төвлөрөл"
#. module: account
#: rml:account.overdue:0
msgid "Customer Ref:"
-msgstr "Худалдан авагчийн дугаар"
+msgstr "ҮйлчлүүлÑгчийн дугаар"
#. module: account
#: xsl:account.transfer:0
@@ -2882,7 +2882,7 @@ msgstr "Ðийт кредит"
#: model:ir.actions.act_window,name:account.action_invoice_tree1_new
#: model:ir.ui.menu,name:account.menu_action_invoice_tree1_new
msgid "New Customer Invoice"
-msgstr "Ð¨Ð¸Ð½Ñ Ñ…ÑƒÐ´Ð°Ð»Ð´Ð°Ð½ авагчийн нÑÑ…ÑмжлÑл"
+msgstr "Ð¨Ð¸Ð½Ñ Ò¯Ð¹Ð»Ñ‡Ð»Ò¯Ò¯Ð»Ñгчийн нÑÑ…ÑмжлÑл"
#. module: account
#: field:account.account,reconcile:0
@@ -2965,7 +2965,7 @@ msgstr "ДанÑны хуулга"
#. module: account
#: rml:account.overdue:0
msgid "Document: Customer account statement"
-msgstr "Баримт: Худалдан авагчийн данÑны хуулга"
+msgstr "Баримт: ҮйлчлүүлÑгчийн данÑны хуулга"
#. module: account
#: view:product.product:0
@@ -3042,7 +3042,7 @@ msgstr "Гаралтын валютын ханш"
#: model:ir.actions.act_window,name:account.action_invoice_tree10
#: model:ir.ui.menu,name:account.menu_action_invoice_tree10
msgid "Draft Customer Refunds"
-msgstr "Худалдан авагчийн ноорог буцаалт"
+msgstr "ҮйлчлүүлÑгчийн ноорог буцаалт"
#. module: account
#: field:account.journal.column,readonly:0
@@ -3119,7 +3119,7 @@ msgstr "Ðналитик Журнал"
#. module: account
#: rml:account.general.ledger:0
msgid "Entry Label"
-msgstr "БичлÑгийн нÑÑ€"
+msgstr "ГүйлгÑÑний нÑÑ€"
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -3498,7 +3498,9 @@ msgstr "Өдрийн огноо"
msgid ""
"The amount expressed in an optional other currency if it is a multi-currency "
"entry."
-msgstr "Ó¨Ó©Ñ€ валютаар илÑрхийлÑÑн дүн байна"
+msgstr ""
+"Ð¥ÑÑ€Ñв ÑÐ½Ñ Ð³Ò¯Ð¹Ð»Ð³ÑÑ Ð³Ð°Ð´Ð°Ð°Ð´ валютаар хийгдÑÑн бол гүйлгÑÑний дүнг гадаад "
+"валютаар илÑрхийлнÑ."
#. module: account
#: field:account.tax,parent_id:0
@@ -3599,7 +3601,7 @@ msgstr "Ð¨Ð¸Ð½Ñ Ð½Ð¸Ð¹Ð»Ò¯Ò¯Ð»Ñгчийн буцаалт"
#. module: account
#: view:account.model:0
msgid "Entry Model"
-msgstr "ГүйлгÑÑний модель"
+msgstr "ГүйлгÑÑний загвар"
#. module: account
#: wizard_field:account.general.ledger.report,checktype,amount_currency:0
@@ -3764,7 +3766,7 @@ msgstr "БиелÑÑ… огноо"
#. module: account
#: view:account.subscription:0
msgid "Entry Subscription"
-msgstr "захиалгын бичилт"
+msgstr "ГүйлгÑÑний Ñ‚ÑмдÑглÑл"
#. module: account
#: selection:account.print.journal.report,init,sort_selection:0
@@ -3840,7 +3842,7 @@ msgstr ""
" Харилцагчийн Ð´Ð°Ð½Ñ Ð±Ò¯Ñ€Ñ‚Ð³Ñл\n"
" Татварын менежмент\n"
" ТөÑөв\n"
-" Харилцагчийн нÑÑ…ÑмжлÑл\n"
+" ҮйлчлүүлÑгчийн нÑÑ…ÑмжлÑл\n"
" Банкны ажил гүйлгÑ\n"
" "
@@ -4001,7 +4003,7 @@ msgstr "ÐÑмÑлт Талбарууд"
#. module: account
#: view:res.partner:0
msgid "Customer Accounting Properties"
-msgstr "Худалдан авагчийн Ñанхүү бүртгÑл"
+msgstr "ҮйлчлүүлÑгчийн Ñанхүү бүртгÑл"
#. module: account
#: view:account.bank.statement:0
@@ -4126,12 +4128,14 @@ msgid ""
"You can check this box to mark the entry line as a litigation with the "
"associated partner"
msgstr ""
+"Журналын бичилт нь холбогдох харилцагчийн хувьд маргаантай гÑж үзвÑл ÑÐ½Ñ "
+"нүдийг Ñонгох Ñ…ÑÑ€ÑгтÑй"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree1
#: model:ir.ui.menu,name:account.menu_action_invoice_tree1
msgid "Customer Invoices"
-msgstr "Худалдан авагчийн нÑÑ…ÑмжлÑл"
+msgstr "ҮйлчлүүлÑгчийн нÑÑ…ÑмжлÑл"
#. module: account
#: field:res.partner,debit_limit:0
@@ -4315,7 +4319,7 @@ msgstr "Татварууд:"
#: model:ir.actions.act_window,name:account.action_invoice_tree7
#: model:ir.ui.menu,name:account.menu_action_invoice_tree7
msgid "Unpaid Customer Invoices"
-msgstr "Худалдан авагчийн төлөгдөөгүй нÑÑ…ÑмжлÑл"
+msgstr "ҮйлчлүүлÑгчийн төлөгдөөгүй нÑÑ…ÑмжлÑл"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2
@@ -4478,7 +4482,7 @@ msgstr "Санхүүгийн жилийн дарааллууд"
#. module: account
#: view:account.model.line:0
msgid "Entry Model Line"
-msgstr "БүртгÑл загвар шугам"
+msgstr "ГүйлгÑÑний загварын мөр"
#. module: account
#: view:account.tax.template:0
@@ -4503,12 +4507,12 @@ msgstr "БаланÑын удирдлагын ÑхлÑл төгÑгөлийг Ñ‚
#. module: account
#: wizard_view:account.wizard_paid_open,init:0
msgid "Are you sure you want to open this invoice ?"
-msgstr ""
+msgstr "ÐÐ½Ñ Ð½ÑÑ…ÑмжлÑлийг нÑÑхдÑÑ Ñ‚Ð° итгÑлтÑй байна уу?"
#. module: account
#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
msgid "Partner Other Ledger"
-msgstr ""
+msgstr "БуÑад харилцагчийн тооцооны дÑвтÑÑ€"
#. module: account
#: view:res.partner:0
@@ -4542,7 +4546,7 @@ msgstr "ДанÑны бичилт"
#. module: account
#: model:ir.actions.act_window,name:account.act_account_partner_account_move_unreconciled
msgid "Receivables & Payables"
-msgstr "Ðвлагын Ð´Ð°Ð½Ñ Ð±Ð¾Ð»Ð¾Ð½ төлбөр"
+msgstr "Ðвлага & Өглөг"
#. module: account
#: rml:account.general.ledger:0
@@ -4625,7 +4629,7 @@ msgstr "ÐийлүүлÑгчийн Ñанхүү бүртгÑл"
#. module: account
#: view:account.analytic.account:0
msgid "Analytic Account Statistics"
-msgstr ""
+msgstr "Ðналитик Ñанхүүгийн ÑтатиÑтик"
#. module: account
#: view:wizard.multi.charts.accounts:0
@@ -4652,12 +4656,12 @@ msgstr "Ðжил гүйлгÑÑнүүд"
#. module: account
#: wizard_view:account.analytic.account.chart,init:0
msgid "Analytic Account Charts"
-msgstr ""
+msgstr "Ðналитик данÑны мод"
#. module: account
#: wizard_field:account.aged.trial.balance,init,result_selection:0
msgid "Filter on Partners"
-msgstr ""
+msgstr "Харилцагч дÑÑÑ€ шүүлт хийх"
#. module: account
#: field:account.tax,price_include:0
@@ -4674,7 +4678,7 @@ msgstr "Ðналитик бичилтүүд журналаар"
#: model:process.transition,note:account.process_transition_suppliervalidentries0
#: model:process.transition,note:account.process_transition_validentries0
msgid "Valid entries from invoice"
-msgstr ""
+msgstr "ÐÑÑ…ÑмжлÑлийн хүчинтÑй бичилт"
#. module: account
#: field:account.account,company_id:0
@@ -4704,7 +4708,7 @@ msgstr "Орлого"
#. module: account
#: selection:account.subscription,state:0
msgid "Running"
-msgstr ""
+msgstr "Байнгын"
#. module: account
#: help:account.tax,include_base_amount:0
@@ -4728,7 +4732,7 @@ msgstr "Журналын нÑÑ€"
#. module: account
#: model:process.transition,note:account.process_transition_invoiceimport0
msgid "Import invoice from statement"
-msgstr ""
+msgstr "ÐœÑдÑгдлÑÑÑ Ð½ÑÑ…ÑмжлÑл оруулж ирÑÑ…"
#. module: account
#: selection:account.automatic.reconcile,init,power:0
@@ -4745,13 +4749,13 @@ msgstr "Санхүүгийн жил"
#. module: account
#: model:process.node,note:account.process_node_importinvoice0
msgid "Import from invoices or payments"
-msgstr ""
+msgstr "ÐÑÑ…ÑмжлÑл буюу Ñ‚Ó©Ð»Ó©Ð»Ñ‚Ó©Ó©Ñ Ð¾Ñ€ÑƒÑƒÐ»Ð°Ñ…"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_reconcile_select
#: model:ir.ui.menu,name:account.menu_reconcile_select
msgid "Reconcile entries"
-msgstr ""
+msgstr "Тулгах бичилт"
#. module: account
#: xsl:account.transfer:0
@@ -4837,7 +4841,7 @@ msgstr "Ð/к дугаар"
#: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree_month
#: model:ir.ui.menu,name:account.report_account_analytic_journal_print_month
msgid "Account cost and revenue by journal (This Month)"
-msgstr ""
+msgstr "ДанÑны өртөг, орлого журналаар"
#. module: account
#: selection:account.partner.balance.report,init,result_selection:0
@@ -4921,7 +4925,7 @@ msgstr "Борлуулалтын татварууд"
#. module: account
#: model:ir.model,name:account.model_account_move_reconcile
msgid "Account Reconciliation"
-msgstr ""
+msgstr "ДанÑны тулгалт"
#. module: account
#: view:account.bank.statement:0
@@ -4953,12 +4957,12 @@ msgstr ""
#: field:account.bank.statement.reconcile,total_amount:0
#: field:account.bank.statement.reconcile,total_second_amount:0
msgid "Payment amount"
-msgstr ""
+msgstr "Төлөлтийн Ñ…ÑмжÑÑ"
#. module: account
#: view:account.analytic.account:0
msgid "Analytic account"
-msgstr ""
+msgstr "Ðналитик данÑ"
#. module: account
#: rml:account.invoice:0
@@ -4995,17 +4999,17 @@ msgstr "Дебит"
#. module: account
#: model:ir.ui.menu,name:account.next_id_42
msgid "All Months"
-msgstr ""
+msgstr "Бүх Ñарууд"
#. module: account
#: wizard_field:account.invoice.refund,init,date:0
msgid "Operation date"
-msgstr ""
+msgstr "Ðшиглалтын огноо"
#. module: account
#: field:account.invoice,invoice_line:0
msgid "Invoice Lines"
-msgstr ""
+msgstr "ÐÑÑ…ÑмжлÑлийн мөр"
#. module: account
#: field:account.period,date_start:0
@@ -5020,7 +5024,7 @@ msgstr "Ð¨Ð¸Ð½Ñ Ð³Ò¯Ð¹Ð»Ð³ÑÑний нÑÑ€"
#. module: account
#: wizard_button:account_use_models,init_form,create:0
msgid "Create Entries"
-msgstr ""
+msgstr "Бичилт Ò¯Ò¯ÑгÑÑ…"
#. module: account
#: field:account.tax,ref_tax_code_id:0
@@ -5031,17 +5035,17 @@ msgstr "Буцаалтын татварын ангилал"
#. module: account
#: field:account.invoice.tax,name:0
msgid "Tax Description"
-msgstr ""
+msgstr "Татварын тайлбар"
#. module: account
#: help:account.invoice,move_id:0
msgid "Link to the automatically generated account moves."
-msgstr ""
+msgstr "ДанÑны автомат Ò¯Ò¯ÑÑÑн шилжилтүүд Ñ€Ò¯Ò¯ холбох"
#. module: account
#: wizard_field:account.automatic.reconcile,reconcile,reconciled:0
msgid "Reconciled transactions"
-msgstr ""
+msgstr "ТулгагдÑан гүйлгÑÑнүүд"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_reporting
@@ -5052,23 +5056,23 @@ msgstr "Тайлан"
#: rml:account.third_party_ledger:0
#: rml:account.third_party_ledger_other:0
msgid "/"
-msgstr ""
+msgstr "/"
#. module: account
#: model:process.node,note:account.process_node_invoiceinvoice0
#: model:process.node,note:account.process_node_supplierinvoiceinvoice0
msgid "Have a number and entries are generated"
-msgstr ""
+msgstr "Ò®Ò¯ÑгÑгдÑÑн тоо болон бичлÑгүүдийг агуулж байна"
#. module: account
#: rml:account.analytic.account.analytic.check:0
msgid "Analytic Check -"
-msgstr ""
+msgstr "Ðналитик шалгалт-"
#. module: account
#: rml:account.account.balance:0
msgid "Account Balance -"
-msgstr ""
+msgstr "ДанÑны Ñ‚ÑнцÑл-"
#. module: account
#: field:account.journal,group_invoice_lines:0
@@ -5084,7 +5088,7 @@ msgstr "Тохиргоо"
#: view:account.analytic.line:0
#: view:account.invoice:0
msgid "Total amount"
-msgstr ""
+msgstr "Ðийт Ñ…ÑмжÑÑ"
#. module: account
#: view:account.journal:0
@@ -5094,7 +5098,7 @@ msgstr "Журналын бүтÑц"
#. module: account
#: view:account.subscription.line:0
msgid "Subscription lines"
-msgstr ""
+msgstr "БүртгÑлийн мөрүүд"
#. module: account
#: field:account.chart.template,property_account_income:0
@@ -5111,7 +5115,7 @@ msgstr "Уг данÑны гүйлгÑÑг хөрвүүлж хадгалах в
#: wizard_button:populate_statement_from_inv,go,end:0
#: wizard_button:populate_statement_from_inv,init,end:0
msgid "_Cancel"
-msgstr ""
+msgstr "Цуцлах"
#. module: account
#: wizard_view:account.general.ledger.report,checktype:0
@@ -5129,7 +5133,7 @@ msgstr "ТонгоруулÑан аналитик баланÑ-"
#: model:process.node,name:account.process_node_paidinvoice0
#: model:process.node,name:account.process_node_supplierpaidinvoice0
msgid "Paid invoice"
-msgstr ""
+msgstr "ÐÑÑ…ÑмжлÑл төлөх"
#. module: account
#: view:account.tax:0
@@ -5147,7 +5151,7 @@ msgstr "Татварын групп"
#: model:ir.actions.act_window,name:account.action_invoice_tree3_new
#: model:ir.ui.menu,name:account.menu_action_invoice_tree3_new
msgid "New Customer Refund"
-msgstr "Ð¨Ð¸Ð½Ñ Ñ…ÑƒÐ´Ð°Ð»Ð´Ð°Ð½ авагчийн буцаалт"
+msgstr "Ð¨Ð¸Ð½Ñ Ò®Ð¹Ð»Ñ‡Ð»Ò¯Ò¯Ð»Ñгчийн буцаалт"
#. module: account
#: help:wizard.multi.charts.accounts,seq_journal:0
@@ -5161,7 +5165,7 @@ msgstr ""
#. module: account
#: model:ir.actions.wizard,name:account.wizard_populate_statement_from_inv
msgid "Import invoices"
-msgstr ""
+msgstr "ÐÑÑ…ÑмжлÑл оруулж ирÑÑ…"
#. module: account
#: wizard_view:account.move.line.unreconcile,init:0
@@ -5195,7 +5199,7 @@ msgstr "ДанÑны өгөгдөл"
#. module: account
#: view:account.tax.code.template:0
msgid "Account Tax Code Template"
-msgstr ""
+msgstr "ДанÑны татварын кодны загвар"
#. module: account
#: view:account.subscription:0
@@ -5205,7 +5209,7 @@ msgstr ""
#. module: account
#: model:process.node,name:account.process_node_manually0
msgid "Manually"
-msgstr ""
+msgstr "Гараар"
#. module: account
#: view:account.invoice:0
@@ -5235,22 +5239,22 @@ msgstr "ÐÑÑ…ÑмжлÑлийн гүйлгÑÑ"
#. module: account
#: wizard_field:account.invoice.pay,addendum,writeoff_journal_id:0
msgid "Write-Off journal"
-msgstr ""
+msgstr "Ð–ÑƒÑ€Ð½Ð°Ð»Ð°Ð°Ñ Ñ…Ð°Ñалт хийх"
#. module: account
#: wizard_button:account.invoice.pay,init,writeoff_check:0
msgid "Full Payment"
-msgstr ""
+msgstr "БүтÑн төлөлт"
#. module: account
#: selection:account.move,type:0
msgid "Journal Purchase"
-msgstr ""
+msgstr "Худалдан авалтын журнал"
#. module: account
#: selection:account.move,type:0
msgid "Cash Receipt"
-msgstr ""
+msgstr "КаÑÑын баримт"
#. module: account
#: field:account.fiscal.position.tax,tax_dest_id:0
@@ -5276,9 +5280,7 @@ msgstr "Томьёолол"
#. module: account
#: help:account.move.line,currency_id:0
msgid "The optional other currency if it is a multi-currency entry."
-msgstr ""
-"Тухайн данÑны Ð²Ð°Ð»ÑŽÑ‚Ð°Ð°Ñ Ó©Ó©Ñ€ валютаар бичилт хийх үед Ñ…ÑÑ€ÑглÑгдÑÑ… валютын "
-"төрөл."
+msgstr "Гадаад валютын гүйлгÑÑ Ð±Ð¾Ð» валютыг Ñонгоно."
#. module: account
#: view:account.invoice:0
@@ -5295,7 +5297,7 @@ msgstr ""
#. module: account
#: wizard_view:account_use_models,create:0
msgid "Use Model"
-msgstr ""
+msgstr "Модел ашиглах"
#. module: account
#: wizard_button:account.wizard_paid_open,init,end:0
@@ -5305,7 +5307,7 @@ msgstr "Үгүй"
#. module: account
#: model:ir.actions.act_window,name:account.act_account_partner_account_move
msgid "All account entries"
-msgstr ""
+msgstr "Бүх данÑны бичилт"
#. module: account
#: help:account.invoice.tax,tax_code_id:0
@@ -5323,7 +5325,7 @@ msgstr "Огноо шүүлт"
#. module: account
#: wizard_view:populate_statement_from_inv,init:0
msgid "Choose Journal and Payment Date"
-msgstr ""
+msgstr "Журнал болон төлөлтийн огноо Ñонгох"
#. module: account
#: selection:account.analytic.account,state:0
@@ -5347,7 +5349,7 @@ msgstr "ТөлÑөн"
#: model:ir.actions.act_window,name:account.action_invoice_tree11
#: model:ir.ui.menu,name:account.menu_action_invoice_tree11
msgid "Unpaid Customer Refunds"
-msgstr "Худалдан авагчийн төлөгдөөгүй буцаалтууд"
+msgstr "ҮйлчлүүлÑгчийн төлөгдөөгүй буцаалтууд"
#. module: account
#: help:account.invoice,residual:0
@@ -5357,18 +5359,18 @@ msgstr ""
#. module: account
#: wizard_view:account.period.close,init:0
msgid "Are you sure ?"
-msgstr ""
+msgstr "Та итгÑлтÑй байна уу?"
#. module: account
#: rml:account.invoice:0
#: view:account.invoice:0
msgid "PRO-FORMA"
-msgstr ""
+msgstr "PRO-FORMA"
#. module: account
#: field:account.move.reconcile,line_partial_ids:0
msgid "Partial Entry lines"
-msgstr ""
+msgstr "Ð¥ÑÑÑгчилÑÑн журналын бичилт"
#. module: account
#: help:account.move.line,statement_id:0
@@ -5378,7 +5380,7 @@ msgstr "Банкны гүйлгÑÑ Ñ‚ÑƒÐ»Ð³Ð°Ð»Ñ‚Ð°Ð½Ð´ Ñ…ÑÑ€ÑглÑгдÑÑ…
#. module: account
#: view:account.fiscalyear:0
msgid "Fiscalyear"
-msgstr ""
+msgstr "Санхүүгийн жил"
#. module: account
#: wizard_button:account.analytic.line,init,open:0
@@ -5389,12 +5391,12 @@ msgstr ""
#: selection:account.analytic.account,type:0
#: selection:account.move.line,centralisation:0
msgid "Normal"
-msgstr ""
+msgstr "Ð¥Ñвийн"
#. module: account
#: model:process.process,name:account.process_process_supplierinvoiceprocess0
msgid "Supplier Invoice Process"
-msgstr ""
+msgstr "ÐийлүүлÑгч нÑÑ…ÑмжлÑÑ… процеÑÑ"
#. module: account
#: rml:account.account.balance:0
@@ -5408,7 +5410,7 @@ msgstr ""
#: rml:account.third_party_ledger_other:0
#: rml:account.vat.declaration:0
msgid "Page"
-msgstr ""
+msgstr "ХуудаÑ"
#. module: account
#: view:account.move:0
@@ -5420,23 +5422,23 @@ msgstr "ТуÑлах мÑдÑÑлÑл"
#: model:ir.actions.act_window,name:account.action_payment_term_form
#: model:ir.ui.menu,name:account.menu_action_payment_term_form
msgid "Payment Terms"
-msgstr ""
+msgstr "Төлөлтийн нөхцөл"
#. module: account
#: selection:account.aged.trial.balance,init,result_selection:0
msgid "Receivable and Payable"
-msgstr ""
+msgstr "Ðвлага болон өглөг"
#. module: account
#: rml:account.account.balance:0
#: rml:account.general.journal:0
msgid ":"
-msgstr ""
+msgstr ":"
#. module: account
#: field:account.bank.statement.line,reconcile_amount:0
msgid "Amount reconciled"
-msgstr ""
+msgstr "ТулгагдÑан Ñ…ÑмжÑÑ"
#. module: account
#: selection:account.account,currency_mode:0
@@ -5474,7 +5476,7 @@ msgstr "Татварын Ñ…ÑÑ€ÑглÑÑ"
#: model:ir.actions.act_window,name:account.action_subscription_form
#: model:ir.ui.menu,name:account.menu_action_subscription_form
msgid "Subscription Entries"
-msgstr ""
+msgstr "Баримтын бичилт"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree6
@@ -5502,7 +5504,7 @@ msgstr "Мөчлөгийн төгÑгөл"
#: view:account.move:0
#: model:ir.model,name:account.model_account_move
msgid "Account Entry"
-msgstr ""
+msgstr "ДанÑны бичилт"
#. module: account
#: rml:account.general.journal:0
@@ -5528,7 +5530,7 @@ msgstr "Ерөнхий журнал"
#: rml:account.third_party_ledger:0
#: rml:account.third_party_ledger_other:0
msgid "Balance"
-msgstr "ТÑнцÑл"
+msgstr "БаланÑ"
#. module: account
#: rml:account.invoice:0
@@ -5538,7 +5540,7 @@ msgstr "Буцааж төлөх"
#. module: account
#: model:ir.model,name:account.model_account_invoice_tax
msgid "Invoice Tax"
-msgstr ""
+msgstr "Татварын нÑÑ…ÑмжлÑл"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
@@ -5664,7 +5666,7 @@ msgstr ""
#. module: account
#: field:account.model.line,date:0
msgid "Current Date"
-msgstr ""
+msgstr "Одоогийн огноо"
#. module: account
#: selection:account.move,type:0
@@ -5785,7 +5787,7 @@ msgstr "Мөчлөг нÑÑж хаах"
#. module: account
#: rml:account.analytic.account.balance:0
msgid "Analytic Balance -"
-msgstr ""
+msgstr "Ðналитик Ñ‚ÑнцÑл"
#. module: account
#: wizard_field:account_use_models,init_form,model:0
@@ -5802,7 +5804,7 @@ msgstr "ÐÑÑ…ÑмжлÑлийн мөр"
#. module: account
#: selection:account.bank.statement.line,type:0
msgid "Customer"
-msgstr "Худалдан авагч"
+msgstr "ҮйлчлүүлÑгчийн"
#. module: account
#: field:account.subscription,period_type:0
@@ -5812,7 +5814,7 @@ msgstr "Мөчлөгийн төрөл"
#. module: account
#: view:product.category:0
msgid "Accounting Properties"
-msgstr ""
+msgstr "Санхүүгийн бүрÑлдÑхүүн Ñ…ÑÑгүүд"
#. module: account
#: model:ir.model,name:account.model_account_sequence_fiscalyear
@@ -5858,7 +5860,7 @@ msgstr "Солих данÑ"
#. module: account
#: rml:account.overdue:0
msgid "Maturity"
-msgstr ""
+msgstr "Хугацаа"
#. module: account
#: field:account.fiscalyear,name:0
@@ -5894,12 +5896,12 @@ msgstr "ÐийлүүлÑгчийн буцаалт"
#: model:process.transition,note:account.process_transition_entriesreconcile0
#: model:process.transition,note:account.process_transition_supplierentriesreconcile0
msgid "Reconcile Entries."
-msgstr ""
+msgstr "Бичилт тулгах"
#. module: account
#: field:account.subscription.line,move_id:0
msgid "Entry"
-msgstr "Бичилт"
+msgstr "Ðжил гүйлгÑÑ"
#. module: account
#: model:process.node,note:account.process_node_paidinvoice0
@@ -5918,7 +5920,7 @@ msgstr ""
#. module: account
#: model:ir.module.module,shortdesc:account.module_meta_information
msgid "Accounting and financial management"
-msgstr ""
+msgstr "Санхүү Ñдийн заÑгийн удирдлага"
#. module: account
#: view:account.fiscal.position.template:0
@@ -6044,7 +6046,7 @@ msgstr "Ð¥ÑÑ€ÑглÑгч уг данÑны гүйлгÑÑг банкны ху
#. module: account
#: wizard_button:account.subscription.generate,init,generate:0
msgid "Compute Entry Dates"
-msgstr ""
+msgstr "ГүйлгÑÑний огноо тооцоолол"
#. module: account
#: view:board.board:0
@@ -6060,7 +6062,7 @@ msgstr "Ðоорог нÑÑ…ÑмжлÑл"
#: model:ir.actions.act_window,name:account.open_board_account
#: model:ir.ui.menu,name:account.menu_board_account
msgid "Accounting Dashboard"
-msgstr ""
+msgstr "Санхүүгийн Ñ…Ñнах Ñамбар"
#. module: account
#: view:board.board:0
@@ -6077,7 +6079,7 @@ msgstr "Үнийн нÑÑ…ÑмжлÑл"
#. module: account
#: view:board.board:0
msgid "Aged receivables"
-msgstr "ÐаÑжилтын авлагын данÑ"
+msgstr "Ðвлагын наÑжилт"
#. module: account
#: model:ir.module.module,shortdesc:account.module_meta_information
@@ -6097,12 +6099,12 @@ msgstr "Ðдийн заÑгийн үзүүлÑлт"
#. module: account
#: view:board.board:0
msgid "Account Board"
-msgstr ""
+msgstr "ДанÑны Ñамбар"
#. module: account
#: view:board.board:0
msgid "Aged income"
-msgstr ""
+msgstr "ÐаÑжилтын орлого"
#. module: account
#: wizard_field:account.balance.account.balance.report,init,show_columns:0
@@ -6164,7 +6166,7 @@ msgstr ""
#. module: account
#: model:ir.actions.wizard,name:account.wizard_account_balance_report
msgid "Account balance-Compare Years"
-msgstr ""
+msgstr "ДанÑны Ñ‚Ñнцлийг жилÑÑÑ€ нь харьцуулах"
#. module: account
#: model:ir.module.module,description:account.module_meta_information
@@ -6296,7 +6298,7 @@ msgstr ""
#. module: account
#: wizard_view:account.balance.account.balance.report,init:0
msgid "Customize Report"
-msgstr ""
+msgstr "Хувийн тайлан"
#. module: account
#: field:report.aged.receivable,name:0
@@ -6326,7 +6328,7 @@ msgstr "ДанÑны төрлөөр"
#. module: account
#: model:ir.model,name:report_account.model_report_aged_receivable
msgid "Aged Receivable Till Today"
-msgstr ""
+msgstr "Өнөөдрийг хүртÑлх авлагын наÑжилт"
#. module: account
#: model:ir.model,name:report_account.model_report_account_receivable
@@ -6352,7 +6354,7 @@ msgstr "Санхүүгийн тайлан-Тайлан"
#: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
#: model:ir.ui.menu,name:report_account.menu_account_receivable_graph
msgid "Balance by Type of Account"
-msgstr ""
+msgstr "ДанÑны төрлийн Ñ‚ÑнцÑл"
#. module: account
#: field:report.account.receivable,name:0
@@ -6368,7 +6370,7 @@ msgstr "Ò®Ò¯ÑгÑÑ… огноо"
#: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
#: view:report.aged.receivable:0
msgid "Aged Receivable"
-msgstr "ÐаÑжилтын авлага"
+msgstr "Ðвлагын наÑжилт"
#. module: account
#: view:report.invoice.created:0
diff --git a/addons/account/i18n/sr.po b/addons/account/i18n/sr.po
index d171553ea859908f9d8908b442129512a0f3e7d5..7efd4a0b1befd2a5b64420e0db8f14dcb73b7e5d 100644
--- a/addons/account/i18n/sr.po
+++ b/addons/account/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-13 16:24+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-14 07:29+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Serbian <sr@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-10-14 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 60251a673ae7aba61a998811651a5c043fd5353a..b689697d7a86a07bd05c78d60ab203e6cdd1ce1e 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -256,7 +256,7 @@ class account_installer(osv.osv_memory):
vals_seq = {
'name': _('Bank Journal '),
'code': 'account.journal',
- 'prefix': 'BAN/',
+ 'prefix': 'BNK/%(year)s/',
'padding': 5
}
seq_id = obj_sequence.create(cr,uid,vals_seq)
@@ -280,17 +280,13 @@ class account_installer(osv.osv_memory):
obj_journal.create(cr,uid,vals_journal)
for val in record.bank_accounts_id:
- seq_prefix = None
seq_padding = 5
if val.account_type == 'cash':
type = cash_type_id
- seq_prefix = "CSH/"
elif val.account_type == 'bank':
type = bank_type_id
- seq_prefix = "BAN/"
elif val.account_type == 'check':
type = check_type_id
- seq_prefix = "CHK/"
else:
type = check_type_id
seq_padding = None
@@ -304,9 +300,9 @@ class account_installer(osv.osv_memory):
'company_id': company_id.id }
child_bnk_acc = obj_acc.create(cr, uid, vals_bnk)
vals_seq_child = {
- 'name': _(vals_bnk['name']),
+ 'name': _(vals_bnk['name'] + ' ' + 'Journal'),
'code': 'account.journal',
- 'prefix': seq_prefix,
+ 'prefix': _((vals_bnk['name'][:3].upper()) + '/%(year)s/'),
'padding': seq_padding
}
seq_id = obj_sequence.create(cr, uid, vals_seq_child)
@@ -314,7 +310,7 @@ class account_installer(osv.osv_memory):
#create the bank journal
vals_journal = {}
vals_journal['name']= vals_bnk['name'] + ' Journal'
- vals_journal['code']= _(vals_bnk['name'][:3])
+ vals_journal['code']= _(vals_bnk['name'][:3]).upper()
vals_journal['sequence_id'] = seq_id
vals_journal['type'] = 'cash'
if vals.get('currency_id', False):
@@ -328,7 +324,6 @@ class account_installer(osv.osv_memory):
obj_journal.create(cr,uid,vals_journal)
code_cnt += 1
-
#reactivate the parent_store functionality on account_account
self.pool._init = False
self.pool.get('account.account')._parent_store_compute(cr)
@@ -352,20 +347,36 @@ class account_installer(osv.osv_memory):
seq_sale = {
'name': 'Sale Journal',
'code': 'account.journal',
- 'prefix': '%(year)s/',
+ 'prefix': 'SAJ/%(year)s/',
'padding': 3
}
seq_id_sale = obj_sequence.create(cr, uid, seq_sale)
seq_purchase = {
'name': 'Purchase Journal',
'code': 'account.journal',
- 'prefix': '%(year)s/',
+ 'prefix': 'EXJ/%(year)s/',
'padding': 3
}
seq_id_purchase = obj_sequence.create(cr, uid, seq_purchase)
+ seq_refund_sale = {
+ 'name': 'Sales Refund Journal',
+ 'code': 'account.journal',
+ 'prefix': 'SCNJ/%(year)s/',
+ 'padding': 3
+ }
+ seq_id_sale_refund = obj_sequence.create(cr, uid, seq_refund_sale)
+ seq_refund_purchase = {
+ 'name': 'Purchase Refund Journal',
+ 'code': 'account.journal',
+ 'prefix': 'ECNJ/%(year)s/',
+ 'padding': 3
+ }
+ seq_id_purchase_refund = obj_sequence.create(cr, uid, seq_refund_purchase)
else:
seq_id_sale = seq_id
seq_id_purchase = seq_id
+ seq_id_sale_refund = seq_id
+ seq_id_purchase_refund = seq_id
vals_journal['view_id'] = view_id
@@ -408,9 +419,6 @@ class account_installer(osv.osv_memory):
data = mod_obj.browse(cr, uid, data_id[0])
view_id = data.res_id
- seq_id_sale_refund = seq_id_sale
- seq_id_purchase_refund = seq_id_purchase
-
vals_journal['view_id'] = view_id
#Sales Refund Journal
@@ -596,8 +604,7 @@ class account_installer(osv.osv_memory):
new_paid_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals_paid_tax_code)
sales_tax = obj_tax.create(cr, uid,
- {'name':'TAX%s%%'%(s_tax*100),
- 'description':'TAX%s%%'%(s_tax*100),
+ {'name':'TAX %s%%'%(s_tax*100),
'amount':s_tax,
'base_code_id':new_tax_code,
'tax_code_id':new_paid_tax_code,
@@ -632,8 +639,7 @@ class account_installer(osv.osv_memory):
new_paid_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals_paid_tax_code)
purchase_tax = obj_tax.create(cr, uid,
- {'name':'TAX%s%%'%(p_tax*100),
- 'description':'TAX%s%%'%(p_tax*100),
+ {'name':'TAX %s%%'%(p_tax*100),
'amount':p_tax,
'base_code_id':new_tax_code,
'tax_code_id':new_paid_tax_code,
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 4cdaeab9a494d6d3a7a124639033b15d200f82bb..2397829636701819f82f412b8c51db0470c48915 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -351,7 +351,7 @@ class account_invoice(osv.osv):
if view_type == 'tree':
doc = etree.XML(res['arch'])
nodes = doc.xpath("//field[@name='partner_id']")
- partner_string = 'Customer'
+ partner_string = _('Customer')
if context.get('type', 'out_invoice') in ('in_invoice', 'in_refund'):
partner_string = _('Supplier')
for node in nodes:
@@ -363,7 +363,7 @@ class account_invoice(osv.osv):
try:
res = super(account_invoice, self).create(cr, uid, vals, context)
for inv_id, name in self.name_get(cr, uid, [res], context=context):
- message = _('Invoice ') + " '" + name + "' "+ _("is waiting for validation.")
+ message = _("Invoice '%s' is waiting for validation.") % name
self.log(cr, uid, inv_id, message)
return res
except Exception, e:
@@ -375,6 +375,9 @@ class account_invoice(osv.osv):
def confirm_paid(self, cr, uid, ids, context=None):
self.write(cr, uid, ids, {'state':'paid'}, context=context)
+ for inv_id, name in self.name_get(cr, uid, ids, context=context):
+ message = _("Invoice '%s' is paid.") % name
+ self.log(cr, uid, inv_id, message)
return True
def unlink(self, cr, uid, ids, context=None):
@@ -674,7 +677,7 @@ class account_invoice(osv.osv):
return (ref or '').replace('/','')
def _get_analytic_lines(self, cr, uid, id):
- inv = self.browse(cr, uid, [id])[0]
+ inv = self.browse(cr, uid, id)
cur_obj = self.pool.get('res.currency')
company_currency = inv.company_id.currency_id.id
@@ -690,6 +693,8 @@ class account_invoice(osv.osv):
ref = inv.reference
else:
ref = self._convert_ref(cr, uid, inv.number)
+ if not inv.journal_id.analytic_journal_id:
+ raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (inv.journal_id.name,))
il['analytic_lines'] = [(0,0, {
'name': il['name'],
'date': inv['date_invoice'],
@@ -699,7 +704,7 @@ class account_invoice(osv.osv):
'product_id': il['product_id'],
'product_uom_id': il['uos_id'],
'general_account_id': il['account_id'],
- 'journal_id': self._get_journal_analytic(cr, uid, inv.type),
+ 'journal_id': inv.journal_id.analytic_journal_id.id,
'ref': ref,
})]
return iml
@@ -1218,12 +1223,13 @@ class account_invoice(osv.osv):
inv_id, name = self.name_get(cr, uid, [invoice.id], context=context)[0]
if (not round(total,self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))) or writeoff_acc_id:
- self.log(cr, uid, inv_id, _('Invoice ') + " '" + name + "' "+ _("is totally paid."))
self.pool.get('account.move.line').reconcile(cr, uid, line_ids, 'manual', writeoff_acc_id, writeoff_period_id, writeoff_journal_id, context)
else:
code = invoice.currency_id.code
- amt = str(pay_amount) + code + ' on ' + str(invoice.amount_total) + code + ' (' + str(total) + code + ' remaining)'
- self.log(cr, uid, inv_id, _('Invoice ') + " '" + name + "' "+ _("is paid partially: ") + amt)
+ # TODO: use currency's formatting function
+ msg = _("Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)") % \
+ (name, pay_amount, code, invoice.amount_total, code, total, code)
+ self.log(cr, uid, inv_id, msg)
self.pool.get('account.move.line').reconcile_partial(cr, uid, line_ids, 'manual', context)
# Update the stored value (fields.function), so we write to trigger recompute
@@ -1289,14 +1295,6 @@ class account_invoice_line(osv.osv):
'price_unit': _price_unit_default,
}
- def product_id_change_unit_price_inv(self, cr, uid, tax_id, price_unit, qty, address_invoice_id, product, partner_id, context=None):
- tax_obj = self.pool.get('account.tax')
- if price_unit:
- taxes = tax_obj.browse(cr, uid, tax_id)
- for tax in tax_obj.compute_inv(cr, uid, taxes, price_unit, qty, address_invoice_id, product, partner_id):
- price_unit = price_unit - tax['amount']
- return {'price_unit': price_unit,'invoice_line_tax_id': tax_id}
-
def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None):
if context is None:
context = {}
@@ -1361,7 +1359,7 @@ class account_invoice_line(osv.osv):
else:
app_acc_in = in_acc_cate
app_acc_exp = ex_acc_cate
- if app_acc_in.company_id.id != company_id and app_acc_exp.company_id.id != company_id:
+ if app_acc_in and app_acc_in.company_id.id != company_id and app_acc_exp and app_acc_exp.company_id.id != company_id:
in_res_id = account_obj.search(cr, uid, [('name','=',app_acc_in.name),('company_id','=',company_id)])
exp_res_id = account_obj.search(cr, uid, [('name','=',app_acc_exp.name),('company_id','=',company_id)])
if not in_res_id and not exp_res_id:
@@ -1396,8 +1394,7 @@ class account_invoice_line(osv.osv):
taxes = res.supplier_taxes_id and res.supplier_taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a).tax_ids or False)
tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
if type in ('in_invoice', 'in_refund'):
- to_update = self.product_id_change_unit_price_inv(cr, uid, tax_id, price_unit or res.standard_price, qty, address_invoice_id, product, partner_id, context=context)
- result.update(to_update)
+ result.update( {'price_unit': price_unit or res.standard_price,'invoice_line_tax_id': tax_id} )
else:
result.update({'price_unit': res.list_price, 'invoice_line_tax_id': tax_id})
diff --git a/addons/account/project/project.py b/addons/account/project/project.py
index f082672310ec31131c416a5c28186b41d3c00820..5a58eca97a4e431097cfffa5216961106867d22c 100644
--- a/addons/account/project/project.py
+++ b/addons/account/project/project.py
@@ -28,11 +28,11 @@ from osv import osv
class account_analytic_journal(osv.osv):
_name = 'account.analytic.journal'
_columns = {
- 'name' : fields.char('Journal Name', size=64, required=True),
- 'code' : fields.char('Journal Code', size=8),
- 'active' : fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the analytic journal without removing it."),
+ 'name': fields.char('Journal Name', size=64, required=True),
+ 'code': fields.char('Journal Code', size=8),
+ 'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the analytic journal without removing it."),
'type': fields.selection([('sale','Sale'), ('purchase','Purchase'), ('cash','Cash'), ('general','General'), ('situation','Situation')], 'Type', size=32, required=True, help="Gives the type of the analytic journal. When it needs for a document (eg: an invoice) to create analytic entries, OpenERP will look for a matching journal of the same type."),
- 'line_ids' : fields.one2many('account.analytic.line', 'journal_id', 'Lines'),
+ 'line_ids': fields.one2many('account.analytic.line', 'journal_id', 'Lines'),
'company_id': fields.many2one('res.company', 'Company', required=True),
}
_defaults = {
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 809f69673fe99c9133d04d6b08bd69f642319542..9a482155b4f61272dd466962d21dcfc692f53efb 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -14,6 +14,8 @@
<field name="quantity"/>
<field name="quantity_max"/>
<field name="date"/>
+ <field name="user_id" invisible="1"/>
+ <field name="parent_id" invisible="1"/>
</tree>
</field>
</record>
@@ -127,7 +129,7 @@
<field name="view_type">tree</field>
<field name="view_id" ref="view_account_analytic_account_tree"/>
<field name="domain">[('parent_id','=',False)]</field>
- <field name="help">Analytic Charts of Accounts allows you to access to reports by analytic accounts (or cost accounts) . From this menu you can access to analytic balance, a report that relates the analytic accounts to the general accounts. It is useful for analyzing the profitability of projects, giving you the profitability of a project for the different operations that you used to carry out the project.</field>
+ <field name="help">The normal chart of accounts has a structure defined by the legal requirement of the country. The analytic chart of account structure should reflect your own business needs in term of costs/revenues reporting. They are usually structured by contracts, projects, products or departements. Most of the OpenERP operations (invoices, timesheets, expenses, etc) generate analytic entries on the related account.</field>
</record>
<menuitem groups="analytic.group_analytic_accounting" id="next_id_40" name="Analytic" parent="account.menu_finance_generic_reporting" sequence="4"/>
diff --git a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml
index 82796a75b4f4dc003dcd3c6fa3477d4725602db4..3bf5d54e8a6064da357290816e372f486fe11a0c 100644
--- a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml
+++ b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml
@@ -8,18 +8,16 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Select period">
- <group width="450">
- <separator string="Cost Ledger for period" colspan="4"/>
- <field name="date1"/>
- <field name="date2"/>
- <separator string="and Journals" colspan="4"/>
- <field name="journal" colspan="4" nolabel="1"/>
- <separator colspan="4"/>
- <group colspan="4" col="6">
- <button special="cancel" string="Cancel" icon="gtk-cancel"/>
- <button name="check_report" string="Print" type="object" icon="gtk-print"/>
- </group>
- </group>
+ <separator string="Cost Ledger for period" colspan="4"/>
+ <field name="date1"/>
+ <field name="date2"/>
+ <separator string="and Journals" colspan="4"/>
+ <field name="journal" colspan="4" nolabel="1"/>
+ <separator colspan="4"/>
+ <group colspan="4" col="6">
+ <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+ <button name="check_report" string="Print" type="object" icon="gtk-print"/>
+ </group>
</form>
</field>
</record>
diff --git a/addons/account/report/account_aged_partner_balance.py b/addons/account/report/account_aged_partner_balance.py
index 457ce7bb27fe3d32b1f70420b72573a95a14867e..95842b92623a5582e14afc7c47d1769005ee84b6 100644
--- a/addons/account/report/account_aged_partner_balance.py
+++ b/addons/account/report/account_aged_partner_balance.py
@@ -137,7 +137,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header):
future_past[i[0]] = i[1]
# Use one query per period and store results in history (a list variable)
- # Each history will contain : history[1] = {'<partner_id>': <partner_debit-credit>}
+ # Each history will contain: history[1] = {'<partner_id>': <partner_debit-credit>}
history = []
for i in range(5):
args_list = (tuple(move_state), tuple(self.ACCOUNT_TYPE), tuple(partner_ids),self.date_from,)
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 6e1ba112606e5c689f180854ba4c84eedf3973db..a6845af69c83d08aa3425695bd1fbc32a1cb12a8 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -61,7 +61,7 @@
<filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical"/>
<filter string="Account" name="Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
- <filter string="General Account" icon="terp-folder-green" context="{'group_by':'general_account_id'}"/>
+ <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
<filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
<separator orientation="vertical"/>
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
@@ -73,17 +73,6 @@
<filter string="Month" name="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
<filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
</group>
- <newline/>
- <group expand="0" string="Extended 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"/>
- <field name="journal_id" widget="selection"/>
- <separator orientation="vertical"/>
- <field name="name"/>
- <field name="account_id" groups="analytic.group_analytic_accounting"/>
- <field name="company_id" widget="selection" groups="base.group_multi_company"/>
- </group>
</search>
</field>
</record>
diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py
index e04527f16a83e9d7112caba8fcd3db72b599441a..ba2cd97f06251a0fbfbf98bb402eb35011fe1ce1 100644
--- a/addons/account/report/account_balance_sheet.py
+++ b/addons/account/report/account_balance_sheet.py
@@ -110,7 +110,7 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
else:
self.res_bl['type'] = 'Net Loss'
pl_dict = {
- 'code': False,
+ 'code': self.res_bl['type'],
'name': self.res_bl['type'],
'level': False,
'balance':self.res_bl['balance'],
diff --git a/addons/account/report/account_central_journal.py b/addons/account/report/account_central_journal.py
index 35f1e666c6f78c90eca5bbbdbf62c071c0fdb158..4e28e2d5140faa7c62671eeb1f8bcd14a543dfec 100644
--- a/addons/account/report/account_central_journal.py
+++ b/addons/account/report/account_central_journal.py
@@ -72,7 +72,7 @@ class journal_print(report_sxw.rml_parse, common_report_header):
if self.target_move == 'posted':
move_state = ['posted']
- self.cr.execute('SELECT a.currency_id ,a.code, a.name, c.code AS currency_code, l.currency_id, l.amount_currency, SUM(debit) AS debit, SUM(credit) AS credit \
+ self.cr.execute('SELECT a.currency_id, a.code, a.name, c.code AS currency_code, l.currency_id, l.amount_currency, SUM(debit) AS debit, SUM(credit) AS credit \
from account_move_line l \
LEFT JOIN account_move am ON (l.move_id=am.id) \
LEFT JOIN account_account a ON (l.account_id=a.id) \
diff --git a/addons/account/report/account_general_journal.py b/addons/account/report/account_general_journal.py
index e81bd994c0ac64d38587fca5e0a8e9b8968992e8..843bedaaf633ef9798c57e3a26e4fd079e391348 100644
--- a/addons/account/report/account_general_journal.py
+++ b/addons/account/report/account_general_journal.py
@@ -87,7 +87,7 @@ class journal_print(report_sxw.rml_parse, common_report_header):
move_state = ['draft','posted']
if self.target_move == 'posted':
move_state = ['posted']
- self.cr.execute('SELECT j.code, j.name, l.amount_currency,c.code AS currency_code,l.currency_id , '
+ self.cr.execute('SELECT j.code, j.name, l.amount_currency,c.code AS currency_code,l.currency_id, '
'SUM(l.debit) AS debit, SUM(l.credit) AS credit '
'FROM account_move_line l '
'LEFT JOIN account_move am ON (l.move_id=am.id) '
@@ -111,7 +111,7 @@ class journal_print(report_sxw.rml_parse, common_report_header):
def _get_account(self, data):
if data['model'] == 'account.journal.period':
return self.pool.get('account.journal.period').browse(self.cr, self.uid, data['id']).company_id.name
- return super(journal_print ,self)._get_account(data)
+ return super(journal_print, self)._get_account(data)
def _get_fiscalyear(self, data):
if data['model'] == 'account.journal.period':
diff --git a/addons/account/report/account_general_journal.rml b/addons/account/report/account_general_journal.rml
index fdf044c048e70bcdb809c23800e33b064615f3c3..f41302408c5d0db73039c200f44bcf4bcc0a5397 100644
--- a/addons/account/report/account_general_journal.rml
+++ b/addons/account/report/account_general_journal.rml
@@ -287,7 +287,7 @@
<td><para style="terp_tblheader_Details_Right">Currency</para></td>
</tr>
<tr>
- <td><para style="terp_default_Bold_9">Total:([[ company.currency_id.code]])</para></td>
+ <td><para style="terp_default_Bold_9">Total:</para></td>
<td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
<td><para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit()) ]]</para></td>
<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit()) ]]</para></td>
diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml
index 324cf37817759fac4510d0cd790551916d51b891..75dc04c507b686b5a9056ee312763f0d9e4f3d61 100644
--- a/addons/account/report/account_general_ledger_landscape.rml
+++ b/addons/account/report/account_general_ledger_landscape.rml
@@ -266,10 +266,10 @@
<tr>
<td><para style="Standard"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para></td>
<td><para style="Standard"></para></td>
- <td alignment="right"><para style="P9b"><u>[[ formatLang(sum_debit_account(o), dp='Account') ]]</u></para></td>
- <td alignment="right"><para style="P9b"><u>[[ formatLang(sum_credit_account(o), dp='Account') ]]</u></para></td>
- <td><para style="P9b"><u>[[ formatLang(sum_balance_account(o), dp='Account') ]] [[ company.currency_id.symbol ]]</u></para></td>
- <td><para style="P9b"><u>[[ o.currency_id and formatLang(sum_currency_amount_account(o), dp='Account') + o.currency_id.code or '' ]]</u></para></td>
+ <td alignment="right"><para style="P9b"><u>[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</u></para></td>
+ <td alignment="right"><para style="P9b"><u>[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</u></para></td>
+ <td><para style="P9b"><u>[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</u></para></td>
+ <td><para style="P9b"><u>[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.code or '' ]]</u></para></td>
</tr>
</blockTable>
</td>
@@ -292,9 +292,9 @@
<td><para style="P2_content">[[ line['move'] ]]</para></td>
<td><para style="P3_content">[[ line['lname'] ]]</para></td>
<td><para style="P3_content_center">[[ strip_name(line['line_corresp'].replace(', ',','),40) ]]</para></td>
- <td><para style="P4_content">[[ formatLang(line['debit'], dp='Account') ]]</para></td>
- <td><para style="P4_content">[[ formatLang(line['credit'], dp='Account') ]]</para></td>
- <td><para style="P4_content">[[ formatLang(line['progress'], dp='Account') ]] [[ company.currency_id.symbol ]]</para></td>
+ <td><para style="P4_content">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]]</para></td>
+ <td><para style="P4_content">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para></td>
+ <td><para style="P4_content">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para></td>
<td><para style="P4_content"><font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'])]] [[ line['currency_code'] or '']]</font></para></td>
</tr>
</blockTable>
@@ -352,9 +352,9 @@
<td><para style="P2_content">[[ line['move'] ]]</para></td>
<td><para style="P3_content">[[ line['lname'] ]]</para></td>
<td><para style="P3_content_center">[[ strip_name(line['line_corresp'],15) ]]</para></td>
- <td><para style="P4_content">[[ formatLang(line['debit'], dp='Account') ]] </para></td>
- <td><para style="P4_content">[[ formatLang(line['credit'], dp='Account') ]]</para></td>
- <td><para style="P4_content">[[ formatLang(line['progress'], dp='Account') ]] [[ company.currency_id.symbol ]]</para></td>
+ <td><para style="P4_content">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]] </para></td>
+ <td><para style="P4_content">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para></td>
+ <td><para style="P4_content">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para></td>
</tr>
</blockTable>
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index a2ea227d707f397c5dc861de0284be69928fba3a..839bfb2ed264a7be2f98d1d384c8dab478fbdf7d 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -110,7 +110,7 @@
</group>
<newline/>
<group expand="1" string="Group By...">
- <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id','residual_visible':True}"/>
+ <filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id','residual_visible':True}"/>
<filter string="Salesman" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/>
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True,'residual_invisible':True}"/>
@@ -139,7 +139,7 @@
<field name="res_model">account.invoice.report</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
- <field name="context">{'search_default_current':1,'search_default_customer':1, 'search_default_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1,}</field>
+ <field name="context">{'search_default_current':1, 'search_default_partner':1, 'search_default_customer':1, 'search_default_date': time.strftime('%Y-01-01'), 'group_by':[], 'group_by_no_leaf':1,}</field>
<field name="search_view_id" ref="view_account_invoice_report_search"/>
<field name="help">A tool search lets you know statistics on invoices that match your needs.</field>
diff --git a/addons/account/report/account_partner_ledger.py b/addons/account/report/account_partner_ledger.py
index 0038eb1278fe5f4721798974d1698b16d183c3da..04ff5cbb5fd1f78ea4283e8456d93760ca360a46 100644
--- a/addons/account/report/account_partner_ledger.py
+++ b/addons/account/report/account_partner_ledger.py
@@ -58,6 +58,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
def set_context(self, objects, data, ids, report_type=None):
obj_move = self.pool.get('account.move.line')
+ obj_partner = self.pool.get('res.partner')
self.query = obj_move._query_get(self.cr, self.uid, obj='l', context=data['form'].get('used_context', {}))
ctx2 = data['form'].get('used_context',{}).copy()
ctx2.update({'initial_bal': True})
@@ -100,7 +101,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
"AND l.account_id = account.id " \
"AND am.id = l.move_id " \
"AND am.state IN %s"
- "AND " + self.query +" " \
+# "AND " + self.query +" " \
"AND l.account_id IN %s " \
" " + PARTNER_REQUEST + " " \
"AND account.active ",
@@ -111,7 +112,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
partner_to_use.append(res_line['partner_id'])
new_ids = partner_to_use
self.partner_ids = new_ids
- objects = self.pool.get('res.partner').browse(self.cr, self.uid, new_ids)
+ objects = obj_partner.browse(self.cr, self.uid, new_ids)
return super(third_party_ledger, self).set_context(objects, data, new_ids, report_type)
def comma_me(self, amount):
@@ -139,7 +140,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
else:
RECONCILE_TAG = "AND l.reconcile_id IS NULL"
self.cr.execute(
- "SELECT l.id, l.date, j.code, acc.code as a_code, acc.name as a_name, l.ref, m.name as move_name, l.name, l.debit, l.credit, l.amount_currency, c.symbol AS currency_code " \
+ "SELECT l.id, l.date, j.code, acc.code as a_code, acc.name as a_name, l.ref, m.name as move_name, l.name, l.debit, l.credit, l.amount_currency,l.currency_id, c.symbol AS currency_code " \
"FROM account_move_line l " \
"LEFT JOIN account_journal j " \
"ON (l.journal_id = j.id) " \
@@ -286,7 +287,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
# return 0.0
# result_tmp = 0.0
# result_init = 0.0
-# if self.reconcil :
+# if self.reconcil:
# RECONCILE_TAG = " "
# else:
# RECONCILE_TAG = "AND reconcile_id IS NULL"
@@ -317,7 +318,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
# "AND m.state IN %s "
# "AND account_id IN %s" \
# " " + RECONCILE_TAG + " " \
-# "AND " + self.query + " " ,
+# "AND " + self.query + " ",
# (tuple(self.partner_ids), tuple(move_state) ,tuple(self.account_ids),))
# contemp = self.cr.fetchone()
# if contemp != None:
@@ -335,7 +336,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
# return 0.0
# result_tmp = 0.0
# result_init = 0.0
-# if self.reconcil :
+# if self.reconcil:
# RECONCILE_TAG = " "
# else:
# RECONCILE_TAG = "AND reconcile_id IS NULL"
@@ -366,7 +367,7 @@ class third_party_ledger(rml_parse.rml_parse, common_report_header):
# "AND m.state IN %s "
# "AND account_id IN %s" \
# " " + RECONCILE_TAG + " " \
-# "AND " + self.query + " " ,
+# "AND " + self.query + " ",
# (tuple(self.partner_ids), tuple(move_state), tuple(self.account_ids),))
# contemp = self.cr.fetchone()
# if contemp != None:
diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml
index ae273ba5647ff2ea0acb32773ab39b36c6fad123..139d9bb16cd5aaaf5929c385494e2f56b43ea574 100644
--- a/addons/account/report/account_partner_ledger.rml
+++ b/addons/account/report/account_partner_ledger.rml
@@ -487,7 +487,7 @@
<para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(line['amount_currency'] or '') ]] [[ line['currency_code'] or '' ]]</para>
+ <para style="terp_default_Right_9"><font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]]</font></para>
</td>
</tr>
</blockTable>
diff --git a/addons/account/report/account_partner_ledger_other.rml b/addons/account/report/account_partner_ledger_other.rml
index 7d7dd035c3fef8a06d593f954d63ea088455c711..644077eec846fbd34b3b2dabc275cd4cdd303046 100644
--- a/addons/account/report/account_partner_ledger_other.rml
+++ b/addons/account/report/account_partner_ledger_other.rml
@@ -627,7 +627,7 @@
<para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(line['amount_currency'] or '') ]] [[ line['currency_code'] or '' ]]</para>
+ <para style="terp_default_Right_9"><font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]]</font></para>
</td>
</tr>
</blockTable>
diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml
index 9e0782c18059ac0cfcf4f76c5c783584b877592f..87f3bb770ba141f52fa152b59e3edfb1a8385e93 100644
--- a/addons/account/report/account_print_invoice.rml
+++ b/addons/account/report/account_print_invoice.rml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Invoices" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Invoices.pdf">
+ <template pageSize="(595.0,842.0)" title="Invoices" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="34.0" y1="28.0" width="530" height="786"/>
</pageTemplate>
@@ -140,18 +140,18 @@
</para>
</td>
<td>
- <para style="terp_default_8">[[ o.partner_id.title.name or '' ]] [[ o.partner_id.name ]]</para>
- <para style="terp_default_8">[[ o.address_invoice_id.street ]]</para>
- <para style="terp_default_8">[[ o.address_invoice_id.street2 or removeParentNode('para') ]]</para>
- <para style="terp_default_8">[[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]]</para>
- <para style="terp_default_8">[[ o.address_invoice_id.state_id and o.address_invoice_id.state_id.name or removeParentNode('para') ]]</para>
- <para style="terp_default_8">[[ o.address_invoice_id.country_id and o.address_invoice_id.country_id.name or '' ]]</para>
+ <para style="terp_default_8">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
+ <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.street) or '' ]]</para>
+ <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.street2) or removeParentNode('para') ]]</para>
+ <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.zip) or '' ]] [[ (o.address_invoice_id and o.address_invoice_id.city) or '' ]]</para>
+ <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.state_id and o.address_invoice_id.state_id.name) or removeParentNode('para') ]]</para>
+ <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.country_id and o.address_invoice_id.country_id.name) or '' ]]</para>
<para style="terp_default_8">
<font color="white"> </font>
</para>
- <para style="terp_default_8">Tel. : [[ o.address_invoice_id.phone or removeParentNode('para') ]]</para>
- <para style="terp_default_8">Fax : [[ o.address_invoice_id.fax or removeParentNode('para') ]]</para>
- <para style="terp_default_8">VAT : [[ o.partner_id.vat or removeParentNode('para') ]]</para>
+ <para style="terp_default_8">Tel. : [[ (o.address_invoice_id and o.address_invoice_id.phone) or removeParentNode('para') ]]</para>
+ <para style="terp_default_8">Fax : [[ (o.address_invoice_id and o.address_invoice_id.fax) or removeParentNode('para') ]]</para>
+ <para style="terp_default_8">VAT : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
</td>
</tr>
</blockTable>
@@ -187,14 +187,14 @@
<para style="terp_default_Centre_9">[[ formatLang(o.date_invoice,date=True) ]]</para>
</td>
<td>
- <para style="terp_default_Centre_9">[[ o.address_invoice_id.partner_id.ref or ' ' ]]</para>
+ <para style="terp_default_Centre_9">[[ (o.address_invoice_id and o.address_invoice_id.partner_id and o.address_invoice_id.partner_id.ref) or ' ' ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_8">
<font color="white"> </font>
</para>
- <blockTable colWidths="219.0,87.0,56.0,56.0,51.0,62.0" style="Table7">
+ <blockTable colWidths="219.0,87.0,62.0,56.0,46.0,62.0" style="Table7">
<tr>
<td>
<para style="terp_tblheader_Details">Description</para>
@@ -218,7 +218,7 @@
</blockTable>
<section>
<para style="terp_default_2">[[ repeatIn(o.invoice_line,'l') ]]</para>
- <blockTable colWidths="218.0,88.0,56.0,56.0,51.0,62.0" style="Table8">
+ <blockTable colWidths="218.0,88.0,62.0,55.0,46.0,62.0" style="Table8">
<tr>
<td>
<para style="terp_default_9">[[ l.name ]]</para>
@@ -315,10 +315,10 @@
<para style="Text body">
<font color="white"> </font>
</para>
- <blockTable colWidths="167.0,59.0,56.0,247.0" style="Table9">
+ <blockTable colWidths="206.0,51.0,49.0,225.0" style="Table9">
<tr>
<td>
- <para style="terp_tblheader_Details">Tax</para>
+ <para style="terp_tblheader_Details">Tax [[ o.tax_line==[] and removeParentNode('blockTable') ]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Base </para>
@@ -335,7 +335,7 @@
</blockTable>
<section>
<para style="terp_default_2">[[ repeatIn(o.tax_line,'t') ]]</para>
- <blockTable colWidths="167.0,60.0,55.0,248.0" style="Table2">
+ <blockTable colWidths="205.0,52.0,49.0,224.0" style="Table2">
<tr>
<td>
<para style="terp_default_8">[[ t.name ]]</para>
@@ -354,11 +354,14 @@
</tr>
</blockTable>
</section>
+ <para style="terp_default_9">
+ <font color="white"> </font>
+ </para>
<para style="terp_default_9">[[ (o.comment and format(o.comment )) or removeParentNode('para') ]]</para>
<para style="terp_default_8">
<font color="white"> </font>
</para>
- <para style="terp_default_9">[[ (o.payment_term.note and format(o.payment_term and o.payment_term.note)) or removeParentNode('para') ]]</para>
+ <para style="terp_default_9">[[ (o.payment_term and o.payment_term.note and format(o.payment_term and o.payment_term.note)) or removeParentNode('para') ]]</para>
<para style="terp_default_9">
<font color="white"> </font>
</para>
@@ -368,7 +371,7 @@
<para style="terp_default_Bold_9">Fiscal Position Remark : </para>
</td>
<td>
- <para style="terp_default_9">[[ (o.fiscal_position.note and format(o.fiscal_position and o.fiscal_position.note)) or removeParentNode('blockTable') ]]</para>
+ <para style="terp_default_9">[[ (o.fiscal_position and o.fiscal_position.note and format(o.fiscal_position.note)) or removeParentNode('blockTable') ]]</para>
</td>
</tr>
</blockTable>
diff --git a/addons/account/report/account_report.py b/addons/account/report/account_report.py
index dd8e0a2ce4ebf90f67f40b9dfca81223d41afbfd..dd0ec1335987e85fe1f3897cd38d1699a5014aa9 100644
--- a/addons/account/report/account_report.py
+++ b/addons/account/report/account_report.py
@@ -74,7 +74,7 @@ class temp_range(osv.osv):
_description = 'A Temporary table used for Dashboard view'
_columns = {
- 'name' : fields.char('Range',size=64)
+ 'name': fields.char('Range',size=64)
}
temp_range()
@@ -177,7 +177,7 @@ class report_invoice_created(osv.osv):
('cancel','Cancelled')
],'State', readonly=True),
'origin': fields.char('Source Document', size=64, readonly=True, help="Reference of the document that generated this invoice report."),
- 'create_date' : fields.datetime('Create Date', readonly=True)
+ 'create_date': fields.datetime('Create Date', readonly=True)
}
_order = 'create_date'
diff --git a/addons/account/report/account_tax_report.py b/addons/account/report/account_tax_report.py
index d3fb791bfaab7c1b71abc451e2b51a4dda403705..d968ee9029e93e0fd1d22f8456826eed5fa8e85f 100644
--- a/addons/account/report/account_tax_report.py
+++ b/addons/account/report/account_tax_report.py
@@ -37,9 +37,26 @@ class tax_report(rml_parse.rml_parse):
'get_company': self._get_company,
'get_currency': self._get_currency,
'get_lines': self._get_lines,
+ 'get_years': self.get_years,
})
+ def get_years(self,form):
+ res={}
+ fiscal_year_name = self.pool.get('account.fiscalyear').name_get(self.cr,self.uid,form['fiscalyear'])
+
+ if fiscal_year_name:
+ res['fname'] = fiscal_year_name[0][1]
+ res['periods'] = ''
+ if form['periods']:
+ periods_l = self.pool.get('account.period').read(self.cr, self.uid, form['periods'], ['name'])
+ for period in periods_l:
+ if res['periods']=='':
+ res['periods'] = period['name']
+ else:
+ res['periods'] += ", "+ period['name']
+ return res
+
def _get_lines(self, based_on, period_list, company_id=False, parent=False, level=0, context={}):
res = self._get_codes(based_on, company_id, parent, level, period_list, context=context)
diff --git a/addons/account/report/account_tax_report.rml b/addons/account/report/account_tax_report.rml
index 2434437e8036e918bcd10f44334befcaf8bae240..47df92cc3bc36526c791f13daa8de52d1994d323 100644
--- a/addons/account/report/account_tax_report.rml
+++ b/addons/account/report/account_tax_report.rml
@@ -105,6 +105,16 @@
</stylesheet>
<story>
<para style="P2">Tax Statement</para>
+ <para style="P2"><font color="white"> </font></para>
+ <blockTable colWidths="538" style="Tableau1">
+ <tr>
+ <td><para style="P12">Year : [[ get_years(data['form'])['fname'] ]]</para></td>
+ </tr>
+ <tr>
+ <td><para style="P12">Periods : [[ get_years(data['form'])['periods'] or removeParentNode('tr')]]</para></td>
+ </tr>
+ </blockTable>
+ <para style="P2"><font color="white"> </font></para>
<blockTable colWidths="340.0,55.0,55.0,90.0" style="Table2" repeatRows="1">
<tr>
<td><para style="P12">Tax Name</para></td>
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index 56e75a3c03605c74ccba4194aa004acf303fde5f..124593ff8f5147fc02a3af88102f0167faca45e4 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -31,7 +31,7 @@
"access_account_chart_template","account.chart.template","model_account_chart_template","account.group_account_manager",1,1,1,1
"access_account_tax_template","account.tax.template","model_account_tax_template","account.group_account_manager",1,1,1,1
"access_account_bank_statement","account.bank.statement","model_account_bank_statement","account.group_account_user",1,0,0,0
-"access_account_bank_statement_line","account.bank.statement.line","model_account_bank_statement_line","account.group_account_user",1,0,0,0
+"access_account_bank_statement_line","account.bank.statement.line","model_account_bank_statement_line","account.group_account_user",1,1,1,1
"access_account_analytic_line","account.analytic.line","model_account_analytic_line","account.group_account_user",1,1,1,1
"access_account_analytic_line_manager","account.analytic.line manager","model_account_analytic_line","account.group_account_manager",1,0,0,0
"access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","base.group_user",1,0,0,0
@@ -39,7 +39,7 @@
"access_account_invoice_uinvoice","account.invoice","model_account_invoice","account.group_account_invoice",1,1,1,1
"access_account_invoice_line_uinvoice","account.invoice.line","model_account_invoice_line","account.group_account_invoice",1,1,1,1
"access_account_invoice_tax_uinvoice","account.invoice.tax","model_account_invoice_tax","account.group_account_invoice",1,1,1,1
-"access_account_move_uinvoice","account.move","model_account_move","account.group_account_invoice",1,0,0,0
+"access_account_move_uinvoice","account.move","model_account_move","account.group_account_invoice",1,1,1,1
"access_account_move_line_uinvoice","account.move.line invoice","model_account_move_line","account.group_account_invoice",1,1,1,1
"access_account_move_reconcile_uinvoice","account.move.reconcile","model_account_move_reconcile","account.group_account_invoice",1,1,1,1
"access_account_journal_period_uinvoice","account.journal.period","model_account_journal_period","account.group_account_invoice",1,1,1,1
@@ -94,47 +94,12 @@
"access_account_move_line_manager","account.move.line manager","model_account_move_line","account.group_account_manager",1,0,0,0
"access_account_move_manager","account.move manager","model_account_move","account.group_account_manager",1,0,0,0
"access_account_invoice_manager","account.invoice manager","model_account_invoice","account.group_account_manager",1,0,0,0
-"access_account_bank_statement_manager","account.bank.statement manager","model_account_bank_statement","account.group_account_manager",1,0,0,0
+"access_account_bank_statement_manager","account.bank.statement manager","model_account_bank_statement","account.group_account_manager",1,1,1,1
"access_account_entries_report_manager","account.entries.report","model_account_entries_report","account.group_account_manager",1,1,1,1
"access_analytic_entries_report_manager","analytic.entries.report","model_analytic_entries_report","account.group_account_manager",1,0,0,0
-"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_manager",1,0,0,0
-"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_user",1,0,0,0
-"access_account_move_line_system","account.move.line system","model_account_move_line","base.group_system",1,0,0,0
-"access_account_invoice_system","account.invoice system","model_account_invoice","base.group_system",1,0,0,0
-"access_account_bank_statement_system","account.bank.statement system","model_account_bank_statement","base.group_system",1,0,0,0
-"access_account_move_system","account.move system","model_account_move","base.group_system",1,0,0,0
-"access_account_analytic_line_system","account.analytic.line system","model_account_analytic_line","base.group_system",1,0,0,0
-"access_account_tax_code_system","account.tax.code system","model_account_tax_code","base.group_system",1,1,1,1
-"access_account_journal_system","account.journal system","model_account_journal","base.group_system",1,1,1,1
-"access_account_period_system","account.period system","model_account_period","base.group_system",1,1,1,1
-"access_account_journal_view_system","account.journal.view system","model_account_journal_view","base.group_system",1,1,1,1
-"access_account_account_type_system","account.account.type system","model_account_account_type","base.group_system",1,1,1,1
-"access_account_analytic_journal_system","account.analytic.journal system","model_account_analytic_journal","base.group_system",1,1,1,1
-"access_account_fiscalyear_system","account.fiscalyear system","model_account_fiscalyear","base.group_system",1,1,1,1
-"access_account_tax_system","account.tax system","model_account_tax","base.group_system",1,1,1,1
-"access_account_model_system","account.model system","model_account_model","base.group_system",1,1,1,1
-"access_account_subscription_system","account.subscription system","model_account_subscription","base.group_system",1,1,1,1
-"access_account_journal_column_system","account.journal.column system","model_account_journal_column","base.group_system",1,1,1,1
-"access_account_invoice_report_system","account.invoice.report system","model_account_invoice_report","base.group_system",1,0,0,0
-"access_account_entries_report_system","account.entries.report system","model_account_entries_report","base.group_system",1,0,0,0
-"access_analytic_entries_report_system","analytic.entries.report system","model_analytic_entries_report","base.group_system",1,0,0,0
-"access_account_journal_period_system","account.journal.period system","model_account_journal_period","base.group_system",1,0,0,0
-"access_account_invoice_tax_system","account.invoice.tax system","model_account_invoice_tax","base.group_system",1,0,0,0
-"access_account_tax_code_template_system","account.tax.code.template system","model_account_tax_code_template","base.group_system",1,1,1,1
-"access_account_sequence_fiscal_year_system","account.sequence.fiscalyear system","model_account_sequence_fiscalyear","base.group_system",1,1,1,1
-"access_account_fiscal_position_system","account.fiscal.position system","model_account_fiscal_position","base.group_system",1,1,1,1
-"access_account_move_reconcile_system","account.move.reconcile system","model_account_move_reconcile","base.group_system",1,0,0,0
-"access_account_account_system","account.account system","model_account_account","base.group_system",1,1,1,1
-"access_account_analytic_system","account.analytic.account system","analytic.model_account_analytic_account","base.group_system",1,1,1,1
-"access_account_model_line_system","account.model.line system","model_account_model_line","base.group_system",1,1,1,1
-"access_account_subscription_line_system","account.subscription.line system","model_account_subscription_line","base.group_system",1,1,1,1
-"access_account_payment_term_system","account.payment.term system","model_account_payment_term","base.group_system",1,1,1,1
-"access_account_payment_term_line_system","account.payment.term.line system","model_account_payment_term_line","base.group_system",1,1,1,1
-"access_report_account_receivable_system","report.account.receivable system","model_report_account_receivable","base.group_system",1,1,1,1
-"access_account_fiscal_position_tax_system","account.fiscal.position.tax system","model_account_fiscal_position_tax","base.group_system",1,1,1,1
-"access_account_fiscal_position_account_template_system","account.fiscal.position.account.template system","model_account_fiscal_position_account_template","base.group_system",1,1,1,1
+"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_manager",1,1,1,1
+"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_user",1,1,1,1
"access_account_journal_view_invoice","account.journal.view invoice","model_account_journal_view","account.group_account_invoice",1,1,1,1
-"access_account_fiscal_position_account_system","account.fiscal.position.account system","model_account_fiscal_position_account","base.group_system",1,1,1,1
"access_account_journal_column_invoice","account.journal.column invoice","model_account_journal_column","account.group_account_invoice",1,1,1,1
"access_account_invoice_tax_manager","account.invoice.tax manager","model_account_invoice_tax","account.group_account_manager",1,0,0,0
"access_account_invoice_tax_accountant","account.invoice.tax accountant","model_account_invoice_tax","account.group_account_user",1,0,0,0
@@ -145,7 +110,6 @@
"access_account_invoice_line_manager","account.invoice.line manager","model_account_invoice_line","account.group_account_manager",1,0,0,0
"access_account_account_invoice","account.account invoice","model_account_account","account.group_account_invoice",1,1,1,1
"access_res_partner_address_invoice","res.partner.address invoice","base.model_res_partner_address","account.group_account_invoice",1,1,1,1
-"access_account_invoice_line_system","account.invoice.line system","model_account_invoice_line","base.group_system",1,0,0,0
"access_account_analytic_accountant","account.analytic.account accountant","analytic.model_account_analytic_account","account.group_account_user",1,1,1,1
"access_account_account_type_invoice","account.account.type invoice","model_account_account_type","account.group_account_invoice",1,1,1,1
"access_report_account_receivable_invoice","report.account.receivable.invoice","model_report_account_receivable","account.group_account_invoice",1,1,1,1
diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml
index 0aae9dbe3d00a4d753e6b96b77fb9c3ec61126d4..d91e4771d6fdfbcf244006919a8b74a512ea58d0 100644
--- a/addons/account/test/account_report.yml
+++ b/addons/account/test/account_report.yml
@@ -67,8 +67,8 @@
import netsvc, tools, os, time
import datetime
from mx.DateTime import *
- import warnings
- warnings.filterwarnings('ignore',".*struct integer overflow masking is deprecated*")
+ import warnings
+ warnings.filterwarnings('ignore',".*struct integer overflow masking is deprecated*")
start = datetime.date.fromtimestamp(time.mktime(time.strptime(time.strftime('%Y-%m-%d'), "%Y-%m-%d")))
start = DateTime(int(start.year), int(start.month), int(start.day))
res = {}
diff --git a/addons/account/test/account_validate_account_move.yml b/addons/account/test/account_validate_account_move.yml
index 44acc341d8ebe88bc41f0c66506e228c950dc070..62ae315e69aa19cec32469d6c4ebdecfe2666aae 100644
--- a/addons/account/test/account_validate_account_move.yml
+++ b/addons/account/test/account_validate_account_move.yml
@@ -6,7 +6,6 @@
sign : 1.00
-
In order to test the 'Validate Journal Entries' wizard in OpenERP, I created an account move
-
-
!record {model: account.move, id: account_move_0}:
date: '2010-06-07'
diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index f35a2c5480c9bfb55c35173e4c507098e2b05715..f2e278b06cebc40ff0fd2eaca99bb8421048209b 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -31,6 +31,7 @@
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_account_chart"/>
<field name="target">new</field>
+ <field name="help">Display your company chart of accounts per fiscal year and filter by period. Have a complete tree view of all journal items per account code by clicking on an account.</field>
</record>
<menuitem icon="STOCK_INDENT" action="action_account_chart"
diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py
index e3d115ae30a8a9e2f159d8bb6cc5faf46247d4a4..cbf1de89a314b640c43dd155b1146639afca185c 100644
--- a/addons/account/wizard/account_fiscalyear_close.py
+++ b/addons/account/wizard/account_fiscalyear_close.py
@@ -30,14 +30,14 @@ class account_fiscalyear_close(osv.osv_memory):
_description = "Fiscalyear Close"
_columns = {
'fy_id': fields.many2one('account.fiscalyear', \
- 'Fiscal Year to close', required=True),
+ 'Fiscal Year to close', required=True, help="Select a Fiscal year to close"),
'fy2_id': fields.many2one('account.fiscalyear', \
'New Fiscal Year', required=True),
'journal_id': fields.many2one('account.journal', \
'Opening Entries Journal', required=True, help='The best practice here is to use a journal dedicated to contain the opening entries of all fiscal years. Note that you should define it with default debit/credit accounts and with a centralized counterpart.'),
'period_id': fields.many2one('account.period', \
'Opening Entries Period', required=True),
- 'report_name': fields.char('Name of new entries',size=64, required=True),
+ 'report_name': fields.char('Name of new entries',size=64, required=True, help="Give name of the new entries"),
}
_defaults = {
'report_name':'End of Fiscal Year Entry',
diff --git a/addons/account/wizard/account_fiscalyear_close_state.py b/addons/account/wizard/account_fiscalyear_close_state.py
index 69b80f17f918b3e6ee3017074b16633f5ceebbd8..899f3353cbd0a8154b2193345c0846eb247348b7 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.py
+++ b/addons/account/wizard/account_fiscalyear_close_state.py
@@ -31,7 +31,7 @@ class account_fiscalyear_close_state(osv.osv_memory):
_description = "Fiscalyear Close state"
_columns = {
'fy_id': fields.many2one('account.fiscalyear', \
- 'Fiscal Year to close', required=True),
+ 'Fiscal Year to close', required=True, help="Select a fiscal year to close"),
}
def data_save(self, cr, uid, ids, context=None):
diff --git a/addons/account/wizard/account_fiscalyear_close_state.xml b/addons/account/wizard/account_fiscalyear_close_state.xml
index 0b303f1a0ccf27283c346c03f8f42c6e1c022acc..c8210dfbdf17d1baf7ea6906a648b2bbbb76a513 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.xml
+++ b/addons/account/wizard/account_fiscalyear_close_state.xml
@@ -7,13 +7,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Close states of Fiscal year and periods">
- <label string ="This wizard will definitelly close a fiscal year and its related periods. That means that no one will be able to create or modify journal entries in it." colspan="4"/>
- <field name="fy_id" domain = "[('state','=','draft')]" colspan="4"/>
- <separator string="" colspan="4" />
- <group colspan="4" col="6">
- <button icon="gtk-cancel" special="cancel" string="Cancel"/>
- <button icon="terp-locked" string="Close Fiscalyear" name="data_save" type="object"/>
- </group>
+ <label string ="This wizard will definitelly close a fiscal year and its related periods. That means that no one will be able to create or modify journal entries in it." colspan="4"/>
+ <separator colspan="4" />
+ <field name="fy_id" domain = "[('state','=','draft')]" colspan="4"/>
+ <separator colspan="4" />
+ <group colspan="4" col="6">
+ <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+ <button icon="terp-locked" string="Close Fiscalyear" name="data_save" type="object"/>
+ </group>
</form>
</field>
</record>
diff --git a/addons/account/wizard/account_fiscalyear_close_view.xml b/addons/account/wizard/account_fiscalyear_close_view.xml
index 66a471b756dcbd9e820c4f8392514edf944b097b..79be8de555a49224aaa1088db53f652b42b33c83 100644
--- a/addons/account/wizard/account_fiscalyear_close_view.xml
+++ b/addons/account/wizard/account_fiscalyear_close_view.xml
@@ -6,21 +6,22 @@
<field name="model">account.fiscalyear.close</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Generate Fiscal Year Opening Entries">
- <label string="This wizard will generate the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year: it will simply replace the old opening entries with the new ones." colspan="4"/>
- <field name="fy_id" domain = "[('state','=','draft')]"/>
- <field name="fy2_id" domain = "[('state','=','draft')]"/>
- <field name="journal_id"/>
- <field name="period_id" domain ="[('fiscalyear_id','=',fy2_id)]"/>
- <field name="report_name" colspan="4"/>
- <separator string="" colspan="4"/>
- <group colspan="4" col="6">
- <label string="" colspan="2"/>
- <button icon="gtk-cancel" special="cancel" string="Cancel"/>
- <button icon="gtk-execute" string="Create" name="data_save" type="object"/>
- </group>
- </form>
- </field>
+ <form string="Generate Fiscal Year Opening Entries">
+ <label string="This wizard will generate the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year: it will simply replace the old opening entries with the new ones." colspan="4"/>
+ <separator colspan="4"/>
+ <field name="fy_id" domain = "[('state','=','draft')]"/>
+ <field name="fy2_id" domain = "[('state','=','draft')]"/>
+ <field name="journal_id"/>
+ <field name="period_id" domain ="[('fiscalyear_id','=',fy2_id)]" />
+ <field name="report_name" colspan="4"/>
+ <separator colspan="4"/>
+ <group colspan="4" col="6">
+ <label string="" colspan="2"/>
+ <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+ <button icon="gtk-execute" string="Create" name="data_save" type="object"/>
+ </group>
+ </form>
+ </field>
</record>
<record id="action_account_fiscalyear_close" model="ir.actions.act_window">
diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml
index da59388eb9194e00545886c389c72e839e506334..24fe913d179da211f3da2fd52f48672a3972e97e 100644
--- a/addons/account/wizard/account_move_journal_view.xml
+++ b/addons/account/wizard/account_move_journal_view.xml
@@ -20,6 +20,7 @@
<field name="view_id" ref="view_account_move_journal_form"/>
<field name="context">{'journal_type':'sale','view_mode':False}</field>
<field name="target">new</field>
+ <field name="help">This view is used by accountants in order to record entries massively in OpenERP. If you want to record a customer invoice, select the journal and the period in the search toolbar. Then, start by recording the entry line of the income account. OpenERP will propose to you automatically the Tax related to this account and the counter-part "Account receivable".</field>
</record>
<menuitem action="action_account_moves_sale" sequence="16" id="menu_eaction_account_moves_sale"
parent="menu_finance_receivables" icon="STOCK_JUSTIFY_FILL" groups="group_account_user,group_account_manager"/>
@@ -31,6 +32,7 @@
<field name="view_id" ref="view_account_move_journal_form"/>
<field name="context">{'journal_type':'purchase','view_mode':False}</field>
<field name="target">new</field>
+ <field name="help">This view is used by accountants in order to record entries massively in OpenERP. If you want to record a supplier invoice, start by recording the line of the expense account, OpenERP will propose to you automatically the Tax related to this account and the counter-part "Account Payable".</field>
</record>
<menuitem action="action_account_moves_purchase"
id="menu_eaction_account_moves_purchase"
@@ -46,6 +48,7 @@
<field name="view_id" ref="view_account_move_journal_form"/>
<field name="context">{'journal_type':'bank','view_mode':False}</field>
<field name="target">new</field>
+ <field name="help">This view is used by accountants in order to record entries massively in OpenERP. Journal items are created by OpenERP if you use Bank Statements, Cash Registers, or Customer/Supplier payments.</field>
</record>
<menuitem
diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml
index 38ed195820bb6103dbc018d3d2fd5acd8352b8ff..7c7ed520b4898cfecd46ac48e3f0d11808786f8e 100644
--- a/addons/account/wizard/account_reconcile_view.xml
+++ b/addons/account/wizard/account_reconcile_view.xml
@@ -8,22 +8,20 @@
<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>
+ <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>
</form>
</field>
</record>
diff --git a/addons/account/wizard/account_report_balance_sheet.py b/addons/account/wizard/account_report_balance_sheet.py
index a4ad0c58524219c0696f969af96468d1fe88857e..9dc04bdad1085840e5501de2be9256b1d61e0441 100644
--- a/addons/account/wizard/account_report_balance_sheet.py
+++ b/addons/account/wizard/account_report_balance_sheet.py
@@ -35,7 +35,7 @@ class account_bs_report(osv.osv_memory):
_columns = {
'display_type': fields.boolean("Landscape Mode"),
'reserve_account_id': fields.many2one('account.account', 'Reserve & Profit/Loss Account',required = True,
- help='This Account is used for trasfering Profit/Loss(If It is Profit : Amount will be added, Loss : Amount will be duducted.), Which is calculated from Profilt & Loss Report', domain = [('type','=','payable')]),
+ help='This Account is used for trasfering Profit/Loss(If It is Profit: Amount will be added, Loss : Amount will be duducted.), Which is calculated from Profilt & Loss Report', domain = [('type','=','payable')]),
}
_defaults={
diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py
index 038973c4ed843989b10445b5f05c16ff311e734c..517fbf248e5d8b16b6ba797dcbd2976e5e3570c3 100644
--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@@ -100,7 +100,7 @@ class account_common_report(osv.osv_memory):
return self.pool.get('account.journal').search(cr, uid ,[])
_defaults = {
- 'fiscalyear_id' : _get_fiscalyear,
+ 'fiscalyear_id': _get_fiscalyear,
'journal_ids': _get_all_journal,
'filter': 'filter_no',
'chart_account_id': _get_account,
diff --git a/addons/account/wizard/account_report_common_partner.py b/addons/account/wizard/account_report_common_partner.py
index d9f3934d9a4585dcdfcc45445b73d6e0b9ebfbc7..3fafb400bb1402525bb4328e0cbf0ac20a41d781 100644
--- a/addons/account/wizard/account_report_common_partner.py
+++ b/addons/account/wizard/account_report_common_partner.py
@@ -28,7 +28,7 @@ class account_common_partner_report(osv.osv_memory):
_columns = {
'result_selection': fields.selection([('customer','Receivable Accounts'),
('supplier','Payable Accounts'),
- ('customer_supplier' ,'Receivable and Payable Accounts')],
+ ('customer_supplier','Receivable and Payable Accounts')],
"Partner's", required=True),
}
diff --git a/addons/account/wizard/account_subscription_generate_view.xml b/addons/account/wizard/account_subscription_generate_view.xml
index f169537be46ca29fbc50b290c0610cfd219b62b8..f8434edafa4c583ed04e962ddbde413175cd9356 100644
--- a/addons/account/wizard/account_subscription_generate_view.xml
+++ b/addons/account/wizard/account_subscription_generate_view.xml
@@ -8,17 +8,15 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Subscription Compute">
- <group colspan="4" >
- <separator string="Generate entries before:" colspan="4"/>
- <field name="date"/>
- </group>
- <separator string="" colspan="4" />
- <group colspan="4" col="6">
- <label string ="" colspan="2"/>
- <button icon="gtk-cancel" special="cancel" string="Cancel" />
- <button icon="gtk-execute" string="Generate Entries"
- name="action_generate" type="object" />
- </group>
+ <separator string="Generate entries before:" colspan="4"/>
+ <field name="date"/>
+ <separator colspan="4" />
+ <group colspan="4" col="6">
+ <label string ="" colspan="2"/>
+ <button icon="gtk-cancel" special="cancel" string="Cancel" />
+ <button icon="gtk-execute" string="Generate Entries"
+ name="action_generate" type="object" />
+ </group>
</form>
</field>
</record>
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index 05a79ca55e6f49c9a61b40b3d9229f322bb75863..3122cf0dd44d7f0ab365999228eb5b97dd2a35c9 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -38,12 +38,10 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Use Model">
- <group colspan="4" col="6" width="300" height="70">
- <label string = "Are you sure you want to create entries?" colspan="2"/>
- <newline/>
- <button icon="gtk-cancel" special="cancel" string="Cancel"/>
- <button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1'/>
- </group>
+ <label string = "Are you sure you want to create entries?" colspan="2"/>
+ <newline/>
+ <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+ <button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1'/>
</form>
</field>
</record>
diff --git a/addons/account/wizard/account_vat.py b/addons/account/wizard/account_vat.py
index 80f4f8360a162503d4b4da757ac871fbb22e7b6b..0c33517d428b632176ca648de934f88534b6a286 100644
--- a/addons/account/wizard/account_vat.py
+++ b/addons/account/wizard/account_vat.py
@@ -24,13 +24,14 @@ from osv import osv, fields
class account_vat_declaration(osv.osv_memory):
_name = 'account.vat.declaration'
_description = 'Account Vat Declaration'
-
+ _inherit = "account.common.account.report"
_columns = {
- 'based_on': fields.selection([('invoices','Invoices'),
- ('payments','Payments'),],
+ 'based_on': fields.selection([('invoices','Invoices'),
+ ('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"),
+ 'fiscalyear': fields.many2many('account.fiscalyear','vat_fiscal_rel','fiscal_id','Fiscal Year',required=True),
}
def _get_company(self, cr, uid, context={}):
@@ -38,14 +39,14 @@ class account_vat_declaration(osv.osv_memory):
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
+ return user.company_id.id
else:
return company_obj.search(cr, uid, [('parent_id', '=', False)])[0]
_defaults = {
- 'based_on': 'invoices',
- 'company_id': _get_company
- }
+ 'based_on': 'invoices',
+ 'company_id': _get_company
+ }
def create_vat(self, cr, uid, ids, context={}):
if context is None:
@@ -57,8 +58,7 @@ class account_vat_declaration(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'account.vat.declaration',
'datas': datas,
- }
-
+ }
account_vat_declaration()
#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index 16bb39e22cd349ba9efddd836fa35268a2b74d9e..41c0faa2c79cc0bf95b74b8e2f81770eab48cbac 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -10,10 +10,12 @@
<form string="Select Period">
<field name="company_id" groups="base.group_multi_company" widget='selection'/>
<newline/>
- <field name="based_on" invisible="1"/>
+ <field name="based_on"/>
<newline/>
<separator string="Select Period(s)" colspan="4"/>
- <field name="periods" nolabel="1" colspan="2"/>
+ <field name="periods" nolabel="1" colspan="4"/>
+ <separator string="Select FiscalYear(s)" colspan="4"/>
+ <field name="fiscalyear" nolabel="1" colspan="4"/>
<group col="2" colspan="4">
<button icon='gtk-cancel' special="cancel" string="Cancel" />
<button name="create_vat" string="Print Tax Statement" colspan="1" type="object" icon="gtk-ok"/>
diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py
index af1264d562c56cc481f6c8b21013aa0b0b47bc6e..43320836fd4361f9bafa16227da9408c0393fd2d 100644
--- a/addons/account_accountant/__openerp__.py
+++ b/addons/account_accountant/__openerp__.py
@@ -24,7 +24,7 @@
"author" : "OpenERP SA",
"category": 'Generic Modules/Accounting',
"description": """
-Give access to the admin user to all accounting features like the journal
+This module gives the admin user the access to all the accounting features like the journal
items and the chart of accounts.
""",
'website': 'http://www.openerp.com',
@@ -33,8 +33,8 @@ items and the chart of accounts.
'update_xml': [
'security/account_security.xml',
],
- 'demo_xml': [ ],
- 'test': [ ],
+ 'demo_xml': [],
+ 'test': [],
'installable': True,
'active': False,
'certificate': '',
diff --git a/addons/account_accountant/security/account_security.xml b/addons/account_accountant/security/account_security.xml
index 4aceb12d2668b052a2cd933131ac2cc14a673d0f..0d6006fd9b0abb2670998b464740964ad9f493e8 100644
--- a/addons/account_accountant/security/account_security.xml
+++ b/addons/account_accountant/security/account_security.xml
@@ -2,7 +2,7 @@
<openerp>
<data>
- <record id="base.user_admin" model="res.users">
+ <record id="base.user_root" model="res.users">
<field name="groups_id" eval="[(4, ref('account.group_account_manager')),(4, ref('account.group_account_user'))]"/>
</record>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 633524e3aaaf3afe4a01318056eaf7d5324915c2..b1b4ece2f64894c47bd2919781e597c3480f8640 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -146,7 +146,7 @@ class account_analytic_account(osv.osv):
FROM account_analytic_line \
WHERE account_id IN %s \
AND invoice_id IS NULL \
- GROUP BY account_analytic_line.account_id" ,(parent_ids,))
+ GROUP BY account_analytic_line.account_id",(parent_ids,))
for account_id, lwd in cr.fetchall():
if account_id not in res:
res[account_id] = {}
@@ -656,7 +656,7 @@ class account_analytic_account_summary_month(osv.osv):
if fields is None:
fields = self._columns.keys()
res_trans_obj = self.pool.get('ir.translation')
- # construct a clause for the rules :
+ # construct a clause for the rules:
d1, d2, tables= self.pool.get('ir.rule').domain_get(cr, user, self._name)
# all inherited fields + all non inherited fields for which the attribute whose name is in load is True
diff --git a/addons/account_analytic_analysis/i18n/sr.po b/addons/account_analytic_analysis/i18n/sr.po
index 073299c29e408197262d3f868a3b5f87d543b72c..a80ba1aa2c1100bb480d84307626a05a5d8a0be5 100644
--- a/addons/account_analytic_analysis/i18n/sr.po
+++ b/addons/account_analytic_analysis/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-13 17:10+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-14 07:30+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Serbian <sr@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-10-14 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/security/ir.model.access.csv b/addons/account_analytic_analysis/security/ir.model.access.csv
index 4db9c88f766a5c621bad3d64018d810ab647c053..80b9f37db1f6d562fd3af216d146d9af2b53d22e 100644
--- a/addons/account_analytic_analysis/security/ir.model.access.csv
+++ b/addons/account_analytic_analysis/security/ir.model.access.csv
@@ -1,5 +1,3 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_account_analytic_analysis_summary_user,account_analytic_analysis.summary.user,model_account_analytic_analysis_summary_user,account.group_account_manager,1,0,0,0
access_account_analytic_analysis_summary_month,account_analytic_analysis.summary.month,model_account_analytic_analysis_summary_month,account.group_account_manager,1,0,0,0
-access_account_analytic_account_user,account.analytic.account.user,model_account_analytic_account,base.group_user,1,0,0,0
-access_account_analytic_account_system,account.analytic.account.system,model_account_analytic_account,base.group_system,1,0,0,0
diff --git a/addons/account_analytic_default/account_analytic_default.py b/addons/account_analytic_default/account_analytic_default.py
index ebc78956a939ef43c9c7e0372dfa52ba3d22c0a0..b41c9b9e5d24d602c327d698007b3c76355f3f31 100644
--- a/addons/account_analytic_default/account_analytic_default.py
+++ b/addons/account_analytic_default/account_analytic_default.py
@@ -29,14 +29,14 @@ class account_analytic_default(osv.osv):
_rec_name = "analytic_id"
_order = "sequence"
_columns = {
- 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of analytic distribution."),
- 'analytic_id': fields.many2one('account.analytic.account', 'Analytic Account'),
- 'product_id': fields.many2one('product.product', 'Product', ondelete='cascade'),
- 'partner_id': fields.many2one('res.partner', 'Partner', ondelete='cascade'),
- 'user_id': fields.many2one('res.users', 'User', ondelete='cascade'),
- 'company_id': fields.many2one('res.company', 'Company', ondelete='cascade'),
- 'date_start': fields.date('Start Date'),
- 'date_stop': fields.date('End Date'),
+ 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of analytic distribution"),
+ 'analytic_id': fields.many2one('account.analytic.account', 'Analytic Account' , help="Analytical Account"),
+ 'product_id': fields.many2one('product.product', 'Product', ondelete='cascade', help="select a product which will use analytical account specified in analytic default (eg. create new cutomer invoice or Sale order if we select this product, it will automatically take this as an analytical account)"),
+ 'partner_id': fields.many2one('res.partner', 'Partner', ondelete='cascade', help="select a partner which will use analytical account specified in analytic default (eg. create new cutomer invoice or Sale order if we select this partner, it will automatically take this as an analytical account)"),
+ 'user_id': fields.many2one('res.users', 'User', ondelete='cascade', help="select a user which will use analytical account specified in analytic default"),
+ 'company_id': fields.many2one('res.company', 'Company', ondelete='cascade', help="select a company which will use analytical account specified in analytic default (eg. create new cutomer invoice or Sale order if we select this company, it will automatically take this as an analytical account)"),
+ 'date_start': fields.date('Start Date', help="Default start date for this Analytical Account"),
+ 'date_stop': fields.date('End Date', help="Default end date for this Analytical Account"),
}
def account_get(self, cr, uid, product_id=None, partner_id=None, user_id=None, date=None, context=None):
diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index 5aad1f3521df528235b5c7b848fa023392b44684..01d10bc13ab7a344b26ca78ecfd20a7f4525512e 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -6,7 +6,7 @@
<field name="model">account.analytic.default</field>
<field name="type">tree</field>
<field name="arch" type="xml">
- <tree string="Analytic Defaults">
+ <tree string="Analytic Defaults" colors="grey:date_stop and (date_stop < datetime.date.today().strftime('%%Y-%%m-%%d'))" >
<field name="sequence"/>
<field name="analytic_id" required="0" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
<field name="product_id"/>
@@ -44,11 +44,25 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Accounts">
+ <group col="10" colspan="4">
+ <filter icon="terp-go-month" string="Current" name = "current" help="Analytical defaults whose end date is greater then today or None" domain = "['|', ('date_stop', '>', datetime.date.today().strftime('%%Y-%%m-%%d')), ('date_stop', '=', False)]" />
+ <separator orientation="vertical"/>
<field name="analytic_id" groups="analytic.group_analytic_accounting"/>
<field name="product_id"/>
<field name="partner_id"/>
<field name="user_id"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
+ </group>
+ <newline/>
+ <group expand="0" string="Group By...">
+ <filter string="User" icon="terp-personal" context="{'group_by':'user_id'}" help="User"/>
+ <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" help="Partner"/>
+ <separator orientation="vertical"/>
+ <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}" help="Product" />
+ <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_id'}" help="Analytic Account" groups="analytic.group_analytic_accounting"/>
+ <separator orientation="vertical"/>
+ <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" help="Comapny" groups="base.group_multi_company" />
+ </group>
</search>
</field>
</record>
@@ -59,6 +73,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_account_analytic_default_form_search"/>
+ <field name="context">{"search_default_current":1}</field>
</record>
<act_window
diff --git a/addons/account_analytic_default/i18n/sr.po b/addons/account_analytic_default/i18n/sr.po
index a6168a5112de99253efc5cb886b987e2e302d8f9..a5aca6fe52a3e35e3496e0d7a5f25d271b96df76 100644
--- a/addons/account_analytic_default/i18n/sr.po
+++ b/addons/account_analytic_default/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-13 17:16+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-14 07:31+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Serbian <sr@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-10-14 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_default
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index 0e3ec4b33ca384abef9ac09b4dc5ecfb7d67f97a..fa3e4a246355b1c6615e1d28fac52204b6628f3a 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -336,6 +336,10 @@ class account_move_line(osv.osv):
analytic_line_obj.create(cr, uid, al_vals, context=context)
return True
+ def fields_view_get(self, cr, uid, view_id=None, view_type='form', context={}, toolbar=False, submenu=False):
+ result = super(osv.osv, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
+ return result
+
account_move_line()
class account_invoice(osv.osv):
@@ -425,4 +429,42 @@ class sale_order_line(osv.osv):
sale_order_line()
+
+class account_bank_statement(osv.osv):
+ _inherit = "account.bank.statement"
+ _name = "account.bank.statement"
+
+ def create_move_from_st_line(self, cr, uid, st_line_id, company_currency_id, st_line_number, context=None):
+ account_move_line_pool = self.pool.get('account.move.line')
+ account_bank_statement_line_pool = self.pool.get('account.bank.statement.line')
+ st_line = account_bank_statement_line_pool.browse(cr, uid, st_line_id, context)
+ result = super(account_bank_statement,self).create_move_from_st_line(cr, uid, st_line_id, company_currency_id, st_line_number, context=context)
+ move = st_line.move_ids and st_line.move_ids[0] or False
+ if move:
+ for line in move.line_id:
+ account_move_line_pool.write(cr, uid, [line.id], {'analytics_id':st_line.analytics_id.id}, context=context)
+ return result
+
+ def button_confirm_bank(self, cr, uid, ids, context=None):
+ super(account_bank_statement,self).button_confirm_bank(cr, uid, ids, context=context)
+ for st in self.browse(cr, uid, ids, context):
+ for st_line in st.line_ids:
+ if st_line.analytics_id:
+ if not st.journal_id.analytic_journal_id:
+ raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (st.journal_id.name,))
+ if not st_line.amount:
+ continue
+ return True
+
+account_bank_statement()
+
+
+class account_bank_statement_line(osv.osv):
+ _inherit = "account.bank.statement.line"
+ _name = "account.bank.statement.line"
+ _columns = {
+ 'analytics_id': fields.many2one('account.analytic.plan.instance', 'Analytic Distribution'),
+ }
+account_bank_statement_line()
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index 1b3a6c8987a2710d5e6f5bf68cc51b0abf72078b..b1dae7f55f8d7e201628a985170ff45d1593f2b6 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -16,17 +16,19 @@
</field>
</record>
-
- <record model="ir.ui.view" id="view_account_move_form_inherit">
- <field name="name">account.move.form.inherit</field>
- <field name="model">account.move</field>
- <field name="type">form</field>
- <field name="inherit_id" ref="account.view_move_form"/>
- <field name="arch" type="xml">
- <field name="analytic_account_id" position="replace">
- <field name="analytics_id" context="{'journal_id':journal_id}" groups="base.group_extended"/>
- </field>
- </field>
+ <record id="view_move_form_inherit" model="ir.ui.view">
+ <field name="name">account.move.form.inherit</field>
+ <field name="model">account.move</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="account.view_move_form"/>
+ <field name="arch" type="xml">
+ <xpath expr="/form/notebook/page/field[@name='line_id']/tree/field[@name='analytic_account_id']" position="replace">
+ <field name="analytics_id" context="{'journal_id':journal_id}" groups="analytic.group_analytic_accounting"/>
+ </xpath>
+ <xpath expr="/form/notebook/page/field[@name='line_id']/form/notebook/page/group/field[@name='analytic_account_id']" position="replace">
+ <field name="analytics_id" context="{'journal_id':journal_id}" groups="analytic.group_analytic_accounting"/>
+ </xpath>
+ </field>
</record>
<record id="account.journal_col11" model="account.journal.column">
@@ -44,12 +46,37 @@
<field name="type">form</field>
<field name="inherit_id" ref="account.view_move_line_form"/>
<field name="arch" type="xml">
- <field name="move_id" position="after">
- <field name="analytics_id" context="{'journal_id':journal_id}" groups="base.group_extended"/>
+ <field name="analytic_account_id" position="replace">
+ <field name="analytics_id" context="{'journal_id':journal_id}" groups="analytic.group_analytic_accounting"/>
</field>
</field>
</record>
+ <record model="ir.ui.view" id="view_move_line_form_1_inherit">
+ <field name="name">account.move.line.form.inherit1</field>
+ <field name="model">account.move.line</field>
+ <field name="type">form</field>
+ <field name="priority">2</field>
+ <field name="inherit_id" ref="account.view_move_line_form2"/>
+ <field name="arch" type="xml">
+ <field name="analytic_account_id" position="replace">
+ <field name="analytics_id" context="{'journal_id':journal_id}" groups="analytic.group_analytic_accounting"/>
+ </field>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="view_move_line_tree_inherit">
+ <field name="name">account.move.line.tree.inherit</field>
+ <field name="model">account.move.line</field>
+ <field name="type">tree</field>
+ <field name="priority">2</field>
+ <field name="inherit_id" ref="account.view_move_line_tree"/>
+ <field name="arch" type="xml">
+ <field name="analytic_account_id" position="replace">
+ <field name="analytics_id" context="{'journal_id':journal_id}" groups="analytic.group_analytic_accounting"/>
+ </field>
+ </field>
+ </record>
<!-- Replace analytic_id with analytics_id in account.invoice.line -->
@@ -60,7 +87,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<field name="account_analytic_id" position="replace">
- <field name="analytics_id" context="{'journal_id':parent.journal_id}" domain="[('plan_id','<>',False)]" groups="base.group_extended"/>
+ <field name="analytics_id" context="{'journal_id':parent.journal_id}" domain="[('plan_id','<>',False)]" groups="analytic.group_analytic_accounting"/>
</field>
</field>
</record>
@@ -73,7 +100,7 @@
<field name="priority">2</field>
<field name="arch" type="xml">
<field name="account_analytic_id" position="replace">
- <field name="analytics_id" domain="[('plan_id','<>',False)]" context="{'journal_id':parent.journal_id}" groups="base.group_extended"/>
+ <field name="analytics_id" domain="[('plan_id','<>',False)]" context="{'journal_id':parent.journal_id}" groups="analytic.group_analytic_accounting"/>
</field>
</field>
</record>
@@ -92,11 +119,11 @@
<field name="account_ids" nolabel="1" colspan="4">
<form string="Analytic Distribution">
<field name="rate"/>
- <field name="analytic_account_id" groups="base.group_extended"/>
+ <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
</form>
<tree string="Analytic Distribution" editable="bottom">
<field name="rate"/>
- <field name="analytic_account_id" groups="base.group_extended"/>
+ <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
</tree>
</field>
</form>
@@ -159,13 +186,24 @@
</field>
</record>
+ <record model="ir.ui.view" id="account_analytic_plan_search">
+ <field name="name">account.analytic.plan.search</field>
+ <field name="model">account.analytic.plan</field>
+ <field name="type">search</field>
+ <field name="arch" type="xml">
+ <search string="Analytic Plans">
+ <field name="name"/>
+ </search>
+ </field>
+ </record>
+
<record model="ir.ui.view" id="account_analytic_plan_form">
<field name="name">account.analytic.plan.form</field>
<field name="model">account.analytic.plan</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Analytic Plan">
- <field name="name" select="1"/>
+ <field name="name"/>
<field name="default_instance_id"/>
<field name="plan_ids" colspan="4" nolabel="1"/>
</form>
@@ -190,6 +228,7 @@
<field name="res_model">account.analytic.plan</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
+ <field name="search_view_id" ref="account_analytic_plan_search"/>
</record>
<menuitem
@@ -258,5 +297,32 @@
</field>
</record>
+ <record id="view_bank_statement_inherit_form" model="ir.ui.view">
+ <field name="name">account.bank.statement.form.inherit</field>
+ <field name="model">account.bank.statement</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="account.view_bank_statement_form"/>
+ <field name="arch" type="xml">
+ <xpath expr="/form/notebook/page/field[@name='line_ids']/tree/field[@name='analytic_account_id']" position="replace">
+ <field name="analytics_id" groups="analytic.group_analytic_accounting"/>
+ </xpath>
+ <xpath expr="/form/notebook/page/field[@name='line_ids']/form/field[@name='analytic_account_id']" position="replace">
+ <field name="analytics_id" groups="analytic.group_analytic_accounting"/>
+ </xpath>
+ </field>
+ </record>
+
+ <record id="view_bank_statement_reconcile_inherit_form" model="ir.ui.view">
+ <field name="name">account.bank.statement.form.inherit_1</field>
+ <field name="model">account.bank.statement</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="account.view_bank_statement_reconcile_form"/>
+ <field name="arch" type="xml">
+ <xpath expr="/form/notebook/page/field[@name='line_ids']/form/field[@name='analytic_account_id']" position="replace">
+ <field name="analytics_id" groups="analytic.group_analytic_accounting"/>
+ </xpath>
+ </field>
+ </record>
+
</data>
</openerp>
diff --git a/addons/account_analytic_plans/i18n/sr.po b/addons/account_analytic_plans/i18n/sr.po
index 6a85a8808566fab0e1ba07ae3ab7ec533ad92a03..fc4ee2ee5866eda4a55091fd5b65fdb0d0dba557 100644
--- a/addons/account_analytic_plans/i18n/sr.po
+++ b/addons/account_analytic_plans/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-13 17:43+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-14 07:31+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Serbian <sr@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-10-14 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/security/ir.model.access.csv b/addons/account_analytic_plans/security/ir.model.access.csv
index 708094dc52011d1b2ede35d7709f6d31d4bd0031..f7f141ac15a2e395b3ad5349c17211489bcb89ea 100644
--- a/addons/account_analytic_plans/security/ir.model.access.csv
+++ b/addons/account_analytic_plans/security/ir.model.access.csv
@@ -6,5 +6,3 @@
"access_account_analytic_plan_line_invoice","account.analytic.plan.line.invoice","model_account_analytic_plan_line","account.group_account_user",1,1,1,1
"access_account_analytic_plan_instance_manager","account.analytic.plan.instance manager","model_account_analytic_plan_instance","account.group_account_manager",1,1,1,1
"access_account_analytic_plan_instance_line_manager","account.analytic.plan.instance.line manager","model_account_analytic_plan_instance_line","account.group_account_manager",1,1,1,1
-"access_account_analytic_plan_system","account.analytic.plan system","model_account_analytic_plan","base.group_system",1,1,1,1
-"access_account_analytic_plan_line_system","account.analytic.plan.line system","model_account_analytic_plan_line","base.group_system",1,1,1,1
diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
index 6c496e18267c5289446695d486eab006187741a5..81e5d33fbda32bf97879ba1037ed046a20414eda 100644
--- a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
+++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
@@ -8,20 +8,18 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Crossovered Analytic">
- <group height="300" width="620">
- <group col="4" colspan="6">
- <field name="date1"/>
- <field name="date2"/>
- <field name="ref" groups="analytic.group_analytic_accounting"/>
- <field name="empty_line"/>
- <separator colspan="4" string="Analytic Journal"/>
- <field name="journal_ids" colspan="4" nolabel="1"/>
- </group>
- <separator colspan="4"/>
- <group col="2" colspan="4">
- <button special="cancel" string="Cancel" icon='gtk-cancel'/>
- <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
- </group>
+ <group col="4" colspan="6">
+ <field name="date1"/>
+ <field name="date2"/>
+ <field name="ref" groups="analytic.group_analytic_accounting"/>
+ <field name="empty_line"/>
+ <separator colspan="4" string="Analytic Journal"/>
+ <field name="journal_ids" colspan="4" nolabel="1"/>
+ </group>
+ <separator colspan="4"/>
+ <group col="2" colspan="4">
+ <button special="cancel" string="Cancel" icon='gtk-cancel'/>
+ <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
</group>
</form>
</field>
diff --git a/addons/account_anglo_saxon/i18n/mn.po b/addons/account_anglo_saxon/i18n/mn.po
new file mode 100644
index 0000000000000000000000000000000000000000..2fd75bcc2456e5aaaa6eddb9b5f1fc508093d335
--- /dev/null
+++ b/addons/account_anglo_saxon/i18n/mn.po
@@ -0,0 +1,66 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-24 12:50+0000\n"
+"PO-Revision-Date: 2010-10-16 09:58+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Mongolian <mn@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-10-17 04:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
+msgid ""
+"This module will support the Anglo-Saxons accounting methodology by \n"
+" changing the accounting logic with stock transactions. The difference "
+"between the Anglo-Saxon accounting countries \n"
+" and the Rhine or also called Continental accounting countries is the "
+"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
+" Anglo-Saxons accounting does take the cost when sales invoice is "
+"created, Continental accounting will take the cost at he moment the goods "
+"are shipped.\n"
+" This module will add this functionality by using a interim account, to "
+"store the value of shipped goods and will contra book this interim account \n"
+" when the invoice is created to transfer this amount to the debtor or "
+"creditor account."
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
+msgid "Stock Account"
+msgstr "Ðгуулахын данÑ"
+
+#. module: account_anglo_saxon
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "ДÑлгÑцийн XML алдаатай!"
+
+#. module: account_anglo_saxon
+#: field:product.category,property_account_creditor_price_difference_categ:0
+#: field:product.template,property_account_creditor_price_difference:0
+msgid "Price Difference Account"
+msgstr "Үнийн өөрчлөлтийн данÑ"
+
+#. module: account_anglo_saxon
+#: help:product.category,property_account_creditor_price_difference_categ:0
+#: help:product.template,property_account_creditor_price_difference:0
+msgid ""
+"This account will be used to value price difference between purchase price "
+"and cost price."
+msgstr ""
+"ÐÐ½Ñ Ð´Ð°Ð½Ñ Ð½ÑŒ худалдан авалтын Ò¯Ð½Ñ Ð±Ð¾Ð»Ð¾Ð½ өртгийн үнийн хоорондох үнийн "
+"өөрчлөлтийг дүгнÑхийн тулд ашиглагдана."
diff --git a/addons/account_budget/__openerp__.py b/addons/account_budget/__openerp__.py
index dfe1640a2902c5a05f6a4d2b8c72baf97d49db41..d73efdce399b841a04e18bde04a8be423d2a1390 100644
--- a/addons/account_budget/__openerp__.py
+++ b/addons/account_budget/__openerp__.py
@@ -49,13 +49,11 @@ Three reports are available:
'update_xml': [
'security/ir.model.access.csv',
'security/account_budget_security.xml',
- 'wizard/account_budget_spread_view.xml',
'account_budget_view.xml',
'account_budget_report.xml',
'account_budget_workflow.xml',
'wizard/account_budget_analytic_view.xml',
'wizard/account_budget_report_view.xml',
- 'wizard/account_budget_spread_view.xml',
'wizard/account_budget_crossovered_summary_report_view.xml',
'wizard/account_budget_crossovered_report_view.xml',
],
diff --git a/addons/account_budget/account_budget.py b/addons/account_budget/account_budget.py
index 8726eca929c340aec7a1f4a7c76cff7fe920f1e0..b85e089016e25ab6c3ca526813c4de4b53296ea8 100644
--- a/addons/account_budget/account_budget.py
+++ b/addons/account_budget/account_budget.py
@@ -34,12 +34,11 @@ def strToDate(dt):
# Budgets
# ---------------------------------------------------------
class account_budget_post(osv.osv):
- _name = 'account.budget.post'
- _description = 'Budgetary Position'
+ _name = "account.budget.post"
+ _description = "Budgetary Position"
_columns = {
'code': fields.char('Code', size=64, required=True),
'name': fields.char('Name', size=256, required=True),
- 'dotation_ids': fields.one2many('account.budget.post.dotation', 'post_id', 'Spreading'),
'account_ids': fields.many2many('account.account', 'account_budget_rel', 'budget_id', 'account_id', 'Accounts'),
'crossovered_budget_line': fields.one2many('crossovered.budget.lines', 'general_budget_id', 'Budget Lines'),
'company_id': fields.many2one('res.company', 'Company', required=True),
@@ -49,60 +48,8 @@ class account_budget_post(osv.osv):
}
_order = "name"
- def spread(self, cr, uid, ids, fiscalyear_id=False, amount=0.0):
- dobj = self.pool.get('account.budget.post.dotation')
- obj_fiscalyear = self.pool.get('account.fiscalyear')
- for o in self.browse(cr, uid, ids):
- # delete dotations for this post
- dobj.unlink(cr, uid, dobj.search(cr, uid, [('post_id','=',o.id)]))
-
- # create one dotation per period in the fiscal year, and spread the total amount/quantity over those dotations
- fy = obj_fiscalyear.browse(cr, uid, [fiscalyear_id])[0]
- num = len(fy.period_ids)
- for p in fy.period_ids:
- dobj.create(cr, uid, {'post_id': o.id, 'period_id': p.id, 'amount': amount/num})
- return True
-
account_budget_post()
-class account_budget_post_dotation(osv.osv):
- def _tot_planned(self, cr, uid, ids, name, args, context):
- obj_budget_lines = self.pool.get('crossovered.budget.lines')
- res = {}
- for line in self.browse(cr, uid, ids):
- if line.period_id:
- obj_period = self.pool.get('account.period').browse(cr, uid, line.period_id.id)
-
- budget_id = line.post_id and line.post_id.id or False
- query="SELECT id FROM crossovered_budget_lines WHERE \
- general_budget_id= %s AND (date_from >=%s AND date_from <= %s ) \
- OR (date_to >=%s AND date_to <= %s) OR (date_from < %s AND date_to > %s)"
- cr.execute(query, (budget_id, obj_period.date_start, obj_period.date_stop, obj_period.date_start, obj_period.date_stop, obj_period.date_start, obj_period.date_stop,))
- res1 = cr.fetchall()
- tot_planned = 0.00
- for record in res1:
- obj_lines = obj_budget_lines.browse(cr, uid, record[0])
- count_days = min(strToDate(obj_period.date_stop), strToDate(obj_lines.date_to)) - max(strToDate(obj_period.date_start), strToDate(obj_lines.date_from))
- days_in_period = count_days.days + 1
- count_days = strToDate(obj_lines.date_to) - strToDate(obj_lines.date_from)
- total_days_of_rec = count_days.days + 1
- tot_planned += obj_lines.planned_amount / total_days_of_rec * days_in_period
- res[line.id] = tot_planned
- else:
- res[line.id] = 0.00
- return res
-
- _name = 'account.budget.post.dotation'
- _description = "Budget Dotation"
- _columns = {
- 'name': fields.char('Name', size=64),
- 'post_id': fields.many2one('account.budget.post', 'Item', select=True),
- 'period_id': fields.many2one('account.period', 'Period'),
- 'amount': fields.float('Amount', digits=(16,2)),
- 'tot_planned': fields.function(_tot_planned, method=True, string='Total Planned Amount', type='float', store=True),
- }
-
-account_budget_post_dotation()
class crossovered_budget(osv.osv):
_name = "crossovered.budget"
@@ -252,10 +199,10 @@ class crossovered_budget_lines(osv.osv):
crossovered_budget_lines()
class account_analytic_account(osv.osv):
- _inherit = 'account.analytic.account'
+ _inherit = "account.analytic.account"
_columns = {
- 'crossovered_budget_line': fields.one2many('crossovered.budget.lines', 'analytic_account_id', 'Budget Lines'),
+ 'crossovered_budget_line': fields.one2many('crossovered.budget.lines', 'analytic_account_id', 'Budget Lines'),
}
account_analytic_account()
diff --git a/addons/account_budget/account_budget_demo.xml b/addons/account_budget/account_budget_demo.xml
index 7c4c6e3ea1502a56863e4bb3024e1164fa0a5d6f..487c7b9eb93a1cc4e98206c5ceb24bbd68ec928b 100644
--- a/addons/account_budget/account_budget_demo.xml
+++ b/addons/account_budget/account_budget_demo.xml
@@ -17,173 +17,24 @@
</record>
</data>
- <!-- Budgetary Dotations -->
- <data noupdate="1">
- <record id="account_budget_post_dot1" model="account.budget.post.dotation">
- <field eval=""""/"""" name="name"/>
- <field eval="5000" name="amount"/>
- <field name="post_id" ref="account_budget_post_sales0"/>
- <field name="period_id" ref="account.period_1"/>
- </record>
- <record id="account_budget_post_dot2" model="account.budget.post.dotation">
- <field eval=""""/"""" name="name"/>
- <field eval="5000" name="amount"/>
- <field name="post_id" ref="account_budget_post_sales0"/>
- <field name="period_id" ref="account.period_2"/>
- </record>
- <record id="account_budget_post_dot3" model="account.budget.post.dotation">
- <field eval=""""/"""" name="name"/>
- <field eval="5000" name="amount"/>
- <field name="post_id" ref="account_budget_post_sales0"/>
- <field name="period_id" ref="account.period_3"/>
- </record>
- <record id="account_budget_post_dot4" model="account.budget.post.dotation">
- <field eval=""""/"""" name="name"/>
- <field eval="5000" name="amount"/>
- <field name="post_id" ref="account_budget_post_sales0"/>
- <field name="period_id" ref="account.period_4"/>
- </record>
- <record id="account_budget_post_dot5" model="account.budget.post.dotation">
- <field eval=""""/"""" name="name"/>
- <field eval="5000" name="amount"/>
- <field name="post_id" ref="account_budget_post_sales0"/>
- <field name="period_id" ref="account.period_5"/>
- </record>
- <record id="account_budget_post_dot6" model="account.budget.post.dotation">
- <field eval=""""/"""" name="name"/>
- <field eval="5000" name="amount"/>
- <field name="post_id" ref="account_budget_post_sales0"/>
- <field name="period_id" ref="account.period_6"/>
- </record>
- <record id="account_budget_post_dot7" model="account.budget.post.dotation">
- <field eval=""""/"""" name="name"/>
- <field eval="5000" name="amount"/>
- <field name="post_id" ref="account_budget_post_sales0"/>
- <field name="period_id" ref="account.period_7"/>
- </record>
- <record id="account_budget_post_dot8" model="account.budget.post.dotation">
- <field eval=""""/"""" name="name"/>
- <field eval="5000" name="amount"/>
- <field name="post_id" ref="account_budget_post_sales0"/>
- <field name="period_id" ref="account.period_8"/>
- </record>
- <record id="account_budget_post_dot9" model="account.budget.post.dotation">
- <field eval=""""/"""" name="name"/>
- <field eval="5000" name="amount"/>
- <field name="post_id" ref="account_budget_post_sales0"/>
- <field name="period_id" ref="account.period_9"/>
- </record>
- <record id="account_budget_post_dot10" model="account.budget.post.dotation">
- <field eval=""""/"""" name="name"/>
- <field eval="5000" name="amount"/>
- <field name="post_id" ref="account_budget_post_sales0"/>
- <field name="period_id" ref="account.period_10"/>
- </record>
- <record id="account_budget_post_dot11" model="account.budget.post.dotation">
- <field eval=""""/"""" name="name"/>
- <field eval="5000" name="amount"/>
- <field name="post_id" ref="account_budget_post_sales0"/>
- <field name="period_id" ref="account.period_11"/>
- </record>
- <record id="account_budget_post_dot12" model="account.budget.post.dotation">
- <field eval=""""/"""" name="name"/>
- <field eval="5000" name="amount"/>
- <field name="post_id" ref="account_budget_post_sales0"/>
- <field name="period_id" ref="account.period_12"/>
- </record>
-
- <record id="account_budget_post_dot_pur1" model="account.budget.post.dotation">
- <field eval=""""/"""" name="name"/>
- <field eval="-2000" name="amount"/>
- <field name="post_id" ref="account_budget_post_purchase0"/>
- <field name="period_id" ref="account.period_1"/>
- </record>
- <record id="account_budget_post_dot_pur2" model="account.budget.post.dotation">
- <field eval=""""/"""" name="name"/>
- <field eval="-2000" name="amount"/>
- <field name="post_id" ref="account_budget_post_purchase0"/>
- <field name="period_id" ref="account.period_2"/>
- </record>
- <record id="account_budget_post_dot_pur3" model="account.budget.post.dotation">
- <field eval=""""/"""" name="name"/>
- <field eval="-2000" name="amount"/>
- <field name="post_id" ref="account_budget_post_purchase0"/>
- <field name="period_id" ref="account.period_3"/>
- </record>
- <record id="account_budget_post_dot_pur4" model="account.budget.post.dotation">
- <field eval=""""/"""" name="name"/>
- <field eval="-2000" name="amount"/>
- <field name="post_id" ref="account_budget_post_purchase0"/>
- <field name="period_id" ref="account.period_4"/>
- </record>
- <record id="account_budget_post_dot_pur5" model="account.budget.post.dotation">
- <field eval=""""/"""" name="name"/>
- <field eval="-2000" name="amount"/>
- <field name="post_id" ref="account_budget_post_purchase0"/>
- <field name="period_id" ref="account.period_5"/>
- </record>
- <record id="account_budget_post_dot_pur6" model="account.budget.post.dotation">
- <field eval=""""/"""" name="name"/>
- <field eval="-2000" name="amount"/>
- <field name="post_id" ref="account_budget_post_purchase0"/>
- <field name="period_id" ref="account.period_6"/>
- </record>
- <record id="account_budget_post_dot_pur7" model="account.budget.post.dotation">
- <field eval=""""/"""" name="name"/>
- <field eval="-2000" name="amount"/>
- <field name="post_id" ref="account_budget_post_purchase0"/>
- <field name="period_id" ref="account.period_7"/>
- </record>
- <record id="account_budget_post_dot_pur8" model="account.budget.post.dotation">
- <field eval=""""/"""" name="name"/>
- <field eval="-2000" name="amount"/>
- <field name="post_id" ref="account_budget_post_purchase0"/>
- <field name="period_id" ref="account.period_8"/>
- </record>
- <record id="account_budget_post_dot_pur9" model="account.budget.post.dotation">
- <field eval=""""/"""" name="name"/>
- <field eval="-2000" name="amount"/>
- <field name="post_id" ref="account_budget_post_purchase0"/>
- <field name="period_id" ref="account.period_9"/>
- </record>
- <record id="account_budget_post_dot_pur10" model="account.budget.post.dotation">
- <field eval=""""/"""" name="name"/>
- <field eval="-2000" name="amount"/>
- <field name="post_id" ref="account_budget_post_purchase0"/>
- <field name="period_id" ref="account.period_10"/>
- </record>
- <record id="account_budget_post_dot_pur11" model="account.budget.post.dotation">
- <field eval=""""/"""" name="name"/>
- <field eval="-2000" name="amount"/>
- <field name="post_id" ref="account_budget_post_purchase0"/>
- <field name="period_id" ref="account.period_11"/>
- </record>
- <record id="account_budget_post_dot_pur12" model="account.budget.post.dotation">
- <field eval=""""/"""" name="name"/>
- <field eval="-2000" name="amount"/>
- <field name="post_id" ref="account_budget_post_purchase0"/>
- <field name="period_id" ref="account.period_12"/>
- </record>
- </data>
-
<!-- Budgets -->
<data noupdate="1">
<record id="crossovered_budget_budgetoptimistic0" model="crossovered.budget">
- <field eval=""""+2011"""" name="code"/>
- <field eval=""""Budget 2011: Optimistic"""" name="name"/>
- <field eval=""""2011-01-01"""" name="date_from"/>
+ <field eval="'+'+str(time.localtime(time.time())[0]+1)" name="code"/>
+ <field eval="'Budget '+str(time.localtime(time.time())[0]+1)+': Optimistic'" name="name"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
<field eval=""""draft"""" name="state"/>
- <field eval=""""2011-12-31"""" name="date_to"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
<field name="creating_user_id" ref="base.user_root"/>
</record>
</data>
<data noupdate="1">
<record id="crossovered_budget_budgetpessimistic0" model="crossovered.budget">
- <field eval=""""-2011"""" name="code"/>
- <field eval=""""Budget 2011: Pessimistic"""" name="name"/>
- <field eval=""""2011-01-01"""" name="date_from"/>
+ <field eval="'-'+str(time.localtime(time.time())[0]+1)" name="code"/>
+ <field eval="'Budget '+str(time.localtime(time.time())[0]+1)+': Pessimistic'" name="name"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
<field eval=""""draft"""" name="state"/>
- <field eval=""""2011-12-31"""" name="date_to"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
<field name="creating_user_id" ref="base.user_root"/>
</record>
</data>
@@ -193,146 +44,146 @@
<record id="crossovered_budget_lines_0" model="crossovered.budget.lines">
<field name="analytic_account_id" ref="account.analytic_consultancy"/>
<field name="general_budget_id" ref="account_budget_post_purchase0"/>
- <field eval=""""2011-01-01"""" name="date_from"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
<field eval="-500.0" name="planned_amount"/>
<field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
- <field eval=""""2011-12-31"""" name="date_to"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
</record>
<record id="crossovered_budget_lines_1" model="crossovered.budget.lines">
<field name="analytic_account_id" ref="account.analytic_consultancy"/>
<field name="general_budget_id" ref="account_budget_post_purchase0"/>
- <field eval=""""2011-01-01"""" name="date_from"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
<field eval="-250.0" name="planned_amount"/>
<field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
- <field eval=""""2011-12-31"""" name="date_to"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
</record>
<record id="crossovered_budget_lines_2" model="crossovered.budget.lines">
<field name="analytic_account_id" ref="account.analytic_consultancy"/>
<field name="general_budget_id" ref="account_budget_post_sales0"/>
- <field eval=""""2011-01-01"""" name="date_from"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
<field eval="500.0" name="planned_amount"/>
<field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
- <field eval=""""2011-12-31"""" name="date_to"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
</record>
<record id="crossovered_budget_lines_3" model="crossovered.budget.lines">
<field name="analytic_account_id" ref="account.analytic_consultancy"/>
<field name="general_budget_id" ref="account_budget_post_sales0"/>
- <field eval=""""2011-01-07"""" name="date_from"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-01-07'" name="date_from"/>
<field eval="900.0" name="planned_amount"/>
<field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
- <field eval=""""2011-12-31"""" name="date_to"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
</record>
<record id="crossovered_budget_lines_4" model="crossovered.budget.lines">
<field name="analytic_account_id" ref="account.analytic_consultancy"/>
<field name="general_budget_id" ref="account_budget_post_sales0"/>
- <field eval=""""2011-01-01"""" name="date_from"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
<field eval="300.0" name="planned_amount"/>
<field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
- <field eval=""""2011-12-06"""" name="date_to"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-12-06'" name="date_to"/>
</record>
</data>
<data noupdate="1">
<record id="crossovered_budget_lines_5" model="crossovered.budget.lines">
<field name="analytic_account_id" ref="account.analytic_super_product_trainings"/>
<field name="general_budget_id" ref="account_budget_post_sales0"/>
- <field eval=""""2011-09-01"""" name="date_from"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-09-01'" name="date_from"/>
<field eval="375.0" name="planned_amount"/>
<field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
- <field eval=""""2011-12-03"""" name="paid_date"/>
- <field eval=""""2208-12-31"""" name="date_to"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-12-03'" name="paid_date"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
</record>
<record id="crossovered_budget_lines_6" model="crossovered.budget.lines">
<field name="analytic_account_id" ref="account.analytic_super_product_trainings"/>
<field name="general_budget_id" ref="account_budget_post_purchase0"/>
- <field eval=""""2011-09-01"""" name="date_from"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-09-01'" name="date_from"/>
<field eval="-150.0" name="planned_amount"/>
<field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
- <field eval=""""2011-12-31"""" name="date_to"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
</record>
<record id="crossovered_budget_lines_7" model="crossovered.budget.lines">
<field name="analytic_account_id" ref="account.analytic_super_product_trainings"/>
<field name="general_budget_id" ref="account_budget_post_sales0"/>
- <field eval=""""2011-09-01"""" name="date_from"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-09-01'" name="date_from"/>
<field eval="375.0" name="planned_amount"/>
<field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
- <field eval=""""2011-12-03"""" name="paid_date"/>
- <field eval=""""2011-12-31"""" name="date_to"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-12-03'" name="paid_date"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
</record>
</data>
<data noupdate="1">
<record id="crossovered_budget_lines_8" model="crossovered.budget.lines">
<field name="analytic_account_id" ref="account.analytic_seagate_p1"/>
<field name="general_budget_id" ref="account_budget_post_purchase0"/>
- <field eval=""""2009-01-01"""" name="date_from"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
<field eval="-7500.0" name="planned_amount"/>
<field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
- <field eval=""""2009-12-31"""" name="date_to"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
</record>
<record id="crossovered_budget_lines_9" model="crossovered.budget.lines">
<field name="analytic_account_id" ref="account.analytic_seagate_p1"/>
<field name="general_budget_id" ref="account_budget_post_purchase0"/>
- <field eval=""""2011-01-01"""" name="date_from"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
<field eval="-5000.0" name="planned_amount"/>
<field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
- <field eval=""""2011-12-31"""" name="date_to"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
</record>
<record id="crossovered_budget_lines_10" model="crossovered.budget.lines">
<field name="analytic_account_id" ref="account.analytic_seagate_p1"/>
<field name="general_budget_id" ref="account_budget_post_purchase0"/>
- <field eval=""""2011-01-01"""" name="date_from"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
<field eval="-2000.0" name="planned_amount"/>
<field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
- <field eval=""""2009-12-31"""" name="date_to"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
</record>
<record id="crossovered_budget_lines_11" model="crossovered.budget.lines">
<field name="analytic_account_id" ref="account.analytic_seagate_p1"/>
<field name="general_budget_id" ref="account_budget_post_sales0"/>
- <field eval=""""2011-01-01"""" name="date_from"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
<field eval="20000.0" name="planned_amount"/>
<field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
- <field eval=""""2010-12-31"""" name="date_to"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
</record>
<record id="crossovered_budget_lines_12" model="crossovered.budget.lines">
<field name="analytic_account_id" ref="account.analytic_seagate_p1"/>
<field name="general_budget_id" ref="account_budget_post_sales0"/>
- <field eval=""""2011-01-01"""" name="date_from"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
<field eval="20000.0" name="planned_amount"/>
<field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
- <field eval=""""2009-12-31"""" name="date_to"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
</record>
</data>
<data noupdate="1">
<record id="crossovered_budget_lines_13" model="crossovered.budget.lines">
<field name="analytic_account_id" ref="account.analytic_seagate_p2"/>
<field name="general_budget_id" ref="account_budget_post_purchase0"/>
- <field eval=""""2011-01-01"""" name="date_from"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
<field eval="-3000.0" name="planned_amount"/>
<field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
- <field eval=""""2011-12-31"""" name="date_to"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
</record>
<record id="crossovered_budget_lines_14" model="crossovered.budget.lines">
<field name="analytic_account_id" ref="account.analytic_seagate_p2"/>
<field name="general_budget_id" ref="account_budget_post_purchase0"/>
- <field eval=""""2011-01-01"""" name="date_from"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
<field eval="-1000.0" name="planned_amount"/>
<field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
- <field eval=""""2011-12-31"""" name="date_to"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
</record>
<record id="crossovered_budget_lines_15" model="crossovered.budget.lines">
<field name="analytic_account_id" ref="account.analytic_seagate_p2"/>
<field name="general_budget_id" ref="account_budget_post_sales0"/>
- <field eval=""""2011-01-01"""" name="date_from"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
<field eval="10000.0" name="planned_amount"/>
<field name="crossovered_budget_id" ref="crossovered_budget_budgetpessimistic0"/>
- <field eval=""""2011-12-31"""" name="date_to"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
</record>
<record id="crossovered_budget_lines_16" model="crossovered.budget.lines">
<field name="analytic_account_id" ref="account.analytic_seagate_p2"/>
<field name="general_budget_id" ref="account_budget_post_sales0"/>
- <field eval=""""2011-01-01"""" name="date_from"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-01-01'" name="date_from"/>
<field eval="10000.0" name="planned_amount"/>
<field name="crossovered_budget_id" ref="crossovered_budget_budgetoptimistic0"/>
- <field eval=""""2011-12-31"""" name="date_to"/>
+ <field eval="str(time.localtime(time.time())[0]+1)+'-12-31'" name="date_to"/>
</record>
</data>
</openerp>
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index a1aeb93252c0de8827f4354ffbd16e48acbe92d6..d98a487b13c9a6a83cc8340d044e10f922f092e8 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -12,6 +12,18 @@
<!--
Budgets
-->
+ <record id="view_budget_post_search" model="ir.ui.view">
+ <field name="name">account.budget.post.search</field>
+ <field name="model">account.budget.post</field>
+ <field name="type">search</field>
+ <field name="arch" type="xml">
+ <search string="Budgetary Position">
+ <field name="code"/>
+ <field name="name"/>
+ <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+ </search>
+ </field>
+ </record>
<record id="view_budget_post_tree" model="ir.ui.view">
<field name="name">account.budget.post.tree</field>
@@ -25,36 +37,13 @@
</tree>
</field>
</record>
- <record id="view_budget_post_dotation_form" model="ir.ui.view">
- <field name="name">account.budget.post.dotation.form</field>
- <field name="model">account.budget.post.dotation</field>
- <field name="type">form</field>
- <field name="arch" type="xml">
- <form string="Budget Dotation">
- <field name="period_id"/>
- <field name="amount"/>
- <field name="tot_planned" />
- </form>
- </field>
- </record>
- <record id="view_budget_post_dotation_tree" model="ir.ui.view">
- <field name="name">account.budget.post.dotation.tree</field>
- <field name="model">account.budget.post.dotation</field>
- <field name="type">tree</field>
- <field name="arch" type="xml">
- <tree string="Budget Dotations">
- <field name="period_id"/>
- <field name="amount"/>
- <field name="tot_planned" />
- </tree>
- </field>
- </record>
<record id="open_budget_post_form" model="ir.actions.act_window">
<field name="name">Budgetary Positions</field>
<field name="res_model">account.budget.post</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_budget_post_tree"/>
+ <field name="search_view_id" ref="view_budget_post_search"/>
</record>
<menuitem id="next_id_31" name="Budgets" parent="account.menu_finance" sequence="5"/>
<menuitem id="next_id_pos" name="Budgets" parent="account.menu_finance_configuration" sequence="20"/>
diff --git a/addons/account_budget/i18n/account_budget.pot b/addons/account_budget/i18n/account_budget.pot
index e7da108f2098a0997350697dad6ec09e140024a8..e710967ae405ad347af0050ffadd17bfcf7007e6 100644
--- a/addons/account_budget/i18n/account_budget.pot
+++ b/addons/account_budget/i18n/account_budget.pot
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01:51+0000\n"
-"PO-Revision-Date: 2009-08-28 16:01:51+0000\n"
+"PO-Revision-Date: 2009-10-12 13:20:51+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -62,11 +62,6 @@ msgstr ""
msgid "Confirmed"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr ""
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -261,7 +256,6 @@ msgstr ""
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr ""
@@ -293,17 +287,6 @@ msgstr ""
msgid "Budget"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr ""
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr ""
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -321,17 +304,6 @@ msgstr ""
msgid "Cancelled"
msgstr ""
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr ""
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -366,11 +338,6 @@ msgstr ""
msgid "Code"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr ""
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/ar.po b/addons/account_budget/i18n/ar.po
index 81afee41f66a9d115ed1f2ebad3214f457e09947..fb11bc9021f7e3dc09a62f76669411e1184a4368 100644
--- a/addons/account_budget/i18n/ar.po
+++ b/addons/account_budget/i18n/ar.po
@@ -7,7 +7,7 @@ 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: 2009-02-03 06:24+0000\n"
+"PO-Revision-Date: 2010-10-12 13:24+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -64,11 +64,6 @@ msgstr ""
msgid "Confirmed"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr ""
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -270,7 +265,6 @@ msgstr ""
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr ""
@@ -302,17 +296,6 @@ msgstr ""
msgid "Budget"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr ""
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr ""
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -330,17 +313,6 @@ msgstr ""
msgid "Cancelled"
msgstr ""
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr ""
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -375,11 +347,6 @@ msgstr ""
msgid "Code"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr ""
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/bg.po b/addons/account_budget/i18n/bg.po
index 43d9f2367f3ece3852d83805f155e43393e7994f..c01f8dfec8ab9dfec9fa6f016d7b67db18f0cbbc 100644
--- a/addons/account_budget/i18n/bg.po
+++ b/addons/account_budget/i18n/bg.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 21:01+0000\n"
+"PO-Revision-Date: 2010-10-12 13:20+0000\n"
"Last-Translator: lem0na <nickyk@gmx.net>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -66,11 +66,6 @@ msgstr ""
msgid "Confirmed"
msgstr "Потвърдено"
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Период"
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -297,7 +292,6 @@ msgstr "Теоритично количеÑтво"
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr "Име"
@@ -329,17 +323,6 @@ msgstr "Редове"
msgid "Budget"
msgstr "Бюджет"
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Обект"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Сума"
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -357,17 +340,6 @@ msgstr "Бюджети"
msgid "Cancelled"
msgstr "Отказан"
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "Парично дарение"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "Парични дарениÑ"
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -402,11 +374,6 @@ msgstr "Печат на бюджети"
msgid "Code"
msgstr "Код"
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Общо планирана Ñума"
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/bs.po b/addons/account_budget/i18n/bs.po
index 4e0fa8cc685fde84263ff081c68ace691efe5ba0..f0dfde2b82290a9c0a99e432a890ea3973e6dc35 100644
--- a/addons/account_budget/i18n/bs.po
+++ b/addons/account_budget/i18n/bs.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 21:01+0000\n"
+"PO-Revision-Date: 2010-10-12 15:01+0000\n"
"Last-Translator: adnan <adnankraljic@yahoo.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -65,11 +65,6 @@ msgstr ""
msgid "Confirmed"
msgstr "Potvrđeno"
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Period"
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -271,7 +266,6 @@ msgstr "Teoretski iznos"
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr "Naziv"
@@ -303,17 +297,6 @@ msgstr "Retci"
msgid "Budget"
msgstr "ProraÄun"
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Stavka"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Iznos"
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -331,17 +314,6 @@ msgstr "ProraÄuni"
msgid "Cancelled"
msgstr "Poništeno"
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "ProraÄunska nadarbina"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "ProraÄunske nadarbine"
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -376,11 +348,6 @@ msgstr "Ispis proraÄuna"
msgid "Code"
msgstr "Å ifra"
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Ukupni planirani iznos"
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/ca.po b/addons/account_budget/i18n/ca.po
index e978bd4da7d2c47ed1d62ab90d83ac64247ebdbf..88d9587eb4d4064e95214d278bbddfd0f5af6f00 100644
--- a/addons/account_budget/i18n/ca.po
+++ b/addons/account_budget/i18n/ca.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 11:08+0000\n"
+"PO-Revision-Date: 2010-10-12 15:08+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -66,11 +66,6 @@ msgstr ""
msgid "Confirmed"
msgstr "Confirmat"
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "PerÃode"
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -302,7 +297,6 @@ msgstr "Import teòric"
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr "Nom"
@@ -334,17 +328,6 @@ msgstr "LÃnies"
msgid "Budget"
msgstr "Pressupost"
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Element"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Import"
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -362,17 +345,6 @@ msgstr "Pressupostos"
msgid "Cancelled"
msgstr "Cancel·lat"
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "Dotació al pressupost"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "Dotacions al pressupost"
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -407,11 +379,6 @@ msgstr "Imprimeix pressupostos"
msgid "Code"
msgstr "Codi"
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Import total previst"
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/cs.po b/addons/account_budget/i18n/cs.po
index 76e41f4cc12ddc3f52aa52585407d7e106856649..1d2c9264638ac5d113dfedc5ee450467695c1ab9 100644
--- a/addons/account_budget/i18n/cs.po
+++ b/addons/account_budget/i18n/cs.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-18 06:21+0000\n"
+"PO-Revision-Date: 2010-10-12 15:21+0000\n"
"Last-Translator: Kuvaly [LCT] <kuvaly@seznam.cz>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -64,11 +64,6 @@ msgstr ""
msgid "Confirmed"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Perioda"
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -270,7 +265,6 @@ msgstr ""
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr "Jméno"
@@ -302,17 +296,6 @@ msgstr ""
msgid "Budget"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr ""
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr ""
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -330,17 +313,6 @@ msgstr ""
msgid "Cancelled"
msgstr ""
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr ""
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -375,11 +347,6 @@ msgstr ""
msgid "Code"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr ""
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/de.po b/addons/account_budget/i18n/de.po
index 5e78acf0545ee10564aaf43ee3c537053efedc6d..78bd498e78f0cc717b5145a67d90e6c5d2d47dbd 100644
--- a/addons/account_budget/i18n/de.po
+++ b/addons/account_budget/i18n/de.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 21:01+0000\n"
+"PO-Revision-Date: 2010-10-12 15:01+0000\n"
"Last-Translator: Ferdinand-chricar <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -66,11 +66,6 @@ msgstr ""
msgid "Confirmed"
msgstr "Bestätigt"
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Periode"
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -289,7 +284,6 @@ msgstr "Planwert"
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr "Name"
@@ -321,17 +315,6 @@ msgstr "Positionen"
msgid "Budget"
msgstr "Budget"
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Pos."
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Betrag"
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -349,17 +332,6 @@ msgstr "Budgets"
msgid "Cancelled"
msgstr "Abgebrochen"
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "Budgetrahmen"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "Budgetrahmen"
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -394,11 +366,6 @@ msgstr "Druck Budgets..."
msgid "Code"
msgstr "Kurzbez."
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Gesamtsumme Planung"
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/el.po b/addons/account_budget/i18n/el.po
index fd8f896fa386388bc5e366f5fbbe2f74c554f4de..3f2d8ef0f2b774b7ba8ece977654659c345c46ee 100644
--- a/addons/account_budget/i18n/el.po
+++ b/addons/account_budget/i18n/el.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 21:02+0000\n"
+"PO-Revision-Date: 2010-10-12 15:02+0000\n"
"Last-Translator: mga (Open ERP) <Unknown>\n"
"Language-Team: Greek <el@li.org>\n"
"MIME-Version: 1.0\n"
@@ -67,11 +67,6 @@ msgstr ""
msgid "Confirmed"
msgstr "ΕπιβεβαιωμÎνο"
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "ΠεÏίοδος"
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -298,7 +293,6 @@ msgstr "ΘεωÏητικό Ποσό"
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr "Όνομα"
@@ -330,17 +324,6 @@ msgstr "ΓÏαμμÎÏ‚"
msgid "Budget"
msgstr "Î Ïοϋπολογισμός"
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Είδος"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Ποσό"
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -358,17 +341,6 @@ msgstr "Î Ïοϋπολογισμοί"
msgid "Cancelled"
msgstr "ΑκυÏωμÎνο"
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "Budget Dotation"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "Budget Dotations"
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -403,11 +375,6 @@ msgstr "ΕκτÏπωση Î Ïοϋπολογισμών"
msgid "Code"
msgstr "Κωδικας"
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Συνολικά ΜελετηθÎν Ποσό"
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/es.po b/addons/account_budget/i18n/es.po
index 45eada63f1b95e4eac5b49ef1b3e9c332f9905ff..40c6b2738519f6e9318fb6319197fe3dc89c9941 100644
--- a/addons/account_budget/i18n/es.po
+++ b/addons/account_budget/i18n/es.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 21:02+0000\n"
+"PO-Revision-Date: 2010-10-12 15:02+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"<jesteve@zikzakmedia.com>\n"
"Language-Team: \n"
@@ -67,11 +67,6 @@ msgstr ""
msgid "Confirmed"
msgstr "Confirmado"
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "PerÃodo"
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -303,7 +298,6 @@ msgstr "Importe teórico"
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr "Nombre"
@@ -335,17 +329,6 @@ msgstr "LÃneas"
msgid "Budget"
msgstr "Presupuesto"
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Item"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Importe"
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -363,17 +346,6 @@ msgstr "Presupuestos"
msgid "Cancelled"
msgstr "Cancelado"
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "Dotación presupuestaria"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "Dotaciones presupuestarias"
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -408,11 +380,6 @@ msgstr "Imprimir presupuestos"
msgid "Code"
msgstr "Código"
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Importe total previsto"
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/es_AR.po b/addons/account_budget/i18n/es_AR.po
index b0824416e41655b95fb17a2017a45d4aca65ab83..cedb35d2365b106020cb7b26fb4e2f52dddc5620 100644
--- a/addons/account_budget/i18n/es_AR.po
+++ b/addons/account_budget/i18n/es_AR.po
@@ -7,7 +7,7 @@ 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-09-14 16:22+0000\n"
+"PO-Revision-Date: 2010-10-12 15:22+0000\n"
"Last-Translator: Silvana Herrera <sherrera@thymbra.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -66,11 +66,6 @@ msgstr ""
msgid "Confirmed"
msgstr "Confirmada"
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "PerÃodo"
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -302,7 +297,6 @@ msgstr "Importe teórico"
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr "Nombre"
@@ -334,17 +328,6 @@ msgstr "LÃneas"
msgid "Budget"
msgstr "Presupuesto"
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Item"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Importe"
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -362,17 +345,6 @@ msgstr "Presupuestos"
msgid "Cancelled"
msgstr "Cancelado"
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "Dotación del presupuesto"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "Dotaciones del presupuesto"
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -407,11 +379,6 @@ msgstr "Imprimir presupuestos"
msgid "Code"
msgstr "Código"
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Importe total previsto"
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/es_EC.po b/addons/account_budget/i18n/es_EC.po
index 54d05867b879d5f43652e8417a037c0488b7c7de..c9d781c68a005462d6e9bd2c9d0c6cefda28d28f 100644
--- a/addons/account_budget/i18n/es_EC.po
+++ b/addons/account_budget/i18n/es_EC.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-17 17:37+0000\n"
+"PO-Revision-Date: 2010-10-12 15:37+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"<jesteve@zikzakmedia.com>\n"
"Language-Team: \n"
@@ -67,11 +67,6 @@ msgstr ""
msgid "Confirmed"
msgstr "Confirmado"
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "PerÃodo"
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -303,7 +298,6 @@ msgstr "Importe teórico"
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr "Nombre"
@@ -335,17 +329,6 @@ msgstr "LÃneas"
msgid "Budget"
msgstr "Presupuesto"
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Item"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Importe"
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -363,17 +346,6 @@ msgstr "Presupuestos"
msgid "Cancelled"
msgstr "Cancelado"
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "Dotación presupuestaria"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "Dotaciones presupuestarias"
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -408,11 +380,6 @@ msgstr "Imprimir presupuestos"
msgid "Code"
msgstr "Código"
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Importe total previsto"
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/et.po b/addons/account_budget/i18n/et.po
index 06c29e55956e3101378ea4733f409da2f1471a17..7edf1d0dc162d6b94a902f8b7209b3af04bc94a0 100644
--- a/addons/account_budget/i18n/et.po
+++ b/addons/account_budget/i18n/et.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 21:03+0000\n"
+"PO-Revision-Date: 2010-10-12 15:03+0000\n"
"Last-Translator: lyyser <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -65,11 +65,6 @@ msgstr ""
msgid "Confirmed"
msgstr "Kinnitatud"
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Periood"
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -271,7 +266,6 @@ msgstr "Teoreetiline summa"
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr "Nimi"
@@ -303,17 +297,6 @@ msgstr "Read"
msgid "Budget"
msgstr "Eelarve"
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Ese"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Kogus"
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -331,17 +314,6 @@ msgstr "Eelarved"
msgid "Cancelled"
msgstr "Tühistatud"
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "Eelarve dotatsioon"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "Eelarve dotatsioonid"
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -376,11 +348,6 @@ msgstr "Prindi eelarved"
msgid "Code"
msgstr "Kood"
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Kogu planeeritud summa"
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/fi.po b/addons/account_budget/i18n/fi.po
index 00858c1f4d612e432afc4ba2b160463f12532c02..d51159ee9e8b719fae3d85d86b780e8fd13c948d 100644
--- a/addons/account_budget/i18n/fi.po
+++ b/addons/account_budget/i18n/fi.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 15:28+0000\n"
+"PO-Revision-Date: 2010-10-12 15:28+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: Finnish <fi@li.org>\n"
"MIME-Version: 1.0\n"
@@ -71,11 +71,6 @@ msgstr ""
msgid "Confirmed"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Jakso"
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -277,7 +272,6 @@ msgstr ""
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr "Nimi"
@@ -309,17 +303,6 @@ msgstr ""
msgid "Budget"
msgstr "Budjetti"
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr ""
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr ""
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -337,17 +320,6 @@ msgstr "Budjetit"
msgid "Cancelled"
msgstr "Peruutettu"
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr ""
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -382,11 +354,6 @@ msgstr "Tulosta budjetit"
msgid "Code"
msgstr "Koodi"
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr ""
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/fr.po b/addons/account_budget/i18n/fr.po
index 23a9145796d3a8a0d4b30f2a0027aaadb709eced..bbcbc951d731f34937f67645992425545e6fe3e9 100644
--- a/addons/account_budget/i18n/fr.po
+++ b/addons/account_budget/i18n/fr.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 09:34+0000\n"
+"PO-Revision-Date: 2010-10-12 15:34+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -66,11 +66,6 @@ msgstr ""
msgid "Confirmed"
msgstr "Confirmé"
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Période"
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -272,7 +267,6 @@ msgstr "Montant Théorique"
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr "Nom"
@@ -304,17 +298,6 @@ msgstr "Lignes"
msgid "Budget"
msgstr "Budget"
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Élément"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Montant"
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -332,17 +315,6 @@ msgstr "Budgets"
msgid "Cancelled"
msgstr "Annulé"
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "Dotation du Budget"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "Dotations du Budget"
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -377,11 +349,6 @@ msgstr "Imprimer les Budgets"
msgid "Code"
msgstr "Code"
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Montant Total Planifié"
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/gl.po b/addons/account_budget/i18n/gl.po
index c5cde9ac29ae552aaf2311f23f03515e51f2e725..ab09deaa83a91bf498c35b018eda5e7b69bcf930 100644
--- a/addons/account_budget/i18n/gl.po
+++ b/addons/account_budget/i18n/gl.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: account-budget-es\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 12:36+0000\n"
+"PO-Revision-Date: 2010-10-12 15:36+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: Galego <g11n@mancomun.org>\n"
"MIME-Version: 1.0\n"
@@ -68,11 +68,6 @@ msgstr ""
msgid "Confirmed"
msgstr "Confirmada"
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "PerÃodo"
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -302,7 +297,6 @@ msgstr "Importe teórico"
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr "Nome"
@@ -334,17 +328,6 @@ msgstr "Liñas"
msgid "Budget"
msgstr "Presuposto"
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Elemento"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Importe"
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -362,17 +345,6 @@ msgstr "Presupostos"
msgid "Cancelled"
msgstr "Cancelado"
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "Dotación ao presuposto"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "Dotacións ao presuposto"
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -407,11 +379,6 @@ msgstr "Imprimir presupostos"
msgid "Code"
msgstr "Código"
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Importe total previsto"
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/hi.po b/addons/account_budget/i18n/hi.po
index 60360d052cdeb6cfb9f823b7ce3bf8f1e1ef8e95..42829cbe9f8df1b990fdf8b0ecb5614d44c4befc 100644
--- a/addons/account_budget/i18n/hi.po
+++ b/addons/account_budget/i18n/hi.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 13:30+0000\n"
+"PO-Revision-Date: 2010-10-12 15:30+0000\n"
"Last-Translator: vir (Open ERP) <vir@tinyerp.com>\n"
"Language-Team: Hindi <hi@li.org>\n"
"MIME-Version: 1.0\n"
@@ -65,11 +65,6 @@ msgstr ""
msgid "Confirmed"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "अवधि"
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -271,7 +266,6 @@ msgstr "Theoritical राशि"
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr ""
@@ -303,17 +297,6 @@ msgstr ""
msgid "Budget"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr ""
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr ""
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -331,17 +314,6 @@ msgstr ""
msgid "Cancelled"
msgstr ""
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr ""
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -376,11 +348,6 @@ msgstr "पà¥à¤°à¤¿à¤‚ट बजट"
msgid "Code"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr ""
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/hr.po b/addons/account_budget/i18n/hr.po
index 500b3297394af775fb0b8d3fb2082161b6b6aefa..1bf5ab636ce61df68f1f6b5cd129662c8ca74b9b 100644
--- a/addons/account_budget/i18n/hr.po
+++ b/addons/account_budget/i18n/hr.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 21:04+0000\n"
+"PO-Revision-Date: 2010-10-12 15:04+0000\n"
"Last-Translator: Goran Kliska (Aplikacija d.o.o.) <gkliska@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -65,11 +65,6 @@ msgstr ""
msgid "Confirmed"
msgstr "Potvrđeno"
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Razdoblje"
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -271,7 +266,6 @@ msgstr "Teoretski iznos"
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr "Naziv"
@@ -303,17 +297,6 @@ msgstr "Retci"
msgid "Budget"
msgstr "Budžet"
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Stavka"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Iznos"
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -331,17 +314,6 @@ msgstr "Budžeti"
msgid "Cancelled"
msgstr "Otkazano"
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr ""
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -376,11 +348,6 @@ msgstr ""
msgid "Code"
msgstr "Å ifra"
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Ukupni planirani iznos"
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/hu.po b/addons/account_budget/i18n/hu.po
index f8145ec51e8650b825a6e74cbd562d2d29450d62..23aa571955250bcaa9de74def80b53f983b14008 100644
--- a/addons/account_budget/i18n/hu.po
+++ b/addons/account_budget/i18n/hu.po
@@ -7,7 +7,7 @@ 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: 2009-02-03 06:37+0000\n"
+"PO-Revision-Date: 2010-10-12 15:37+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -64,11 +64,6 @@ msgstr ""
msgid "Confirmed"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr ""
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -270,7 +265,6 @@ msgstr ""
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr "Név"
@@ -302,17 +296,6 @@ msgstr ""
msgid "Budget"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr ""
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr ""
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -330,17 +313,6 @@ msgstr ""
msgid "Cancelled"
msgstr ""
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr ""
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -375,11 +347,6 @@ msgstr ""
msgid "Code"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr ""
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/id.po b/addons/account_budget/i18n/id.po
index c5a77c794a5d45080b916fdeaca00ca244c27ad6..65ef0c4eaa1a39e3aaeecdd312e43674f38f4deb 100644
--- a/addons/account_budget/i18n/id.po
+++ b/addons/account_budget/i18n/id.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 21:05+0000\n"
+"PO-Revision-Date: 2010-10-12 15:05+0000\n"
"Last-Translator: mga (Open ERP) <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -64,11 +64,6 @@ msgstr ""
msgid "Confirmed"
msgstr "Dikonfirmasi"
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Periode"
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -270,7 +265,6 @@ msgstr ""
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr "Nama"
@@ -302,17 +296,6 @@ msgstr ""
msgid "Budget"
msgstr "Anggaran"
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Item"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr ""
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -330,17 +313,6 @@ msgstr "Anggaran"
msgid "Cancelled"
msgstr "Dibatalkan"
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr ""
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -375,11 +347,6 @@ msgstr ""
msgid "Code"
msgstr "Kode"
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr ""
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/it.po b/addons/account_budget/i18n/it.po
index 07938f063576de233f7c25cda2ed3d1db6e41ba7..9b0e416482bff7894687d77eb665af3a9e377084 100644
--- a/addons/account_budget/i18n/it.po
+++ b/addons/account_budget/i18n/it.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 10:12+0000\n"
+"PO-Revision-Date: 2010-10-12 15:12+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -66,11 +66,6 @@ msgstr ""
msgid "Confirmed"
msgstr "Confermato"
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Periodo"
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -272,7 +267,6 @@ msgstr "Importo teorico"
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr "Nome"
@@ -304,17 +298,6 @@ msgstr "Linee"
msgid "Budget"
msgstr "Budget"
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Elemento"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Importo"
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -332,17 +315,6 @@ msgstr "Budget"
msgid "Cancelled"
msgstr "Annullato"
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "Dotazione di bilancio"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "Dotazione di bilancio"
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -377,11 +349,6 @@ msgstr "Stampa Badget"
msgid "Code"
msgstr "Codice"
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Totale Importo pianificato"
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/ko.po b/addons/account_budget/i18n/ko.po
index 2479f7414c8c925f3486d3ad24f3d8ca0a2542ff..c9419c9c41f2e3f497d91f656ea8dbd5fd898f57 100644
--- a/addons/account_budget/i18n/ko.po
+++ b/addons/account_budget/i18n/ko.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 12:44+0000\n"
+"PO-Revision-Date: 2010-10-12 15:44+0000\n"
"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
"Language-Team: Korean <ko@li.org>\n"
"MIME-Version: 1.0\n"
@@ -65,11 +65,6 @@ msgstr "오브ì 트 ì´ë¦„ì€ x_ë¡œ 시작해야 하며, 특수 문ìžë¥¼ í¬
msgid "Confirmed"
msgstr "í™•ì •ë¨"
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "기간"
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -288,7 +283,6 @@ msgstr "ì´ë¡ ì 금액"
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr "ì´ë¦„"
@@ -320,17 +314,6 @@ msgstr "ë¼ì¸"
msgid "Budget"
msgstr "예산"
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "ì•„ì´í…œ"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "금액"
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -348,17 +331,6 @@ msgstr "예산"
msgid "Cancelled"
msgstr "취소ë¨"
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "예산 êµë¶€ê¸ˆ"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "예산 êµë¶€ê¸ˆ"
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -393,11 +365,6 @@ msgstr "예산 ì¸ì‡„"
msgid "Code"
msgstr "코드"
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "계íšëœ ì „ì²´ 금액"
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/lt.po b/addons/account_budget/i18n/lt.po
index f212f095b20eafd4fe83c0dd3fddd2deb8ae88b2..b86ace61fd117254f398efe2f5cdacfd2c524853 100644
--- a/addons/account_budget/i18n/lt.po
+++ b/addons/account_budget/i18n/lt.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-09 07:05+0000\n"
+"PO-Revision-Date: 2010-10-12 15:05+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -64,11 +64,6 @@ msgstr ""
msgid "Confirmed"
msgstr "Patvirtinta"
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Periodas"
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -270,7 +265,6 @@ msgstr ""
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr "Pavadinimas"
@@ -302,17 +296,6 @@ msgstr "EilutÄ—s"
msgid "Budget"
msgstr "Biudžetas"
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr ""
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Suma"
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -330,17 +313,6 @@ msgstr "Biudžetai"
msgid "Cancelled"
msgstr "Nutrauktas"
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr ""
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -375,11 +347,6 @@ msgstr "Spausdinti biudžetus"
msgid "Code"
msgstr "Kodas"
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr ""
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/nl.po b/addons/account_budget/i18n/nl.po
index ea9f1dd1af22db8a3eed6dab6b9346489216ed6d..8b53629ae46e85b9e0cce3950d939e9d3293455b 100644
--- a/addons/account_budget/i18n/nl.po
+++ b/addons/account_budget/i18n/nl.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 21:06+0000\n"
+"PO-Revision-Date: 2010-10-12 14:06+0000\n"
"Last-Translator: mga (Open ERP) <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -65,11 +65,6 @@ msgstr ""
msgid "Confirmed"
msgstr "Bevestigd"
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Periode"
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -291,7 +286,6 @@ msgstr "Theoretisch bedrag"
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr "Naam"
@@ -323,17 +317,6 @@ msgstr "Regels"
msgid "Budget"
msgstr "Budget"
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Item"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Bedrag"
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -351,17 +334,6 @@ msgstr "Budgetten"
msgid "Cancelled"
msgstr "Geannuleerd"
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "Budgettoewijzing"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "Budgettoewijzingen"
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -396,11 +368,6 @@ msgstr "Budgetten afdrukken"
msgid "Code"
msgstr "Code"
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Totaal begroot bedrag"
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/nl_BE.po b/addons/account_budget/i18n/nl_BE.po
index 9af44ee63c2ed45977eff2489ef4b07a4afadd7e..be101bbcf28fce180bfa2e2adb88d258a2901e17 100644
--- a/addons/account_budget/i18n/nl_BE.po
+++ b/addons/account_budget/i18n/nl_BE.po
@@ -7,7 +7,7 @@ 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-04-24 15:00+0000\n"
+"PO-Revision-Date: 2010-10-12 14:00+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -65,11 +65,6 @@ msgstr ""
msgid "Confirmed"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr ""
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -271,7 +266,6 @@ msgstr ""
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr ""
@@ -303,17 +297,6 @@ msgstr ""
msgid "Budget"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr ""
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr ""
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -331,17 +314,6 @@ msgstr ""
msgid "Cancelled"
msgstr ""
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr ""
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -376,11 +348,6 @@ msgstr ""
msgid "Code"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr ""
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/oc.po b/addons/account_budget/i18n/oc.po
index b87c5855c2d6bfd10ef900a44649ceb3cf116367..3e2c90aa548bf8a1189985fc353ccc31dfbf7758 100644
--- a/addons/account_budget/i18n/oc.po
+++ b/addons/account_budget/i18n/oc.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 21:07+0000\n"
+"PO-Revision-Date: 2010-10-12 14:07+0000\n"
"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
"Language-Team: Occitan (post 1500) <oc@li.org>\n"
"MIME-Version: 1.0\n"
@@ -67,11 +67,6 @@ msgstr ""
msgid "Confirmed"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Periòde"
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -273,7 +268,6 @@ msgstr ""
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr "Nom"
@@ -305,17 +299,6 @@ msgstr "Linhas"
msgid "Budget"
msgstr "Budgèt"
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Element"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Soma"
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -333,17 +316,6 @@ msgstr ""
msgid "Cancelled"
msgstr "Anullat"
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr ""
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -378,11 +350,6 @@ msgstr ""
msgid "Code"
msgstr "Còde"
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr ""
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/pl.po b/addons/account_budget/i18n/pl.po
index eff25d46997376e9f66abbcde502cb73007c7c28..1882110e12fb9cc1c20ec2c2d550faac095ff79b 100644
--- a/addons/account_budget/i18n/pl.po
+++ b/addons/account_budget/i18n/pl.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 21:07+0000\n"
+"PO-Revision-Date: 2010-10-12 14:07+0000\n"
"Last-Translator: Jarosław Ogrodnik <nobodythere@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -66,11 +66,6 @@ msgstr ""
msgid "Confirmed"
msgstr "Potwierdzone"
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Okres"
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -294,7 +289,6 @@ msgstr "Kwota teoretyczna"
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr "Nazwa"
@@ -326,17 +320,6 @@ msgstr "Pozycje"
msgid "Budget"
msgstr "Budżet"
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Element"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Kwota"
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -354,17 +337,6 @@ msgstr "Budżety"
msgid "Cancelled"
msgstr "Anulowano"
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "Dotacja budżetu"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "Dotacje budżetu"
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -399,11 +371,6 @@ msgstr "Drukuj budżety"
msgid "Code"
msgstr "Kod"
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Suma planowanych kwot"
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/pt.po b/addons/account_budget/i18n/pt.po
index a39f048956e1e67394429f8fd3b78f2a45992a0e..731f6f5ce4390dcc5afaafa8c86a45407b0d74e5 100644
--- a/addons/account_budget/i18n/pt.po
+++ b/addons/account_budget/i18n/pt.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 21:07+0000\n"
+"PO-Revision-Date: 2010-10-12 14:07+0000\n"
"Last-Translator: mga (Open ERP) <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -65,11 +65,6 @@ msgstr ""
msgid "Confirmed"
msgstr "Confirmado"
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "PerÃodo"
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -271,7 +266,6 @@ msgstr "Montante teórico"
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr "Nome"
@@ -303,17 +297,6 @@ msgstr "Linhas"
msgid "Budget"
msgstr "Orçamento"
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Item"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Montante"
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -331,17 +314,6 @@ msgstr "Orçamentos"
msgid "Cancelled"
msgstr "Cancelado"
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr ""
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -376,11 +348,6 @@ msgstr "Imprimir orçamentos"
msgid "Code"
msgstr "Código"
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Montante total planeado."
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/pt_BR.po b/addons/account_budget/i18n/pt_BR.po
index 75b214ed34db0b571bb949be56da1a0a3e3ce1d2..37c94bca44a11f5093d0e2ad201c3e8fcb289d51 100644
--- a/addons/account_budget/i18n/pt_BR.po
+++ b/addons/account_budget/i18n/pt_BR.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 21:07+0000\n"
+"PO-Revision-Date: 2010-10-12 14:07+0000\n"
"Last-Translator: mga (Open ERP) <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -66,11 +66,6 @@ msgstr ""
msgid "Confirmed"
msgstr "Confirmado"
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "PerÃodo"
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -295,7 +290,6 @@ msgstr "Valor Estimado"
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr "Nome"
@@ -327,17 +321,6 @@ msgstr "Linhas"
msgid "Budget"
msgstr "Orçamento"
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Item"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Valor"
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -355,17 +338,6 @@ msgstr "Orçamentos"
msgid "Cancelled"
msgstr "Cancelado"
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "Dotação Orçamentária"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "Dotações Orçamentárias"
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -400,11 +372,6 @@ msgstr "Imprimir Orçamentos"
msgid "Code"
msgstr "Código"
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Valor Total Planejado"
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/ro.po b/addons/account_budget/i18n/ro.po
index 57c2b467fbc3de2da18047477f245c9fc7651365..a7b637749b8e84c7aad832f7af42ee70f4e96815 100644
--- a/addons/account_budget/i18n/ro.po
+++ b/addons/account_budget/i18n/ro.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 09:33+0000\n"
+"PO-Revision-Date: 2010-10-12 14:33+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -66,11 +66,6 @@ msgstr ""
msgid "Confirmed"
msgstr "Confirmat"
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Perioadă"
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -297,7 +292,6 @@ msgstr "Suma teoretică"
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr "Nume"
@@ -329,17 +323,6 @@ msgstr "Linii"
msgid "Budget"
msgstr "Buget"
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Element"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Sumă"
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -357,17 +340,6 @@ msgstr "Bugete"
msgid "Cancelled"
msgstr "Anulat"
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "Dotare bugetară"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "Dotări bugetare"
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -402,11 +374,6 @@ msgstr "Tipărire bugete"
msgid "Code"
msgstr "Cod"
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Suma totală planificată"
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/ru.po b/addons/account_budget/i18n/ru.po
index b165e1439d53dce6b9ccbb831c9d4e3bfc96d06f..ad662f969446331d8af9218e2d5edfe45fe925cb 100644
--- a/addons/account_budget/i18n/ru.po
+++ b/addons/account_budget/i18n/ru.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 21:08+0000\n"
+"PO-Revision-Date: 2010-10-12 14:08+0000\n"
"Last-Translator: mga (Open ERP) <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -66,11 +66,6 @@ msgstr ""
msgid "Confirmed"
msgstr "Подтверждено"
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Период"
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -272,7 +267,6 @@ msgstr ""
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr "ИмÑ"
@@ -304,17 +298,6 @@ msgstr "Строк"
msgid "Budget"
msgstr "Бюджет"
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Ðлемент"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Сумма"
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -332,17 +315,6 @@ msgstr "Бюджеты"
msgid "Cancelled"
msgstr "Отменено"
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "Ð‘ÑŽÐ´Ð¶ÐµÑ‚Ð½Ð°Ñ Ð´Ð¾Ñ‚Ð°Ñ†Ð¸Ñ"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "Бюджетные дотации"
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -377,11 +349,6 @@ msgstr "Печать бюджетов"
msgid "Code"
msgstr "Код"
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Запланировано вÑего"
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/sl.po b/addons/account_budget/i18n/sl.po
index fb8ab700dff740330efea8344e9bc74d8d7cf192..4884056f036b83d5964d9da5ecdbd4e7a32b9168 100644
--- a/addons/account_budget/i18n/sl.po
+++ b/addons/account_budget/i18n/sl.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 21:09+0000\n"
+"PO-Revision-Date: 2010-10-12 14:09+0000\n"
"Last-Translator: mga (Open ERP) <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -65,11 +65,6 @@ msgstr ""
msgid "Confirmed"
msgstr "Potrjeno"
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Obdobje"
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -271,7 +266,6 @@ msgstr "TeoretiÄni znesek"
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr "Naziv"
@@ -303,17 +297,6 @@ msgstr "Postavke"
msgid "Budget"
msgstr "ProraÄun"
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "Element"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Znesek"
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -331,17 +314,6 @@ msgstr "ProraÄuni"
msgid "Cancelled"
msgstr "Preklicano"
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr ""
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -376,11 +348,6 @@ msgstr "IzpiÅ¡i proraÄune"
msgid "Code"
msgstr "Oznaka"
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Skupni naÄrtovani znesek"
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/sq.po b/addons/account_budget/i18n/sq.po
index 83f6cba0d44e09e7ee04148dbe23b39314cef403..a1cd17b21fac4a8ef00275c56bf5901fe58eee21 100644
--- a/addons/account_budget/i18n/sq.po
+++ b/addons/account_budget/i18n/sq.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 14:42+0000\n"
+"PO-Revision-Date: 2010-10-12 14:42+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Albanian <sq@li.org>\n"
"MIME-Version: 1.0\n"
@@ -65,11 +65,6 @@ msgstr ""
msgid "Confirmed"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr ""
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -271,7 +266,6 @@ msgstr ""
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr ""
@@ -303,17 +297,6 @@ msgstr ""
msgid "Budget"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr ""
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr ""
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -331,17 +314,6 @@ msgstr ""
msgid "Cancelled"
msgstr ""
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr ""
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -376,11 +348,6 @@ msgstr ""
msgid "Code"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr ""
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/sr.po b/addons/account_budget/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..c98287d9e32779fc14d9e284fcc335ea5293e875
--- /dev/null
+++ b/addons/account_budget/i18n/sr.po
@@ -0,0 +1,452 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-15 08:22+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-16 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_budget
+#: field:crossovered.budget,creating_user_id:0
+msgid "Responsible User"
+msgstr "Odgovorni korisnik"
+
+#. module: account_budget
+#: rml:account.budget:0
+msgid "% performance"
+msgstr "% performansa"
+
+#. module: account_budget
+#: model:ir.actions.act_window,name:account_budget.open_budget_post_form
+#: model:ir.ui.menu,name:account_budget.menu_budget_post_form
+msgid "Budgetary Positions"
+msgstr "ProraÄunska pozicija"
+
+#. module: account_budget
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "Printed at:"
+msgstr "Ispisano na:"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Confirm"
+msgstr "Potvrdi"
+
+#. module: account_budget
+#: field:crossovered.budget,validating_user_id:0
+msgid "Validate User"
+msgstr "Potvrdi korisnika"
+
+#. module: account_budget
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da poÄne sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Confirmed"
+msgstr "Potvrđeno"
+
+#. module: account_budget
+#: wizard_field:account.budget.report,init,date2:0
+#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
+#: wizard_field:wizard.crossovered.budget,init,date_to:0
+#: wizard_field:wizard.crossovered.budget.summary,init,date_to:0
+msgid "End of period"
+msgstr "Završetak perioda"
+
+#. module: account_budget
+#: rml:account.budget:0
+msgid "Printing date:"
+msgstr "Datum Stampe:"
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Draft"
+msgstr "Priprema"
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+#: rml:account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "at"
+msgstr "u"
+
+#. module: account_budget
+#: view:account.budget.post:0
+msgid "Dotations"
+msgstr "Dotacija"
+
+#. module: account_budget
+#: rml:account.budget:0
+msgid "Performance"
+msgstr "Performansa"
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+#: rml:account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "Currency:"
+msgstr "Valuta:"
+
+#. module: account_budget
+#: rml:account.budget:0
+msgid "From"
+msgstr "Od"
+
+#. module: account_budget
+#: field:crossovered.budget.lines,percentage:0
+msgid "Percentage"
+msgstr "Procenat"
+
+#. module: account_budget
+#: rml:account.budget:0
+msgid "Results"
+msgstr "Резултати"
+
+#. module: account_budget
+#: field:crossovered.budget,state:0
+msgid "Status"
+msgstr "Status"
+
+#. module: account_budget
+#: model:ir.module.module,description:account_budget.module_meta_information
+msgid ""
+"This module allows accountants to manage analytic and crossovered budgets.\n"
+"\n"
+"Once the Master Budgets and the Budgets defined (in Financial\n"
+"Management/Budgets/), the Project Managers can set the planned amount on "
+"each\n"
+"Analytic Account.\n"
+"\n"
+"The accountant has the possibility to see the total of amount planned for "
+"each\n"
+"Budget and Master Budget in order to ensure the total planned is not\n"
+"greater/lower than what he planned for this Budget/Master Budget. Each list "
+"of\n"
+"record can also be switched to a graphical view of it.\n"
+"\n"
+"Three reports are available:\n"
+" 1. The first is available from a list of Budgets. It gives the "
+"spreading, for these Budgets, of the Analytic Accounts per Master Budgets.\n"
+"\n"
+" 2. The second is a summary of the previous one, it only gives the "
+"spreading, for the selected Budgets, of the Analytic Accounts.\n"
+"\n"
+" 3. The last one is available from the Analytic Chart of Accounts. It "
+"gives the spreading, for the selected Analytic Accounts, of the Master "
+"Budgets per Budgets.\n"
+"\n"
+msgstr ""
+
+#. module: account_budget
+#: rml:account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "%"
+msgstr "%"
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+msgid "Analytic Account :"
+msgstr "Analiticki konto :"
+
+#. module: account_budget
+#: wizard_button:account.budget.report,init,report:0
+#: wizard_button:wizard.analytic.account.budget.report,init,report:0
+#: wizard_button:wizard.crossovered.budget,init,report:0
+#: wizard_button:wizard.crossovered.budget.summary,init,report:0
+msgid "Print"
+msgstr "Å tampaj"
+
+#. module: account_budget
+#: rml:account.budget:0
+msgid "A/c No."
+msgstr "RaÄun br."
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+#: rml:account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "to"
+msgstr "do"
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+#: rml:account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "Total :"
+msgstr "Ukupno:"
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+#: field:crossovered.budget.lines,planned_amount:0
+#: rml:crossovered.budget.report:0
+msgid "Planned Amount"
+msgstr "Planirani iznos"
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "Perc(%)"
+msgstr "Proc(%)"
+
+#. module: account_budget
+#: rml:account.budget:0
+msgid "Period Budget"
+msgstr "Budžetsko razdoblje"
+
+#. module: account_budget
+#: rml:account.budget:0
+msgid "Budget Analysis"
+msgstr "Analiza Budžeta"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+#: selection:crossovered.budget,state:0
+msgid "Done"
+msgstr "Gotovo"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Validate"
+msgstr "Overi"
+
+#. module: account_budget
+#: wizard_view:wizard.crossovered.budget,init:0
+#: wizard_view:wizard.crossovered.budget.summary,init:0
+msgid "Select Options"
+msgstr "Selektuj Opciju"
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+#: field:crossovered.budget.lines,practical_amount:0
+#: rml:crossovered.budget.report:0
+msgid "Practical Amount"
+msgstr "Stvarni iznos"
+
+#. module: account_budget
+#: field:crossovered.budget,date_to:0
+#: field:crossovered.budget.lines,date_to:0
+msgid "End Date"
+msgstr "Završni Datum"
+
+#. module: account_budget
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: account_budget
+#: field:crossovered.budget.lines,theoritical_amount:0
+msgid "Theoritical Amount"
+msgstr "Teoretski Iznos"
+
+#. module: account_budget
+#: field:account.budget.post,name:0
+#: field:crossovered.budget,name:0
+msgid "Name"
+msgstr "Ime"
+
+#. module: account_budget
+#: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu_1
+msgid "Print Summary of Budgets"
+msgstr "Ispis Sumarnog Budzeta"
+
+#. module: account_budget
+#: model:ir.actions.wizard,name:account_budget.wizard_budget_spread
+msgid "Spread amount"
+msgstr "Iznos Å¡irenja"
+
+#. module: account_budget
+#: view:account.analytic.account:0
+#: view:account.budget.post:0
+msgid "Lines"
+msgstr "redova"
+
+#. module: account_budget
+#: rml:account.budget:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,crossovered_budget_id:0
+#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
+#: model:ir.actions.wizard,name:account_budget.wizard_budget_report
+#: model:ir.model,name:account_budget.model_crossovered_budget
+#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view
+msgid "Budget"
+msgstr "Budzet"
+
+#. module: account_budget
+#: field:crossovered.budget.lines,paid_date:0
+msgid "Paid Date"
+msgstr "Datum plaćanja"
+
+#. module: account_budget
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree
+#: model:ir.ui.menu,name:account_budget.menu_action_account_budget_post_tree
+#: model:ir.ui.menu,name:account_budget.next_id_31
+msgid "Budgets"
+msgstr "Budzeti"
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Cancelled"
+msgstr "Отказано"
+
+#. module: account_budget
+#: rml:account.budget:0
+msgid "Budget Item Detail"
+msgstr "Detalj Budzetske stavke"
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: field:crossovered.budget.lines,general_budget_id:0
+#: model:ir.model,name:account_budget.model_account_budget_post
+msgid "Budgetary Position"
+msgstr "Budzetska pozicija"
+
+#. module: account_budget
+#: wizard_field:account.budget.report,init,date1:0
+#: wizard_field:wizard.analytic.account.budget.report,init,date_from:0
+#: wizard_field:wizard.crossovered.budget,init,date_from:0
+#: wizard_field:wizard.crossovered.budget.summary,init,date_from:0
+msgid "Start of period"
+msgstr "PoÄetak razdoblja"
+
+#. module: account_budget
+#: model:ir.actions.report.xml,name:account_budget.account_analytic_account_budget
+#: model:ir.actions.report.xml,name:account_budget.report_crossovered_budget
+#: model:ir.actions.wizard,name:account_budget.account_analytic_account_budget_report
+#: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu
+msgid "Print Budgets"
+msgstr "Stampa Budzeta"
+
+#. module: account_budget
+#: field:account.budget.post,code:0
+#: field:crossovered.budget,code:0
+msgid "Code"
+msgstr "Kod"
+
+#. module: account_budget
+#: wizard_view:wizard.analytic.account.budget.report,init:0
+msgid "Select Dates Period"
+msgstr "Selektuj Datume razdoblja"
+
+#. module: account_budget
+#: field:account.budget.post,dotation_ids:0
+msgid "Spreading"
+msgstr "Raspon"
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "Theoretical Amount"
+msgstr "Teoretski Iznos"
+
+#. module: account_budget
+#: wizard_field:account.budget.spread,init,fiscalyear:0
+msgid "Fiscal Year"
+msgstr "Fiskalna Godina"
+
+#. module: account_budget
+#: field:crossovered.budget.lines,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "AnalitiÄki nalog"
+
+#. module: account_budget
+#: rml:crossovered.budget.report:0
+msgid "Budget :"
+msgstr "Budzet"
+
+#. module: account_budget
+#: rml:account.budget:0
+#: view:account.budget.post:0
+#: wizard_view:account.budget.spread,init:0
+#: wizard_button:account.budget.spread,init,spread:0
+msgid "Spread"
+msgstr "Raspon"
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: field:account.budget.post,account_ids:0
+msgid "Accounts"
+msgstr "Nalozi"
+
+#. module: account_budget
+#: model:ir.actions.report.xml,name:account_budget.account_budget
+msgid "Print Budget"
+msgstr ""
+
+#. module: account_budget
+#: view:account.analytic.account:0
+#: field:account.analytic.account,crossovered_budget_line:0
+#: view:account.budget.post:0
+#: field:account.budget.post,crossovered_budget_line:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget,crossovered_budget_line:0
+#: view:crossovered.budget.lines:0
+#: model:ir.actions.act_window,name:account_budget.act_account_analytic_account_cb_lines
+#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_lines_view
+#: model:ir.model,name:account_budget.model_crossovered_budget_lines
+#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view
+msgid "Budget Lines"
+msgstr "Budzetski Redovi"
+
+#. module: account_budget
+#: wizard_button:account.budget.report,init,end:0
+#: wizard_button:account.budget.spread,init,end:0
+#: view:crossovered.budget:0
+#: wizard_button:wizard.analytic.account.budget.report,init,end:0
+#: wizard_button:wizard.crossovered.budget,init,end:0
+#: wizard_button:wizard.crossovered.budget.summary,init,end:0
+msgid "Cancel"
+msgstr "Otkaži"
+
+#. module: account_budget
+#: model:ir.module.module,shortdesc:account_budget.module_meta_information
+msgid "Budget Management"
+msgstr "Budzetski Menadzment"
+
+#. module: account_budget
+#: field:crossovered.budget,date_from:0
+#: field:crossovered.budget.lines,date_from:0
+msgid "Start Date"
+msgstr "PoÄetni datum"
+
+#. module: account_budget
+#: rml:account.analytic.account.budget:0
+#: rml:crossovered.budget.report:0
+msgid "Analysis from"
+msgstr "Analiza od"
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Validated"
+msgstr "Potvrđeno"
+
+#. module: account_budget
+#: wizard_view:account.budget.report,init:0
+msgid "Select period"
+msgstr "Izaberi period"
diff --git a/addons/account_budget/i18n/sv.po b/addons/account_budget/i18n/sv.po
index 9e5a466bd05f522825edc5aebe4bf94353f436dd..69bc52d615299da90f60c79c18959447ad763bc9 100644
--- a/addons/account_budget/i18n/sv.po
+++ b/addons/account_budget/i18n/sv.po
@@ -7,7 +7,7 @@ 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: 2009-04-10 09:38+0000\n"
+"PO-Revision-Date: 2010-10-12 14:38+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -65,11 +65,6 @@ msgstr ""
msgid "Confirmed"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr ""
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -271,7 +266,6 @@ msgstr ""
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr "Namn"
@@ -303,17 +297,6 @@ msgstr ""
msgid "Budget"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr ""
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr ""
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -331,17 +314,6 @@ msgstr "Budgetar"
msgid "Cancelled"
msgstr ""
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr ""
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -376,11 +348,6 @@ msgstr ""
msgid "Code"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr ""
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/tlh.po b/addons/account_budget/i18n/tlh.po
index 474fee684c9569f71e91a671e39a4bd4a267f906..cce9c961224b7b7dd1d3be7908fa3d6d6e649a0e 100644
--- a/addons/account_budget/i18n/tlh.po
+++ b/addons/account_budget/i18n/tlh.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:24+0000\n"
+"PO-Revision-Date: 2010-10-12 14:24+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -64,11 +64,6 @@ msgstr ""
msgid "Confirmed"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr ""
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -270,7 +265,6 @@ msgstr ""
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr ""
@@ -302,17 +296,6 @@ msgstr ""
msgid "Budget"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr ""
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr ""
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -330,17 +313,6 @@ msgstr ""
msgid "Cancelled"
msgstr ""
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr ""
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -375,11 +347,6 @@ msgstr ""
msgid "Code"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr ""
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/tr.po b/addons/account_budget/i18n/tr.po
index f4c72790f567482939e7303b6f371a9471ff60b5..53d6f7d9f6f735db60f6ddb3925a239a3cfd937b 100644
--- a/addons/account_budget/i18n/tr.po
+++ b/addons/account_budget/i18n/tr.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-09 07:04+0000\n"
+"PO-Revision-Date: 2010-10-12 14:04+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -64,11 +64,6 @@ msgstr ""
msgid "Confirmed"
msgstr "Onaylandı"
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Dönem"
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -270,7 +265,6 @@ msgstr "Kurumsal Tutar"
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr "Adı"
@@ -302,17 +296,6 @@ msgstr ""
msgid "Budget"
msgstr "Bütçe"
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr ""
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Miktar"
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -330,17 +313,6 @@ msgstr "Bütçeler"
msgid "Cancelled"
msgstr "Ä°ptal Edildi"
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "Bütçe Ödeneği"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "Bütçe Ödenekleri"
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -375,11 +347,6 @@ msgstr "Bütçeleri Yazdır"
msgid "Code"
msgstr "Kodu"
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "Toplam Planl. Tutar"
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/uk.po b/addons/account_budget/i18n/uk.po
index 420efaf9b0c102c483b87d1fe11718343b4691ca..8c4fd5d9640424a16414ebcf657065b5a43b2f0e 100644
--- a/addons/account_budget/i18n/uk.po
+++ b/addons/account_budget/i18n/uk.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 16:49+0000\n"
+"PO-Revision-Date: 2010-10-12 14:49+0000\n"
"Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -65,11 +65,6 @@ msgstr ""
msgid "Confirmed"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "Період"
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -271,7 +266,6 @@ msgstr ""
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr "Ðазва"
@@ -303,17 +297,6 @@ msgstr "Ð Ñдки"
msgid "Budget"
msgstr "Бюджет"
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr ""
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "Сума"
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -331,17 +314,6 @@ msgstr ""
msgid "Cancelled"
msgstr ""
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr ""
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -376,11 +348,6 @@ msgstr ""
msgid "Code"
msgstr "Код"
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr ""
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/vi.po b/addons/account_budget/i18n/vi.po
index e908238a8a59327ac5d166138599026e6ea5245b..89b0ada492fbf172d86474a997c2c293e8148681 100644
--- a/addons/account_budget/i18n/vi.po
+++ b/addons/account_budget/i18n/vi.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 14:42+0000\n"
+"PO-Revision-Date: 2010-10-12 14:42+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Vietnamese <vi@li.org>\n"
"MIME-Version: 1.0\n"
@@ -65,11 +65,6 @@ msgstr ""
msgid "Confirmed"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr ""
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -271,7 +266,6 @@ msgstr ""
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr ""
@@ -303,17 +297,6 @@ msgstr ""
msgid "Budget"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr ""
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr ""
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -331,17 +314,6 @@ msgstr ""
msgid "Cancelled"
msgstr ""
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr ""
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -376,11 +348,6 @@ msgstr ""
msgid "Code"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr ""
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/zh_CN.po b/addons/account_budget/i18n/zh_CN.po
index ed5a3a4368d0c87b7b50a9b762807e6c9961be1c..2d512a9276aaa5a5c1531f13a8cb743c5978c950 100644
--- a/addons/account_budget/i18n/zh_CN.po
+++ b/addons/account_budget/i18n/zh_CN.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 08:58+0000\n"
+"PO-Revision-Date: 2010-10-12 14:58+0000\n"
"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -64,11 +64,6 @@ msgstr "对象åå¿…é¡»è¦ä»¥X_开头并且ä¸èƒ½å«æœ‰ç‰¹æ®Šå—符!"
msgid "Confirmed"
msgstr "已确认"
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr "会计期间"
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -288,7 +283,6 @@ msgstr "ç†è®ºé‡‘é¢"
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr "å称"
@@ -320,17 +314,6 @@ msgstr "明细"
msgid "Budget"
msgstr "预算"
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr "项"
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr "金é¢"
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -348,17 +331,6 @@ msgstr "预算"
msgid "Cancelled"
msgstr "å·²å–消"
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr "预算给予"
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr "预算给予"
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -393,11 +365,6 @@ msgstr "打å°é¢„ç®—"
msgid "Code"
msgstr "代ç "
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr "计划金é¢åˆè®¡"
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/i18n/zh_TW.po b/addons/account_budget/i18n/zh_TW.po
index 900864233fedfbb37e63d47bd0327c6442e8864a..c8ff1d77da7d93c8e1126c5637f455704b080f0d 100644
--- a/addons/account_budget/i18n/zh_TW.po
+++ b/addons/account_budget/i18n/zh_TW.po
@@ -7,7 +7,7 @@ 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: 2009-01-23 17:15+0000\n"
+"PO-Revision-Date: 2010-10-12 14:15+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -64,11 +64,6 @@ msgstr ""
msgid "Confirmed"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,period_id:0
-msgid "Period"
-msgstr ""
-
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
@@ -270,7 +265,6 @@ msgstr ""
#. module: account_budget
#: field:account.budget.post,name:0
-#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
msgstr "å称"
@@ -302,17 +296,6 @@ msgstr ""
msgid "Budget"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,post_id:0
-msgid "Item"
-msgstr ""
-
-#. module: account_budget
-#: field:account.budget.post.dotation,amount:0
-#: wizard_field:account.budget.spread,init,amount:0
-msgid "Amount"
-msgstr ""
-
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
@@ -330,17 +313,6 @@ msgstr ""
msgid "Cancelled"
msgstr ""
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-#: model:ir.model,name:account_budget.model_account_budget_post_dotation
-msgid "Budget Dotation"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post.dotation:0
-msgid "Budget Dotations"
-msgstr ""
-
#. module: account_budget
#: rml:account.budget:0
msgid "Budget Item Detail"
@@ -375,11 +347,6 @@ msgstr ""
msgid "Code"
msgstr ""
-#. module: account_budget
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr ""
-
#. module: account_budget
#: wizard_view:wizard.analytic.account.budget.report,init:0
msgid "Select Dates Period"
diff --git a/addons/account_budget/report/budget_report.py b/addons/account_budget/report/budget_report.py
index 7db3925fd4d451c0741342093c3ef52bf2187ebf..8b98b067bb3459a97cc61b66f560f6c20c6a09e3 100644
--- a/addons/account_budget/report/budget_report.py
+++ b/addons/account_budget/report/budget_report.py
@@ -20,55 +20,169 @@
##############################################################################
import time
-import datetime
-
from report import report_sxw
-import operator
+
+tot = {}
class budget_report(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
super(budget_report, self).__init__(cr, uid, name, context=context)
- self.localcontext.update( {
- 'lines': self.lines,
- 'budget_total': self.budget_total,
- 'post_total': self.post_total,
+ self.localcontext.update({
+ 'funct': self.funct,
+ 'funct_total': self.funct_total,
'time': time,
})
+ self.context = context
+
+ def funct(self, object, form, ids={}, done=None, level=1):
+ if not ids:
+ ids = self.ids
+ if not done:
+ done = {}
+ global tot
+ tot = {
+ 'theo':0.00,
+ 'pln':0.00,
+ 'prac':0.00,
+ 'perc':0.00
+ }
+ result = []
+
+ budgets = self.pool.get('account.budget.post').browse(self.cr, self.uid, [object.id], self.context.copy())
+ c_b_lines_obj = self.pool.get('crossovered.budget.lines')
+ acc_analytic_obj = self.pool.get('account.analytic.account')
+ for budget_id in budgets:
+ res = {}
+ budget_ids = []
+ d_from = form['date_from']
+ d_to = form['date_to']
+
+ for line in budget_id.crossovered_budget_line:
+ budget_ids.append(line.id)
- def post_total(self, post_obj, date1, date2):
- def str2date(date_str):
- return datetime.date.fromtimestamp(time.mktime(time.strptime(date_str, '%Y-%m-%d')))
+ if not budget_ids:
+ return []
+ self.cr.execute('SELECT DISTINCT(analytic_account_id) FROM crossovered_budget_lines WHERE id = ANY(%s)',(budget_ids,))
+ an_ids = self.cr.fetchall()
- def interval(d1str, d2str):
- return (str2date(d2str) - str2date(d1str) + datetime.timedelta(days=1)).days
+ context = {'wizard_date_from': d_from, 'wizard_date_to': d_to}
+ for i in range(0, len(an_ids)):
+ analytic_name = acc_analytic_obj.browse(self.cr, self.uid, [an_ids[i][0]])
+ res={
+ 'b_id': '-1',
+ 'a_id': '-1',
+ 'name': analytic_name[0].name,
+ 'status': 1,
+ 'theo': 0.00,
+ 'pln': 0.00,
+ 'prac': 0.00,
+ 'perc': 0.00
+ }
+ result.append(res)
- prev = reduce(lambda x,d: x + d.amount, post_obj.dotation_ids, 0.0)
- period_days = interval(date1, date2)
- for d in post_obj.dotation_ids:
- i = interval(d.period_id.date_start, d.period_id.date_stop)
- total_days = reduce(lambda x,d: x+interval(d.period_id.date_start, d.period_id.date_stop), post_obj.dotation_ids, 0)
- achievements = reduce(lambda x,l: x+l['achievements'], self.lines(post_obj, date1, date2), 0.0)
- prev_1 = 1.00
- if total_days <> 0.00:
- prev_1 = prev * period_days / total_days
- return [{'prev': prev, 'prev_period': prev_1, 'achievements': achievements}]
+ line_ids = c_b_lines_obj.search(self.cr, self.uid, [('id', 'in', budget_ids), ('analytic_account_id','=',an_ids[i][0])])
+ line_id = c_b_lines_obj.browse(self.cr, self.uid, line_ids)
+ tot_theo = tot_pln = tot_prac = tot_perc = 0.00
- def budget_total(self, post_obj, date1, date2):
- res = {'prev': 0.0, 'prev_period': 0.0, 'achievements': 0.0}
- r = self.post_total(post_obj, date1, date2)[0]
- for k in r:
- res[k] += r[k]
- return [res]
+ done_budget = []
+ for line in line_id:
+ if line.id in budget_ids:
+ theo = pract = 0.00
+ theo = c_b_lines_obj._theo_amt(self.cr, self.uid, [line.id], context)[line.id]
+ pract = c_b_lines_obj._prac_amt(self.cr, self.uid, [line.id], context)[line.id]
+ if line.general_budget_id.id in done_budget:
+ for record in result:
+ if record['b_id'] == line.general_budget_id.id and record['a_id'] == line.analytic_account_id.id:
+ record['theo'] += theo
+ record['pln'] += line.planned_amount
+ record['prac'] += pract
+ if record['theo'] <> 0.00:
+ perc = (record['prac'] / record['theo']) * 100
+ else:
+ perc = 0.00
+ record['perc'] = perc
+ tot_theo += theo
+ tot_pln += line.planned_amount
+ tot_prac += pract
+ tot_perc += perc
+ else:
+ if theo <> 0.00:
+ perc = (pract / theo) * 100
+ else:
+ perc = 0.00
+ res1 = {
+ 'a_id': line.analytic_account_id.id,
+ 'b_id': line.general_budget_id.id,
+ 'name': line.general_budget_id.name,
+ 'status': 2,
+ 'theo': theo,
+ 'pln': line.planned_amount,
+ 'prac': pract,
+ 'perc': perc,
+ }
+ tot_theo += theo
+ tot_pln += line.planned_amount
+ tot_prac += pract
+ tot_perc += perc
+ if form['report'] == 'analytic-full':
+ result.append(res1)
+ done_budget.append(line.general_budget_id.id)
+ else:
- def lines(self, post_obj, date1, date2):
- res = []
- for a in post_obj.account_ids:
- self.cr.execute("SELECT COALESCE(SUM(debit-credit), 0) FROM account_move_line WHERE account_id=%s AND date>=%s AND date<=%s and state<>'draft'", (a.id, date1, date2))
- achievements = float(self.cr.fetchone()[0])
- res.append({'name': a.name, 'code': a.code, 'achievements': achievements})
- return res
+ if line.general_budget_id.id in done_budget:
+ continue
+ else:
+ res1={
+ 'a_id': line.analytic_account_id.id,
+ 'b_id': line.general_budget_id.id,
+ 'name': line.general_budget_id.name,
+ 'status': 2,
+ 'theo': 0.00,
+ 'pln': 0.00,
+ 'prac': 0.00,
+ 'perc': 0.00
+ }
+ if form['report'] == 'analytic-full':
+ result.append(res1)
+ done_budget.append(line.general_budget_id.id)
+ if tot_theo == 0.00:
+ tot_perc = 0.00
+ else:
+ tot_perc = float(tot_prac / tot_theo) * 100
+ if form['report'] == 'analytic-full':
+ result[-(len(done_budget) +1)]['theo'] = tot_theo
+ tot['theo'] += tot_theo
+ result[-(len(done_budget) +1)]['pln'] = tot_pln
+ tot['pln'] += tot_pln
+ result[-(len(done_budget) +1)]['prac'] = tot_prac
+ tot['prac'] += tot_prac
+ result[-(len(done_budget) +1)]['perc'] = tot_perc
+ else:
+ result[-1]['theo'] = tot_theo
+ tot['theo'] += tot_theo
+ result[-1]['pln'] = tot_pln
+ tot['pln'] += tot_pln
+ result[-1]['prac'] = tot_prac
+ tot['prac'] += tot_prac
+ result[-1]['perc'] = tot_perc
+ if tot['theo'] == 0.00:
+ tot['perc'] = 0.00
+ else:
+ tot['perc'] = float(tot['prac'] / tot['theo']) * 100
+ return result
-report_sxw.report_sxw('report.account.budget', 'account.budget.post', 'addons/account_budget/report/budget_report.rml', parser=budget_report, header="internal")
+ def funct_total(self, form):
+ result = []
+ res = {}
+ res = {
+ 'tot_theo': tot['theo'],
+ 'tot_pln': tot['pln'],
+ 'tot_prac': tot['prac'],
+ 'tot_perc': tot['perc']
+ }
+ result.append(res)
+ return result
+report_sxw.report_sxw('report.account.budget', 'account.budget.post', 'addons/account_budget/report/budget_report.rml', parser=budget_report, header='internal')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_budget/report/budget_report.rml b/addons/account_budget/report/budget_report.rml
index 577e03af9f4efd103204675b3649c71606e3fea3..0533042822a19ec8916602e81cff7ce4952e2a7f 100644
--- a/addons/account_budget/report/budget_report.rml
+++ b/addons/account_budget/report/budget_report.rml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<document filename="test.pdf">
+<document filename="Budgets.pdf">
<template pageSize="(595.0,842.0)" title="Budgets" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
@@ -10,114 +10,68 @@
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
- <blockTableStyle id="Table3">
+ <blockTableStyle id="Table2">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
+ <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
</blockTableStyle>
- <blockTableStyle id="Table2">
+ <blockTableStyle id="Table1">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
- <blockBackground colorName="#ffffff" start="0,0" stop="0,-1"/>
- <blockBackground colorName="#ffffff" start="1,0" stop="1,-1"/>
- <blockBackground colorName="#ffffff" start="2,0" stop="2,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
</blockTableStyle>
- <blockTableStyle id="Table1">
+ <blockTableStyle id="Table3">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
</blockTableStyle>
- <blockTableStyle id="Table8">
+ <blockTableStyle id="Table4">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
</blockTableStyle>
- <blockTableStyle id="Table9">
+ <blockTableStyle id="Table5">
<blockAlignment value="LEFT"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
<blockValign value="TOP"/>
- </blockTableStyle>
- <blockTableStyle id="Table10">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
- </blockTableStyle>
- <blockTableStyle id="Table7">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEBEFORE" colorName="#c0c0c0" start="0,0" stop="0,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#c0c0c0" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEBELOW" colorName="#c0c0c0" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#c0c0c0" start="1,0" stop="1,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#c0c0c0" start="1,0" stop="1,0"/>
- <lineStyle kind="LINEBELOW" colorName="#c0c0c0" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#c0c0c0" start="2,0" stop="2,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#c0c0c0" start="2,0" stop="2,0"/>
- <lineStyle kind="LINEBELOW" colorName="#c0c0c0" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#c0c0c0" start="3,0" stop="3,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#c0c0c0" start="3,0" stop="3,0"/>
- <lineStyle kind="LINEBELOW" colorName="#c0c0c0" start="3,-1" stop="3,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#c0c0c0" start="4,0" stop="4,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#c0c0c0" start="4,0" stop="4,0"/>
- <lineStyle kind="LINEBELOW" colorName="#c0c0c0" start="4,-1" stop="4,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#c0c0c0" start="5,0" stop="5,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#c0c0c0" start="5,0" stop="5,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#c0c0c0" start="5,0" stop="5,0"/>
- <lineStyle kind="LINEBELOW" colorName="#c0c0c0" start="5,-1" stop="5,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
- <paraStyle name="P1" fontName="Times-Roman" alignment="CENTER"/>
- <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="P4" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="P6" rightIndent="-0.0" leftIndent="-3.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="P7" fontName="Times-Roman" alignment="CENTER"/>
- <paraStyle name="P8" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="P9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="P10" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="P11" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="P15" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="Standard" fontName="Times-Roman"/>
- <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Standard" fontName="Helvetica"/>
+ <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="15.0" leading="19" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Footer" fontName="Times-Roman"/>
- <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="Index" fontName="Times-Roman"/>
- <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+ <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Footer" fontName="Helvetica"/>
+ <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+ <paraStyle name="Index" fontName="Helvetica"/>
+ <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+ <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+ <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
@@ -126,175 +80,109 @@
<paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_Bold_right_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <images/>
</stylesheet>
- <images/>
<story>
- <blockTable colWidths="499.0" style="Table3">
+ <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
+ <blockTable colWidths="482.0" style="Table2">
<tr>
<td>
- <para style="P14">Budget Analysis</para>
+ <para style="terp_header_Centre">Budget</para>
</td>
</tr>
</blockTable>
- <para style="Text body">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="137.0,237.0,125.0" repeatRows="1" style="Table2">
+ <blockTable colWidths="241.0,241.0" style="Table1">
<tr>
<td>
- <para style="P15">[[ company.name ]]</para>
+ <para style="terp_default_9"><font face="Helvetica-Bold">Currency: </font>[[ company.currency_id.name ]]</para>
</td>
<td>
- <para style="P8">From [[ data['form']['date1'] ]] to [[ data['form']['date2'] ]]</para>
+ <para style="terp_default_Right_9">Printed at: [[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]] at [[ time.strftime('%H:%M:%S')]]</para>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <para style="terp_default_9"><font face="Helvetica-Bold">Analysis from</font> [[ formatLang(data['form']['date_from'],date=True) ]] to [[ formatLang(data['form']['date_to'],date=True) ]]</para>
</td>
<td>
- <para style="P9">Currency: [[ company.currency_id.name ]]</para>
+ <para style="terp_default_Bold_right_9">Budget : <font color="Blue">[[ o.name ]]</font></para>
</td>
</tr>
</blockTable>
- <para style="Standard">
+ <para style="terp_default_8">
<font color="white"> </font>
</para>
- <para style="P1">
+ <para style="terp_default_8">
<font color="white"> </font>
</para>
- <blockTable colWidths="104.0,55.0,58.0,72.0,77.0,59.0,73.0" repeatRows="1" style="Table1">
+ <blockTable colWidths="191.0,82.0,81.0,83.0,62.0" style="Table3">
<tr>
<td>
- <para style="P13">Budget Item Detail</para>
- </td>
- <td>
- <para style="P13">A/c No.</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">Budget</para>
+ <para style="terp_tblheader_Details">Description</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">Period Budget</para>
+ <para style="terp_tblheader_Details_Right">Theoretical Amt</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">Performance</para>
+ <para style="terp_tblheader_Details_Right">Planned Amt</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">Spread</para>
+ <para style="terp_tblheader_Details_Right">Practical Amt</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">% performance</para>
+ <para style="terp_tblheader_Details_Right">Perc(%)</para>
</td>
</tr>
</blockTable>
- <para style="Standard">
- <font color="white"> </font>
- </para>
- <para style="Standard">[[ repeatIn(objects,'o') ]]</para>
<section>
- <blockTable colWidths="75.0,424.0" style="Table8">
- <tr>
- <td>
- <para style="P6"><font color="blue">[[ o.code ]]</font></para>
- </td>
- <td>
- <para style="P5"><font color="blue">[[ o.name ]]</font></para>
- </td>
- </tr>
- </blockTable>
- <blockTable colWidths="103.0,53.0,62.0,72.0,77.0,62.0,71.0" style="Table9">
- <tr>
- <td>
- <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(lines(o, data['form']['date1'], data['form']['date2']), 'a') ]]</font>[[ a['name'] ]]</para>
- </td>
- <td>
- <para style="P2">[[ a['code'] ]]</para>
- </td>
- <td>
- <para style="P2">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="P3">[[ '%.2f' % a['achievements'] ]]</para>
- </td>
- <td>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
- </td>
- </tr>
- </blockTable>
- <para style="Text body">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="156.0,61.0,72.0,76.0,62.0,71.0" style="Table10">
+ <para style="terp_default_8">[[ repeatIn(funct(o,data['form']),'a') ]]</para>
+ <blockTable colWidths="185.0,79.0,78.0,81.0,59.0" style="Table4">
<tr>
<td>
- <para style="P5">Total : [[ o.code ]]</para>
- <para style="Table Contents">[[ repeatIn( post_total(o, data['form']['date1'], data['form']['date2']), 'total') ]]</para>
+ <para style="terp_default_9"><font color="white">[['.....' *(a['status']-1) ]]</font><font face="Helvetica">[[ (a['status']==1 and (setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ a['name'] ]]</para>
</td>
<td>
- <para style="P4">[[ '%.2f' % total['prev'] ]]</para>
+ <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['theo'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
- <para style="P4">[[ '%.2f' % total['prev_period'] ]]</para>
+ <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ formatLang(a['pln'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
- <para style="P4">[[ '%.2f' % total['achievements'] ]]</para>
+ <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ formatLang(a['prac'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
- <para style="P4">[[ '%.2f' % (total['prev_period'] - total['achievements']) ]]</para>
- </td>
- <td>
- <para style="P4">[[ total['prev_period'] and ('%.2f' % (total['achievements'] / total['prev_period'] * 100.0)) or 0.0]] %</para>
+ <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ formatLang(a['perc'], digits=2) ]]%</para>
</td>
</tr>
</blockTable>
- <para style="Standard">
- <font color="white"> </font>
- </para>
- <para style="Standard">
- <font color="white"> </font>
- </para>
</section>
- <blockTable colWidths="156.0,61.0,72.0,76.0,64.0,68.0" style="Table7">
+ <blockTable colWidths="185.0,82.0,80.0,81.0,60.0" style="Table5">
<tr>
<td>
- <para style="P5">Results</para>
- <para style="Table Contents">[[ repeatIn( budget_total(o, data['form']['date1'], data['form']['date2']), 'total') ]]</para>
- </td>
- <td>
- <para style="P4">[[ '%.2f' % total['prev'] ]]</para>
+ <para style="terp_default_Bold_9"><font face="Helvetica">[[ repeatIn(funct_total(data['form']),'b') ]]</font>Total:</para>
</td>
<td>
- <para style="P4">[[ '%.2f' % total['prev_period'] ]]</para>
+ <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_theo'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
- <para style="P4">[[ '%.2f' % total['achievements'] ]]</para>
+ <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_pln'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
- <para style="P4">[[ '%.2f' % (total['prev_period'] - total['achievements']) ]]</para>
+ <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_prac'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
</td>
<td>
- <para style="P4">[[ '%.2f' % (total['achievements'] / total['prev_period'] * 100.0) ]] %</para>
+ <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_perc'], digits=2) ]]%</para>
</td>
</tr>
</blockTable>
- <para style="Standard">
+ <para style="terp_default_8">
<font color="white"> </font>
</para>
</story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/account_budget/security/ir.model.access.csv b/addons/account_budget/security/ir.model.access.csv
index e068630ae888132dd346aaf95590fd2b42209a40..b2eb33f3d04510891196497c782771d1f3c4f80e 100644
--- a/addons/account_budget/security/ir.model.access.csv
+++ b/addons/account_budget/security/ir.model.access.csv
@@ -2,10 +2,6 @@
"access_crossovered_budget","crossovered.budget","model_crossovered_budget","account.group_account_manager",1,0,0,0
"access_crossovered_budget_lines","crossovered.budget.lines","model_crossovered_budget_lines","account.group_account_manager",1,1,1,1
"access_account_budget_post","account.budget.post","model_account_budget_post","account.group_account_manager",1,0,0,0
-"access_account_budget_post_dotation","account.budget.post.dotation","model_account_budget_post_dotation","account.group_account_manager",1,1,1,1
"access_account_budget_post_accountant","account.budget.post accountant","model_account_budget_post","account.group_account_user",1,1,1,1
"access_crossovered_budget_accountant","crossovered.budget accountant","model_crossovered_budget","account.group_account_user",1,1,1,1
-"access_account_budget_post_system","account.budget.post system","model_account_budget_post","base.group_system",1,0,0,0
-"access_crossovered_budget_system","crossovered.budget system","model_crossovered_budget","base.group_system",1,0,0,0
-"access_crossovered_budget_lines_system","crossovered.budget.lines system","model_crossovered_budget_lines","base.group_system",1,1,1,1
"access_crossovered_budget_lines_accountant","crossovered.budget.lines accountant","model_crossovered_budget_lines","account.group_account_user",1,1,1,1
diff --git a/addons/account_budget/wizard/__init__.py b/addons/account_budget/wizard/__init__.py
index 56faa0af5245ce23ea84cba60493323795048906..f94d386c3b0f7e9e5d34c331bd536b1364356897 100644
--- a/addons/account_budget/wizard/__init__.py
+++ b/addons/account_budget/wizard/__init__.py
@@ -22,8 +22,6 @@
import account_budget_crossovered_report
import account_budget_analytic
import account_budget_crossovered_summary_report
-
-import account_budget_spread
import account_budget_report
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_budget/wizard/account_budget_analytic_view.xml b/addons/account_budget/wizard/account_budget_analytic_view.xml
index 645b13a95118d3d84803159c4ebfa9f5a01b6067..95f3fe4a6bb5843fd70fd5eba5cc7c7d14f9e125 100644
--- a/addons/account_budget/wizard/account_budget_analytic_view.xml
+++ b/addons/account_budget/wizard/account_budget_analytic_view.xml
@@ -8,16 +8,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Select Dates Period">
- <group width="450">
- <separator string="This wizard is used to print budget" colspan="4"/>
- <field name="date_from"/>
- <field name="date_to"/>
- <separator colspan="4"/>
- <group colspan="4" col="6">
- <button special="cancel" string="Cancel" icon="gtk-cancel"/>
- <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
- </group>
- </group>
+ <separator string="This wizard is used to print budget" colspan="4"/>
+ <field name="date_from"/>
+ <field name="date_to"/>
+ <separator colspan="4"/>
+ <group colspan="4" col="6">
+ <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+ <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
+ </group>
</form>
</field>
</record>
diff --git a/addons/account_budget/wizard/account_budget_crossovered_report.py b/addons/account_budget/wizard/account_budget_crossovered_report.py
index e1207c5cba8e71206f497acf35b8dc88c7c81968..84e47fc47d789709814bf4042146c73b6dd60422 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_report.py
+++ b/addons/account_budget/wizard/account_budget_crossovered_report.py
@@ -24,13 +24,13 @@ from osv import fields, osv
class account_budget_crossvered_report(osv.osv_memory):
- _name = 'account.budget.crossvered.report'
- _description = 'Account Budget crossvered report'
+ _name = "account.budget.crossvered.report"
+ _description = "Account Budget crossvered report"
_columns = {
'date_from': fields.date('Start of period', required=True),
'date_to': fields.date('End of period', required=True),
}
- _defaults= {
+ _defaults = {
'date_from': time.strftime('%Y-01-01'),
'date_to': time.strftime('%Y-%m-%d'),
}
@@ -45,7 +45,7 @@ class account_budget_crossvered_report(osv.osv_memory):
'model': 'crossovered.budget',
'form': data
}
- datas['form']['report']='analytic-full'
+ datas['form']['report'] = 'analytic-full'
return {
'type': 'ir.actions.report.xml',
'report_name': 'crossovered.budget.report',
diff --git a/addons/account_budget/wizard/account_budget_crossovered_report_view.xml b/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
index 8bcd2445c67d6bd6fd59d039fe5c9fce08d9a4a6..feaf208a351abcc1027546b108a21d24d21012ab 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
@@ -8,16 +8,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Select Dates Period">
- <group width="450">
- <separator string="This wizard is used to print budget" colspan="4"/>
- <field name="date_from"/>
- <field name="date_to"/>
- <separator colspan="4"/>
- <group colspan="4" col="6">
- <button special="cancel" string="Cancel" icon="gtk-cancel"/>
- <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
- </group>
- </group>
+ <separator string="This wizard is used to print budget" colspan="4"/>
+ <field name="date_from"/>
+ <field name="date_to"/>
+ <separator colspan="4"/>
+ <group colspan="4" col="6">
+ <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+ <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
+ </group>
</form>
</field>
</record>
diff --git a/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml b/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
index 4775bdffe0f9ed2634fc5d86ed129488cbe33859..8ddcc16b01c50dfb4f595f4bacb4de434d421fdf 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
@@ -8,15 +8,13 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Select Dates Period">
- <group width="450">
<separator string="This wizard is used to print summary of budgets" colspan="4"/>
<field name="date_from"/>
<field name="date_to"/>
<separator colspan="4"/>
- <group colspan="4" col="6">
- <button special="cancel" string="Cancel" icon="gtk-cancel"/>
- <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
- </group>
+ <group colspan="4" col="6">
+ <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+ <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
</group>
</form>
</field>
diff --git a/addons/account_budget/wizard/account_budget_report.py b/addons/account_budget/wizard/account_budget_report.py
index 20432ff64e4dca5010a1fc739183eb7c8ecb9079..a5db4e7ceca8483c84705eedc994352468ff2351 100644
--- a/addons/account_budget/wizard/account_budget_report.py
+++ b/addons/account_budget/wizard/account_budget_report.py
@@ -21,19 +21,19 @@
import time
from osv import fields, osv
-from tools.translate import _
+
class account_budget_report(osv.osv_memory):
- _name = 'account.budget.report'
- _description = 'Account Budget report for analytic account'
+ _name = "account.budget.report"
+ _description = "Account Budget report for analytic account"
_columns = {
- 'date1': fields.date('Start of period', required=True),
- 'date2': fields.date('End of period', required=True),
+ 'date_from': fields.date('Start of period', required=True),
+ 'date_to': fields.date('End of period', required=True),
}
_defaults= {
- 'date1': time.strftime('%Y-01-01'),
- 'date2': time.strftime('%Y-%m-%d'),
+ 'date_from': time.strftime('%Y-01-01'),
+ 'date_to': time.strftime('%Y-%m-%d'),
}
def check_report(self, cr, uid, ids, context=None):
@@ -46,10 +46,7 @@ class account_budget_report(osv.osv_memory):
'model': 'account.budget.post',
'form': data
}
-
- data_model = self.pool.get(datas['model']).browse(cr, uid, context['active_id'])
- if not data_model.dotation_ids:
- raise osv.except_osv(_('Insufficient Data!'),_('No Depreciation or Master Budget Expenses Found on Budget %s!') % data_model.name)
+ datas['form']['report']='analytic-full'
return {
'type': 'ir.actions.report.xml',
'report_name': 'account.budget',
diff --git a/addons/account_budget/wizard/account_budget_report_view.xml b/addons/account_budget/wizard/account_budget_report_view.xml
index 8508637859a6a6f691c78f96ea418f5e197f13cb..3821bfb74b2e0a25fbbf5fc88890e2007db34994 100644
--- a/addons/account_budget/wizard/account_budget_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_report_view.xml
@@ -2,45 +2,43 @@
<openerp>
<data>
- <record id="account_budget_report_view" model="ir.ui.view">
- <field name="name">account.budget.report.form</field>
- <field name="model">account.budget.report</field>
- <field name="type">form</field>
- <field name="arch" type="xml">
- <form string="Select Dates Period">
- <group width="450">
- <separator string="Print Budgets" colspan="4"/>
- <field name="date1"/>
- <field name="date2"/>
- <separator colspan="4"/>
- <group colspan="4" col="6">
- <button special="cancel" string="Cancel" icon="gtk-cancel"/>
- <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
- </group>
- </group>
- </form>
- </field>
- </record>
+ <record id="account_budget_report_view" model="ir.ui.view">
+ <field name="name">account.budget.report.form</field>
+ <field name="model">account.budget.report</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form string="Select Dates Period">
+ <separator string="Print Budgets" colspan="4"/>
+ <field name="date_from"/>
+ <field name="date_to"/>
+ <separator colspan="4"/>
+ <group colspan="4" col="6">
+ <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+ <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
+ </group>
+ </form>
+ </field>
+ </record>
- <record id="action_account_budget_report" model="ir.actions.act_window">
- <field name="name">Budgets</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">account.budget.report</field>
- <field name="view_type">form</field>
- <field name="view_mode">form</field>
- <field name="view_id" ref="account_budget_report_view"/>
- <field name="target">new</field>
- </record>
+ <record id="action_account_budget_report" model="ir.actions.act_window">
+ <field name="name">Budgets</field>
+ <field name="type">ir.actions.act_window</field>
+ <field name="res_model">account.budget.report</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">form</field>
+ <field name="view_id" ref="account_budget_report_view"/>
+ <field name="target">new</field>
+ </record>
- <record model="ir.values" id="account_budget_report_values">
- <field name="model_id" ref="account_budget.model_account_budget_post" />
- <field name="object" eval="1" />
- <field name="name">Budgets</field>
- <field name="key2">client_print_multi</field>
- <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_budget_report'))" />
- <field name="key">action</field>
- <field name="model">account.budget.post</field>
- </record>
+ <record model="ir.values" id="account_budget_report_values">
+ <field name="model_id" ref="account_budget.model_account_budget_post" />
+ <field name="object" eval="1" />
+ <field name="name">Budgets</field>
+ <field name="key2">client_print_multi</field>
+ <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_budget_report'))" />
+ <field name="key">action</field>
+ <field name="model">account.budget.post</field>
+ </record>
- </data>
+ </data>
</openerp>
diff --git a/addons/account_budget/wizard/account_budget_spread.py b/addons/account_budget/wizard/account_budget_spread.py
deleted file mode 100644
index de854a3966c1b027e5dc2a2c0aa6944fdd6d2a6b..0000000000000000000000000000000000000000
--- a/addons/account_budget/wizard/account_budget_spread.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields, osv
-import decimal_precision as dp
-
-class account_budget_spread(osv.osv_memory):
-
- _name = 'account.budget.spread'
- _description = 'Account Budget spread '
- _columns = {
- 'fiscalyear': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True),
- 'amount': fields.float('Amount', digits_compute=dp.get_precision('Account')),
- }
-
- def check_spread(self, cr, uid, ids, context=None):
- if context is None:
- context = {}
- data = self.browse(cr, uid, ids, context=context)[0]
- res = self.pool.get('account.budget.post').spread(cr, uid, context['active_ids'], data.fiscalyear.id, data.amount)
- return {}
-
-account_budget_spread()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_budget/wizard/account_budget_spread_view.xml b/addons/account_budget/wizard/account_budget_spread_view.xml
deleted file mode 100644
index 2d6b5996feece483b76b6fb92d317603a902e7f4..0000000000000000000000000000000000000000
--- a/addons/account_budget/wizard/account_budget_spread_view.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
- <data>
-
- <record id="account_budget_spread_view" model="ir.ui.view">
- <field name="name">account.budget.spread.form</field>
- <field name="model">account.budget.spread</field>
- <field name="type">form</field>
- <field name="arch" type="xml">
- <form string="Select Fiscalyear">
- <group width="480">
- <separator string="" colspan="4"/>
- <field name="fiscalyear"/>
- <field name="amount"/>
- <separator colspan="4"/>
- <group colspan="4" col="6">
- <button special="cancel" string="Cancel" icon="gtk-cancel"/>
- <button name="check_spread" string="Ok" type="object" icon="gtk-ok"/>
- </group>
- </group>
- </form>
- </field>
- </record>
-
- <record id="action_account_budget_spread" model="ir.actions.act_window">
- <field name="name">Spread</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">account.budget.spread</field>
- <field name="view_type">form</field>
- <field name="view_mode">form</field>
- <field name="view_id" ref="account_budget_spread_view"/>
- <field name="target">new</field>
- </record>
-
- </data>
-</openerp>
\ No newline at end of file
diff --git a/addons/account_cancel/i18n/mn.po b/addons/account_cancel/i18n/mn.po
new file mode 100644
index 0000000000000000000000000000000000000000..0750c13f415c52c56f9b79c0fccadec8ec35d1a5
--- /dev/null
+++ b/addons/account_cancel/i18n/mn.po
@@ -0,0 +1,37 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-19 12:03+0000\n"
+"PO-Revision-Date: 2010-10-16 08:58+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Mongolian <mn@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-10-17 04:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_cancel
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "ДÑлгÑцийн XML алдаатай!"
+
+#. module: account_cancel
+#: model:ir.module.module,description:account_cancel.module_meta_information
+msgid ""
+"\n"
+" Module adds 'Allow cancelling entries' field on form view of account "
+"journal. If set to true it allows user to cancel entries & invoices.\n"
+" "
+msgstr ""
+
+#. module: account_cancel
+#: model:ir.module.module,shortdesc:account_cancel.module_meta_information
+msgid "Account Cancel"
+msgstr "Ð”Ð°Ð½Ñ Ñ†ÑƒÑ†Ð»Ð°Ñ…"
diff --git a/addons/account_cancel/i18n/sr.po b/addons/account_cancel/i18n/sr.po
index 35ee862ca7876bbb978072e17cd0d531bacb26d8..e41e7e7a16399b8fbdad43c05d90db8e83f4afea 100644
--- a/addons/account_cancel/i18n/sr.po
+++ b/addons/account_cancel/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-08-19 12:03+0000\n"
-"PO-Revision-Date: 2010-10-13 16:49+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-14 07:30+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Serbian <sr@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-10-14 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_cancel
diff --git a/addons/account_cancel/i18n/tr.po b/addons/account_cancel/i18n/tr.po
index 38866a6c4393e467b443c3f9182d8ea4b9cbf91c..26cc53cf183b97837621e1141638dcf062d7d3ac 100644
--- a/addons/account_cancel/i18n/tr.po
+++ b/addons/account_cancel/i18n/tr.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-08-19 12:03+0000\n"
-"PO-Revision-Date: 2010-10-13 14:54+0000\n"
-"Last-Translator: cafer can <Unknown>\n"
+"PO-Revision-Date: 2010-10-14 07:31+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Turkish <tr@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-10-14 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_cancel
diff --git a/addons/account_coda/i18n/hr.po b/addons/account_coda/i18n/hr.po
index a9dbb78f1f50c1ca7ad4b72bb20a77bfdf42e349..0b56b4f26646a52abe2535afeace8d739b39292d 100644
--- a/addons/account_coda/i18n/hr.po
+++ b/addons/account_coda/i18n/hr.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-11-24 13:11+0000\n"
-"PO-Revision-Date: 2010-09-29 11:13+0000\n"
+"PO-Revision-Date: 2010-10-15 09:33+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Croatian <hr@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-09-30 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_coda
@@ -73,7 +73,7 @@ msgstr ""
#. module: account_coda
#: wizard_field:account.coda_import,init,def_receivable:0
msgid "Default receivable Account"
-msgstr ""
+msgstr "Osnovni Konto Prihoda"
#. module: account_coda
#: model:ir.module.module,description:account_coda.module_meta_information
@@ -82,48 +82,51 @@ msgid ""
" bank statements from .csv file.\n"
" Import coda file wizard is used to import bank statements."
msgstr ""
+"Ovaj modul omogucava gunkionalnost uvoza\n"
+" Bancinih izvoda iz .csv fajla.\n"
+" Coda fajl carobnjak za uvoz se koristi za uvoz bancinih stavki"
#. module: account_coda
#: wizard_button:account.coda_import,extraction,end:0
msgid "_Close"
-msgstr ""
+msgstr "_Zatvori"
#. module: account_coda
#: field:account.coda,statement_id:0
msgid "Generated Bank Statement"
-msgstr ""
+msgstr "Generisani Bancin Izvod"
#. module: account_coda
#: view:account.coda:0
#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
#: model:ir.actions.act_window,name:account_coda.action_account_coda
msgid "Coda import"
-msgstr ""
+msgstr "Coda Uvoz"
#. module: account_coda
#: field:account.coda,user_id:0
msgid "User"
-msgstr ""
+msgstr "Korisnik"
#. module: account_coda
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Neispravan XML za arhitekturu View-a !"
#. module: account_coda
#: model:ir.model,name:account_coda.model_account_coda
msgid "coda for an Account"
-msgstr ""
+msgstr "coda za jedan nalog"
#. module: account_coda
#: wizard_field:account.coda_import,init,def_payable:0
msgid "Default Payable Account"
-msgstr ""
+msgstr "Osnovni platni konto"
#. module: account_coda
#: model:ir.ui.menu,name:account_coda.menu_account_coda
msgid "Coda Statements"
-msgstr ""
+msgstr "Coda stavke"
#. module: account_coda
#: model:ir.ui.menu,name:account_coda.menu_account_coda_wizard
diff --git a/addons/account_coda/i18n/sr.po b/addons/account_coda/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..c5af7899172074e01da6ec361d76303ad3ce32a8
--- /dev/null
+++ b/addons/account_coda/i18n/sr.po
@@ -0,0 +1,170 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-24 13:11+0000\n"
+"PO-Revision-Date: 2010-10-15 08:49+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-16 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_coda
+#: field:account.coda,journal_id:0
+#: wizard_field:account.coda_import,init,journal_id:0
+msgid "Bank Journal"
+msgstr "Dnevnik Banke"
+
+#. module: account_coda
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da poÄinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: account_coda
+#: wizard_field:account.coda_import,extraction,note:0
+msgid "Log"
+msgstr ""
+
+#. module: account_coda
+#: wizard_button:account.coda_import,extraction,open:0
+msgid "_Open Statement"
+msgstr "_Otvori izvod"
+
+#. module: account_coda
+#: model:ir.module.module,shortdesc:account_coda.module_meta_information
+msgid "Account CODA"
+msgstr "CODA Nalog"
+
+#. module: account_coda
+#: field:account.coda,name:0
+msgid "Coda file"
+msgstr "Coda Fajl"
+
+#. module: account_coda
+#: wizard_view:account.coda_import,init:0
+msgid "Clic on 'New' to select your file :"
+msgstr "Klikni na 'Novi' da izaberes svoj fajl"
+
+#. module: account_coda
+#: model:ir.actions.wizard,name:account_coda.wizard_account_coda_import
+msgid "Import Coda File"
+msgstr "Uvezi Coda fajl"
+
+#. module: account_coda
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: account_coda
+#: field:account.coda,note:0
+msgid "Import log"
+msgstr "Uvezi log"
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,def_receivable:0
+msgid "Default receivable Account"
+msgstr "Osnovni Konto Prihoda"
+
+#. module: account_coda
+#: model:ir.module.module,description:account_coda.module_meta_information
+msgid ""
+"Module provides functionality to import\n"
+" bank statements from .csv file.\n"
+" Import coda file wizard is used to import bank statements."
+msgstr ""
+"Ovaj modul omogucava funkionalnost uvoza\n"
+"Bancinih izvoda iz .csv fajla.\n"
+"Coda fajl carobnjak za uvoz se koristi za uvoz bancinih stavki"
+
+#. module: account_coda
+#: wizard_button:account.coda_import,extraction,end:0
+msgid "_Close"
+msgstr "_Zatvori"
+
+#. module: account_coda
+#: field:account.coda,statement_id:0
+msgid "Generated Bank Statement"
+msgstr "Generisani Bancin Izvod"
+
+#. module: account_coda
+#: view:account.coda:0
+#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
+#: model:ir.actions.act_window,name:account_coda.action_account_coda
+msgid "Coda import"
+msgstr "Coda Uvoz"
+
+#. module: account_coda
+#: field:account.coda,user_id:0
+msgid "User"
+msgstr "Korisnik"
+
+#. module: account_coda
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda
+msgid "coda for an Account"
+msgstr "coda za jedan nalog"
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,def_payable:0
+msgid "Default Payable Account"
+msgstr "Osnovni platni konto"
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda
+msgid "Coda Statements"
+msgstr "Coda stavke"
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_wizard
+msgid "Import Coda Statements"
+msgstr "Uvezi Coda Stavke"
+
+#. module: account_coda
+#: wizard_button:account.coda_import,init,extraction:0
+msgid "_Ok"
+msgstr "_U Redu"
+
+#. module: account_coda
+#: wizard_view:account.coda_import,extraction:0
+#: wizard_view:account.coda_import,init:0
+msgid "Import Coda Statement"
+msgstr "Uvezi Coda Stavku"
+
+#. module: account_coda
+#: field:account.bank.statement,coda_id:0
+msgid "Coda"
+msgstr "Coda"
+
+#. module: account_coda
+#: wizard_view:account.coda_import,extraction:0
+msgid "Results :"
+msgstr "Rezultati :"
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,coda:0
+msgid "Coda File"
+msgstr "Coda Fajl"
+
+#. module: account_coda
+#: field:account.coda,date:0
+msgid "Import Date"
+msgstr "Uvezi Datum"
+
+#. module: account_coda
+#: wizard_view:account.coda_import,init:0
+msgid "Select your bank journal :"
+msgstr "Izaberi svoj bancin dnevnik"
diff --git a/addons/account_coda/security/ir.model.access.csv b/addons/account_coda/security/ir.model.access.csv
index df4faec11ee3afc987557ec12e94f3b8ea5e1c87..3ab8dccd4ad53239b20e845476d32b1a24d65bac 100644
--- a/addons/account_coda/security/ir.model.access.csv
+++ b/addons/account_coda/security/ir.model.access.csv
@@ -3,4 +3,3 @@
"access_account_coda_manager","account.coda","model_account_coda","account.group_account_manager",1,1,1,1
"access_account_coda_import_manager","account.coda.import","model_account_coda_import","account.group_account_manager",1,1,1,1
"access_account_coda_import_user","account.coda","model_account_coda","account.group_account_user",1,0,0,0
-"access_account_coda_system","account.coda system","model_account_coda","base.group_system",1,0,0,0
diff --git a/addons/account_coda/wizard/account_coda_import.py b/addons/account_coda/wizard/account_coda_import.py
index 1d34e28896fdbbb824f7e5bcd8e3b6dbd8bbd8f8..b3c34efc5a51ab168782fdfd9c7ccecb5cd2b06d 100644
--- a/addons/account_coda/wizard/account_coda_import.py
+++ b/addons/account_coda/wizard/account_coda_import.py
@@ -37,7 +37,7 @@ def str2float(str):
def list2float(lst):
try:
- return str2float((lambda s : s[:-3] + '.' + s[-3:])(lst))
+ return str2float((lambda s: s[:-3] + '.' + s[-3:])(lst))
except:
return 0.0
@@ -48,7 +48,7 @@ class account_coda_import(osv.osv_memory):
'journal_id': fields.many2one('account.journal', 'Bank Journal', required=True),
'def_payable': fields.many2one('account.account', 'Default Payable Account', domain=[('type', '=', 'payable')], required=True, help= 'Set here the payable account that will be used, by default, if the partner is not found'),
'def_receivable': fields.many2one('account.account', 'Default Receivable Account', domain=[('type', '=', 'receivable')], required=True, help= 'Set here the receivable account that will be used, by default, if the partner is not found',),
- 'awaiting_account': fields.many2one('account.account', 'Default Account for Unrecognized Movement', domain=[('type', '=', 'liquidity')], required=True, help= 'Set here the default account that will be used, if the partner is found but does not have the bank account , or if he is domiciled'),
+ 'awaiting_account': fields.many2one('account.account', 'Default Account for Unrecognized Movement', domain=[('type', '=', 'liquidity')], required=True, help= 'Set here the default account that will be used, if the partner is found but does not have the bank account, or if he is domiciled'),
'coda': fields.binary('Coda File', required=True),
'note':fields.text('Log'),
}
@@ -81,7 +81,7 @@ class account_coda_import(osv.osv_memory):
err_log = "Errors:\n------\n"
nb_err=0
std_log=''
- str_log1 = "Coda File is Imported : "
+ str_log1 = "Coda File is Imported: "
str_not=''
str_not1=''
@@ -158,9 +158,9 @@ class account_coda_import(osv.osv_memory):
bank = partner_bank_obj.browse(cr, uid, bank_ids[0], context)
if line and bank.partner_id:
bank_statement_lines[st_line_name].update({'partner_id': bank.partner_id.id})
- if bank_statement_lines[st_line_name]['amount'] < 0 :
+ if bank_statement_lines[st_line_name]['amount'] < 0:
bank_statement_lines[st_line_name].update({'account_id': bank.partner_id.property_account_payable.id})
- else :
+ else:
bank_statement_lines[st_line_name].update({'account_id': bank.partner_id.property_account_receivable.id})
else:
nb_err += 1
@@ -216,9 +216,9 @@ class account_coda_import(osv.osv_memory):
rec_id = self.pool.get('account.move.line').search(cr, uid, [('name', '=', name), ('reconcile_id', '=', False), ('account_id.reconcile', '=', True)])
if rec_id:
result = voucher_obj.onchange_partner_id(cr, uid, [], partner_id=line['partner_id'], journal_id=statement['journal_id'], price=abs(line['amount']), currency_id = journal.company_id.currency_id.id, ttype=(line['amount'] < 0 and 'payment' or 'receipt'), context=context)
- voucher_res = { 'type':(line['amount'] < 0 and 'payment' or 'receipt') ,
+ voucher_res = { 'type':(line['amount'] < 0 and 'payment' or 'receipt'),
'name': line['name'],#line.name,
- 'partner_id': line['partner_id'] ,#line.partner_id.id,
+ 'partner_id': line['partner_id'],#line.partner_id.id,
'journal_id': statement['journal_id'], #statement.journal_id.id,
'account_id': result.get('account_id', journal.default_credit_account_id.id),#line.account_id.id,
'company_id': journal.company_id.id,#statement.company_id.id,
@@ -249,9 +249,9 @@ class account_coda_import(osv.osv_memory):
mv = self.pool.get('account.move.line').browse(cr, uid, rec_id[0], context=context)
if mv.partner_id:
line['partner_id'] = mv.partner_id.id
- if line['amount'] < 0 :
+ if line['amount'] < 0:
line['account_id'] = mv.partner_id.property_account_payable.id
- else :
+ else:
line['account_id'] = mv.partner_id.property_account_receivable.id
str_not1 = ''
if line.has_key('contry_name') and line.has_key('cntry_number'):
@@ -269,28 +269,28 @@ class account_coda_import(osv.osv_memory):
})
str_not = "\n \n Account Number: %s \n Account Holder Name: %s " %(statement["acc_number"], statement["acc_holder"])
- std_log += "\nStatement : %s , Date : %s, Starting Balance : %.2f , Ending Balance : %.2f \n"\
+ std_log += "\nStatement: %s, Date: %s, Starting Balance: %.2f, Ending Balance: %.2f \n"\
%(statement['name'], statement['date'], float(statement["balance_start"]), float(statement["balance_end_real"]))
bkst_list.append(bk_st_id)
except osv.except_osv, e:
cr.rollback()
nb_err += 1
- err_log += '\n Application Error : ' + str(e)
+ err_log += '\n Application Error: ' + str(e)
raise # REMOVEME
except Exception, e:
cr.rollback()
nb_err += 1
- err_log += '\n System Error : '+str(e)
+ err_log += '\n System Error: '+str(e)
raise # REMOVEME
- except :
+ except:
cr.rollback()
nb_err+=1
err_log += '\n Unknown Error'
raise
- err_log += '\n\nNumber of statements : '+ str(len(bkst_list))
- err_log += '\nNumber of error :'+ str(nb_err) +'\n'
+ err_log += '\n\nNumber of statements: '+ str(len(bkst_list))
+ err_log += '\nNumber of error:'+ str(nb_err) +'\n'
account_coda_obj.create(cr, uid, {
'name': codafile,
diff --git a/addons/account_coda/wizard/account_coda_import.xml b/addons/account_coda/wizard/account_coda_import.xml
index 480e86d1b97e93bf107838bd0f1db8b207841767..6f867cb8d4745e6fd455d14ca504f34b45368529 100644
--- a/addons/account_coda/wizard/account_coda_import.xml
+++ b/addons/account_coda/wizard/account_coda_import.xml
@@ -23,29 +23,27 @@
<group colspan="4">
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="coda_parsing" string="Import" type="object" icon="gtk-ok"/>
- </group>
+ </group>
</form>
</field>
</record>
-
+
<record id="account_coda_note_view" model="ir.ui.view">
<field name="name">Import Coda Statement</field>
<field name="model">account.coda.import</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Result of Imported Coda Statements">
- <group width="500" height="420">
- <separator colspan="4" string="Results :" />
- <field name="note" colspan="4" nolabel="1" width="500"/>
- <newline/>
- <separator colspan="6"/>
- <button special="cancel" string="Close" icon="gtk-cancel"/>
- <button name="action_open_window" string="Open Statements" type="object" icon="gtk-apply"/>
- </group>
+ <separator colspan="4" string="Results :" />
+ <field name="note" colspan="4" nolabel="1" width="500" height="310"/>
+ <newline/>
+ <separator colspan="6"/>
+ <button special="cancel" string="Close" icon="gtk-cancel"/>
+ <button name="action_open_window" string="Open Statements" type="object" icon="gtk-apply"/>
</form>
</field>
</record>
-
+
<record id="action_account_coda_import" model="ir.actions.act_window">
<field name="name">Import Coda Statement</field>
<field name="type">ir.actions.act_window</field>
@@ -53,7 +51,7 @@
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="target">new</field>
- <field name="view_id" ref="account_coda_import_view"/>
+ <field name="view_id" ref="account_coda_import_view"/>
</record>
</data>
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index 111870aa33b4168af8bc9f76fd31b7adf105ac97..e246e3659e103094a6d331fd5332660885192dec 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -73,7 +73,7 @@
<search string="Search Followup">
<group col="10" colspan="4">
<field name="name"/>
- <field name="company_id" groups="base.group_multi_company"/>
+ <field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
</search>
</field>
@@ -86,7 +86,8 @@
<field name="search_view_id" ref="view_account_followup_filter"/>
<field name="view_type">form</field>
</record>
- <menuitem action="action_account_followup_definition_form" id="account_followup_menu" parent="account.menu_configuration_misc" groups="base.group_system"/>
+ <menuitem action="action_account_followup_definition_form" id="account_followup_menu"
+ parent="account.menu_configuration_misc"/>
<report auto="False" id="account_followup_followup_report" menu="False" model="account_followup.followup" name="account_followup.followup.print" rml="account_followup/report/account_followup_print.rml" string="Followup Report"/>
diff --git a/addons/account_followup/i18n/sr.po b/addons/account_followup/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..d882a65d26a64ddb21981ee4973c39664390c671
--- /dev/null
+++ b/addons/account_followup/i18n/sr.po
@@ -0,0 +1,547 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-15 09:03+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-16 04:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Date :"
+msgstr "Datum :"
+
+#. module: account_followup
+#: wizard_field:account_followup.followup.print.all,next,partner_ids:0
+msgid "Partners"
+msgstr "Partneri"
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Customer Ref :"
+msgstr "Poziv na broj"
+
+#. module: account_followup
+#: 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 "Sve stavke potraživanja"
+
+#. module: account_followup
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: account_followup
+#: field:account_followup.followup.line,description:0
+msgid "Printed Message"
+msgstr "Ispisana Poruka"
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Amount In Currency"
+msgstr "Iznos u valuti"
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Due"
+msgstr "Dospeće"
+
+#. module: account_followup
+#: view:account.move.line:0
+msgid "Total debit"
+msgstr "Ukupno duguje"
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "%(user_signature)s: User name"
+msgstr "%(korisnicka_oznaka)e: KorisniÄko ime"
+
+#. module: account_followup
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "Select partners"
+msgstr "Odaberi partnere"
+
+#. module: account_followup
+#: view:account_followup.followup:0
+#: field:account_followup.followup,followup_line:0
+msgid "Follow-Up"
+msgstr "Следи"
+
+#. module: account_followup
+#: field:account_followup.stat,debit:0
+msgid "Debit"
+msgstr "Duguje"
+
+#. module: account_followup
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "Email Settings"
+msgstr "Email Postavke"
+
+#. module: account_followup
+#: field:account_followup.stat,account_type:0
+msgid "Account Type"
+msgstr "Vrsta konta"
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Ref"
+msgstr "Referenca"
+
+#. module: account_followup
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "%(followup_amount)s: Total Amount Due"
+msgstr "%(iznos_pracenja): Ukupan iznos duga"
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "%(date)s: Current Date"
+msgstr "%(datum)i: Trenutni Datum"
+
+#. module: account_followup
+#: field:account.move.line,followup_date:0
+msgid "Latest Follow-up"
+msgstr "Poslednje praćenje"
+
+#. module: account_followup
+#: field:account_followup.followup.line,followup_id:0
+#: field:account_followup.stat,followup_id:0
+msgid "Follow Ups"
+msgstr "Praćenja"
+
+#. module: account_followup
+#: wizard_field:account_followup.followup.print.all,init,date:0
+msgid "Follow-up Sending Date"
+msgstr "Datum Slanja Pracenja"
+
+#. module: account_followup
+#: view:account_followup.followup:0
+#: field:account_followup.followup,description:0
+#: rml:account_followup.followup.print:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Balance:"
+msgstr "Saldo"
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "VAT:"
+msgstr "PDV:"
+
+#. module: account_followup
+#: field:account_followup.followup,company_id:0
+msgid "Company"
+msgstr "Preduzeće"
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Invoice Date"
+msgstr "Datum raÄuna"
+
+#. module: account_followup
+#: wizard_field:account_followup.followup.print.all,next,email_subject:0
+msgid "Email Subject"
+msgstr "Tema Email-a"
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Paid"
+msgstr "Plaćeno"
+
+#. module: account_followup
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "%(line)s: Account Move lines"
+msgstr "%(red): redovi prenosa raÄuna"
+
+#. module: account_followup
+#: field:account_followup.stat,date_followup:0
+msgid "Latest followup"
+msgstr "Poslednje praćenje"
+
+#. module: account_followup
+#: view:account.move.line:0
+msgid "Partner entries"
+msgstr "Stavke Partnera"
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_followup_line
+msgid "Follow-Ups Criteria"
+msgstr "Kriterijumi Praćenja"
+
+#. module: account_followup
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "Partner Selection"
+msgstr "Selekcija Partnera"
+
+#. module: account_followup
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: account_followup
+#: field:account_followup.followup.line,start:0
+msgid "Type of Term"
+msgstr "Tip Uslova"
+
+#. module: account_followup
+#: wizard_view:account_followup.followup.print.all,init:0
+msgid "Follow-up and Date Selection"
+msgstr "Praćenja i Datum Selekcije"
+
+#. module: account_followup
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "Select partners to remind"
+msgstr "Odaberite partnere za opomenu"
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Li."
+msgstr "Li."
+
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount staid unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"consider the present one as void. Do not hesitate to contact our accounting "
+"department at (+32).10.68.94.39.\n"
+"\n"
+"Best Regards,\n"
+"\t\t\t"
+msgstr ""
+"\n"
+"Postovani %(partner_name)s,\n"
+"\n"
+"Izvinjavamo se unapred ako je greska nastala kod nas, cini se da su sledeci "
+"iznosi ostali neplaceni. Molimo, preduzmite neophodne akcije u cilju isplate "
+"ovih racuna u sledecih 8 dana.\n"
+"\n"
+"Ukoliko uradite isplatu nakon ovog maila, molimo obavestite nas, Takodje se "
+"nemojte ustrucavati da kontaktirate nasu\n"
+"racunovodstvenu sluzbu na tel (032) 69 555 666\n"
+"\n"
+"Srdacan pozdrav\n"
+"\t\t\t"
+
+#. module: account_followup
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da poÄinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: account_followup
+#: wizard_button:account_followup.followup.print.all,summary,end:0
+msgid "Ok"
+msgstr "U redu"
+
+#. module: account_followup
+#: field:account_followup.followup,name:0
+#: field:account_followup.followup.line,name:0
+msgid "Name"
+msgstr "Ime"
+
+#. module: account_followup
+#: field:account_followup.stat,date_move:0
+msgid "First move"
+msgstr "Prvi potez"
+
+#. module: account_followup
+#: selection:account_followup.followup.line,start:0
+msgid "End of Month"
+msgstr "Kraj Meseca"
+
+#. 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 "%(company_name)s: Ime preduzeca 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 "Sve stavke potraživanja"
+
+#. module: account_followup
+#: view:account_followup.followup:0
+msgid "Lines"
+msgstr "redova"
+
+#. 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šalji praćenja"
+
+#. module: account_followup
+#: field:account.move.line,followup_line_id:0
+msgid "Follow-up Level"
+msgstr "Nivo praćenja"
+
+#. module: account_followup
+#: field:account_followup.stat,credit:0
+msgid "Credit"
+msgstr "Kredit"
+
+#. module: account_followup
+#: model:ir.model,name:account_followup.model_account_followup_stat
+msgid "Followup statistics"
+msgstr "Statisktike Praćenja"
+
+#. module: account_followup
+#: wizard_button:account_followup.followup.print.all,init,next:0
+msgid "Continue"
+msgstr "Nastavi"
+
+#. module: account_followup
+#: model:ir.module.module,shortdesc:account_followup.module_meta_information
+msgid "Accounting follow-ups management"
+msgstr "Menadzment naloga Praćenja"
+
+#. 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 "Sumarno"
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+msgid "Follow-Up Lines"
+msgstr "Redovi Praćenja"
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Document : Customer account statement"
+msgstr "Dokument:Korisnicka stavka naloga"
+
+#. module: account_followup
+#: view:account_followup.stat:0
+msgid "Follow-Up lines"
+msgstr "Redovi Praćenja"
+
+#. module: account_followup
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "%(company_currency)s: User's Company Currency"
+msgstr "%(company_currency)s: Valuta Preduzeca Korisnika"
+
+#. module: account_followup
+#: field:account_followup.stat,balance:0
+msgid "Balance"
+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 ""
+"Ovo polje vam omogucava da selektujete udaljeni datum za planiranje vaseg "
+"pracenja"
+
+#. module: account_followup
+#: view:account.move.line:0
+msgid "Total credit"
+msgstr "Ukupno potražuje"
+
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
+"\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days\n"
+"\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
+"we can resolve the matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+"\t\t\t"
+msgstr ""
+"\n"
+"Postovani %(partner_name)s\n"
+"\n"
+"Zao nam je sto vas moramo podsecati, ali vas je nalog sada u ozbiljnom "
+"prekoracenju.\n"
+"\n"
+"Vrlo je bitno da izmirite vase obaveze ka nama, u suprotnom ce mo morati "
+"razmotriti dalju saradnju sa vama, sto znaci da necemo\n"
+"vise biti u mogucnosti da vas snabdevamo ( servisiramo)\n"
+"\n"
+"Molimo vas da preduzmete hitne mere kako bi se izvrsila ova uplata u roku od "
+"8 dana.\n"
+"\n"
+"Ukoliko postoji problem vezan za vas racun, a mi nismo upoznati, ne "
+"ustrucavajte se da kontaktirate nase racunovodstvo na (+32_69 555 666 kako "
+"bi mogli resiti nastalu gresku sto pre.\n"
+"\n"
+"Detalji vaseg racuna se nalaze ispod.\n"
+"\n"
+"Srdacan pozdrav.\n"
+"\t\t\t"
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Sub-Total:"
+msgstr "Subtotal"
+
+#. module: account_followup
+#: selection:account_followup.followup.line,start:0
+msgid "Net Days"
+msgstr "Neto dana"
+
+#. module: account_followup
+#: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
+#: model:ir.actions.act_window,name:account_followup.action_followup_stat
+#: model:ir.model,name:account_followup.model_account_followup_followup
+#: 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 "Pracenja"
+
+#. module: account_followup
+#: wizard_view:account_followup.followup.print.all,next:0
+#: wizard_field:account_followup.followup.print.all,next,email_body:0
+msgid "Email body"
+msgstr "Sadrzaj Email-a"
+
+#. module: account_followup
+#: field:account_followup.stat,date_move_last:0
+msgid "Last move"
+msgstr "Poslednji potez"
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Maturity"
+msgstr "Dospeće"
+
+#. module: account_followup
+#: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
+msgid "Followup Report"
+msgstr "Izvestaj Pracenja"
+
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
+msgid ""
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days , then legal action for the "
+"recovery of the debt, will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department at (+32).10.68.94.39.\n"
+"\n"
+"Best Regards,\n"
+"\t\t\t"
+msgstr ""
+"\n"
+"Postovani %(partner_name)s,\n"
+"\n"
+"Uprkos nekoliko opomena, vase dugovanje nije izmireno.\n"
+"\n"
+"Ukoliko ne izvrsite uplatu u sledecih 8 dana, bicemo prinudjeni da se "
+"obratimo nadleznim organima za sravnjenje ovog duga.\n"
+"\n"
+"Verujem da ce se ova varijanta pokazati kao nepotrebna i da ce te vi "
+"izvrsiti uplatu dugova opisanih ispod.\n"
+"\n"
+"U slucaju bilo kakve nedoumice, ili nase greske, nemojte se ustrucavati da "
+"kontaktirate nase knjigovodstvo na (+32)69 555 666.\n"
+"\n"
+"Srdacan Pozdrav.\n"
+"\t\t\t"
+
+#. module: account_followup
+#: rml:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr "Datum Dospeća"
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "Legend"
+msgstr "Legenda"
+
+#. module: account_followup
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
+msgstr "Sekvenca"
+
+#. module: account_followup
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "%(heading)s: Move line header"
+msgstr "%(heading): Zaglavlje reda prijenosa"
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: wizard_view:account_followup.followup.print.all,next:0
+msgid "%(partner_name)s: Partner name"
+msgstr "%(partner_name)s: Partnerovo Ime"
+
+#. module: account_followup
+#: wizard_field:account_followup.followup.print.all,next,email_conf:0
+msgid "Send email confirmation"
+msgstr "Pošalji Email potvrdu"
+
+#. module: account_followup
+#: wizard_field:account_followup.followup.print.all,init,followup_id:0
+msgid "Follow-up"
+msgstr "Pracenje"
+
+#. module: account_followup
+#: field:account_followup.stat,name:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: account_followup
+#: wizard_button:account_followup.followup.print.all,init,end:0
+#: wizard_button:account_followup.followup.print.all,next,end:0
+msgid "Cancel"
+msgstr "Otkaži"
+
+#. module: account_followup
+#: field:account_followup.followup.line,delay:0
+msgid "Days of delay"
+msgstr "Dana kašnjenja"
+
+#. module: account_followup
+#: wizard_button:account_followup.followup.print.all,next,print:0
+msgid "Print Follow Ups & Send Mails"
+msgstr "Odstampaj Pracenja & Posalji Meilove"
diff --git a/addons/account_followup/report/account_followup_print.rml b/addons/account_followup/report/account_followup_print.rml
index 32bd8103a1cf0e8cab7fc8e35f3ae82718069f9b..fb0f93b4a38b05d5d5cfa9e1f148fb09b8c9cbbb 100644
--- a/addons/account_followup/report/account_followup_print.rml
+++ b/addons/account_followup/report/account_followup_print.rml
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
-<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Follow UP" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Account Followup.pdf">
+ <template pageSize="(595.0,842.0)" title="Account Followup" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
- <frame id="first" x1="42.0" y1="28.0" width="511" height="786"/>
+ <frame id="first" x1="31.0" y1="28.0" width="532" height="786"/>
</pageTemplate>
</template>
<stylesheet>
@@ -48,11 +48,13 @@
<lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="1,1" stop="1,1"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="2,1" stop="2,1"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="3,1" stop="3,1"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="4,1" stop="4,1"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="5,1" stop="5,1"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table3">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
@@ -92,16 +94,16 @@
<story>
<para style="terp_default_8">[[ repeatIn(ids_to_objects(data['form']['partner_ids']),'o') ]] </para>
<para style="terp_default_8">[[ setLang(o.lang) ]]</para>
- <blockTable colWidths="286.0,224.0" style="Tableau2">
+ <blockTable colWidths="298.0,234.0" style="Tableau2">
<tr>
<td>
<para style="terp_default_9">[[ repeatIn(adr_get(o,'invoice'),'a' )]]</para>
</td>
<td>
- <para style="terp_default_9">[[ o.name ]]</para>
- <para style="terp_default_9">[[ a['street'] ]]</para>
+ <para style="terp_default_9">[[ o.name or '' ]]</para>
+ <para style="terp_default_9">[[ a['street'] or '']]</para>
<para style="terp_default_9">[[ a['street2'] or removeParentNode('para') ]]</para>
- <para style="terp_default_9">[[ a['zip'] ]] [[ a['city'] ]]</para>
+ <para style="terp_default_9">[[ a['zip'] or '' ]] [[ a['city'] or '' ]]</para>
<para style="terp_default_9">[[( a['state_id'] and a['state_id'][1]) or removeParentNode('para') ]]</para>
<para style="terp_default_9">[[( a['country_id'] and a['country_id'][1]) or '']]</para>
<para style="terp_default_9">
@@ -124,7 +126,7 @@
<para style="terp_default_9">
<font color="white"> </font>
</para>
- <blockTable colWidths="68.0,78.0,45.0,70.0,51.0,58.0,62.0,61.0,27.0" style="Table1">
+ <blockTable colWidths="66.0,77.0,46.0,74.0,52.0,62.0,59.0,67.0,29.0" style="Table1">
<tr>
<td>
<para style="terp_tblheader_Details_Centre">Invoice Date</para>
@@ -157,7 +159,7 @@
</blockTable>
<section>
<para style="terp_default_8">[[repeatIn(getLines(o), 'line') ]]</para>
- <blockTable colWidths="68.0,79.0,44.0,69.0,49.0,62.0,61.0,60.0,26.0" style="Table5">
+ <blockTable colWidths="66.0,78.0,46.0,69.0,57.0,62.0,58.0,68.0,28.0" style="Table5">
<tr>
<td>
<para style="terp_default_9">[[ formatLang(line['date'],date = True) ]]</para>
@@ -189,7 +191,7 @@
</tr>
</blockTable>
</section>
- <blockTable colWidths="191.0,108.0,73.0,61.0,60.0,26.0" style="Table2">
+ <blockTable colWidths="190.0,101.0,87.0,58.0,68.0,28.0" style="Table2">
<tr>
<td>
<para style="terp_default_8">
@@ -200,10 +202,10 @@
<para style="terp_tblheader_Details">Sub-Total: </para>
</td>
<td>
- <para style="terp_default_Right_9">[[formatLang(reduce(lambda x,y: x+y['debit'], getLines(o), 0.00)) ]]</para>
+ <para style="terp_default_Right_9">[[formatLang(reduce(lambda x,y: x+y['debit'], getLines(o), 0.00)) ]] </para>
</td>
<td>
- <para style="terp_default_Right_9">[[formatLang(reduce(lambda x,y: x+y['credit'], getLines(o), 0.00)) ]]</para>
+ <para style="terp_default_Right_9">[[formatLang(reduce(lambda x,y: x+y['credit'], getLines(o), 0.00)) ]] </para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(reduce(lambda x,y: x+(y['debit'] - y['credit']), filter(lambda x: x['date_maturity'] < time.strftime('%Y-%m-%d'), getLines(o)), 0)) ]] [[ company.currency_id.symbol ]]</para>
@@ -214,6 +216,8 @@
</para>
</td>
</tr>
+ </blockTable>
+ <blockTable colWidths="193.0,92.0,100.0,147.0" style="Table3">
<tr>
<td>
<para style="terp_default_8">
@@ -224,27 +228,14 @@
<para style="terp_tblheader_Details">Balance: </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x,y: x+(y['debit'] - y['credit']), getLines(o), 0.00))) ]] [[ company.currency_id.symbol]] </para>
- </td>
- <td>
- <para style="terp_default_Right_9">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="Standard">
- <font color="white"> </font>
- </para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang((reduce(lambda x,y: x+(y['debit'] - y['credit']), getLines(o), 0.00))) ]] [[ company.currency_id.symbol]] </para>
</td>
<td>
- <para style="Standard">
+ <para style="terp_default_8">
<font color="white"> </font>
</para>
</td>
</tr>
</blockTable>
- <para style="terp_default_8">
- <font color="white"> </font>
- </para>
</story>
</document>
\ No newline at end of file
diff --git a/addons/account_followup/report/account_followup_report.py b/addons/account_followup/report/account_followup_report.py
index 8f6011a3b97b02d0a4e497acb271049e1d38094d..00dfe3a99988fdd9ae7b3180b0273fee94b2398d 100644
--- a/addons/account_followup/report/account_followup_report.py
+++ b/addons/account_followup/report/account_followup_report.py
@@ -93,8 +93,8 @@ class account_followup_stat(osv.osv):
sum(l.debit) as debit,
sum(l.credit) as credit,
sum(l.debit - l.credit) as balance,
- a.type as account_type ,
- l.company_id as company_id ,
+ a.type as account_type,
+ l.company_id as company_id,
l.blocked,
am.period_id as period_id
from
@@ -111,7 +111,7 @@ class account_followup_stat(osv.osv):
l.company_id is not NULL and
l.blocked is not NULL
group by
- l.partner_id, a.type , l.company_id ,l.blocked ,am.period_id
+ l.partner_id, a.type, l.company_id,l.blocked,am.period_id
)""")
account_followup_stat()
diff --git a/addons/account_followup/security/ir.model.access.csv b/addons/account_followup/security/ir.model.access.csv
index ccf257b3ecff43886b83c36ca5e5009033771fe6..60d179d3cbe271b019b1ef784d23a585d76bf8a7 100644
--- a/addons/account_followup/security/ir.model.access.csv
+++ b/addons/account_followup/security/ir.model.access.csv
@@ -1,9 +1,6 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_account_followup_followup","account_followup.followup","model_account_followup_followup","base.group_system",1,1,1,1
"access_account_followup_followup_line","account_followup.followup.line","model_account_followup_followup_line","account.group_account_user",1,0,0,0
"access_account_followup_stat_manager","account_followup.stat.manager","model_account_followup_stat","account.group_account_manager",1,1,1,1
-"access_account_followup_followup_manager","account_followup.followup.manager","model_account_followup_followup","base.group_system",1,1,1,1
"access_account_followup_followup_line_manager","account_followup.followup.line.manager","model_account_followup_followup_line","account.group_account_manager",1,1,1,1
-"access_account_followup_followup_line_system","account_followup.followup.line system","model_account_followup_followup_line","base.group_system",1,1,1,1
"access_account_followup_followup_accountant","account_followup.followup user","model_account_followup_followup","account.group_account_user",1,0,0,0
"access_account_followup_stat_invoice","account_followup.stat.invoice","model_account_followup_stat","account.group_account_invoice",1,1,1,1
diff --git a/addons/account_invoice_layout/account_invoice_layout_view.xml b/addons/account_invoice_layout/account_invoice_layout_view.xml
index c9d3e32e892048f08498a7ba5ac774a8787b036a..0d6a35657847917fa2e1b4b8092013b4a16acee3 100644
--- a/addons/account_invoice_layout/account_invoice_layout_view.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_view.xml
@@ -55,6 +55,17 @@
</record>
<!-- notification message views -->
+ <record model="ir.ui.view" id="view_notify_message_search">
+ <field name="name">notify.message.search</field>
+ <field name="model">notify.message</field>
+ <field name="type">search</field>
+ <field name="arch" type="xml">
+ <search string="Messages">
+ <field name="name"/>
+ <field name="msg"/>
+ </search>
+ </field>
+ </record>
<record model="ir.ui.view" id="view_notify_message_tree">
<field name="name">notify.message.tree</field>
<field name="model">notify.message</field>
@@ -73,10 +84,10 @@
<field name="arch" type="xml">
<form string="Messages">
<separator string="Write a notification or a wishful message." colspan="4"/>
- <field name="name" select="1" colspan="2" />
+ <field name="name" colspan="2" />
<newline/>
<separator string="Special Message" colspan="4"/>
- <field name="msg" select="1" nolabel="1" colspan="2"/>
+ <field name="msg" nolabel="1" colspan="2"/>
</form>
</field>
</record>
@@ -85,10 +96,11 @@
<field name="res_model">notify.message</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
+ <field name="search_view_id" ref="view_notify_message_search"/>
</record>
<menuitem name="Notification Message" id="menu_finan_config_notify_message" parent="account.menu_finance_configuration"/>
- <menuitem name="All Notification Messages" id="menu_notify_mesage_tree_form" action="notify_mesage_tree_form" parent="menu_finan_config_notify_message" groups="base.group_system"/>
+ <menuitem name="All Notification Messages" id="menu_notify_mesage_tree_form" action="notify_mesage_tree_form" parent="menu_finan_config_notify_message"/>
</data>
</openerp>
diff --git a/addons/account_invoice_layout/i18n/sr.po b/addons/account_invoice_layout/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..ae168dc498c63fb28b5107d19fcee0a4e32165cf
--- /dev/null
+++ b/addons/account_invoice_layout/i18n/sr.po
@@ -0,0 +1,312 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-15 09:39+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-16 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Sub Total"
+msgstr "Subtotal"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Invoice Date:"
+msgstr "Datum fakture:"
+
+#. module: account_invoice_layout
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da poÄinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Cancelled Invoice"
+msgstr "Otkazane Fakture"
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+#: field:notify.message,name:0
+msgid "Title"
+msgstr "Naslov"
+
+#. module: account_invoice_layout
+#: model:ir.actions.wizard,name:account_invoice_layout.wizard_notify_message
+msgid "Invoices with Layout and Message"
+msgstr "Formatirana Faktura sa Porukom"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Disc. (%)"
+msgstr "Popust (%)"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "(Incl. taxes):"
+msgstr "Urac.porezi"
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Note"
+msgstr "Napomena"
+
+#. module: account_invoice_layout
+#: wizard_button:wizard.notify_message,init,print:0
+msgid "Print"
+msgstr "Å tampaj"
+
+#. module: account_invoice_layout
+#: help:notify.message,msg:0
+msgid ""
+"This notification will appear at the bottom of the Invoices when printed."
+msgstr "Ova napomena ce se pojaviti na dnu fakture pri stampi"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Unit Price"
+msgstr "JediniÄna cijena"
+
+#. module: account_invoice_layout
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: account_invoice_layout
+#: model:ir.model,name:account_invoice_layout.model_notify_message
+msgid "Notify By Messages"
+msgstr "Napomena po porukama"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "PRO-FORMA"
+msgstr "PredraÄun"
+
+#. module: account_invoice_layout
+#: field:account.invoice,abstract_line_ids:0
+msgid "Invoice Lines"
+msgstr "Stavke raÄuna"
+
+#. module: account_invoice_layout
+#: view:account.invoice.line:0
+msgid "Seq."
+msgstr "Sekv."
+
+#. module: account_invoice_layout
+#: model:ir.ui.menu,name:account_invoice_layout.menu_finan_config_notify_message
+msgid "Notification Message"
+msgstr "Poruka Napomene"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Customer Ref:"
+msgstr "Referenca kupca:"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid ")"
+msgstr ")"
+
+#. module: account_invoice_layout
+#: field:account.invoice.line,state:0
+msgid "Type"
+msgstr "Tip"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Price"
+msgstr "Cena"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "/ ("
+msgstr "/("
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Taxes:"
+msgstr "Porezi:"
+
+#. module: account_invoice_layout
+#: field:account.invoice.line,functional_field:0
+msgid "Source Account"
+msgstr "Изворни налог"
+
+#. module: account_invoice_layout
+#: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
+msgid "Write Messages"
+msgstr "Napisi Poruke"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Base"
+msgstr "Osnova"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: account_invoice_layout
+#: field:notify.message,msg:0
+msgid "Special Message"
+msgstr "Specijalna Poruka"
+
+#. module: account_invoice_layout
+#: view:notify.message:0
+msgid "Write a notification or a wishful message."
+msgstr "Napisi napomenu ili celu poruku"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: account_invoice_layout
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Page Break"
+msgstr "Прелом Ñтране"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Document:"
+msgstr "Dokument"
+
+#. module: account_invoice_layout
+#: wizard_view:wizard.notify_message,init:0
+msgid "Select Message"
+msgstr "Odaberite poruku"
+
+#. module: account_invoice_layout
+#: view:notify.message:0
+msgid "Messages"
+msgstr "Poruke"
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Product"
+msgstr "Proizvod"
+
+#. module: account_invoice_layout
+#: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_1
+msgid "Invoices with Layout"
+msgstr "Formatirana Faktura"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Description / Taxes"
+msgstr "Opis / Porezi"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Amount"
+msgstr "Iznos"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Description/Taxes"
+msgstr "Opis/Porezi"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Draft Invoice"
+msgstr "Neodobreni raÄuni"
+
+#. module: account_invoice_layout
+#: field:account.invoice.line,sequence:0
+msgid "Sequence Number"
+msgstr "Broj Sekvence"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Quantity"
+msgstr "KoliÄina"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Refund"
+msgstr "Refundiraj"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "VATÂ :"
+msgstr "PDVÂ :"
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Separator Line"
+msgstr "Linija za odvajanje"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Supplier Invoice"
+msgstr "RaÄun dobavljaÄa"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Note :"
+msgstr "Napomena :"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Tax"
+msgstr "Porez"
+
+#. module: account_invoice_layout
+#: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
+msgid "account_invoice_layout"
+msgstr "izgled_fakture_naloga"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Total (Excl. taxes):"
+msgstr "Ukupno (bez poreza):"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Invoice"
+msgstr "RaÄun"
+
+#. module: account_invoice_layout
+#: wizard_button:wizard.notify_message,init,end:0
+msgid "Cancel"
+msgstr "Otkaži"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Supplier Refund"
+msgstr "Povrat DobavljaÄu"
+
+#. module: account_invoice_layout
+#: wizard_field:wizard.notify_message,init,message:0
+msgid "Message"
+msgstr "Poruka"
+
+#. module: account_invoice_layout
+#: rml:account.invoice.layout:0
+msgid "Total"
+msgstr "Ukupno"
+
+#. module: account_invoice_layout
+#: model:ir.ui.menu,name:account_invoice_layout.menu_notify_mesage_tree_form
+msgid "All Notification Messages"
+msgstr "Sve Napomene"
diff --git a/addons/account_invoice_layout/report/report_account_invoice_layout.rml b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
index cd23fc1f4ac7c235fa5475e74ce5e865cc3d6d3a..df7c25f3de8b43e5db0f990c80f61282967a04fc 100644
--- a/addons/account_invoice_layout/report/report_account_invoice_layout.rml
+++ b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Invoices" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Invoices.pdf">
+ <template pageSize="(595.0,842.0)" title="Invoices" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
</pageTemplate>
@@ -185,18 +185,18 @@
</para>
</td>
<td>
- <para style="terp_default_9">[[ o.partner_id.title.name or '' ]] [[ o.partner_id.name ]]</para>
- <para style="terp_default_9">[[ o.address_invoice_id.street ]]</para>
- <para style="terp_default_9">[[ o.address_invoice_id.street2 or removeParentNode('para') ]]</para>
- <para style="terp_default_9">[[ o.address_invoice_id.zip or '' ]][[ o.address_invoice_id.city or '' ]]</para>
- <para style="terp_default_9">[[ (o.address_invoice_id.state_id and o.address_invoice_id.state_id.name) or removeParentNode('para')]]</para>
- <para style="terp_default_9">[[ o.address_invoice_id.country_id and o.address_invoice_id.country_id.name or '' ]]</para>
- <para style="terp_default_9">
+ <para style="terp_default_8">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
+ <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.street) or '' ]]</para>
+ <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.street2) or removeParentNode('para') ]]</para>
+ <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.zip) or '' ]] [[ (o.address_invoice_id and o.address_invoice_id.city) or '' ]]</para>
+ <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.state_id and o.address_invoice_id.state_id.name) or removeParentNode('para') ]]</para>
+ <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.country_id and o.address_invoice_id.country_id.name) or '' ]]</para>
+ <para style="terp_default_8">
<font color="white"> </font>
</para>
- <para style="terp_default_9">Tel. : [[ o.address_invoice_id.phone or removeParentNode('para') ]]</para>
- <para style="terp_default_9">Fax : [[ o.address_invoice_id.fax or removeParentNode('para') ]]</para>
- <para style="terp_default_9">VAT : [[ o.partner_id.vat or removeParentNode('para') ]]</para>
+ <para style="terp_default_8">Tel. : [[ (o.address_invoice_id and o.address_invoice_id.phone) or removeParentNode('para') ]]</para>
+ <para style="terp_default_8">Fax : [[ (o.address_invoice_id and o.address_invoice_id.fax) or removeParentNode('para') ]]</para>
+ <para style="terp_default_8">VAT : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
</td>
</tr>
</blockTable>
@@ -238,7 +238,7 @@
<para style="terp_default_Centre_8">[[ formatLang(o.date_invoice,date=True) ]]</para>
</td>
<td>
- <para style="terp_default_Centre_8">[[ o.address_invoice_id.partner_id.ref or '' ]]</para>
+ <para style="terp_default_Centre_9">[[ (o.address_invoice_id and o.address_invoice_id.partner_id and o.address_invoice_id.partner_id.ref) or ' ' ]]</para>
</td>
</tr>
</blockTable>
@@ -416,10 +416,10 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
- <blockTable colWidths="105.0,52.0,62.0,320.0" style="Table7">
+ <blockTable colWidths="206.0,50.0,52.0,230.0" style="Table7">
<tr>
<td>
- <para style="terp_tblheader_Details">Tax</para>
+ <para style="terp_tblheader_Details">Tax [[ o.tax_line==[] and removeParentNode('blockTable') ]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Base</para>
@@ -436,16 +436,16 @@
</blockTable>
<section>
<para style="terp_default_8">[[ repeatIn(o.tax_line,'t') ]]</para>
- <blockTable colWidths="105.0,51.0,63.0,320.0" style="Table8">
+ <blockTable colWidths="206.0,49.0,52.0,230.0" style="Table8">
<tr>
<td>
<para style="terp_default_8">[[ t.name ]]</para>
</td>
<td>
- <para style="terp_default_Right_8">[[ formatLang(t.base, digits=get_digits(dp='Account')) ]]</para>
+ <para style="terp_default_Right_8">[[ formatLang(t.base, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
</td>
<td>
- <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account')) ]]</para>
+ <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_8">
diff --git a/addons/account_invoice_layout/report/special_message_invoice.rml b/addons/account_invoice_layout/report/special_message_invoice.rml
index dafde3d34a6da1ddb0d5f518dcefab5db30c9311..2925b3526b88aaa115b792c231ae964cef98b71a 100644
--- a/addons/account_invoice_layout/report/special_message_invoice.rml
+++ b/addons/account_invoice_layout/report/special_message_invoice.rml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Invoices" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Invoices.pdf">
+ <template pageSize="(595.0,842.0)" title="Invoices" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
</pageTemplate>
@@ -189,18 +189,18 @@
</para>
</td>
<td>
- <para style="terp_default_9">[[ o.partner_id.title.name or '' ]] [[ o.partner_id.name ]]</para>
- <para style="terp_default_9">[[ o.address_invoice_id.street ]]</para>
- <para style="terp_default_9">[[ o.address_invoice_id.street2 or removeParentNode('para')]]</para>
- <para style="terp_default_9">[[ o.address_invoice_id.zip or '' ]][[ o.address_invoice_id.city or '' ]]</para>
- <para style="terp_default_9">[[ (o.address_invoice_id.state_id and o.address_invoice_id.state_id.name) or removeParentNode('para') ]]</para>
- <para style="terp_default_9">[[ o.address_invoice_id.country_id and o.address_invoice_id.country_id.name or '' ]]</para>
- <para style="terp_default_9">
+ <para style="terp_default_8">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
+ <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.street) or '' ]]</para>
+ <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.street2) or removeParentNode('para') ]]</para>
+ <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.zip) or '' ]] [[ (o.address_invoice_id and o.address_invoice_id.city) or '' ]]</para>
+ <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.state_id and o.address_invoice_id.state_id.name) or removeParentNode('para') ]]</para>
+ <para style="terp_default_8">[[ (o.address_invoice_id and o.address_invoice_id.country_id and o.address_invoice_id.country_id.name) or '' ]]</para>
+ <para style="terp_default_8">
<font color="white"> </font>
</para>
- <para style="terp_default_9">Tel. : [[ o.address_invoice_id.phone or removeParentNode('para') ]]</para>
- <para style="terp_default_9">Fax : [[ o.address_invoice_id.fax or removeParentNode('para') ]]</para>
- <para style="terp_default_9">VAT : [[ o.partner_id.vat or removeParentNode('para') ]]</para>
+ <para style="terp_default_8">Tel. : [[ (o.address_invoice_id and o.address_invoice_id.phone) or removeParentNode('para') ]]</para>
+ <para style="terp_default_8">Fax : [[ (o.address_invoice_id and o.address_invoice_id.fax) or removeParentNode('para') ]]</para>
+ <para style="terp_default_8">VAT : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
</td>
</tr>
</blockTable>
@@ -242,7 +242,7 @@
<para style="terp_default_Centre_9">[[ formatLang(o.date_invoice,date=True) ]]</para>
</td>
<td>
- <para style="terp_default_Centre_9">[[ o.address_invoice_id.partner_id.ref or '' ]]</para>
+ <para style="terp_default_Centre_9">[[ (o.address_invoice_id and o.address_invoice_id.partner_id and o.address_invoice_id.partner_id.ref) or ' ' ]]</para>
</td>
</tr>
</blockTable>
@@ -420,10 +420,10 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
- <blockTable colWidths="119.0,50.0,59.0,310.0" style="Table7">
+ <blockTable colWidths="209.0,54.0,46.0,229.0" style="Table7">
<tr>
<td>
- <para style="terp_tblheader_Details">Tax</para>
+ <para style="terp_tblheader_Details">Tax [[ o.tax_line==[] and removeParentNode('blockTable') ]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">Base</para>
@@ -439,17 +439,17 @@
</tr>
</blockTable>
<section>
- <para style="terp_default_8">[[ repeatIn(o.tax_line,'t') ]]</para>
- <blockTable colWidths="120.0,49.0,60.0,310.0" style="Table8">
+ <para style="terp_default_1">[[ repeatIn(o.tax_line,'t') ]]</para>
+ <blockTable colWidths="209.0,55.0,46.0,229.0" style="Table8">
<tr>
<td>
<para style="terp_default_8">[[ t.name ]]</para>
</td>
<td>
- <para style="terp_default_Right_8">[[ formatLang(t.base, digits=get_digits(dp='Account')) ]]</para>
+ <para style="terp_default_Right_8">[[ formatLang(t.base, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
</td>
<td>
- <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account')) ]]</para>
+ <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_default_Right_8">
diff --git a/addons/account_invoice_layout/security/ir.model.access.csv b/addons/account_invoice_layout/security/ir.model.access.csv
index 6eede39eb70fff9bcb65ae452c05264a9054b7a5..c838392e6eb78e362b57148fc5ea5c98849232cb 100644
--- a/addons/account_invoice_layout/security/ir.model.access.csv
+++ b/addons/account_invoice_layout/security/ir.model.access.csv
@@ -1,3 +1,2 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_notify_message,notify.message,model_notify_message,account.group_account_invoice,1,1,1,1
-access_notify_message_system,notify.message system,model_notify_message,base.group_system,1,1,1,1
diff --git a/addons/account_payment/i18n/mn.po b/addons/account_payment/i18n/mn.po
index fe5de359e295ef749b0654459960f3967fe2b59a..5bd7975811f1930d649fcdcfc8007cae35e549e6 100644
--- a/addons/account_payment/i18n/mn.po
+++ b/addons/account_payment/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 10:42+0000\n"
+"PO-Revision-Date: 2010-10-15 09:14+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Mongolian <mn@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-09-30 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
@@ -288,7 +288,7 @@ msgstr "Төлбөрийн менежмент"
#. module: account_payment
#: field:payment.line,communication:0
msgid "Communication"
-msgstr "Харилцаа"
+msgstr "ГүйлгÑÑний утга"
#. module: account_payment
#: selection:payment.order,date_prefered:0
@@ -335,7 +335,7 @@ msgstr "Харилцагч"
#. module: account_payment
#: help:payment.line,communication2:0
msgid "The successor message of Communication."
-msgstr "Өмнөх харилцÑан меÑÑеж"
+msgstr "Залгамжлагчтай холбоотой мÑдÑÑлÑл"
#. module: account_payment
#: help:payment.line,info_partner:0
@@ -500,12 +500,12 @@ msgstr "Төлөлт хайх"
#. module: account_payment
#: field:payment.line,amount_currency:0
msgid "Amount in Partner Currency"
-msgstr "Харилцагчийн валютаархи дүн"
+msgstr "Дүн харилцагчийн валютаар"
#. module: account_payment
#: field:payment.line,communication2:0
msgid "Communication 2"
-msgstr "Харилцах 2"
+msgstr "Дагалдах баримт"
#. module: account_payment
#: field:payment.line,bank_id:0
@@ -544,7 +544,7 @@ msgstr "Төлбөр"
#. module: account_payment
#: field:payment.line,move_line_id:0
msgid "Entry line"
-msgstr "БичлÑг"
+msgstr "Журналын бичлÑг"
#. module: account_payment
#: help:payment.line,communication:0
@@ -570,7 +570,7 @@ msgstr "_Хайх"
#: view:payment.line:0
#: view:payment.order:0
msgid "Entry Information"
-msgstr "БичлÑгийн мÑдÑÑлÑл"
+msgstr "Журналын бичлÑгийн мÑдÑÑлÑл"
#. module: account_payment
#: model:ir.actions.wizard,name:account_payment.wizard_populate_statement
diff --git a/addons/account_payment/i18n/ru.po b/addons/account_payment/i18n/ru.po
index a77dfcf2567a128446eb2f0a0b95a1bbe31a7a1c..0ab2bcf63ff5d03ddccff45b8663e2f913cdd2fc 100644
--- a/addons/account_payment/i18n/ru.po
+++ b/addons/account_payment/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 10:53+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2010-10-16 09:33+0000\n"
+"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
@@ -275,7 +275,7 @@ msgstr "ПроизвеÑти платежи"
#. module: account_payment
#: field:payment.line,state:0
msgid "Communication Type"
-msgstr ""
+msgstr "Тип коммуникации"
#. module: account_payment
#: model:ir.module.module,shortdesc:account_payment.module_meta_information
@@ -332,7 +332,7 @@ msgstr "Партнер"
#. module: account_payment
#: help:payment.line,communication2:0
msgid "The successor message of Communication."
-msgstr ""
+msgstr "Приемник ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð¼ÑƒÐ½Ð¸ÐºÐ°Ñ†Ð¸Ð¸"
#. module: account_payment
#: help:payment.line,info_partner:0
@@ -502,7 +502,7 @@ msgstr "Сумма в валюте партнера"
#. module: account_payment
#: field:payment.line,communication2:0
msgid "Communication 2"
-msgstr ""
+msgstr "Коммуникации 2"
#. module: account_payment
#: field:payment.line,bank_id:0
diff --git a/addons/account_payment/i18n/sr.po b/addons/account_payment/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..4fd733e9ea5fa1b9f6638ad6a2096c50ec1edb8a
--- /dev/null
+++ b/addons/account_payment/i18n/sr.po
@@ -0,0 +1,626 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-15 09:18+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-16 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_payment
+#: field:payment.order,date_scheduled:0
+msgid "Scheduled date if fixed"
+msgstr "Zakazani datum ako je fiskno"
+
+#. module: account_payment
+#: field:payment.line,currency:0
+msgid "Partner Currency"
+msgstr "Valuta partnera"
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Set to draft"
+msgstr "Postavi za obradu"
+
+#. module: account_payment
+#: help:payment.order,mode:0
+msgid "Select the Payment Mode to be applied."
+msgstr "Odaberite naÄin plaćanja koji će biti primenjen."
+
+#. module: account_payment
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: account_payment
+#: view:payment.line:0
+#: field:payment.line,info_owner:0
+#: view:payment.order:0
+msgid "Owner Account"
+msgstr "RaÄun vlasnika"
+
+#. module: account_payment
+#: help:account.invoice,amount_to_pay:0
+msgid ""
+"The amount which should be paid at the current date\n"
+"minus the amount which is already in payment order"
+msgstr ""
+"Iznos koji bi trebao biti plaćen na tekući datum\n"
+"minus iznos koji je već u nalogu za plaćanje"
+
+#. module: account_payment
+#: help:payment.line,date:0
+msgid ""
+"If no payment date is specified, the bank will treat this payment line "
+"directly"
+msgstr ""
+"Ako nije naveden datum plaćanja, banka će smatrati da je ovaj red plaćanja "
+"poravnan."
+
+#. module: account_payment
+#: field:payment.order,date_prefered:0
+msgid "Preferred date"
+msgstr "Zeljeni Datum"
+
+#. module: account_payment
+#: selection:payment.line,state:0
+msgid "Free"
+msgstr "slobodno"
+
+#. module: account_payment
+#: wizard_field:populate_payment,search,entries:0
+msgid "Entries"
+msgstr "Stavke"
+
+#. module: account_payment
+#: wizard_field:populate_payment,init,duedate:0
+msgid "Due Date"
+msgstr "Datum dospeća"
+
+#. module: account_payment
+#: view:account.move.line:0
+msgid "Account Entry Line"
+msgstr "Stavke knjiženja"
+
+#. module: account_payment
+#: wizard_button:populate_payment,search,create:0
+msgid "_Add to payment order"
+msgstr "_Dodaj u nalog za plaćanje"
+
+#. module: account_payment
+#: rml:payment.order:0
+#: view:payment.order:0
+msgid "Amount"
+msgstr "Iznos"
+
+#. module: account_payment
+#: rml:payment.order:0
+msgid "Execution date:"
+msgstr "Datum izvršenja:"
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Total in Company Currency"
+msgstr "Ukupno u valuti preduzeca"
+
+#. module: account_payment
+#: selection:payment.order,state:0
+msgid "Cancelled"
+msgstr "Otkazano"
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree_new
+#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_form_new
+msgid "New Payment Order"
+msgstr "Novi nalog za plaćanje"
+
+#. module: account_payment
+#: rml:payment.order:0
+#: field:payment.order,reference:0
+msgid "Reference"
+msgstr "Referenca"
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
+#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_form
+msgid "Payment Orders"
+msgstr "Nalozi za plaćanje"
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Directly"
+msgstr "Direktno"
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_line_form
+#: model:ir.model,name:account_payment.model_payment_line
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Payment Line"
+msgstr "Red plaćanja"
+
+#. module: account_payment
+#: field:payment.type,suitable_bank_types:0
+msgid "Suitable bank types"
+msgstr "Pogodni tipovi banaka"
+
+#. module: account_payment
+#: view:payment.line:0
+msgid "Amount Total"
+msgstr "Ukupni iznos"
+
+#. module: account_payment
+#: selection:payment.order,state:0
+msgid "Confirmed"
+msgstr "Potvrđeno"
+
+#. module: account_payment
+#: help:payment.line,ml_date_created:0
+msgid "Invoice Effective Date"
+msgstr "Efektivni datum fakture"
+
+#. module: account_payment
+#: field:payment.order,line_ids:0
+msgid "Payment lines"
+msgstr "Redovi plaćanja"
+
+#. module: account_payment
+#: help:payment.order,date_scheduled:0
+msgid "Select a date if you have chosen Preferred Date to be fixed."
+msgstr "Odaberite datum ako ste odabrali fiksni željeni datum"
+
+#. module: account_payment
+#: selection:payment.line,state:0
+msgid "Structured"
+msgstr "Strukturiran"
+
+#. module: account_payment
+#: field:payment.order,state:0
+msgid "State"
+msgstr "Stanje"
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Transaction Information"
+msgstr "Informacije Transakcije"
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_mode_form
+#: model:ir.ui.menu,name:account_payment.menu_action_payment_mode_form
+#: view:payment.mode:0
+msgid "Payment Mode"
+msgstr "NaÄin plaćanja"
+
+#. module: account_payment
+#: field:payment.line,ml_date_created:0
+msgid "Effective Date"
+msgstr "Efektivni datum"
+
+#. module: account_payment
+#: field:payment.line,ml_inv_ref:0
+msgid "Invoice Ref."
+msgstr "Ref. Faktura"
+
+#. module: account_payment
+#: help:payment.order,date_prefered:0
+msgid ""
+"Choose an option for the Payment Order:'Fixed' stands for a date specified "
+"by you.'Directly' stands for the direct execution.'Due date' stands for the "
+"scheduled date of execution."
+msgstr ""
+"Odaberite opciju za nalog za plaćanje: \"Fiksno\" znaÄi datum naveden od "
+"vaÅ¡e strane. \"Direktno\" znaÄi direktno izvrÅ¡enje. \"Datum odgode\" znaÄi "
+"zakazan datum izvršenja."
+
+#. module: account_payment
+#: view:account.move.line:0
+msgid "Total debit"
+msgstr "Ukupno duguje"
+
+#. module: account_payment
+#: field:payment.order,date_done:0
+msgid "Execution date"
+msgstr "Datum izvršenja"
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Fixed date"
+msgstr "Fiksni datum"
+
+#. module: account_payment
+#: field:payment.line,info_partner:0
+msgid "Destination Account"
+msgstr "Ciljni raÄun"
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Desitination Account"
+msgstr "Ciljni raÄun"
+
+#. module: account_payment
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: account_payment
+#: wizard_button:populate_payment,init,end:0
+#: wizard_button:populate_payment,search,end:0
+#: wizard_button:populate_statement,init,end:0
+msgid "_Cancel"
+msgstr "_Odustani"
+
+#. module: account_payment
+#: field:payment.line,create_date:0
+msgid "Created"
+msgstr "Kreirano"
+
+#. module: account_payment
+#: view:payment.line:0
+msgid "Currency Amount Total"
+msgstr "Ukupni iznos valute"
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Make Payments"
+msgstr "Napravite plaćanja"
+
+#. module: account_payment
+#: field:payment.line,state:0
+msgid "Communication Type"
+msgstr "Tip Komunikacije"
+
+#. module: account_payment
+#: model:ir.module.module,shortdesc:account_payment.module_meta_information
+msgid "Payment Management"
+msgstr "Menadzment Plaćanja"
+
+#. module: account_payment
+#: field:payment.line,communication:0
+msgid "Communication"
+msgstr "Komunikacija"
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Due date"
+msgstr "Krajnji Rok"
+
+#. module: account_payment
+#: field:account.invoice,amount_to_pay:0
+msgid "Amount to be paid"
+msgstr "Iznos za plaćanje"
+
+#. module: account_payment
+#: help:payment.line,info_owner:0
+msgid "Address of the Main Partner"
+msgstr "Adresa glavnog partnera"
+
+#. module: account_payment
+#: help:payment.mode,name:0
+msgid "Mode of Payment"
+msgstr "NaÄin plaćanja"
+
+#. module: account_payment
+#: view:payment.type:0
+#: help:payment.type,name:0
+msgid "Payment Type"
+msgstr "Tip plaćanja"
+
+#. module: account_payment
+#: help:payment.line,amount_currency:0
+msgid "Payment amount in the partner currency"
+msgstr "Iznos plaćanja u valuti partnera"
+
+#. module: account_payment
+#: selection:payment.order,state:0
+msgid "Draft"
+msgstr "Priprema"
+
+#. module: account_payment
+#: field:payment.line,partner_id:0
+#: rml:payment.order:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: account_payment
+#: help:payment.line,communication2:0
+msgid "The successor message of Communication."
+msgstr "Nasljedna poruka komunikacije."
+
+#. module: account_payment
+#: help:payment.line,info_partner:0
+msgid "Address of the Ordering Customer."
+msgstr "Adresa kupca naruÄitelja."
+
+#. module: account_payment
+#: view:account.move.line:0
+msgid "Total credit"
+msgstr "Ukupno potražuje"
+
+#. module: account_payment
+#: model:ir.actions.wizard,name:account_payment.wizard_populate_payment
+msgid "Populate payment"
+msgstr "Popuni plaćanje"
+
+#. module: account_payment
+#: field:payment.order,user_id:0
+msgid "User"
+msgstr "Korisnik"
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.act_account_invoice_2_payment_line
+#: wizard_field:populate_statement,init,lines:0
+msgid "Payment Lines"
+msgstr "Redovi plaćanja"
+
+#. module: account_payment
+#: rml:payment.order:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: account_payment
+#: rml:payment.order:0
+msgid "Reference:"
+msgstr "Referenca:"
+
+#. module: account_payment
+#: help:payment.line,move_line_id:0
+msgid ""
+"This Entry Line will be referred for the information of the ordering "
+"customer."
+msgstr "Ovaj red će biti odreÄ‘en za informaciju o naruÄitelju."
+
+#. module: account_payment
+#: field:payment.line,date:0
+msgid "Payment Date"
+msgstr "Datum Isplate"
+
+#. module: account_payment
+#: field:payment.order,date_created:0
+msgid "Creation date"
+msgstr "Datum kreiranja"
+
+#. module: account_payment
+#: field:payment.line,ml_maturity_date:0
+msgid "Maturity Date"
+msgstr "Datum Dospeća"
+
+#. module: account_payment
+#: view:account.bank.statement:0
+msgid "Import payment lines"
+msgstr "Uvezi redove plaćanja"
+
+#. module: account_payment
+#: help:payment.type,code:0
+msgid "Specify the Code for Payment Type"
+msgstr "Navedite šifru tipa plaćanja"
+
+#. module: account_payment
+#: field:account.move.line,amount_to_pay:0
+msgid "Amount to pay"
+msgstr "Iznos za plaćanje"
+
+#. module: account_payment
+#: field:payment.line,amount:0
+msgid "Amount in Company Currency"
+msgstr "Iznos u valuti preduzeca"
+
+#. module: account_payment
+#: help:payment.line,partner_id:0
+msgid "The Ordering Customer"
+msgstr "Kupac naruÄitelj"
+
+#. module: account_payment
+#: field:payment.type,code:0
+msgid "Code"
+msgstr "Å ifra"
+
+#. module: account_payment
+#: field:payment.line,name:0
+msgid "Your Reference"
+msgstr "Vaše veze"
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Payment order"
+msgstr "Nalog za plaćanje"
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "General Information"
+msgstr "Opšte informacije"
+
+#. module: account_payment
+#: selection:payment.order,state:0
+msgid "Done"
+msgstr "Gotovo"
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Select Invoices to Pay"
+msgstr "Odaberite fakture za plaćanje"
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Cancel"
+msgstr "Otkaži"
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Information"
+msgstr "Informacija"
+
+#. module: account_payment
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da poÄinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: account_payment
+#: model:ir.actions.wizard,name:account_payment.wizard_pay_payment
+msgid "Pay"
+msgstr "Plati"
+
+#. module: account_payment
+#: model:ir.actions.report.xml,name:account_payment.payment_order1
+#: model:ir.model,name:account_payment.model_payment_order
+msgid "Payment Order"
+msgstr "Nalog za plaćanje"
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_order_draft
+#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_draft
+msgid "Draft Payment Order"
+msgstr "Nalog za plaćanje u pripremi"
+
+#. module: account_payment
+#: help:payment.line,amount:0
+msgid "Payment amount in the company currency"
+msgstr "Iznos plaćanja u valuti preduzeca"
+
+#. module: account_payment
+#: wizard_view:populate_payment,init:0
+msgid "Search Payment lines"
+msgstr "Traži redove plaćanja"
+
+#. module: account_payment
+#: field:payment.line,amount_currency:0
+msgid "Amount in Partner Currency"
+msgstr "Iznos u valuti partnera"
+
+#. module: account_payment
+#: field:payment.line,communication2:0
+msgid "Communication 2"
+msgstr "Komunikacija 2"
+
+#. module: account_payment
+#: field:payment.line,bank_id:0
+msgid "Destination Bank account"
+msgstr "Destinacioni bankovni raÄun"
+
+#. module: account_payment
+#: help:payment.mode,journal:0
+msgid "Cash Journal for the Payment Mode"
+msgstr "Gotovisnki Dnevnik za naÄin plaćanja"
+
+#. module: account_payment
+#: field:payment.mode,bank_id:0
+#: rml:payment.order:0
+msgid "Bank account"
+msgstr "Bankovni raÄun"
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Confirm Payments"
+msgstr "Potvrdi plaćanja"
+
+#. module: account_payment
+#: field:payment.line,company_currency:0
+msgid "Company Currency"
+msgstr "Valuta preduzeca"
+
+#. module: account_payment
+#: model:ir.ui.menu,name:account_payment.menu_main
+#: model:ir.ui.menu,name:account_payment.next_id_44
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Payment"
+msgstr "Isplata"
+
+#. module: account_payment
+#: field:payment.line,move_line_id:0
+msgid "Entry line"
+msgstr "Red unosa"
+
+#. module: account_payment
+#: help:payment.line,communication:0
+msgid ""
+"Used as the message between ordering customer and current company. Depicts "
+"'What do you want to say to the recipient about this order ?'"
+msgstr ""
+"Koristi se kao poruka izmedju narucioca i date kompanije. Objasnjava ' Sta "
+"ste to hteli reci kupcu o ovoj narudzbi?'"
+
+#. module: account_payment
+#: field:payment.mode,name:0
+#: field:payment.type,name:0
+msgid "Name"
+msgstr "Ime"
+
+#. module: account_payment
+#: wizard_button:populate_payment,init,search:0
+msgid "_Search"
+msgstr "_Traži"
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Entry Information"
+msgstr "Unos Informacije"
+
+#. module: account_payment
+#: model:ir.actions.wizard,name:account_payment.wizard_populate_statement
+msgid "Populate Statement with Payment lines"
+msgstr "Popunite izvod sa redovima plaćanja"
+
+#. module: account_payment
+#: field:payment.line,order_id:0
+msgid "Order"
+msgstr "Nalog"
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_order_open
+#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_open
+msgid "Payment Orders to Validate"
+msgstr "Nalozi za plaćanje za potvrdu"
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_payment_type
+#: field:payment.mode,type:0
+msgid "Payment type"
+msgstr "Tip plaćanja"
+
+#. module: account_payment
+#: field:payment.order,total:0
+msgid "Total"
+msgstr "Ukupno"
+
+#. module: account_payment
+#: wizard_button:populate_statement,init,add:0
+msgid "_Add"
+msgstr "_Dodaj"
+
+#. module: account_payment
+#: help:payment.mode,type:0
+msgid "Select the Payment Type for the Payment Mode."
+msgstr "Odaberite tip plaćanja za naÄin plaćanja"
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_payment_mode
+#: field:payment.order,mode:0
+msgid "Payment mode"
+msgstr "NaÄin plaćanja"
+
+#. module: account_payment
+#: help:payment.mode,bank_id:0
+msgid "Bank Account for the Payment Mode"
+msgstr "Bankovni raÄun za naÄin plaćanja"
+
+#. module: account_payment
+#: field:payment.mode,journal:0
+msgid "Journal"
+msgstr "Dnevnik"
diff --git a/addons/account_payment/security/ir.model.access.csv b/addons/account_payment/security/ir.model.access.csv
index 1d39372a6b377bafb77307f871f26bca101f6627..a4b6fe0af5e0cd820398350986993d31009d4c80 100644
--- a/addons/account_payment/security/ir.model.access.csv
+++ b/addons/account_payment/security/ir.model.access.csv
@@ -7,7 +7,5 @@
"access_account_move_line_payment","account.move.line payment","account.model_account_move_line","group_account_payment",1,0,0,0
"access_payment_order_accountant","payment.order accountant","model_payment_order","account.group_account_user",1,1,1,1
"access_payment_order_manager","payment.order manager","model_payment_order","account.group_account_manager",1,0,0,0
-"access_payment_order_system","payment.order system","model_payment_order","base.group_system",1,0,0,0
-"access_payment_mode_system","payment.mode system","model_payment_mode","base.group_system",1,1,1,1
"access_payment_order_invoice","payment.order invoice","model_payment_order","account.group_account_invoice",1,1,1,1
"access_payment_line_invoice","payment.line invoice","model_payment_line","account.group_account_invoice",1,1,1,1
diff --git a/addons/account_payment/wizard/account_payment_pay_view.xml b/addons/account_payment/wizard/account_payment_pay_view.xml
index 566359d8b32edeef4053a037e5c992b2adb15aa9..3d732aea6e2507baa027deff63eb59baba87c60a 100644
--- a/addons/account_payment/wizard/account_payment_pay_view.xml
+++ b/addons/account_payment/wizard/account_payment_pay_view.xml
@@ -8,14 +8,12 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Make Payment">
- <group height="100" width="320">
- <separator string="Are you sure you want to make payment?"/>
- <newline/>
- <group colspan="2" col="4">
- <button special="cancel" string="Cancel" icon="gtk-cancel"/>
- <button name="launch_wizard" string="Yes" type="object" icon="gtk-ok" default_focus="1"/>
- </group>
- </group>
+ <separator string="Are you sure you want to make payment?"/>
+ <newline/>
+ <group colspan="2" col="4">
+ <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+ <button name="launch_wizard" string="Yes" type="object" icon="gtk-ok" default_focus="1"/>
+ </group>
</form>
</field>
</record>
diff --git a/addons/account_report/i18n/sr.po b/addons/account_report/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..a79525b4502467bb8cbcfb7b464c4f58b9cb2e53
--- /dev/null
+++ b/addons/account_report/i18n/sr.po
@@ -0,0 +1,542 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-14 13:32+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-15 04:42+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_report
+#: field:account.report.history,name:0
+#: selection:account.report.report,type:0
+#: model:ir.model,name:account_report.model_account_report_history
+msgid "Indicator"
+msgstr "Pokazatelj"
+
+#. module: account_report
+#: wizard_field:print.indicators.pdf,init,file:0
+msgid "Select a PDF File"
+msgstr "Odaberite PDF datoteku"
+
+#. module: account_report
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Operators:"
+msgstr "Operatori:"
+
+#. module: account_report
+#: field:account.report.report,parent_id:0
+msgid "Parent"
+msgstr ""
+
+#. module: account_report
+#: field:account.report.report,disp_graph:0
+msgid "Display As Graph"
+msgstr "Prikaži kao grafikon"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Account Debit:"
+msgstr "Dugovni konto:"
+
+#. module: account_report
+#: selection:account.report.report,type:0
+msgid "Others"
+msgstr "Drugo"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "balance(['ACCOUNT_CODE',],fiscalyear)"
+msgstr "balance(['ACCOUNT_CODE',],fiscalyear)"
+
+#. module: account_report
+#: rml:print.indicators:0
+msgid "Tabular Summary"
+msgstr "TabliÄni pregled"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Notes"
+msgstr "Napomene"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "= Goodness Indicator Limit:"
+msgstr "= Granica pokazivaÄa dobrote"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Very bad"
+msgstr "Vrlo loše"
+
+#. module: account_report
+#: field:account.report.history,val:0
+#: field:account.report.report,amount:0
+msgid "Value"
+msgstr "Vrednost"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "= Badness Indicator Limit:"
+msgstr "= GRanica pokazivaca slabosti"
+
+#. module: account_report
+#: view:account.report.report:0
+#: selection:account.report.report,status:0
+msgid "Bad"
+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 "Odaberite PDF datoteku na kojoj će biti ispisani pokazivaci"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "> Goodness Indicator Limit:"
+msgstr "> Granice pokazivaca dobrote"
+
+#. module: account_report
+#: field:account.report.report,badness_limit:0
+msgid "Badness Indicator Limit"
+msgstr "Pokazivac granice slabosti"
+
+#. module: account_report
+#: selection:account.report.report,status:0
+msgid "Very Bad"
+msgstr "Vrlo lose"
+
+#. module: account_report
+#: model:ir.actions.act_window,name:account_report.account_report_history_record_structure
+msgid "Indicator history"
+msgstr "Istorija Pokazivaca"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "credit(['ACCOUNT_CODE',],fiscalyear)"
+msgstr "credit(['ACCOUNT_CODE',],fiscalyear)"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Report Amount:"
+msgstr "izveštaj Iznosa:"
+
+#. module: account_report
+#: model:ir.actions.report.xml,name:account_report.fiscal_statements
+msgid "Fiscal Statements"
+msgstr "Fiskalni izvodi"
+
+#. module: account_report
+#: wizard_button:print.indicators,init,next:0
+msgid "Next"
+msgstr "Sledeće"
+
+#. module: account_report
+#: model:ir.module.module,shortdesc:account_report.module_meta_information
+msgid "Reporting for accounting"
+msgstr "RaÄunovodstveni izveÅ¡taji"
+
+#. module: account_report
+#: wizard_button:print.indicators,next,print:0
+#: wizard_button:print.indicators.pdf,init,print:0
+msgid "Print"
+msgstr "Å tampaj"
+
+#. module: account_report
+#: field:account.report.report,type:0
+msgid "Type"
+msgstr "Tip"
+
+#. module: account_report
+#: model:ir.actions.report.xml,name:account_report.report_indicator_pdf
+msgid "Print Indicators in PDF"
+msgstr "IspiÅ¡i pokazivaÄe u PDF"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Account Tax Code:"
+msgstr "Å ifra poreznog raÄuna:"
+
+#. module: account_report
+#: view:account.report.report:0
+#: selection:account.report.report,status:0
+msgid "Good"
+msgstr "Dobar"
+
+#. module: account_report
+#: view:account.report.history:0
+msgid "Account Report History"
+msgstr "Istiorija izveÅ¡taja raÄuna"
+
+#. module: account_report
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: account_report
+#: help:account.report.report,badness_limit:0
+msgid "This Value sets the limit of badness."
+msgstr "Ova vrednost predstavlja granicu slabosti"
+
+#. module: account_report
+#: wizard_field:print.indicators,init,select_base:0
+msgid "Choose Criteria"
+msgstr "Izaberi Kriterijum"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "debit(['ACCOUNT_CODE',],fiscalyear)"
+msgstr "debit(['ACCOUNT_CODE',],fiscalyear)"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Account Credit:"
+msgstr "Potražni konto"
+
+#. module: account_report
+#: wizard_view:print.indicators,init:0
+msgid "Select the criteria based on which Indicators will be printed."
+msgstr "Odaberite uslov zasnovan na pokazivaÄima koji će biti ispisani."
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "< Badness Indicator Limit:"
+msgstr "< Granica Pokazivaca Slabosti"
+
+#. module: account_report
+#: view:account.report.report:0
+#: selection:account.report.report,status:0
+msgid "Very Good"
+msgstr "Vrlo Dobro"
+
+#. module: account_report
+#: field:account.report.report,note:0
+msgid "Note"
+msgstr "Napomena"
+
+#. module: account_report
+#: rml:accounting.report:0
+#: rml:print.indicators:0
+msgid "Currency:"
+msgstr "Valuta:"
+
+#. module: account_report
+#: field:account.report.report,status:0
+msgid "Status"
+msgstr "Status"
+
+#. module: account_report
+#: help:account.report.report,disp_tree:0
+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 ""
+"Kada su pokazivaci prikazani, ako je polje jednog od njih postavljeno na ' "
+"Istina', tada ce se prikazati jos jedan grafikon sa svim podgrupama koje "
+"sadrzi."
+
+#. module: account_report
+#: selection:account.report.report,status:0
+msgid "Normal"
+msgstr "Normalan"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Example: (balance(['6','45'],-1) - credit(['7'])) / report('RPT1')"
+msgstr "Primer: (balance(['6','45'],-1) - credit(['7'])) / report('RPT1')"
+
+#. module: account_report
+#: field:account.report.report,active:0
+msgid "Active"
+msgstr "Aktivan"
+
+#. module: account_report
+#: field:account.report.report,disp_tree:0
+msgid "Display Tree"
+msgstr "Prikazi Stablo"
+
+#. module: account_report
+#: selection:print.indicators,init,select_base:0
+msgid "Based On Fiscal Years"
+msgstr "Bazirano na Fiskalnim Godinama"
+
+#. module: account_report
+#: model:ir.model,name:account_report.model_account_report_report
+msgid "Account reporting"
+msgstr "RaÄunovodstveni izveÅ¡taji"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Account Balance:"
+msgstr "Saldo raÄuna:"
+
+#. module: account_report
+#: rml:print.indicators:0
+msgid "Expression :"
+msgstr "Izraz :"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "report('REPORT_CODE')"
+msgstr "report('REPORT_CODE')"
+
+#. module: account_report
+#: field:account.report.report,expression:0
+msgid "Expression"
+msgstr "Izraz"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Accounting reporting"
+msgstr "RaÄunovodstveni izveÅ¡taji"
+
+#. 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 "Formula nove stavke izveštaja"
+
+#. module: account_report
+#: field:account.report.report,code:0
+#: rml:accounting.report:0
+msgid "Code"
+msgstr "Å ifra"
+
+#. module: account_report
+#: field:account.report.history,tmp:0
+msgid "temp"
+msgstr "privremen"
+
+#. module: account_report
+#: field:account.report.history,period_id:0
+msgid "Period"
+msgstr "Razdoblje"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "General"
+msgstr "Opšte"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Legend of operators"
+msgstr "Objasnjenje Operatera"
+
+#. 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 "Otkaži"
+
+#. module: account_report
+#: field:account.report.report,child_ids:0
+msgid "Children"
+msgstr "Podređeni"
+
+#. module: account_report
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da poÄinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: account_report
+#: help:account.report.report,goodness_limit:0
+msgid "This Value sets the limit of goodness."
+msgstr "Ova vrednost predstavlja granicu dobrote"
+
+#. module: account_report
+#: model:ir.actions.wizard,name:account_report.wizard_print_indicators
+#: model:ir.ui.menu,name:account_report.menu_wizard_print_indicators
+#: wizard_view:print.indicators,init:0
+#: wizard_view:print.indicators,next:0
+msgid "Print Indicators"
+msgstr "Ispis Pokazatelja"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "+ - * / ( )"
+msgstr "+ - * / ( )"
+
+#. module: account_report
+#: rml:accounting.report:0
+#: rml:print.indicators:0
+msgid "Printing date:"
+msgstr "Datum Stampe:"
+
+#. module: account_report
+#: model:ir.actions.wizard,name:account_report.wizard_indicators_with_pdf
+msgid "Indicators in PDF"
+msgstr "Pokazivaci u PDF"
+
+#. module: account_report
+#: rml:accounting.report:0
+#: rml:print.indicators:0
+msgid "at"
+msgstr "u"
+
+#. module: account_report
+#: rml:accounting.report:0
+msgid "Accounting Report"
+msgstr "RaÄunovodstveni izvjeÅ¡taj"
+
+#. module: account_report
+#: field:account.report.report,goodness_limit:0
+msgid "Goodness Indicator Limit"
+msgstr "Pokazivac granice dobrote"
+
+#. 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 "Ostali izvještaji"
+
+#. module: account_report
+#: view:account.report.report:0
+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 argument 'fiskalna godina' i 'period' su opcionalni. Ako je "
+"vrednost -1, prethodna fiskalna godina ili period su upotrebljeni."
+
+#. module: account_report
+#: rml:print.indicators:0
+msgid ")"
+msgstr ")"
+
+#. module: account_report
+#: 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 "Izveštaji fiskalnih izvoda"
+
+#. module: account_report
+#: selection:print.indicators,init,select_base:0
+msgid "Based on Fiscal Periods"
+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 "PokazivaÄi"
+
+#. module: account_report
+#: wizard_view:print.indicators.pdf,init:0
+msgid "Print Indicators with PDF"
+msgstr "IspiÅ¡i pokazivaÄe sa 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 "IzvjeÅ¡tavanje pokazivaÄa"
+
+#. module: account_report
+#: field:account.report.report,name:0
+#: rml:accounting.report:0
+#: rml:print.indicators:0
+msgid "Name"
+msgstr "Ime"
+
+#. module: account_report
+#: wizard_field:print.indicators,next,base_selection:0
+msgid "Select Criteria"
+msgstr "Selektuj Kriterijum"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "tax_code(['ACCOUNT_TAX_CODE',],period)"
+msgstr "tax_code(['ACCOUNT_TAX_CODE',],period)"
+
+#. module: account_report
+#: field:account.report.history,fiscalyear_id:0
+msgid "Fiscal Year"
+msgstr "Fiskalna Godina"
+
+#. module: account_report
+#: model:ir.actions.act_window,name:account_report.action_account_report_tree
+#: model:ir.actions.act_window,name:account_report.action_account_report_tree_view
+#: 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 "Posebno izvještavanje"
+
+#. module: account_report
+#: rml:print.indicators:0
+msgid "Page"
+msgstr "Strana"
+
+#. module: account_report
+#: selection:account.report.report,type:0
+msgid "View"
+msgstr "Pregled"
+
+#. module: account_report
+#: rml:print.indicators:0
+msgid "Indicators -"
+msgstr "PokazivaÄi -"
+
+#. module: account_report
+#: help:account.report.report,disp_graph:0
+msgid ""
+"If the field is set to True, information will be printed as a Graph, "
+"otherwise as an array."
+msgstr ""
+"Ako je ovo polje postavljeno na ' Istina' , INformacija ce biti ispisana kao "
+"grafikon, a inace ce biti prikazana kao niz."
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Return value for status"
+msgstr "Vrati vrednost za stanje"
+
+#. module: account_report
+#: field:account.report.report,sequence:0
+msgid "Sequence"
+msgstr "Sekvenca"
+
+#. module: account_report
+#: rml:accounting.report:0
+msgid "Amount"
+msgstr "Iznos"
+
+#. module: account_report
+#: rml:print.indicators:0
+msgid "1cm 27.7cm 20cm 27.7cm"
+msgstr "1cm 27,7cm 20cm 27,7cm"
+
+#. module: account_report
+#: model:ir.module.module,description:account_report.module_meta_information
+msgid ""
+"Financial and accounting reporting\n"
+" Fiscal statements\n"
+" Indicators\n"
+" "
+msgstr ""
+"Finansijski i Kontni Izvestaj\n"
+" Fiskalna Izjava\n"
+" Pokazivaci\n"
+" "
+
+#. module: account_report
+#: selection:account.report.report,type:0
+msgid "Fiscal Statement"
+msgstr "Fiskalna Izjava"
diff --git a/addons/account_report/report/print_indicator.py b/addons/account_report/report/print_indicator.py
index 55596764dc652ebf95873d410430667d18b02e98..84593a32b8c2903b5f60b4c13c1f775b2ff3d356 100644
--- a/addons/account_report/report/print_indicator.py
+++ b/addons/account_report/report/print_indicator.py
@@ -22,15 +22,16 @@
import pooler
import time
from report import report_sxw
-
from pychart import *
import StringIO
+import tools
+import os
+
theme.use_color = 1
theme.default_font_family = "Helvetica-Bold"
theme.default_font_size = 18
theme.default_line_width = 1.0
-import tools
-import os
+
class accounting_report_indicator(report_sxw.rml_parse):
@@ -72,9 +73,9 @@ class accounting_report_indicator(report_sxw.rml_parse):
'disp_graph':obj_ind.disp_graph,
'disp_tree':obj_ind.disp_tree,
'note':obj_ind.note,
- 'level' : obj_ind.parent_id or 0,
+ 'level': obj_ind.parent_id or 0,
'type':obj_ind.type,
- 'array_table' : False,
+ 'array_table': False,
}
if obj_ind.parent_id:
for record in result:
@@ -228,7 +229,6 @@ class accounting_report_indicator(report_sxw.rml_parse):
if intercall:
return True
self.count +=1
- import os
path=tools.config['addons_path']+"/account_report/tmp_images/image"
dirname =tools.config['addons_path']+'/account_report/tmp_images/'
diff --git a/addons/account_report/security/ir.model.access.csv b/addons/account_report/security/ir.model.access.csv
index 66fe44b671477e283313c4f9cc47aa3e311b13c5..789f18530e072fa574d1cc083636b55bf84b9c88 100644
--- a/addons/account_report/security/ir.model.access.csv
+++ b/addons/account_report/security/ir.model.access.csv
@@ -1,5 +1,4 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_account_report_report_system","account.report.report system","model_account_report_report","base.group_system",1,0,0,0
"access_account_report_history","account.report.history","model_account_report_history","account.group_account_manager",1,0,0,0
"access_account_report_report","account.report.report","model_account_report_report","account.group_account_user",1,1,0,0
"access_account_report_report_manager","account.report.report manager","model_account_report_report","account.group_account_manager",1,1,1,1
diff --git a/addons/account_report/wizard/account_report_print_indicators_view.xml b/addons/account_report/wizard/account_report_print_indicators_view.xml
index e5a0ec30c769dae19dc5682acef1683e27c9675e..466ed21d3c43b26b1065bbe6a7197e99a7e856a1 100644
--- a/addons/account_report/wizard/account_report_print_indicators_view.xml
+++ b/addons/account_report/wizard/account_report_print_indicators_view.xml
@@ -8,14 +8,12 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Indicators">
- <group width="450">
<separator string="Select the criteria based on which Indicators will be printed." colspan="4"/>
<field name="select_base"/>
<separator colspan="4"/>
- <group colspan="4" col="6">
- <button special="cancel" string="Cancel" icon="gtk-cancel"/>
- <button name="next" string="Next" type="object" icon="gtk-ok" default_focus="1"/>
- </group>
+ <group colspan="4" col="6">
+ <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+ <button name="next" string="Next" type="object" icon="gtk-ok" default_focus="1"/>
</group>
</form>
</field>
diff --git a/addons/account_reporting/account_view.xml b/addons/account_reporting/account_view.xml
index 6c8c0db8a5bc39fcd49dedfa6e0829387972b431..f02ed221e421f388bbf3e5b1ab8c06aad8b89983 100644
--- a/addons/account_reporting/account_view.xml
+++ b/addons/account_reporting/account_view.xml
@@ -10,18 +10,19 @@
<form string="Account reporting">
<notebook>
<page string="General">
- <field name="name" select="1" colspan="3"/>
+ <field name="name" select="1"/>
<field name="code" select="1"/>
- <field name="parent_id" select="1" />
+ <field name="parent_id" select="1"/>
<field name="sequence"/>
<field name="color_font"/>
<field name="color_back"/>
- <field name="font_style" />
- <field name="report_type" />
+ <field name="font_style"/>
+ <field name="report_type"/>
<newline/>
<separator string="Accounts" colspan="4"/>
<field name="account_id" colspan="4" nolabel="1"/>
- </page><page string="Notes">
+ </page>
+ <page string="Notes">
<field name="note" nolabel="1" colspan="4"/>
</page>
</notebook>
diff --git a/addons/account_reporting/i18n/sr.po b/addons/account_reporting/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..38289723f44b156fdb7f907ce13b238a0739c113
--- /dev/null
+++ b/addons/account_reporting/i18n/sr.po
@@ -0,0 +1,247 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-15 09:23+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-16 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_reporting
+#: field:color.rml,code:0
+msgid "code"
+msgstr "kod"
+
+#. module: account_reporting
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da poÄinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: account_reporting
+#: selection:account.report.bs,font_style:0
+msgid "Helvetica-Bold"
+msgstr "Helvetica-Bold"
+
+#. module: account_reporting
+#: selection:account.report.bs,font_style:0
+msgid "Helvetica"
+msgstr "Helvetica"
+
+#. module: account_reporting
+#: field:account.report.bs,note:0
+msgid "Note"
+msgstr "Napomena"
+
+#. module: account_reporting
+#: field:account.report.bs,report_type:0
+msgid "Report Type"
+msgstr "Tip izveš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 "Izvještaj Liste Salda"
+
+#. module: account_reporting
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: account_reporting
+#: selection:account.report.bs,font_style:0
+msgid "Courier"
+msgstr "Pošiljka"
+
+#. module: account_reporting
+#: selection:account.report.bs,font_style:0
+msgid "Courier-BoldOblique"
+msgstr "Courier-BoldOblique"
+
+#. module: account_reporting
+#: wizard_button:account.account.balancesheet.report,init,report:0
+msgid "Print BalanceSheet"
+msgstr "Ispis ListeSalda"
+
+#. module: account_reporting
+#: help:account.account.balancesheet.report,init,periods:0
+msgid "All periods if empty"
+msgstr "Ako je prazno, sva razdoblja"
+
+#. module: account_reporting
+#: field:account.report.bs,color_font:0
+msgid "Font Color"
+msgstr "Boja Fonta"
+
+#. module: account_reporting
+#: selection:account.report.bs,report_type:0
+msgid "Report Objects With Accounts and child of Accounts"
+msgstr "IzveÅ¡taj Objekata sa raÄunima i podredjenim raÄunima"
+
+#. module: account_reporting
+#: model:ir.module.module,description:account_reporting.module_meta_information
+msgid ""
+"Financial and accounting reporting\n"
+" Balance Sheet Report"
+msgstr ""
+"Financijsko i raÄunovodstveno izveÅ¡tavanje\n"
+"Izveštaj liste salda"
+
+#. module: account_reporting
+#: selection:account.report.bs,report_type:0
+msgid "Report Objects With Accounts"
+msgstr "IzveÅ¡taj Objekata sa raÄunima"
+
+#. module: account_reporting
+#: selection:account.report.bs,font_style:0
+msgid "Courier-Oblique"
+msgstr "Courier-Oblique"
+
+#. module: account_reporting
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: account_reporting
+#: field:account.report.bs,name:0
+#: field:color.rml,name:0
+msgid "Name"
+msgstr "Ime"
+
+#. module: account_reporting
+#: view:account.report.bs:0
+msgid "Account reporting"
+msgstr "RaÄunovodstveni izveÅ¡taji"
+
+#. module: account_reporting
+#: model:ir.ui.menu,name:account_reporting.bs_report_action_form
+msgid "Balance Sheet Report Form"
+msgstr "Obrazac izveštaja Liste Salda"
+
+#. module: account_reporting
+#: view:account.report.bs:0
+msgid "Notes"
+msgstr "Napomene"
+
+#. module: account_reporting
+#: selection:account.report.bs,font_style:0
+msgid "Times-BoldItalic"
+msgstr "Times-BoldItalic"
+
+#. module: account_reporting
+#: model:ir.model,name:account_reporting.model_account_report_bs
+msgid "Account reporting for Balance Sheet"
+msgstr "Kontni Izveštaj za Listu Salda"
+
+#. module: account_reporting
+#: selection:account.report.bs,font_style:0
+msgid "Courier-Bold"
+msgstr "Courier-Bold"
+
+#. module: account_reporting
+#: selection:account.report.bs,font_style:0
+msgid "Times-Italic"
+msgstr "Times-Italic"
+
+#. module: account_reporting
+#: selection:account.report.bs,report_type:0
+msgid "Report Objects Only"
+msgstr "Izveštaj samo objekata"
+
+#. module: account_reporting
+#: model:ir.model,name:account_reporting.model_color_rml
+msgid "Rml Colors"
+msgstr "Rml Boje"
+
+#. module: account_reporting
+#: model:ir.module.module,shortdesc:account_reporting.module_meta_information
+msgid "Reporting of Balancesheet for accounting"
+msgstr "IzveÅ¡tavanje liste salda za raÄunovostvo"
+
+#. module: account_reporting
+#: field:account.report.bs,code:0
+msgid "Code"
+msgstr "Å ifra"
+
+#. module: account_reporting
+#: field:account.report.bs,parent_id:0
+msgid "Parent"
+msgstr "Roditelj"
+
+#. module: account_reporting
+#: field:account.report.bs,sequence:0
+msgid "Sequence"
+msgstr "Sekvenca"
+
+#. module: account_reporting
+#: selection:account.report.bs,font_style:0
+msgid "Times-Bold"
+msgstr "Times-Bold"
+
+#. module: account_reporting
+#: view:account.report.bs:0
+msgid "General"
+msgstr "Opšte"
+
+#. module: account_reporting
+#: wizard_field:account.account.balancesheet.report,init,fiscalyear:0
+msgid "Fiscal year"
+msgstr "Fiskalna Godina"
+
+#. module: account_reporting
+#: view:account.report.bs:0
+#: field:account.report.bs,account_id:0
+msgid "Accounts"
+msgstr "Nalozi"
+
+#. module: account_reporting
+#: wizard_field:account.account.balancesheet.report,init,periods:0
+msgid "Periods"
+msgstr "Razdoblja"
+
+#. module: account_reporting
+#: field:account.report.bs,color_back:0
+msgid "Back Color"
+msgstr "Pozadinska Boja"
+
+#. module: account_reporting
+#: field:account.report.bs,child_id:0
+msgid "Children"
+msgstr "Podređeni"
+
+#. module: account_reporting
+#: wizard_button:account.account.balancesheet.report,init,end:0
+msgid "Cancel"
+msgstr "Otkaži"
+
+#. module: account_reporting
+#: selection:account.report.bs,font_style:0
+msgid "Times-Roman"
+msgstr "Times-Roman"
+
+#. module: account_reporting
+#: selection:account.report.bs,font_style:0
+msgid "Helvetica-Oblique"
+msgstr "Helvetica-Oblique"
+
+#. module: account_reporting
+#: field:account.report.bs,font_style:0
+msgid "Font"
+msgstr "Font"
+
+#. module: account_reporting
+#: wizard_view:account.account.balancesheet.report,init:0
+msgid "Customize Report"
+msgstr "Prilagodi Izvestaj"
diff --git a/addons/account_reporting/security/ir.model.access.csv b/addons/account_reporting/security/ir.model.access.csv
index e84e663dfda27e052be3f076b73d736eea9edd17..78dfe260864e93231e5d07f51f41403ddb4514f6 100644
--- a/addons/account_reporting/security/ir.model.access.csv
+++ b/addons/account_reporting/security/ir.model.access.csv
@@ -1,3 +1,3 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_color_rml,color.rml,model_color_rml,account.group_account_manager,1,1,1,1
-access_account_report_bs,account.report.bs,model_account_report_bs,base.group_system,1,1,1,1
+access_account_report_bs,account.report.bs,model_account_report_bs,account.group_account_manager,1,1,1,1
diff --git a/addons/account_reporting/wizard/account_reporting_balance_report_view.xml b/addons/account_reporting/wizard/account_reporting_balance_report_view.xml
index 07db4156af9803822b0d0865274f4757d359a7f3..5d7ef7dfbdb4bcbd247ccf8ecfb34449dc9adf38 100644
--- a/addons/account_reporting/wizard/account_reporting_balance_report_view.xml
+++ b/addons/account_reporting/wizard/account_reporting_balance_report_view.xml
@@ -8,16 +8,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Select Dates Period">
- <group height="350" width="390">
- <field name="fiscalyear" colspan="4"/>
- <newline/>
- <separator string="Periods" colspan="4"/>
- <field name="periods" nolabel="1" colspan="4"/>
- <separator colspan="4"/>
- <group colspan="4" col="6">
- <button special="cancel" string="Cancel" icon="gtk-cancel"/>
- <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
- </group>
+ <field name="fiscalyear" colspan="4"/>
+ <newline/>
+ <separator string="Periods" colspan="4"/>
+ <field name="periods" nolabel="1" colspan="4"/>
+ <separator colspan="4"/>
+ <group colspan="4" col="6">
+ <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+ <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
</group>
</form>
</field>
diff --git a/addons/account_tax_include/__init__.py b/addons/account_tax_include/__init__.py
deleted file mode 100644
index f96eb08f2fe52d683cee0145325dab2c6789b3b3..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import account_tax_include
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account_tax_include/__openerp__.py b/addons/account_tax_include/__openerp__.py
deleted file mode 100644
index a6bab18ce0165784e36c0148e2937928c292cf57..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/__openerp__.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-
-{
- 'name': 'Invoices and prices with taxes included',
- 'version': '1.0',
- 'category': 'Generic Modules/Accounting',
- 'description': """Allow the user to work tax included prices.
-Especially useful for b2c businesses.
-
-This module implements the modification on the invoice form.
-""",
- 'author': 'OpenERP SA',
- 'website': 'http://www.openerp.com',
- 'depends': ['account'],
- 'init_xml': [],
- 'update_xml': ['account_tax_include_view.xml'],
- 'demo_xml': [],
- 'test': ['test/account_tax_include.yml'],
- 'installable': True,
- 'active': False,
- 'certificate': '0070514190381',
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_tax_include/account_tax_include.py b/addons/account_tax_include/account_tax_include.py
deleted file mode 100644
index afd1ef36ae79fed5997071a7f1eb32236b52fc0d..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/account_tax_include.py
+++ /dev/null
@@ -1,228 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-
-from osv import fields, osv
-
-class account_invoice(osv.osv):
- _inherit = "account.invoice"
- _columns = {
- 'price_type': fields.selection([('tax_included','Tax included'),
- ('tax_excluded','Tax excluded')],
- 'Price method', required=True, readonly=True,
- states={'draft': [('readonly', False)]}),
- }
- _defaults = {
- 'price_type': 'tax_excluded',
- }
-
- def refund(self, cr, uid, ids, date=None, period_id=None, description=None, journal_id=None):
- map_old_new = {}
- refund_ids = []
- for old_inv_id in ids:
- new_id = super(account_invoice,self).refund(cr, uid, ids, date=date, period_id=period_id, description=description, journal_id=journal_id)
- refund_ids += new_id
- map_old_new[old_inv_id] = new_id[0]
-
- for old_inv_id in map_old_new.keys():
- old_inv_record = self.read(cr, uid, [old_inv_id], ['price_type'])[0]['price_type']
- self.write(cr, uid, [map_old_new[old_inv_id]], {'price_type' : old_inv_record})
- return refund_ids
-
-account_invoice()
-
-class account_invoice_line(osv.osv):
- _inherit = "account.invoice.line"
-
- def _amount_line2(self, cr, uid, ids, name, args, context=None):
- """
- Return the subtotal excluding taxes with respect to price_type.
- """
- res = {}
- tax_obj = self.pool.get('account.tax')
- cur_obj = self.pool.get('res.currency')
- dec_obj = self.pool.get('decimal.precision')
- for line in self.browse(cr, uid, ids):
- cur = line.invoice_id and line.invoice_id.currency_id or False
- res_init = super(account_invoice_line, self)._amount_line(cr, uid, [line.id], name, args, context)
- res[line.id] = {
- 'price_subtotal': 0.0,
- 'price_subtotal_incl': 0.0,
- 'data': []
- }
- if not line.quantity:
- continue
- if line.invoice_id:
- product_taxes = []
- if line.product_id:
- if line.invoice_id.type in ('out_invoice', 'out_refund'):
- product_taxes = filter(lambda x: x.price_include, line.product_id.taxes_id)
- else:
- product_taxes = filter(lambda x: x.price_include, line.product_id.supplier_taxes_id)
-
- if ((set(product_taxes) == set(line.invoice_line_tax_id)) or not product_taxes) and (line.invoice_id.price_type == 'tax_included'):
- res[line.id]['price_subtotal_incl'] = cur and cur_obj.round(cr, uid, cur, res_init[line.id]) or res_init[line.id]
- else:
- res[line.id]['price_subtotal'] = cur and cur_obj.round(cr, uid, cur, res_init[line.id]) or res_init[line.id]
- for tax in tax_obj.compute_inv(cr, uid, product_taxes, res_init[line.id]/line.quantity, line.quantity):
- res[line.id]['price_subtotal'] = res[line.id]['price_subtotal'] - round(tax['amount'], dec_obj.precision_get(cr, uid, 'Account'))
- else:
- res[line.id]['price_subtotal'] = cur and cur_obj.round(cr, uid, cur, res_init[line.id]) or res_init[line.id]
-
- if res[line.id]['price_subtotal']:
- res[line.id]['price_subtotal_incl'] = res[line.id]['price_subtotal']
- for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, res[line.id]['price_subtotal']/line.quantity, line.quantity):
- res[line.id]['price_subtotal_incl'] = res[line.id]['price_subtotal_incl'] + tax['amount']
- res[line.id]['data'].append(tax)
- else:
- res[line.id]['price_subtotal'] = res[line.id]['price_subtotal_incl']
- for tax in tax_obj.compute_inv(cr, uid, line.invoice_line_tax_id, res[line.id]['price_subtotal_incl']/line.quantity, line.quantity):
- res[line.id]['price_subtotal'] = res[line.id]['price_subtotal'] - tax['amount']
- res[line.id]['data'].append(tax)
-
- res[line.id]['price_subtotal']= round(res[line.id]['price_subtotal'], dec_obj.precision_get(cr, uid, 'Account'))
- res[line.id]['price_subtotal_incl']= round(res[line.id]['price_subtotal_incl'], dec_obj.precision_get(cr, uid, 'Account'))
- return res
-
- def _price_unit_default(self, cr, uid, context=None):
- if context is None:
- context = {}
- if 'check_total' in context:
- t = context['check_total']
- if context.get('price_type', False) == 'tax_included':
- for l in context.get('invoice_line', {}):
- if len(l) >= 3 and l[2]:
- p = l[2].get('price_unit', 0) * (1-l[2].get('discount', 0)/100.0)
- t = t - (p * l[2].get('quantity'))
- return t
- return super(account_invoice_line, self)._price_unit_default(cr, uid, context)
- return 0
-
- def _get_invoice(self, cr, uid, ids, context=None):
- result = {}
- for inv in self.pool.get('account.invoice').browse(cr, uid, ids, context=context):
- for line in inv.invoice_line:
- result[line.id] = True
- return result.keys()
-
- _columns = {
- 'price_subtotal': fields.function(_amount_line2, method=True, string='Subtotal w/o tax', multi='amount',
- store={'account.invoice':(_get_invoice,['price_type'], 10), 'account.invoice.line': (lambda self, cr, uid, ids, c={}: ids, None,10)}),
- 'price_subtotal_incl': fields.function(_amount_line2, method=True, string='Subtotal', multi='amount',
- store={'account.invoice':(_get_invoice,['price_type'], 10), 'account.invoice.line': (lambda self, cr, uid, ids, c={}: ids, None,10)}),
- }
-
- _defaults = {
- 'price_unit': _price_unit_default,
- }
-
- def move_line_get_item(self, cr, uid, line, context=None):
- return {
- 'type':'src',
- 'name':line.name,
- 'price_unit':(line.quantity) and (line.price_subtotal / line.quantity) or line.price_subtotal,
- 'quantity':line.quantity,
- 'price':line.price_subtotal,
- 'account_id':line.account_id.id,
- 'product_id': line.product_id.id,
- 'uos_id':line.uos_id.id,
- 'account_analytic_id':line.account_analytic_id.id,
- }
-
- def product_id_change_unit_price_inv(self, cr, uid, tax_id, price_unit, qty, address_invoice_id, product, partner_id, context=None):
- if context is None:
- context = {}
- # if the tax is already included, just return the value without calculations
- if context.get('price_type', False) == 'tax_included':
- return {'price_unit': price_unit,'invoice_line_tax_id': tax_id}
- else:
- return super(account_invoice_line, self).product_id_change_unit_price_inv(cr, uid, tax_id, price_unit, qty, address_invoice_id, product, partner_id, context=context)
-
- def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None):
- # note: will call product_id_change_unit_price_inv with context...
-
- # Temporary trap, for bad context that came from koo:
-
- ctx = (context and context.copy()) or {}
- ctx.update({'price_type': ctx.get('price_type', 'tax_excluded')})
- return super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id=currency_id, context=ctx)
-
-account_invoice_line()
-
-class account_invoice_tax(osv.osv):
- _inherit = "account.invoice.tax"
-
- def compute(self, cr, uid, invoice_id, context=None):
- tax_grouped = {}
- tax_obj = self.pool.get('account.tax')
- cur_obj = self.pool.get('res.currency')
- line_obj = self.pool.get('account.invoice.line')
-
- inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id)
- line_ids = map(lambda x: x.id, inv.invoice_line)
-
- cur = inv.currency_id
- company_currency = inv.company_id.currency_id.id
-
- for line in inv.invoice_line:
- data = line_obj._amount_line2(cr, uid, [line.id], [], [], context)[line.id]
- for tax in data['data']:
- val={}
- val['invoice_id'] = inv.id
- val['name'] = tax['name']
- val['amount'] = tax['amount']
- val['manual'] = False
- val['sequence'] = tax['sequence']
- val['base'] = tax['price_unit'] * line['quantity']
-
- if inv.type in ('out_invoice','in_invoice'):
- val['base_code_id'] = tax['base_code_id']
- val['tax_code_id'] = tax['tax_code_id']
- val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
- val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
- val['account_id'] = tax['account_collected_id'] or line.account_id.id
- else:
- val['base_code_id'] = tax['ref_base_code_id']
- val['tax_code_id'] = tax['ref_tax_code_id']
- val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['ref_base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
- val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['ref_tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
- val['account_id'] = tax['account_paid_id'] or line.account_id.id
-
- key = (val['tax_code_id'], val['base_code_id'], val['account_id'])
- if not key in tax_grouped:
- tax_grouped[key] = val
- else:
- tax_grouped[key]['amount'] += val['amount']
- tax_grouped[key]['base'] += val['base']
- tax_grouped[key]['base_amount'] += val['base_amount']
- tax_grouped[key]['tax_amount'] += val['tax_amount']
-
- for t in tax_grouped.values():
- t['amount'] = cur_obj.round(cr, uid, cur, t['amount'])
- t['base_amount'] = cur_obj.round(cr, uid, cur, t['base_amount'])
- t['tax_amount'] = cur_obj.round(cr, uid, cur, t['tax_amount'])
-
- return tax_grouped
-
-account_invoice_tax()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_tax_include/account_tax_include_view.xml b/addons/account_tax_include/account_tax_include_view.xml
deleted file mode 100644
index 4c103cd0d50fe1d1b51899c523df1c09d51dd3e2..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/account_tax_include_view.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
- <data>
-
- <record id="account_tax_view_price" model="ir.ui.view">
- <field name="name">account.tax.exlcuded.view.form</field>
- <field name="type">form</field>
- <field name="model">account.tax</field>
- <field name="inherit_id" ref="account.view_tax_form"/>
- <field name="arch" type="xml">
- <field name="python_compute" position="after">
- <separator colspan="4" string="Compute Code for Taxes included prices"/>
- <field colspan="4" name="python_compute_inv" nolabel="1"/>
- </field>
- </field>
- </record>
-
- <record id="account_invoice_view_price" model="ir.ui.view">
- <field name="name">account.invoice.vat.exlcuded.view.form</field>
- <field name="type">form</field>
- <field name="model">account.invoice</field>
- <field name="inherit_id" ref="account.invoice_form"/>
- <field name="arch" type="xml">
- <field name="payment_term" position="after">
- <field name="price_type"/>
- </field>
- </field>
- </record>
-
- <record id="invoice_supplier_form_tax_include" model="ir.ui.view">
- <field name="name">account.invoice.supplier.tax_include</field>
- <field name="type">form</field>
- <field name="model">account.invoice</field>
- <field name="inherit_id" ref="account.invoice_supplier_form"/>
- <field name="arch" type="xml">
- <field colspan="4" default_get="{'check_total': check_total, 'invoice_line': invoice_line, 'address_invoice_id': address_invoice_id, 'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False}" name="invoice_line" nolabel="1" position="before">
- <field name="price_type"/>
- </field>
- </field>
- </record>
-
- <record id="invoice_supplier_form_tax_include2" model="ir.ui.view">
- <field name="name">account.invoice.supplier.tax_include2</field>
- <field name="type">form</field>
- <field name="model">account.invoice</field>
- <field name="inherit_id" ref="account.invoice_supplier_form"/>
- <field name="arch" type="xml">
- <field name="price_subtotal" position="after">
- <field name="price_subtotal_incl"/>
- </field>
- </field>
- </record>
-
- <record id="invoice_supplier_form_tax_include3" model="ir.ui.view">
- <field name="name">account.invoice.supplier.tax_include3</field>
- <field name="type">form</field>
- <field name="model">account.invoice</field>
- <field name="inherit_id" ref="account.invoice_supplier_form"/>
- <field name="arch" type="xml">
- <field name="product_id" position="replace">
- <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id,{'company_id': parent.company_id, 'price_type':parent.price_type})"/>
- </field>
- </field>
- </record>
-
- <record id="view_invoice_line_tree" model="ir.ui.view">
- <field name="name">account.invoice.line.tree</field>
- <field name="model">account.invoice.line</field>
- <field name="type">tree</field>
- <field name="inherit_id" ref="account.view_invoice_line_tree"/>
- <field name="arch" type="xml">
- <field name="price_subtotal" position="after">
- <field name="price_subtotal_incl"/>
- </field>
- </field>
- </record>
-
- </data>
-</openerp>
diff --git a/addons/account_tax_include/i18n/account_tax_include.pot b/addons/account_tax_include/i18n/account_tax_include.pot
deleted file mode 100644
index da7622102bd82e6d78ba45ee33aed455d713783b..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/account_tax_include.pot
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01:51+0000\n"
-"PO-Revision-Date: 2009-08-28 16:01:51+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
-
diff --git a/addons/account_tax_include/i18n/ar.po b/addons/account_tax_include/i18n/ar.po
deleted file mode 100644
index 5090a5e011f0d6adc49ff3d25f0680cccf9f9671..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/ar.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_tax_include
-#
-msgid ""
-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: 2009-02-03 06:24+0000\n"
-"Last-Translator: <>\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-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/i18n/bg.po b/addons/account_tax_include/i18n/bg.po
deleted file mode 100644
index f0b055241ccdec3c04792a5ae9dde73a2084bcf6..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/bg.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 12:06+0000\n"
-"Last-Translator: lem0na <nickyk@gmx.net>\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-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ðевалиден XML за преглед на архитектурата"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Ðачин на изчиÑлÑване"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "С включен данък"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Без данък"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/i18n/bs.po b/addons/account_tax_include/i18n/bs.po
deleted file mode 100644
index 97a0c10e367ddaf049b1830a8a5e4ce5bba853f1..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/bs.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-10 12:26+0000\n"
-"Last-Translator: adnan <adnankraljic@yahoo.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neodgovarajući XML za arhitekturu prikaza!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Cjenovna procedura"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "RaÄuni i cijene sa ukljuÄenim porezom"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Porez ukljuÄen"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Porez nije ukljuÄen"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "IzraÄunaj cijene sa porezima"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Sub-ukupno"
diff --git a/addons/account_tax_include/i18n/ca.po b/addons/account_tax_include/i18n/ca.po
deleted file mode 100644
index ce0276a8c26cb47fac90ee9d3e36d63fbef98330..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/ca.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-29 06:30+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invà lid per a la definició de la vista!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Mètode preu"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Factures i preus amb impostos inclosos"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Impostos inclosos"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Impostos exclosos"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Codi pel cà lcul dels preus amb impostos inclosos"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/cs.po b/addons/account_tax_include/i18n/cs.po
deleted file mode 100644
index a8958b780d7c003a032cbe43627d08f768b70241..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/cs.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 23:35+0000\n"
-"Last-Translator: mga (Open ERP) <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-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neplatný XML pro zobrazenà architektury"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Metoda urÄovánà cen"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Faktury a ceny vÄetnÄ› danÃ"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "DanÄ› zahrnuty"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "DanÄ› vylouÄeny"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "VýpoÄetnà kód pro ceny vÄetnÄ› danÄ›"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "MezisouÄet"
diff --git a/addons/account_tax_include/i18n/de.po b/addons/account_tax_include/i18n/de.po
deleted file mode 100644
index 4635a414aaa96a4e856dae84286019bdbe8e05db..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/de.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-04-09 13:20+0000\n"
-"Last-Translator: Ferdinand @ ChriCar <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-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Preismethode"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Rechnungen und Preise mit inkludierten Steuern"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Steuer inklusive"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Steuern exklusive"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Berechnungsgrundlage (inkl. Steuer)"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Zwischensumme"
diff --git a/addons/account_tax_include/i18n/el.po b/addons/account_tax_include/i18n/el.po
deleted file mode 100644
index 74d719a9b9ee3d29cb40968a27ab87fd63084fbb..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/el.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# Greek translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 15:27+0000\n"
-"Last-Translator: Makis Nicolaou <mark.nicolaou@gmail.com>\n"
-"Language-Team: Greek <el@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-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "ΆκυÏο XML για την αÏχιτεκτονική όψης!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "ÎœÎθοδος Τιμής"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Τιμολόγια και τιμÎÏ‚ με ενσωμάτωση φόÏων"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "ΣυμπεÏίληψη φόÏου"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "ΕξαιÏοÏνται φόÏοι"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Κωδικός Î¥Ï€Î¿Î»Î¿Î³Î¹ÏƒÎ¼Î¿Ï Î³Î¹Î± ΦόÏους που εμπεÏιÎχονται στις τιμÎÏ‚"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "ΥποσÏνολο"
diff --git a/addons/account_tax_include/i18n/en_AU.po b/addons/account_tax_include/i18n/en_AU.po
deleted file mode 100644
index 4c0e3609f24731e84f9be707ad923c5a9fe43fed..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/en_AU.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# English (Australia) translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-05-09 21:19+0000\n"
-"Last-Translator: MoLE <Unknown>\n"
-"Language-Team: English (Australia) <en_AU@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-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalid XML for View Architecture!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Price method"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Invoices and prices with taxes included"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Tax included"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Tax excluded"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Compute Code for Taxes included prices"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/en_GB.po b/addons/account_tax_include/i18n/en_GB.po
deleted file mode 100644
index cd72d7a2cacc0b5834d40d72b93ace986905e34b..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/en_GB.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# English (United Kingdom) translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-05-09 21:20+0000\n"
-"Last-Translator: MoLE <Unknown>\n"
-"Language-Team: English (United Kingdom) <en_GB@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-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalid XML for View Architecture!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Price method"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Invoices and prices with taxes included"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Tax included"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Tax excluded"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Compute Code for Taxes included prices"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/es.po b/addons/account_tax_include/i18n/es.po
deleted file mode 100644
index b01d20c9ec87509ead0feaa9b11bbe62895c04d5..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/es.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-24 20:17+0000\n"
-"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\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-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Método precio"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Facturas y precios con impuestos incluidos"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Impuestos incluidos"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Impuestos excluidos"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Código para el cálculo de precios con impuestos incluidos"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/es_AR.po b/addons/account_tax_include/i18n/es_AR.po
deleted file mode 100644
index a9cc40c0d4c7a34058a4400e3e08761185383a33..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/es_AR.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_tax_include
-#
-msgid ""
-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-09-14 18:28+0000\n"
-"Last-Translator: Silvana Herrera <sherrera@thymbra.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para la definición de la vista!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Método de precio"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Facturas y precios con impuestos incluidos"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Impuestos incluidos"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Impuestos no incluidos"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Código del cálculo para precios con impuestos incluÃdos"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/es_EC.po b/addons/account_tax_include/i18n/es_EC.po
deleted file mode 100644
index 1858f2a52bcbe5f9781d00979bee142bc2a04a26..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/es_EC.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-17 17:47+0000\n"
-"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\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-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Método precio"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Facturas y precios con impuestos incluidos"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Impuestos incluidos"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Impuestos excluidos"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Código para el cálculo de precios con impuestos incluidos"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/et.po b/addons/account_tax_include/i18n/et.po
deleted file mode 100644
index d4398a2ae582e8b560aca0de844e39fb10a6c7d7..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/et.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 16:28+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Hinna meetod"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Makse sisaldavad arved ja hinnad"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Maksuga"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Maksuta"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Arvuta kood maksuga hindadele"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Vahesumma"
diff --git a/addons/account_tax_include/i18n/fi.po b/addons/account_tax_include/i18n/fi.po
deleted file mode 100644
index 0b8e8dfcee2b486cd3302d5fd0849958e6d7593c..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/fi.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# Finnish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 23:40+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
-"Language-Team: Finnish <fi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Hinnan tyyppi"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Laskut ja hinnat veroilla"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Vero sisältyy"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Ilman veroa"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Laske koodi hinnoille joissa on vero mukana"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Välisumma"
diff --git a/addons/account_tax_include/i18n/fr.po b/addons/account_tax_include/i18n/fr.po
deleted file mode 100644
index 3f912c6ffba29fba12677f92fcea5f2311a0a2a8..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/fr.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 09:23+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valide pour l'architecture de la vue"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Méthode de prix"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Factures et prix avec taxes comprises"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Taxe comprise"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Hors-taxe"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Code de calcul pour les prix taxes comprises"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Sous-total"
diff --git a/addons/account_tax_include/i18n/gl.po b/addons/account_tax_include/i18n/gl.po
deleted file mode 100644
index 96e9538706143a79d2f6bd2221c7cfa4918f6ee2..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/gl.po
+++ /dev/null
@@ -1,54 +0,0 @@
-# translation of account-tax-include-es.po to Galego
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_tax_include
-#
-# Frco. Javier Rial RodrÃguez <fjrial@cesga.es>, 2009.
-msgid ""
-msgstr ""
-"Project-Id-Version: account-tax-include-es\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 12:37+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: Galego <g11n@mancomun.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-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML non válido para a definición da vista!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Método prezo"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Facturas e prezos con impostos incluÃdos"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Imposto incluÃdo"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Imposto excluÃdo"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Código para o cálculo dos impostos en prezos incluÃdos"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/hr.po b/addons/account_tax_include/i18n/hr.po
deleted file mode 100644
index ba46ce2f95ab31e082da0e0bf00d98153fb54816..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/hr.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 23:43+0000\n"
-"Last-Translator: Dragan Jovanovic <dragan.jovanovic@strojotex.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nevažeći XML za Arhitekturu Prikaza!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Cjenovna metoda"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "RaÄuni i cijene sa ukljuÄenim porezom"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Porez ukljuÄen"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Nije ukljuÄen porez"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Kod za izraÄun cijena sa ukljuÄenim porezima"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Podzbroj"
diff --git a/addons/account_tax_include/i18n/hu.po b/addons/account_tax_include/i18n/hu.po
deleted file mode 100644
index 5090a5e011f0d6adc49ff3d25f0680cccf9f9671..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/hu.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_tax_include
-#
-msgid ""
-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: 2009-02-03 06:24+0000\n"
-"Last-Translator: <>\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-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/i18n/id.po b/addons/account_tax_include/i18n/id.po
deleted file mode 100644
index e0d1f76a6b189c367ca60827b09f2ef6e210e6a3..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/id.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 14:41+0000\n"
-"Last-Translator: mga (Open ERP) <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-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML tidak valid untuk Menampilkan Arsitektur!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Metode Harga"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Faktur dan harga sudah termasuk pajak"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Termasuk Pajak"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Tidak termasuk pajak"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "menghitung kode untuk Pajak termasuk harga"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Sub Total"
diff --git a/addons/account_tax_include/i18n/it.po b/addons/account_tax_include/i18n/it.po
deleted file mode 100644
index 0b3a6d3b846b85f139397c71133abca1e4766e3c..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/it.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_tax_include
-#
-msgid ""
-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-10-13 18:13+0000\n"
-"Last-Translator: simone.sandri <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-10-14 04:45+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per Visualizzazione Architettura!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Metodo di pagamento"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Tasse incluse"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Tasse escluse"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotale"
diff --git a/addons/account_tax_include/i18n/ko.po b/addons/account_tax_include/i18n/ko.po
deleted file mode 100644
index 254d3ffc1b160b1982cc5b197b21c8cbc26a6d24..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/ko.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# Korean translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 16:43+0000\n"
-"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
-"Language-Team: Korean <ko@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-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "ë·° 아키í…ì²˜ì˜ XMLì´ ìœ íš¨í•˜ì§€ 않습니다."
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "가격 ë°©ì‹"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "ì„¸ê¸ˆì´ í¬í•¨ëœ ì¸ë³´ì´ìŠ¤ì™€ 가격"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "세금 í¬í•¨"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "세금 ì œì™¸"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "세금 í¬í•¨ ê°€ê²©ì„ ìœ„í•œ 컴퓨터 코드"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "ì„œë¸Œí† í„¸"
diff --git a/addons/account_tax_include/i18n/lt.po b/addons/account_tax_include/i18n/lt.po
deleted file mode 100644
index 35af6cdcb04de12e658e8d8e4871c88b36635e7e..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/lt.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 15:54+0000\n"
-"Last-Translator: Donatas Stonys TeraxIT <donatelonow@hotmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/i18n/nb.po b/addons/account_tax_include/i18n/nb.po
deleted file mode 100644
index a457b6a3c4926d51a9dfc53c622ad22ec304b3dc..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/nb.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# Norwegian Bokmal translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-09 07:22+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Norwegian Bokmal <nb@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ugyldig XML for visningsarkitektur!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/nl.po b/addons/account_tax_include/i18n/nl.po
deleted file mode 100644
index cfccf0663d4beae1a82f55a1eded3ed580e2799b..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/nl.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-14 21:11+0000\n"
-"Last-Translator: Pieter J. Kersten (EduSense BV) <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-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor weergave!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Prijsmethode"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Facturen en prijzen inclusief belastingen"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Inclusief belastingen"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Exclusief belastingen"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Bereken code voor prijzen inclusief belastingen"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotaal"
diff --git a/addons/account_tax_include/i18n/nl_BE.po b/addons/account_tax_include/i18n/nl_BE.po
deleted file mode 100644
index 68a51f90ec3a2f1e64d2a19abbea268b6d5bc261..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/nl_BE.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_tax_include
-#
-msgid ""
-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-04-24 15:12+0000\n"
-"Last-Translator: <>\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-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/i18n/oc.po b/addons/account_tax_include/i18n/oc.po
deleted file mode 100644
index 95700dc830e24617099938790b6530f8d7f102b9..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/oc.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# Occitan (post 1500) translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 23:48+0000\n"
-"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
-"Language-Team: Occitan (post 1500) <oc@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-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invalid per l'arquitectura de la vista"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Metòde de prètz"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Facturas e prèses amb taxas inclusas"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Taxa inclusa"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Fòra taxa"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Còde de calcul pels prèses amb taxas compresas"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Sostotal"
diff --git a/addons/account_tax_include/i18n/pl.po b/addons/account_tax_include/i18n/pl.po
deleted file mode 100644
index efa5a2bfdfb951bc1b79fba964a4662d24fcb25d..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/pl.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-21 15:43+0000\n"
-"Last-Translator: Andrzej MoST (Marcin Ostajewski) <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-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Metoda wyceny"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Faktury i ceny zawierajÄ…ce podatki."
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Zawiera podatek"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Nie zawiera podatku"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Wylicz kod dla cen z podatkiem"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Suma częściowa"
diff --git a/addons/account_tax_include/i18n/pt.po b/addons/account_tax_include/i18n/pt.po
deleted file mode 100644
index 9f5c11b9832e15d61375ee43961e30f6fbde988e..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/pt.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 23:49+0000\n"
-"Last-Translator: mga (Open ERP) <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-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para a arquitectura da vista"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Método do preço"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Facturas e preços com imposto incluÃdo"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Imposto incluÃdo"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Imposto excluÃdo"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Código de cálculo para preços com imposto incluÃdo"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/pt_BR.po b/addons/account_tax_include/i18n/pt_BR.po
deleted file mode 100644
index bd8ff06c8e4836d4954a237d33a652f8b15fa801..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/pt_BR.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 12:28+0000\n"
-"Last-Translator: Pedro_Maschio <pedro.bicudo@tgtconsult.com.br>\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-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalido XML para Arquitetura da View"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/i18n/ro.po b/addons/account_tax_include/i18n/ro.po
deleted file mode 100644
index c6c5a81169c197beec41bd910d74ecf8c6e2ca54..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/ro.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 23:52+0000\n"
-"Last-Translator: mga (Open ERP) <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-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invalid pentru arhitectura machetei de afișare !"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Metoda de pret"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Facturi şi preţuri cu taxele incluse"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Taxe incluse"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Fără taxe"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Calcul cod pentru preţuri cu taxe incluse"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/ru.po b/addons/account_tax_include/i18n/ru.po
deleted file mode 100644
index 0d7efd3ffdfb8d6c6f832b26f0964b5deea9ea1a..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/ru.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-06-06 06:51+0000\n"
-"Last-Translator: mr.The <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-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ðеправильный XML Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñмотра архитектуры!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Метод раÑчета цены"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Счета и цены Ñ Ð½Ð°Ð»Ð¾Ð³Ð°Ð¼Ð¸"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "С налогами"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "До налогов"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Выполнить код Ð´Ð»Ñ Ñ†ÐµÐ½ Ñ Ð½Ð°Ð»Ð¾Ð³Ð°Ð¼Ð¸"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Промежуточный итог"
diff --git a/addons/account_tax_include/i18n/sk.po b/addons/account_tax_include/i18n/sk.po
deleted file mode 100644
index eedd88d3edc04fcce8713548787d4211ac0f7689..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/sk.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# Slovak translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 23:53+0000\n"
-"Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
-"Language-Team: Slovak <sk@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-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neplatné XML pre zobrazenie architektúry!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Faktúry a ceny zahrnuté s DPH"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "MedzisúÄet"
diff --git a/addons/account_tax_include/i18n/sl.po b/addons/account_tax_include/i18n/sl.po
deleted file mode 100644
index 22db03c58942c476c69308dffd321070e43a733a..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/sl.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 09:23+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neveljaven XML za arhitekturo pogleda."
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Metoda cene"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "RaÄuni in cene z vkljuÄenimi davki"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Davek vkljuÄen"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Davek ni vkljuÄen"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Koda izraÄuna za davke v cenah"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Delna vsota"
diff --git a/addons/account_tax_include/i18n/sq.po b/addons/account_tax_include/i18n/sq.po
deleted file mode 100644
index 7c7b2189fd25d7340bbbfe1d8eef2bd00d61b01d..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/sq.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# Albanian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 14:41+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Albanian <sq@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/i18n/sv.po b/addons/account_tax_include/i18n/sv.po
deleted file mode 100644
index 30a63ed1824c2520074684954a906f434ac4e42c..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/sv.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 02:42+0000\n"
-"Last-Translator: mga (Open ERP) <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-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Felaktig XML för Vyarkitektur!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/i18n/tlh.po b/addons/account_tax_include/i18n/tlh.po
deleted file mode 100644
index 334e888d03d3e73d0916bbcd82dde49a84e7de99..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/tlh.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:24+0000\n"
-"Last-Translator: <>\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-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/i18n/tr.po b/addons/account_tax_include/i18n/tr.po
deleted file mode 100644
index a719aaf1b2b745126929446002a032206eb7e32a..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/tr.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-09 06:58+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Görüntüleme mimarisi için Geçersiz XML"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Fiyat Yöntemi"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Vergiler dahil fiyat ve faturalar"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "KDV Dahil"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "KDV Hariç"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Alt Toplam"
diff --git a/addons/account_tax_include/i18n/uk.po b/addons/account_tax_include/i18n/uk.po
deleted file mode 100644
index 8b467132fb9dda3b55f43ec896333be55b82d186..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/uk.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 15:16+0000\n"
-"Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ðеправильний XML Ð´Ð»Ñ Ðрхітектури ВиглÑду!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/i18n/vi.po b/addons/account_tax_include/i18n/vi.po
deleted file mode 100644
index 055c258190160d1fd1b1562c6f60c3d9c839fbf1..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/vi.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# Vietnamese translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 14:41+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Vietnamese <vi@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-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/i18n/zh_CN.po b/addons/account_tax_include/i18n/zh_CN.po
deleted file mode 100644
index b5ed33802aeb92cddb99e46fc1c451b5ade06c4e..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/zh_CN.po
+++ /dev/null
@@ -1,63 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-07-13 16:34+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "æ— æ•ˆXML视图结构!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "ä»·æ ¼è§„åˆ™"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "å‘票和å«ç¨Žä»·"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "å«ç¨Ž"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "ä¸å«ç¨Ž"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "å«ç¨Žä»·æ ¼è®¡ç®—代ç "
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "å°è®¡"
-
-#~ msgid ""
-#~ "Allow the user to work tax included prices.\n"
-#~ "Especially useful for b2c businesses.\n"
-#~ " \n"
-#~ "This module implement the modification on the invoice form.\n"
-#~ msgstr ""
-#~ "å…许用户使用å«ç¨Žä»·æ ¼\n"
-#~ "特别适用于B2C商务\n"
-#~ "\n"
-#~ "这模å—使å‘ç¥¨çš„æ ¼å¼ç”Ÿæ•ˆ\n"
diff --git a/addons/account_tax_include/i18n/zh_TW.po b/addons/account_tax_include/i18n/zh_TW.po
deleted file mode 100644
index cc456963251cacb8ec47ac705421e47b0a5e3432..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/i18n/zh_TW.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_tax_include
-#
-msgid ""
-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: 2009-01-30 12:43+0000\n"
-"Last-Translator: <>\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-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/test/account_tax_include.yml b/addons/account_tax_include/test/account_tax_include.yml
deleted file mode 100644
index a4b0f8531b92ad1281e600923ca16aacdac635d6..0000000000000000000000000000000000000000
--- a/addons/account_tax_include/test/account_tax_include.yml
+++ /dev/null
@@ -1,93 +0,0 @@
-
--
- Creating a tax record
--
- !record {model: account.tax, id: account_tax_a0}:
- amount: 0.10000000000000001
- applicable_type: 'true'
- company_id: base.main_company
- description: a
- name: a
- sequence: 1
- type: percent
- type_tax_use: all
-
--
- Creating a account invoice record with tax excluded
--
- !record {model: account.invoice, id: account_invoice_tax_exclude}:
- account_id: account.a_recv
- address_contact_id: base.res_partner_address_3000
- address_invoice_id: base.res_partner_address_3000
- company_id: base.main_company
- currency_id: base.EUR
- invoice_line:
- - account_id: account.a_sale
- name: '[PC1] Basic PC'
- price_unit: 100.0
- quantity: 1.0
- invoice_line_tax_id:
- - account_tax_a0
- product_id: product.product_product_pc1
- uos_id: product.product_uom_unit
- journal_id: account.sales_journal
- partner_id: base.res_partner_desertic_hispafuentes
- price_type: tax_excluded
- reference_type: none
-
--
- Performing an osv_memory action button_reset_taxes on module account.invoice
--
- !python {model: account.invoice}: |
- self.button_reset_taxes(cr, uid, [ref("account_invoice_tax_exclude")], {"lang": "en_US", "tz": False,
- "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_action_invoice_tree1")],
- "type": "out_invoice", "active_id": ref("account.menu_action_invoice_tree1"),
- })
--
- Check if tax is excluded in invoice
--
- !assert {model: account.invoice, id: account_invoice_tax_exclude, severity: error, string: price type is tax excluded}:
- - state == "draft"
- - amount_untaxed == 100.0
- - amount_tax == 10.0
- - amount_total == 110.0
-
--
- Creating a account invoice record with tax include
--
- !record {model: account.invoice, id: account_invoice_tax_include}:
- account_id: account.a_recv
- address_contact_id: base.res_partner_address_3000
- address_invoice_id: base.res_partner_address_3000
- company_id: base.main_company
- currency_id: base.EUR
- invoice_line:
- - account_id: account.a_sale
- name: '[PC1] Basic PC'
- price_unit: 100.0
- quantity: 1.0
- invoice_line_tax_id:
- - account_tax_a0
- product_id: product.product_product_pc1
- uos_id: product.product_uom_unit
- journal_id: account.sales_journal
- partner_id: base.res_partner_desertic_hispafuentes
- price_type: tax_included
- reference_type: none
-
--
- Performing an osv_memory action button_reset_taxes on module account.invoice
--
- !python {model: account.invoice}: |
- self.button_reset_taxes(cr, uid, [ref("account_invoice_tax_include")], {"lang": "en_US", "tz": False,
- "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_action_invoice_tree1")],
- "type": "out_invoice", "active_id": ref("account.menu_action_invoice_tree1"),
- })
--
- Check if tax is included in invoice
--
- !assert {model: account.invoice, id: account_invoice_tax_include, severity: error, string: price type is tax included}:
- - state == "draft"
- - amount_untaxed == 90.91
- - amount_tax == 9.09
- - amount_total == 100.00
\ No newline at end of file
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index 683cca2442e7b0f9384053f1e6f2ec60326b248b..ce5cd60733254926c298b5c7cc79dcff05ebaae1 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -22,7 +22,7 @@
{
"name" : "Accounting Voucher Entries",
"version" : "1.0",
- "author" : 'OpenERP SA & Axelor',
+ "author" : 'OpenERP SA',
"description": """Account Voucher module includes all the basic requirements of
Voucher Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, etc...
* Voucher Entry
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 25997a2e0ebae9213066bdab420acad77923034b..a59b36a2736c9f1308033028f7211184f0e0deaa 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -110,7 +110,7 @@ class account_voucher(osv.osv):
return context.get('narration', False)
def name_get(self, cr, uid, ids, context=None):
- if not len(ids):
+ if not ids:
return []
return [(r['id'], (str("%.2f" % r['amount']) or '')) for r in self.read(cr, uid, ids, ['amount'], context, load='_classic_write')]
@@ -194,7 +194,7 @@ class account_voucher(osv.osv):
'state': 'draft',
'pay_now': 'pay_later',
'name': '',
- 'date' : time.strftime('%Y-%m-%d'),
+ 'date': time.strftime('%Y-%m-%d'),
'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.voucher',context=c),
'tax_id': _get_tax,
}
@@ -257,10 +257,9 @@ class account_voucher(osv.osv):
total = 0.0
total_tax = 0.0
-
for line in line_ids:
line_amount = 0.0
- line_amount = line[2].get('amount')
+ line_amount = line[2] and line[2].get('amount',0.0) or 0.0
voucher_line_ids += [line[1]]
voucher_total += line_amount
@@ -573,7 +572,7 @@ class account_voucher(osv.osv):
move_pool = self.pool.get('account.move')
move_line_pool = self.pool.get('account.move.line')
currency_pool = self.pool.get('res.currency')
- bank_st_line_obj = self.pool.get('account.bank.statement.line')
+ tax_obj = self.pool.get('account.tax')
for inv in self.browse(cr, uid, ids):
if inv.move_id:
continue
@@ -585,19 +584,14 @@ class account_voucher(osv.osv):
raise osv.except_osv(_('Error !'), _('Please define a sequence on the journal !'))
move = {
- 'name' : name,
+ 'name': name,
'journal_id': inv.journal_id.id,
- 'narration' : inv.narration,
+ 'narration': inv.narration,
'date':inv.date,
'ref':inv.reference,
'period_id': inv.period_id and inv.period_id.id or False
}
move_id = move_pool.create(cr, uid, move)
- line_bank_ids = bank_st_line_obj.search(cr, uid, [('voucher_id', '=', inv.id)], context=context)
- if line_bank_ids:
- bank_st_line_obj.write(cr, uid, line_bank_ids, {
- 'move_ids': [(4, move_id, False)]
- })
#create the first line manually
company_currency = inv.journal_id.company_id.currency_id.id
@@ -621,7 +615,7 @@ class account_voucher(osv.osv):
'debit':debit,
'credit':credit,
'account_id':inv.account_id.id,
- 'move_id':move_id ,
+ 'move_id':move_id,
'journal_id':inv.journal_id.id,
'period_id':inv.period_id.id,
'partner_id':inv.partner_id.id,
@@ -679,7 +673,10 @@ class account_voucher(osv.osv):
move_line.update({
'account_tax_id':inv.tax_id.id,
})
-
+ if move_line.get('account_tax_id', False):
+ tax_data = tax_obj.browse(cr, uid, [move_line['account_tax_id']], context=context)[0]
+ if not (tax_data.base_code_id and tax_data.tax_code_id):
+ raise osv.except_osv(_('No Account Base Code and Account Tax Code!'),_("You have to configure account base code and account tax code on the '%s' tax!") % (tax_data.name))
master_line = move_line_pool.create(cr, uid, move_line)
if line.move_line_id.id:
rec_ids = [master_line, line.move_line_id.id]
@@ -690,7 +687,7 @@ class account_voucher(osv.osv):
move_line = {
'name': name,
'account_id': False,
- 'move_id': move_id ,
+ 'move_id': move_id,
'partner_id': inv.partner_id.id,
'date': inv.date,
'credit': diff > 0 and diff or 0.0,
@@ -864,13 +861,20 @@ class account_bank_statement(osv.osv):
def create_move_from_st_line(self, cr, uid, st_line_id, company_currency_id, next_number, context=None):
voucher_obj = self.pool.get('account.voucher')
wf_service = netsvc.LocalService("workflow")
- st_line = self.pool.get('account.bank.statement.line').browse(cr, uid, st_line_id, context=context)
+ bank_st_line_obj = self.pool.get('account.bank.statement.line')
+ st_line = bank_st_line_obj.browse(cr, uid, st_line_id, context=context)
if st_line.voucher_id:
voucher_obj.write(cr, uid, [st_line.voucher_id.id], {'number': next_number}, context=context)
if st_line.voucher_id.state == 'cancel':
voucher_obj.action_cancel_draft(cr, uid, [st_line.voucher_id.id], context=context)
wf_service.trg_validate(uid, 'account.voucher', st_line.voucher_id.id, 'proforma_voucher', cr)
- return self.pool.get('account.move.line').write(cr, uid, [x.id for x in st_line.voucher_id.move_ids], {'statement_id': st_line.statement_id.id}, context=context)
+
+ v = voucher_obj.browse(cr, uid, st_line.voucher_id.id, context=context)
+ bank_st_line_obj.write(cr, uid, [st_line_id], {
+ 'move_ids': [(4, v.move_id.id, False)]
+ })
+
+ return self.pool.get('account.move.line').write(cr, uid, [x.id for x in v.move_ids], {'statement_id': st_line.statement_id.id}, context=context)
return super(account_bank_statement, self).create_move_from_st_line(cr, uid, st_line.id, company_currency_id, next_number, context=context)
account_bank_statement()
@@ -912,4 +916,4 @@ class account_bank_statement_line(osv.osv):
self.pool.get('account.voucher').unlink(cr, uid, unlink_ids, context=context)
return super(account_bank_statement_line, self).unlink(cr, uid, ids, context=context)
-account_bank_statement_line()
\ No newline at end of file
+account_bank_statement_line()
diff --git a/addons/account_voucher/i18n/sr.po b/addons/account_voucher/i18n/sr.po
index a6b8f5f074658f6fbc9131b22f1c4a7ece68c282..5c134d5bd0e590ec47ec5d32389cd62ec327a242 100644
--- a/addons/account_voucher/i18n/sr.po
+++ b/addons/account_voucher/i18n/sr.po
@@ -8,47 +8,47 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-28 10:22+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-10-17 17:33+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
"Language-Team: Serbian <sr@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-09-29 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-10-18 04:55+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.act_account_acount_move_line_open1
msgid "Opening Balance Entry"
-msgstr ""
+msgstr "Otvaranje sadrzaja salda"
#. module: account_voucher
#: model:ir.ui.menu,name:account_voucher.menu_action_receipt_bakreceipt_voucher_list
msgid "Bank Receipts"
-msgstr ""
+msgstr "Bankovni primitci"
#. module: account_voucher
#: rml:voucher.cash_amount:0
#: rml:voucher.cash_receipt.drcr:0
msgid "Particulars"
-msgstr ""
+msgstr "Pojedinosti"
#. module: account_voucher
#: rml:voucher.cash_amount:0
#: rml:voucher.cash_receipt.drcr:0
msgid "State :"
-msgstr ""
+msgstr "Stanje :"
#. module: account_voucher
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Pogrešno ime modela u definiciji akcije."
#. module: account_voucher
#: rml:voucher.cash_amount:0
#: rml:voucher.cash_receipt.drcr:0
msgid "Ref. :"
-msgstr ""
+msgstr "Ref. :"
#. module: account_voucher
#: selection:account.move,voucher_type:0
@@ -57,12 +57,12 @@ msgstr ""
#: model:ir.actions.act_window,name:account_voucher.action_view_cont_voucher_form
#: model:ir.ui.menu,name:account_voucher.menu_action_view_cont_voucher_form
msgid "Contra Voucher"
-msgstr ""
+msgstr "Suprotna priznanica"
#. module: account_voucher
#: field:account.voucher,company_id:0
msgid "Company"
-msgstr ""
+msgstr "Preduzeće"
#. module: account_voucher
#: selection:account.move,voucher_type:0
@@ -70,88 +70,88 @@ msgstr ""
#: model:ir.actions.act_window,name:account_voucher.action_view_jour_voucher_form
#: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_voucher_form
msgid "Journal Voucher"
-msgstr ""
+msgstr "Nalog za knjiženje"
#. module: account_voucher
#: rml:voucher.cash_receipt.drcr:0
msgid ","
-msgstr ""
+msgstr ","
#. module: account_voucher
#: view:account.voucher:0
msgid "Set to Draft"
-msgstr ""
+msgstr "Postavi u pripremu"
#. module: account_voucher
#: wizard_button:account.voucher.open,init,open:0
msgid "Open Voucher Entries"
-msgstr ""
+msgstr "Otvori Stavke Priznanice"
#. module: account_voucher
#: model:ir.model,name:account_voucher.model_account_voucher_line
msgid "Voucher Line"
-msgstr ""
+msgstr "Red Priznanice"
#. module: account_voucher
#: view:account.move:0
msgid "Total Credit"
-msgstr ""
+msgstr "Ukupno potrazuje"
#. module: account_voucher
#: field:account.voucher,account_id:0
#: field:account.voucher.line,account_id:0
msgid "Account"
-msgstr ""
+msgstr "Konto"
#. module: account_voucher
#: rml:voucher.cash_amount:0
msgid "D"
-msgstr ""
+msgstr "D"
#. module: account_voucher
#: field:account.account,level:0
msgid "Level"
-msgstr ""
+msgstr "Nivo"
#. module: account_voucher
#: view:account.move:0
msgid "Account Entry Line"
-msgstr ""
+msgstr "Stavke knjiženja"
#. module: account_voucher
#: view:account.move:0
msgid "Total Debit"
-msgstr ""
+msgstr "Ukupno duguje"
#. module: account_voucher
#: field:account.voucher,amount:0
#: field:account.voucher.line,amount:0
#: rml:voucher.cash_amount:0
msgid "Amount"
-msgstr ""
+msgstr "Iznos"
#. module: account_voucher
#: rml:voucher.cash_amount:0
#: rml:voucher.cash_receipt.drcr:0
msgid "Receiver's Signature"
-msgstr ""
+msgstr "Potpis Primaoca"
#. module: account_voucher
#: rml:voucher.cash_amount:0
#: rml:voucher.cash_receipt.drcr:0
msgid "No."
-msgstr ""
+msgstr "Br."
#. module: account_voucher
#: rml:voucher.cash_amount:0
#: rml:voucher.cash_receipt.drcr:0
msgid "Amount (in words) :"
-msgstr ""
+msgstr "Iznos ( napisano slovima )"
#. module: account_voucher
#: field:account.voucher.line,account_analytic_id:0
msgid "Analytic Account"
-msgstr ""
+msgstr "AnalitiÄki konto"
#. module: account_voucher
#: selection:account.move,voucher_type:0
@@ -160,24 +160,24 @@ msgstr ""
#: model:ir.actions.act_window,name:account_voucher.action_view_jour_sale_voucher_form
#: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_sale_voucher_form
msgid "Journal Sale Voucher"
-msgstr ""
+msgstr "Dnevnik prodaje priznanicama"
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_receipt_vou_voucher_list
#: model:ir.ui.menu,name:account_voucher.menu_action_receipt_vou_voucher_list
msgid "Receipt Vouchers"
-msgstr ""
+msgstr "Priznanice prijema"
#. module: account_voucher
#: rml:voucher.cash_amount:0
msgid "Account :"
-msgstr ""
+msgstr "Nalog :"
#. module: account_voucher
#: rml:voucher.cash_amount:0
#: rml:voucher.cash_receipt.drcr:0
msgid "On Account of :"
-msgstr ""
+msgstr "Na Nalogu od:"
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_payments_bankpay_voucher_list
@@ -185,12 +185,12 @@ msgstr ""
#: model:ir.actions.act_window,name:account_voucher.action_payments_voucher_list
#: model:ir.ui.menu,name:account_voucher.menu_action_payments_voucher_list
msgid "Payment Vouchers"
-msgstr ""
+msgstr "Priznanice plaćanja"
#. module: account_voucher
#: view:account.voucher:0
msgid "Create"
-msgstr ""
+msgstr "Kreiraj"
#. module: account_voucher
#: selection:account.account,type1:0
diff --git a/addons/account_voucher/report/rml_parse.py b/addons/account_voucher/report/rml_parse.py
index d59a5f0551a9ae307735f5b3f9f0809b03380526..1a5d3fa6ec100fcd89f97e41cfb272494ce33a66 100644
--- a/addons/account_voucher/report/rml_parse.py
+++ b/addons/account_voucher/report/rml_parse.py
@@ -30,16 +30,16 @@ class rml_parse(report_sxw.rml_parse):
self.localcontext.update({
'comma_me': self.comma_me,
'format_date': self._get_and_change_date_format_for_swiss,
- 'strip_name' : self._strip_name,
- 'explode_name' : self._explode_name,
+ 'strip_name': self._strip_name,
+ 'explode_name': self._explode_name,
})
def comma_me(self, amount):
if not amount:
amount = 0.0
- if type(amount) is float :
+ if type(amount) is float:
amount = str('%.2f'%amount)
- else :
+ else:
amount = str(amount)
if (amount == '0'):
return ' '
diff --git a/addons/account_voucher/security/ir.model.access.csv b/addons/account_voucher/security/ir.model.access.csv
index b27392628f05e60d4386344b95bc49477100c14a..e2b048dcedd9d45106246ded200f577b222a1ada 100644
--- a/addons/account_voucher/security/ir.model.access.csv
+++ b/addons/account_voucher/security/ir.model.access.csv
@@ -4,6 +4,4 @@
"access_account_voucher_manager","account.voucher","model_account_voucher","account.group_account_manager",1,0,0,0
"access_account_voucher_line_manager","account.voucher.line","model_account_voucher_line","account.group_account_manager",1,0,0,0
"access_account_voucher_invoice","account.voucher invoice","model_account_voucher","account.group_account_invoice",1,1,1,1
-"access_account_voucher_system","account.voucher system","model_account_voucher","base.group_system",1,0,0,0
-"access_account_voucher_line_system","account.voucher.line.system","model_account_voucher_line","base.group_system",1,0,0,0
"access_account_voucher_line_invoice","account.voucher.line invoice","model_account_voucher_line","account.group_account_invoice",1,1,1,1
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 8169cac31e360a0593173ba9249cb236329c7cba..a8f827e7bb85208cb4ce3e6e0fb80cea86082fed 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -235,6 +235,7 @@
<field name="view_id" eval="False"/>
<field name="search_view_id" ref="view_voucher_filter_vendor_pay"/>
<field name="target">current</field>
+ <field name="help">The supplier payment form allows you to track the payment you do to your suppliers. When you select a supplier, the payment method and an amount for the payment, OpenERP will propose to reconcile your payment with the open supplier invoices or bills.</field>
</record>
<record id="action_vendor_payment_tree" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
@@ -342,6 +343,7 @@
<field name="search_view_id" ref="view_voucher_filter_customer_pay"/>
<field name="view_id" eval="False"/>
<field name="target">current</field>
+ <field name="help">Sales payment allows you to register the payments you receive from your customers. In order to record a payment, you must enter the customer, the payment method (=the journal) and the payment amount. OpenERP will propose to you automatically the reconciliation of this payment with the open invoices or sales receipts.</field>
</record>
<record id="action_vendor_receipt_tree" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index ad44b842587d95338d43f821733d028cf6df7c16..ed6e98ad17dbe507c5cb067e05aec7bb25b9316f 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -172,6 +172,7 @@
<field name="view_id" eval="False"/>
<field name="search_view_id" ref="view_voucher_filter_sale"/>
<field name="target">current</field>
+ <field name="help">When you sell products to a customer, you can give him a sales receipt or an invoice. When the sales receipt is confirmed, it creates journal items automatically and you can record the customer payment related to this sales receipt.</field>
</record>
<record id="action_sale_receipt_tree" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
diff --git a/addons/account_voucher/wizard/account_statement_from_invoice.py b/addons/account_voucher/wizard/account_statement_from_invoice.py
index 16d05f3f62c2531e8b3243929c9a23622ed70f4f..507fdcabffad3822db57b08e294c9e4603bd3b00 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice.py
+++ b/addons/account_voucher/wizard/account_statement_from_invoice.py
@@ -74,7 +74,7 @@ class account_statement_from_invoice_lines(osv.osv_memory):
context.update({'move_line_ids': [line.id]})
result = voucher_obj.onchange_partner_id(cr, uid, [], partner_id=line.partner_id.id, journal_id=statement.journal_id.id, price=abs(amount), currency_id= statement.currency.id, ttype=(amount < 0 and 'payment' or 'receipt'), context=context)
- voucher_res = { 'type':(amount < 0 and 'payment' or 'receipt') ,
+ voucher_res = { 'type':(amount < 0 and 'payment' or 'receipt'),
'name': line.name,
'partner_id': line.partner_id.id,
'journal_id': statement.journal_id.id,
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index bfaa59adf2dc1be6d7ad624cfd005accb5475eff..dd727e993b6370203001aa9a0cd8979d9a9f3304 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -20,12 +20,10 @@
##############################################################################
import time
-import operator
from osv import fields, osv
import decimal_precision as dp
-
class account_analytic_account(osv.osv):
_name = 'account.analytic.account'
_description = 'Analytic Account'
@@ -239,7 +237,6 @@ class account_analytic_account(osv.osv):
return {}
parent = self.read(cr, uid, [parent_id], ['partner_id','code'])[0]
childs = self.search(cr, uid, [('parent_id', '=', parent_id)])
- numchild = len(childs)
if parent['partner_id']:
partner = parent['partner_id'][0]
else:
diff --git a/addons/analytic/i18n/sr.po b/addons/analytic/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..77fb1553933a6b92df420e34e97ccb18f4414001
--- /dev/null
+++ b/addons/analytic/i18n/sr.po
@@ -0,0 +1,285 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-06-18 10:59+0000\n"
+"PO-Revision-Date: 2010-10-15 08:47+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-16 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: analytic
+#: field:account.analytic.account,child_ids:0
+msgid "Child Accounts"
+msgstr "Podređeni Nalozi"
+
+#. module: analytic
+#: help:account.analytic.line,amount_currency:0
+msgid ""
+"The amount expressed in the related account currency if not equal to the "
+"company one."
+msgstr ""
+"Vrednost izrazena u datom iznosu valute ako nije jednaka valuti preduzeca"
+
+#. module: analytic
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da poÄinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account Name"
+msgstr "Naziv raÄuna"
+
+#. module: analytic
+#: help:account.analytic.line,unit_amount:0
+msgid "Specifies the amount of quantity to count."
+msgstr "Specificira koju kolicinu iznosa da broji"
+
+#. module: analytic
+#: help:account.analytic.line,currency_id:0
+msgid "The related account currency if not equal to the company one."
+msgstr "Dati iznos valute ako nije jednaka valuti preduzeca"
+
+#. module: analytic
+#: model:ir.module.module,description:analytic.module_meta_information
+msgid ""
+"Module for defining analytic accounting object.\n"
+" "
+msgstr ""
+"Modul za definisanje Analitickog Racuna objekta\n"
+" "
+
+#. module: analytic
+#: field:account.analytic.account,state:0
+msgid "State"
+msgstr "Stanje"
+
+#. module: analytic
+#: field:account.analytic.account,user_id:0
+msgid "Account Manager"
+msgstr "Upravnik raÄunovodstva"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Draft"
+msgstr "Priprema"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Closed"
+msgstr "Zatvoren"
+
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Duguje"
+
+#. module: analytic
+#: help:account.analytic.account,state:0
+msgid ""
+"* When an account is created its in 'Draft' state. "
+" \n"
+"* If any associated partner is there, it can be in 'Open' state. "
+" \n"
+"* If any pending balance is there it can be in 'Pending'. "
+" \n"
+"* And finally when all the transactions are over, it can be in 'Close' "
+"state. \n"
+"* The project can be in either if the states 'Template' and 'Running'.\n"
+" If it is template then we can make projects based on the template projects. "
+"If its in 'Running' state it is a normal project. "
+" \n"
+" If it is to be reviewed then the state is 'Pending'.\n"
+" When the project is completed the state is set to 'Done'."
+msgstr ""
+"*Kada je neka faktura kreirana a nalazi se u ' U Toku'. "
+" \n"
+"*Ako je bilo koji asocirani partner tamo, on mora biti u stanju ' Otvoren'. "
+" \n"
+"*Ako je bilo koji Saldo u stanju 'U izvrsenju' on mora i biti tamo. "
+" "
+"\n"
+"*I , na kraju kada su sve transakcije gotove, mora se naci u stanju ' "
+"Zatvoreno'. "
+" \n"
+" Ako je ovo shema(obrazac) onda mi mozemo napraviri projekat baziran na "
+"istom. Ako je u stanju ' U izvrsenju' to je normalnan\n"
+"projekat.\n"
+" Ako zelimo da ga pregledamo, stanje mora biti ' U Toku'.\n"
+" Kada je projekat zavrsen stanje je postavljeno na ' Zavrseno'."
+
+#. module: analytic
+#: field:account.analytic.account,type:0
+msgid "Account Type"
+msgstr "Vrsta konta"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Template"
+msgstr "Å ablon"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Pending"
+msgstr "U toku"
+
+#. module: analytic
+#: model:ir.model,name:analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Analiticki red"
+
+#. module: analytic
+#: field:account.analytic.account,description:0
+#: field:account.analytic.line,name:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price."
+msgstr ""
+"Izracunato mnozenjem kolicine i cene dobijene iz Proizvodove cene kostanja"
+
+#. module: analytic
+#: field:account.analytic.account,company_id:0
+#: field:account.analytic.line,company_id:0
+msgid "Company"
+msgstr "Preduzeće"
+
+#. module: analytic
+#: field:account.analytic.account,quantity_max:0
+msgid "Maximum Quantity"
+msgstr "Maximalna kolicina"
+
+#. module: analytic
+#: field:account.analytic.line,user_id:0
+msgid "User"
+msgstr "Korisnik"
+
+#. module: analytic
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "NadreÄ‘eni analitiÄki konto"
+
+#. module: analytic
+#: field:account.analytic.line,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: analytic
+#: field:account.analytic.account,currency_id:0
+#: field:account.analytic.line,currency_id:0
+msgid "Account currency"
+msgstr "Valuta Naloga"
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "View"
+msgstr "Pregled"
+
+#. module: analytic
+#: help:account.analytic.account,quantity_max:0
+msgid "Sets the higher limit of quantity of hours."
+msgstr "Postavi limit za kolicinu Sati"
+
+#. module: analytic
+#: field:account.analytic.account,credit:0
+msgid "Credit"
+msgstr "Kredit"
+
+#. module: analytic
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Iznos"
+
+#. module: analytic
+#: field:account.analytic.account,contact_id:0
+msgid "Contact"
+msgstr "Kontakt"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Cancelled"
+msgstr "Otkazano"
+
+#. module: analytic
+#: field:account.analytic.account,balance:0
+msgid "Balance"
+msgstr "Saldo"
+
+#. module: analytic
+#: field:account.analytic.account,date_start:0
+msgid "Date Start"
+msgstr "PoÄetni datum"
+
+#. module: analytic
+#: field:account.analytic.account,quantity:0
+#: field:account.analytic.line,unit_amount:0
+msgid "Quantity"
+msgstr "KoliÄina"
+
+#. module: analytic
+#: field:account.analytic.account,date:0
+msgid "Date End"
+msgstr "Završni datum"
+
+#. module: analytic
+#: field:account.analytic.account,code:0
+msgid "Account Code"
+msgstr "Sifra Naloga"
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "Normal"
+msgstr "Normalan"
+
+#. module: analytic
+#: field:account.analytic.account,complete_name:0
+msgid "Full Account Name"
+msgstr "Puni naziv konta"
+
+#. module: analytic
+#: field:account.analytic.line,account_id:0
+#: model:ir.model,name:analytic.model_account_analytic_account
+#: model:ir.module.module,shortdesc:analytic.module_meta_information
+msgid "Analytic Account"
+msgstr "AnalitiÄki konto"
+
+#. module: analytic
+#: field:account.analytic.account,company_currency_id:0
+msgid "Currency"
+msgstr "Valuta"
+
+#. module: analytic
+#: field:account.analytic.line,amount_currency:0
+msgid "Amount currency"
+msgstr "Iznos valute"
+
+#. module: analytic
+#: field:account.analytic.account,partner_id:0
+msgid "Associated Partner"
+msgstr "Povezani partner"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Open"
+msgstr "Otvori"
+
+#. module: analytic
+#: field:account.analytic.account,line_ids:0
+msgid "Analytic Entries"
+msgstr "AnalitiÄke stavke"
diff --git a/addons/analytic_journal_billing_rate/i18n/sr.po b/addons/analytic_journal_billing_rate/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..cad00d3772cd60bc74577ec7d1639cba26650d28
--- /dev/null
+++ b/addons/analytic_journal_billing_rate/i18n/sr.po
@@ -0,0 +1,65 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-15 09:19+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-16 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: analytic_journal_billing_rate
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,journal_id:0
+msgid "Analytic Journal"
+msgstr "Analiticki Dnevnik"
+
+#. module: analytic_journal_billing_rate
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da poÄinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: analytic_journal_billing_rate
+#: view:analytic_journal_rate_grid:0
+msgid "Billing Rate per Journal for this Analytic Account"
+msgstr "Stepen naplate po Dnevniku za ovaj Analiticki Konto"
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,account_id:0
+msgid "Analytic Account"
+msgstr "AnalitiÄki konto"
+
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
+msgid "Relation table between journals and billing rates"
+msgstr "Relaciona tabela izmedju dnevnika i stepena naplate"
+
+#. module: analytic_journal_billing_rate
+#: field:account.analytic.account,journal_rate_ids:0
+msgid "Invoicing Rate per Journal"
+msgstr "Stepen fakturiranja po Dnevniku"
+
+#. module: analytic_journal_billing_rate
+#: model:ir.module.module,shortdesc:analytic_journal_billing_rate.module_meta_information
+msgid "Analytic Journal Billing Rate"
+msgstr "Analiticki Dnevnik obracunate cene"
+
+#. module: analytic_journal_billing_rate
+#: field:analytic_journal_rate_grid,rate_id:0
+msgid "Invoicing Rate"
+msgstr "Fakturisanje cene"
diff --git a/addons/analytic_user_function/i18n/sr.po b/addons/analytic_user_function/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..846409dd53d78c6c5476658cc25f7c20d238599a
--- /dev/null
+++ b/addons/analytic_user_function/i18n/sr.po
@@ -0,0 +1,66 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-15 09:40+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-16 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: analytic_user_function
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "Relaciona tabela izmedju korisnika i proizvoda u analitickom kontu"
+
+#. module: analytic_user_function
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr "Proizvod"
+
+#. module: analytic_user_function
+#: field:analytic_user_funct_grid,account_id:0
+msgid "Analytic Account"
+msgstr "AnalitiÄki konto"
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+#: field:account.analytic.account,user_product_ids:0
+msgid "Users/Products Rel."
+msgstr "Korisnik/Proizvod Relac."
+
+#. module: analytic_user_function
+#: field:analytic_user_funct_grid,user_id:0
+msgid "User"
+msgstr "Korisnik"
+
+#. module: analytic_user_function
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da poÄinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: analytic_user_function
+#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
+msgid "Analytic User Function"
+msgstr "Korisnicka Funkcija Analitike"
+
+#. module: analytic_user_function
+#: view:analytic_user_funct_grid:0
+msgid "User's Product for this Analytic Account"
+msgstr "Korisnicki Proizvod za ovaj Analiticki Konto"
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index 43de651e5546addebaa98b5f78fe023b55b272c6..36a1b60096ca10d2a8e75f2086ed52bf91f64db9 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -2,8 +2,8 @@
<openerp>
<data>
<menuitem name="Auction" id="auction_menu_root" icon="terp-purchase" sequence="26"
- groups="base.group_system,group_auction_manager,group_auction_user"/>
- <menuitem name="Configuration" parent="auction_menu_root" id="auction_config_menu" sequence="7" groups="base.group_system,group_auction_manager"/>
+ groups="group_auction_manager,group_auction_user"/>
+ <menuitem name="Configuration" parent="auction_menu_root" id="auction_config_menu" sequence="7" groups="group_auction_manager"/>
<menuitem name="Tools Bar Codes" id="auction_outils_menu" parent="auction_menu_root" sequence="5" />
<menuitem name="Deliveries Management" action="action_auction_taken" id="menu_wizard_emporte" parent="auction_outils_menu"/>
@@ -82,7 +82,7 @@
</record>
<menuitem name="Object Categories" parent="auction_config_menu" action="action_auction_object_categories"
- id="menu_auction_object_cat" groups="base.group_system,group_auction_manager"/>
+ id="menu_auction_object_cat" groups="group_auction_manager"/>
<!-- Auction Management/Auction Dates/New Auction Dates -->
@@ -765,7 +765,7 @@
<menuitem name="Buyers" id="auction_buyers_menu" parent="auction_menu_root" sequence="4"/>
<menuitem name="Bids" parent="auction_buyers_menu" action="action_bid_open" id="menu_action_bid_open"/>
- <menuitem name="Reporting" id="auction_report_menu" parent="auction_menu_root" sequence="6" groups="base.group_system,group_auction_manager"/>
+ <menuitem name="Reporting" id="auction_report_menu" parent="auction_menu_root" sequence="6" groups="group_auction_manager"/>
<act_window name="Deposit slip"
context="{'search_default_partner_id': [active_id]}"
diff --git a/addons/auction/board_auction_view.xml b/addons/auction/board_auction_view.xml
index 56ed41e2ca534e75f298b880dbe70e380360def1..12ef99043b0f4854179494c7dff73b30916a919b 100644
--- a/addons/auction/board_auction_view.xml
+++ b/addons/auction/board_auction_view.xml
@@ -111,7 +111,7 @@
sequence="1"
id="menu_board_auction_open" icon="terp-graph" parent="menu_board_auction"/>
- <menuitem name="Auction" id="auction.auction_menu_root" icon="terp-purchase" sequence="26" groups="base.group_system" action="open_board_auction"/>
+ <menuitem name="Auction" id="auction.auction_menu_root" icon="terp-purchase" sequence="26" action="open_board_auction"/>
</data>
</openerp>
diff --git a/addons/auction/security/ir.model.access.csv b/addons/auction/security/ir.model.access.csv
index 31f3182fa04101e80b8e1503882b54cefada8add..5458e6c2ac3aeefb2cc4f349eaeba76869b1c610 100644
--- a/addons/auction/security/ir.model.access.csv
+++ b/addons/auction/security/ir.model.access.csv
@@ -18,15 +18,6 @@
"access_report_auction_adjudication","report.auction.adjudication","model_report_auction_adjudication","group_auction_manager",1,1,1,1
"access_report_object_encoded","report.object.encoded","model_report_object_encoded","group_auction_manager",1,1,1,1
"access_aie_category","aie.category","model_aie_category","group_auction_manager",1,1,1,1
-"access_auction_dates_system","auction.dates system","model_auction_dates","base.group_system",1,0,0,0
-"access_auction_lots_system","auction.lots system","model_auction_lots","base.group_system",1,0,0,0
-"access_auction_deposit_system","auction.deposit system","model_auction_deposit","base.group_system",1,0,0,0
-"access_auction_bid_system","auction.bid system","model_auction_bid","base.group_system",1,0,0,0
-"access_auction_artists_system","auction.artists system","model_auction_artists","base.group_system",1,1,1,1
-"access_auction_lot_category_system","auction.lot.category system","model_auction_lot_category","base.group_system",1,1,1,1
-"access_auction_lot_history_system","auction.lot.history system","model_auction_lot_history","base.group_system",1,0,0,0
-"access_auction_deposit_cost_system","auction.deposit.cost system","model_auction_deposit_cost","base.group_system",1,0,0,0
-"access_auction_bid_line_system","auction.bid.line system","model_auction_bid_line","base.group_system",1,0,0,0
"access_auction_account_tax","account.tax manager","account.model_account_tax","group_auction_manager",1,1,1,0
"access_auction_account_fiscalyear","account.fiscalyear manager","account.model_account_fiscalyear","group_auction_manager",1,1,1,0
"access_auction_account_journal","account.journal manager","account.model_account_journal","group_auction_manager",1,1,1,0
diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index dd843449c8c3c093c69e2e0bd74be47feb5dd7a9..c2ef5f5d4a489940fb4df6f683831debdfe330aa 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -456,7 +456,7 @@ class audittrail_objects_proxy(osv_pool):
"""
Overrides Object Proxy execute method
@param db: the current database
- @param uid: the current user’s ID for security checks,
+ @param uid: the current user's ID for security checks,
@param object: Object who's values are being changed
@param method: get any method and create log
@@ -500,49 +500,47 @@ class audittrail_objects_proxy(osv_pool):
return self.log_fct(db, uid, model, method, fct_src, *args)
return fct_src(db, uid, model, method, *args)
- res = my_fct(db, uid, model, method, *args)
- cr.close()
- return res
-
+ try:
+ res = my_fct(db, uid, model, method, *args)
+ return res
+ finally:
+ cr.close()
def exec_workflow(self, db, uid, model, method, *args, **argv):
pool = pooler.get_pool(db)
- cr = pooler.get_db(db).cursor()
- cr.autocommit(True)
logged_uids = []
fct_src = super(audittrail_objects_proxy, self).exec_workflow
field = method
rule = False
model_pool = pool.get('ir.model')
rule_pool = pool.get('audittrail.rule')
- model_ids = model_pool.search(cr, uid, [('model', '=', model)])
- for obj_name in pool.obj_list():
- if obj_name == 'audittrail.rule':
- rule = True
- if not rule:
- cr.close()
- return super(audittrail_objects_proxy, self).exec_workflow(db, uid, model, method, *args, **argv)
- if not model_ids:
- cr.close()
- return super(audittrail_objects_proxy, self).exec_workflow(db, uid, model, method, *args, **argv)
-
- rule_ids = rule_pool.search(cr, uid, [('object_id', 'in', model_ids), ('state', '=', 'subscribed')])
- if not rule_ids:
- cr.close()
- return super(audittrail_objects_proxy, self).exec_workflow(db, uid, model, method, *args, **argv)
-
- for thisrule in rule_pool.browse(cr, uid, rule_ids):
- for user in thisrule.user_id:
- logged_uids.append(user.id)
- if not logged_uids or uid in logged_uids:
- if thisrule.log_workflow:
- cr.close()
- return self.log_fct(db, uid, model, method, fct_src, *args)
- cr.close()
- return super(audittrail_objects_proxy, self).exec_workflow(db, uid, model, method, *args, **argv)
+ cr = pooler.get_db(db).cursor()
+ cr.autocommit(True)
+ try:
+ model_ids = model_pool.search(cr, uid, [('model', '=', model)])
+ for obj_name in pool.obj_list():
+ if obj_name == 'audittrail.rule':
+ rule = True
+ if not rule:
+ return super(audittrail_objects_proxy, self).exec_workflow(db, uid, model, method, *args, **argv)
+ if not model_ids:
+ return super(audittrail_objects_proxy, self).exec_workflow(db, uid, model, method, *args, **argv)
- cr.close()
- return True
+ rule_ids = rule_pool.search(cr, uid, [('object_id', 'in', model_ids), ('state', '=', 'subscribed')])
+ if not rule_ids:
+ return super(audittrail_objects_proxy, self).exec_workflow(db, uid, model, method, *args, **argv)
+
+ for thisrule in rule_pool.browse(cr, uid, rule_ids):
+ for user in thisrule.user_id:
+ logged_uids.append(user.id)
+ if not logged_uids or uid in logged_uids:
+ if thisrule.log_workflow:
+ return self.log_fct(db, uid, model, method, fct_src, *args)
+ return super(audittrail_objects_proxy, self).exec_workflow(db, uid, model, method, *args, **argv)
+
+ return True
+ finally:
+ cr.close()
audittrail_objects_proxy()
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index 218db24d89a890022a5bc0a06ad20594b04579cc..5fdcfcd55585cd6eb715ee61d4cf8e95c61d904e 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -55,7 +55,7 @@
<!-- Action for audittrail rule -->
<record model="ir.actions.act_window" id="action_audittrail_rule_tree">
- <field name="name">Rules</field>
+ <field name="name">Audit Rules</field>
<field name="res_model">audittrail.rule</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
@@ -63,12 +63,8 @@
<!--<field name="view_id" ref="view_audittrail_rule_form" />-->
</record>
- <menuitem name="Audittrail" id="menu_action_audittrail"
- groups="base.group_extended"
- parent="base.menu_administration" />
-
<menuitem name="Rules" id="menu_action_audittrail_rule_tree"
- action="action_audittrail_rule_tree" parent="menu_action_audittrail" />
+ action="action_audittrail_rule_tree" parent="base.menu_audit" />
<record model="ir.actions.act_window" id="action_audittrail_rule_tree_sub">
@@ -152,12 +148,12 @@
<!-- Action for Audittrail Log -->
<record model="ir.actions.act_window" id="action_audittrail_log_tree">
- <field name="name">Logs</field>
+ <field name="name">Audit Logs</field>
<field name="res_model">audittrail.log</field>
<field name="view_type">form</field>
</record>
<menuitem name="Logs" id="menu_action_audittrail_log_tree"
- action="action_audittrail_log_tree" parent="menu_action_audittrail" />
+ action="action_audittrail_log_tree" parent="base.menu_audit" />
</data>
</openerp>
diff --git a/addons/audittrail/i18n/ru.po b/addons/audittrail/i18n/ru.po
index 9bc201a24c2c9ae4c9d0bad1841ad11cd430acfb..30a63c8c88da21ba5039180ea1a8249b6b245bcb 100644
--- a/addons/audittrail/i18n/ru.po
+++ b/addons/audittrail/i18n/ru.po
@@ -7,19 +7,19 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 00:52+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-10-16 09:06+0000\n"
+"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
#: model:ir.module.module,shortdesc:audittrail.module_meta_information
msgid "Audit Trail"
-msgstr ""
+msgstr "Проведение аудита"
#. module: audittrail
#: constraint:ir.model:0
@@ -43,6 +43,8 @@ msgstr "ПодпиÑка"
#: view:audittrail.log:0
msgid "Old Value : "
msgstr ""
+"Старое значение.\\nпредÑтавление пробела. Введите пробел в Ñквивалентную "
+"позицию перевода "
#. module: audittrail
#: selection:audittrail.log,method:0
@@ -52,7 +54,7 @@ msgstr "Создать"
#. module: audittrail
#: wizard_view:audittrail.view.log,init:0
msgid "Audit Logs"
-msgstr ""
+msgstr "Логи аудита"
#. module: audittrail
#: field:audittrail.rule,state:0
@@ -82,7 +84,7 @@ msgstr "ПроÑмотреть журнал"
#. module: audittrail
#: model:ir.model,name:audittrail.model_audittrail_log_line
msgid "audittrail.log.line"
-msgstr ""
+msgstr "Строки лога аудита"
#. module: audittrail
#: field:audittrail.log,method:0
@@ -92,17 +94,17 @@ msgstr "Метод"
#. module: audittrail
#: wizard_field:audittrail.view.log,init,from:0
msgid "Log From"
-msgstr ""
+msgstr "Форма лога"
#. module: audittrail
#: field:audittrail.log.line,log:0
msgid "Log ID"
-msgstr ""
+msgstr "Идентификатор лога"
#. module: audittrail
#: field:audittrail.log,res_id:0
msgid "Resource Id"
-msgstr ""
+msgstr "Идентификатор запиÑи"
#. module: audittrail
#: selection:audittrail.log,method:0
@@ -112,12 +114,12 @@ msgstr "ÐапиÑать"
#. module: audittrail
#: model:ir.ui.menu,name:audittrail.menu_action_audittrail
msgid "Audittrails"
-msgstr ""
+msgstr "Проведение аудита"
#. module: audittrail
#: view:audittrail.log:0
msgid "Log Lines"
-msgstr ""
+msgstr "Строки лога"
#. module: audittrail
#: view:audittrail.rule:0
@@ -138,17 +140,17 @@ msgstr "Объект"
#. module: audittrail
#: view:audittrail.rule:0
msgid "AuditTrail Rule"
-msgstr ""
+msgstr "Правила Ð¿Ñ€Ð¾Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð°ÑƒÐ´Ð¸Ñ‚Ð°"
#. module: audittrail
#: wizard_field:audittrail.view.log,init,to:0
msgid "Log To"
-msgstr ""
+msgstr "ЗапиÑÑŒ лога по"
#. module: audittrail
#: view:audittrail.log:0
msgid "New Value Text: "
-msgstr ""
+msgstr "Ðовое значение текÑта: "
#. module: audittrail
#: model:ir.module.module,description:audittrail.module_meta_information
@@ -158,6 +160,9 @@ msgid ""
" Subscribe Rules for read, write, create and delete on objects and check "
"logs"
msgstr ""
+"ПозволÑет админиÑтратору отÑлеживать операции каждого Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿Ð¾ вÑем "
+"объектам ÑиÑтемы.\\nУÑтанавливает правила читать, пиÑать, Ñоздавать и "
+"удалÑÑ‚ÑŒ на объектах и проверить журналы."
#. module: audittrail
#: field:audittrail.log,timestamp:0
@@ -172,7 +177,7 @@ msgstr "Пользователь"
#. module: audittrail
#: view:audittrail.log:0
msgid "Old Value Text : "
-msgstr ""
+msgstr "Старое значение текÑта: "
#. module: audittrail
#: constraint:ir.ui.view:0
@@ -187,12 +192,12 @@ msgstr "Ðазвание"
#. module: audittrail
#: field:audittrail.log,line_ids:0
msgid "Log lines"
-msgstr ""
+msgstr "Строги лога"
#. module: audittrail
#: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree_sub
msgid "Subscribed Rules"
-msgstr ""
+msgstr "Правила подпиÑки"
#. module: audittrail
#: field:audittrail.log.line,field_id:0
@@ -202,12 +207,12 @@ msgstr "ПолÑ"
#. module: audittrail
#: view:audittrail.rule:0
msgid "AuditTrail Rules"
-msgstr ""
+msgstr "Правила Ð¿Ñ€Ð¾Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð°ÑƒÐ´Ð¸Ñ‚Ð°"
#. module: audittrail
#: model:ir.model,name:audittrail.model_audittrail_rule
msgid "audittrail.rule"
-msgstr ""
+msgstr "Правила аудита"
#. module: audittrail
#: view:audittrail.rule:0
@@ -217,17 +222,17 @@ msgstr "ОтпиÑатьÑÑ"
#. module: audittrail
#: field:audittrail.rule,log_write:0
msgid "Log writes"
-msgstr ""
+msgstr "ЗапиÑи лога"
#. module: audittrail
#: model:ir.model,name:audittrail.model_audittrail_log
msgid "audittrail.log"
-msgstr ""
+msgstr "Журнал Ð¿Ñ€Ð¾Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð°ÑƒÐ´Ð¸Ñ‚Ð°"
#. module: audittrail
#: field:audittrail.log.line,field_description:0
msgid "Field Description"
-msgstr ""
+msgstr "ОпиÑание полÑ"
#. module: audittrail
#: selection:audittrail.log,method:0
@@ -237,12 +242,12 @@ msgstr "Удалить"
#. module: audittrail
#: wizard_button:audittrail.view.log,init,open:0
msgid "Open Logs"
-msgstr ""
+msgstr "Открыть лог"
#. module: audittrail
#: field:audittrail.log.line,new_value_text:0
msgid "New value Text"
-msgstr ""
+msgstr "Ðовое значение текÑта"
#. module: audittrail
#: field:audittrail.rule,name:0
@@ -252,7 +257,7 @@ msgstr "Ðазвание правила"
#. module: audittrail
#: field:audittrail.rule,log_read:0
msgid "Log reads"
-msgstr ""
+msgstr "Чтение лога"
#. module: audittrail
#: model:ir.ui.menu,name:audittrail.menu_action_audittrail_log_tree
@@ -262,22 +267,22 @@ msgstr "Журналы"
#. module: audittrail
#: field:audittrail.log.line,new_value:0
msgid "New Value"
-msgstr ""
+msgstr "Ðовое значение"
#. module: audittrail
#: model:ir.ui.menu,name:audittrail.menu_action_log_tree2
msgid "View Logs"
-msgstr ""
+msgstr "Чтение лога"
#. module: audittrail
#: field:audittrail.rule,log_create:0
msgid "Log creates"
-msgstr ""
+msgstr "Созданные журналы"
#. module: audittrail
#: view:audittrail.log:0
msgid "AuditTrail Logs"
-msgstr ""
+msgstr "Логи Ð¿Ñ€Ð¾Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð°ÑƒÐ´Ð¸Ñ‚Ð°"
#. module: audittrail
#: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree
@@ -287,7 +292,7 @@ msgstr "Правила"
#. module: audittrail
#: view:audittrail.log:0
msgid "New Value : "
-msgstr ""
+msgstr "Ðовое значение "
#. module: audittrail
#: field:audittrail.rule,user_id:0
@@ -297,7 +302,7 @@ msgstr "Пользователи"
#. module: audittrail
#: field:audittrail.log.line,old_value_text:0
msgid "Old value Text"
-msgstr ""
+msgstr "Старое значение текÑта"
#. module: audittrail
#: wizard_button:audittrail.view.log,init,end:0
@@ -307,4 +312,4 @@ msgstr "Отмена"
#. module: audittrail
#: field:audittrail.rule,log_unlink:0
msgid "Log deletes"
-msgstr ""
+msgstr "Удаленные логи"
diff --git a/addons/audittrail/security/ir.model.access.csv b/addons/audittrail/security/ir.model.access.csv
index ac367182f260b3c1a49b8bbed0b0d03797806060..877cf622ad49d9c1b4b5e748203fd37510256224 100644
--- a/addons/audittrail/security/ir.model.access.csv
+++ b/addons/audittrail/security/ir.model.access.csv
@@ -1,7 +1,4 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_audittrail_rule_group_system","audittrail rule system","model_audittrail_rule","base.group_system",1,1,1,1
-"access_audittrail_log_group_system","audittrail log system","model_audittrail_log","base.group_system",1,1,1,1
-"access_audittrail_logline_group_system","audittrail log line system","model_audittrail_log_line","base.group_system",1,1,1,1
"access_audittrail_rule_all_users","audittrail rule all","model_audittrail_rule","base.group_user",1,0,0,0
"access_audittrail_log_all_users","audittrail log all","model_audittrail_log","base.group_user",1,0,1,0
"access_audittrail_log_line_all_users","audittrail log line all","model_audittrail_log_line","base.group_user",1,0,1,0
diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml
index 01951b3c9b8001e30c503184159101e8d5d43734..cc8966316fdaba2e98420a23f4d4f88a6476f69c 100644
--- a/addons/base_action_rule/base_action_rule_view.xml
+++ b/addons/base_action_rule/base_action_rule_view.xml
@@ -114,6 +114,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_base_action_rule_tree"/>
+ <field name="help">Create actions automatically triggered based on a user activity in the system.E.g.: an opportunity created by a specific user can be automatically maintained with a specific sales team, or an opportunity which still has status pending after 14 days triggers an automatic reminder email.</field>
</record>
<menuitem id="menu_base_action_rule_form"
diff --git a/addons/base_action_rule/i18n/sr.po b/addons/base_action_rule/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..3370aac8617a51951918d939a3bb39baf87e5e3b
--- /dev/null
+++ b/addons/base_action_rule/i18n/sr.po
@@ -0,0 +1,482 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-19 12:20+0000\n"
+"PO-Revision-Date: 2010-10-17 14:30+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-18 04:56+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_to_user:0
+msgid ""
+"Check this if you want the rule to send an email to the responsible person."
+msgstr "OznaÄite ukoliko želite da pravilo Å¡alje email odgovornoj osobi."
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_partner:0
+msgid "Remind Partner"
+msgstr "Podseti partnera"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_categ_id:0
+msgid "Partner Category"
+msgstr "Kategorija partnera"
+
+#. module: base_action_rule
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_user:0
+msgid ""
+"Check this if you want the rule to send a reminder by email to the user."
+msgstr "OznaÄite ukoliko želite da pravilo Å¡alje podsjetnik korisniku."
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_state_to:0
+msgid "Button Pressed"
+msgstr "Pritisnuto dugme"
+
+#. module: base_action_rule
+#: field:base.action.rule,model_id:0
+msgid "Object"
+msgstr "Objekat"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_email:0
+msgid "Mail to these Emails"
+msgstr "Email za Ostale Emailove"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_state:0
+msgid "Set State to"
+msgstr "Postavi stanje na"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Body"
+msgstr "Email Sadrzaj"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Days"
+msgstr "Dana"
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:0
+#, python-format
+msgid "Error!"
+msgstr "Greška"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_reply_to:0
+msgid "Reply-To"
+msgstr "Odgovor - Za"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_email_cc:0
+msgid ""
+"These people will receive a copy of the future communication between partner "
+"and users by email"
+msgstr ""
+"Ovi ljudi će email-om primiti kopiju buduće komunikacije između partnera i "
+"korisnika"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Minutes"
+msgstr "Minute"
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Naziv pravila"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_partner:0
+msgid ""
+"Check this if you want the rule to send a reminder by email to the partner."
+msgstr "oznaci ovde ako zelis da pravilo posalje Email podsetnik partnerima"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Reminders"
+msgstr "Email podsetnici"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Partner"
+msgstr "Uslovi za Model Partnera"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Deadline"
+msgstr "Krajnji Rok"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_subject)s = Object subject"
+msgstr "%(object_subject)s = Objekt subject"
+
+#. module: base_action_rule
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Special Keywords to Be Used in The Body"
+msgstr "Specijalne kljucne reci za koriscenje u sadrzaju poruke"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_state_from:0
+msgid "State"
+msgstr "Stanje"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_to_email:0
+msgid "Email-id of the persons whom mail is to be sent"
+msgstr "Email-id osoba kojima treba poslati email"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+#: model:ir.module.module,shortdesc:base_action_rule.module_meta_information
+msgid "Action Rule"
+msgstr "Pravilo Akcije"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Fields to Change"
+msgstr "Polja za Menjanje"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Creation Date"
+msgstr "Datum kreiranja"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Last Action Date"
+msgstr "Datum poslednje akcije"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Hours"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_id)s = Object ID"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Delay After Trigger Date"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_attach:0
+msgid "Remind with Attachment"
+msgstr ""
+
+#. module: base_action_rule
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible to"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "None"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_phone)s = Responsible phone"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid ""
+"The rule uses the AND operator. The model must match all non-empty fields so "
+"that the rule executes the action described in the 'Actions' tab."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range_type:0
+msgid "Delay type"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,regex_name:0
+msgid ""
+"Regular expression for matching name of the resource\n"
+"e.g.: 'urgent.*' will search for records having name starting with the "
+"string 'urgent'\n"
+"Note: This is case sensitive search."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_method:0
+msgid "Call Object Method"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_to_watchers:0
+msgid ""
+"Check this if you want the rule to mark CC(mail to any other person defined "
+"in actions)."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner)s = Partner name"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Note"
+msgstr ""
+
+#. module: base_action_rule
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range:0
+msgid "Delay after trigger date"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,trg_date_range:0
+msgid ""
+"Delay After Trigger Date,specifies you can put a negative number. If you "
+"need a delay before the trigger date, like sending a reminder 15 minutes "
+"before a meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,active:0
+msgid "Active"
+msgstr ""
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:0
+#, python-format
+msgid "No E-Mail ID Found for your Company address!"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_user:0
+msgid "Remind Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.module.module,description:base_action_rule.module_meta_information
+msgid "This module allows to implement action rules for any object."
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,sequence:0
+msgid "Gives the sequence order when displaying a list of rules."
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,filter_id:0
+msgid "Filter"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Date"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,server_action_id:0
+msgid ""
+"Describes the action name.\n"
+"eg:on which object which action to be taken on basis of which condition"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_ir_cron
+msgid "ir.cron"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_description)s = Object description"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Actions"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Information"
+msgstr ""
+
+#. module: base_action_rule
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule
+msgid "Action Rules"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_body:0
+msgid "Content of mail"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner_email)s = Partner Email"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_date)s = Creation date"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_email)s = Responsible Email"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_body:0
+msgid "Mail body"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_watchers:0
+msgid "Mail to Watchers (CC)"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Server Action to be Triggered"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_user:0
+msgid "Mail to Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_cc:0
+msgid "Add Watchers (Cc)"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Fields"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
+#: model:ir.ui.menu,name:base_action_rule.menu_base_action_rule_form
+msgid "Automated Actions"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,server_action_id:0
+msgid "Server Action"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,regex_name:0
+msgid "Regex on Resource Name"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_attach:0
+msgid ""
+"Check this if you want that all documents attached to the object be attached "
+"to the reminder email sent."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Timing"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Actions"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the rule "
+"without removing it."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user)s = Responsible name"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on States"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_type:0
+msgid "Trigger Date"
+msgstr ""
diff --git a/addons/base_action_rule/security/ir.model.access.csv b/addons/base_action_rule/security/ir.model.access.csv
index c3a69f93e4ce3728c00730838f1d1ce71cdb45c3..4d2e612b384d5319a8bf2eeab1b0879116a85e14 100644
--- a/addons/base_action_rule/security/ir.model.access.csv
+++ b/addons/base_action_rule/security/ir.model.access.csv
@@ -1,3 +1,3 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_base_action_rule","base.action.rule","model_base_action_rule",,1,0,0,0
-"access_base_action_rule_config","base.action.rule config","model_base_action_rule",base.group_system,1,1,1,1
\ No newline at end of file
+"access_base_action_rule_config","base.action.rule config","model_base_action_rule",base.group_system,1,1,1,1
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 1ff7777cf36941e1d88f9dbdf9704c0d3d60e9b8..d602fce3a0f47c8faf9f2f6034c1ec645c3df3c0 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -306,7 +306,7 @@ class calendar_attendee(osv.osv):
res = obj.read(cr, uid, ids, ['object', 'name'], context=context)
return [(r['object'], r['name']) for r in res]
- def _lang_get(self, cr, uid, context={}):
+ def _lang_get(self, cr, uid, context=None):
"""
Get language for language selection field.
@param cr: the current row, from the database cursor,
@@ -912,10 +912,10 @@ class calendar_event(osv.osv):
_description = "Calendar Event"
__attribute__ = {}
- def _tz_get(self, cr, uid, context={}):
+ def _tz_get(self, cr, uid, context=None):
return [(x.lower(), x) for x in pytz.all_timezones]
- def onchange_allday(self, cr, uid, ids, allday, context={}):
+ def onchange_allday(self, cr, uid, ids, allday, context=None):
"""Sets duration as 24 Hours if event is selcted for all day
@param self: The object pointer
@param cr: the current row, from the database cursor,
@@ -1017,7 +1017,8 @@ class calendar_event(osv.osv):
elif int(val.get('interval')) > 1: #If interval is other than 1 rule is custom
rrule_type = 'custom'
- qry = "UPDATE %(table)s set rrule_type=\'%(rule_type)s\' "
+ qry = "UPDATE \"%s\" set rrule_type=%%s " % self._table
+ qry_args = [ rrule_type, ]
if rrule_type == 'custom':
new_val = val.copy()
@@ -1055,17 +1056,12 @@ class calendar_event(osv.osv):
new_val.pop('bymonth')
for k, v in new_val.items():
- temp = ", %s='%s'" % (k, v)
- qry += temp
-
- whr = " where id=%(id)s"
- qry = qry + whr
- val.update({
- 'table': self._table,
- 'rule_type': rrule_type,
- 'id': id,
- })
- cr.execute(qry % val)
+ qry += ", %s=%%s" % k
+ qry_args.append(v)
+
+ qry = qry + " where id=%s"
+ qry_args.append(id)
+ cr.execute(qry, qry_args)
return True
def _get_rulestring(self, cr, uid, ids, name, arg, context=None):
@@ -1479,6 +1475,8 @@ true, it will allow you to hide the event alarm information without removing it.
if not real_event_id in new_ids:
new_ids.append(real_event_id)
+ if vals.get('vtimezone', '').startswith('/freeassociation.sourceforge.net/tzfile/'):
+ vals['vtimezone'] = vals['vtimezone'][40:]
if new_ids:
res = super(calendar_event, self).write(cr, uid, new_ids, vals, context=context)
if (vals.has_key('alarm_id') or vals.has_key('base_calendar_alarm_id'))\
@@ -1489,7 +1487,7 @@ true, it will allow you to hide the event alarm information without removing it.
context=context)
return res
- def browse(self, cr, uid, ids, context=None, list_class=None, fields_process={}):
+ def browse(self, cr, uid, ids, context=None, list_class=None, fields_process=None):
"""
Overrides orm browse method.
@param self: the object pointer
@@ -1608,6 +1606,8 @@ true, it will allow you to hide the event alarm information without removing it.
"""
if not context:
context = {}
+ if vals.get('vtimezone', '') and vals.get('vtimezone', '').startswith('/freeassociation.sourceforge.net/tzfile/'):
+ vals['vtimezone'] = vals['vtimezone'][40:]
res = super(calendar_event, self).create(cr, uid, vals, context)
alarm_obj = self.pool.get('res.alarm')
alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date', context=context)
@@ -1682,7 +1682,7 @@ class calendar_todo(osv.osv):
@param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
@param context: A standard dictionary for contextual values
"""
-
+
assert name == 'date'
return self.write(cr, uid, id, { 'date_start': value }, context=context)
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index b5f234aa7cb1d04ccbba35256a4d7d82a5fd98e2..9f27e79d5a582748d055bd7a9238a655fb66da2c 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -157,12 +157,12 @@
</record>
<!-- Calenadar's menu -->
- <menuitem id="base.menu_calendar_configuration" name="Calendar"
- parent="base.menu_base_config" sequence="6" groups="base.group_system,base.group_sale_manager" />
+ <menuitem id="base.menu_calendar_configuration" name="Calendar"
+ parent="base.menu_base_config" sequence="6" groups="base.group_sale_manager" />
<!-- Invitation menu -->
- <menuitem id="menu_attendee_invitations"
+ <menuitem id="menu_attendee_invitations"
parent="base.menu_calendar_configuration"
groups="base.group_extended"
sequence="10" action="action_view_attendee_form" />
@@ -208,6 +208,7 @@
<field name="res_model">res.alarm</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
+ <field name="help">Create specific calendar alarms that can be assigned to calendar events or meetings.</field>
</record>
<!-- Menu for Alarms-->
diff --git a/addons/base_calendar/i18n/sr.po b/addons/base_calendar/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..084471fb3cdc540a1f93aa46481772340d633ee0
--- /dev/null
+++ b/addons/base_calendar/i18n/sr.po
@@ -0,0 +1,1565 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-19 12:50+0000\n"
+"PO-Revision-Date: 2010-10-17 14:09+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-18 04:56+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event starts"
+msgstr "DogaÄ‘aj poÄinje"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Hourly"
+msgstr "Po satu"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required to Join"
+msgstr "OÄekuje se prisustvovanje"
+
+#. module: base_calendar
+#: help:calendar.event,exdate:0
+#: help:calendar.todo,exdate:0
+msgid ""
+"This property defines the list of date/time exceptions for a recurring "
+"calendar component."
+msgstr ""
+"Ovo svojstvo određuje listu ekssepcija datuma/vremena za ponavljajuću "
+"komponentu kalendara"
+
+#. module: base_calendar
+#: field:calendar.event.edit.all,name:0
+msgid "Title"
+msgstr "Naslov"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,freq:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Monthly"
+msgstr "MeseÄno"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invited User"
+msgstr "Pozvani korisnik"
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
+#: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
+msgid "Alarms"
+msgstr "Alarmi"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Sunday"
+msgstr "Nedelja"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,role:0
+msgid "Role"
+msgstr "Uloga"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation details"
+msgstr "Detalji poziva"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fourth"
+msgstr "ÄŒetvrti"
+
+#. module: base_calendar
+#: field:calendar.event,show_as:0
+#: field:calendar.todo,show_as:0
+msgid "Show as"
+msgstr "Prikaži kao"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,day:0
+#: selection:base.calendar.set.exrule,select1:0
+#: field:calendar.event,day:0
+#: selection:calendar.event,select1:0
+#: field:calendar.todo,day:0
+#: selection:calendar.todo,select1:0
+msgid "Date of month"
+msgstr "Dan u mesecu"
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Public"
+msgstr "Javno"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Hours"
+msgstr "Sati"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "March"
+msgstr "Mart"
+
+#. module: base_calendar
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0
+#, python-format
+msgid "Warning !"
+msgstr "Upozorenje !"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Friday"
+msgstr "Petak"
+
+#. module: base_calendar
+#: field:calendar.event,allday:0
+#: field:calendar.todo,allday:0
+msgid "All Day"
+msgstr "Celi dan"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,select1:0
+#: field:calendar.event,select1:0
+#: field:calendar.todo,select1:0
+msgid "Option"
+msgstr "Opcija"
+
+#. module: base_calendar
+#: selection:calendar.attendee,availability:0
+#: selection:calendar.event,show_as:0
+#: selection:calendar.todo,show_as:0
+#: selection:res.users,availability:0
+msgid "Free"
+msgstr "Slobodan"
+
+#. module: base_calendar
+#: help:calendar.attendee,rsvp:0
+msgid "Indicats whether the favor of a reply is requested"
+msgstr "Indikator da li se oÄekuje odgovor"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
+#. module: base_calendar
+#: help:calendar.attendee,delegated_to:0
+msgid "The users that the original request was delegated to"
+msgstr "Korisnici kojima je prosleđen originalni zahtev"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_to:0
+msgid "Delegated To"
+msgstr "Delegirano Za"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,we:0
+#: field:calendar.event,we:0
+#: field:calendar.todo,we:0
+msgid "Wed"
+msgstr "Sreda"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Show time as"
+msgstr "Prikaži vreme kao"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,tu:0
+#: field:calendar.event,tu:0
+#: field:calendar.todo,tu:0
+msgid "Tue"
+msgstr "Utorak"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,freq:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Yearly"
+msgstr "Godišnje"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event ends"
+msgstr "Događaj završava"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Last"
+msgstr "Posljednji"
+
+#. module: base_calendar
+#: help:calendar.attendee,state:0
+msgid "Status of the attendee's participation"
+msgstr "Status prisustvovanja"
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr "Soba"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Days"
+msgstr "Dana"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "No Repeat"
+msgstr "Bez ponavljanja"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:0
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:0
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0
+#, python-format
+msgid "Error!"
+msgstr "Greška"
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Chair Person"
+msgstr "Glavna Osoba"
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Procedure"
+msgstr "Procedura"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Select data for Custom Rule"
+msgstr "Odaberite podatke za korisniÄko pravilo"
+
+#. module: base_calendar
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Cancelled"
+msgstr "Otkazano"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Minutes"
+msgstr "Minuti"
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Display"
+msgstr "Prikaz"
+
+#. module: base_calendar
+#: view:calendar.event.edit.all:0
+msgid "Edit all Occurrences"
+msgstr "Uredi sve događaje"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation type"
+msgstr "Tip poziva"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Secondly"
+msgstr "Drugo"
+
+#. module: base_calendar
+#: field:calendar.alarm,event_date:0
+#: field:calendar.attendee,event_date:0
+#: view:calendar.event:0
+msgid "Event Date"
+msgstr "Datum događaja"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Group By..."
+msgstr "Grupirano po"
+
+#. module: base_calendar
+#: help:calendar.attendee,partner_id:0
+msgid "Partner related to contact"
+msgstr "Partner povezan s kontaktom"
+
+#. module: base_calendar
+#: help:calendar.attendee,cutype:0
+msgid "Specify the type of Invitation"
+msgstr "Odredite tip poziva"
+
+#. module: base_calendar
+#: help:calendar.event,exrule:0
+#: help:calendar.todo,exrule:0
+msgid ""
+"defines a rule or repeating pattern for an exception to a recurrence set"
+msgstr ""
+"Definise pravilo ili ponavljajući uzorak za eksepciju u skupu ponavljanja"
+
+#. module: base_calendar
+#: field:calendar.alarm,event_end_date:0
+#: field:calendar.attendee,event_end_date:0
+msgid "Event End Date"
+msgstr "Datum završetka događaja"
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Optional Participation"
+msgstr "Neobvezno sudelovanje"
+
+#. module: base_calendar
+#: field:calendar.event,date_deadline:0
+#: field:calendar.todo,date_deadline:0
+msgid "Deadline"
+msgstr "Krajnji Rok"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:0
+#, python-format
+msgid "Warning!"
+msgstr "Upozorenje!"
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Cancel"
+msgstr "_Odustani"
+
+#. module: base_calendar
+#: model:ir.module.module,shortdesc:base_calendar.module_meta_information
+msgid "Basic Calendar Functionality"
+msgstr "Osnovna funkcionalnost kalendara"
+
+#. module: base_calendar
+#: field:calendar.event,organizer:0
+#: field:calendar.event,organizer_id:0
+#: field:calendar.todo,organizer:0
+#: field:calendar.todo,organizer_id:0
+msgid "Organizer"
+msgstr "Organizator"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:0
+#: view:calendar.event:0
+#: model:res.request.link,name:base_calendar.request_link_meeting
+#, python-format
+msgid "Event"
+msgstr "Događaj"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_occurs:0
+#: selection:res.alarm,trigger_occurs:0
+msgid "Before"
+msgstr "Pre"
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Confirmed"
+msgstr "Potvrđeno"
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_calendar_event_edit_all
+msgid "Edit all events"
+msgstr "Uredi sve događaje"
+
+#. module: base_calendar
+#: field:calendar.alarm,attendee_ids:0
+#: field:calendar.event,attendee_ids:0
+#: field:calendar.todo,attendee_ids:0
+msgid "Attendees"
+msgstr "UÄesnici"
+
+#. module: base_calendar
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Confirm"
+msgstr "Potvrdi"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_todo
+msgid "Calendar Task"
+msgstr "Zadatak po Kalendaru"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,su:0
+#: field:calendar.event,su:0
+#: field:calendar.todo,su:0
+msgid "Sun"
+msgstr "Nedelja"
+
+#. module: base_calendar
+#: field:calendar.attendee,cutype:0
+msgid "Invite Type"
+msgstr "Tip poziva"
+
+#. module: base_calendar
+#: view:res.alarm:0
+msgid "Reminder details"
+msgstr "Detalji podsetnika"
+
+#. module: base_calendar
+#: field:calendar.attendee,parent_ids:0
+msgid "Delegrated From"
+msgstr "Delegirano od"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,select1:0
+#: selection:calendar.event,select1:0
+#: selection:calendar.todo,select1:0
+msgid "Day of month"
+msgstr "Dan u mesecu"
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,location:0
+#: field:calendar.event.edit.all,location:0
+#: field:calendar.todo,location:0
+msgid "Location"
+msgstr "Lokacija"
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,send_mail:0
+msgid "Send mail?"
+msgstr "Poslati e-poštu?"
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,email:0
+#: selection:calendar.alarm,action:0
+#: field:calendar.attendee,email:0
+msgid "Email"
+msgstr "E‑pošta"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Event Detail"
+msgstr "Detalj događaja"
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Run"
+msgstr "Izvrši"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_alarm
+msgid "Event alarm information"
+msgstr "Informacija alarma događaja"
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Confidential"
+msgstr "Poverljivo"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,end_date:0
+#: field:calendar.event,end_date:0
+#: field:calendar.todo,end_date:0
+msgid "Repeat Until"
+msgstr "Ponavljaj dok"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Visibility"
+msgstr "Vidljivost"
+
+#. module: base_calendar
+#: field:calendar.attendee,rsvp:0
+msgid "Required Reply?"
+msgstr "Potreban odgovor?"
+
+#. module: base_calendar
+#: field:calendar.event,base_calendar_url:0
+#: field:calendar.todo,base_calendar_url:0
+msgid "Caldav URL"
+msgstr "CalDAV URL"
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_uid:0
+#: field:calendar.todo,recurrent_uid:0
+msgid "Recurrent ID"
+msgstr "Ponavljajući ID"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "July"
+msgstr "Jul"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Accepted"
+msgstr "Prihvaćeno"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,th:0
+#: field:calendar.event,th:0
+#: field:calendar.todo,th:0
+msgid "Thu"
+msgstr "ÄŒet"
+
+#. module: base_calendar
+#: field:calendar.attendee,child_ids:0
+msgid "Delegrated To"
+msgstr "Proslijeđeno"
+
+#. module: base_calendar
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr "Neispravni Argumenti"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required Reply"
+msgstr "OÄekivan odgovor"
+
+#. module: base_calendar
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Participation required"
+msgstr "Obvezno sudelovanje"
+
+#. module: base_calendar
+#: field:calendar.event,create_date:0
+#: field:calendar.todo,create_date:0
+msgid "Created"
+msgstr "Kreirano"
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Private"
+msgstr "Privatno"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,freq:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Daily"
+msgstr "Dnevno"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:0
+#, python-format
+msgid "Can not Duplicate"
+msgstr "Ne može se kopirati"
+
+#. module: base_calendar
+#: field:calendar.event,class:0
+#: field:calendar.todo,class:0
+msgid "Mark as"
+msgstr "OznaÄi kao"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_address_id:0
+msgid "Contact"
+msgstr "Kontakt"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Delegate"
+msgstr "Delegiraj"
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,partner_id:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "Select data for ExRule"
+msgstr "Odaberi podatke za pravilo iznimke"
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Partner Contacts"
+msgstr "Kontakti partnera"
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Ok"
+msgstr "_U Redu"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "First"
+msgstr "Prvi"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Privacy"
+msgstr "Privatnost"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Subject"
+msgstr "Tema"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "September"
+msgstr "Septembar"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "December"
+msgstr "Decembar"
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,send_mail:0
+msgid "Check this if you want to send an Email to Invited Person"
+msgstr "OznaÄite ako želite poslati e-poÅ¡tu pozvanoj osobi"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Availability"
+msgstr "Dostupnost"
+
+#. module: base_calendar
+#: view:calendar.event.edit.all:0
+msgid "_Save"
+msgstr "_SaÄuvaj"
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Individual"
+msgstr "Individualno"
+
+#. module: base_calendar
+#: field:calendar.alarm,user_id:0
+msgid "Owner"
+msgstr "Vlasnik"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Delegation Info"
+msgstr "Detalji prosleđivanja"
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,date:0
+msgid "Start Date"
+msgstr "PoÄetni datum"
+
+#. module: base_calendar
+#: field:calendar.attendee,cn:0
+msgid "Common name"
+msgstr "UobiÄajeno ime"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Declined"
+msgstr "Odbijeno"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "My Role"
+msgstr "Moja Uloga"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "My Events"
+msgstr "Moji Dogadjaji"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Decline"
+msgstr "Odbij"
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Group"
+msgstr "Grupa"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Edit All"
+msgstr "Uredi Sve"
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,contact_ids:0
+msgid "Contacts"
+msgstr "Kontakti"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_alarm
+msgid "Basic Alarm Information"
+msgstr "Osnovni podaci alarma"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,fr:0
+#: field:calendar.event,fr:0
+#: field:calendar.todo,fr:0
+msgid "Fri"
+msgstr "Petak"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation Detail"
+msgstr "Detalji Poziva"
+
+#. module: base_calendar
+#: field:calendar.attendee,member:0
+msgid "Member"
+msgstr "ÄŒlan"
+
+#. module: base_calendar
+#: help:calendar.event,location:0
+#: help:calendar.todo,location:0
+msgid "Location of Event"
+msgstr "Lokacija Dogadjaja"
+
+#. module: base_calendar
+#: field:calendar.event,rrule:0
+#: field:calendar.todo,rrule:0
+msgid "Recurrent Rule"
+msgstr "Ponavljajuće pravilo"
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Draft"
+msgstr "Priprema"
+
+#. module: base_calendar
+#: field:calendar.alarm,attach:0
+msgid "Attachment"
+msgstr "Dodatak"
+
+#. module: base_calendar
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Greska! Ne mozete kreirati rekursivni meni."
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation From"
+msgstr "Poziv Od"
+
+#. module: base_calendar
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da poÄinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,alarm_id:0
+msgid "Reminder"
+msgstr "Podsetnik"
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
+#: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
+msgid "Set Exrule"
+msgstr "Postavi pravilo izuzetka"
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: model:ir.actions.act_window,name:base_calendar.action_view_event
+#: model:ir.ui.menu,name:base_calendar.menu_events
+msgid "Events"
+msgstr "Događaji"
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_view_calendar_invite_attendee_wizard
+#: model:ir.model,name:base_calendar.model_base_calendar_invite_attendee
+msgid "Invite Attendees"
+msgstr "Pozovi ucesnike"
+
+#. module: base_calendar
+#: help:calendar.attendee,email:0
+msgid "Email of Invited Person"
+msgstr "Email pozvane Osobe"
+
+#. module: base_calendar
+#: field:calendar.alarm,repeat:0
+#: field:res.alarm,repeat:0
+msgid "Repeat"
+msgstr "Ponovi"
+
+#. module: base_calendar
+#: help:calendar.attendee,dir:0
+msgid ""
+"Reference to the URIthat points to the directory information corresponding "
+"to the attendee."
+msgstr "Napomena za URL koji pokazuje na podatke direktorijuma ucesnika"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "August"
+msgstr "Avgust"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Monday"
+msgstr "Ponedeljak"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Third"
+msgstr "Treći"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "June"
+msgstr "Jun"
+
+#. module: base_calendar
+#: field:calendar.alarm,alarm_id:0
+msgid "Basic Alarm"
+msgstr "Osnovni alarmDelegirano od"
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: view:calendar.event:0
+msgid "The"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_from:0
+msgid "Delegated From"
+msgstr "Delegirano Od"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,user_id:0
+msgid "User"
+msgstr "Korisnik"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "ExRule"
+msgstr "Pravilo Izuzetka"
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "November"
+msgstr "Novembar"
+
+#. module: base_calendar
+#: help:calendar.attendee,member:0
+msgid "Indicate the groups that the attendee belongs to"
+msgstr "OznaÄite grupe kojima ucesnik pripada"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,mo:0
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+msgid "Mon"
+msgstr "Pon"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,count:0
+#: field:calendar.event,count:0
+#: field:calendar.todo,count:0
+msgid "Count"
+msgstr "Brojanje"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "October"
+msgstr "Oktobar"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Uncertain"
+msgstr "Nesigurno"
+
+#. module: base_calendar
+#: field:calendar.attendee,language:0
+msgid "Language"
+msgstr "Jezik"
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_occurs:0
+#: field:res.alarm,trigger_occurs:0
+msgid "Triggers"
+msgstr "OkidaÄi"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "January"
+msgstr "Januar"
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_related:0
+#: field:res.alarm,trigger_related:0
+msgid "Related to"
+msgstr "Povezano sa"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,interval:0
+#: field:calendar.alarm,trigger_interval:0
+#: field:calendar.event,interval:0
+#: field:calendar.todo,interval:0
+#: field:res.alarm,trigger_interval:0
+msgid "Interval"
+msgstr "Interval"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Wednesday"
+msgstr "Sreda"
+
+#. module: base_calendar
+#: field:calendar.alarm,name:0
+#: view:calendar.event:0
+msgid "Summary"
+msgstr "Sumarno"
+
+#. module: base_calendar
+#: field:calendar.alarm,active:0
+#: field:calendar.event,active:0
+#: field:calendar.todo,active:0
+#: field:res.alarm,active:0
+msgid "Active"
+msgstr "Aktivan"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation"
+msgstr "Pozivnica"
+
+#. module: base_calendar
+#: field:calendar.alarm,action:0
+msgid "Action"
+msgstr "Radnja"
+
+#. module: base_calendar
+#: help:calendar.alarm,duration:0
+#: help:res.alarm,duration:0
+msgid ""
+"Duration' and 'Repeat' are both optional, but if one occurs, so MUST the "
+"other"
+msgstr ""
+"'Trajanje' i 'Ponavljanje' su neobvezni, ali ako se jedan dogodi, MORA se "
+"dogoditi i drugi"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_event_edit_all
+msgid "Calendar Edit all event"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,role:0
+msgid "Participation role for the calendar user"
+msgstr "Uredi Sve dogadjaje Kalendara"
+
+#. module: base_calendar
+#: field:calendar.attendee,ref:0
+msgid "Event Ref"
+msgstr "Referentni Dogadjaj"
+
+#. module: base_calendar
+#: help:calendar.alarm,action:0
+msgid "Defines the action to be invoked when an alarm is triggered"
+msgstr "Određuje akciju koja će se pokrenuti kada se okine alarm"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Search Events"
+msgstr "Pretraži događaje"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,freq:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Weekly"
+msgstr "SedmiÄno"
+
+#. module: base_calendar
+#: help:calendar.alarm,active:0
+#: help:calendar.event,active:0
+#: help:calendar.todo,active:0
+#: help:res.alarm,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the event "
+"alarm information without removing it."
+msgstr ""
+"ko je aktivan, omogućeno je skrivanje detalja alarma događaja bez uklanjanja "
+"istog"
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+msgid "Recurrent ID date"
+msgstr "Ponavljajući ID datuma"
+
+#. module: base_calendar
+#: field:calendar.alarm,state:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,state:0
+#: view:calendar.event:0
+#: field:calendar.event,state:0
+#: field:calendar.todo,state:0
+msgid "State"
+msgstr "Stanje"
+
+#. module: base_calendar
+#: view:res.alarm:0
+msgid "Reminder Details"
+msgstr "Detalji podsetnika"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "To Review"
+msgstr "Pregledati"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,freq:0
+#: field:calendar.event,freq:0
+#: field:calendar.todo,freq:0
+msgid "Frequency"
+msgstr "Frekvencija"
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Done"
+msgstr "Gotovo"
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: field:base_calendar.invite.attendee,user_ids:0
+msgid "Users"
+msgstr "Korisnici"
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: view:calendar.event:0
+msgid "of"
+msgstr "od"
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+#: view:calendar.event.edit.all:0
+msgid "Cancel"
+msgstr "Otkaži"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Tuesday"
+msgstr "Utorak"
+
+#. module: base_calendar
+#: help:calendar.alarm,description:0
+msgid ""
+"Provides a more complete description of the "
+"calendar component, than that provided by the "
+"\"SUMMARY\" property"
+msgstr ""
+"Omogućuje detaljniji opis komponente kalendara, nego oni detalji koji su "
+"dati u \"Sumarno\""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Responsible User"
+msgstr "Odgovorni korisnik"
+
+#. module: base_calendar
+#: selection:calendar.attendee,availability:0
+#: selection:calendar.event,show_as:0
+#: selection:calendar.todo,show_as:0
+#: selection:res.users,availability:0
+msgid "Busy"
+msgstr "Zauzet"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_event
+msgid "Calendar Event"
+msgstr "Dogadjaj Kalendara"
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Tentative"
+msgstr "Uslovno"
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,user_id:0
+#: field:calendar.todo,user_id:0
+msgid "Responsible"
+msgstr "Odgovoran"
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,rrule_type:0
+#: field:calendar.todo,rrule_type:0
+msgid "Recurrency"
+msgstr "Referenca"
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_view_attendee_form
+#: model:ir.ui.menu,name:base_calendar.menu_attendee_invitations
+msgid "Event Invitations"
+msgstr "Pozivnice Dogadjaja"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Thursday"
+msgstr "ÄŒetvrtak"
+
+#. module: base_calendar
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Custom"
+msgstr "Prilagodjeno"
+
+#. module: base_calendar
+#: field:calendar.event,exrule:0
+#: field:calendar.todo,exrule:0
+msgid "Exception Rule"
+msgstr "Pravilo Izuzetka"
+
+#. module: base_calendar
+#: help:calendar.attendee,language:0
+msgid ""
+"To specify the language for text values in aproperty or property parameter."
+msgstr ""
+"Za određivanje jezika za tekstualne vrednosti u svojstvu ili parametru "
+"svojstva"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Details"
+msgstr "Detalji"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,month_list:0
+#: field:calendar.event,month_list:0
+#: field:calendar.todo,month_list:0
+msgid "Month"
+msgstr "Mesec"
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+msgid "Invite People"
+msgstr "Pozovi Ljude"
+
+#. module: base_calendar
+#: help:calendar.event,rrule:0
+#: help:calendar.todo,rrule:0
+msgid ""
+"Defines a rule or repeating pattern for recurring events\n"
+"e.g.: Every other month on the last Sunday of the month for 10 occurrences: "
+" FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+msgstr ""
+"Određuje o pravilu ponavljajućeg uzorka za ponavljajuće događaje\n"
+"npr.: Svaki drugi mesec posljednje nedjelje mjeseca za 10 događaja: "
+"FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+
+#. module: base_calendar
+#: field:calendar.attendee,dir:0
+msgid "URI Reference"
+msgstr "URI napomena"
+
+#. module: base_calendar
+#: field:calendar.alarm,description:0
+#: view:calendar.event:0
+#: field:calendar.event,description:0
+#: field:calendar.event,name:0
+#: field:calendar.todo,description:0
+#: field:calendar.todo,name:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "May"
+msgstr "Мај"
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,type:0
+#: view:calendar.attendee:0
+msgid "Type"
+msgstr "Tip"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Search Invitations"
+msgstr "Pretrazi Pozive"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_occurs:0
+#: selection:res.alarm,trigger_occurs:0
+msgid "After"
+msgstr "Posle"
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Stop"
+msgstr "Zaustavi"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_values
+msgid "ir.values"
+msgstr "ir.values"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_model
+msgid "Objects"
+msgstr "Objekti"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Delegated"
+msgstr "Delegirano"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,sa:0
+#: field:calendar.event,sa:0
+#: field:calendar.todo,sa:0
+msgid "Sat"
+msgstr "Sub"
+
+#. module: base_calendar
+#: model:ir.module.module,description:base_calendar.module_meta_information
+msgid ""
+"Full featured calendar system that supports:\n"
+" - Calendar of events\n"
+" - Alerts (create requests)\n"
+" - Recurring events\n"
+" - Invitations to people"
+msgstr ""
+"Potpuni kalendarski sistem koji podržava:\n"
+"- Kalendar događaja\n"
+"- Alarmi (kreira zahteve)\n"
+"- Ponavljajući događaji\n"
+"- Pozivi drugima"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Minutely"
+msgstr "U minutama"
+
+#. module: base_calendar
+#: help:calendar.attendee,sent_by:0
+msgid "Specify the user that is acting on behalf of the calendar user"
+msgstr "Odredite korisnika koji djeluje u ime korisnika kalendara"
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,date_deadline:0
+msgid "End Date"
+msgstr "Završni Datum"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "February"
+msgstr "Februar"
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Resource"
+msgstr "Resurs"
+
+#. module: base_calendar
+#: field:res.alarm,name:0
+msgid "Name"
+msgstr "Ime"
+
+#. module: base_calendar
+#: field:calendar.event,exdate:0
+#: field:calendar.todo,exdate:0
+msgid "Exception Date/Times"
+msgstr "Datum/Vreme Izuzetka"
+
+#. module: base_calendar
+#: help:calendar.alarm,name:0
+msgid ""
+"Contains the text to be used as the message subject for "
+"email or contains the text to be used for display"
+msgstr ""
+"Sadrži tekst koji će se koristiti kao naslov poruke za e-poštu ili sadrži "
+"tekst koji će se koristiti za prikaz"
+
+#. module: base_calendar
+#: field:calendar.event,alarm_id:0
+#: field:calendar.event,base_calendar_alarm_id:0
+#: field:calendar.todo,alarm_id:0
+#: field:calendar.todo,base_calendar_alarm_id:0
+msgid "Alarm"
+msgstr "Alarm"
+
+#. module: base_calendar
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0
+#, python-format
+msgid "Please Apply Recurrency before applying Exception Rule."
+msgstr "Molimo odredite ponavljanje prije postavljanja pravila izuzetaka"
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by_uid:0
+msgid "Sent By User"
+msgstr "poslato od Korisnika"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "April"
+msgstr "April"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,week_list:0
+#: field:calendar.event,week_list:0
+#: field:calendar.todo,week_list:0
+msgid "Weekday"
+msgstr "Sedmicni Dan"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,byday:0
+#: field:calendar.event,byday:0
+#: field:calendar.todo,byday:0
+msgid "By day"
+msgstr "po Danu"
+
+#. module: base_calendar
+#: field:calendar.alarm,model_id:0
+msgid "Model"
+msgstr "Model"
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Audio"
+msgstr "Audio"
+
+#. module: base_calendar
+#: field:calendar.event,id:0
+#: field:calendar.todo,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "For information Purpose"
+msgstr "Za potrebe informisanja"
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+msgid "Invite"
+msgstr "Pozovi"
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_attendee
+msgid "Attendee information"
+msgstr "Detalji ucesnika"
+
+#. module: base_calendar
+#: field:calendar.alarm,res_id:0
+msgid "Resource ID"
+msgstr "Å ifra resursa"
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+msgid "Needs Action"
+msgstr "Potrebna akcija"
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by:0
+msgid "Sent By"
+msgstr "Poslato Od"
+
+#. module: base_calendar
+#: field:calendar.event,sequence:0
+#: field:calendar.todo,sequence:0
+msgid "Sequence"
+msgstr "Sekvenca"
+
+#. module: base_calendar
+#: field:calendar.event,vtimezone:0
+#: field:calendar.todo,vtimezone:0
+msgid "Timezone"
+msgstr "Vremenska zona"
+
+#. module: base_calendar
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Internal User"
+msgstr "Interni Korisnik"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Accept"
+msgstr "Prihvati"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Saturday"
+msgstr "Subota"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation To"
+msgstr "Poziv za"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Second"
+msgstr "Drugi"
+
+#. module: base_calendar
+#: field:calendar.attendee,availability:0
+#: field:res.users,availability:0
+msgid "Free/Busy"
+msgstr "Slobodno/Zauzeto"
+
+#. module: base_calendar
+#: field:calendar.alarm,duration:0
+#: field:calendar.alarm,trigger_duration:0
+#: field:calendar.event,duration:0
+#: field:calendar.todo,date:0
+#: field:calendar.todo,duration:0
+#: field:res.alarm,duration:0
+#: field:res.alarm,trigger_duration:0
+msgid "Duration"
+msgstr "Trajanje"
+
+#. module: base_calendar
+#: selection:base_calendar.invite.attendee,type:0
+msgid "External Email"
+msgstr "Spoljni Email"
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_date:0
+msgid "Trigger Date"
+msgstr "Datum okidanja"
+
+#. module: base_calendar
+#: help:calendar.alarm,attach:0
+msgid ""
+"* Points to a sound resource, which is rendered when the "
+"alarm is triggered for audio,\n"
+" * File which is intended to be sent as message "
+"attachments for email,\n"
+" * Points to a procedure resource, which is invoked when "
+" the alarm is triggered for procedure."
+msgstr ""
+"* Pokazuje na datoteku sa zvukom, koji se pojavljuje kada se pokrene alarm,\n"
+"* Na datoteku koja se treba poslati kao dodatak e-pošte,\n"
+"* Na proceduru koja se pokreće kada se pokrene alarm za proceduru."
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fifth"
+msgstr "Peti"
diff --git a/addons/base_calendar/security/ir.model.access.csv b/addons/base_calendar/security/ir.model.access.csv
index 0ae628fb7209ed2a7515f1e29001570b8ab42ad8..aa269e9ff18586332eb5da3e6e1033c50811bf15 100644
--- a/addons/base_calendar/security/ir.model.access.csv
+++ b/addons/base_calendar/security/ir.model.access.csv
@@ -1,5 +1,5 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_calendar_attendee","calendar.attendee","model_calendar_attendee","base.group_user",1,1,1,0
+"access_calendar_attendee","calendar.attendee","model_calendar_attendee","base.group_user",1,1,1,1
"access_calendar_alarm","calendar.alarm","model_calendar_alarm","base.group_user",1,1,1,1
"access_res_alarm","res.alarm","model_res_alarm","base.group_user",1,1,1,1
"access_calendar_todo","calendar.todo","model_calendar_todo","base.group_user",1,1,1,1
diff --git a/addons/base_contact/i18n/sr.po b/addons/base_contact/i18n/sr.po
index 9a3fb65353b220c6fed0d80f0e880aa5e2afb373..b8dc4170bdfd366021b973647235ddc41de5550f 100644
--- a/addons/base_contact/i18n/sr.po
+++ b/addons/base_contact/i18n/sr.po
@@ -8,35 +8,36 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-21 12:30+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-10-16 09:28+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Serbian <sr@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-09-29 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_contact
#: field:res.partner.job,sequence_contact:0
msgid "Contact Seq."
-msgstr ""
+msgstr "Seq. Osobe"
#. module: base_contact
#: model:ir.model,name:base_contact.model_res_partner_contact
msgid "res.partner.contact"
-msgstr ""
+msgstr "es.partner.contact"
#. module: base_contact
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Ime objekta mora da poÄinje sa x_ i ne sme da sadrži specijalne karaktere !"
#. module: base_contact
#: field:res.partner.job,function_id:0
msgid "Partner Function"
-msgstr ""
+msgstr "Funkcija Partnera"
#. module: base_contact
#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
@@ -46,97 +47,97 @@ msgstr ""
#: view:res.partner.address:0
#: field:res.partner.address,job_ids:0
msgid "Contacts"
-msgstr ""
+msgstr "Kontakti"
#. module: base_contact
#: field:res.partner.job,sequence_partner:0
msgid "Partner Seq."
-msgstr ""
+msgstr "Partner Seq."
#. module: base_contact
#: selection:res.partner.job,state:0
msgid "Current"
-msgstr ""
+msgstr "Trenutni"
#. module: base_contact
#: field:res.partner.contact,first_name:0
msgid "First Name"
-msgstr ""
+msgstr "Ime"
#. module: base_contact
#: model:ir.model,name:base_contact.model_res_partner_job
msgid "Contact Partner Function"
-msgstr ""
+msgstr "Funkcija Kontakta Partnera"
#. module: base_contact
#: field:res.partner.job,other:0
msgid "Other"
-msgstr ""
+msgstr "Drugo"
#. module: base_contact
#: model:process.transition,name:base_contact.process_transition_contacttofunction0
msgid "Contact to function"
-msgstr ""
+msgstr "Kontakt na funkciju"
#. module: base_contact
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Pogrešno ime modela u definiciji akcije."
#. module: base_contact
#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
msgid "Partner to address"
-msgstr ""
+msgstr "Partner na adresu"
#. module: base_contact
#: view:res.partner.address:0
msgid "# of Contacts"
-msgstr ""
+msgstr "# Kontakata"
#. module: base_contact
#: help:res.partner.job,other:0
msgid "Additional phone field"
-msgstr ""
+msgstr "Dodatno polje za Tel"
#. module: base_contact
#: model:process.node,name:base_contact.process_node_function0
msgid "Function"
-msgstr ""
+msgstr "Funkcija"
#. module: base_contact
#: field:res.partner.job,fax:0
msgid "Fax"
-msgstr ""
+msgstr "Faks"
#. module: base_contact
#: field:res.partner.contact,lang_id:0
msgid "Language"
-msgstr ""
+msgstr "Jezik"
#. module: base_contact
#: field:res.partner.job,phone:0
msgid "Phone"
-msgstr ""
+msgstr "Telefon"
#. module: base_contact
#: model:process.transition,note:base_contact.process_transition_contacttofunction0
msgid "Defines contacts and functions."
-msgstr ""
+msgstr "Određuje Osobe i Funkcije"
#. module: base_contact
#: field:res.partner.contact,title:0
msgid "Title"
-msgstr ""
+msgstr "Naslov"
#. module: base_contact
#: view:res.partner.job:0
msgid "Contact Functions"
-msgstr ""
+msgstr "Funkcije Osoba"
#. module: base_contact
#: model:ir.module.module,shortdesc:base_contact.module_meta_information
msgid "Base Contact"
-msgstr ""
+msgstr "Osnovni Kontakt"
#. module: base_contact
#: help:res.partner.job,sequence_partner:0
@@ -144,212 +145,214 @@ msgid ""
"Order of importance of this job title in the list of job title of the linked "
"partner"
msgstr ""
+"redosled važnosti ovog naziva Posla-Radnog mesta u listi naziva Poslova-"
+"Radnih mesta povezanog Partnera"
#. module: base_contact
#: field:res.partner.contact,email:0
#: field:res.partner.job,email:0
msgid "E-Mail"
-msgstr ""
+msgstr "E-Mail"
#. module: base_contact
#: field:res.partner.job,date_stop:0
msgid "Date Stop"
-msgstr ""
+msgstr "Datum Završetka"
#. module: base_contact
#: view:res.partner:0
#: field:res.partner.job,address_id:0
msgid "Address"
-msgstr ""
+msgstr "Adresa"
#. module: base_contact
#: model:ir.actions.act_window,name:base_contact.action_res_partner_job
#: model:ir.ui.menu,name:base_contact.menu_action_res_partner_job
msgid "Contact's Jobs"
-msgstr ""
+msgstr "Poslovi kontakta"
#. module: base_contact
#: field:res.partner.contact,country_id:0
msgid "Nationality"
-msgstr ""
+msgstr "Nacionalnost"
#. module: base_contact
#: help:res.partner.job,sequence_contact:0
msgid ""
"Order of importance of this address in the list of addresses of the linked "
"contact"
-msgstr ""
+msgstr "redosled važnosti ove Adrese u listi Adresa povezanog Partnera"
#. module: base_contact
#: field:res.partner.address,job_id:0
#: field:res.partner.contact,job_id:0
msgid "Main Job"
-msgstr ""
+msgstr "Glavni Posao"
#. module: base_contact
#: view:res.partner:0
msgid "Categories"
-msgstr ""
+msgstr "Kategorije"
#. module: base_contact
#: field:res.partner.contact,function_id:0
msgid "Main Function"
-msgstr ""
+msgstr "Glavna Funkcija"
#. module: base_contact
#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
msgid "Define partners and their addresses."
-msgstr ""
+msgstr "Definisi Partnere i njihove Adrese"
#. module: base_contact
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nevažeći XML za pregled arhitekture"
#. module: base_contact
#: model:process.process,name:base_contact.process_process_basecontactprocess0
msgid "Base Contact Process"
-msgstr ""
+msgstr "Postupak Osnovnog Kontakta"
#. module: base_contact
#: view:res.partner.contact:0
msgid "Seq."
-msgstr ""
+msgstr "Sekv."
#. module: base_contact
#: field:res.partner.job,extension:0
msgid "Extension"
-msgstr ""
+msgstr "Dodatak"
#. module: base_contact
#: field:res.partner.contact,mobile:0
msgid "Mobile"
-msgstr ""
+msgstr "Mobilni"
#. module: base_contact
#: help:res.partner.job,extension:0
msgid "Internal/External extension phone number"
-msgstr ""
+msgstr "Interna/Externa Ekstenzija Tel. broja"
#. module: base_contact
#: model:process.node,note:base_contact.process_node_contacts0
msgid "People you work with."
-msgstr ""
+msgstr "Ljudi s kojima radite."
#. module: base_contact
#: view:res.partner.contact:0
msgid "Extra Information"
-msgstr ""
+msgstr "Dodatne informacije"
#. module: base_contact
#: view:res.partner.contact:0
#: field:res.partner.contact,job_ids:0
msgid "Functions and Addresses"
-msgstr ""
+msgstr "Funkcije i Adrese"
#. module: base_contact
#: field:res.partner.contact,active:0
msgid "Active"
-msgstr ""
+msgstr "Aktivan"
#. module: base_contact
#: field:res.partner.job,contact_id:0
msgid "Contact"
-msgstr ""
+msgstr "Kontakt"
#. module: base_contact
#: model:process.node,note:base_contact.process_node_partners0
msgid "Companies you work with."
-msgstr ""
+msgstr "Kompanije s kojima radite."
#. module: base_contact
#: field:res.partner.contact,partner_id:0
msgid "Main Employer"
-msgstr ""
+msgstr "Glavni Poslodavac."
#. module: base_contact
#: model:process.transition,name:base_contact.process_transition_functiontoaddress0
msgid "Function to address"
-msgstr ""
+msgstr "Funkcija na Adresu"
#. module: base_contact
#: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
msgid "Partner Contacts"
-msgstr ""
+msgstr "Kontakti partnera"
#. module: base_contact
#: view:res.partner.contact:0
msgid "Partner Contact"
-msgstr ""
+msgstr "Kontakt partnera"
#. module: base_contact
#: model:process.node,name:base_contact.process_node_partners0
msgid "Partners"
-msgstr ""
+msgstr "Partneri"
#. module: base_contact
#: model:process.node,name:base_contact.process_node_addresses0
#: view:res.partner:0
msgid "Addresses"
-msgstr ""
+msgstr "Adrese"
#. module: base_contact
#: model:process.node,note:base_contact.process_node_addresses0
msgid "Working and private addresses."
-msgstr ""
+msgstr "Rad na Privatnoj adresi"
#. module: base_contact
#: field:res.partner.contact,name:0
msgid "Last Name"
-msgstr ""
+msgstr "Prezime"
#. module: base_contact
#: field:res.partner.job,state:0
msgid "State"
-msgstr ""
+msgstr "Stanje"
#. module: base_contact
#: view:res.partner.contact:0
#: view:res.partner.job:0
msgid "General"
-msgstr ""
+msgstr "Opšte"
#. module: base_contact
#: selection:res.partner.job,state:0
msgid "Past"
-msgstr ""
+msgstr "Prošlost"
#. module: base_contact
#: view:res.partner.contact:0
msgid "General Information"
-msgstr ""
+msgstr "Opšte informacije"
#. module: base_contact
#: model:process.node,note:base_contact.process_node_function0
msgid "Jobs at a same partner address."
-msgstr ""
+msgstr "Poslovi na istoj Adresi Partnera"
#. module: base_contact
#: field:res.partner.job,name:0
msgid "Partner"
-msgstr ""
+msgstr "Partner"
#. module: base_contact
#: field:res.partner.job,date_start:0
msgid "Date Start"
-msgstr ""
+msgstr "PoÄetni datum"
#. module: base_contact
#: model:process.transition,note:base_contact.process_transition_functiontoaddress0
msgid "Define functions and address."
-msgstr ""
+msgstr "Definisi Funkcije i Adrese"
#. module: base_contact
#: field:res.partner.contact,website:0
msgid "Website"
-msgstr ""
+msgstr "Internet stranica"
#. module: base_contact
#: field:res.partner.contact,birthdate:0
msgid "Birth Date"
-msgstr ""
+msgstr "Datum rođenja"
diff --git a/addons/base_iban/i18n/sr.po b/addons/base_iban/i18n/sr.po
index 23ba5329fd3daf11e0404dc3ea0b50a71ae0b5c8..cd0a36c5208190b546060603be6211e1d749bc32 100644
--- a/addons/base_iban/i18n/sr.po
+++ b/addons/base_iban/i18n/sr.po
@@ -8,57 +8,57 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-21 12:29+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-10-16 09:02+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Serbian <sr@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-09-29 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_iban
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nevažeći XML za pregled arhitekture"
#. module: base_iban
#: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
msgid "zip"
-msgstr ""
+msgstr "Pošt. Broj"
#. module: base_iban
#: help:res.partner.bank,iban:0
msgid "International Bank Account Number"
-msgstr ""
+msgstr "MeÄ‘unarodni broj Bankovnog raÄuna"
#. module: base_iban
#: model:res.partner.bank.type.field,name:base_iban.bank_country_field
msgid "country_id"
-msgstr ""
+msgstr "country_id"
#. module: base_iban
#: model:res.partner.bank.type.field,name:base_iban.bank_swift_field
msgid "bic"
-msgstr ""
+msgstr "bic"
#. module: base_iban
#: model:res.partner.bank.type.field,name:base_iban.bank_iban_field
msgid "iban"
-msgstr ""
+msgstr "iban"
#. module: base_iban
#: model:ir.module.module,shortdesc:base_iban.module_meta_information
#: field:res.partner.bank,iban:0
msgid "IBAN"
-msgstr ""
+msgstr "IBAN"
#. module: base_iban
#: model:res.partner.bank.type,name:base_iban.bank_iban
msgid "IBAN Account"
-msgstr ""
+msgstr "IBAN konto"
#. module: base_iban
#: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field
msgid "acc_number"
-msgstr ""
+msgstr "Broj konta"
diff --git a/addons/base_module_quality/i18n/it.po b/addons/base_module_quality/i18n/it.po
index 6f151909339db52fa362aa284c48e2c6cec1e235..64844aac82000a079cdf79758ef6ae3fb2560055 100644
--- a/addons/base_module_quality/i18n/it.po
+++ b/addons/base_module_quality/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 11:04+0000\n"
+"PO-Revision-Date: 2010-10-17 07:55+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Italian <it@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-09-30 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-10-18 04:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_module_quality
@@ -38,7 +38,7 @@ msgstr "Modulo base di qualità "
#. module: base_module_quality
#: field:module.quality.check,name:0
msgid "Rated Module"
-msgstr ""
+msgstr "Valuta Modulo"
#. module: base_module_quality
#: view:module.quality.detail:0
diff --git a/addons/base_module_quality/i18n/sr.po b/addons/base_module_quality/i18n/sr.po
index 3b6e1679b5251ea790bb4c41490067b399a48a65..83992eb264057f46cb2908a0948b0481552b3f5f 100644
--- a/addons/base_module_quality/i18n/sr.po
+++ b/addons/base_module_quality/i18n/sr.po
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 14:58+0000\n"
-"Last-Translator: Dragan Životić <dragan_zivotic@yahoo.com>\n"
+"PO-Revision-Date: 2010-10-16 11:23+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Serbian <sr@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-09-29 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_module_quality
#: field:module.quality.check,final_score:0
msgid "Final Score (%)"
-msgstr ""
+msgstr "Krajnji Rezultat (%)"
#. module: base_module_quality
#: constraint:ir.model:0
@@ -33,12 +33,12 @@ msgstr ""
#. module: base_module_quality
#: model:ir.module.module,shortdesc:base_module_quality.module_meta_information
msgid "Base module quality"
-msgstr ""
+msgstr "Kvalitet osnovnog Modula"
#. module: base_module_quality
#: field:module.quality.check,name:0
msgid "Rated Module"
-msgstr ""
+msgstr "Ocenjen Modul"
#. module: base_module_quality
#: view:module.quality.detail:0
@@ -48,22 +48,22 @@ msgstr "Detalji"
#. module: base_module_quality
#: field:module.quality.detail,note:0
msgid "Note"
-msgstr ""
+msgstr "Napomena"
#. module: base_module_quality
#: field:module.quality.detail,state:0
msgid "State"
-msgstr ""
+msgstr "Stanje"
#. module: base_module_quality
#: field:module.quality.detail,detail:0
msgid "Details"
-msgstr ""
+msgstr "Detalji"
#. module: base_module_quality
#: field:module.quality.detail,ponderation:0
msgid "Ponderation"
-msgstr ""
+msgstr "Ponderacija"
#. module: base_module_quality
#: help:module.quality.detail,ponderation:0
@@ -71,17 +71,19 @@ msgid ""
"Some tests are more critical than others, so they have a bigger weight in "
"the computation of final rating"
msgstr ""
+"Neki su testovi kritiÄniji od drugih, tako da imaju veću \"težinu\" pri "
+"proraÄunu konaÄne procene."
#. module: base_module_quality
#: view:module.quality.check:0
#: field:module.quality.check,check_detail_ids:0
msgid "Tests"
-msgstr ""
+msgstr "Probe"
#. module: base_module_quality
#: selection:module.quality.detail,state:0
msgid "Skipped"
-msgstr ""
+msgstr "PreskoÄeno"
#. module: base_module_quality
#: help:module.quality.detail,state:0
@@ -89,41 +91,43 @@ msgid ""
"The test will be completed only if the module is installed or if the test "
"may be processed on uninstalled module."
msgstr ""
+"test će biti dovršen jedino ako je modul instaliran ili ako test može biti "
+"procesuiran na neinstaliranom modulu."
#. module: base_module_quality
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr "Neispravan XML za arhitekturu prikaza"
+msgstr "Nevažeći XML za pregled arhitekture"
#. module: base_module_quality
#: model:ir.model,name:base_module_quality.model_module_quality_check
msgid "module.quality.check"
-msgstr ""
+msgstr "modul.provera.kvaliteta"
#. module: base_module_quality
#: field:module.quality.detail,name:0
msgid "Name"
-msgstr ""
+msgstr "Ime"
#. module: base_module_quality
#: wizard_field:quality_detail_save,init,module_file:0
msgid "Save report"
-msgstr ""
+msgstr "Sacuvaj Izvestaj"
#. module: base_module_quality
#: wizard_field:quality_detail_save,init,name:0
msgid "File name"
-msgstr ""
+msgstr "Ime fajla"
#. module: base_module_quality
#: field:module.quality.detail,score:0
msgid "Score (%)"
-msgstr ""
+msgstr "Rezultat (%)"
#. module: base_module_quality
#: help:quality_detail_save,init,name:0
msgid "Save report as .html format"
-msgstr ""
+msgstr "Sacuvaj Izvestaj kao .html format"
#. module: base_module_quality
#: view:module.quality.detail:0
@@ -134,32 +138,32 @@ msgstr "Sumarno"
#. module: base_module_quality
#: model:ir.actions.wizard,name:base_module_quality.quality_detail_save
msgid "Report Save"
-msgstr ""
+msgstr "Sacuvaj Izvestaj"
#. module: base_module_quality
#: wizard_view:quality_detail_save,init:0
msgid "Standard entries"
-msgstr ""
+msgstr "Standardne stavke"
#. module: base_module_quality
#: view:module.quality.detail:0
msgid "Save Report"
-msgstr ""
+msgstr "Sacuvaj Izvestaj"
#. module: base_module_quality
#: model:ir.actions.wizard,name:base_module_quality.create_quality_check_id
msgid "Quality Check"
-msgstr ""
+msgstr "Provera Kvaliteta"
#. module: base_module_quality
#: model:ir.model,name:base_module_quality.model_module_quality_detail
msgid "module.quality.detail"
-msgstr ""
+msgstr "modul.detalj.kvalitet"
#. module: base_module_quality
#: selection:module.quality.detail,state:0
msgid "Done"
-msgstr ""
+msgstr "Gotovo"
#. module: base_module_quality
#: view:module.quality.check:0
@@ -170,12 +174,12 @@ msgstr "Rezultat"
#. module: base_module_quality
#: wizard_button:quality_detail_save,init,end:0
msgid "Cancel"
-msgstr ""
+msgstr "Otkaži"
#. module: base_module_quality
#: field:module.quality.detail,message:0
msgid "Message"
-msgstr ""
+msgstr "Poruka"
#. module: base_module_quality
#: field:module.quality.detail,quality_check_id:0
diff --git a/addons/base_module_record/i18n/sr.po b/addons/base_module_record/i18n/sr.po
index 65d7ba6bb4f057423cc37f707d483d866515f49d..40a3beef7c4e4c379ee43fa3b53a8433b2a1b7f1 100644
--- a/addons/base_module_record/i18n/sr.po
+++ b/addons/base_module_record/i18n/sr.po
@@ -8,99 +8,100 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-21 12:24+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-10-16 10:25+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Serbian <sr@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-09-29 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_module_record
#: wizard_field:base_module_record.module_record_objects,intro,category:0
#: wizard_field:base_module_record.module_save,info,category:0
msgid "Category"
-msgstr ""
+msgstr "Категорија"
#. module: base_module_record
#: wizard_view:base_module_record.module_record_objects,save:0
#: wizard_field:base_module_record.module_save,init,info_text:0
#: wizard_view:base_module_record.module_save,save:0
msgid "Information"
-msgstr ""
+msgstr "Informacija"
#. module: base_module_record
#: model:ir.model,name:base_module_record.model_ir_module_record
msgid "ir.module.record"
-msgstr ""
+msgstr "ir.module.record"
#. module: base_module_record
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Ime objekta mora da poÄinje sa x_ i ne sme da sadrži specijalne karaktere !"
#. module: base_module_record
#: wizard_view:base_module_record.module_record_objects,init:0
msgid "Choose objects to record"
-msgstr ""
+msgstr "Izaberi objekat za cuvanje"
#. module: base_module_record
#: wizard_field:base_module_record.module_record_objects,intro,author:0
#: wizard_field:base_module_record.module_save,info,author:0
msgid "Author"
-msgstr ""
+msgstr "Autor"
#. module: base_module_record
#: wizard_field:base_module_record.module_record_objects,intro,directory_name:0
#: wizard_field:base_module_record.module_save,info,directory_name:0
msgid "Directory Name"
-msgstr ""
+msgstr "Ime Direktorijuma"
#. module: base_module_record
#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
msgid "Records only"
-msgstr ""
+msgstr "Samo Zapisi"
#. module: base_module_record
#: selection:base_module_record.module_record_objects,intro,data_kind:0
#: selection:base_module_record.module_save,info,data_kind:0
msgid "Demo Data"
-msgstr ""
+msgstr "Demo Podaci"
#. module: base_module_record
#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
#: wizard_field:base_module_record.module_save,save,module_filename:0
msgid "Filename"
-msgstr ""
+msgstr "Ime Fajla"
#. module: base_module_record
#: wizard_field:base_module_record.module_record_objects,intro,version:0
#: wizard_field:base_module_record.module_save,info,version:0
msgid "Version"
-msgstr ""
+msgstr "Verzija"
#. module: base_module_record
#: wizard_view:base_module_record.module_record_objects,init:0
msgid "Objects Recording"
-msgstr ""
+msgstr "Objekti se Snimaju"
#. module: base_module_record
#: wizard_field:base_module_record.module_record_objects,init,check_date:0
msgid "Record from Date"
-msgstr ""
+msgstr "Zapis od Datuma"
#. module: base_module_record
#: wizard_view:base_module_record.module_record,stop:0
#: wizard_view:base_module_record.module_save,init:0
msgid "Recording Information"
-msgstr ""
+msgstr "Informacija o Snimanju"
#. module: base_module_record
#: wizard_field:base_module_record.module_save,init,info_status:0
msgid "Status"
-msgstr ""
+msgstr "Status"
#. module: base_module_record
#: wizard_view:base_module_record.module_record,stop:0
@@ -112,111 +113,111 @@ msgstr ""
#: wizard_view:base_module_record.module_save,init:0
#: wizard_view:base_module_record.module_save,save:0
msgid "Module Recording"
-msgstr ""
+msgstr "Snimanje Modula"
#. module: base_module_record
#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
msgid "Export Customizations As a Module"
-msgstr ""
+msgstr "Izvezi Podesavanja kao Modul"
#. module: base_module_record
#: wizard_view:base_module_record.module_record_objects,save:0
#: wizard_view:base_module_record.module_save,save:0
msgid "Thanks in advance for your contribution."
-msgstr ""
+msgstr "Hvala unaprijed na Vašem Doprinosu"
#. module: base_module_record
#: help:base_module_record.module_record_objects,init,objects:0
msgid "List of objects to be recorded"
-msgstr ""
+msgstr "Lista Objekata za zapis"
#. module: base_module_record
#: wizard_button:base_module_record.module_record,start,start_confirm:0
#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record
msgid "Start Recording"
-msgstr ""
+msgstr "PoÄni Snimanje"
#. module: base_module_record
#: selection:base_module_record.module_save,init,info_status:0
msgid "Not Recording"
-msgstr ""
+msgstr "Ne Snima"
#. module: base_module_record
#: wizard_field:base_module_record.module_record_objects,intro,description:0
#: wizard_field:base_module_record.module_save,info,description:0
msgid "Full Description"
-msgstr ""
+msgstr "Puni Opis"
#. module: base_module_record
#: wizard_field:base_module_record.module_record_objects,intro,name:0
#: wizard_field:base_module_record.module_save,info,name:0
msgid "Module Name"
-msgstr ""
+msgstr "Naziv Modula"
#. module: base_module_record
#: wizard_field:base_module_record.module_record_objects,init,objects:0
msgid "Objects"
-msgstr ""
+msgstr "Objekti"
#. module: base_module_record
#: wizard_field:base_module_record.module_record_objects,save,module_file:0
#: wizard_field:base_module_record.module_save,save,module_file:0
msgid "Module .zip File"
-msgstr ""
+msgstr ".zip datoteka Modula"
#. module: base_module_record
#: wizard_view:base_module_record.module_record,start:0
msgid "Recording information"
-msgstr ""
+msgstr "Informacija o Snimanju"
#. module: base_module_record
#: wizard_view:base_module_record.module_record_objects,save:0
#: wizard_view:base_module_record.module_save,save:0
msgid "Module successfully created !"
-msgstr ""
+msgstr "Modul uspješno kreiran !"
#. module: base_module_record
#: wizard_view:base_module_record.module_record,start:0
msgid "Recording Stopped"
-msgstr ""
+msgstr "Snimanje zaustavljeno"
#. module: base_module_record
#: selection:base_module_record.module_record_objects,init,filter_cond:0
msgid "Created"
-msgstr ""
+msgstr "Kreirano"
#. module: base_module_record
#: wizard_view:base_module_record.module_record_objects,end:0
#: wizard_view:base_module_record.module_save,end:0
msgid "Thanks For using Module Recorder"
-msgstr ""
+msgstr "Hvala Å¡to ste koristili SnimaÄ Modula"
#. module: base_module_record
#: wizard_field:base_module_record.module_record,start,continue:0
msgid "Continue Previous Session"
-msgstr ""
+msgstr "Nastavi Prethodnu Sesiju"
#. module: base_module_record
#: wizard_field:base_module_record.module_record_objects,intro,website:0
#: wizard_field:base_module_record.module_save,info,website:0
msgid "Documentation URL"
-msgstr ""
+msgstr "URL Dokumentacije"
#. module: base_module_record
#: selection:base_module_record.module_record_objects,init,filter_cond:0
msgid "Modified"
-msgstr ""
+msgstr "Izmenjen"
#. module: base_module_record
#: selection:base_module_record.module_save,init,info_status:0
msgid "Recording"
-msgstr ""
+msgstr "Snimanje"
#. module: base_module_record
#: wizard_button:base_module_record.module_record_objects,init,record:0
msgid "Record"
-msgstr ""
+msgstr "Snima"
#. module: base_module_record
#: wizard_button:base_module_record.module_record,stop,end:0
@@ -224,25 +225,25 @@ msgstr ""
#: wizard_button:base_module_record.module_save,info,save:0
#: wizard_button:base_module_record.module_save,init,check:0
msgid "Continue"
-msgstr ""
+msgstr "Nastavi"
#. module: base_module_record
#: model:ir.module.module,shortdesc:base_module_record.module_meta_information
#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec_rec
msgid "Module Recorder"
-msgstr ""
+msgstr "SnimaÄ Modula"
#. module: base_module_record
#: selection:base_module_record.module_record_objects,intro,data_kind:0
#: selection:base_module_record.module_save,info,data_kind:0
msgid "Normal Data"
-msgstr ""
+msgstr "ObiÄni podaci"
#. module: base_module_record
#: wizard_button:base_module_record.module_record_objects,end,end:0
#: wizard_button:base_module_record.module_save,end,end:0
msgid "OK"
-msgstr ""
+msgstr "U redu"
#. module: base_module_record
#: wizard_view:base_module_record.module_record_objects,save:0
@@ -252,6 +253,9 @@ msgid ""
"publish it on OpenERP.com, in the 'Modules' section. You can do it through "
"the website or using features of the 'base_module_publish' module."
msgstr ""
+"Ako mislite da bi Vaš Modul mogao nekog zanimati, voljeli bismo da ga "
+"publicirate na OpenERP.com u sekciji \"Modules\". To možete putem weba ili "
+"korištenjem mogućnosti Modula: 'base_module_publish'."
#. module: base_module_record
#: wizard_view:base_module_record.module_record,start:0
@@ -260,16 +264,19 @@ msgid ""
"ERP client and save them as a module. You will be able to install this "
"module on any database to reuse and/or publish it."
msgstr ""
+"SnimaÄ Modula omogućuje Vam da snimite svaku operaciju izvrÅ¡enu u Open ERP "
+"klijentu i izmjene spremite kao Modul. Moći ćete instalirati taj Modul na "
+"bilo kojoj Bazi Podataka za ponovnu upotrebu ili publiciranje."
#. module: base_module_record
#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record
msgid "Record module"
-msgstr ""
+msgstr "Snimi Modul"
#. module: base_module_record
#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
msgid "Module Creation"
-msgstr ""
+msgstr "Kreacija Modula"
#. module: base_module_record
#: wizard_view:base_module_record.module_record,stop:0
@@ -277,30 +284,33 @@ msgid ""
"You can continue the recording session by relauching the 'start recording' "
"wizard."
msgstr ""
+"Možete nastaviti snimanje tako da ponovo pokrenete ÄŒarobnjak \"PoÄni "
+"Snimanje\""
#. module: base_module_record
#: wizard_field:base_module_record.module_record_objects,intro,data_kind:0
#: wizard_field:base_module_record.module_save,info,data_kind:0
msgid "Type of Data"
-msgstr ""
+msgstr "Tip Podataka"
#. module: base_module_record
#: wizard_view:base_module_record.module_record_objects,intro:0
#: wizard_view:base_module_record.module_save,info:0
msgid "Module Information"
-msgstr ""
+msgstr "Informacija o Modulu"
#. module: base_module_record
#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_save
#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_save
msgid "Save Recorded Module"
-msgstr ""
+msgstr "Sacuvaj Snimljen Modul"
#. module: base_module_record
#: wizard_view:base_module_record.module_record,stop:0
msgid ""
"Open ERP recording is stopped. Don't forget to save the recorded module."
msgstr ""
+"OpenERP SnimaÄ je zaustavljen. Ne zaboravite da sacuvate snimljen Modul."
#. module: base_module_record
#: wizard_button:base_module_record.module_record,start,end:0
@@ -309,20 +319,20 @@ msgstr ""
#: wizard_button:base_module_record.module_save,info,end:0
#: wizard_button:base_module_record.module_save,init,end:0
msgid "Cancel"
-msgstr ""
+msgstr "Otkaži"
#. module: base_module_record
#: wizard_button:base_module_record.module_record_objects,save,end:0
#: wizard_button:base_module_record.module_save,save,end:0
msgid "Close"
-msgstr ""
+msgstr "Zatvori"
#. module: base_module_record
#: selection:base_module_record.module_record_objects,init,filter_cond:0
msgid "Created & Modified"
-msgstr ""
+msgstr "Kreiran & Izmijenjen"
#. module: base_module_record
#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_stop
msgid "Stop Recording"
-msgstr ""
+msgstr "Zaustavi Snimanje"
diff --git a/addons/base_report_creator/i18n/sr.po b/addons/base_report_creator/i18n/sr.po
index a0d62708967b3e7584dd5a617cba8d02a30401b6..d8c008b6b9ef1dad6f9ea558537604528ca16691 100644
--- a/addons/base_report_creator/i18n/sr.po
+++ b/addons/base_report_creator/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-21 12:24+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-10-16 09:40+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Serbian <sr@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-09-29 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_report_creator
@@ -24,378 +24,381 @@ msgid ""
"records.\n"
" e.g. res_partner.id=3"
msgstr ""
+"Unesite izraz za polje po kojem želite filtrirati zapise.\n"
+"npr. res_partner.id=3"
#. module: base_report_creator
#: field:base_report_creator.report,view_graph_type:0
msgid "Graph Type"
-msgstr ""
+msgstr "Tip grafikona"
#. module: base_report_creator
#: view:base_report_creator.report:0
msgid "Used View"
-msgstr ""
+msgstr "Korišten prikaz"
#. module: base_report_creator
#: wizard_view:base_report_creator.report_filter.fields,set_value_select_field:0
msgid "Filter Values"
-msgstr ""
+msgstr "Vrednosti filtra"
#. module: base_report_creator
#: field:base_report_creator.report.fields,graph_mode:0
msgid "Graph Mode"
-msgstr ""
+msgstr "GrafiÄki"
#. module: base_report_creator
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Pogrešno ime modela u definiciji akcije."
#. module: base_report_creator
#: view:base_report_creator.report:0
msgid "Graph View"
-msgstr ""
+msgstr "GrafiÄki prikaz"
#. module: base_report_creator
#: field:base_report_creator.report.filter,expression:0
msgid "Value"
-msgstr ""
+msgstr "Vrednost"
#. module: base_report_creator
#: model:ir.actions.wizard,name:base_report_creator.wizard_set_filter_fields
msgid "Set Filter Fields"
-msgstr ""
+msgstr "Postavi filterska polja"
#. module: base_report_creator
#: selection:base_report_creator.report.fields,calendar_mode:0
msgid "Ending Date"
-msgstr ""
+msgstr "Datum završetka"
#. module: base_report_creator
#: model:ir.model,name:base_report_creator.model_base_report_creator_report_filter
msgid "Report Filters"
-msgstr ""
+msgstr "Filteri izvještaja"
#. module: base_report_creator
#: view:base_report_creator.report:0
#: field:base_report_creator.report,sql_query:0
msgid "SQL Query"
-msgstr ""
+msgstr "SQL upit"
#. module: base_report_creator
#: view:base_report_creator.report:0
#: wizard_button:base_report_creator.report.menu.create,init,create_menu:0
msgid "Create Menu"
-msgstr ""
+msgstr "Kreiraj Meni"
#. module: base_report_creator
#: selection:base_report_creator.report.fields,group_method:0
msgid "Minimum"
-msgstr ""
+msgstr "Minimum"
#. module: base_report_creator
#: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,operator:0
msgid "Operator"
-msgstr ""
+msgstr "Operator"
#. module: base_report_creator
#: selection:base_report_creator.report.filter,condition:0
#: selection:base_report_creator.report_filter.fields,set_value_select_field,condition:0
msgid "OR"
-msgstr ""
+msgstr "ILI"
#. module: base_report_creator
#: model:ir.ui.menu,name:base_report_creator.menu_base_report_creator_action
#: model:ir.ui.menu,name:base_report_creator.menu_base_report_creator_action_config
msgid "Custom Reports"
-msgstr ""
+msgstr "Prilagođeni izvještaji"
#. module: base_report_creator
#: wizard_view:base_report_creator.report.menu.create,init:0
msgid "Menu Information"
-msgstr ""
+msgstr "Informacije Menija"
#. module: base_report_creator
#: selection:base_report_creator.report.fields,group_method:0
msgid "Sum"
-msgstr ""
+msgstr "Suma"
#. module: base_report_creator
#: field:base_report_creator.report,model_ids:0
msgid "Reported Objects"
-msgstr ""
+msgstr "Navedeni objekti"
#. module: base_report_creator
#: view:base_report_creator.report:0
msgid "Field List"
-msgstr ""
+msgstr "Lista polja"
#. module: base_report_creator
#: field:base_report_creator.report,type:0
msgid "Report Type"
-msgstr ""
+msgstr "Tip izveštaja"
#. module: base_report_creator
#: view:base_report_creator.report:0
msgid "State"
-msgstr ""
+msgstr "Stanje"
#. module: base_report_creator
#: selection:base_report_creator.report,state:0
msgid "Valid"
-msgstr ""
+msgstr "Potvrđeno"
#. module: base_report_creator
#: view:base_report_creator.report:0
msgid "Add filter"
-msgstr ""
+msgstr "Dodaj Filter"
#. module: base_report_creator
#: model:ir.actions.wizard,name:base_report_creator.wizard_menu_create
msgid "Create Menu for Report"
-msgstr ""
+msgstr "Kreiraj Meni za Izveštaje"
#. module: base_report_creator
#: selection:base_report_creator.report,view_type1:0
#: selection:base_report_creator.report,view_type2:0
#: selection:base_report_creator.report,view_type3:0
msgid "Form"
-msgstr ""
+msgstr "Obrazac"
#. module: base_report_creator
#: selection:base_report_creator.report,view_type3:0
#: selection:base_report_creator.report.fields,calendar_mode:0
#: selection:base_report_creator.report.fields,graph_mode:0
msgid "/"
-msgstr ""
+msgstr "/"
#. module: base_report_creator
#: field:base_report_creator.report.fields,report_id:0
#: field:base_report_creator.report.filter,report_id:0
#: model:ir.model,name:base_report_creator.model_base_report_creator_report
msgid "Report"
-msgstr ""
+msgstr "Izveštaj"
#. module: base_report_creator
#: selection:base_report_creator.report.fields,calendar_mode:0
msgid "Starting Date"
-msgstr ""
+msgstr "PoÄetni datum"
#. module: base_report_creator
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nevažeći XML za pregled arhitekture"
#. module: base_report_creator
#: selection:base_report_creator.report,view_type1:0
#: selection:base_report_creator.report,view_type2:0
#: selection:base_report_creator.report,view_type3:0
msgid "Tree"
-msgstr ""
+msgstr "Stablo"
#. module: base_report_creator
#: field:base_report_creator.report,group_ids:0
msgid "Authorized Groups"
-msgstr ""
+msgstr "Autorizovane Grupe"
#. module: base_report_creator
#: field:base_report_creator.report,view_graph_orientation:0
msgid "Graph Orientation"
-msgstr ""
+msgstr "Orjentacija grafikona"
#. module: base_report_creator
#: view:base_report_creator.report:0
msgid "Authorized Groups (empty for all)"
-msgstr ""
+msgstr "Autorizovane Grupe(Prazno za sve)"
#. module: base_report_creator
#: view:base_report_creator.report:0
msgid "Security"
-msgstr ""
+msgstr "Bezbednost"
#. module: base_report_creator
#: wizard_field:base_report_creator.report.menu.create,init,menu_name:0
msgid "Menu Name"
-msgstr ""
+msgstr "Naziv Menija"
#. module: base_report_creator
#: selection:base_report_creator.report.filter,condition:0
#: selection:base_report_creator.report_filter.fields,set_value_select_field,condition:0
msgid "AND"
-msgstr ""
+msgstr "I"
#. module: base_report_creator
#: field:base_report_creator.report.fields,calendar_mode:0
msgid "Calendar Mode"
-msgstr ""
+msgstr "Kalendar Mod"
#. module: base_report_creator
#: model:ir.model,name:base_report_creator.model_base_report_creator_report_fields
msgid "Display Fields"
-msgstr ""
+msgstr "Polja Displeja"
#. module: base_report_creator
#: selection:base_report_creator.report.fields,graph_mode:0
msgid "Y Axis"
-msgstr ""
+msgstr "Y osa"
#. module: base_report_creator
#: selection:base_report_creator.report,view_type1:0
#: selection:base_report_creator.report,view_type2:0
#: selection:base_report_creator.report,view_type3:0
msgid "Calendar"
-msgstr ""
+msgstr "Kalendar"
#. module: base_report_creator
#: selection:base_report_creator.report,view_type1:0
#: selection:base_report_creator.report,view_type2:0
#: selection:base_report_creator.report,view_type3:0
msgid "Graph"
-msgstr ""
+msgstr "Grafikon"
#. module: base_report_creator
#: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,field_id:0
msgid "Field Name"
-msgstr ""
+msgstr "Naziv polja"
#. module: base_report_creator
#: selection:base_report_creator.report,state:0
msgid "Draft"
-msgstr ""
+msgstr "Priprema"
#. module: base_report_creator
#: wizard_view:base_report_creator.report_filter.fields,set_value_select_field:0
msgid "Set Filter Values"
-msgstr ""
+msgstr "Postavi Vrednosti Filtera"
#. module: base_report_creator
#: field:base_report_creator.report,state:0
msgid "Status"
-msgstr ""
+msgstr "Status"
#. module: base_report_creator
#: selection:base_report_creator.report,view_graph_orientation:0
msgid "Vertical"
-msgstr ""
+msgstr "Uspravno"
#. module: base_report_creator
#: selection:base_report_creator.report,type:0
msgid "Rows And Columns Report"
-msgstr ""
+msgstr "Izvestaj redova i kolona"
#. module: base_report_creator
#: view:base_report_creator.report:0
msgid "General Configuration"
-msgstr ""
+msgstr "Opšte podešavanje"
#. module: base_report_creator
#: wizard_view:base_report_creator.report_filter.fields,init:0
msgid "Select Field to filter"
-msgstr ""
+msgstr "Odaberite polje za filtriranje"
#. module: base_report_creator
#: field:base_report_creator.report,active:0
msgid "Active"
-msgstr ""
+msgstr "Aktivan"
#. module: base_report_creator
#: selection:base_report_creator.report,view_graph_orientation:0
msgid "Horizontal"
-msgstr ""
+msgstr "Vodoravno"
#. module: base_report_creator
#: field:base_report_creator.report.fields,group_method:0
msgid "Grouping Method"
-msgstr ""
+msgstr "Metod grupisanja"
#. module: base_report_creator
#: field:base_report_creator.report.filter,condition:0
#: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,condition:0
msgid "Condition"
-msgstr ""
+msgstr "Uslov"
#. module: base_report_creator
#: selection:base_report_creator.report.fields,group_method:0
msgid "Count"
-msgstr ""
+msgstr "Brojanje"
#. module: base_report_creator
#: selection:base_report_creator.report.fields,graph_mode:0
msgid "X Axis"
-msgstr ""
+msgstr "X osa"
#. module: base_report_creator
#: wizard_field:base_report_creator.report.menu.create,init,menu_parent_id:0
msgid "Parent Menu"
-msgstr ""
+msgstr "Roditeljski Meni"
#. module: base_report_creator
#: wizard_button:base_report_creator.report_filter.fields,set_value_select_field,set_value:0
msgid "Confirm Filter"
-msgstr ""
+msgstr "Potvrdi Filter"
#. module: base_report_creator
#: field:base_report_creator.report.filter,name:0
msgid "Filter Name"
-msgstr ""
+msgstr "Naziv Filtera"
#. module: base_report_creator
#: model:ir.actions.wizard,name:base_report_creator.wizard_report_open
msgid "Open Report"
-msgstr ""
+msgstr "Otvori izveštaj"
#. module: base_report_creator
#: selection:base_report_creator.report.fields,group_method:0
msgid "Grouped"
-msgstr ""
+msgstr "Grupisano"
#. module: base_report_creator
#: view:base_report_creator.report:0
#: model:ir.module.module,shortdesc:base_report_creator.module_meta_information
msgid "Report Creator"
-msgstr ""
+msgstr "Kreator izveštaja"
#. module: base_report_creator
#: wizard_button:base_report_creator.report.menu.create,init,end:0
#: wizard_button:base_report_creator.report_filter.fields,init,end:0
#: wizard_button:base_report_creator.report_filter.fields,set_value_select_field,end:0
msgid "Cancel"
-msgstr ""
+msgstr "Otkaži"
#. module: base_report_creator
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Ime objekta mora da poÄinje sa x_ i ne sme da sadrži specijalne karaktere !"
#. module: base_report_creator
#: field:base_report_creator.report,view_type1:0
msgid "First View"
-msgstr ""
+msgstr "Prvi pogled"
#. module: base_report_creator
#: selection:base_report_creator.report.fields,calendar_mode:0
msgid "Delay"
-msgstr ""
+msgstr "Kašnjenje"
#. module: base_report_creator
#: field:base_report_creator.report.fields,field_id:0
msgid "Field"
-msgstr ""
+msgstr "Polje"
#. module: base_report_creator
#: view:base_report_creator.report:0
msgid "Filters on Fields"
-msgstr ""
+msgstr "Filteri na poljima"
#. module: base_report_creator
#: selection:base_report_creator.report,view_graph_type:0
msgid "Pie Chart"
-msgstr ""
+msgstr "Tortni grafikon"
#. module: base_report_creator
#: field:base_report_creator.report,view_type3:0
msgid "Third View"
-msgstr ""
+msgstr "Treći pogled"
#. module: base_report_creator
#: model:ir.module.module,description:base_report_creator.module_meta_information
@@ -407,85 +410,91 @@ msgid ""
"After installing the module, it adds a menu to define custom report in\n"
"the \"Dashboard\" menu.\n"
msgstr ""
+"Ovi moduli vam dozvoljavaju kreiranje bilo kojeg statistiÄkog\n"
+"izvještaja iz više objekata. To je graditelj SQL upita i pretrazivac\n"
+"za krajnje korisnike.\n"
+"\n"
+"Nakon instalacije, modul dodaje Meni za kreiranje prilagođenog izvještaja\n"
+"na Meniju Glavne Table.\n"
#. module: base_report_creator
#: selection:base_report_creator.report.fields,calendar_mode:0
msgid "Uniq Colors"
-msgstr ""
+msgstr "Jedinstvene boje"
#. module: base_report_creator
#: field:base_report_creator.report,name:0
msgid "Report Name"
-msgstr ""
+msgstr "Naziv izveštaja"
#. module: base_report_creator
#: view:base_report_creator.report:0
msgid "Fields"
-msgstr ""
+msgstr "Polja"
#. module: base_report_creator
#: selection:base_report_creator.report.fields,group_method:0
msgid "Average"
-msgstr ""
+msgstr "ProseÄno"
#. module: base_report_creator
#: view:base_report_creator.report:0
msgid "Reports"
-msgstr ""
+msgstr "Izveštaji"
#. module: base_report_creator
#: selection:base_report_creator.report.fields,group_method:0
msgid "Maximum"
-msgstr ""
+msgstr "Maksimum"
#. module: base_report_creator
#: wizard_button:base_report_creator.report_filter.fields,init,set_value_select_field:0
msgid "Continue"
-msgstr ""
+msgstr "Nastavi"
#. module: base_report_creator
#: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,value:0
msgid "Values"
-msgstr ""
+msgstr "ВредноÑти"
#. module: base_report_creator
#: selection:base_report_creator.report,view_graph_type:0
msgid "Bar Chart"
-msgstr ""
+msgstr "Bar grafikon"
#. module: base_report_creator
#: field:base_report_creator.report,view_type2:0
msgid "Second View"
-msgstr ""
+msgstr "Drugi pogled"
#. module: base_report_creator
#: wizard_view:base_report_creator.report.menu.create,init:0
msgid "Create Menu For This Report"
-msgstr ""
+msgstr "Kreiraj Meni za ovaj izveštaj"
#. module: base_report_creator
#: view:base_report_creator.report:0
msgid "View parameters"
-msgstr ""
+msgstr "Parametri prikaza"
#. module: base_report_creator
#: field:base_report_creator.report.fields,sequence:0
msgid "Sequence"
-msgstr ""
+msgstr "Sekvenca"
#. module: base_report_creator
#: wizard_field:base_report_creator.report_filter.fields,init,field_id:0
msgid "Filter Field"
-msgstr ""
+msgstr "polje Filtera"
#. module: base_report_creator
#: view:base_report_creator.report:0
#: field:base_report_creator.report,field_ids:0
msgid "Fields to Display"
-msgstr ""
+msgstr "Polja za Prikaz"
#. module: base_report_creator
#: view:base_report_creator.report:0
#: field:base_report_creator.report,filter_ids:0
msgid "Filters"
-msgstr ""
+msgstr "Filteri"
diff --git a/addons/base_report_designer/i18n/sr.po b/addons/base_report_designer/i18n/sr.po
index bee67bea6e75a2758ba8bcba4186cf28c136fb69..74bacc3daa9f770986694d2e6fca34ab82f1c24f 100644
--- a/addons/base_report_designer/i18n/sr.po
+++ b/addons/base_report_designer/i18n/sr.po
@@ -8,89 +8,89 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-21 12:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-10-16 09:24+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Serbian <sr@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-09-29 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_report_designer
#: wizard_field:base_report_designer.modify,init,text:0
msgid "Introduction"
-msgstr ""
+msgstr "Predstavljanje"
#. module: base_report_designer
#: wizard_view:base_report_designer.modify,send_form:0
msgid "Upload your modified report"
-msgstr ""
+msgstr "Pošalji promenjen izveštaj na Server"
#. module: base_report_designer
#: wizard_button:base_report_designer.modify,get_form_result,send_form:0
msgid "Upload the modified report"
-msgstr ""
+msgstr "Pošalji promenjen izveštaj na Server"
#. module: base_report_designer
#: wizard_view:base_report_designer.modify,get_form_result:0
msgid "The .SXW report"
-msgstr ""
+msgstr ".SXW Izveštaj"
#. module: base_report_designer
#: wizard_view:base_report_designer.modify,send_form_result:0
msgid "Report modified"
-msgstr ""
+msgstr "Izveštaj je promenjen"
#. module: base_report_designer
#: wizard_button:base_report_designer.modify,init,get_form:0
msgid "Modify a report"
-msgstr ""
+msgstr "Izmeni Izveštaj"
#. module: base_report_designer
#: wizard_view:base_report_designer.modify,send_form_result:0
msgid "Your report has been modified."
-msgstr ""
+msgstr "Vaš je Izveštaj izmenjen"
#. module: base_report_designer
#: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
msgid "Report designer interface module"
-msgstr ""
+msgstr "Modul Interfejsa Dizajnera Izveštaja"
#. module: base_report_designer
#: wizard_field:base_report_designer.modify,get_form,report_id:0
#: wizard_field:base_report_designer.modify,get_form_result,report_id:0
#: wizard_field:base_report_designer.modify,send_form,report_id:0
msgid "Report"
-msgstr ""
+msgstr "Izveštaj"
#. module: base_report_designer
#: model:ir.ui.menu,name:base_report_designer.menu_wizard_report_designer_modify
msgid "Report Designer"
-msgstr ""
+msgstr "Dizajner Izvještaja"
#. module: base_report_designer
#: wizard_view:base_report_designer.modify,get_form:0
#: wizard_view:base_report_designer.modify,get_form_result:0
#: wizard_view:base_report_designer.modify,send_form:0
msgid "Get a report"
-msgstr ""
+msgstr "Napravi Izvještaj"
#. module: base_report_designer
#: wizard_button:base_report_designer.modify,get_form,get_form_result:0
msgid "Continue"
-msgstr ""
+msgstr "Nastavi"
#. module: base_report_designer
#: wizard_field:base_report_designer.modify,get_form_result,file_sxw:0
#: wizard_field:base_report_designer.modify,send_form,file_sxw:0
msgid "Your .SXW file"
-msgstr ""
+msgstr "Vaša .SXW datoteka"
#. module: base_report_designer
#: wizard_view:base_report_designer.modify,init:0
msgid "Report designer"
-msgstr ""
+msgstr "Dizajner Izveštaja"
#. module: base_report_designer
#: wizard_view:base_report_designer.modify,get_form_result:0
@@ -100,47 +100,51 @@ msgid ""
"to modify it. Once it is modified, re-upload it in Open ERP using this "
"wizard."
msgstr ""
+"Ovo je Predložak vašeg traženog Izveštaja. Spremite ga kao .SXW datoteku i "
+"otvorite s programon OpenOffice. Ne zaboravite instalirati Tiny OpenOffice "
+"paket kako biste mogli vršiti izmjene. kad izvršite izmjene, vratite "
+"datoteku u Open ERP koristeći ovaj Čarobnjak."
#. module: base_report_designer
#: wizard_button:base_report_designer.modify,send_form,send_form_result:0
msgid "Update the report"
-msgstr ""
+msgstr "Ažurirajte Izvještaj"
#. module: base_report_designer
#: selection:base_report_designer.modify,init,operation:0
msgid "Create a new report"
-msgstr ""
+msgstr "Napravi novi Izvještaj"
#. module: base_report_designer
#: selection:base_report_designer.modify,init,operation:0
#: model:ir.actions.wizard,name:base_report_designer.wizard_report_designer_modify
msgid "Modify an existing report"
-msgstr ""
+msgstr "Izmeni postojeći izveštaj"
#. module: base_report_designer
#: wizard_button:base_report_designer.modify,get_form,end:0
#: wizard_button:base_report_designer.modify,init,end:0
msgid "Cancel"
-msgstr ""
+msgstr "Otkaži"
#. module: base_report_designer
#: wizard_button:base_report_designer.modify,get_form_result,end:0
#: wizard_button:base_report_designer.modify,send_form,end:0
#: wizard_button:base_report_designer.modify,send_form_result,end:0
msgid "Close"
-msgstr ""
+msgstr "Zatvori"
#. module: base_report_designer
#: wizard_field:base_report_designer.modify,init,operation:0
msgid "Operation"
-msgstr ""
+msgstr "Postupak"
#. module: base_report_designer
#: wizard_view:base_report_designer.modify,init:0
msgid "Report designer introduction"
-msgstr ""
+msgstr "Uvod u Dizajner Izveštaja"
#. module: base_report_designer
#: wizard_view:base_report_designer.modify,get_form:0
msgid "Select your report"
-msgstr ""
+msgstr "Odaberite izvještaj"
diff --git a/addons/base_setup/i18n/sr.po b/addons/base_setup/i18n/sr.po
index 53bd12e5688af1ee86fa46984a0dd56da9a2fb01..1c11be3bb17dfc50db52f6203df972149836cadc 100644
--- a/addons/base_setup/i18n/sr.po
+++ b/addons/base_setup/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-21 12:25+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-10-15 08:51+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Serbian <sr@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-09-29 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_setup
@@ -22,7 +22,7 @@ msgstr ""
#: wizard_field:base_setup.base_setup,init,city:0
#: wizard_field:base_setup.base_setup,update,city:0
msgid "City"
-msgstr ""
+msgstr "Grad"
#. module: base_setup
#: wizard_view:base_setup.base_setup,finish:0
@@ -30,34 +30,36 @@ msgid ""
"You can start configuring the system or connect directly to the database "
"using the default setup."
msgstr ""
+"Možete poÄeti s konfiguracijom sistema ili se direktno spojiti na bazu "
+"podataka koristeći predefinisane postavke."
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,zip:0
#: wizard_field:base_setup.base_setup,init,zip:0
#: wizard_field:base_setup.base_setup,update,zip:0
msgid "Zip code"
-msgstr ""
+msgstr "Poštanski broj"
#. module: base_setup
#: wizard_view:base_setup.base_setup,init:0
msgid "Select a Profile"
-msgstr ""
+msgstr "Izaberi Profil"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Report header"
-msgstr ""
+msgstr "Zaglavlje Izveštaja"
#. module: base_setup
#: wizard_button:base_setup.base_setup,finish,config:0
msgid "Start Configuration"
-msgstr ""
+msgstr "Startuj Konfiguraciju"
#. module: base_setup
#: wizard_view:base_setup.base_setup,init:0
msgid ""
"You'll be able to install more modules later through the Administration menu."
-msgstr ""
+msgstr "Moći ćete instalirati više Modula kasnije kroz Administracioni Meni"
#. module: base_setup
#: wizard_view:base_setup.base_setup,init:0
@@ -66,88 +68,91 @@ msgid ""
"have been setup to help you discover the different aspects of OpenERP. This "
"is just an overview, we have 300+ available modules."
msgstr ""
+"Profil odreÄ‘uje pred-izbor modula za specifiÄne potrebe. Ti su profili "
+"podeÅ¡eni kako biste lakÅ¡e otkrivali razliÄite aspekte Open ERP-a. Ovo je tek "
+"osvrt, postoji 300+ raspoloživih modula"
#. module: base_setup
#: wizard_button:base_setup.base_setup,company,update:0
#: wizard_button:base_setup.base_setup,init,company:0
msgid "Next"
-msgstr ""
+msgstr "Sledeće"
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,email:0
#: wizard_field:base_setup.base_setup,init,email:0
#: wizard_field:base_setup.base_setup,update,email:0
msgid "E-mail"
-msgstr ""
+msgstr "E-mail"
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,state_id:0
#: wizard_field:base_setup.base_setup,init,state_id:0
#: wizard_field:base_setup.base_setup,update,state_id:0
msgid "State"
-msgstr ""
+msgstr "Stanje"
#. module: base_setup
#: wizard_view:base_setup.base_setup,finish:0
msgid "Your new database is now fully installed."
-msgstr ""
+msgstr "Vaša nova baza podataka sada je instalirana u potpunosti."
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,profile:0
#: wizard_field:base_setup.base_setup,init,profile:0
#: wizard_field:base_setup.base_setup,update,profile:0
msgid "Profile"
-msgstr ""
+msgstr "Profil"
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,rml_footer1:0
#: wizard_field:base_setup.base_setup,init,rml_footer1:0
#: wizard_field:base_setup.base_setup,update,rml_footer1:0
msgid "Report Footer 1"
-msgstr ""
+msgstr "Podnožje izveštaja 1"
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,rml_footer2:0
#: wizard_field:base_setup.base_setup,init,rml_footer2:0
#: wizard_field:base_setup.base_setup,update,rml_footer2:0
msgid "Report Footer 2"
-msgstr ""
+msgstr "Podnožje izveštaja 2"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "General Information"
-msgstr ""
+msgstr "Opšte informacije"
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,street2:0
#: wizard_field:base_setup.base_setup,init,street2:0
#: wizard_field:base_setup.base_setup,update,street2:0
msgid "Street2"
-msgstr ""
+msgstr "Ulica2"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Report Information"
-msgstr ""
+msgstr "Informacije Izvestaja"
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,phone:0
#: wizard_field:base_setup.base_setup,init,phone:0
#: wizard_field:base_setup.base_setup,update,phone:0
msgid "Phone"
-msgstr ""
+msgstr "Telefon"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Define Main Company"
-msgstr ""
+msgstr "Definisi Osnovno Preduzece"
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,name:0
#: wizard_field:base_setup.base_setup,init,name:0
#: wizard_field:base_setup.base_setup,update,name:0
msgid "Company Name"
-msgstr ""
+msgstr "Naziv Preduzeca"
#. module: base_setup
#: help:base_setup.base_setup,company,rml_footer2:0
@@ -158,13 +163,16 @@ msgid ""
"We suggest you to put bank information here:\n"
"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
msgstr ""
+"Ovaj deo ce se pojavljivati na dnu vasih izvestaja\n"
+"Savetujemo vam da SADA postavite informacije o vasoj Banci\n"
+"BAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 -PDV: BE0477.472.701"
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,country_id:0
#: wizard_field:base_setup.base_setup,init,country_id:0
#: wizard_field:base_setup.base_setup,update,country_id:0
msgid "Country"
-msgstr ""
+msgstr "Drzava"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
@@ -174,7 +182,7 @@ msgstr ""
#: model:ir.actions.wizard,name:base_setup.action_wizard_setup
#: model:ir.actions.wizard,name:base_setup.wizard_base_setup
msgid "Setup"
-msgstr ""
+msgstr "Podešavanje"
#. module: base_setup
#: help:base_setup.base_setup,company,rml_footer1:0
@@ -185,21 +193,24 @@ msgid ""
"We suggest you to write legal sentences here:\n"
"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
msgstr ""
+"Ova će se reÄenica pojavljivati u podnožju vaÅ¡ih izveÅ¡taja.\n"
+"Savetujemo vam da ovdje upišete osnovne podatke:\n"
+"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
#. module: base_setup
#: wizard_view:base_setup.base_setup,update:0
msgid "Summary"
-msgstr ""
+msgstr "Sumarno"
#. module: base_setup
#: wizard_button:base_setup.base_setup,update,finish:0
msgid "Install"
-msgstr ""
+msgstr "Instaliraj"
#. module: base_setup
#: wizard_view:base_setup.base_setup,finish:0
msgid "Installation Done"
-msgstr ""
+msgstr "Instalacija je završena"
#. module: base_setup
#: help:base_setup.base_setup,company,rml_header1:0
@@ -210,57 +221,60 @@ msgid ""
"We suggest you to put a slogan here:\n"
"\"Open Source Business Solutions\"."
msgstr ""
+"Ova će se reÄenica pojavljivati u gornjem desnom uglu vaÅ¡ih izveÅ¡taja.\n"
+"Savetujemo vam da ovje upišete slogan preduzeca:\n"
+"\"Open Source Business Solucija\""
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,rml_header1:0
#: wizard_field:base_setup.base_setup,init,rml_header1:0
#: wizard_field:base_setup.base_setup,update,rml_header1:0
msgid "Report Header"
-msgstr ""
+msgstr "Zaglavlje izveštaja"
#. module: base_setup
#: wizard_view:base_setup.base_setup,company:0
msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr ""
+msgstr "VaÅ¡ logotip - Koristite veliÄinu oko 450x150 piksela."
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,currency:0
#: wizard_field:base_setup.base_setup,init,currency:0
#: wizard_field:base_setup.base_setup,update,currency:0
msgid "Currency"
-msgstr ""
+msgstr "Valuta"
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,street:0
#: wizard_field:base_setup.base_setup,init,street:0
#: wizard_field:base_setup.base_setup,update,street:0
msgid "Street"
-msgstr ""
+msgstr "Ulica"
#. module: base_setup
#: wizard_button:base_setup.base_setup,finish,menu:0
msgid "Use Directly"
-msgstr ""
+msgstr "Koristi Direktno"
#. module: base_setup
#: wizard_button:base_setup.base_setup,init,menu:0
msgid "Cancel"
-msgstr ""
+msgstr "Otkaži"
#. module: base_setup
#: wizard_field:base_setup.base_setup,company,logo:0
#: wizard_field:base_setup.base_setup,init,logo:0
#: wizard_field:base_setup.base_setup,update,logo:0
msgid "Logo"
-msgstr ""
+msgstr "Logotip"
#. module: base_setup
#: model:ir.module.module,shortdesc:base_setup.module_meta_information
msgid "Base Setup"
-msgstr ""
+msgstr "Bazna Podesavanja"
#. module: base_setup
#: wizard_button:base_setup.base_setup,company,init:0
#: wizard_button:base_setup.base_setup,update,company:0
msgid "Previous"
-msgstr ""
+msgstr "Prethodno"
diff --git a/addons/base_synchro/__openerp__.py b/addons/base_synchro/__openerp__.py
index bd285821e2b4b07b51eb0928ed4466abedb67b18..3bb46827d689981bfced1f7e6f8049f3eb015c4b 100644
--- a/addons/base_synchro/__openerp__.py
+++ b/addons/base_synchro/__openerp__.py
@@ -22,7 +22,7 @@
{
"name":"Base Synchro",
"version":"0.1",
- "author":"Tiny",
+ "author":"OpenERP SA",
"category":"Generic Modules/Base",
"description": """Synchronization with all objects.""",
"depends":["base"],
diff --git a/addons/base_vat/i18n/sr.po b/addons/base_vat/i18n/sr.po
index 1babdc58986c54bc1ce31a9c423e73e28819805d..98aecb1e7f2cc058fa15523ccc57b526cc729953 100644
--- a/addons/base_vat/i18n/sr.po
+++ b/addons/base_vat/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-21 12:25+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-10-15 08:42+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Serbian <sr@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-09-29 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_vat
@@ -22,18 +22,19 @@ msgstr ""
msgid ""
"Enable the VAT Number for the partner. Check the validity of that VAT Number."
msgstr ""
+"Dozvoli porezni broj partnera. Proveri ispravnost tog poreznog broja."
#. module: base_vat
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nevažeći XML za pregled arhitekture"
#. module: base_vat
#: field:res.partner,vat_subjected:0
msgid "VAT Legal Statement"
-msgstr ""
+msgstr "PDV zakonska izjava"
#. module: base_vat
#: model:ir.module.module,shortdesc:base_vat.module_meta_information
msgid "VAT"
-msgstr ""
+msgstr "PDV"
diff --git a/addons/board/__openerp__.py b/addons/board/__openerp__.py
index 8282e9a5d07de8321ded965c1edd0e8596b7d683..1c44dfe7955e6cde561f58ba38c3f478a2bfbc94 100644
--- a/addons/board/__openerp__.py
+++ b/addons/board/__openerp__.py
@@ -26,7 +26,7 @@
'description': """Base module for all dashboards.""",
'author': 'OpenERP SA',
'depends': ['base'],
- 'update_xml': ['security/board_security.xml','security/ir.model.access.csv', 'wizard/board_menu_create_view.xml', 'board_view.xml'],
+ 'update_xml': ['security/board_security.xml','security/ir.model.access.csv', 'wizard/board_menu_create_view.xml', 'board_view.xml','board_administration_view.xml'],
'demo_xml': [],
'installable': True,
'active': False,
diff --git a/addons/board/board_administration_view.xml b/addons/board/board_administration_view.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7c7c0da57cf9873ce2501be554c03dbc6413bcb6
--- /dev/null
+++ b/addons/board/board_administration_view.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+ <data>
+ <!-- User Connection -->
+ <record model="ir.ui.view" id="view_user_connection_tree">
+ <field name="name">user.connection.tree</field>
+ <field name="model">res.users</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <tree string="Latest Connections">
+ <field name="name"/>
+ <field name="date"/>
+ </tree>
+ </field>
+ </record>
+ <record model="ir.actions.act_window" id="action_user_connection_tree">
+ <field name="name">Latest Connections</field>
+ <field name="res_model">res.users</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form</field>
+ <field name="view_id" ref="view_user_connection_tree"></field>
+ </record>
+
+ <!-- Latest Activities -->
+ <record model="ir.actions.act_window" id="action_latest_activities_tree">
+ <field name="name">Latest Activities</field>
+ <field name="res_model">res.log</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form</field>
+ </record>
+ <record id="board_administration_form" model="ir.ui.view">
+ <field name="name">board.administration.form</field>
+ <field name="model">board.board</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form string="Administration Dashboard">
+ <hpaned position="100">
+ <child1>
+ <action name="%(action_latest_activities_tree)d" string="Latest Activities" sequence="1"/>
+ <action width="510" name="%(action_user_connection_tree)d" string="Latest Connections" />
+ </child1>
+ <child2>
+ </child2>
+ </hpaned>
+ </form>
+ </field>
+ </record>
+ <record id="open_board_administration_form" model="ir.actions.act_window">
+ <field name="name">Administration Dashboard</field>
+ <field name="res_model">board.board</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">form</field>
+ <field name="view_id" ref="board_administration_form"/>
+ </record>
+ <menuitem id="board.admin_menu_dasboard" name="Dashboard" sequence="0" parent="base.menu_reporting"/>
+ <menuitem id="menu_board_admin" action="open_board_administration_form" icon="terp-graph" parent="board.admin_menu_dasboard" />
+
+ </data>
+</openerp>
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/board/i18n/sr.po b/addons/board/i18n/sr.po
index d46cbf9de5c9270b134c81f9357e024367690665..092d4ebd40e7c743bf1ad1f1bca7556a15977643 100644
--- a/addons/board/i18n/sr.po
+++ b/addons/board/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-13 16:46+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-14 07:31+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Serbian <sr@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-10-14 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: board
diff --git a/addons/caldav/__openerp__.py b/addons/caldav/__openerp__.py
index cdb06a17a1fd36db4e52b1e7d6ed55fab9cce573..40088cb0bac80ceffe4b1be1eee35395c9c40b3d 100644
--- a/addons/caldav/__openerp__.py
+++ b/addons/caldav/__openerp__.py
@@ -21,12 +21,12 @@
{
- "name" : "Share Calendar using Caldav",
- "version" : "1.0",
+ "name" : "Share Calendar using CalDAV",
+ "version" : "1.1",
"depends" : [
"base",
"document_webdav",
- ],
+ ],
'description': """
This module Contains basic functionality for caldav system like:
- Webdav server that provides remote access to calendar
@@ -34,7 +34,10 @@
- Customize calendar event and todo attribute with any of OpenERP model
- Provides iCal Import/Export functionality
- To access OpenERP Calendar using caldav to remote site use the URL like:
+ To access Calendars using CalDAV clients, point them to:
+ http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c
+
+ To access OpenERP Calendar using WebCal to remote site use the URL like:
http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics
Where,
@@ -53,7 +56,8 @@
'wizard/calendar_event_export_view.xml',
'wizard/calendar_event_import_view.xml',
'wizard/calendar_event_subscribe_view.xml',
- 'caldav_view.xml'
+ 'caldav_view.xml',
+ 'caldav_setup.xml'
],
"installable" : True,
"active" : False,
diff --git a/addons/caldav/caldav_node.py b/addons/caldav/caldav_node.py
index 11f720bdcabe7cb98fb2b1d413299491daf4cc46..b735d8530252618e960fc00601c91a309f36ca9d 100644
--- a/addons/caldav/caldav_node.py
+++ b/addons/caldav/caldav_node.py
@@ -20,41 +20,86 @@
##############################################################################
import time
-from document import nodes
+from document_webdav import nodes
+from document.nodes import _str2time
+import logging
import StringIO
+from orm_utils import get_last_modified
+
+try:
+ from tools.dict_tools import dict_merge, dict_merge2
+except ImportError:
+ from document.dict_tools import dict_merge, dict_merge2
+
+# TODO: implement DAV-aware errors, inherit from IOError
+
+# Assuming that we have set global properties right, we mark *all*
+# directories as having calendar-access.
+nodes.node_dir.http_options = dict_merge2(nodes.node_dir.http_options,
+ { 'DAV': ['calendar-access',] })
+
+class node_calendar_collection(nodes.node_dir):
+ DAV_PROPS = dict_merge2(nodes.node_dir.DAV_PROPS,
+ { "http://calendarserver.org/ns/" : ('getctag',), } )
+ DAV_M_NS = dict_merge2(nodes.node_dir.DAV_M_NS,
+ { "http://calendarserver.org/ns/" : '_get_dav', } )
+
+ def _file_get(self,cr, nodename=False):
+ return []
-class node_database(nodes.node_database):
def _child_get(self, cr, name=False, parent_id=False, domain=None):
dirobj = self.context._dirobj
uid = self.context.uid
ctx = self.context.context.copy()
ctx.update(self.dctx)
- if not domain:
- domain = []
- domain2 = domain + [('calendar_collection','=', False)]
- res = super(node_database, self)._child_get(cr, name=name, parent_id=parent_id, domain=domain2)
- where = [('parent_id','=',parent_id)]
- domain2 = domain + [('calendar_collection','=', True)]
+ where = [('collection_id','=',self.dir_id)]
+ ext = False
+ if name and name.endswith('.ics'):
+ name = name[:-4]
+ ext = True
if name:
where.append(('name','=',name))
- if domain2:
- where += domain2
-
- where2 = where + [('type', '=', 'directory')]
- ids = dirobj.search(cr, uid, where2, context=ctx)
- for dirr in dirobj.browse(cr,uid,ids,context=ctx):
- res.append(node_calendar_collection(dirr.name,self,self.context,dirr))
+ if not domain:
+ domain = []
+ where = where + domain
+ fil_obj = dirobj.pool.get('basic.calendar')
+ ids = fil_obj.search(cr,uid,where,context=ctx)
+ res = []
+ for cal in fil_obj.browse(cr, uid, ids, context=ctx):
+ if (not name) or not ext:
+ res.append(node_calendar(cal.name, self, self.context, cal))
+ if self.context.get('DAV-client', '') in ('iPhone', 'iCalendar'):
+ # these ones must not see the webcal entry.
+ continue
+ if cal.has_webcal and (not name) or ext:
+ res.append(res_node_calendar(cal.name+'.ics', self, self.context, cal))
+ # May be both of them!
return res
-class node_calendar_collection(nodes.node_dir):
- DAV_PROPS = {
- "http://calendarserver.org/ns/" : ('getctag',),
- }
- DAV_M_NS = {
- "http://calendarserver.org/ns/" : '_get_dav',
- }
+ def _get_ttag(self, cr):
+ return 'calen-dir-%d' % self.dir_id
- http_options = { 'DAV': ['calendar-access'] }
+ def _get_dav_getctag(self, cr):
+ dirobj = self.context._dirobj
+ uid = self.context.uid
+ ctx = self.context.context.copy()
+ ctx.update(self.dctx)
+ where = [('collection_id','=',self.dir_id)]
+ bc_obj = dirobj.pool.get('basic.calendar')
+
+ res = get_last_modified(bc_obj, cr, uid, where, context=ctx)
+ return _str2time(res)
+
+class node_calendar_res_col(nodes.node_res_obj):
+ """ Calendar collection, as a dynamically created node
+
+ This class shall be used instead of node_calendar_collection, when the
+ node is under dynamic ones.
+ """
+ DAV_PROPS = dict_merge2(nodes.node_res_obj.DAV_PROPS,
+ { "http://calendarserver.org/ns/" : ('getctag',), } )
+ DAV_M_NS = dict_merge2(nodes.node_res_obj.DAV_M_NS,
+ { "http://calendarserver.org/ns/" : '_get_dav', } )
def _file_get(self,cr, nodename=False):
return []
@@ -77,48 +122,63 @@ class node_calendar_collection(nodes.node_dir):
fil_obj = dirobj.pool.get('basic.calendar')
ids = fil_obj.search(cr,uid,where,context=ctx)
res = []
+ # TODO: shall we use any of our dynamic information??
for cal in fil_obj.browse(cr, uid, ids, context=ctx):
if (not name) or not ext:
res.append(node_calendar(cal.name, self, self.context, cal))
- if (not name) or ext:
+ if self.context.get('DAV-client', '') in ('iPhone', 'iCalendar'):
+ # these ones must not see the webcal entry.
+ continue
+ if cal.has_webcal and (not name) or ext:
res.append(res_node_calendar(cal.name+'.ics', self, self.context, cal))
# May be both of them!
return res
- def _get_dav_owner(self, cr):
- # Todo?
- return False
-
def _get_ttag(self, cr):
return 'calen-dir-%d' % self.dir_id
def _get_dav_getctag(self, cr):
- result = self.get_etag(cr)
- return str(result)
+ dirobj = self.context._dirobj
+ uid = self.context.uid
+ ctx = self.context.context.copy()
+ ctx.update(self.dctx)
+ where = [('collection_id','=',self.dir_id)]
+ bc_obj = dirobj.pool.get('basic.calendar')
+
+ res = get_last_modified(bc_obj, cr, uid, where, context=ctx)
+ return _str2time(res)
class node_calendar(nodes.node_class):
our_type = 'collection'
DAV_PROPS = {
- "DAV:": ('principal-collection-set'),
- "http://cal.me.com/_namespace/" : ('user-state'),
- "http://calendarserver.org/ns/" : (
- 'dropbox-home-URL',
- 'notification-URL',
- 'getctag',),
+ "DAV:": ('supported-report-set',),
+ # "http://cal.me.com/_namespace/" : ('user-state',),
+ "http://calendarserver.org/ns/" : ( 'getctag',),
'http://groupdav.org/': ('resourcetype',),
"urn:ietf:params:xml:ns:caldav" : (
- 'calendar-description',
+ 'calendar-description',
+ 'supported-calendar-component-set',
+ ),
+ "http://apple.com/ns/ical/": ("calendar-color", "calendar-order"),
+ }
+ DAV_PROPS_HIDDEN = {
+ "urn:ietf:params:xml:ns:caldav" : (
'calendar-data',
- 'calendar-home-set',
- 'calendar-user-address-set',
- 'schedule-inbox-URL',
- 'schedule-outbox-URL',)}
+ 'calendar-timezone',
+ 'supported-calendar-data',
+ 'max-resource-size',
+ 'min-date-time',
+ 'max-date-time',
+ )}
+
DAV_M_NS = {
"DAV:" : '_get_dav',
- "http://cal.me.com/_namespace/": '_get_dav',
+ # "http://cal.me.com/_namespace/": '_get_dav',
'http://groupdav.org/': '_get_gdav',
"http://calendarserver.org/ns/" : '_get_dav',
- "urn:ietf:params:xml:ns:caldav" : '_get_caldav'}
+ "urn:ietf:params:xml:ns:caldav" : '_get_caldav',
+ "http://apple.com/ns/ical/": '_get_apple_cal',
+ }
http_options = { 'DAV': ['calendar-access'] }
@@ -131,42 +191,33 @@ class node_calendar(nodes.node_class):
self.content_length = 0
self.displayname = calendar.name
self.cal_type = calendar.type
+ self.cal_color = calendar.calendar_color or None
+ self.cal_order = calendar.calendar_order or None
+ try:
+ self.uuser = (calendar.user_id and calendar.user_id.login) or 'nobody'
+ except Exception:
+ self.uuser = 'nobody'
def _get_dav_getctag(self, cr):
- result = self._get_ttag(cr) + ':' + str(time.time())
- return str(result)
-
- def _get_dav_dropbox_home_URL(self, cr):
- import urllib
- uid = self.context.uid
- ctx = self.context.context.copy()
- ctx.update(self.dctx)
- calendar_obj = self.context._dirobj.pool.get('basic.calendar')
- calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx)
- res = '%s/%s' %(calendar.collection_id.name, calendar.name)
- url = urllib.quote('/%s/%s' % (cr.dbname, res))
- return url
-
- def _get_dav_notification_URL(self, cr):
- import urllib
+ dirobj = self.context._dirobj
uid = self.context.uid
ctx = self.context.context.copy()
ctx.update(self.dctx)
- calendar_obj = self.context._dirobj.pool.get('basic.calendar')
- calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx)
- res = '%s/%s' %(calendar.collection_id.name, calendar.name)
- url = urllib.quote('/%s/%s' % (cr.dbname, res))
- return url
+
+ bc_obj = dirobj.pool.get('basic.calendar')
+ res = bc_obj.get_cal_max_modified(cr, uid, [self.calendar_id], self, domain=[], context=ctx)
+ return _str2time(res)
def _get_dav_user_state(self, cr):
#TODO
- return True
-
+ return 'online'
def get_dav_resourcetype(self, cr):
res = [ ('collection', 'DAV:'),
- (str(self.cal_type + '-collection'), 'http://groupdav.org/'),
- ('calendar', 'urn:ietf:params:xml:ns:caldav') ]
+ ('calendar', 'urn:ietf:params:xml:ns:caldav'),
+ ]
+ if self.context.get('DAV-client', '') == 'GroupDAV':
+ res.append((str(self.cal_type + '-collection'), 'http://groupdav.org/'))
return res
def get_domain(self, cr, filters):
@@ -174,6 +225,7 @@ class node_calendar(nodes.node_class):
res = []
if not filters:
return res
+ _log = logging.getLogger('caldav.query')
if filters.localName == 'calendar-query':
res = []
for filter_child in filters.childNodes:
@@ -189,26 +241,33 @@ class node_calendar(nodes.node_class):
if vevent_filter.nodeType == vevent_filter.TEXT_NODE:
continue
if vevent_filter.localName == 'comp-filter':
- if vevent_filter.getAttribute('name') == 'VEVENT':
- res = [('type','=','vevent')]
- if vevent_filter.getAttribute('name') == 'VTODO':
- res = [('type','=','vtodo')]
+ if vevent_filter.getAttribute('name'):
+ res = [('type','=',vevent_filter.getAttribute('name').lower() )]
+
+ for cfe in vevent_filter.childNodes:
+ if cfe.localName == 'time-range':
+ if cfe.getAttribute('start'):
+ _log.warning("Ignore start.. ")
+ # No, it won't work in this API
+ #val = cfe.getAttribute('start')
+ #res += [('dtstart','=', cfe)]
+ elif cfe.getAttribute('end'):
+ _log.warning("Ignore end.. ")
+ else:
+ _log.debug("Unknown comp-filter: %s", cfe.localName)
+ else:
+ _log.debug("Unknown comp-filter: %s", vevent_filter.localName)
+ else:
+ _log.debug("Unknown filter element: %s", vcalendar_filter.localName)
+ else:
+ _log.debug("Unknown calendar-query element: %s", filter_child.localName)
return res
elif filters.localName == 'calendar-multiget':
- names = []
- for filter_child in filters.childNodes:
- if filter_child.nodeType == filter_child.TEXT_NODE:
- continue
- if filter_child.localName == 'href':
- if not filter_child.firstChild:
- continue
- uri = filter_child.firstChild.data
- caluri = uri.split('/')
- if len(caluri):
- caluri = caluri[-2]
- if caluri not in names : names.append(caluri)
- res = [('name','in',names)]
- return res
+ # this is not the place to process, as it wouldn't support multi-level
+ # hrefs. So, the code is moved to document_webdav/dav_fs.py
+ pass
+ else:
+ _log.debug("Unknown element in REPORT: %s", filters.localName)
return res
def children(self, cr, domain=None):
@@ -227,26 +286,33 @@ class node_calendar(nodes.node_class):
ctx = self.context.context.copy()
ctx.update(self.dctx)
where = []
+ bc_obj = dirobj.pool.get('basic.calendar')
+
if name:
if name.endswith('.ics'):
name = name[:-4]
try:
- where.append(('id','=',int(name)))
+ if name.isdigit():
+ where.append(('id','=',int(name)))
+ else:
+ bca_obj = dirobj.pool.get('basic.calendar.alias')
+ bc_alias = bca_obj.search(cr, uid,
+ [('cal_line_id.calendar_id', '=', self.calendar_id),
+ ('name', '=', name)] )
+ if not bc_alias:
+ return []
+ bc_val = bca_obj.read(cr, uid, bc_alias, ['res_id',])
+ where.append(('id', '=', bc_val[0]['res_id']))
except ValueError:
# if somebody requests any other name than the ones we
# generate (non-numeric), it just won't exist
- # FIXME: however, this confuses Evolution (at least), which
- # thinks the .ics node hadn't been saved.
return []
if not domain:
domain = []
- fil_obj = dirobj.pool.get('basic.calendar')
- ids = fil_obj.search(cr, uid, domain)
- res = []
- if self.calendar_id in ids:
- res = fil_obj.get_calendar_objects(cr, uid, [self.calendar_id], self, domain=where, context=ctx)
+ # we /could/ be supplying an invalid calendar id to bc_obj, it has to check
+ res = bc_obj.get_calendar_objects(cr, uid, [self.calendar_id], self, domain=where, context=ctx)
return res
def create_child(self, cr, path, data):
@@ -268,7 +334,24 @@ class node_calendar(nodes.node_class):
assert isinstance(res[0], (int, long))
fnodes = fil_obj.get_calendar_objects(cr, uid, [self.calendar_id], self,
domain=[('id','=',res[0])], context=ctx)
+ if self.context.get('DAV-client','') in ('iPhone', 'iCalendar',):
+ # For those buggy clients, register the alias
+ bca_obj = fil_obj.pool.get('basic.calendar.alias')
+ ourcal = fil_obj.browse(cr, uid, self.calendar_id)
+ line_id = None
+ for line in ourcal.line_ids:
+ if line.name == ourcal.type:
+ line_id = line.id
+ break
+ assert line_id, "Calendar #%d must have at least one %s line" % \
+ (ourcal.id, ourcal.type)
+ if path.endswith('.ics'):
+ path = path[:-4]
+ bca_obj.create(cr, uid, { 'cal_line_id': line_id,
+ 'res_id': res[0], 'name': path}, context=ctx)
return fnodes[0]
+ # If we reach this line, it means that we couldn't import any useful
+ # (and matching type vs. our node kind) data from the iCal content.
return None
@@ -287,8 +370,12 @@ class node_calendar(nodes.node_class):
def rmcol(self, cr):
return False
-
def _get_caldav_calendar_data(self, cr):
+ if self.context.get('DAV-client', '') in ('iPhone', 'iCalendar'):
+ # Never return collective data to iClients, they get confused
+ # because they do propfind on the calendar node with Depth=1
+ # and only expect the childrens' data
+ return None
res = []
for child in self.children(cr):
res.append(child._get_caldav_calendar_data(cr))
@@ -299,86 +386,54 @@ class node_calendar(nodes.node_class):
calendar_obj = self.context._dirobj.pool.get('basic.calendar')
ctx = self.context.context.copy()
ctx.update(self.dctx)
- calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx)
- return calendar.description
-
- def _get_dav_principal_collection_set(self, cr):
- import xml
- import urllib
- uid = self.context.uid
- ctx = self.context.context.copy()
- ctx.update(self.dctx)
- calendar_obj = self.context._dirobj.pool.get('basic.calendar')
- calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx)
- res = '%s/%s' %(calendar.collection_id.name, calendar.name)
- doc = xml.dom.minidom.getDOMImplementation().createDocument(None, 'href', None)
- href = doc.documentElement
- href.tagName = 'D:href'
- huri = doc.createTextNode(urllib.quote('/%s/%s' % (cr.dbname, res)))
- href.appendChild(huri)
- return href
-
- def _get_caldav_calendar_home_set(self, cr):
- import xml.dom.minidom
- import urllib
- uid = self.context.uid
- ctx = self.context.context.copy()
- ctx.update(self.dctx)
- doc = xml.dom.minidom.getDOMImplementation().createDocument(None, 'href', None)
-
- calendar_obj = self.context._dirobj.pool.get('basic.calendar')
- calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx)
- huri = doc.createTextNode(urllib.quote('/%s/%s' % (cr.dbname, calendar.collection_id.name)))
- href = doc.documentElement
- href.tagName = 'D:href'
- href.appendChild(huri)
- return href
-
- def _get_caldav_calendar_user_address_set(self, cr):
- import xml.dom.minidom
- uid = self.context.uid
- ctx = self.context.context.copy()
- ctx.update(self.dctx)
- user_obj = self.context._dirobj.pool.get('res.users')
- user = user_obj.browse(cr, uid, uid, context=ctx)
- doc = xml.dom.minidom.getDOMImplementation().createDocument(None, 'href', None)
- href = doc.documentElement
- href.tagName = 'D:href'
- huri = doc.createTextNode('MAILTO:' + str(user.email) or str(user.name))
- href.appendChild(huri)
- return href
-
- def _get_caldav_schedule_outbox_URL(self, cr):
- return self._get_caldav_schedule_inbox_URL(cr)
-
- def _get_caldav_schedule_inbox_URL(self, cr):
- import xml.dom.minidom
- import urllib
- uid = self.context.uid
- ctx = self.context.context.copy()
- ctx.update(self.dctx)
- calendar_obj = self.context._dirobj.pool.get('basic.calendar')
- calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx)
- res = '%s/%s' %(calendar.collection_id.name, calendar.name)
- doc = xml.dom.minidom.getDOMImplementation().createDocument(None, 'href', None)
- href = doc.documentElement
- href.tagName = 'D:href'
- huri = doc.createTextNode(urllib.quote('/%s/%s' % (cr.dbname, res)))
- href.appendChild(huri)
- return href
+ try:
+ calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx)
+ return calendar.description or calendar.name
+ except Exception, e:
+ return None
+
+ def _get_dav_supported_report_set(self, cr):
+
+ return ('supported-report', 'DAV:',
+ ('report','DAV:',
+ ('principal-match','DAV:')
+ )
+ )
+
+ def _get_caldav_supported_calendar_component_set(self, cr):
+ return ('comp', 'urn:ietf:params:xml:ns:caldav', None,
+ {'name': self.cal_type.upper()} )
+
+ def _get_caldav_calendar_timezone(self, cr):
+ return None #TODO
+
+ def _get_caldav_supported_calendar_data(self, cr):
+ return ('calendar-data', 'urn:ietf:params:xml:ns:caldav', None,
+ {'content-type': "text/calendar", 'version': "2.0" } )
+
+ def _get_caldav_max_resource_size(self, cr):
+ return 65535
+
+ def _get_caldav_min_date_time(self, cr):
+ return "19700101T000000Z"
+
+ def _get_caldav_max_date_time(self, cr):
+ return "21001231T235959Z" # I will be dead by then
+
+ def _get_apple_cal_calendar_color(self, cr):
+ return self.cal_color
+ def _get_apple_cal_calendar_order(self, cr):
+ return self.cal_order
class res_node_calendar(nodes.node_class):
our_type = 'file'
DAV_PROPS = {
- "http://calendarserver.org/ns/" : ('getctag'),
+ "http://calendarserver.org/ns/" : ('getctag',),
"urn:ietf:params:xml:ns:caldav" : (
'calendar-description',
'calendar-data',
- 'calendar-home-set',
- 'calendar-user-address-set',
- 'schedule-inbox-URL',
- 'schedule-outbox-URL',)}
+ )}
DAV_M_NS = {
"http://calendarserver.org/ns/" : '_get_dav',
"urn:ietf:params:xml:ns:caldav" : '_get_caldav'}
@@ -393,7 +448,7 @@ class res_node_calendar(nodes.node_class):
self.calendar_id = hasattr(parent, 'calendar_id') and parent.calendar_id or False
if res_obj:
if not self.calendar_id: self.calendar_id = res_obj.id
- pr = res_obj.perm_read()[0]
+ pr = res_obj.perm_read(context=context, details=False)[0]
self.create_date = pr.get('create_date')
self.write_date = pr.get('write_date') or pr.get('create_date')
self.displayname = res_obj.name
@@ -414,6 +469,7 @@ class res_node_calendar(nodes.node_class):
uid = self.context.uid
calendar_obj = self.context._dirobj.pool.get('basic.calendar')
context = self.context.context.copy()
+ context.update(self.dctx)
context.update({'model': self.model, 'res_id':self.res_id})
res = calendar_obj.export_cal(cr, uid, [self.calendar_id], context=context)
return res
@@ -426,8 +482,11 @@ class res_node_calendar(nodes.node_class):
def set_data(self, cr, data, fil_obj = None):
uid = self.context.uid
+ context = self.context.context.copy()
+ context.update(self.dctx)
+ context.update({'model': self.model, 'res_id':self.res_id})
calendar_obj = self.context._dirobj.pool.get('basic.calendar')
- res = calendar_obj.import_cal(cr, uid, data, self.calendar_id)
+ res = calendar_obj.import_cal(cr, uid, data, self.calendar_id, context=context)
return res
def _get_ttag(self,cr):
@@ -438,7 +497,6 @@ class res_node_calendar(nodes.node_class):
res = '%d' % (self.calendar_id)
return res
-
def rm(self, cr):
uid = self.context.uid
res = False
diff --git a/addons/caldav/caldav_setup.xml b/addons/caldav/caldav_setup.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c33edbc75f7545541f943d194ca07b35aec098af
--- /dev/null
+++ b/addons/caldav/caldav_setup.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0"?>
+<openerp>
+ <data>
+ <!-- /calendars tree -->
+ <record id="document_directory_calendars0" model="document.directory">
+ <field name="domain">[]</field>
+ <field eval="1" name="resource_find_all"/>
+ <field eval="0" name="ressource_tree"/>
+ <field name="user_id" ref="base.user_root"/>
+ <field name="company_id" ref="base.main_company"/>
+ <field name="storage_id" ref="document.storage_default"/>
+ <field name="type">directory</field>
+ <field eval="[(6,0,[])]" name="group_ids"/>
+ <field name="name">calendars</field>
+ </record>
+ <record id="document_directory_resources1" model="document.directory">
+ <field name="domain">[]</field>
+ <field eval="1" name="resource_find_all"/>
+ <field eval="0" name="ressource_tree"/>
+ <field name="company_id" ref="base.main_company"/>
+ <field model="document.directory" name="parent_id" ref="document_directory_calendars0"/>
+ <field name="type">directory</field>
+ <field eval="[(6,0,[])]" name="group_ids"/>
+ <field name="name">resources</field>
+ </record>
+ <record id="document_directory_uids0" model="document.directory">
+ <field name="domain">[]</field>
+ <field eval="1" name="resource_find_all"/>
+ <field eval="0" name="ressource_tree"/>
+ <field name="user_id" ref="base.user_root"/>
+ <field name="company_id" ref="base.main_company"/>
+ <field model="document.directory" name="parent_id" ref="document_directory_calendars0"/>
+ <field name="type">ressource</field>
+ <field name="ressource_type_id" ref="base.model_res_users"/>
+ <field eval="[(6,0,[ref('base.group_system')])]" name="group_ids"/>
+ <field name="name">__uids__</field>
+ </record>
+ <record id="document_directory_users0" model="document.directory">
+ <field name="domain">[]</field>
+ <field eval="1" name="resource_find_all"/>
+ <field eval="0" name="ressource_tree"/>
+ <field name="resource_field" ref="base.field_res_users_login"/>
+ <field name="company_id" ref="base.main_company"/>
+ <field model="document.directory" name="parent_id" ref="document_directory_calendars0"/>
+ <field name="storage_id" ref="document.storage_default"/>
+ <field name="type">ressource</field>
+ <field name="ressource_type_id" ref="base.model_res_users"/>
+ <field eval="[(6,0,[])]" name="group_ids"/>
+ <field name="name">users</field>
+ </record>
+ <record id="document_directory_dctx_0" model="document.directory.dctx">
+ <field model="document.directory" name="dir_id" ref="document_directory_users0"/>
+ <field name="field">user_id</field>
+ <field name="expr">res_id</field>
+ </record>
+ <record id="document_directory_c0" model="document.directory">
+ <field name="domain">[]</field>
+ <field eval="1" name="resource_find_all"/>
+ <field name="user_id" ref="base.user_root"/>
+ <field name="company_id" ref="base.main_company"/>
+ <field model="document.directory" name="parent_id" ref="document_directory_users0"/>
+ <field name="storage_id" ref="document.storage_default"/>
+ <field name="type">directory</field>
+ <field eval="[(6,0,[])]" name="group_ids"/>
+ <field name="name">c</field>
+ <field eval="1" name="calendar_collection"/>
+ </record>
+ <record id="document_directory_groups1" model="document.directory">
+ <field name="domain">[]</field>
+ <field eval="1" name="resource_find_all"/>
+ <field eval="0" name="ressource_tree"/>
+ <field name="company_id" ref="base.main_company"/>
+ <field model="document.directory" name="parent_id" ref="document_directory_calendars0"/>
+ <field name="storage_id" ref="document.storage_default"/>
+ <field name="type">directory</field>
+ <field eval="[(6,0,[])]" name="group_ids"/>
+ <field name="name">groups</field>
+ </record>
+ <record id="document_webdav_dir_property_calendarhomeset0" model="document.webdav.dir.property">
+ <field model="document.directory" name="dir_id" ref="document_directory_calendars0"/>
+ <field name="namespace">urn:ietf:params:xml:ns:caldav</field>
+ <!-- no parent, it is a global property -->
+ <field name="name">calendar-home-set</field>
+ <field name="value">('href','DAV:','/%s/%s/calendars/users/%s/c' % ('webdav',dbname,username) )</field>
+ <field eval="1" name="do_subst"/>
+ </record>
+ </data>
+</openerp>
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 2e9719efeadb9380b639cc396079c24db053792b..97656a954adbe90826b50f1b917e24b1f251715b 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -74,6 +74,9 @@
<field name="type"/>
<field name="user_id"/>
<field name="collection_id" required="1"/>
+ <field name="has_webcal" groups="base.group_extended" />
+ <field name="calendar_color" groups="base.group_extended" />
+ <field name="calendar_order" groups="base.group_extended" />
<notebook colspan="4">
<page string="Calendar Lines">
<field name="line_ids" mode="form,tree" colspan="4" nolabel="1">
diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py
index 068af56459f31daa6eddc45024a8e23826f87530..ccc4bf39facdc02e2e8f8bd24f51b69cc41eb396 100644
--- a/addons/caldav/calendar.py
+++ b/addons/caldav/calendar.py
@@ -30,7 +30,10 @@ import pytz
import re
import tools
import time
+import logging
from caldav_node import res_node_calendar
+from orm_utils import get_last_modified
+from tools.safe_eval import safe_eval as eval
try:
import vobject
@@ -63,12 +66,13 @@ def uid2openobjectid(cr, uidval, oomodel, rdate):
return (False, None)
qry = 'SELECT DISTINCT(id) FROM %s' % model_obj._table
if rdate:
- qry += " where recurrent_id='%s'" % (rdate) #TOFIX: sql injection
- cr.execute(qry)
+ qry += " WHERE recurrent_id=%s"
+ cr.execute(qry, (rdate,))
r_id = cr.fetchone()
if r_id:
return (id, r_id[0])
-
+ else:
+ return (False, None)
cr.execute(qry)
ids = map(lambda x: str(x[0]), cr.fetchall())
if id in ids:
@@ -232,6 +236,7 @@ def map_data(cr, uid, obj, context=None):
class CalDAV(object):
__attribute__ = {}
+ _logger = logging.getLogger('document.caldav')
def ical_set(self, name, value, type):
""" set calendar Attribute
@@ -294,6 +299,7 @@ class CalDAV(object):
att_data = []
exdates = []
+ _server_tzinfo = pytz.timezone(tools.get_server_timezone())
for cal_data in child.getChildren():
if cal_data.name.lower() == 'organizer':
@@ -329,8 +335,8 @@ class CalDAV(object):
if cal_data.name.lower() in self.__attribute__:
if cal_data.params.get('X-VOBJ-ORIGINAL-TZID'):
self.ical_set('vtimezone', cal_data.params.get('X-VOBJ-ORIGINAL-TZID'), 'value')
- date_utc = cal_data.value.astimezone(pytz.utc)
- self.ical_set(cal_data.name.lower(), date_utc, 'value')
+ date_local = cal_data.value.astimezone(_server_tzinfo)
+ self.ical_set(cal_data.name.lower(), date_local, 'value')
continue
self.ical_set(cal_data.name.lower(), cal_data.value, 'value')
vals = map_data(cr, uid, self, context=context)
@@ -576,6 +582,13 @@ class Calendar(CalDAV, osv.osv):
'create_date': fields.datetime('Created Date', readonly=True),
'write_date': fields.datetime('Modifided Date', readonly=True),
'description': fields.text("description"),
+ 'calendar_color': fields.char('Color', size=20, help="For supporting clients, the color of the calendar entries"),
+ 'calendar_order': fields.integer('Order', help="For supporting clients, the order of this folder among the calendars"),
+ 'has_webcal': fields.boolean('WebCal', required=True, help="Also export a <name>.ics entry next to the calendar folder, with WebCal content."),
+ }
+
+ _defaults = {
+ 'has_webcal': False,
}
def get_calendar_objects(self, cr, uid, ids, parent=None, domain=None, context=None):
@@ -592,7 +605,7 @@ class Calendar(CalDAV, osv.osv):
continue
if line.name in ('valarm', 'attendee'):
continue
- line_domain = eval(line.domain or '[]')
+ line_domain = eval(line.domain or '[]', context)
line_domain += domain
if ctx_res_id:
line_domain += [('id','=',ctx_res_id)]
@@ -606,6 +619,32 @@ class Calendar(CalDAV, osv.osv):
node = res_node_calendar('%s.ics' %data.id, parent, ctx, data, line.object_id.model, data.id)
res.append(node)
return res
+
+
+ def get_cal_max_modified(self, cr, uid, ids, parent=None, domain=None, context=None):
+ if not context:
+ context = {}
+ if not domain:
+ domain = []
+ res = None
+ ctx_res_id = context.get('res_id', None)
+ ctx_model = context.get('model', None)
+ for cal in self.browse(cr, uid, ids):
+ for line in cal.line_ids:
+ if ctx_model and ctx_model != line.object_id.model:
+ continue
+ if line.name in ('valarm', 'attendee'):
+ continue
+ line_domain = eval(line.domain or '[]', context)
+ line_domain += domain
+ if ctx_res_id:
+ line_domain += [('id','=',ctx_res_id)]
+ mod_obj = self.pool.get(line.object_id.model)
+ max_data = get_last_modified(mod_obj, cr, uid, line_domain, context=context)
+ if res and res > max_data:
+ continue
+ res = max_data
+ return res
def export_cal(self, cr, uid, ids, vobj='vevent', context=None):
""" Export Calendar
@@ -624,7 +663,7 @@ class Calendar(CalDAV, osv.osv):
continue
if line.name in ('valarm', 'attendee'):
continue
- domain = eval(line.domain or '[]')
+ domain = eval(line.domain or '[]', context)
if ctx_res_id:
domain += [('id','=',ctx_res_id)]
mod_obj = self.pool.get(line.object_id.model)
@@ -668,6 +707,15 @@ class Calendar(CalDAV, osv.osv):
val = self.parse_ics(cr, uid, child, cal_children=cal_children, context=context)
vals.append(val)
objs.append(cal_children[child.name.lower()])
+ elif child.name.upper() == 'CALSCALE':
+ if child.value.upper() != 'GREGORIAN':
+ self._logger.warning('How do I handle %s calendars?',child.value)
+ elif child.name.upper() in ('PRODID', 'VERSION'):
+ pass
+ elif child.name.upper().startswith('X-'):
+ self._logger.debug("skipping custom node %s", child.name)
+ else:
+ self._logger.debug("skipping node %s", child.name)
res = []
for obj_name in list(set(objs)):
@@ -728,6 +776,30 @@ line "%s" more than once' % (vals.get('name'))))
basic_calendar_line()
+class basic_calendar_alias(osv.osv):
+ """ Mapping of client filenames to ORM ids of calendar records
+
+ Since some clients insist on putting arbitrary filenames on the .ics data
+ they send us, and they won't respect the redirection "Location:" header,
+ we have to store those filenames and allow clients to call our calendar
+ records with them.
+ Note that adding a column to all tables that would possibly hold calendar-
+ mapped data won't work. The user is always allowed to specify more
+ calendars, on any arbitrary ORM object, without need to alter those tables'
+ data or structure
+ """
+ _name = 'basic.calendar.alias'
+ _columns = {
+ 'name': fields.char('Filename', size=512, required=True, select=1),
+ 'cal_line_id': fields.many2one('basic.calendar.lines', 'Calendar', required=True,
+ select=1, help='The calendar/line this mapping applies to'),
+ 'res_id': fields.integer('Res. ID', required=True, select=1),
+ }
+
+ _sql_constraints = [ ('name_cal_uniq', 'UNIQUE(cal_line_id, name)',
+ _('The same filename cannot apply to two records!')), ]
+
+basic_calendar_alias()
class basic_calendar_attribute(osv.osv):
_name = 'basic.calendar.attributes'
diff --git a/addons/caldav/calendar_collection.py b/addons/caldav/calendar_collection.py
index 8dd4ff053c9820927e7d4717b84d9b1e72d2271a..52fe698647c538fae7a42efba3a358094f94d2ae 100644
--- a/addons/caldav/calendar_collection.py
+++ b/addons/caldav/calendar_collection.py
@@ -18,9 +18,11 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
+
from osv import osv, fields
from tools.translate import _
import caldav_node
+import logging
class calendar_collection(osv.osv):
_inherit = 'document.directory'
@@ -30,7 +32,8 @@ class calendar_collection(osv.osv):
}
_default = {
'calendar_collection' : False,
- }
+ }
+
def _get_root_calendar_directory(self, cr, uid, context=None):
objid = self.pool.get('ir.model.data')
try:
@@ -40,18 +43,25 @@ class calendar_collection(osv.osv):
root_id = objid.read(cr, uid, mid, ['res_id'])['res_id']
root_cal_dir = self.browse(cr,uid, root_id, context=context)
return root_cal_dir.name
- except Exception, e:
- import netsvc
- logger = netsvc.Logger()
- logger.notifyChannel("document", netsvc.LOG_WARNING, 'Cannot set root directory for Calendars:'+ str(e))
+ except Exception:
+ logger = logging.getLogger('document')
+ logger.warning('Cannot set root directory for Calendars:', exc_info=True)
return False
return False
- def _locate_child(self, cr, uid, root_id, uri,nparent, ncontext):
- """ try to locate the node in uri,
- Return a tuple (node_dir, remaining_path)
- """
- return (caldav_node.node_database(context=ncontext), uri)
+ def get_node_class(self, cr, uid, ids, dbro=None, dynamic=False, context=None):
+ if dbro is None:
+ dbro = self.browse(cr, uid, ids, context=context)
+
+ if dbro.calendar_collection:
+ if dynamic:
+ return caldav_node.node_calendar_res_col
+ else:
+ return caldav_node.node_calendar_collection
+ else:
+ return super(calendar_collection, self).\
+ get_node_class(cr, uid, ids, dbro=dbro,dynamic=dynamic,
+ context=context)
def get_description(self, cr, uid, ids, context=None):
#TODO : return description of all calendars
diff --git a/addons/caldav/doc/Path discovery.rst b/addons/caldav/doc/Path discovery.rst
new file mode 100644
index 0000000000000000000000000000000000000000..d2d434b5fb6ac4a89c2d5ac3cdd05c112cba4e74
--- /dev/null
+++ b/addons/caldav/doc/Path discovery.rst
@@ -0,0 +1,43 @@
+===============================
+Discovery of calendar resources
+===============================
+
+1. Srv record
+--------------
+Calendar server and port should be advertised by a DNS _srv record.
+Although this is beyond the capabilities of the OpenERP server, an
+example setup is listed below:
+ -- TODO --
+
+DNS -> http://our-host-ip:port/
+
+2. Well-known uris
+-------------------
+The OpenERP server may have the 'well-known URIs' servlet activated,
+which means that it will advertise its main database and the correct
+location of the main CalDAV resource.
+http://our-host-ip:port/.well-known/caldav -> http://our-host-ip:port/webdav/dbname/calendars/
+
+
+3. Caldav collection
+---------------------
+The CalDAV "collection" is not necessarily a calendar or a folder just
+containing calendars under it. It is a DAV resource (aka folder) which
+has special DAV properties, so that clients are redirected to the right
+urls (like per-user calendars etc.).
+
+http://our-host-ip:port/webdav/dbname/calendars/ -> http://our-host-ip:port/webdav/dbname/calendars/users/user-login/c/
+
+4. Calendar home for user
+--------------------------
+There can be one dynamic folder per user, which will in turn contain the calendars
+
+http://our-host-ip:port/webdav/dbname/calendars/users/user-login/c/ ->
+http://our-host-ip:port/webdav/dbname/calendars/users/user-login/c/[Meetings, Tasks]
+
+5. Calendars
+--------------
+Each calendar will contain the resource nodes:
+ .../c/Meetings/ -> .../c/Meetings/123.ics
+
+Principal url
diff --git a/addons/caldav/doc/iPhone.rst b/addons/caldav/doc/iPhone.rst
new file mode 100644
index 0000000000000000000000000000000000000000..4a3af7724d2a4ef0fa5a571e589b8142453b5303
--- /dev/null
+++ b/addons/caldav/doc/iPhone.rst
@@ -0,0 +1,97 @@
+==========================
+CalDAV with iPhone How-To
+==========================
+
+As from OpenERP v6.0, document_webdav v2.2, the iPhone has been thoroughly
+tested and supported as a Calendaring client for the OpenERP CalDAV module.
+
+However, keep in mind that OpenERP is not a straightforward calendaring
+server, but an ERP application (with more data + structure) which exposes
+that data to calendar clients. That said, the full features that would be
+accessible through the Gtk or Web OpenERP clients cannot be crammed into
+the Calendar clients (such as the iPhone).
+
+OpenERP server Setup
+--------------------
+Some modules need to be installed at the OpenERP server. These are:
+ - caldav: Required, has the reference setup and the necessary
+ underlying code. Will also cause document, document_webdav
+ to be installed.
+ - crm_caldav: Optional, will export the CRM Meetings as a calendar.
+ - project_caldav: Optional, will export project tasks as calendar.
+ - http_well_known: Optional, experimental. Will ease bootstrapping,
+ but only when a DNS srv record is also used.
+
+These will also install a reference setup of the folders, ready to go.
+The administrator of OpenERP can add more calendars and structure, if
+needed.
+
+DNS server setup
+------------------
+To be documented.
+
+SSL setup
+----------
+It is highly advisable that you also setup SSL to work for the OpenERP
+server. HTTPS is a server-wide feature in OpenERP, which means a
+certificate will be set at the openerp-server.conf and will be the same
+for XML-RPC, HTTP, WebDAV and CalDAV.
+The iPhone also supports secure connections with SSL, although it does
+not expect a self-signed certificate (or one that is not verified by
+one of the "big" certificate authorities [1] ).
+
+Phone setup
+-------------
+The iPhone is fairly easy to setup.
+IF you need SSL (and your certificate is not a verified one, as usual),
+then you first will need to let the iPhone trust that. Follow these
+steps:
+ s1. Open Safari and enter the https location of the OpenERP server:
+ https://my.server.ip:8071/
+ (assuming you have the server at "my.server.ip" and the HTTPS port
+ is the default 8071)
+ s2. Safari will try to connect and issue a warning about the certificate
+ used. Inspect the certificate and click "Accept" so that iPhone
+ now trusts it.
+
+Now, to setup the calendars, you need to:
+1. Click on the "Settings" and go to the "Mail, Contacts, Calendars" page.
+2. Go to "Add account..."
+3. Click on "Other"
+4. From the "Calendars" group, select "Add CalDAV Account"
+5. Enter the server's name or IP address at the "Server" entry, the
+ OpenERP username and password at the next ones.
+ As a description, you can either leave the server's name or
+ something like "OpenERP calendars".
+6. You _will_ get the "Unable to verify account" error message. That is
+ because our server is not at the port iPhone expects[2]. But no
+ need to worry, click OK.
+7. At the next page, enter the "Advanced Settings" to specify the right
+ ports and paths
+8. If you have SSL, turn the switch on. Note that port will be changed
+ to 8443.
+9. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.
+10. Set the "Account URL" to the right path of the OpenERP webdav:
+ https://my.server.ip:8071/webdav/dbname/calendars
+ Where "https://my.server.ip:8071" is the protocol, server name
+ and port as discussed above, "dbname" is the name of the database.
+ [Note that the default
+ "https://my.server.ip:8071/principals/users/username" might also
+ be edited to
+ "https://my.server.ip:8071/webdav/dbname/principals/users/username" ]
+11. Click on Done. The phone will hopefully connect to the OpenERP server
+ and verify it can use the account.
+12. Go to the main menu of the iPhone and enter the Calendar application.
+ Your OpenERP calendars will be visible inside the selection of the
+ "Calendars" button.
+ Note that when creating a new calendar entry, you will have to specify
+ which calendar it should be saved at.
+
+
+
+
+[1] I remember one guy that made *lots* of money selling his CA business
+off, and since then uses this money to create a software monopoly.
+[2] This may not happen if the SRV records at DNS and the well-known URIs
+are setup right. But we appreciate that a default OpenERP installation will
+not have the DNS server of the company's domain configured.
diff --git a/addons/caldav/orm_utils.py b/addons/caldav/orm_utils.py
new file mode 100644
index 0000000000000000000000000000000000000000..ab0b4bbb8db2dd93b18fbbbfeb717ec2977bacaf
--- /dev/null
+++ b/addons/caldav/orm_utils.py
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2010 OpenERP SA (www.openerp.com)
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+if True: # we need this indentation level ;)
+
+ def get_last_modified(self, cr, user, args, context=None, access_rights_uid=None):
+ """Return the last modification date of objects in 'domain'
+ This function has similar semantics to orm.search(), apart from the
+ limit, offset and order arguments, which make no sense here.
+ It is useful when we want to find if the table (aka set of records)
+ has any modifications we should update at the client.
+ """
+ if context is None:
+ context = {}
+ self.pool.get('ir.model.access').check(cr, access_rights_uid or user, self._name, 'read', context=context)
+
+ query = self._where_calc(cr, user, args, context=context)
+ self._apply_ir_rules(cr, user, query, 'read', context=context)
+ from_clause, where_clause, where_clause_params = query.get_sql()
+
+ where_str = where_clause and (" WHERE %s" % where_clause) or ''
+
+ cr.execute('SELECT MAX(COALESCE("%s".write_date, "%s".create_date)) FROM ' % (self._table, self._table) +
+ from_clause + where_str ,
+ where_clause_params)
+ res = cr.fetchall()
+ return res[0][0]
+
+#eof
diff --git a/addons/caldav/security/ir.model.access.csv b/addons/caldav/security/ir.model.access.csv
index bb16603b9043df8d398d9f6f84df74aa52112ad1..ce3f3c90e3257767f801c90ea39a62ee20503ae5 100644
--- a/addons/caldav/security/ir.model.access.csv
+++ b/addons/caldav/security/ir.model.access.csv
@@ -3,3 +3,4 @@
"access_basic_calendar_attributes","basic.calendar.attributes","model_basic_calendar_attributes","base.group_user",1,1,1,1
"access_basic_calendar_fields","basic.calendar.fields","model_basic_calendar_fields","base.group_user",1,1,1,1
"access_basic_calendar","basic.calendar","model_basic_calendar","base.group_user",1,1,1,1
+"access_basic_calendar_alias","basic.calendar.alias","model_basic_calendar_alias","base.group_user",1,1,1,1
diff --git a/addons/caldav/wizard/calendar_event_export.py b/addons/caldav/wizard/calendar_event_export.py
index ea90686b347e9eb6af11d4824976674c695f8f22..0a55f8b4fbefcb1d52918a33f63c2f1f4d9c45a5 100644
--- a/addons/caldav/wizard/calendar_event_export.py
+++ b/addons/caldav/wizard/calendar_event_export.py
@@ -37,8 +37,11 @@ class calendar_event_export(osv.osv_memory):
"""
Get Default value for Name field.
"""
- if not context:
+ if context is None:
context = {}
+ else:
+ context= context.copy()
+ context['uid'] = uid
model = context.get('model', 'basic.calendar')
model_obj = self.pool.get(model)
res = super(calendar_event_export, self).default_get( cr, uid, fields, context=context)
diff --git a/addons/caldav/wizard/calendar_event_import.py b/addons/caldav/wizard/calendar_event_import.py
index 875e48d7d4750cfe7eb6771b861933ce62b93e71..11f9f9b4afbb35d7f855667717612cb4505831f3 100644
--- a/addons/caldav/wizard/calendar_event_import.py
+++ b/addons/caldav/wizard/calendar_event_import.py
@@ -42,6 +42,11 @@ class calendar_event_import(osv.osv_memory):
@param ids: List of calendar event import’s IDs
@return: dictionary of calendar evet import window with Import successful msg.
"""
+ if context is None:
+ context = {}
+ else:
+ context = context.copy()
+ context['uid'] = uid
for data in self.read(cr, uid, ids):
model = data.get('model', 'basic.calendar')
diff --git a/addons/caldav/wizard/calendar_event_subscribe.py b/addons/caldav/wizard/calendar_event_subscribe.py
index de673b5d7c0043a7334f568beae211b4a670f541..f8dc7614507dbce6ec0abec85c2ff869dfb68d3b 100644
--- a/addons/caldav/wizard/calendar_event_subscribe.py
+++ b/addons/caldav/wizard/calendar_event_subscribe.py
@@ -44,6 +44,12 @@ class calendar_event_subscribe(osv.osv_memory):
@return: dictionary of calendar evet subscribe window with Import successful msg.
"""
global cnt
+ if context is None:
+ context = {}
+ else:
+ context = context.copy()
+ context['uid'] = uid
+
for data in self.read(cr, uid, ids):
try:
f = urllib.urlopen(data['url_path'])
diff --git a/addons/claim_from_delivery/i18n/sr.po b/addons/claim_from_delivery/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..f183e128f7e12c97253cbb0a5a75d86754d91e5f
--- /dev/null
+++ b/addons/claim_from_delivery/i18n/sr.po
@@ -0,0 +1,60 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 12:02+0000\n"
+"PO-Revision-Date: 2010-10-17 07:56+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-18 04:56+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: claim_from_delivery
+#: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
+msgid "Claim"
+msgstr "Zahtev"
+
+#. module: claim_from_delivery
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: claim_from_delivery
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da poÄinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: claim_from_delivery
+#: model:ir.module.module,description:claim_from_delivery.module_meta_information
+msgid "Create Claim from delivery order:\n"
+msgstr "Kreiraj Zahtev iz Naloga Isporuke\n"
+
+#. module: claim_from_delivery
+#: model:ir.module.module,shortdesc:claim_from_delivery.module_meta_information
+msgid "Claim from delivery"
+msgstr "Zahtev od Isporuke"
+
+#. module: claim_from_delivery
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: claim_from_delivery
+#: model:ir.model,name:claim_from_delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Izborna Lista"
+
+#. module: claim_from_delivery
+#: field:stock.picking,partner_id:0
+msgid "Partner"
+msgstr "Partner"
diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index 72368d1413a1a6b3ac7388a9f9f698888e63d4de..79dadadbcd079764dd3a881eb22d0e84bfc8361b 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -159,6 +159,5 @@
sequence="1"
id="menu_board_crm" icon="terp-graph"
groups="base.group_sale_salesman"/>
- <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman,base.group_sale_manager,base.group_system,base.group_partner_manager" action="open_board_crm"/>
</data>
</openerp>
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index d6194254c659aef9af4a4cab062d9882715eb065..c809857de66ef28fc7cd7e8101a166d4c42fa3d8 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -322,11 +322,7 @@ class crm_case(object):
'active': True})
self._action(cr, uid, cases, 'cancel')
for case in cases:
- message = "The " + self._description + " '" + case.name + "' has been Cancelled."
- #TODO: Need to differentiate lead and opportunity
-# if hasattr(case, 'type'):
-# #TO CHECK: hasattr gives warning for other crm objects that don't have field 'type'
-# message = "The " + (case.type or 'Case').title() + " '" + case.name + "' has been Cancelled."
+ message = _("The case '%s' has been cancelled.") % (case.name,)
self.log(cr, uid, case.id, message)
return True
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 23b1af57b28e724afa91f7c39554a221bff220fe..6a113a42c2ab17da350af0d7cf0d87275a00c418 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -197,10 +197,14 @@ class crm_lead(crm_case, osv.osv):
value.update({'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
self.write(cr, uid, ids, value)
- for (id, name) in self.name_get(cr, uid, ids):
- type = self.browse(cr, uid, id).type or 'Lead'
- message = (_('The ') + type.title()) + " '" + name + "' "+ _("has been Opened.")
- self.log(cr, uid, id, message)
+ for case in self.browse(cr, uid, ids):
+ if case.type == 'lead':
+ message = _("The lead '%s' has been opened.") % case.name
+ elif case.type == 'opportunity':
+ message = _("The opportunity '%s' has been opened.") % case.name
+ else:
+ message = _("The case '%s' has been opened.") % case.name
+ self.log(cr, uid, case.id, message)
return res
def case_close(self, cr, uid, ids, *args):
@@ -213,11 +217,14 @@ class crm_lead(crm_case, osv.osv):
"""
res = super(crm_lead, self).case_close(cr, uid, ids, args)
self.write(cr, uid, ids, {'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')})
- for (id, name) in self.name_get(cr, uid, ids):
- lead = self.browse(cr, uid, id)
- if lead.type == 'lead':
- message = _('The Lead') + " '" + name + "' "+ _("has been Closed.")
- self.log(cr, uid, id, message)
+ for case in self.browse(cr, uid, ids):
+ if case.type == 'lead':
+ message = _("The lead '%s' has been closed.") % case.name
+ elif case.type == 'opportunity':
+ message = _("The opportunity '%s' has been closed.") % case.name
+ else:
+ message = _("The case '%s' has been closed.") % case.name
+ self.log(cr, uid, case.id, message)
return res
def convert_opportunity(self, cr, uid, ids, context=None):
@@ -315,8 +322,6 @@ class crm_lead(crm_case, osv.osv):
vals.update(res)
res = self.create(cr, uid, vals, context)
- message = _('A Lead created') + " '" + subject + "' " + _("from Mailgate.")
- self.log(cr, uid, res, message)
attachents = msg.get('attachments', [])
for attactment in attachents or []:
data_attach = {
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index b26dcc29f41636f5ff9ec4b22e8b292855b81991..a92a36aba33a102a915b148b1ac30f62697bd74b 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -10,7 +10,7 @@
<field name="view_id" ref="crm_case_tree_view_leads"/>
<field name="search_view_id" ref="crm.view_crm_case_leads_filter"/>
<field name="context">{'search_default_current':1, 'default_type': 'lead', 'search_default_section_id': section_id}</field>
- <field name="help">A lead is a first, unqualified, contact with a new prospect. Use leads when you import a database of prospects or integrate your website's contact form with OpenERP. After having been qualified, the lead can be converted to a partner and a business opportunity for a further detailed tracking of the related activities.</field>
+ <field name="help">'Leads' allows you to manage and keep track of all first potential interests of a partner in one of your products or services. A lead is a first, unqualified, contact with a prospect or customer. After being qualified, a lead can be converted into a business opportunity with the creation of the related partner for further detailed tracking of any linked activities. You can use leads when you import a database of prospects or to integrate your website's contact form with OpenERP.</field>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all">
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 99ebcf635929810abb3f9ca5439c00d59bf121e5..fb45e8a7b1b2e7822586a1a168704640767f4bea 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -11,6 +11,7 @@
<field name="view_id" ref="crm.crm_case_stage_tree"/>
<field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
<field name="context">{'object_id':'crm.lead'}</field>
+ <field name="help">Create specific stages that will help your sales better organise their sales pipeline by maintaining them to their leads and sales opportunities. It will allow them to easily track how is positioned a specific lead or opportunity in the sales cycle.</field>
</record>
<menuitem action="crm_lead_stage_act" id="menu_crm_lead_stage_act" name="Stages"
@@ -26,6 +27,7 @@
<field name="view_type">form</field>
<field name="view_id" ref="crm_case_categ_tree-view"/>
<field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
+ <field name="help">Create specific categories that fit your company's activities in order to better classify and analyse them after they have been maintained in your leads and opportunities. You can use categories to reflect your product structure or the different types of sales you do.</field>
</record>
<menuitem action="crm_lead_categ_action"
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 5fc9805304667d2c40b9617780ff72fdfda58bcf..b81819e1171e727b2ca6846f90a837e78790a7bd 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -134,7 +134,7 @@ class crm_meeting(crm_case, osv.osv):
"""
res = super(crm_meeting, self).case_open(cr, uid, ids, args)
for (id, name) in self.name_get(cr, uid, ids):
- message = _('The Meeting') + " '" + name + "' "+ _("has been Confirmed.")
+ message = _("The meeting '%s' has been confirmed.") % name
self.log(cr, uid, id, message)
return res
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 18218bee6ff165ffb48c6792b53f7f83fdbf39da..73880da9523a923ee0a78198a958873310967e03 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -51,7 +51,7 @@
<field name="view_id" ref="crm_case_calendar_view_meet"/>
<field name="context">{"search_default_user_id":uid, 'search_default_section_id': section_id}</field>
<field name="search_view_id" ref="view_crm_case_meetings_filter"/>
- <field name="help">The calendar of meetings is shared between sales teams and fully integrated with the others applications like the employee holidays. You can also synchronize meetings with your mobile phone using the caldav interface.</field>
+ <field name="help">The meeting calendar is shared between the sales teams and fully integrated with other applications such as the employee holidays or the business opportunities. You can also synchronize meetings with your mobile phone using the caldav interface.</field>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet">
@@ -106,12 +106,13 @@
<field name="view_id" ref="base_calendar.base_calendar_attendee_tree_view" />
<field name="domain">[('ref','like','crm.meeting,')]</field>
<field name="context">{"search_default_toreview":1, "search_default_user_id":uid}</field>
+ <field name="help">'Meeting Invitations' allows you to create and manage the meeting invitations sent/to be sent to your colleagues/partners.</field>
</record>
<menuitem id="menu_attendee_invitations"
name="Meeting Invitations" parent="crm.menu_meeting_sale"
sequence="10" action="action_view_attendee_form"
- groups="base.group_extended,base.group_sale_salesman" />
+ groups="base.group_no_one" />
</data>
</openerp>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index dfeadb85bcc350f5cd3a014c76fdde52218170d0..163a2f5878af79214eb93c75bb19fc89561ba9c2 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -11,6 +11,7 @@
<field name="view_id" ref="crm.crm_case_categ_tree-view"/>
<field name="domain">[('object_id.model', '=', 'crm.meeting')]</field>
<field name="context">{'object_id':'crm.meeting'}</field>
+ <field name="help">Create different meeting categories to better organize and classify your meetings.</field>
</record>
<menuitem action="crm_meeting_categ_action"
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 9bc4efda0f88f13be11e4ca6aa7bba4360096210..9bd998d0f46521b0d60f9aa5d786a6992b8acfba 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -70,7 +70,7 @@ class crm_opportunity(osv.osv):
for (id, name) in self.name_get(cr, uid, ids):
opp = self.browse(cr, uid, id)
if opp.type == 'opportunity':
- message = _('The Opportunity') + " '" + name + "' "+ _("has been Won.")
+ message = _("The opportunity '%s' has been won.") % name
self.log(cr, uid, id, message)
return res
@@ -94,7 +94,7 @@ class crm_opportunity(osv.osv):
for (id, name) in self.name_get(cr, uid, ids):
opp = self.browse(cr, uid, id)
if opp.type == 'opportunity':
- message = _('The Opportunity') + " '" + name + "' "+ _("has been Lost.")
+ message = _("The opportunity '%s' has been marked as lost.") % name
self.log(cr, uid, id, message)
return res
diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml
index d2d2a299edb7e9d3e685b4adc2e5372048789e8b..9a065571324d5373ca34978c7a230aee809d5f36 100644
--- a/addons/crm/crm_opportunity_menu.xml
+++ b/addons/crm/crm_opportunity_menu.xml
@@ -31,16 +31,9 @@
<field name="context">{'search_default_user_id':uid,'search_default_current':1, 'search_default_section_id':section_id,'default_type': 'opportunity'}</field>
<field name="view_id" ref="crm_case_tree_view_oppor"/>
<field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
- <field name="help">Opportunities allows you to track your best deals pipeline: history of
-the communication, expected revenues, stage of each opportunity,
-excepted closings, etc. Opportunities are usually connected with the
-email gateway: new emails may create opportunities and each opportunity
-automatically gets the history of the conversation with the customer.
+ <field name="help">Opportunities allows you to manage and keep track of your sales pipeline by creating specific customer or prospect related sales documents in order to follow up potential sales. Information such as the expected revenue, opportunity stage, expected closing date, communication history and so on can be maintained in them. Opportunities can be connected with the email gateway: new emails create opportunities, each of them automatically gets the history of the conversation with the customer.
-Your teams will be able to plan meeting and phonecalls from
-opportunities, to convert opportunities into quotations, to manage
-documents related to the opportunity, to track all activities related to
-this customer, etc.</field>
+You and your team(s) will be able to plan meetings and phone calls from opportunities, convert them into quotations, manage related documents, track all customer related activities, and much more.</field>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor11">
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 5bb55a2320d966c2ad0c8fd8f55f6232f48a5295..644d12cfc77aadf396f2413a0c3362ebf6369c81 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -76,6 +76,9 @@
<button name="case_cancel" string="Cancel"
states="draft" type="object"
icon="gtk-close" />
+ <button name="case_mark_lost" string="Mark Lost"
+ states="open,pending" type="object"
+ icon="gtk-cancel" />
<button name="case_reset" string="Reset to Draft"
states="done,cancel" type="object"
icon="gtk-convert" />
@@ -89,9 +92,6 @@
states="open,pending" type="object"
groups="base.group_extended"
icon="gtk-go-up" />
- <button name="case_mark_lost" string="Mark Lost"
- states="open,pending" type="object"
- icon="gtk-cancel" />
<button name="case_close" string="Mark Won"
states="open,pending" type="object"
icon="gtk-apply" />
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index 5c5a43edbd88221e5cd60669e2b2c61711b0c9f6..d030a4f24f6b9278dee66b32dc3d1b441ea20f52 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -69,7 +69,7 @@
<field name="domain" eval="'[(\'categ_id\',\'=\','+str(ref('categ_phone1'))+')]'"/>
<field name="context" eval="'{\'search_default_section_id\':section_id, \'set_editable\':True,\'default_state\':\'open\', \'search_default_current\':1,\'search_default_today\':1, \'default_categ_id\': ' + str(ref('categ_phone1')) +'}'"/>
<field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
- <field name="help">Trace easily all your Inbound calls. The Inbound menu open a search view in editable mode, so you can easily modify or add a new call record. With the actions buttons convert a lead into an opportunity or plan a meeting.</field>
+ <field name="help">The Inbound Calls tool allows you to log your inbound calls on the fly. Each call you get will appear on the partner form for the traceability of every contact you get with a partner. From the call record, you can trigger a request for another call, a meeting or a business opportunity.</field>
</record>
@@ -107,7 +107,7 @@
<field name="domain" eval="'[(\'categ_id\',\'=\','+str(ref('categ_phone2'))+')]'"/>
<field name="context" eval="'{\'search_default_section_id\':section_id, \'default_state\':\'open\', \'search_default_current\':1, \'default_categ_id\': ' + str(ref('categ_phone2')) +'}'"/>
<field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
- <field name="help">The Outbound menu open a search view in editable mode, so you can easily modify or plan a new call. Actions buttons allows you to to make you call status evolved for a better follow up of your planned calls. During calls, convert your lead into an opportunity, plan a meeting or canceled it.</field>
+ <field name="help">Outbound Calls lists all the calls to be performed by your sales team. They can record the information about the call on the form view. These information will appear on the partner form for the traceability of every contact you get with a customer. You can import a .CSV file with a list of calls to be done for your sales team.</field>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_outgoing0">
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index ca38f587f00876194bea96b50b6eeed0058d8c15..5b796d20b8d685e68f2d65fea5d980ffa91d98f2 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -11,6 +11,7 @@
<field name="view_id" ref="crm.crm_case_categ_tree-view"/>
<field name="domain">[('object_id.model', '=', 'crm.phonecall')]</field>
<field name="context">{'object_id':'crm.phonecall'}</field>
+ <field name="help">Create specific phone call categories to better sort the type of calls tracked in the system.</field>
</record>
<menuitem action="crm_phonecall_categ_action" name="Categories"
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 912736bd912c9e6facc0099aea030c42198be962..fa576bca24fcddb2e991d81054cd92aabcf5242c 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -2,16 +2,17 @@
<openerp>
<data>
- <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_system,base.group_sale_manager,base.group_sale_salesman"/>
+ <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0"
+ groups="base.group_sale_manager,base.group_sale_salesman"/>
<menuitem id="base.menu_crm_config_lead" name="Leads & Opportunities"
- parent="base.menu_base_config" sequence="1" groups="base.group_extended,base.group_system"/>
+ parent="base.menu_base_config" sequence="1" groups="base.group_sale_manager"/>
<menuitem id="base.menu_sale_config_sales" name="Sales"
- parent="base.menu_base_config" sequence="0" groups="base.group_system,base.group_extended"/>
+ parent="base.menu_base_config" sequence="0" groups="base.group_sale_manager"/>
<menuitem id="menu_crm_config_phonecall" name="Phone Call"
- parent="base.menu_base_config" sequence="5" groups="base.group_extended,base.group_system"/>
+ parent="base.menu_base_config" sequence="5" groups="base.group_extended"/>
<menuitem id="base.next_id_64" name="Reporting"
parent="base.menu_base_partner" sequence="11" />
@@ -85,6 +86,7 @@
<field name="res_model">crm.case.section</field>
<field name="view_type">form</field>
<field name="view_id" ref="crm_case_section_view_tree"/>
+ <field name="help">Sales team allows you to organize your different salesmen or departments into separate teams. Each team will work in his own list of opportunities, sales orders, eso. Each user can set a team by default in his preferences. The opportunities and sales order he will see, will be automatically filtered according to his team.</field>
</record>
<menuitem action="crm_case_section_act"
@@ -324,6 +326,7 @@
<field name="res_model">crm.segmentation</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
+ <field name="help">Create specific partner categories that you will then be able to assign to your partners to better manage your interactions with them. The segmentation tool will assign categories to partners based on defined criteria.</field>
</record>
<menuitem action="crm_segmentation_tree-act"
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index da0aa1cffbafd7fc8eb86e9cdf52d1069d59e29c..b711bd68fb5b5ce9b40c807b3f70fd351773d45d 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -202,7 +202,7 @@
<field name="context">{'search_default_filter_lead': 1, 'search_default_lead':1, "search_default_user":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="view_mode">tree,graph</field>
<field name="domain">[('type', '=', 'lead')]</field>
- <field name="help">Leads Analysis allows you to consult different informations relative to CRM. Check for treatments delays, number of responses given and emails send. You can sort out your leads analysis on different groups to get fine grained analysis.</field>
+ <field name="help">Leads Analysis allows you to check different CRM related information. Check for treatment delays, number of responses given and emails sent. You can sort out your leads analysis by different groups to get accurate grained analysis.</field>
</record>
<record model="ir.actions.act_window.view" id="action_report_crm_lead_tree">
@@ -226,7 +226,7 @@
<field name="context">{"search_default_filter_opportunity":1, "search_default_opportunity": 1, "search_default_user":1,"search_default_this_month":1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="view_mode">tree,graph</field>
<field name="domain">[('type', '=', 'opportunity')]</field>
- <field name="help">Opportunities Analysis menu gives you an instant access to your opportunities like expected revenue, planned cost, overpassed deadline or the number of exchanges by opportunity.</field>
+ <field name="help">Opportunities Analysis gives you an instant access to your opportunities with information such as the expected revenue, planned cost, missed deadlines or the number of interactions per opportunity. This report is mainly used by the sales manager in order to do the periodic review with the teams of the sales pipeline.</field>
</record>
<record model="ir.actions.act_window.view" id="action_report_crm_opportunity_tree">
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 9100c75a7ae5d22433fe574904076f4e8aea6b00..69dd06c5ad6443226e195cffe222f976a69ad476 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -159,7 +159,7 @@
<field name="context">{"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="view_id" ref="view_report_crm_phonecall_tree"/>
<field name="search_view_id" ref="view_report_crm_phonecall_filter"/>
- <field name="help">Get an anlysis of Phone Calls number and delay to close, stage, user suits to different groups for a global or a fine grained analysis.</field>
+ <field name="help">From this report, you can analyse the performance of your sales team, based on their phone calls. You can group or filter the information according to several criteria and drill down the information, by adding more groups in the report.</field>
</record>
<record model="ir.actions.act_window.view" id="action_report_crm_phonecall_tree">
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index 5f695b5e5c1c856929db93c7eff67826c64027fb..9abdaed00c5e8be1f99d79f8984123cf796eb378 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -7,7 +7,6 @@
"access_crm_case_categ","crm.case.categ","model_crm_case_categ","base.group_sale_salesman",1,1,1,0
"access_crm_meeting_manager","crm.meeting.manager","model_crm_meeting","base.group_sale_manager",1,1,1,1
"access_crm_lead_manager","crm.lead.manager","model_crm_lead","base.group_sale_manager",1,1,1,1
-"access_crm_phonecall_system","crm.phonecall.system","model_crm_phonecall","base.group_system",1,0,0,0
"access_crm_phonecall_manager","crm.phonecall.manager","model_crm_phonecall","base.group_sale_manager",1,1,1,1
"access_crm_case_categ","crm.case.categ","model_crm_case_categ","base.group_user",1,0,0,0
"access_crm_meeting","crm.meeting","model_crm_meeting","base.group_sale_salesman",1,1,1,0
@@ -18,7 +17,6 @@
"access_crm_phonecall.all","crm.phonecall.all","model_crm_phonecall","base.group_user",1,0,0,0
"access_crm_case_section_user","crm.case.section.user","model_crm_case_section","base.group_sale_salesman",1,1,1,0
"access_crm_case_section_manager","crm.case.section.manager","model_crm_case_section","base.group_sale_manager",1,1,1,1
-"access_crm_case_categ","crm.case.categ","model_crm_case_categ","base.group_system",1,1,1,1
"access_crm_case_stage","crm.case.stage","model_crm_case_stage","base.group_user",1,0,0,0
"access_crm_case_stage_manager","crm.case.stage","model_crm_case_stage","base.group_sale_manager",1,1,1,1
"access_crm_case_resource_type_user","crm_case_resource_type user","model_crm_case_resource_type","base.group_sale_salesman",1,1,1,0
@@ -36,30 +34,11 @@
"access_res_partner","res.partner.crm.user","base.model_res_partner","base.group_sale_salesman",1,1,1,0
"access_res_partner_address","res.partner.address.crm.user","base.model_res_partner_address","base.group_sale_salesman",1,1,1,0
"access_res_partner_category","res.partner.category.crm.user","base.model_res_partner_category","base.group_sale_salesman",1,1,1,0
-"mail_gateway_mailgate_message","mail_gateway.mailgate.message","mail_gateway.model_mailgate_message","base.group_system",1,1,1,1
"mail_gateway_mailgate_thread","mail_gateway.mailgate.thread","mail_gateway.model_mailgate_thread","base.group_sale_salesman",1,1,1,1
"mail_gateway_mailgate_message_user","mail_gateway.mailgate.message.user","mail_gateway.model_mailgate_message","base.group_sale_salesman",1,1,1,1
-"access_base_res_bank_system","base.res.bank system","base.model_res_bank","base.group_system",1,1,1,1
-"access_crm_case_stage_system","crm.case.stage system","model_crm_case_stage","base.group_system",1,1,1,1
"access_crm_case_categ_manager","crm.case.categ manager","model_crm_case_categ","base.group_sale_manager",1,1,1,1
-"access_crm_case_resource_type_system","crm.case.resource.type system","model_crm_case_resource_type","base.group_system",1,1,1,1
-"access_crm_case_section_system","crm.case.section system","model_crm_case_section","base.group_system",1,1,1,1
-"access_crm_lead_report_system","crm.lead.report system","model_crm_lead_report","base.group_system",1,1,1,1
-"access_base_res_country_system","base.res.country system","base.model_res_country","base.group_system",1,1,1,1
-"access_base_res_country_state_system","base.res.country.state system","base.model_res_country_state","base.group_system",1,1,1,1
"access_base_action_rule_manager","base.action.rule manager","model_base_action_rule","base.group_sale_manager",1,1,1,1
-"access_base_action_rule_system","base.action.rule system","model_base_action_rule","base.group_system",1,1,1,1
-"access_crm_segmentation_system","crm.segmentation system","model_crm_segmentation","base.group_system",1,1,1,1
-"access_crm_segmentation_line_system","crm.segmentation.line system","model_crm_segmentation_line","base.group_system",1,1,1,1
-"access_base_calendar_res_alarm_system","base.calendar.res.alarm system","base_calendar.model_res_alarm","base.group_system",1,1,1,1
-"access_res_partner_address_system","res.partner.address system","base.model_res_partner_address","base.group_system",1,0,0,0
"access_crm_lead_report_user","crm.lead.report user","model_crm_lead_report","base.group_sale_salesman",1,1,1,1
-"access_base_res_partner_canal_system","base.res.partner.canal system","base.model_res_partner_canal","base.group_system",1,1,1,1
-"access_res_partner_category_system","res.partner.category system","base.model_res_partner_category","base.group_system",1,1,1,1
-"access_res_partner_title_system","res.partner.title system","base.model_res_partner_title","base.group_system",1,1,1,1
-"access_crm_lead_system","crm.lead.system","model_crm_lead","base.group_system",1,0,0,0
-"access_crm_meeting_system","crm.meeting.system","model_crm_meeting","base.group_system",1,0,0,0
-"access_calendar_attendee_system","calendar.attendee.system","model_calendar_attendee","base.group_system",1,0,0,0
"access_res_partner_bank_type_crm_user","res.partner.bank.type.crm.user","base.model_res_partner_bank_type","base.group_sale_salesman",1,0,0,0
"access_res_partner_bank_type_crm_manager","res.partner.bank.type.crm.manager","base.model_res_partner_bank_type","base.group_sale_manager",1,0,0,0
"access_res_partner_canal_manager","res.partner.canal.manager","base.model_res_partner_canal","base.group_sale_manager",1,1,1,1
diff --git a/addons/crm/wizard/crm_merge_opportunities_view.xml b/addons/crm/wizard/crm_merge_opportunities_view.xml
index cf1a7ee09a4e4c0994e1d16b2e14036b196cd1b7..153267f0ad1ac1ef34ab053a246f1ff2a04eec42 100644
--- a/addons/crm/wizard/crm_merge_opportunities_view.xml
+++ b/addons/crm/wizard/crm_merge_opportunities_view.xml
@@ -35,9 +35,10 @@
</record>
<act_window id="action_merge_opportunities"
+ multi="True"
key2="client_action_multi" name="Merge Opportunities"
res_model="crm.merge.opportunity" src_model="crm.lead"
view_mode="form" target="new" view_type="form" />
</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/crm_caldav/__openerp__.py b/addons/crm_caldav/__openerp__.py
index ce8f72a3e17fa90519e02f9590a8bbfe3eb700b9..d0e04576b3b3eca2d1a965a81cc6ab3c015d416e 100644
--- a/addons/crm_caldav/__openerp__.py
+++ b/addons/crm_caldav/__openerp__.py
@@ -22,24 +22,24 @@
{
'name': 'Extened Module to Add CalDav future on Meeting',
- 'version': '1.0',
+ 'version': '1.1',
'category': 'Generic Modules/CRM & SRM',
'description': """
- New Futures in Meeting:
- * Share meeting with other calendar clients like sunbird
-""",
- 'author': 'OpenERP SA',
- 'website': 'http://www.openerp.com',
- 'depends': ['caldav', 'crm'
- ],
- 'init_xml': [
- 'crm_caldav_data.xml',
- ],
+ New Futures in Meeting:
+ * Share meeting with other calendar clients like sunbird
+""",
+ 'author': 'OpenERP SA',
+ 'website': 'http://www.openerp.com',
+ 'depends': ['caldav', 'crm' ],
+ 'init_xml': [
+ 'crm_caldav_data.xml',
+ 'crm_caldav_setup.xml',
+ ],
'update_xml': [],
- 'demo_xml': [],
- 'installable': True,
- 'active': False,
+ 'demo_xml': [],
+ 'installable': True,
+ 'active': False,
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_caldav/crm_caldav.py b/addons/crm_caldav/crm_caldav.py
index 22f64f4d63d95eb20a5fd229e69d171977bcde41..1a2deae90be4dac0c8d305dcee2c709122918080 100644
--- a/addons/crm_caldav/crm_caldav.py
+++ b/addons/crm_caldav/crm_caldav.py
@@ -77,7 +77,7 @@ class crm_meeting(osv.osv):
try:
for val in vals:
# Compute value of duration
- if 'date_deadline' in val and 'duration' not in val:
+ if val.get('date_deadline', False) and 'duration' not in val:
start = datetime.strptime(val['date'], '%Y-%m-%d %H:%M:%S')
end = datetime.strptime(val['date_deadline'], '%Y-%m-%d %H:%M:%S')
diff = end - start
diff --git a/addons/crm_caldav/crm_caldav_setup.xml b/addons/crm_caldav/crm_caldav_setup.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1a103f618115cc13744390f6d2167256b51e8a73
--- /dev/null
+++ b/addons/crm_caldav/crm_caldav_setup.xml
@@ -0,0 +1,287 @@
+<?xml version="1.0"?>
+<openerp>
+<data noupdate="1">
+
+ <record id="basic_calendar_meetings0" model="basic.calendar">
+ <field eval="1" name="has_webcal"/>
+ <field name="description">Meetings per user</field>
+ <field name="calendar_color">#1E25FF</field>
+ <field model="document.directory" name="collection_id" ref="caldav.document_directory_c0"/>
+ <field name="type">vevent</field>
+ <field name="name">Meetings</field>
+ </record>
+
+ <record id="basic_calendar_lines_attendee0" model="basic.calendar.lines">
+ <field name="calendar_id" ref="basic_calendar_meetings0"/>
+ <field name="domain">[]</field>
+ <field name="name">attendee</field>
+ <field name="object_id" ref="base_calendar.model_calendar_attendee"/>
+ </record>
+
+ <record id="basic_calendar_lines_valarm0" model="basic.calendar.lines">
+ <field name="calendar_id" ref="basic_calendar_meetings0"/>
+ <field name="domain">[]</field>
+ <field name="name">valarm</field>
+ <field name="object_id" ref="base_calendar.model_calendar_alarm"/>
+ </record>
+
+ <record id="basic_calendar_lines_vevent0" model="basic.calendar.lines">
+ <field name="calendar_id" ref="basic_calendar_meetings0"/>
+ <field name="domain">[('user_id','=', dctx_user_id)]</field>
+ <field name="name">vevent</field>
+ <field name="object_id" ref="crm.model_crm_meeting"/>
+ </record>
+
+
+ <record id="basic_calendar_fields_1" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_alarm_attendee"/>
+ <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_alarm_attendee_ids"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_2" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_alarm_trigger_duration"/>
+ <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+ <field name="field_id" ref="base_calendar.field_res_alarm_trigger_duration"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_3" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_alarm_description"/>
+ <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_alarm_description"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_4" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_alarm_attach"/>
+ <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_alarm_attach"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_5" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_alarm_trigger_occurs"/>
+ <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+ <field name="field_id" ref="base_calendar.field_res_alarm_trigger_occurs"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_6" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_alarm_trigger_interval"/>
+ <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+ <field name="field_id" ref="base_calendar.field_res_alarm_trigger_interval"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_7" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_alarm_summary"/>
+ <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_alarm_name"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_8" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_alarm_duration"/>
+ <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+ <field name="field_id" ref="base_calendar.field_res_alarm_duration"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_9" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_alarm_repeat"/>
+ <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+ <field name="field_id" ref="base_calendar.field_res_alarm_repeat"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_10" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_alarm_action"/>
+ <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_alarm_action"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_11" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_alarm_trigger_related"/>
+ <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+ <field name="field_id" ref="base_calendar.field_res_alarm_trigger_related"/>
+ <field name="fn">field</field>
+ </record>
+
+ <record id="basic_calendar_fields_12" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_event_organizer"/>
+ <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+ <field name="field_id" ref="crm.field_crm_meeting_organizer"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_13" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_event_uid"/>
+ <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_event_id"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_14" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_event_recurrence-id"/>
+ <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_event_recurrent_id"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_15" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_event_vtimezone"/>
+ <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_event_vtimezone"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_16" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_event_attendee"/>
+ <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+ <field name="field_id" ref="crm.field_crm_meeting_attendee_ids"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_17" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_event_rrule"/>
+ <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_event_rrule"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_18" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_event_dtend"/>
+ <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_event_date_deadline"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_19" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_event_valarm"/>
+ <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_event_base_calendar_alarm_id"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_20" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_event_location"/>
+ <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_event_location"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_21" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_event_exrule"/>
+ <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_event_exrule"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_22" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_event_status"/>
+ <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+ <field name="field_id" ref="crm.field_crm_meeting_state"/>
+ <field name="mapping">{'tentative': 'draft', 'confirmed': 'open', 'cancelled': 'cancel'}</field>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_23" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_event_exdate"/>
+ <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_event_exdate"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_24" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_event_dtstamp"/>
+ <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_event_date"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_25" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_event_description"/>
+ <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_event_description"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_26" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_event_dtstart"/>
+ <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_event_date"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_27" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_event_class"/>
+ <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_event_class"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_28" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_event_created"/>
+ <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_event_create_date"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_29" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_event_url"/>
+ <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_event_base_calendar_url"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_30" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_event_summary"/>
+ <field name="type_id" ref="basic_calendar_lines_vevent0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_event_name"/>
+ <field name="fn">field</field>
+ </record>
+
+ <record id="basic_calendar_fields_31" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_attendee_cn"/>
+ <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_attendee_cn"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_32" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_attendee_sent-by"/>
+ <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_attendee_sent_by"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_33" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_attendee_language"/>
+ <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_attendee_language"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_34" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_attendee_delegated-from"/>
+ <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_attendee_delegated_from"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_35" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_attendee_member"/>
+ <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_attendee_member"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_36" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_attendee_cutype"/>
+ <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_attendee_cutype"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_37" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_attendee_role"/>
+ <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_attendee_role"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_38" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_attendee_partstat"/>
+ <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_attendee_state"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_39" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_attendee_delegated-to"/>
+ <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_attendee_delegated_to"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_40" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_attendee_dir"/>
+ <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_attendee_dir"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_41" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_attendee_rsvp"/>
+ <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_attendee_rsvp"/>
+ <field name="fn">field</field>
+ </record>
+
+</data>
+</openerp>
diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index c02bc33340d87d87f2b867f9c9729ac9f6593f3f..18642f182822863acc008a83e7d1013fcc703862 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -16,7 +16,7 @@
<field name="view_id" ref="crm_case_claims_tree_view"/>
<field name="context">{'search_default_section_id': section_id, "search_default_current":1,"search_default_user_id":uid}</field>
<field name="search_view_id" ref="crm_claim.view_crm_case_claims_filter"/>
- <field name="help">Record and trace your customers' claims here. A claim is defined by a client name, several types, a status and a priority level. A claim can also be a preventive or repairing action. A claim can be linked to a reference like a sales order, or a lot. You can send emails with attachments and get the history of the claim treatment (emails send, interventions type, etc.). </field>
+ <field name="help">Record and track your customers' claims. Claims can be linked to a sales order or a lot. You can send emails with attachments and get the history of everything that happened on a specific claim (emails sent, interventions type and so on..). Claims can be automatically linked to an email address using the mail gateway module.</field>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_tree_claim0">
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 9839f03bd6d891dfbb52bbf0b1d465c63fbab424..975e8d33becdfc6acdbd231ea3e442c2adde5445 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -3,7 +3,7 @@
<data>
<menuitem id="menu_config_claim" name="Claim"
- groups="base.group_extended,base.group_system"
+ groups="base.group_extended"
parent="base.menu_base_config" sequence="6" />
<!-- Claims categories -->
@@ -15,6 +15,7 @@
<field name="view_id" ref="crm.crm_case_categ_tree-view"/>
<field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
<field name="context">{'object_id':'crm.claim'}</field>
+ <field name="help">Create claim categories to better manage and classify your claims. Some example of claims can be: preventive action, corrective action.</field>
</record>
<menuitem action="crm_claim_categ_action" name="Categories"
@@ -30,6 +31,7 @@
<field name="view_id" ref="crm.crm_case_stage_tree"/>
<field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
<field name="context">{'object_id':'crm.claim'}</field>
+ <field name="help">You can create claim stages to categorize the status of every claim entered in the system. The stages define all the steps required for the resolution of a claim.</field>
</record>
<menuitem action="crm_claim_stage_act" name="Stages"
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 276c8b2b7711efeded8f333f53544036d0b178b9..04be54e205242d501f6354ee783e33ee67a06637 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -196,6 +196,7 @@
<field name="context">{"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="view_id" ref="view_report_crm_claim_tree"/>
<field name="search_view_id" ref="view_report_crm_claim_filter"/>
+ <field name="help">Have a general overview of all claims processed in the system by sorting them with specific criteria.</field>
</record>
<record model="ir.actions.act_window.view" id="action_report_crm_claim_tree">
diff --git a/addons/crm_claim/security/ir.model.access.csv b/addons/crm_claim/security/ir.model.access.csv
index e2563f7541a5c7e04d8187a1af48d77706d6f08b..ac2752f58b22bcd0b8e02f6434b03faab6d6f317 100644
--- a/addons/crm_claim/security/ir.model.access.csv
+++ b/addons/crm_claim/security/ir.model.access.csv
@@ -2,4 +2,3 @@
"access_crm_claim_manager","crm.claim.manager","model_crm_claim","base.group_sale_manager",1,1,1,1
"access_crm_claim_user","crm.claim.user","model_crm_claim","base.group_sale_salesman",1,1,1,0
"access_crm_claim_report_manager","crm.claim.report.manager","model_crm_claim_report","base.group_sale_manager",1,1,1,1
-"access_crm_claim_system","crm.claim.system","model_crm_claim","base.group_system",1,0,0,0
diff --git a/addons/crm_fundraising/crm_fundraising_menu.xml b/addons/crm_fundraising/crm_fundraising_menu.xml
index d521bc91592f8b94a9272aed1f717aba61c62bf7..85fa4ffd70b7b6a1a2dcceb31f1947e816d42a2f 100644
--- a/addons/crm_fundraising/crm_fundraising_menu.xml
+++ b/addons/crm_fundraising/crm_fundraising_menu.xml
@@ -15,7 +15,7 @@
<field name="view_id" ref="crm_fundraising.crm_case_tree_view_fund"/>
<field name="context">{"search_default_user_id":uid,"search_default_current":1, 'search_default_section_id': section_id}</field>
<field name="search_view_id" ref="crm_fundraising.view_crm_case_fund_filter"/>
- <field name="help">When you wish to support your organization or a campaign, trace here all your activities for collecting money. The menu open a search list where you can find funds description, email, history, probability of success. Several actions buttons allows you to easily modify your different fund status.</field>
+ <field name="help">If you need to support your organization or a campaign, with 'Fund Raising' you can track all you fund raising activities. The search list allows you to filter by funds description, email, history and probability of success.</field>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_all1">
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 51650f8b7d5a3a5b1941e8a6a5f81a6c5e83dca3..eea653a4d489c179e675f0d04560868f53784a46 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -15,6 +15,7 @@
<field name="view_id" ref="crm.crm_case_categ_tree-view"/>
<field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
<field name="context">{'object_id':'crm.fundraising'}</field>
+ <field name="help">Manage and define the fund raising categories you want to be maintained in the system.</field>
</record>
<menuitem action="crm_fund_categ_action" name="Categories"
@@ -30,6 +31,7 @@
<field name="view_id" ref="crm.crm_case_stage_tree"/>
<field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
<field name="context">{'object_id':'crm.fundraising'}</field>
+ <field name="help">Create and manage fund raising activity categories you want to be maintained in the system.</field>
</record>
<menuitem action="crm_fundraising_stage_act"
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 957db9ec9c3c7f78b5e521c0e12fe2db355eb3ed..25222a56b2de191dafe2c1b6844ecd158e74de08 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -172,7 +172,7 @@
<field name="context">{"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="view_id" ref="view_report_crm_fundraising_tree"/>
<field name="search_view_id" ref="view_report_crm_fundraising_filter"/>
- <field name="help">With Fund Raising get at a glance a view to your fund raising campaigns with the estimated revenue, average probability and delay to close.</field>
+ <field name="help">Have a general overview of all fund raising activities by sorting them with specific criteria such as the estimated revenue, average success probability and delay to close.</field>
</record>
<record model="ir.actions.act_window.view" id="action_report_crm_fundrising_tree">
diff --git a/addons/crm_fundraising/security/ir.model.access.csv b/addons/crm_fundraising/security/ir.model.access.csv
index 53d593589d4a8c3852881935bf64dba4cea38c5b..703c899c0961f3230ee9d63697b1407578233d2e 100644
--- a/addons/crm_fundraising/security/ir.model.access.csv
+++ b/addons/crm_fundraising/security/ir.model.access.csv
@@ -3,4 +3,3 @@
"access_crm_fundraising_user","crm.fundraising.user","model_crm_fundraising","base.group_sale_salesman",1,1,1,0
"access_crm_fundraising_report_user","crm.fundraising.report.user","model_crm_fundraising_report","base.group_sale_salesman",1,0,0,0
"access_crm_fundraising_report_manager","crm.fundraising.report.manager","model_crm_fundraising_report","base.group_sale_manager",1,1,1,1
-"access_crm_fundraising_system","crm.fundraising.system","model_crm_fundraising","base.group_system",1,0,0,0
diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml
index 7bc6faf4ee07bc668f6ed4cc6c9cec5ca6b88477..80077e9a51eb2d5dfc9dbd9bc491620650ed247a 100644
--- a/addons/crm_helpdesk/crm_helpdesk_menu.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml
@@ -13,7 +13,7 @@
<field name="view_id" ref="crm_case_tree_view_helpdesk"/>
<field name="context">{"search_default_user_id":uid, 'search_default_section_id': section_id}</field>
<field name="search_view_id" ref="view_crm_case_helpdesk_filter"/>
- <field name="help">Alike records and processing of claims, Helpdesk and Support is a good tool to trace your interventions. This menu is more adapted to an oral communication, which is not necessarily related to a claim. Select a customer, add notes and categorize your interventions with a channel and a priority level.</field>
+ <field name="help">'Helpdesk and Support' allows you to track your interventions. Select a customer, add notes and categorize interventions with partners if necessary and assign a priority level. Depending on your need, you may consider using the issues system of OpenERP to manage your support activities.</field>
</record>
<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_act111">
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 9c0fe7ac254d5cdf35cfd8079f8ffe26b61ea8c3..55eaf16ff856ba5dc423021eb6a6ad0cb4caf5ce 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -15,6 +15,7 @@
<field name="view_id" ref="crm.crm_case_categ_tree-view"/>
<field name="domain">[('object_id.model', '=', 'crm.helpdesk')]</field>
<field name="context">{'object_id':'crm.helpdesk'}</field>
+ <field name="help">Create and manage helpdesk categories to better manage and classify your support request.</field>
</record>
<menuitem action="crm_helpdesk_categ_action" name="Categories"
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index cee5d12045b6c4dd76125aab0cc1c839e3b1551a..8dbfe843d9e66d56221a2c8c4eb97f420830c610 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -162,7 +162,7 @@
<field name="context">{"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="view_id" ref="view_report_crm_helpdesk_tree"/>
<field name="search_view_id" ref="view_report_crm_helpdesk_filter"/>
- <field name="help">Helpdesk allows you to consult different informations relative to support demands. Check for treatments delays, number of responses given and emails send and costs. You can sort out your analysis on different groups to get fine grained analysis.</field>
+ <field name="help">Have a general overview of all support requests by sorting them with specific criteria such as the processing time, number of requests answered, emails sent and costs.</field>
</record>
<record model="ir.actions.act_window.view" id="action_report_crm_helpdesk_tree">
diff --git a/addons/crm_helpdesk/security/ir.model.access.csv b/addons/crm_helpdesk/security/ir.model.access.csv
index 79cac379f91b1fdc81a5082b93d22e5f02fd18a9..2a0d87851220f94377eaae066fc17da964d762c0 100644
--- a/addons/crm_helpdesk/security/ir.model.access.csv
+++ b/addons/crm_helpdesk/security/ir.model.access.csv
@@ -2,4 +2,3 @@
"access_crm_helpdesk_manager","crm.helpdesk.manager","model_crm_helpdesk","base.group_sale_manager",1,1,1,1
"access_crm_helpdesk_user","crm.helpdesk.user","model_crm_helpdesk","base.group_sale_salesman",1,1,1,0
"access_report_crm_helpdesk_manager","report.crm.helpdesk.manager","model_crm_helpdesk_report","base.group_sale_manager",1,1,1,1
-"access_crm_helpdesk_system","crm.helpdesk.system","model_crm_helpdesk","base.group_system",1,0,0,0
diff --git a/addons/crm_profiling/crm_profiling_view.xml b/addons/crm_profiling/crm_profiling_view.xml
index e0dbcce05a125e24bf0a6b5d7d5f6fd2d6ecef92..d029240a76831cfc83d632e9494734571e5d0c88 100644
--- a/addons/crm_profiling/crm_profiling_view.xml
+++ b/addons/crm_profiling/crm_profiling_view.xml
@@ -14,6 +14,7 @@
<field name="res_model">crm_profiling.questionnaire</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
+ <field name="help">You can create specific topic related questionnaires that will be used to guide your team(s) in the sales cycle by helping them to ask the right questions. Using the segmentation tool, you will be able to automatically assign a partner to a category based on his answers to the different questionnaires.</field>
</record>
<menuitem parent="base.menu_crm_config_lead" id="menu_segm_questionnaire"
diff --git a/addons/crm_profiling/i18n/sr.po b/addons/crm_profiling/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..3f30558a333bc871bdf55aab7d23767f9db4a6c8
--- /dev/null
+++ b/addons/crm_profiling/i18n/sr.po
@@ -0,0 +1,173 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-16 09:53+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-17 04:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: crm_profiling
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da poÄinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: crm_profiling
+#: field:crm_profiling.answer,question_id:0
+#: field:crm_profiling.question,name:0
+#: model:ir.model,name:crm_profiling.model_crm_profiling_question
+msgid "Question"
+msgstr "Pitanje"
+
+#. module: crm_profiling
+#: wizard_button:open_questionnaire,init,open:0
+msgid "Open Questionnaire"
+msgstr "Otvori Upitnik"
+
+#. module: crm_profiling
+#: field:crm.segmentation,child_ids:0
+msgid "Child Profiles"
+msgstr "Pod Profili"
+
+#. module: crm_profiling
+#: model:ir.module.module,shortdesc:crm_profiling.module_meta_information
+msgid "crm_profiling management"
+msgstr "crm_profiling upravljanje"
+
+#. module: crm_profiling
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: crm_profiling
+#: field:crm_profiling.answer,name:0
+#: model:ir.model,name:crm_profiling.model_crm_profiling_answer
+msgid "Answer"
+msgstr "Odgovor"
+
+#. module: crm_profiling
+#: view:res.partner:0
+msgid "Profiling"
+msgstr "Profiliranje"
+
+#. module: crm_profiling
+#: field:crm_profiling.questionnaire,description:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: crm_profiling
+#: field:crm.segmentation,answer_no:0
+msgid "Excluded Answers"
+msgstr "IskljuÄeni Odgovori"
+
+#. module: crm_profiling
+#: view:crm_profiling.answer:0
+#: view:crm_profiling.question:0
+#: field:res.partner,answers_ids:0
+msgid "Answers"
+msgstr "Odgovori"
+
+#. module: crm_profiling
+#: wizard_field:open_questionnaire,init,questionnaire_name:0
+msgid "Questionnaire name"
+msgstr "Ime Upitnka"
+
+#. module: crm_profiling
+#: view:res.partner:0
+msgid "Use a questionnaire"
+msgstr "Koristi Upitnka"
+
+#. module: crm_profiling
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: crm_profiling
+#: view:crm_profiling.questionnaire:0
+#: model:ir.actions.act_window,name:crm_profiling.open_questionnaires
+#: model:ir.ui.menu,name:crm_profiling.menu_segm_questionnaire
+msgid "Questionnaires"
+msgstr "Upitnici"
+
+#. module: crm_profiling
+#: field:crm_profiling.questionnaire,name:0
+#: model:ir.model,name:crm_profiling.model_crm_profiling_questionnaire
+#: wizard_view:open_questionnaire,init:0
+msgid "Questionnaire"
+msgstr "Upitnik"
+
+#. module: crm_profiling
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
+msgstr "Greška ! Ne možete kreirati rekurzivne profile."
+
+#. module: crm_profiling
+#: field:crm.segmentation,profiling_active:0
+msgid "Use The Profiling Rules"
+msgstr "Koristi Pravila Profiliranja"
+
+#. module: crm_profiling
+#: view:crm_profiling.question:0
+#: field:crm_profiling.question,answers_ids:0
+msgid "Avalaible answers"
+msgstr "Raspoloživi odgovori"
+
+#. module: crm_profiling
+#: field:crm.segmentation,answer_yes:0
+msgid "Included Answers"
+msgstr "UkljuÄeni Odgovori"
+
+#. module: crm_profiling
+#: help:crm.segmentation,profiling_active:0
+msgid ""
+"Check this box if you want to use this tab as part of the segmentation rule. "
+"If not checked, the criteria beneath will be ignored"
+msgstr ""
+"OznaÄite ovde ako želite koristiti ovu karticu (Tab) kao deo pravila "
+"segmentacije. Ako ne oznaÄite, kriterijum koji sledi će biti ignorisan."
+
+#. module: crm_profiling
+#: view:crm_profiling.question:0
+#: field:crm_profiling.questionnaire,questions_ids:0
+#: model:ir.actions.act_window,name:crm_profiling.open_questions
+#: model:ir.ui.menu,name:crm_profiling.menu_segm_answer
+msgid "Questions"
+msgstr "Pitanja"
+
+#. module: crm_profiling
+#: field:crm.segmentation,parent_id:0
+msgid "Parent Profile"
+msgstr "Roditeljski Profil"
+
+#. module: crm_profiling
+#: wizard_button:open_questionnaire,init,end:0
+#: wizard_button:open_questionnaire,open,end:0
+msgid "Cancel"
+msgstr "Otkaži"
+
+#. module: crm_profiling
+#: view:crm.segmentation:0
+msgid "Partner Segmentations"
+msgstr "Segmentacije Partnera"
+
+#. module: crm_profiling
+#: model:ir.actions.wizard,name:crm_profiling.wizard_open_questionnaire
+msgid "Using a questionnaire"
+msgstr "Korištenje Upitnika"
+
+#. module: crm_profiling
+#: wizard_button:open_questionnaire,open,compute:0
+msgid "Save Data"
+msgstr "Sacuvaj Podatke"
diff --git a/addons/crm_profiling/security/ir.model.access.csv b/addons/crm_profiling/security/ir.model.access.csv
index f60a6041c9f8393d514a5c287fb86c3c8e81e758..6ba022b2535e3fc679914ac5b0459e1aa50c9ff3 100644
--- a/addons/crm_profiling/security/ir.model.access.csv
+++ b/addons/crm_profiling/security/ir.model.access.csv
@@ -1,7 +1,4 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_crm_profiling_question","crm_profiling.question","model_crm_profiling_question","base.group_system",1,1,1,1
-"access_crm_profiling_questionnaire_manager","crm_profiling.questionnaire manager","model_crm_profiling_questionnaire","base.group_system",1,1,1,1
-"access_crm_profiling_answer_system","crm_profiling.answer system","model_crm_profiling_answer","base.group_system",1,1,1,1
"access_crm_profiling_answer_user","crm_profiling.answer user","model_crm_profiling_answer","base.group_sale_salesman",1,1,1,0
"access_crm_profiling_answer_manager","crm_profiling.answer manager","model_crm_profiling_answer","base.group_sale_manager",1,0,0,0
"access_crm_profiling_question_manager","crm_profiling.question manager","model_crm_profiling_question","base.group_sale_salesman",1,1,1,0
diff --git a/addons/decimal_precision/i18n/ru.po b/addons/decimal_precision/i18n/ru.po
index 3088918479a9d10dcda751fdc8999a1213ca88e6..f9d9d6a3f5be06c9ec36fcf61052b2dea20fadfa 100644
--- a/addons/decimal_precision/i18n/ru.po
+++ b/addons/decimal_precision/i18n/ru.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-08-20 05:24+0000\n"
-"PO-Revision-Date: 2010-09-30 06:57+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2010-10-16 10:39+0000\n"
+"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
"Language-Team: Russian <ru@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-10-01 08:47+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: decimal_precision
@@ -85,4 +85,4 @@ msgstr "ÐаÑтройка точноÑти"
#. module: decimal_precision
#: model:ir.model,name:decimal_precision.model_decimal_precision
msgid "decimal.precision"
-msgstr ""
+msgstr "ТочноÑÑ‚ÑŒ деÑÑтичных знаков"
diff --git a/addons/decimal_precision/i18n/sr.po b/addons/decimal_precision/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..ceb01a4781cc5cca9586d36d1bb1091cef668cb4
--- /dev/null
+++ b/addons/decimal_precision/i18n/sr.po
@@ -0,0 +1,88 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 05:24+0000\n"
+"PO-Revision-Date: 2010-10-17 07:55+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-18 04:56+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: decimal_precision
+#: field:decimal.precision,digits:0
+msgid "Digits"
+msgstr "Brojevi"
+
+#. module: decimal_precision
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: decimal_precision
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da poÄinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: decimal_precision
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: decimal_precision
+#: view:decimal.precision:0
+msgid "Decimal Precision"
+msgstr "Decimalna Preiznost"
+
+#. module: decimal_precision
+#: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form
+#: model:ir.ui.menu,name:decimal_precision.menu_decimal_precision_form
+msgid "Decimal Accuracy Definitions"
+msgstr "Definicija Decimalne Preciznosti"
+
+#. module: decimal_precision
+#: model:ir.module.module,description:decimal_precision.module_meta_information
+msgid ""
+"\n"
+"This module allows to configure the price accuracy you need for different "
+"kind\n"
+"of usage: accounting, sales, purchases, ...\n"
+"\n"
+"The decimal precision is configured per company.\n"
+msgstr ""
+"\n"
+"Ovaj modul vam omogucava za zaokruzujete cene na potrebne vrednosti za "
+"nekoliko nacina\n"
+"koriscenja: Racunanje, prodaja, nabavka ...\n"
+"\n"
+"Preciznost definisete za celo preduzece.\n"
+
+#. module: decimal_precision
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Greska! Ne mozete kreirati rekursivni meni."
+
+#. module: decimal_precision
+#: field:decimal.precision,name:0
+msgid "Usage"
+msgstr "Koriscenje"
+
+#. module: decimal_precision
+#: model:ir.module.module,shortdesc:decimal_precision.module_meta_information
+msgid "Decimal Precision Configuration"
+msgstr "Podesavanje Decimalne Preciznosti"
+
+#. module: decimal_precision
+#: model:ir.model,name:decimal_precision.model_decimal_precision
+msgid "decimal.precision"
+msgstr "decimal.precision"
diff --git a/addons/decimal_precision/security/ir.model.access.csv b/addons/decimal_precision/security/ir.model.access.csv
index f01ff24e34f912069327a46efebed20abce5a171..d53a5fef14125463dddff8a58a9e5540abc3e6c8 100644
--- a/addons/decimal_precision/security/ir.model.access.csv
+++ b/addons/decimal_precision/security/ir.model.access.csv
@@ -1,2 +1,3 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_decimal_precision","decimal.precision","model_decimal_precision",base.group_system,1,1,1,1
+"access_decimal_precision_config","decimal.precision configuration","model_decimal_precision",base.group_system,1,1,1,1
+"access_decimal_precision_all","decimal.precision","model_decimal_precision",,1,0,0,0
diff --git a/addons/delivery/delivery_data.xml b/addons/delivery/delivery_data.xml
index 97e841ead45cb6b85a92b57a4709e072e871325e..ff0c90ad193cbe76c96ad8298a9a4e438b9c4e95 100644
--- a/addons/delivery/delivery_data.xml
+++ b/addons/delivery/delivery_data.xml
@@ -5,5 +5,54 @@
<field name="name">property_delivery_carrier</field>
<field name="fields_id" search="[('model','=','res.partner'),('name','=','property_delivery_carrier')]"/>
</record>
+
+ <!-- Create a transporter -->
+
+ <record id="delivery_partner" model="res.partner">
+ <field name="name">The Poste</field>
+ </record>
+ <record id="delivery_partner_address" model="res.partner.address">
+ <field name="type">default</field>
+ <field name="partner_id" ref="delivery_partner"/>
+ </record>
+
+ <!-- Create a partner -->
+
+ <record id="delivery_product" model="product.product">
+ <field name="name">Delivery by Poste</field>
+ <field name="type">service</field>
+ <field model="product.category" name="categ_id" search="[]"/>
+ </record>
+
+ <!-- Carrier -->
+
+ <record id="delivery_carrier" model="delivery.carrier">
+ <field name="name">The Poste</field>
+ <field name="partner_id" ref="delivery_partner"/>
+ <field name="product_id" ref="delivery_product"/>
+ </record>
+
+ <!-- Carrier Grids -->
+
+ <record id="delivery_grid" model="delivery.grid">
+ <field name="name">The Poste - Pricelist</field>
+ <field name="carrier_id" ref="delivery_carrier"/>
+ </record>
+ <record id="delivery_grid_line1" model="delivery.grid.line">
+ <field name="name">Weight <= 5kg</field>
+ <field name="grid_id" ref="delivery_grid"/>
+ <field eval="5" name="max_value"/>
+ <field eval="20" name="list_price"/>
+ <field eval="10" name="standard_price"/>
+ </record>
+ <record id="delivery_grid_line2" model="delivery.grid.line">
+ <field name="name">Weight > 5kg</field>
+ <field name="grid_id" ref="delivery_grid"/>
+ <field name="operator">>=</field>
+ <field eval="5" name="max_value"/>
+ <field eval="50" name="list_price"/>
+ <field eval="30" name="standard_price"/>
+ </record>
+
</data>
</openerp>
diff --git a/addons/delivery/delivery_demo.xml b/addons/delivery/delivery_demo.xml
index 2c05d4567a5119d31a346fb4778a28fc1809e528..f247c53ed829808384cd41d6ddc1e412ec345b7a 100644
--- a/addons/delivery/delivery_demo.xml
+++ b/addons/delivery/delivery_demo.xml
@@ -1,64 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="1">
- <!-- Create a transporter -->
-
- <record id="delivery_partner" model="res.partner">
- <field name="name">The Poste</field>
- <field name="website">http://www.openerp.com</field>
- </record>
- <record id="delivery_partner_address" model="res.partner.address">
- <field name="name">Fabien Pinckaers</field>
- <field name="type">default</field>
- <field name="partner_id" ref="delivery_partner"/>
- </record>
-
- <!-- Create a partner -->
-
- <record id="delivery_product" model="product.product">
- <field name="name">Delivery by Poste</field>
- <field name="type">service</field>
- <field model="product.category" name="categ_id" search="[]"/>
- </record>
-
- <!-- Carrier -->
-
- <record id="delivery_carrier" model="delivery.carrier">
- <field name="name">The Poste - Express</field>
- <field name="partner_id" ref="delivery_partner"/>
- <field name="product_id" ref="delivery_product"/>
- </record>
-
- <!-- Carrier Grids -->
-
- <record id="delivery_grid" model="delivery.grid">
- <field name="name">The Poste Express - Pricelist</field>
- <field name="carrier_id" ref="delivery_carrier"/>
- </record>
<record id="delivery_grid_line3" model="delivery.grid.line">
- <field name="name">Franco, price >= 300</field>
- <field name="grid_id" ref="delivery_grid"/>
+ <field name="name">Free if price >= 300</field>
+ <field name="grid_id" ref="delivery.delivery_grid"/>
<field eval="300" name="max_value"/>
<field name="operator">>=</field>
<field name="type">price</field>
<field eval="0" name="list_price"/>
<field eval="20" name="standard_price"/>
</record>
- <record id="delivery_grid_line1" model="delivery.grid.line">
- <field name="name">Weight <= 250</field>
- <field name="grid_id" ref="delivery_grid"/>
- <field eval="250" name="max_value"/>
- <field eval="100" name="list_price"/>
- <field eval="80" name="standard_price"/>
- </record>
- <record id="delivery_grid_line2" model="delivery.grid.line">
- <field name="name">Weight > 250</field>
- <field name="grid_id" ref="delivery_grid"/>
- <field name="operator">>=</field>
- <field eval="250" name="max_value"/>
- <field eval="120" name="list_price"/>
- <field eval="100" name="standard_price"/>
- </record>
-
</data>
</openerp>
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 3d03235d872ae3d71e23bbdfaef68dd33a9f4c32..b7ec0fed61e53989977e7b7cce59b81c9dc65537 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -35,8 +35,9 @@
<field name="res_model">delivery.carrier</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
+ <field name="help">Create and manage the delivery method(s) you want your sales to be processed with. Each delivery method can be assigned to a pricelist which computes the price of the delivery according to the products sold or delivered.</field>
</record>
- <menuitem action="action_delivery_carrier_form" id="menu_action_delivery_carrier_form" parent="menu_delivery" groups="base.group_system"/>
+ <menuitem action="action_delivery_carrier_form" id="menu_action_delivery_carrier_form" parent="menu_delivery" groups="base.group_extended"/>
<!-- Delivery Grids -->
<record id="view_delivery_grid_tree" model="ir.ui.view">
@@ -84,6 +85,7 @@
<field name="res_model">delivery.grid</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
+ <field name="help">The delivery pricelist allows you to compute the cost and sales price of the delivery based on the weight of the products and other criteria. You can define several pricelists for one delivery method, for each region such as countries or a zone in a specific country defined by a zip code range.</field>
</record>
<menuitem action="action_delivery_grid_form" id="menu_action_delivery_grid_form" parent="menu_delivery"/>
@@ -232,10 +234,13 @@
<field name="model">stock.move</field>
<field name="inherit_id" ref="stock.view_move_form"/>
<field name="arch" type="xml">
- <field name="product_uom" position="after">
- <field name="weight"/>
- <field name="weight_net"/>
- </field>
+ <group colspan="2" col="2" position="after">
+ <group colspan="2" col="2" groups="base.group_extended">
+ <separator string="Weights" colspan="2"/>
+ <field name="weight"/>
+ <field name="weight_net"/>
+ </group>
+ </group>
</field>
</record>
@@ -245,10 +250,13 @@
<field name="model">stock.move</field>
<field name="inherit_id" ref="stock.view_move_form_reception_picking"/>
<field name="arch" type="xml">
- <field name="product_uom" position="after">
- <field name="weight"/>
- <field name="weight_net"/>
- </field>
+ <group colspan="2" col="2" position="after">
+ <group colspan="2" col="2" groups="base.group_extended">
+ <separator string="Weights" colspan="2"/>
+ <field name="weight"/>
+ <field name="weight_net"/>
+ </group>
+ </group>
</field>
</record>
diff --git a/addons/delivery/i18n/ru.po b/addons/delivery/i18n/ru.po
index dd7cb8d23a293a0dbf32b942102f7c27b2ed05de..1049fb707fe825a0ea1f4fdb6c4b2945cacde573 100644
--- a/addons/delivery/i18n/ru.po
+++ b/addons/delivery/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 09:53+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2010-10-16 09:49+0000\n"
+"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:38+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@@ -37,7 +37,7 @@ msgstr "Продажи и закупки"
#. module: delivery
#: view:delivery.grid:0
msgid "Destination"
-msgstr "Ðазначение"
+msgstr "МеÑто назначениÑ"
#. module: delivery
#: model:product.template,name:delivery.delivery_product_product_template
@@ -68,6 +68,8 @@ msgstr "ÐедопуÑтимое Ð¸Ð¼Ñ Ð¼Ð¾Ð´ÐµÐ»Ð¸ в определении
#: help:res.partner,property_delivery_carrier:0
msgid "This delivery method will be used when invoicing from packing."
msgstr ""
+"Ðтот метод доÑтавки должен иÑпользоватьÑÑ Ð¿Ñ€Ð¸ фактурировании на оÑновании "
+"данных упаковки."
#. module: delivery
#: model:ir.model,name:delivery.model_delivery_grid
@@ -77,17 +79,17 @@ msgstr "РаÑценки на доÑтавку"
#. module: delivery
#: field:delivery.grid,zip_from:0
msgid "Start Zip"
-msgstr ""
+msgstr "Почтовый Ð¸Ð½Ð´ÐµÐºÑ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÐµÐ»Ñ"
#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
-msgstr ""
+msgstr "ФикÑированный"
#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
-msgstr ""
+msgstr "РазделÑÐµÐ¼Ð°Ñ Ñтрока"
#. module: delivery
#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
@@ -104,7 +106,7 @@ msgstr "Генерировать черновики Ñчетов при полу
#. module: delivery
#: model:ir.model,name:delivery.model_delivery_grid_line
msgid "Delivery line of grid"
-msgstr ""
+msgstr "РазделÑÐµÐ¼Ð°Ñ Ñтрока поÑтавки"
#. module: delivery
#: model:ir.ui.menu,name:delivery.menu_delivery
@@ -114,12 +116,12 @@ msgstr "ДоÑтавка"
#. module: delivery
#: view:delivery.grid.line:0
msgid "Grid Lines"
-msgstr ""
+msgstr "РазделÑемые Ñтроки"
#. module: delivery
#: field:delivery.grid.line,grid_id:0
msgid "Grid"
-msgstr "РаÑценка"
+msgstr "Разделение"
#. module: delivery
#: view:res.partner:0
@@ -135,7 +137,7 @@ msgstr "Ðктивен"
#. module: delivery
#: view:delivery.grid:0
msgid "Grid definition"
-msgstr ""
+msgstr "Определение разделениÑ"
#. module: delivery
#: selection:delivery.grid.line,type:0
@@ -156,12 +158,12 @@ msgstr "УÑлуга или изделие, ÑоответÑтвующее до
#. module: delivery
#: view:delivery.grid.line:0
msgid "Condition"
-msgstr ""
+msgstr "УÑловие"
#. module: delivery
#: model:ir.model,name:delivery.model_delivery_carrier
msgid "Carrier and delivery grids"
-msgstr ""
+msgstr "Разделение поÑтавки и перевозчика"
#. module: delivery
#: field:delivery.grid.line,standard_price:0
@@ -190,6 +192,7 @@ msgstr "Страны"
msgid ""
"Error: The default UOM and the purchase UOM must be in the same category."
msgstr ""
+"Ошибка. ЕИМ по умолчанию и Ð·Ð°ÐºÑƒÐ¿Ð¾Ñ‡Ð½Ð°Ñ Ð•Ð˜Ðœ должны иметь одинаковую категорию."
#. module: delivery
#: view:sale.order:0
@@ -199,18 +202,18 @@ msgstr "ПримечаниÑ"
#. module: delivery
#: field:delivery.grid.line,variable_factor:0
msgid "Variable Factor"
-msgstr ""
+msgstr "Переменный фактор"
#. module: delivery
#: selection:delivery.grid.line,price_type:0
#: field:delivery.grid.line,type:0
msgid "Variable"
-msgstr ""
+msgstr "ПеременнаÑ"
#. module: delivery
#: field:delivery.grid,name:0
msgid "Grid Name"
-msgstr ""
+msgstr "Ð˜Ð¼Ñ Ñ€Ð°Ð·Ð´ÐµÐ»ÐµÐ½Ð¸Ñ"
#. module: delivery
#: view:delivery.carrier:0
@@ -235,7 +238,7 @@ msgstr "МакÑимальное значение"
#. module: delivery
#: wizard_button:delivery.sale.order,init,delivery:0
msgid "Add Delivery Costs"
-msgstr ""
+msgstr "Добавить ÑтоимоÑÑ‚ÑŒ доÑтавки"
#. module: delivery
#: wizard_field:delivery.sale.order,init,carrier_id:0
@@ -248,7 +251,7 @@ msgstr "Метод доÑтавки"
#. module: delivery
#: field:sale.order,id:0
msgid "ID"
-msgstr ""
+msgstr "Идентификатор"
#. module: delivery
#: field:delivery.grid.line,operator:0
@@ -258,12 +261,12 @@ msgstr "Оператор"
#. module: delivery
#: model:ir.module.module,shortdesc:delivery.module_meta_information
msgid "Carriers and deliveries"
-msgstr ""
+msgstr "Перевозчики и поÑтавки"
#. module: delivery
#: field:delivery.carrier,grids_id:0
msgid "Delivery Grids"
-msgstr ""
+msgstr "Разделение поÑтавки"
#. module: delivery
#: selection:delivery.grid.line,type:0
@@ -289,28 +292,33 @@ msgid ""
"define your own carrier and delivery grids for prices. When creating "
"invoices from picking, Open ERP is able to add and compute the shipping line."
msgstr ""
+"ПозволÑет добавить методы доÑтавки в заказы на продажу и упаковку. Ð’Ñ‹ можете "
+"определить Ñвоего ÑобÑтвенного перевозчика и выполнить разделение поÑтавка "
+"Ð´Ð»Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ ÑтоимоÑти. При Ñоздании Ñчета-фактуры на оÑновании упаковки, "
+"Open ERP имеет возможноÑÑ‚ÑŒ добавлÑÑ‚ÑŒ и вычиÑлить Ñтроки доÑтавки."
#. module: delivery
#: field:delivery.grid,zip_to:0
msgid "To Zip"
-msgstr ""
+msgstr "Почтовый Ð¸Ð½Ð´ÐµÐºÑ Ð¿Ð¾Ð»ÑƒÑ‡Ð°Ñ‚ÐµÐ»Ñ"
#. module: delivery
#: model:ir.actions.act_window,name:delivery.action_picking_tree4
#: model:ir.ui.menu,name:delivery.menu_action_picking_tree3
msgid "Packing to be invoiced"
-msgstr ""
+msgstr "Фактурирование по упаковке"
#. module: delivery
#: help:sale.order,carrier_id:0
msgid ""
"Complete this field if you plan to invoice the shipping based on packing."
msgstr ""
+"Заполните Ñто поле, еÑли вы планируете Ñчет доÑтавки оÑнованный на упаковке."
#. module: delivery
#: model:ir.actions.wizard,name:delivery.wizard_deliver_line_add
msgid "Delivery Costs"
-msgstr ""
+msgstr "СтоимоÑÑ‚ÑŒ поÑтавки"
#. module: delivery
#: field:delivery.grid.line,list_price:0
diff --git a/addons/delivery/i18n/sr.po b/addons/delivery/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..86c33eac8ec5330053127a5131c93e874bfce7c8
--- /dev/null
+++ b/addons/delivery/i18n/sr.po
@@ -0,0 +1,362 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-15 09:04+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-16 04:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: delivery
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da poÄinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: delivery
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
+
+#. module: delivery
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "Prodaja & Nabavka"
+
+#. module: delivery
+#: view:delivery.grid:0
+msgid "Destination"
+msgstr "Odredište"
+
+#. module: delivery
+#: model:product.template,name:delivery.delivery_product_product_template
+msgid "Delivery by Poste"
+msgstr "Isporuka Postom"
+
+#. module: delivery
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: delivery
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "GreÅ¡ka ! Ne možete da kreirate rekurivne povezane Älanove."
+
+#. module: delivery
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr "Stanja"
+
+#. module: delivery
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: delivery
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from packing."
+msgstr ""
+"Ovaj će naÄin isporuke biti koriÅ¡ten kada se RaÄun radi kod Pakovanja."
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
+msgstr "Dostavna Mreža"
+
+#. module: delivery
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "Pst.Br Polaska"
+
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "Fiksno"
+
+#. module: delivery
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "Linija Mreze"
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "Cenovnik Dostave"
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_picking_tree5
+#: model:ir.ui.menu,name:delivery.menu_action_picking_tree5
+msgid "Generate Draft Invoices On Receptions"
+msgstr "Generiraj Nacrte RaÄuna pri prijemu"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery line of grid"
+msgstr "Prijemna Linija mreze"
+
+#. module: delivery
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "Dostava"
+
+#. module: delivery
+#: view:delivery.grid.line:0
+msgid "Grid Lines"
+msgstr "Linije Mreže"
+
+#. module: delivery
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "Mreža"
+
+#. module: delivery
+#: view:res.partner:0
+msgid "Deliveries Properties"
+msgstr "Svojstva Dostave"
+
+#. module: delivery
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "Aktivan"
+
+#. module: delivery
+#: view:delivery.grid:0
+msgid "Grid definition"
+msgstr "Definicija mreže"
+
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "Težina * Zapremina"
+
+#. module: delivery
+#: selection:delivery.grid.line,operator:0
+msgid "="
+msgstr "="
+
+#. module: delivery
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "Proizvod za Isporuku"
+
+#. module: delivery
+#: view:delivery.grid.line:0
+msgid "Condition"
+msgstr "Uslov"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_carrier
+msgid "Carrier and delivery grids"
+msgstr "Mreža Prijevoza i Isporuka"
+
+#. module: delivery
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "Cena koštanja"
+
+#. module: delivery
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "Ime"
+
+#. module: delivery
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr ""
+"GreÅ¡ka: JU (jedinice usluga) i JM moraju da budu u razliÄitim kategorijama"
+
+#. module: delivery
+#: field:delivery.grid,country_ids:0
+msgid "Countries"
+msgstr "Zemlje"
+
+#. module: delivery
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+"Greška: Podrazumevana JM i kupljena JM moraju da budu u istoj kategoriji."
+
+#. module: delivery
+#: view:sale.order:0
+msgid "Notes"
+msgstr "Napomene"
+
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "Varijabilni Faktor"
+
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "Promjenljiva"
+
+#. module: delivery
+#: field:delivery.grid,name:0
+msgid "Grid Name"
+msgstr "Naziv Mreže"
+
+#. module: delivery
+#: view:delivery.carrier:0
+#: field:delivery.carrier,name:0
+#: field:delivery.grid,carrier_id:0
+#: field:stock.picking,carrier_id:0
+msgid "Carrier"
+msgstr "Prevoznik"
+
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "Zapremina"
+
+#. module: delivery
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
+msgstr "Maksimalna Vrednost"
+
+#. module: delivery
+#: wizard_button:delivery.sale.order,init,delivery:0
+msgid "Add Delivery Costs"
+msgstr "Dodaj Troškove Dostave"
+
+#. module: delivery
+#: wizard_field:delivery.sale.order,init,carrier_id:0
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+#: field:res.partner,property_delivery_carrier:0
+msgid "Delivery Method"
+msgstr "NaÄini isporuke"
+
+#. module: delivery
+#: field:sale.order,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: delivery
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "Operator"
+
+#. module: delivery
+#: model:ir.module.module,shortdesc:delivery.module_meta_information
+msgid "Carriers and deliveries"
+msgstr "Prijevoznici i Isporuke"
+
+#. module: delivery
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "Dostavne Mreže"
+
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,weight:0
+msgid "Weight"
+msgstr "Težina"
+
+#. module: delivery
+#: field:delivery.grid,sequence:0
+msgid "Sequence"
+msgstr "Sekvenca"
+
+#. module: delivery
+#: field:delivery.carrier,partner_id:0
+msgid "Carrier Partner"
+msgstr "Partner Prijevoznik"
+
+#. module: delivery
+#: model:ir.module.module,description:delivery.module_meta_information
+msgid ""
+"Allows you to add delivery methods in sales orders and packing. You can "
+"define your own carrier and delivery grids for prices. When creating "
+"invoices from picking, Open ERP is able to add and compute the shipping line."
+msgstr ""
+"Omogućuje Vam da dodate naÄine isporuke Prodajnim narudžbama i pakovanjima. "
+"Možete odrediti vlastitog prijevoznika i cenovnike mreže isporuke. Kada se "
+"RaÄuni kreiraju kod preuzimanja, Open ERP može dodati i izraÄunati naÄin i "
+"troškove otpreme."
+
+#. module: delivery
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "Na Pošt. Broj"
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_picking_tree4
+#: model:ir.ui.menu,name:delivery.menu_action_picking_tree3
+msgid "Packing to be invoiced"
+msgstr "Pakovanje za koje treba izdati raÄun"
+
+#. module: delivery
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on packing."
+msgstr ""
+"Popunite ovo polje ako planirate Robu koju saljete fakturirati na bazi "
+"Pakovanja."
+
+#. module: delivery
+#: model:ir.actions.wizard,name:delivery.wizard_deliver_line_add
+msgid "Delivery Costs"
+msgstr "Troškovi Dostave"
+
+#. module: delivery
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "Prodajna Cijena"
+
+#. module: delivery
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Greška: Neispravan EAN kod"
+
+#. module: delivery
+#: view:delivery.grid:0
+msgid "Delivery grids"
+msgstr "Dostavne mreže"
+
+#. module: delivery
+#: wizard_button:delivery.sale.order,init,end:0
+msgid "Cancel"
+msgstr "Otkaži"
+
+#. module: delivery
+#: field:sale.order,carrier_id:0
+msgid "Delivery method"
+msgstr "NaÄin dostave"
+
+#. module: delivery
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
+msgstr "Cena"
+
+#. module: delivery
+#: constraint:res.partner:0
+msgid "The VAT doesn't seem to be correct."
+msgstr "PDV nije ispravan."
+
+#. module: delivery
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "Vrsta Cene"
diff --git a/addons/delivery/report/shipping.rml b/addons/delivery/report/shipping.rml
index a4ed29bc643cc52f5bbb8dfd5df1fa2647fba3cb..8ba9342af9ee128fb417af8877002f2da0d13c32 100644
--- a/addons/delivery/report/shipping.rml
+++ b/addons/delivery/report/shipping.rml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Delivery Order" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Delivery Order.pdf">
+ <template pageSize="(595.0,842.0)" title="Delivery Order" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="30.0" y1="27.0" width="508" height="815"/>
</pageTemplate>
@@ -189,11 +189,8 @@
</td>
</tr>
</blockTable>
- <para style="terp_default_1">
- <font color="white"> </font>
- </para>
<section>
- <para style="terp_default_9">[[repeatIn(o.move_lines,'line')]]</para>
+ <para style="terp_default_1">[[repeatIn(o.move_lines,'line')]]</para>
<blockTable colWidths="370.0,85.0,83.0" style="Table4">
<tr>
<td>
@@ -211,8 +208,5 @@
<font color="white"> </font>
</para>
</section>
- <para style="Standard">
- <font color="white"> </font>
- </para>
</story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/delivery/security/ir.model.access.csv b/addons/delivery/security/ir.model.access.csv
index 409fba3becd0e4ec52d2df8795e24814aab94887..52e60995519b229d19ca0897ae7709f374e35229 100644
--- a/addons/delivery/security/ir.model.access.csv
+++ b/addons/delivery/security/ir.model.access.csv
@@ -6,6 +6,3 @@
"access_delivery_grid_manager","delivery.grid","model_delivery_grid","base.group_sale_manager",1,1,1,1
"access_delivery_grid_line_manager","delivery.grid.line","model_delivery_grid_line","base.group_sale_manager",1,1,1,1
"access_delivery_carrier_partner_manager","delivery.carrier partner_manager","model_delivery_carrier","base.group_partner_manager",1,0,0,0
-"access_delivery_carrier_stock_system","delivery.carrier stock_system","model_delivery_carrier","base.group_system",1,1,1,1
-"access_delivery_grid_system","delivery.grid.system","model_delivery_grid","base.group_system",1,1,1,1
-"access_delivery_grid_line_system","delivery.grid.line.system","model_delivery_grid_line","base.group_system",1,1,1,1
diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py
index 16bbcd41c83e5e078eedd3cc0911b26df060eb06..5741a7223e075df01b6db6a9a9288b2b8fb97d32 100644
--- a/addons/document/__openerp__.py
+++ b/addons/document/__openerp__.py
@@ -22,7 +22,7 @@
{
'name': 'Integrated Document Management System',
- 'version': '1.1',
+ 'version': '2.0',
'category': 'Generic Modules/Others',
'description': """This is a complete document management system:
* User Authentication
diff --git a/addons/document/content_index.py b/addons/document/content_index.py
index e3b37914f8ca56c2e08975696d2f8472f4e410e8..df2b12b5456b5b60660a93d6954f7089ab3dab50 100644
--- a/addons/document/content_index.py
+++ b/addons/document/content_index.py
@@ -21,11 +21,11 @@
import logging
import os
import tempfile
+from subprocess import Popen, PIPE
class NhException(Exception):
pass
-from subprocess import Popen, PIPE
class indexer(object):
""" An indexer knows how to parse the content of some file.
diff --git a/addons/document/dict_tools.py b/addons/document/dict_tools.py
new file mode 100644
index 0000000000000000000000000000000000000000..10d2fdc69f35596202f73411648ef2b7fefd4856
--- /dev/null
+++ b/addons/document/dict_tools.py
@@ -0,0 +1,57 @@
+# -*- encoding: utf-8 -*-
+# Copyright P. Christeas <p_christ@hol.gr> 2008-2010
+# Copyright 2010 OpenERP SA. http://www.openerp.com
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License
+# as published by the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+###############################################################################
+
+
+def dict_merge(*dicts):
+ """ Return a dict with all values of dicts
+ """
+ res = {}
+ for d in dicts:
+ res.update(d)
+ return res
+
+def dict_merge2(*dicts):
+ """ Return a dict with all values of dicts.
+ If some key appears twice and contains iterable objects, the values
+ are merged (instead of overwritten).
+ """
+ res = {}
+ for d in dicts:
+ for k in d.keys():
+ if k in res and isinstance(res[k], (list, tuple)):
+ res[k] = res[k] + d[k]
+ elif k in res and isinstance(res[k], dict):
+ res[k].update(d[k])
+ else:
+ res[k] = d[k]
+ return res
+
+def dict_filter(srcdic, keys, res=None):
+ ''' Return a copy of srcdic that has only keys set.
+ If any of keys are missing from srcdic, the result won't have them,
+ either.
+ @param res If given, result will be updated there, instead of a new dict.
+ '''
+ if res is None:
+ res = {}
+ for k in keys:
+ if k in srcdic:
+ res[k] = srcdic[k]
+ return res
+
+#eof
diff --git a/addons/document/document.py b/addons/document/document.py
index 92a00f3222c6f29967c35e57a67fdc37a3070912..470d67c582ba84875be3f621c4dd0eee525490a6 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -28,6 +28,7 @@ import os
import tools
from tools.translate import _
import nodes
+import logging
DMS_ROOT_PATH = tools.config.get('document_path', os.path.join(tools.config['root_path'], 'filestore'))
@@ -106,7 +107,7 @@ class document_file(osv.osv):
'parent_id': __get_def_directory
}
_sql_constraints = [
- ('filename_uniq', 'unique (name,parent_id,res_id,res_model)', 'The file name must be unique !')
+ # filename_uniq is not possible in pure SQL
]
def _check_duplication(self, cr, uid, vals, ids=[], op='create'):
name = vals.get('name', False)
@@ -259,6 +260,9 @@ class document_file(osv.osv):
r = stor.prepare_unlink(cr, uid, storage_id, f)
if r:
unres.append(r)
+ else:
+ logging.getLogger('document').warning("Unlinking attachment #%s %s that has no storage",
+ f.id, f.name)
res = super(document_file, self).unlink(cr, uid, ids, context)
stor.do_unlink(cr, uid, unres)
return res
diff --git a/addons/document/document_data.xml b/addons/document/document_data.xml
index f13213034e8a350ce64e7c5c341c3c9fe0034826..ef829b6e2582f15adf5700d95c6f3bc004ed57f0 100644
--- a/addons/document/document_data.xml
+++ b/addons/document/document_data.xml
@@ -11,12 +11,12 @@
<record model="document.storage" id="storage_default">
<field name="name">Database storage</field>
<field name="type">db</field>
- <field name="user_id" ref="base.user_admin"/>
+ <field name="user_id" ref="base.user_root"/>
</record>
<record model="document.directory" id="dir_root">
<field name="name">Documents</field>
- <field name="user_id" ref="base.user_admin"/>
+ <field name="user_id" ref="base.user_root"/>
<field name="storage_id" ref="storage_default"/>
<field name="ressource_id">0</field>
</record>
@@ -24,7 +24,7 @@
<record model="document.directory" id="dir_my_folder">
<field name="name">My Folder</field>
<field name="parent_id" ref="dir_root"/>
- <field name="user_id" ref="base.user_admin"/>
+ <field name="user_id" ref="base.user_root"/>
<field name="ressource_id">0</field>
</record>
@@ -37,7 +37,7 @@
<field name="ressource_id">0</field>
<field name="ressource_type_id" search="[('model','=','res.partner.category')]" />
- <field name="user_id" ref="base.user_admin"/>
+ <field name="user_id" ref="base.user_root"/>
</record>
<record model="document.directory" id="dir_partner">
@@ -46,7 +46,7 @@
<field name="domain">[('category_id','in',[active_id])]</field>
<field name="ressource_type_id" search="[('model','=','res.partner')]" />
<field name="ressource_parent_type_id" search="[('model','=','res.partner.category')]" />
- <field name="user_id" ref="base.user_admin"/>
+ <field name="user_id" ref="base.user_root"/>
<field name="ressource_id">0</field>
</record>
@@ -62,7 +62,7 @@
<record model="document.directory" id="dir_product">
<field name="name">Products</field>
- <field name="user_id" ref="base.user_admin"/>
+ <field name="user_id" ref="base.user_root"/>
<field name="parent_id" ref="dir_root"/>
<field name="ressource_id">0</field>
@@ -70,7 +70,7 @@
<record model="document.directory" id="dir_sale_order">
<field name="name">Sales Order</field>
- <field name="user_id" ref="base.user_admin"/>
+ <field name="user_id" ref="base.user_root"/>
<field name="parent_id" ref="dir_root"/>
<field name="ressource_id">0</field>
@@ -78,7 +78,7 @@
<record model="document.directory" id="dir_sale_order_all">
<field name="name">All Sales Order</field>
- <field name="user_id" ref="base.user_admin"/>
+ <field name="user_id" ref="base.user_root"/>
<field name="parent_id" ref="dir_sale_order"/>
<field name="ressource_id">0</field>
@@ -86,7 +86,7 @@
<record model="document.directory" id="dir_sale_order_quote">
<field name="name">Quotations</field>
- <field name="user_id" ref="base.user_admin"/>
+ <field name="user_id" ref="base.user_root"/>
<field name="parent_id" ref="dir_sale_order"/>
<field name="ressource_id">0</field>
@@ -94,7 +94,7 @@
<record model="document.directory" id="dir_project">
<field name="name">Projects</field>
- <field name="user_id" ref="base.user_admin"/>
+ <field name="user_id" ref="base.user_root"/>
<field name="parent_id" ref="dir_root"/>
<field name="ressource_id">0</field>
diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index 47cea1e86bf6879e06522c97a1f0e22f8df2432c..9b7ba18b16fdc0f8f0a55478b6b5285819cf9327 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -125,6 +125,10 @@ class document_directory(osv.osv):
def get_full_path(self, cr, uid, dir_id, context=None):
""" Return the full path to this directory, in a list, root first
"""
+ if isinstance(dir_id, (tuple, list)):
+ assert len(dir_id) == 1
+ dir_id = dir_id[0]
+
def _parent(dir_id, path):
parent=self.browse(cr, uid, dir_id)
if parent.parent_id and not parent.ressource_parent_type_id:
@@ -174,6 +178,39 @@ class document_directory(osv.osv):
return nodes.get_node_context(cr, uid, context).get_uri(cr, uri)
+ def get_node_class(self, cr, uid, ids, dbro=None, dynamic=False, context=None):
+ """Retrieve the class of nodes for this directory
+
+ This function can be overriden by inherited classes ;)
+ @param dbro The browse object, if caller already has it
+ """
+ if dbro is None:
+ dbro = self.browse(cr, uid, ids, context=context)
+
+ if dynamic:
+ assert dbro.type == 'directory'
+ return nodes.node_res_obj
+ elif dbro.type == 'directory':
+ return nodes.node_dir
+ elif dbro.type == 'ressource':
+ return nodes.node_res_dir
+ else:
+ raise ValueError("dir node for %s type", dbro.type)
+
+ def _prepare_context(self, cr, uid, nctx, context):
+ """ Fill nctx with properties for this database
+ @param nctx instance of nodes.node_context, to be filled
+ @param context ORM context (dict) for us
+
+ Note that this function is called *without* a list of ids,
+ it should behave the same for the whole database (based on the
+ ORM instance of document.directory).
+
+ Some databases may override this and attach properties to the
+ node_context. See WebDAV, CalDAV.
+ """
+ return
+
def get_dir_permissions(self, cr, uid, ids ):
"""Check what permission user 'uid' has on directory 'id'
"""
@@ -215,6 +252,7 @@ class document_directory(osv.osv):
name=directory.name
if not parent_id:
parent_id=directory.parent_id and directory.parent_id.id or False
+ # TODO fix algo
if not ressource_parent_type_id:
ressource_parent_type_id=directory.ressource_parent_type_id and directory.ressource_parent_type_id.id or False
if not ressource_id:
@@ -235,8 +273,11 @@ class document_directory(osv.osv):
def create(self, cr, uid, vals, context=None):
if not self._check_duplication(cr, uid, vals):
raise osv.except_osv(_('ValidateError'), _('Directory name must be unique!'))
- if vals.get('name',False) and (vals.get('name').find('/')+1 or vals.get('name').find('@')+1 or vals.get('name').find('$')+1 or vals.get('name').find('#')+1) :
- raise osv.except_osv(_('ValidateError'), _('Directory name contains special characters!'))
+ newname = vals.get('name',False)
+ if newname:
+ for illeg in ('/', '@', '$', '#'):
+ if illeg in newname:
+ raise osv.except_osv(_('ValidateError'), _('Directory name contains special characters!'))
return super(document_directory,self).create(cr, uid, vals, context)
# TODO def unlink(...
@@ -255,7 +296,7 @@ class document_directory_dctx(osv.osv):
_name = 'document.directory.dctx'
_description = 'Directory Dynamic Context'
_columns = {
- 'dir_id': fields.many2one('document.directory', 'Directory', required=True),
+ 'dir_id': fields.many2one('document.directory', 'Directory', required=True, ondelete="cascade"),
'field': fields.char('Field', size=20, required=True, select=1, help="The name of the field. Note that the prefix \"dctx_\" will be prepended to what is typed here."),
'expr': fields.char('Expression', size=64, required=True, help="A python expression used to evaluate the field.\n" + \
"You can use 'dir_id' for current dir, 'res_id', 'res_model' as a reference to the current record, in dynamic folders"),
diff --git a/addons/document/i18n/sr.po b/addons/document/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..51ba09ec5ddf9a1d4da548b460f615c69b7e8219
--- /dev/null
+++ b/addons/document/i18n/sr.po
@@ -0,0 +1,653 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-17 07:58+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-18 04:55+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: document
+#: field:document.directory,create_date:0
+msgid "Date Created"
+msgstr "Datum kreiranja"
+
+#. module: document
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "Å ifra resursa"
+
+#. module: document
+#: field:document.directory.content,include_name:0
+msgid "Include Record Name"
+msgstr "UkljuÄi naziv zapisa"
+
+#. module: document
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da poÄinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: document
+#: field:ir.actions.report.xml,model_id:0
+msgid "Model Id"
+msgstr "ID modela"
+
+#. module: document
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr "Greška! Ne možete kreirati rekurzivne direktorijume."
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_document_configuration
+msgid "Document Configuration"
+msgstr "Podesavanja Dokumenta"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Preview"
+msgstr "Pregled"
+
+#. module: document
+#: field:ir.attachment,store_method:0
+msgid "Storing Method"
+msgstr "Metoda cuvanja"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_config_auto_directory
+msgid "Auto Configure Directory"
+msgstr "Auto Podesavanje Direktorijuma"
+
+#. module: document
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr "VeliÄina Datoteke"
+
+#. module: document
+#: help:document.directory.content,include_name:0
+msgid ""
+"Check this field if you want that the name of the file start by the record "
+"name."
+msgstr ""
+"UkljuÄite ovu opciju ako želite da naziv datoteke poÄinje s nazivom zapisa"
+
+#. module: document
+#: selection:document.directory,type:0
+msgid "Other Resources"
+msgstr "Drugi resursi"
+
+#. module: document
+#: field:document.directory,ressource_parent_type_id:0
+msgid "Parent Model"
+msgstr "Roditeljski Model"
+
+#. module: document
+#: view:document.configuration.wizard:0
+msgid "Document Management System."
+msgstr "Sistem za Upravljanje Dokumentima"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Attachment"
+msgstr "Dodatak"
+
+#. module: document
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: document
+#: selection:document.directory,type:0
+msgid "Static Directory"
+msgstr "StatiÄki Direktorijum"
+
+#. module: document
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Tip sadržaja Direktoriuma"
+
+#. module: document
+#: help:document.directory,domain:0
+msgid ""
+"Use a domain if you want to apply an automatic filter on visible resources."
+msgstr ""
+"Koristite domen ako želite postaviti automatski filter nad vidljivim "
+"resursima"
+
+#. module: document
+#: help:document.directory,ressource_tree:0
+msgid ""
+"Check this if you want to use the same tree structure as the object selected "
+"in the system."
+msgstr ""
+"Odaberite ovu opciju ako želite koristiti istu strukturu stabla kao odabrani "
+"objekat sistema."
+
+#. module: document
+#: field:document.directory,type:0
+msgid "Type"
+msgstr "Tip"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_document_directory_tree
+#: model:ir.ui.menu,name:document.menu_document_directories_tree
+msgid "Directorie's Structure"
+msgstr "Struktura Direktorijuma"
+
+#. module: document
+#: field:document.directory,parent_id:0
+msgid "Parent Item"
+msgstr "Roditeljska Stavka"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "File Information"
+msgstr "Informacije o Fajlu"
+
+#. module: document
+#: field:document.directory,file_ids:0
+#: view:ir.attachment:0
+msgid "Files"
+msgstr "Fajlovi"
+
+#. module: document
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr "Sacuvano IMe Fajla"
+
+#. module: document
+#: field:document.directory,write_uid:0
+#: field:ir.attachment,write_uid:0
+msgid "Last Modification User"
+msgstr "Korisnik poslednje promene"
+
+#. module: document
+#: view:document.configuration.wizard:0
+msgid "Configure"
+msgstr "Podesi"
+
+#. module: document
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Struktura Stabla"
+
+#. module: document
+#: field:ir.attachment,title:0
+msgid "Resource Title"
+msgstr "Naslov resursa"
+
+#. module: document
+#: model:ir.actions.todo,note:document.config_auto_directory
+msgid ""
+"This wizard will configure the URL of the server of the document management "
+"system."
+msgstr ""
+"Ovaj ćecarobnjak podesiti URL server sistema za upravljanje dokumentima."
+
+#. module: document
+#: model:ir.model,name:document.model_document_directory_content
+msgid "Directory Content"
+msgstr "Sadržaj Direktorijuma"
+
+#. module: document
+#: help:document.directory,ressource_parent_type_id:0
+msgid ""
+"If you put an object here, this directory template will appear bellow all of "
+"these objects. Don't put a parent directory if you select a parent model."
+msgstr ""
+"Ako ovdje postavite objekt, predložak ove mape će biti prikazan ispod svih "
+"takvih objekata. Nemojte postaviti mapu roditelja ako odabirete model "
+"roditelja."
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_document
+msgid "Document Management"
+msgstr "Upravljanje Dokumentima"
+
+#. module: document
+#: selection:ir.attachment,store_method:0
+msgid "Link"
+msgstr "Veza"
+
+#. module: document
+#: view:document.directory:0
+msgid "Directory Type"
+msgstr "Tip Direktorijuma"
+
+#. module: document
+#: field:document.directory,group_ids:0
+#: field:ir.attachment,group_ids:0
+msgid "Groups"
+msgstr "Grupe"
+
+#. module: document
+#: field:document.directory.content,report_id:0
+msgid "Report"
+msgstr "Izveštaj"
+
+#. module: document
+#: help:document.configuration.wizard,host:0
+msgid ""
+"Put here the server address or IP. Keep localhost if you don't know what to "
+"write."
+msgstr ""
+"Ovdje upišite adresu servera ili IP adresu. Ostavite localhost ako ne znate "
+"Å¡ta da napisete."
+
+#. module: document
+#: view:document.configuration.wizard:0
+msgid ""
+"This wizard will automatically configure the document management system "
+"according to modules installed on your system."
+msgstr ""
+"Ovaj Carobnjak će automatski postaviti sistem za upravljanje dokumentima "
+"ovisno o modulima koji su instalirani na vašem sistemu."
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Data"
+msgstr "Podaci"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Notes"
+msgstr "Napomene"
+
+#. module: document
+#: view:ir.attachment:0
+#: field:ir.attachment,index_content:0
+msgid "Indexed Content"
+msgstr "Indeksirani sadržaj"
+
+#. module: document
+#: view:document.directory:0
+msgid "Definition"
+msgstr "Definicija"
+
+#. module: document
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: document
+#: model:ir.module.module,description:document.module_meta_information
+msgid ""
+"This is a complete document management system:\n"
+" * FTP Interface\n"
+" * User Authentication\n"
+" * Document Indexation\n"
+msgstr ""
+"Ovo je kompletni sistem za upravljanje dokumentima:\n"
+"* FTP interfejs\n"
+"* Autentifikacija korisnika\n"
+"* Indeksiranje dokumenata\n"
+
+#. module: document
+#: field:document.directory,name:0
+msgid "Name"
+msgstr "Ime"
+
+#. module: document
+#: field:document.directory.content.type,code:0
+msgid "Extension"
+msgstr "Ekstenzija"
+
+#. module: document
+#: selection:ir.attachment,store_method:0
+msgid "Database"
+msgstr "Baza Podataka"
+
+#. module: document
+#: field:document.directory,content_ids:0
+msgid "Virtual Files"
+msgstr "Virtualne datoteke"
+
+#. module: document
+#: view:document.directory:0
+#: model:ir.ui.menu,name:document.menu_document_directories
+msgid "Directories"
+msgstr "Direktorijumi"
+
+#. module: document
+#: view:document.directory:0
+msgid "Seq."
+msgstr "Sekv."
+
+#. module: document
+#: model:ir.module.module,shortdesc:document.module_meta_information
+msgid "Integrated Document Management System"
+msgstr "Integrisani sistem za upravljanje dokumentima"
+
+#. module: document
+#: field:document.directory.content,directory_id:0
+#: field:ir.attachment,parent_id:0
+msgid "Directory"
+msgstr "Direktorijum"
+
+#. module: document
+#: field:document.directory,user_id:0
+#: field:ir.attachment,user_id:0
+msgid "Owner"
+msgstr "Vlasnik"
+
+#. module: document
+#: model:ir.model,name:document.model_document_configuration_wizard
+msgid "document.configuration.wizard"
+msgstr "document.configuration.wizard"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Attached To"
+msgstr "Pridruženo"
+
+#. module: document
+#: selection:ir.attachment,store_method:0
+msgid "Filesystem"
+msgstr "Fajl sistem"
+
+#. module: document
+#: field:document.directory,file_type:0
+#: field:document.directory.content.type,name:0
+#: field:ir.attachment,file_type:0
+msgid "Content Type"
+msgstr "Tip Sadrzaja"
+
+#. module: document
+#: view:document.directory:0
+#: view:ir.attachment:0
+msgid "Security"
+msgstr "Bezbednost"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_document_browse
+msgid "Browse Files Using FTP"
+msgstr "Pregledaj datoteke koristeći FTP"
+
+#. module: document
+#: field:document.directory,ressource_type_id:0
+msgid "Directories Mapped to Objects"
+msgstr "Direktorijumi vezani uz objekte"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "History"
+msgstr "Istorija"
+
+#. module: document
+#: help:document.directory,ressource_type_id:0
+msgid ""
+"Select an object here and Open ERP will create a mapping for each of these "
+"objects, using the given domain, when browsing through FTP."
+msgstr ""
+"Ovdje odaberite objekt i Open ERP će uspostaviti mapiranje za svaki od ovih "
+"objekata, koristeći zadani domen, prilikom predleda kroz FTP."
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Others Info"
+msgstr "Ostale informacije"
+
+#. module: document
+#: field:document.directory,domain:0
+msgid "Domain"
+msgstr "Domen"
+
+#. module: document
+#: field:document.directory,write_date:0
+#: field:ir.attachment,write_date:0
+msgid "Date Modified"
+msgstr "Datum Izmene"
+
+#. module: document
+#: field:document.directory.content,suffix:0
+msgid "Suffix"
+msgstr "Sufiks"
+
+#. module: document
+#: field:document.configuration.wizard,host:0
+msgid "Server Address"
+msgstr "Adresa Servera"
+
+#. module: document
+#: model:ir.actions.url,name:document.action_document_browse
+msgid "Browse Files"
+msgstr "Pretraži Fajlove"
+
+#. module: document
+#: field:document.directory.content,name:0
+msgid "Content Name"
+msgstr "Naziv sadržaja"
+
+#. module: document
+#: model:ir.model,name:document.model_document_directory
+#: field:process.node,directory_id:0
+msgid "Document directory"
+msgstr "Direktorijum dokumenta"
+
+#. module: document
+#: field:document.directory,create_uid:0
+msgid "Creator"
+msgstr "Kreator"
+
+#. module: document
+#: view:document.directory:0
+msgid "Auto-Generated Files"
+msgstr "Auto-Generisani Fajlovi"
+
+#. module: document
+#: field:document.directory.content,sequence:0
+msgid "Sequence"
+msgstr "Sekvenca"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_document_files
+msgid "Search a File"
+msgstr ""
+
+#. module: document
+#: view:document.configuration.wizard:0
+msgid "Auto Configure"
+msgstr "Auto Podesavanje"
+
+#. module: document
+#: view:document.configuration.wizard:0
+msgid "Cancel"
+msgstr "Откажи"
+
+#. module: document
+#: field:ir.attachment,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: document
+#: view:document.directory:0
+msgid "PDF Report"
+msgstr "PDF izveštaj"
+
+#. module: document
+#: field:document.directory.content,extension:0
+msgid "Document Type"
+msgstr "Tip Dokumenta"
+
+#. module: document
+#: field:document.directory,child_ids:0
+msgid "Children"
+msgstr "Podređeni"
+
+#. module: document
+#: view:document.directory:0
+msgid "Contents"
+msgstr "Sadržaj"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Month"
+msgstr "Falova za Mesec"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr "Zid Srama"
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr "Detalji Fajlova po Partneru"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
+msgid "All Months"
+msgstr "Svi meseci"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
+msgid "My files"
+msgstr "Moji Fajlovi"
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr "Fajlovi po Korisniku"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr "Fajlova za Mesec"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
+msgid "My files (All months)"
+msgstr "Moji Fajlovi (svi Meseci)"
+
+#. module: document
+#: field:report.document.wall,file_name:0
+msgid "Last Posted File Name"
+msgstr "Zadnje postavljeno Ime Fajla"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+msgid "Reporting"
+msgstr "Izveštavanje"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr "Korisnici koji jedan celi mjesec nisu unijeli Dokument"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr "Fajlovi po Partneru"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+msgid "This Month"
+msgstr "Ovog meseca"
+
+#. module: document
+#: field:report.document.user,user:0 field:report.document.wall,user:0
+msgid "User"
+msgstr "Korisnik"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
+#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
+msgid "All Users files"
+msgstr "Svi Korisnikovi fajlovi"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_my_document_tree
+msgid "My files (This months)"
+msgstr "Moji Fajlovi(Ovaj Mesec)"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr "Detalji fajlova po Korisnicima"
+
+#. module: document
+#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr "# Fajlova"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr "Fajlovi po Korisnicima"
+
+#. module: document
+#: model:ir.module.module,shortdesc:report_document.module_meta_information
+msgid "Document Management - Reporting"
+msgstr "Upravljanje Dokumentima - Izveštavanje"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files (All months)"
+msgstr "Fajlovi svih Korisnika (Svi meseci)"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr "Detalji Fajlova po Direktorijumu"
+
+#. module: document
+#: field:report.document.user,change_date:0
+#: field:report.files.partner,change_date:0
+msgid "Modified Date"
+msgstr "Izmjenjen Datum"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr "VeliÄina fajlova po Mesecu"
+
+#. module: document
+#: field:report.document.user,file_title:0
+#: field:report.files.partner,file_title:0
+msgid "File Name"
+msgstr "Ime fajla"
+
+#. module: document
+#: field:report.document.file,month:0 field:report.document.user,month:0
+#: field:report.document.user,name:0 field:report.document.wall,month:0
+#: field:report.document.wall,name:0 field:report.files.partner,name:0
+msgid "Month"
+msgstr "Mesec"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr "Fajlovi po Mesecu"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr "Fajlovi po Tipu Izvora"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree
+msgid "All Users files (This month)"
+msgstr "Svi Korisnicki Fajlovi ( Ovaj Mesec)"
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr "Zadnje postavljeno Vrijeme"
diff --git a/addons/document/nodes.py b/addons/document/nodes.py
index b849396498dbb5adc58944f44bf28baa8a27743d..68220885dff934d843d314b69c407d2cbd9c0641 100644
--- a/addons/document/nodes.py
+++ b/addons/document/nodes.py
@@ -61,16 +61,27 @@ def get_node_context(cr, uid, context):
return node_context(cr, uid, context)
class node_context(object):
- """ This is the root node, representing access to some particular
- context """
+ """ This is the root node, representing access to some particular context
+
+ A context is a set of persistent data, which may influence the structure
+ of the nodes. All other transient information during a data query should
+ be passed down with function arguments.
+ """
cached_roots = {}
+ node_file_class = None
def __init__(self, cr, uid, context=None):
self.dbname = cr.dbname
self.uid = uid
self.context = context
+ if context is None:
+ context = {}
+ context['uid'] = uid
self._dirobj = pooler.get_pool(cr.dbname).get('document.directory')
+ self.node_file_class = node_file
+ self.extra_ctx = {} # Extra keys for context, that do _not_ trigger inequality
assert self._dirobj
+ self._dirobj._prepare_context(cr, uid, self, context=context)
self.rootdir = False #self._dirobj._get_root_directory(cr,uid,context)
def __eq__(self, other):
@@ -88,10 +99,14 @@ class node_context(object):
def __ne__(self, other):
return not self.__eq__(other)
+
+ def get(self, name, default=None):
+ return self.context.get(name, default)
def get_uri(self, cr, uri):
""" Although this fn passes back to doc.dir, it is needed since
- it is a potential caching point """
+ it is a potential caching point.
+ """
(ndir, duri) = self._dirobj._locate_child(cr, self.uid, self.rootdir, uri, None, self)
while duri:
ndir = ndir.child(cr, duri[0])
@@ -104,14 +119,10 @@ class node_context(object):
"""Create (or locate) a node for a directory
@param dbro a browse object of document.directory
"""
- fullpath = self._dirobj.get_full_path(cr, self.uid, dbro.id, self.context)
- if dbro.type == 'directory':
- return node_dir(fullpath, None ,self, dbro)
- elif dbro.type == 'ressource':
- assert dbro.ressource_parent_type_id == False
- return node_res_dir(fullpath, None, self, dbro)
- else:
- raise ValueError("dir node for %s type", dbro.type)
+
+ fullpath = dbro.get_full_path(context=self.context)
+ klass = dbro.get_node_class(dbro, context=self.context)
+ return klass(fullpath, None ,self, dbro)
def get_file_node(self, cr, fbro):
""" Create or locate a node for a static file
@@ -121,7 +132,7 @@ class node_context(object):
if fbro.parent_id:
parent = self.get_dir_node(cr, fbro.parent_id)
- return node_file(fbro.name, parent, self, fbro)
+ return self.node_file_class(fbro.name, parent, self, fbro)
class node_descriptor(object):
@@ -266,22 +277,24 @@ class node_class(object):
""" Get a tag, unique per object + modification.
see. http://tools.ietf.org/html/rfc2616#section-13.3.3 """
- return self._get_ttag(cr) + ':' + self._get_wtag(cr)
+ return '"%s-%s"' % (self._get_ttag(cr), self._get_wtag(cr))
def _get_wtag(self, cr):
""" Return the modification time as a unique, compact string """
- return str(_str2time(self.write_date))
+ return str(_str2time(self.write_date)).replace('.','')
- def _get_ttag(self,cr):
+ def _get_ttag(self, cr):
""" Get a unique tag for this type/id of object.
Must be overriden, so that each node is uniquely identified.
"""
print "node_class.get_ttag()",self
- raise NotImplementedError("get_etag stub()")
+ raise NotImplementedError("get_ttag stub()")
def get_dav_props(self, cr):
""" If this class has special behaviour for GroupDAV etc, export
its capabilities """
+ # This fn is placed here rather than WebDAV, because we want the
+ # baseclass methods to apply to all node subclasses
return self.DAV_PROPS or {}
def match_dav_eprop(self, cr, match, ns, prop):
@@ -438,22 +451,20 @@ class node_database(node_class):
if not domain:
domain = []
- where2 = where + domain + [('type', '=', 'directory')]
+ where2 = where + domain + ['|', ('type', '=', 'directory'), \
+ '&', ('type', '=', 'ressource'), ('ressource_parent_type_id','=',False)]
ids = dirobj.search(cr, uid, where2, context=ctx)
res = []
for dirr in dirobj.browse(cr, uid, ids, context=ctx):
- res.append(node_dir(dirr.name, self, self.context,dirr))
-
- where2 = where + domain + [('type', '=', 'ressource'), ('ressource_parent_type_id','=',False)]
- ids = dirobj.search(cr, uid, where2, context=ctx)
- for dirr in dirobj.browse(cr, uid, ids, context=ctx):
- res.append(node_res_dir(dirr.name, self, self.context, dirr))
+ klass = dirr.get_node_class(dirr, context=ctx)
+ res.append(klass(dirr.name, self, self.context,dirr))
fil_obj = dirobj.pool.get('ir.attachment')
ids = fil_obj.search(cr, uid, where, context=ctx)
if ids:
for fil in fil_obj.browse(cr, uid, ids, context=ctx):
- res.append(node_file(fil.name, self, self.context, fil))
+ klass = self.context.node_file_class
+ res.append(klass(fil.name, self, self.context, fil))
return res
def _file_get(self,cr, nodename=False):
@@ -463,9 +474,6 @@ class node_database(node_class):
def _get_ttag(self,cr):
return 'db-%s' % cr.dbname
- def get_dav_resourcetype(self, cr):
- return ('collection', 'DAV:')
-
def mkdosname(company_name, default='noname'):
""" convert a string to a dos-like name"""
if not company_name:
@@ -492,7 +500,10 @@ class node_dir(node_database):
self.write_date = dirr and (dirr.write_date or dirr.create_date) or False
self.content_length = 0
self.unixperms = 040750
- self.uuser = (dirr.user_id and dirr.user_id.login) or 'nobody'
+ try:
+ self.uuser = (dirr.user_id and dirr.user_id.login) or 'nobody'
+ except Exception:
+ self.uuser = 'nobody'
self.ugroup = mkdosname(dirr.company_id and dirr.company_id.name, default='nogroup')
self.uidperms = dirr.get_dir_permissions()
if dctx:
@@ -505,7 +516,7 @@ class node_dir(node_database):
for dfld in dirr.dctx_ids:
try:
self.dctx['dctx_' + dfld.field] = safe_eval(dfld.expr,dc2)
- except Exception,e:
+ except Exception:
print "Cannot eval %s" % dfld.expr
print e
pass
@@ -670,12 +681,14 @@ class node_dir(node_database):
return ret
class node_res_dir(node_class):
- """ A special sibling to node_dir, which does only contain dynamically
+ """ A folder containing dynamic folders
+ A special sibling to node_dir, which does only contain dynamically
created folders foreach resource in the foreign model.
All folders should be of type node_res_obj and merely behave like
node_dirs (with limited domain).
"""
our_type = 'collection'
+ res_obj_class = None
def __init__(self, path, parent, context, dirr, dctx=None ):
super(node_res_dir,self).__init__(path, parent, context)
self.dir_id = dirr.id
@@ -687,7 +700,10 @@ class node_res_dir(node_class):
self.write_date = dirr.write_date or dirr.create_date
self.content_length = 0
self.unixperms = 040750
- self.uuser = (dirr.user_id and dirr.user_id.login) or 'nobody'
+ try:
+ self.uuser = (dirr.user_id and dirr.user_id.login) or 'nobody'
+ except Exception:
+ self.uuser = 'nobody'
self.ugroup = mkdosname(dirr.company_id and dirr.company_id.name, default='nogroup')
self.uidperms = dirr.get_dir_permissions()
self.res_model = dirr.ressource_type_id and dirr.ressource_type_id.model or False
@@ -782,17 +798,15 @@ class node_res_dir(node_class):
continue
# Yes! we can't do better but skip nameless records.
- res.append(node_res_obj(name, self.dir_id, self, self.context, self.res_model, bo))
+ res.append(self.res_obj_class(name, self.dir_id, self, self.context, self.res_model, bo))
return res
def _get_ttag(self,cr):
return 'rdir-%d' % self.dir_id
- def get_dav_resourcetype(self, cr):
- return ('collection', 'DAV:')
-
class node_res_obj(node_class):
- """ A special sibling to node_dir, which does only contain dynamically
+ """ A dynamically created folder.
+ A special sibling to node_dir, which does only contain dynamically
created folders foreach resource in the foreign model.
All folders should be of type node_res_obj and merely behave like
node_dirs (with limited domain).
@@ -828,7 +842,7 @@ class node_res_obj(node_class):
for fld,expr in self.dctx_dict.items():
try:
self.dctx[fld] = safe_eval(expr, dc2)
- except Exception,e:
+ except Exception:
print "Cannot eval %s for %s" % (expr, fld)
print e
pass
@@ -886,7 +900,8 @@ class node_res_obj(node_class):
return res
- def get_dav_props(self, cr):
+ def get_dav_props_DEPR(self, cr):
+ # Deprecated! (but document_ics must be cleaned, first)
res = {}
cntobj = self.context._dirobj.pool.get('document.directory.content')
uid = self.context.uid
@@ -899,7 +914,8 @@ class node_res_obj(node_class):
res['http://groupdav.org/'] = ('resourcetype',)
return res
- def get_dav_eprop(self, cr, ns, prop):
+ def get_dav_eprop_DEPR(self, cr, ns, prop):
+ # Deprecated!
if ns != 'http://groupdav.org/' or prop != 'resourcetype':
logger.warning("Who asked for %s:%s?" % (ns, prop))
return None
@@ -910,6 +926,7 @@ class node_res_obj(node_class):
where = [('directory_id','=',self.dir_id) ]
ids = cntobj.search(cr,uid,where,context=ctx)
for content in cntobj.browse(cr, uid, ids, context=ctx):
+ # TODO: remove relic of GroupDAV
if content.extension == '.ics': # FIXME: call the content class!
return ('vevent-collection','http://groupdav.org/')
return None
@@ -944,20 +961,21 @@ class node_res_obj(node_class):
res_name = getattr(bo, namefield)
if not res_name:
continue
- res.append(node_res_obj(res_name, self.dir_id, self, self.context, self.res_model, res_bo = bo))
+ # TODO Revise
+ klass = directory.get_node_class(directory, dynamic=True, context=ctx)
+ res.append(klass(res_name, self.dir_id, self, self.context, self.res_model, res_bo = bo))
where2 = where + [('parent_id','=',self.dir_id) ]
ids = dirobj.search(cr, uid, where2, context=ctx)
for dirr in dirobj.browse(cr, uid, ids, context=ctx):
if dirr.type == 'directory':
- res.append(node_res_obj(dirr.name, dirr.id, self, self.context, self.res_model, res_bo = None, res_id = self.res_id))
+ klass = dirr.get_node_class(dirr, dynamic=True, context=ctx)
+ res.append(klass(dirr.name, dirr.id, self, self.context, self.res_model, res_bo = None, res_id = self.res_id))
elif dirr.type == 'ressource':
# child resources can be controlled by properly set dctx
- res.append(node_res_dir(dirr.name,self,self.context, dirr, {'active_id': self.res_id}))
-
-
-
+ klass = dirr.get_node_class(dirr, context=ctx)
+ res.append(klass(dirr.name,self,self.context, dirr, {'active_id': self.res_id}))
fil_obj = dirobj.pool.get('ir.attachment')
if self.res_find_all:
@@ -967,7 +985,8 @@ class node_res_obj(node_class):
ids = fil_obj.search(cr, uid, where3, context=ctx)
if ids:
for fil in fil_obj.browse(cr, uid, ids, context=ctx):
- res.append(node_file(fil.name, self, self.context, fil))
+ klass = self.context.node_file_class
+ res.append(klass(fil.name, self, self.context, fil))
# Get Child Ressource Directories
@@ -979,9 +998,11 @@ class node_res_obj(node_class):
dirids = dirids + dirobj.search(cr,uid, where5)
for dirr in dirobj.browse(cr, uid, dirids, context=ctx):
if dirr.type == 'directory' and not dirr.parent_id:
- res.append(node_res_obj(dirr.name, dirr.id, self, self.context, self.res_model, res_bo = None, res_id = self.res_id))
+ klass = dirr.get_node_class(dirr, dynamic=True, context=ctx)
+ res.append(klass(dirr.name, dirr.id, self, self.context, self.res_model, res_bo = None, res_id = self.res_id))
if dirr.type == 'ressource':
- res.append(node_res_dir(dirr.name, self, self.context, dirr, {'active_id': self.res_id}))
+ klass = dirr.get_node_class(dirr, context=ctx)
+ res.append(klass(dirr.name, self, self.context, dirr, {'active_id': self.res_id}))
return res
def create_child_collection(self, cr, objname):
@@ -993,9 +1014,9 @@ class node_res_obj(node_class):
uid = self.context.uid
ctx = self.context.context.copy()
ctx.update(self.dctx)
- res_obj = dirobj.pool.get(self.context.context['res_model'])
+ res_obj = dirobj.pool.get(self.res_model)
- object2 = res_obj.browse(cr, uid, self.context.context['res_id']) or False
+ object2 = res_obj.browse(cr, uid, self.res_id) or False
obj = dirobj.browse(cr, uid, self.dir_id)
if obj and (obj.type == 'ressource') and not object2:
@@ -1038,7 +1059,8 @@ class node_res_obj(node_class):
fil_id = fil_obj.create(cr, uid, val, context=ctx)
fil = fil_obj.browse(cr, uid, fil_id, context=ctx)
- fnode = node_file(path, self, self.context, fil)
+ klass = self.context.node_file_class
+ fnode = klass(path, self, self.context, fil)
if data is not None:
fnode.set_data(cr, data, fil)
return fnode
@@ -1046,8 +1068,7 @@ class node_res_obj(node_class):
def _get_ttag(self,cr):
return 'rodir-%d-%d' % (self.dir_id, self.res_id)
- def get_dav_resourcetype(self, cr):
- return ('collection', 'DAV:')
+node_res_dir.res_obj_class = node_res_obj
class node_file(node_class):
our_type = 'file'
@@ -1069,7 +1090,10 @@ class node_file(node_class):
elif not parent.check_perms('w'):
self.uidperms = 4
- self.uuser = (fil.user_id and fil.user_id.login) or 'nobody'
+ try:
+ self.uuser = (fil.user_id and fil.user_id.login) or 'nobody'
+ except Exception:
+ self.uuser = 'nobody'
self.ugroup = mkdosname(fil.company_id and fil.company_id.name, default='nogroup')
# This only propagates the problem to get_data. Better
@@ -1183,9 +1207,6 @@ class node_file(node_class):
def _get_ttag(self,cr):
return 'file-%d' % self.file_id
- def get_dav_resourcetype(self, cr):
- return ''
-
def move_to(self, cr, ndir_node, new_name=False, fil_obj=None, ndir_obj=None, in_write=False):
if ndir_node and ndir_node.context != self.context:
raise NotImplementedError("Cannot move files between contexts")
@@ -1382,3 +1403,5 @@ class nodefd_content(StringIO, node_descriptor):
finally:
cr.close()
StringIO.close(self)
+
+#eof
\ No newline at end of file
diff --git a/addons/document/test/document_test2.yml b/addons/document/test/document_test2.yml
index 34e834a5306244570a8dc01661691c4d21ac640b..65312eaf10d391bf501383e0a5aeda3f80e243c0 100644
--- a/addons/document/test/document_test2.yml
+++ b/addons/document/test/document_test2.yml
@@ -12,7 +12,7 @@
I create a "Testing" folder where all the test data will go.
-
!record {model: document.directory, id: dir_tests }:
- name: 'Testing'
+ name: 'Testing (will be deleted!)'
parent_id: dir_root
-
I create an attachment into the root folder (w. empty fields, test that
@@ -52,7 +52,7 @@
I search the testing folder for attachments.
-
!python {model: ir.attachment}: |
- ids = self.search(cr, uid, [('parent_id.name','=', 'Testing'), ('name','=','Test renamed 2')])
+ ids = self.search(cr, uid, [('parent_id.name','=', 'Testing (will be deleted!)'), ('name','=','Test renamed 2')])
assert ids == [ ref("file_test2") ], ids
-
I create an attachment to a 3rd resource, eg. a res.country
@@ -70,7 +70,14 @@
ids = self.search(cr, uid, [('res_model', '=', 'res.country'), ('res_id', '=', ref("base.za"))])
assert ids == [ ref("attach_3rd")], ids
-
- I delete the attachment
+ I delete the attachments
-
!python {model: ir.attachment}: |
+ self.unlink(cr, uid, [ref('file_test2')])
self.unlink(cr, uid, [ref('attach_3rd')])
+-
+ I delete the tests folder
+-
+ !python {model: document.directory}: |
+ self.unlink(cr, uid, [ref('dir_tests')])
+ cr.commit()
diff --git a/addons/document_email/__openerp__.py b/addons/document_email/__openerp__.py
index 0348665ffa0e4847e3b8485f822923fa7e33df44..6f61ba628581b0920326659e1dcb7ad8a555fcae 100644
--- a/addons/document_email/__openerp__.py
+++ b/addons/document_email/__openerp__.py
@@ -25,7 +25,6 @@
"name" : "Email Integrated Document",
"version" : "1.1",
"depends" : ["base", "document", "fetchmail","mail_gateway"],
- "author" : "Tiny",
"description": """Email Integrated Document
* Email based Document submission
* user based document submission
diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py
index f69a0bbbaad28ef4ee0fea3b8ad381acb0c85e55..9c16e7dde55d153d872a474edaea092402fc13fb 100644
--- a/addons/document_ftp/ftpserver/abstracted_fs.py
+++ b/addons/document_ftp/ftpserver/abstracted_fs.py
@@ -363,7 +363,6 @@ class abstracted_fs(object):
"""Remove the specified directory."""
cr, node, rem = datacr
assert node
- cr = self.get_node_cr(node)
node.rmcol(cr)
cr.commit()
diff --git a/addons/document_ftp/test/document_ftp_test2.yml b/addons/document_ftp/test/document_ftp_test2.yml
index 53d5a2b78bffcee30dfe8c98870b5493bb1ab197..da55c3537673731be35adba57e594b19a1d320c6 100644
--- a/addons/document_ftp/test/document_ftp_test2.yml
+++ b/addons/document_ftp/test/document_ftp_test2.yml
@@ -200,6 +200,11 @@
# TODO move
-
I remove the 'Test-Folder3'
+-
+ !python {model: ir.attachment}: |
+ from document_ftp import test_easyftp as te
+ ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
+ ftp.rmd("Test-Folder3")
-
I check that test3.txt is removed.
-
@@ -228,3 +233,22 @@
-
I move the 200 files to 'Test-Folder2'
# TODO
+
+-
+ I delete the 200 files
+-
+ !python {model: ir.attachment}: |
+ from document_ftp import test_easyftp as te
+ from cStringIO import StringIO
+ ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Test-Folder2')
+ # TODO speed
+ ftp.delete('test3.txt')
+ for i in range(0, 200):
+ ftp.delete('test-name%s.txt' %i)
+-
+ I remove the 'Test-Folder2'
+-
+ !python {model: ir.attachment}: |
+ from document_ftp import test_easyftp as te
+ ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
+ ftp.rmd("Test-Folder2")
diff --git a/addons/document_ftp/test/document_ftp_test3.yml b/addons/document_ftp/test/document_ftp_test3.yml
index dbdab370b9703886e0647c0f2b8ac6e14ac995ad..a51f259f44ed1c8a25a57f7191935169480050a4 100644
--- a/addons/document_ftp/test/document_ftp_test3.yml
+++ b/addons/document_ftp/test/document_ftp_test3.yml
@@ -5,10 +5,10 @@
from document_ftp import test_easyftp as te
ftp = te.get_plain_ftp(timeout=1.0)
-
- I create a folder called '������������ ��������' in the server.
+ I create in the server a folder called 'Äïêéìáóôéêüò ÖÜêåëëïò'
-
!record {model: document.directory, id: dir_itests }:
- name: '������������ ��������'
+ name: 'Äïêéìáóôéêüò ÖÜêåëëïò'
parent_id: document.dir_root
-
And then I create another folder, under it, through FTP
@@ -16,67 +16,77 @@
!python {model: ir.attachment}: |
cr.commit()
from document_ftp import test_easyftp as te
- ftp = te.get_ftp_folder(cr, uid, self, 'Documents/������������ ��������')
- ftp.mkd("�������� ��� ����")
+ ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Äïêéìáóôéêüò ÖÜêåëëïò')
+ ftp.mkd("ÖÜêåëëïò áðü êÜôù")
-
I check that this folder exists at the server
-
- !assert {model: document.directory, id: , search: "[('name','=','�������� ��� ����')]" }:
+ !assert {model: document.directory, id: , search: "[('name','=','ÖÜêåëëïò áðü êÜôù')]" }:
- parent_id != False
-
- I login with FTP and check that '������������ ��������' is there
+ I login with FTP and check that 'Äïêéìáóôéêüò ÖÜêåëëïò' is there
-
!python {model: ir.attachment}: |
from document_ftp import test_easyftp as te
- ftp = te.get_ftp_folder(cr, uid, self, 'Documents/������������ ��������/�������� ��� ����')
+ ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Äïêéìáóôéêüò ÖÜêåëëïò/ÖÜêåëëïò áðü êÜôù')
-
- I create a file named '������' into that folder
+ I create a file named 'ÄïêéìÞ' into that folder
-
!python {model: ir.attachment}: |
from document_ftp import test_easyftp as te
from cStringIO import StringIO
- ftp = te.get_ftp_folder(cr, uid, self, 'Documents/������������ ��������/�������� ��� ����')
- fdata = StringIO('������� �� utf-8')
- ftp.storbinary('STOR ������.txt', fdata)
+ ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Äïêéìáóôéêüò ÖÜêåëëïò/ÖÜêåëëïò áðü êÜôù')
+ fdata = StringIO('êåßìåíï ìå utf-8')
+ ftp.storbinary('STOR ÄïêéìÞ.txt', fdata)
-
- I remove the '������.txt' file
+ I remove the 'ÄïêéìÞ.txt' file
-
!python {model: ir.attachment}: |
from document_ftp import test_easyftp as te
from cStringIO import StringIO
- ftp = te.get_ftp_folder(cr, uid, self, 'Documents/������������ ��������/�������� ��� ����')
- ftp.delete('������.txt')
+ ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Äïêéìáóôéêüò ÖÜêåëëïò/ÖÜêåëëïò áðü êÜôù')
+ ftp.delete('ÄïêéìÞ.txt')
-
- I rename '�������� ��� ����' into '�����'
+ I rename 'ÖÜêåëëïò áðü êÜôù' into 'Üëëïò'
-
!python {model: ir.attachment}: |
from document_ftp import test_easyftp as te
- ftp = te.get_ftp_folder(cr, uid, self, 'Documents/������������ ��������')
- ftp.rename("�������� ��� ����", "�����")
+ ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Äïêéìáóôéêüò ÖÜêåëëïò')
+ ftp.rename("ÖÜêåëëïò áðü êÜôù", "Üëëïò")
-
- I place a file 'file �3' in '�����'
+ I place a file 'file Ö3' in 'Üëëïò'
-
!python {model: ir.attachment}: |
from document_ftp import test_easyftp as te
from cStringIO import StringIO
- ftp = te.get_ftp_folder(cr, uid, self, 'Documents/������������ ��������/�����')
- fdata = StringIO('�� ���� �������')
- ftp.storbinary('STOR file �3.txt', fdata)
+ ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Äïêéìáóôéêüò ÖÜêåëëïò/Üëëïò')
+ fdata = StringIO('êé Üëëï êåßìåíï')
+ ftp.storbinary('STOR file Ö3.txt', fdata)
-
I rename the file into file+range(1..200) (large filename)
-
!python {model: ir.attachment}: |
from document_ftp import test_easyftp as te
from cStringIO import StringIO
- ftp = te.get_ftp_folder(cr, uid, self, 'Documents/������������ ��������/�����')
+ ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Äïêéìáóôéêüò ÖÜêåëëïò/Üëëïò')
vuvuzela = 'b'+''.join('z' * 200)+'!'
- ftp.rename("file �3.txt", vuvuzela)
+ ftp.rename("file Ö3.txt", vuvuzela)
-
I delete the file with the large name
-
!python {model: ir.attachment}: |
from document_ftp import test_easyftp as te
from cStringIO import StringIO
- ftp = te.get_ftp_folder(cr, uid, self, 'Documents/������������ ��������/�����')
+ ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Äïêéìáóôéêüò ÖÜêåëëïò/Üëëïò')
vuvuzela = 'b'+''.join('z' * 200)+'!'
ftp.delete(vuvuzela)
+
+-
+ I delete the testing folders
+-
+ !python {model: ir.attachment}: |
+ from document_ftp import test_easyftp as te
+ from cStringIO import StringIO
+ ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
+ ftp.rmd('Äïêéìáóôéêüò ÖÜêåëëïò/Üëëïò')
+ ftp.rmd('Äïêéìáóôéêüò ÖÜêåëëïò')
diff --git a/addons/document_ftp/test/document_ftp_test4.yml b/addons/document_ftp/test/document_ftp_test4.yml
index eeed4b17ddae2c9434b83b6bf712ae6dcbf6bc59..2bb616dc1bd6f3c216fbe17497dec99e1fc21e29 100644
--- a/addons/document_ftp/test/document_ftp_test4.yml
+++ b/addons/document_ftp/test/document_ftp_test4.yml
@@ -118,3 +118,10 @@
- |
Bonus Piste:
I create a 'Partner3' under 'all'
+-
+ I delete the Partners Testing folder
+-
+ !python {model: document.directory}: |
+ self.unlink(cr, uid, [ref('dir_tests2')])
+ self.unlink(cr, uid, [ref('dir_respart1')])
+ cr.commit()
\ No newline at end of file
diff --git a/addons/document_ics/i18n/sr.po b/addons/document_ics/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..c3cc40789f2e65d3cb4b857f49898767039ae924
--- /dev/null
+++ b/addons/document_ics/i18n/sr.po
@@ -0,0 +1,334 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-17 07:56+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-18 04:55+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: document_ics
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da poÄinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "uid"
+msgstr "uid"
+
+#. module: document_ics
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr "Greška! Ne možete kreirati rekurzivne direktorijume."
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,jobs:0
+msgid "Jobs Hiring Process"
+msgstr "Proces zapošljavanja"
+
+#. module: document_ics
+#: view:document.ics.crm.wizard:0
+msgid "Configure Calendars for CRM Sections"
+msgstr "Konfigurisi kalendare za CRM Sekcije"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,helpdesk:0
+msgid "Helpdesk"
+msgstr "Helpdesk"
+
+#. module: document_ics
+#: field:document.directory.ics.fields,field_id:0
+msgid "Open ERP Field"
+msgstr "Otvori ERP Polje"
+
+#. module: document_ics
+#: view:document.ics.crm.wizard:0
+msgid "Next"
+msgstr "Sledeće"
+
+#. module: document_ics
+#: field:document.directory.ics.fields,content_id:0
+msgid "Content"
+msgstr "Sadržaj"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,meeting:0
+msgid "Calendar of Meetings"
+msgstr "Kalendar Sastanaka"
+
+#. module: document_ics
+#: model:crm.case.section,name:document_ics.section_meeting
+msgid "Shared Calendar Meetings"
+msgstr "Sastanci zajedniÄkog kalendara"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "url"
+msgstr "url"
+
+#. module: document_ics
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,bugs:0
+msgid "Used by companies to track bugs and support requests on softwares"
+msgstr ""
+"Korišten od firmi za praćenje grešaka i zahteva za podrškom na programima"
+
+#. module: document_ics
+#: model:ir.actions.todo,note:document_ics.config_wizard_step_case_section_menu
+msgid ""
+"This Configuration step use to create Calendars in document for all Case "
+"Sections"
+msgstr ""
+"Ovaj konfiguracioni korak se koristi za kreiranje kalendara u dokumentima ze "
+"sve tipove Sekcija"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "dtend"
+msgstr "dtend"
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,jobs:0
+msgid ""
+"Help you to organise the jobs hiring process: evaluation, meetings, email "
+"integration..."
+msgstr ""
+"Pomaže vam da organizujete proces zapošljavanja: procena, sastanci, "
+"integracija elektronske pošte..."
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "description"
+msgstr "opis"
+
+#. module: document_ics
+#: model:ir.actions.act_window,name:document_ics.action_view_document_ics_config_directories
+msgid "Configure Calendars for Sections "
+msgstr "Konfigurise Kalendare za Sekcije "
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,opportunity:0
+msgid "Tracks identified business opportunities for your sales pipeline."
+msgstr "Prati prepoznate poslovne prilike za vašu prodajnu mrezu."
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,fund:0
+msgid ""
+"This may help associations in their fund raising process and tracking."
+msgstr ""
+"Ovo može pomoći saradnicima u procesu prikupljanja i praćenja sredstava za "
+"finansiranje."
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,helpdesk:0
+msgid "Manages an Helpdesk service."
+msgstr "Upravlja uslugom Helpdesk-a."
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,fund:0
+msgid "Fund Raising Operations"
+msgstr "Operacije za skupljanje sredstava"
+
+#. module: document_ics
+#: field:document.directory.content,ics_object_id:0
+msgid "Object"
+msgstr "Objekat"
+
+#. module: document_ics
+#: constraint:crm.case.section:0
+msgid "Error ! You cannot create recursive sections."
+msgstr "Greška ! Ne možete stvarati rekurzivne sekcije."
+
+#. module: document_ics
+#: model:ir.module.module,shortdesc:document_ics.module_meta_information
+msgid "Support for iCal based on Document Management System"
+msgstr "Podrška za iCal baziranom na sistemu za upravljanje dokumentima."
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "location"
+msgstr "polozaj"
+
+#. module: document_ics
+#: view:document.directory:0
+msgid "ICS Calendar"
+msgstr "ICS Kalendar"
+
+#. module: document_ics
+#: field:document.directory.ics.fields,name:0
+msgid "ICS Value"
+msgstr "ICS Vrednost"
+
+#. module: document_ics
+#: model:ir.module.module,description:document_ics.module_meta_information
+msgid "Allows to synchronise calendars with others applications."
+msgstr "omogucava vam da sinhronisete kalendar sa ostalim aplikacijama"
+
+#. module: document_ics
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,lead:0
+msgid ""
+"Allows you to track and manage prospects which are pre-sales requests or "
+"contacts, the very first contact with a customer request."
+msgstr ""
+"Omogućava vam da pratite i upravljate prilikama koje ukljuÄuju predprodajne "
+"zahteve ili kontakte, prvi kontakt s pitanjima korisnika."
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,name:0
+msgid "Name"
+msgstr "Ime"
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,meeting:0
+msgid "Manages the calendar of meetings of the users."
+msgstr "Upravlja kalendarom sastanaka korisnika"
+
+#. module: document_ics
+#: field:document.directory.content,ics_domain:0
+msgid "Domain"
+msgstr "Domen"
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,claims:0
+msgid ""
+"Manages the supplier and customers claims, including your corrective or "
+"preventive actions."
+msgstr ""
+"Upravlja pritužbama dobavljaÄa i kupaca, ukljuÄujući korektivne ili "
+"preventivne akcije."
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "last-modified"
+msgstr "poslednja-promjena"
+
+#. module: document_ics
+#: view:document.directory:0
+msgid "ICS Mapping"
+msgstr "ICS mapiranje"
+
+#. module: document_ics
+#: view:crm.case:0
+msgid "Duration(In Hour)"
+msgstr "Trajanje (u satima)"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,document_ics:0
+msgid "Shared Calendar"
+msgstr "Deljeni Kalendar"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,claims:0
+msgid "Claims"
+msgstr "Pritužbe"
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,phonecall:0
+msgid ""
+"Help you to encode the result of a phone call or to planify a list of phone "
+"calls to process."
+msgstr ""
+"Pomaže vam pri unosu rezultata telefonskih poziva ili pri planiranju popisa "
+"poziva za obradu."
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "dtstart"
+msgstr "dtstart"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,phonecall:0
+msgid "Phone Calls"
+msgstr "Telefonski Pozivi"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,bugs:0
+msgid "Bug Tracking"
+msgstr "Praćenje Grešaka"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "categories"
+msgstr "kategorije"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,lead:0
+msgid "Prospect"
+msgstr "Prilika"
+
+#. module: document_ics
+#: view:document.ics.crm.wizard:0
+msgid "Create Pre-Configured Calendars"
+msgstr "Kreiraj predkonfigurisani Kalendar"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "created"
+msgstr "Kreiran"
+
+#. module: document_ics
+#: field:crm.case,code:0
+msgid "Calendar Code"
+msgstr "Å ifra kalendara"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "summary"
+msgstr "Sumarno"
+
+#. module: document_ics
+#: model:ir.model,name:document_ics.model_document_ics_crm_wizard
+msgid "document.ics.crm.wizard"
+msgstr "document.ics.crm.wizard"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
+msgstr "prisutan"
+
+#. module: document_ics
+#: model:ir.model,name:document_ics.model_document_directory_ics_fields
+msgid "document.directory.ics.fields"
+msgstr "document.directory.ics.fields"
+
+#. module: document_ics
+#: field:document.directory.content,ics_field_ids:0
+msgid "Fields Mapping"
+msgstr "Mapiranje polja"
+
+#. module: document_ics
+#: view:document.ics.crm.wizard:0
+msgid "Cancel"
+msgstr "Otkaži"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,opportunity:0
+msgid "Business Opportunities"
+msgstr "Poslovne Prilike"
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "dtstamp"
+msgstr "dtstamp"
diff --git a/addons/document_webdav/__init__.py b/addons/document_webdav/__init__.py
index 69312668a74c186145a10905d5af7adffac8fb1c..ac417e18087071d6d48f3b68645d86332b412855 100644
--- a/addons/document_webdav/__init__.py
+++ b/addons/document_webdav/__init__.py
@@ -21,3 +21,7 @@
import webdav
import webdav_server
+
+import document_webdav
+
+#eof
\ No newline at end of file
diff --git a/addons/document_webdav/__openerp__.py b/addons/document_webdav/__openerp__.py
index 39330f68dea53886c334ab85fbeac07d94ac8643..1c2e232e9148eb6183d72714c6c798c7475f96de 100644
--- a/addons/document_webdav/__openerp__.py
+++ b/addons/document_webdav/__openerp__.py
@@ -29,20 +29,23 @@
##############################################################################
{
- "name" : "WebDAV server for Document Management",
- "version" : "2.0",
- "author" : "OpenERP SA",
- "category" : "Generic Modules/Others",
- "website": "http://www.openerp.com",
- "description": """ With this module, the WebDAV server for the documents is activated.
- You can then use any compatible browser to remotely see the attachments of OpenObject.
+ "name" : "WebDAV server for Document Management",
+ "version" : "2.2",
+ "author" : "OpenERP SA",
+ "category" : "Generic Modules/Others",
+ "website": "http://www.openerp.com",
+ "description": """ With this module, the WebDAV server for the documents is activated.
+ You can then use any compatible browser to remotely see the attachments of OpenObject.
- After installation, the webDAV server can be controlled by a [webdav] section in the server's config.
+ After installation, the webDAV server can be controlled by a [webdav] section in the server's config.
""",
- "depends" : ["base", "document"],
- "init_xml" : [],
- "update_xml" : [],
- "demo_xml" : [],
- "active": False,
- "installable": True
+ "depends" : ["base", "document"],
+ "init_xml" : [],
+ "update_xml" : ['security/ir.model.access.csv',
+ 'webdav_view.xml',
+ 'webdav_setup.xml',
+ ],
+ "demo_xml" : [],
+ "active": False,
+ "installable": True
}
diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index f3c8201bafc10e77a74a12fff953cdfa5a199047..3e8e1c2b3e587dd9b28b102b63bc2d43467ed4e7 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -26,8 +26,6 @@ import os
import time
from string import joinfields, split, lower
-from service import security
-
import netsvc
import urlparse
@@ -37,9 +35,13 @@ from DAV.iface import *
import urllib
from DAV.davcmd import copyone, copytree, moveone, movetree, delone, deltree
-from document.nodes import node_res_dir, node_res_obj
from cache import memoize
from tools import misc
+try:
+ from tools.dict_tools import dict_merge2
+except ImportError:
+ from document.dict_tools import dict_merge2
+
CACHE_SIZE=20000
#hack for urlparse: add webdav in the net protocols
@@ -96,8 +98,7 @@ class openerp_dav_handler(dav_interface):
return props
node = self.uri2object(cr, uid, pool, uri2)
if node:
- props = props.copy()
- props.update(node.get_dav_props(cr))
+ props = dict_merge2(props, node.get_dav_props(cr))
cr.close()
return props
@@ -134,11 +135,11 @@ class openerp_dav_handler(dav_interface):
self.parent.log_message("Exc: %s",traceback.format_exc())
raise default_exc("Operation failed")
- def _get_dav_lockdiscovery(self, uri):
- raise DAV_NotFound
+ #def _get_dav_lockdiscovery(self, uri):
+ # raise DAV_NotFound
- def _get_dav_supportedlock(self, uri):
- raise DAV_NotFound
+ #def A_get_dav_supportedlock(self, uri):
+ # raise DAV_NotFound
def match_prop(self, uri, match, ns, propname):
if self.M_NS.has_key(ns):
@@ -186,6 +187,16 @@ class openerp_dav_handler(dav_interface):
cr.close()
return ret
+ def reduce_useragent(self):
+ ua = self.parent.headers.get('User-Agent', False)
+ ctx = {}
+ if ua:
+ if 'iPhone' in ua:
+ ctx['DAV-client'] = 'iPhone'
+ elif 'Konqueror' in ua:
+ ctx['DAV-client'] = 'GroupDAV'
+ return ctx
+
def get_prop(self, uri, ns, propname):
""" return the value of a given property
@@ -194,17 +205,23 @@ class openerp_dav_handler(dav_interface):
pname -- name of the property
"""
if self.M_NS.has_key(ns):
- return dav_interface.get_prop(self, uri, ns, propname)
+ try:
+ # if it's not in the interface class, a "DAV:" property
+ # may be at the node class. So shouldn't give up early.
+ return dav_interface.get_prop(self, uri, ns, propname)
+ except DAV_NotFound:
+ pass
cr, uid, pool, dbname, uri2 = self.get_cr(uri)
if not dbname:
if cr: cr.close()
raise DAV_NotFound
- node = self.uri2object(cr, uid, pool, uri2)
- if not node:
+ try:
+ node = self.uri2object(cr, uid, pool, uri2)
+ if not node:
+ raise DAV_NotFound
+ res = node.get_dav_eprop(cr, ns, propname)
+ finally:
cr.close()
- raise DAV_NotFound
- res = node.get_dav_eprop(cr, ns, propname)
- cr.close()
return res
def get_db(self, uri, rest_ret=False, allow_last=False):
@@ -283,26 +300,55 @@ class openerp_dav_handler(dav_interface):
result = []
node = self.uri2object(cr, uid, pool, uri2[:])
- if not node:
- if cr: cr.close()
- raise DAV_NotFound2(uri2)
- else:
- fp = node.full_path()
- if fp and len(fp):
- self.parent.log_message('childs: @%s' % fp)
- fp = '/'.join(fp)
+ try:
+ if not node:
+ raise DAV_NotFound2(uri2)
else:
- fp = None
- domain = None
- if filters:
- domain = node.get_domain(cr, filters)
- for d in node.children(cr, domain):
- self.parent.log_message('child: %s' % d.path)
- if fp:
- result.append( self.urijoin(dbname,fp,d.path) )
+ fp = node.full_path()
+ if fp and len(fp):
+ fp = '/'.join(fp)
+ self.parent.log_message('childs for: %s' % fp)
else:
- result.append( self.urijoin(dbname,d.path) )
- if cr: cr.close()
+ fp = None
+ domain = None
+ if filters:
+ domain = node.get_domain(cr, filters)
+
+ if hasattr(filters, 'getElementsByTagNameNS'):
+ hrefs = filters.getElementsByTagNameNS('DAV:', 'href')
+ if hrefs:
+ ul = self.parent.davpath + self.uri2local(uri)
+ for hr in hrefs:
+ turi = ''
+ for tx in hr.childNodes:
+ if tx.nodeType == hr.TEXT_NODE:
+ turi += tx.data
+ if not turi.startswith('/'):
+ # it may be an absolute URL, decode to the
+ # relative part, because ul is relative, anyway
+ uparts=urlparse.urlparse(turi)
+ turi=uparts[2]
+ if turi.startswith(ul):
+ result.append( turi[len(self.parent.davpath):])
+ else:
+ self.parent.log_error("ignore href %s because it is not under request path %s", turi, ul)
+ return result
+ # We don't want to continue with the children found below
+ # Note the exceptions and that 'finally' will close the
+ # cursor
+ for d in node.children(cr, domain):
+ self.parent.log_message('child: %s' % d.path)
+ if fp:
+ result.append( self.urijoin(dbname,fp,d.path) )
+ else:
+ result.append( self.urijoin(dbname,d.path) )
+ except DAV_Error:
+ raise
+ except Exception, e:
+ self.parent.log_error("cannot get_childs: "+ str(e))
+ raise
+ finally:
+ if cr: cr.close()
return result
def uri2local(self, uri):
@@ -338,7 +384,8 @@ class openerp_dav_handler(dav_interface):
def uri2object(self, cr, uid, pool, uri):
if not uid:
return None
- return pool.get('document.directory').get_object(cr, uid, uri)
+ context = self.reduce_useragent()
+ return pool.get('document.directory').get_object(cr, uid, uri, context=context)
def get_data(self,uri, rrange=None):
self.parent.log_message('GET: %s' % uri)
diff --git a/addons/document_webdav/document_webdav.py b/addons/document_webdav/document_webdav.py
new file mode 100644
index 0000000000000000000000000000000000000000..28b70c8d7e4d03f725347abe9a85b0bf2655c933
--- /dev/null
+++ b/addons/document_webdav/document_webdav.py
@@ -0,0 +1,97 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2010 Tiny SPRL (<http://tiny.be>).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+import nodes
+from tools import config
+
+class document_davdir(osv.osv):
+ _inherit = 'document.directory'
+
+ _columns = {
+ # Placed here just for a reference
+ 'dav_prop_ids': fields.one2many('document.webdav.dir.property', 'dir_id', 'DAV properties'),
+ }
+
+ def get_node_class(self, cr, uid, ids, dbro=None, dynamic=False, context=None):
+ # Note: in this function, nodes come from document_webdav/nodes.py !
+ if dbro is None:
+ dbro = self.browse(cr, uid, ids, context=context)
+
+ if dynamic:
+ assert dbro.type == 'directory'
+ return nodes.node_res_obj
+ elif dbro.type == 'directory':
+ return nodes.node_dir
+ elif dbro.type == 'ressource':
+ return nodes.node_res_dir
+ else:
+ raise ValueError("dir node for %s type", dbro.type)
+
+ def _prepare_context(self, cr, uid, nctx, context):
+ nctx.node_file_class = nodes.node_file
+ # We can fill some more fields, but avoid any expensive function
+ # that might be not worth preparing.
+ nctx.extra_ctx['webdav_path'] = '/'+config.get_misc('webdav','vdir','webdav')
+ usr_obj = self.pool.get('res.users')
+ res = usr_obj.read(cr, uid, uid, ['login'])
+ if res:
+ nctx.extra_ctx['username'] = res['login']
+ # TODO group
+ return
+
+ def _locate_child(self, cr, uid, root_id, uri,nparent, ncontext):
+ """ try to locate the node in uri,
+ Return a tuple (node_dir, remaining_path)
+ """
+ return (nodes.node_database(context=ncontext), uri)
+
+document_davdir()
+
+class dav_dir_property(osv.osv):
+ """ Arbitrary WebDAV properties, attached to document.directories.
+
+ Some DAV properties have to be settable at directories, depending
+ on the database directory structure.
+
+ Example would be the principal-URL.
+
+ There _can_ be properties without a directory, which means that they
+ globally apply to all the directories (aka. collections) of the
+ present database.
+ """
+ _name = 'document.webdav.dir.property'
+
+ _columns = {
+ 'dir_id': fields.many2one('document.directory', 'Directory', required=False, select=1),
+ 'namespace': fields.char('Namespace', size=127, required=True),
+ 'name': fields.char('Name', size=64, required=True),
+ 'value': fields.text('Value'),
+ 'do_subst': fields.boolean('Substitute', required=True),
+ }
+
+ _defaults = {
+ 'do_subst': False,
+ }
+
+dav_dir_property()
+
+#eof
\ No newline at end of file
diff --git a/addons/document_webdav/i18n/sr.po b/addons/document_webdav/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..393ca94f60412fb90b8bcc7066294f8de0867205
--- /dev/null
+++ b/addons/document_webdav/i18n/sr.po
@@ -0,0 +1,31 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-05-30 15:14+0000\n"
+"PO-Revision-Date: 2010-10-17 07:57+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-18 04:56+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: document_webdav_old
+#: model:ir.module.module,description:document_webdav_old.module_meta_information
+msgid ""
+"This is a complete document management system:\n"
+"\t* WebDav Interface\n"
+"\t* User Authentification\n"
+"\t* Document Indexation\n"
+msgstr ""
+"Ovo je kompletan sistem Dokument Menadzmenta\n"
+"\t* WebDav Interfejs\n"
+"\t* Autentifikacija korisnika\n"
+"\t* Indeksacija Dokumenata\n"
diff --git a/addons/document_webdav/nodes.py b/addons/document_webdav/nodes.py
new file mode 100644
index 0000000000000000000000000000000000000000..8bea54ab7d3bd98996e39207791e61a5c057b9c6
--- /dev/null
+++ b/addons/document_webdav/nodes.py
@@ -0,0 +1,219 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2010 Tiny SPRL (<http://tiny.be>).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+from document import nodes
+from tools.safe_eval import safe_eval as eval
+try:
+ from tools.dict_tools import dict_filter
+except ImportError:
+ from document.dict_tools import dict_filter
+
+import urllib
+
+
+class node_acl_mixin(object):
+ def _get_dav_owner(self, cr):
+ return self.uuser
+
+ def _get_dav_group(self, cr):
+ return self.ugroup
+
+ def _get_dav_supported_privilege_set(self, cr):
+ return '' # TODO
+
+ def _get_dav_current_user_privilege_set(self, cr):
+ return '' # TODO
+
+ def _get_dav_props_hlpr(self, cr, par_class, prop_model,
+ prop_ref_field, res_id):
+ """ Helper for dav properties, usable in subclasses
+
+ @param par_class The parent class
+ @param prop_model The name of the orm model holding the properties
+ @param prop_ref_field The name of the field at prop_model pointing to us
+ @param res_id the id of self in the corresponing orm table, that should
+ match prop_model.prop_ref_field
+ """
+ ret = par_class.get_dav_props(self, cr)
+ if prop_model:
+ propobj = self.context._dirobj.pool.get(prop_model)
+ uid = self.context.uid
+ ctx = self.context.context.copy()
+ ctx.update(self.dctx)
+ # Not really needed because we don't do eval here:
+ # ctx.update({'uid': uid, 'dbname': self.context.dbname })
+ # dict_filter(self.context.extra_ctx, ['username', 'groupname', 'webdav_path'], ctx)
+ sdomain = [(prop_ref_field, '=', False),]
+ if res_id:
+ sdomain = ['|', (prop_ref_field, '=', res_id)] + sdomain
+ prop_ids = propobj.search(cr, uid, sdomain, context=ctx)
+ if prop_ids:
+ ret = ret.copy()
+ for pbro in propobj.browse(cr, uid, prop_ids, context=ctx):
+ ret[pbro.namespace] = ret.get(pbro.namespace, ()) + \
+ (pbro.name,)
+ # Note that we cannot have properties to conditionally appear
+ # on the context, yet.
+
+ return ret
+
+ def _get_dav_eprop_hlpr(self, cr, ns, prop,
+ par_class, prop_model,
+ prop_ref_field, res_id):
+ """ Helper for get dav eprop, usable in subclasses
+
+ @param namespace the one to search for
+ @param name Name to search for
+ @param par_class The parent class
+ @param prop_model The name of the orm model holding the properties
+ @param prop_ref_field The name of the field at prop_model pointing to us
+ @param res_id the id of self in the corresponing orm table, that should
+ match prop_model.prop_ref_field
+ """
+ ret = par_class.get_dav_eprop(self, cr, ns, prop)
+ if ret is not None:
+ return ret
+ if prop_model:
+ propobj = self.context._dirobj.pool.get(prop_model)
+ uid = self.context.uid
+ ctx = self.context.context.copy()
+ ctx.update(self.dctx)
+ ctx.update({'uid': uid, 'dbname': self.context.dbname })
+ ctx['node_classname'] = "%s.%s" % (self.__class__.__module__, self.__class__.__name__)
+ dict_filter(self.context.extra_ctx, ['username', 'groupname', 'webdav_path'], ctx)
+ sdomain = [(prop_ref_field, '=', False),('namespace', '=', ns), ('name','=', prop)]
+ if res_id:
+ sdomain = ['|', (prop_ref_field, '=', res_id)] + sdomain
+ prop_ids = propobj.search(cr, uid, sdomain, context=ctx)
+ if prop_ids:
+ pbro = propobj.browse(cr, uid, prop_ids[0], context=ctx)
+ val = pbro.value
+ if pbro.do_subst:
+ if val.startswith("('") and val.endswith(")"):
+ glbls = { 'urlquote': urllib.quote, }
+ val = eval(val, glbls, ctx)
+ else:
+ val = val % ctx
+ return val
+ return None
+
+class node_dir(node_acl_mixin, nodes.node_dir):
+ """ override node_dir and add DAV functionality
+ """
+ DAV_PROPS = { "DAV:": ('owner', 'group',
+ 'supported-privilege-set',
+ 'current-user-privilege-set'),
+ }
+ DAV_M_NS = { "DAV:" : '_get_dav',}
+ http_options = { 'DAV': ['access-control',] }
+
+ def get_dav_resourcetype(self, cr):
+ return ('collection', 'DAV:')
+
+ def get_dav_props(self, cr):
+ return self._get_dav_props_hlpr(cr, nodes.node_dir,
+ 'document.webdav.dir.property', 'dir_id', self.dir_id)
+
+ def get_dav_eprop(self, cr, ns, prop):
+ return self._get_dav_eprop_hlpr(cr, ns, prop, nodes.node_dir,
+ 'document.webdav.dir.property', 'dir_id', self.dir_id)
+
+
+class node_file(node_acl_mixin, nodes.node_file):
+ DAV_PROPS = { "DAV:": ('owner', 'group',
+ 'supported-privilege-set',
+ 'current-user-privilege-set'),
+ }
+ DAV_M_NS = { "DAV:" : '_get_dav',}
+ http_options = { 'DAV': ['access-control', ] }
+ pass
+
+ def get_dav_resourcetype(self, cr):
+ return ''
+
+ def get_dav_props(self, cr):
+ return self._get_dav_props_hlpr(cr, nodes.node_dir,
+ None, 'file_id', self.file_id)
+ #'document.webdav.dir.property', 'dir_id', self.dir_id)
+
+ #def get_dav_eprop(self, cr, ns, prop):
+
+class node_database(nodes.node_database):
+ def get_dav_resourcetype(self, cr):
+ return ('collection', 'DAV:')
+
+ def get_dav_props(self, cr):
+ return self._get_dav_props_hlpr(cr, nodes.node_dir,
+ 'document.webdav.dir.property', 'dir_id', False)
+
+ def get_dav_eprop(self, cr, ns, prop):
+ return self._get_dav_eprop_hlpr(cr, nodes.node_dir, ns, prop,
+ 'document.webdav.dir.property', 'dir_id', False)
+
+class node_res_obj(node_acl_mixin, nodes.node_res_obj):
+ DAV_PROPS = { "DAV:": ('owner', 'group',
+ 'supported-privilege-set',
+ 'current-user-privilege-set'),
+ }
+ DAV_M_NS = { "DAV:" : '_get_dav',}
+ http_options = { 'DAV': ['access-control',] }
+
+ def get_dav_resourcetype(self, cr):
+ return ('collection', 'DAV:')
+
+ def get_dav_props(self, cr):
+ return self._get_dav_props_hlpr(cr, nodes.node_res_obj,
+ 'document.webdav.dir.property', 'dir_id', self.dir_id)
+
+ def get_dav_eprop(self, cr, ns, prop):
+ return self._get_dav_eprop_hlpr(cr, ns, prop, nodes.node_res_obj,
+ 'document.webdav.dir.property', 'dir_id', self.dir_id)
+
+
+class node_res_dir(node_acl_mixin, nodes.node_res_dir):
+ DAV_PROPS = { "DAV:": ('owner', 'group',
+ 'supported-privilege-set',
+ 'current-user-privilege-set'),
+ }
+ DAV_M_NS = { "DAV:" : '_get_dav',}
+ http_options = { 'DAV': ['access-control',] }
+ res_obj_class = node_res_obj
+
+ def get_dav_resourcetype(self, cr):
+ return ('collection', 'DAV:')
+
+ def get_dav_props(self, cr):
+ return self._get_dav_props_hlpr(cr, nodes.node_res_dir,
+ 'document.webdav.dir.property', 'dir_id', self.dir_id)
+
+ def get_dav_eprop(self, cr, ns, prop):
+ return self._get_dav_eprop_hlpr(cr, ns, prop, nodes.node_res_dir,
+ 'document.webdav.dir.property', 'dir_id', self.dir_id)
+
+# Some copies, so that this module can replace 'from document import nodes'
+get_node_context = nodes.get_node_context
+node_context = nodes.node_context
+node_class = nodes.node_class
+node_descriptor = nodes.node_descriptor
+
+
+#eof
diff --git a/addons/document_webdav/security/ir.model.access.csv b/addons/document_webdav/security/ir.model.access.csv
new file mode 100644
index 0000000000000000000000000000000000000000..a77304eb2971c357f8a23418d9f3b13bb7ae594d
--- /dev/null
+++ b/addons/document_webdav/security/ir.model.access.csv
@@ -0,0 +1,4 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_webdav_dir_property_all","webdav.dir.property all","model_document_webdav_dir_property",,1,0,0,0
+"access_webdav_dir_property_group_doc_manager","webdav.dir.property document manager","model_document_webdav_dir_property","base.group_system",1,1,1,1
+"access_webdav_dir_property_group_system","webdav.dir.property group system","model_document_webdav_dir_property","base.group_system",1,1,1,1
diff --git a/addons/document_webdav/webdav.py b/addons/document_webdav/webdav.py
index 3b6cf58206726346c153163a9536633c3ee324bf..bb2b8caf470a512147c68f7fd34ae975364ee3c3 100644
--- a/addons/document_webdav/webdav.py
+++ b/addons/document_webdav/webdav.py
@@ -22,6 +22,8 @@
import xml.dom.minidom
domimpl = xml.dom.minidom.getDOMImplementation()
+from xml.dom.minicompat import StringTypes
+
import urlparse
import urllib
from osv import osv
@@ -29,12 +31,28 @@ from osv import osv
try:
from DAV import utils
from DAV.propfind import PROPFIND
+ from DAV.report import REPORT
except ImportError:
raise osv.except_osv('PyWebDAV Import Error!','Please install PyWebDAV \
from http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-0.9.4.tar.gz&can=2&q=/')
import tools
+class Text2(xml.dom.minidom.Text):
+ def writexml(self, writer, indent="", addindent="", newl=""):
+ data = "%s%s%s" % (indent, self.data, newl)
+ data = data.replace("&", "&").replace("<", "<")
+ data = data.replace(">", ">")
+ writer.write(data)
+
+def createText2Node(doc, data):
+ if not isinstance(data, StringTypes):
+ raise TypeError, "node contents must be a string"
+ t = Text2()
+ t.data = data
+ t.ownerDocument = doc
+ return t
+
super_mk_prop_response = PROPFIND.mk_prop_response
def mk_prop_response(self, uri, good_props, bad_props, doc):
@@ -48,7 +66,7 @@ def mk_prop_response(self, uri, good_props, bad_props, doc):
re=doc.createElement("D:response")
# append namespaces to response
nsnum=0
- namespaces = self.namespaces
+ namespaces = self.namespaces[:]
if 'DAV:' in namespaces:
namespaces.remove('DAV:')
for nsname in namespaces:
@@ -67,6 +85,8 @@ def mk_prop_response(self, uri, good_props, bad_props, doc):
string: text node
tuple ('elem', 'ns') for empty sub-node <ns:elem />
tuple ('elem', 'ns', sub-elems) for sub-node with elements
+ tuple ('elem', 'ns', sub-elems, {attrs}) for sub-node with
+ optional elements and attributes
list, of above tuples
"""
if ns == 'DAV:':
@@ -108,13 +128,21 @@ def mk_prop_response(self, uri, good_props, bad_props, doc):
ve=doc.createElement(ns_prefix+v[0])
if need_ns:
ve.setAttribute("xmlns:ns"+str(nsnum), v[1])
- if len(v) > 2 and isinstance(v[2], list):
- # support nested elements like:
- # ( 'elem', 'ns:', [('sub-elem1', 'ns1'), ...]
- _prop_elem_child(ve, v[1], v[2], ns_prefix)
+ if len(v) > 2 and v[2] is not None:
+ if isinstance(v[2], (list, tuple)):
+ # support nested elements like:
+ # ( 'elem', 'ns:', [('sub-elem1', 'ns1'), ...]
+ _prop_elem_child(ve, v[1], v[2], ns_prefix)
+ else:
+ vt=createText2Node(doc,tools.ustr(v[2]))
+ ve.appendChild(vt)
+ if len(v) > 3 and v[3]:
+ assert isinstance(v[3], dict)
+ for ak, av in v[3].items():
+ ve.setAttribute(ak, av)
pnode.appendChild(ve)
else:
- ve=doc.createTextNode(tools.ustr(v))
+ ve=createText2Node(doc, tools.ustr(v))
pnode.appendChild(ve)
# write href information
@@ -124,7 +152,12 @@ def mk_prop_response(self, uri, good_props, bad_props, doc):
fileloc = fileloc.encode('utf-8')
href=doc.createElement("D:href")
davpath = self._dataclass.parent.get_davpath()
- hurl = '%s://%s%s%s' % (uparts[0], uparts[1], davpath, urllib.quote(fileloc))
+ if uparts[0] and uparts[1]:
+ hurl = '%s://%s%s%s' % (uparts[0], uparts[1], davpath, urllib.quote(fileloc))
+ else:
+ # When the request has been relative, we don't have enough data to
+ # reply with absolute url here.
+ hurl = '%s%s' % (davpath, urllib.quote(fileloc))
huri=doc.createTextNode(hurl)
href.appendChild(huri)
re.appendChild(href)
@@ -133,6 +166,10 @@ def mk_prop_response(self, uri, good_props, bad_props, doc):
ps=doc.createElement("D:propstat")
if good_props:
re.appendChild(ps)
+ s=doc.createElement("D:status")
+ t=doc.createTextNode("HTTP/1.1 200 OK")
+ s.appendChild(t)
+ ps.appendChild(s)
gp=doc.createElement("D:prop")
for ns in good_props.keys():
@@ -141,15 +178,11 @@ def mk_prop_response(self, uri, good_props, bad_props, doc):
else:
ns_prefix="ns"+str(namespaces.index(ns))+":"
for p,v in good_props[ns].items():
- if not v:
+ if v is None:
continue
_prop_child(gp, ns, p, v)
ps.appendChild(gp)
- s=doc.createElement("D:status")
- t=doc.createTextNode("HTTP/1.1 200 OK")
- s.appendChild(t)
- ps.appendChild(s)
re.appendChild(ps)
# now write the errors!
@@ -159,6 +192,10 @@ def mk_prop_response(self, uri, good_props, bad_props, doc):
for ecode in bad_props.keys():
ps=doc.createElement("D:propstat")
re.appendChild(ps)
+ s=doc.createElement("D:status")
+ t=doc.createTextNode(utils.gen_estring(ecode))
+ s.appendChild(t)
+ ps.appendChild(s)
bp=doc.createElement("D:prop")
ps.appendChild(bp)
@@ -172,10 +209,6 @@ def mk_prop_response(self, uri, good_props, bad_props, doc):
pe=doc.createElement(ns_prefix+str(p))
bp.appendChild(pe)
- s=doc.createElement("D:status")
- t=doc.createTextNode(utils.gen_estring(ecode))
- s.appendChild(t)
- ps.appendChild(s)
re.appendChild(ps)
# return the new response element
@@ -198,7 +231,12 @@ def mk_propname_response(self,uri,propnames,doc):
fileloc = fileloc.encode('utf-8')
href=doc.createElement("D:href")
davpath = self._dataclass.parent.get_davpath()
- hurl = '%s://%s%s%s' % (uparts[0], uparts[1], davpath, urllib.quote(fileloc))
+ if uparts[0] and uparts[1]:
+ hurl = '%s://%s%s%s' % (uparts[0], uparts[1], davpath, urllib.quote(fileloc))
+ else:
+ # When the request has been relative, we don't have enough data to
+ # reply with absolute url here.
+ hurl = '%s%s' % (davpath, urllib.quote(fileloc))
huri=doc.createTextNode(hurl)
href.appendChild(huri)
re.appendChild(href)
@@ -230,3 +268,18 @@ def mk_propname_response(self,uri,propnames,doc):
PROPFIND.mk_prop_response = mk_prop_response
PROPFIND.mk_propname_response = mk_propname_response
+super_create_prop = REPORT.create_prop
+
+def create_prop(self):
+ try:
+ if (self.filter is not None) and self._depth == "0":
+ hrefs = self.filter.getElementsByTagNameNS('DAV:', 'href')
+ if hrefs:
+ self._depth = "1"
+ except Exception:
+ pass
+ return super_create_prop(self)
+
+REPORT.create_prop = create_prop
+
+#eof
diff --git a/addons/document_webdav/webdav_demo.xml b/addons/document_webdav/webdav_demo.xml
new file mode 100644
index 0000000000000000000000000000000000000000..45cd17ed28842f0d1ff5f5de8392809a38eaaf97
--- /dev/null
+++ b/addons/document_webdav/webdav_demo.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<openerp>
+<data>
+<record id="document_webdav_dir_property_nodeclass0" model="document.webdav.dir.property">
+ <field name="namespace">debug:</field>
+ <field name="name">node_class</field>
+ <field name="value">%(node_classname)s</field>
+ <field eval="1" name="do_subst"/>
+</record>
+
+<!--
+<record id="document_webdav_dir_property_debug0" model="document.webdav.dir.property">
+ <field name="namespace">debug:</field>
+ <field name="name">node_context</field>
+ <field name="value">%r</field>
+ <! dash dash This will expose the whole context at the property !>
+ <field eval="1" name="do_subst"/>
+</record>
+-->
+
+</data>
+</openerp>
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index 445922434802c0f20470ca9ef2064f70c6cec947..df2c4a871f6bd1d173621c8fd3233280b341194c 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -57,7 +57,7 @@ def OpenDAVConfig(**kw):
class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler):
verbose = False
protocol_version = 'HTTP/1.1'
- _HTTP_OPTIONS= { 'DAV' : ['1',],
+ _HTTP_OPTIONS= { 'DAV' : ['1', '2'],
'Allow' : [ 'GET', 'HEAD', 'COPY', 'MOVE', 'POST', 'PUT',
'PROPFIND', 'PROPPATCH', 'OPTIONS', 'MKCOL',
'DELETE', 'TRACE', 'REPORT', ]
@@ -81,7 +81,15 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler):
def setup(self):
self.davpath = '/'+config.get_misc('webdav','vdir','webdav')
- self.baseuri = "http://%s:%d/"% (self.server.server_name, self.server.server_port)
+ addr, port = self.server.server_name, self.server.server_port
+ server_proto = getattr(self.server,'proto', 'http').lower()
+ try:
+ if hasattr(self.request, 'getsockname'):
+ addr, port = self.request.getsockname()
+ except Exception, e:
+ self.log_error("Cannot calculate own address: %s" , e)
+ # Too early here to use self.headers
+ self.baseuri = "%s://%s:%d/"% (server_proto, addr, port)
self.IFACE_CLASS = openerp_dav_handler(self, self.verbose)
def copymove(self, CLASS):
@@ -156,8 +164,6 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler):
etag = None
for match in self.headers['If-Match'].split(','):
- if match.startswith('"') and match.endswith('"'):
- match = match[1:-1]
if match == '*':
if dc.exists(uri):
test = True
@@ -208,8 +214,9 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler):
if self.headers.has_key("Content-Type"):
ct=self.headers['Content-Type']
try:
- location = dc.put(uri,body,ct)
+ location = dc.put(uri, body, ct)
except DAV_Error, (ec,dd):
+ self._logger.warning("Cannot PUT to %s: %s", uri, dd, exc_info=True)
return self.send_status(ec)
headers = {}
@@ -264,8 +271,7 @@ try:
handler.debug = config.get_misc('webdav','debug',True)
_dc = { 'verbose' : verbose,
'directory' : directory,
- 'lockemulation' : False,
-
+ 'lockemulation' : True,
}
conf = OpenDAVConfig(**_dc)
diff --git a/addons/document_webdav/webdav_setup.xml b/addons/document_webdav/webdav_setup.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2bd41ddb69c56c124cd2178ea024adf9187dea67
--- /dev/null
+++ b/addons/document_webdav/webdav_setup.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0"?>
+<openerp>
+<data noupdate="1">
+<!--This file contains a typical setup of a WebDAV folders' structure,
+ which conforms to the RFCs and extensions of the protocol.
+ In OpenERP, this is not enforced by any code inside the server, it
+ is rather a matter of setting these records in our document configuration.
+-->
+
+ <!-- /principals tree -->
+ <record id="document_directory_principals0" model="document.directory">
+ <field name="domain">[]</field>
+ <field eval="1" name="resource_find_all"/>
+ <field eval="0" name="ressource_tree"/>
+ <field name="user_id" ref="base.user_root"/>
+ <field name="company_id" ref="base.main_company"/>
+ <field name="storage_id" ref="document.storage_default"/>
+ <field name="type">directory</field>
+ <field eval="[(6,0,[])]" name="group_ids"/>
+ <field name="name">principals</field>
+ </record>
+
+ <record id="document_directory_groups0" model="document.directory">
+ <field name="domain">[]</field>
+ <field eval="1" name="resource_find_all"/>
+ <field eval="0" name="ressource_tree"/>
+ <field name="user_id" ref="base.user_root"/>
+ <field name="company_id" ref="base.main_company"/>
+ <field model="document.directory" name="parent_id" ref="document_directory_principals0"/>
+ <field name="storage_id" ref="document.storage_default"/>
+ <field name="type">directory</field>
+ <field eval="[(6,0,[])]" name="group_ids"/>
+ <field name="name">groups</field>
+ </record>
+
+ <record id="document_directory_resources0" model="document.directory">
+ <field name="domain">[]</field>
+ <field eval="1" name="resource_find_all"/>
+ <field eval="0" name="ressource_tree"/>
+ <field name="company_id" ref="base.main_company"/>
+ <field model="document.directory" name="parent_id" ref="document_directory_principals0"/>
+ <field name="storage_id" ref="document.storage_default"/>
+ <field name="type">directory</field>
+ <field eval="[(6,0,[])]" name="group_ids"/>
+ <field name="name">resources</field>
+ </record>
+ <record id="document_directory_uids1" model="document.directory">
+ <field name="domain">[]</field>
+ <field eval="1" name="resource_find_all"/>
+ <field eval="0" name="ressource_tree"/>
+ <field name="resource_field" ref="base.field_res_users_login"/>
+ <field name="company_id" ref="base.main_company"/>
+ <field model="document.directory" name="parent_id" ref="document_directory_principals0"/>
+ <field name="storage_id" ref="document.storage_default"/>
+ <field name="type">ressource</field>
+ <field name="ressource_type_id" ref="base.model_res_users"/>
+ <field eval="[(6,0,[])]" name="group_ids"/>
+ <field name="name">__uids__</field>
+ </record>
+ <record id="document_directory_users1" model="document.directory">
+ <field name="domain">[]</field>
+ <field eval="1" name="resource_find_all"/>
+ <field eval="0" name="ressource_tree"/>
+ <field name="user_id" ref="base.user_root"/>
+ <field name="resource_field" ref="base.field_res_users_login"/>
+ <field name="company_id" ref="base.main_company"/>
+ <field model="document.directory" name="parent_id" ref="document_directory_principals0"/>
+ <field name="storage_id" ref="document.storage_default"/>
+ <field name="type">ressource</field>
+ <field name="ressource_type_id" ref="base.model_res_users"/>
+ <field eval="[(6,0,[])]" name="group_ids"/>
+ <field name="name">users</field>
+ </record>
+ <record id="document_directory_locations0" model="document.directory">
+ <field name="domain">[]</field>
+ <field eval="1" name="resource_find_all"/>
+ <field eval="0" name="ressource_tree"/>
+ <field name="company_id" ref="base.main_company"/>
+ <field model="document.directory" name="parent_id" ref="document_directory_principals0"/>
+ <field name="storage_id" ref="document.storage_default"/>
+ <field name="type">directory</field>
+ <field eval="[(6,0,[])]" name="group_ids"/>
+ <field name="name">locations</field>
+ </record>
+ <record id="document_webdav_dir_property_currentuserprincipal0" model="document.webdav.dir.property">
+ <field name="namespace">DAV:</field>
+ <field name="name">current-user-principal</field>
+ <field name="value">('href','DAV:','/%s/%s/principals/users/%s' % ('webdav',dbname, username ) )</field>
+ <field eval="1" name="do_subst"/>
+ </record>
+ <record id="document_webdav_dir_property_principalurl0" model="document.webdav.dir.property">
+ <field name="namespace">DAV:</field>
+ <field name="name">principal-URL</field>
+ <field name="value">('href','DAV:','/%s/%s/principals/users/%s' % ('webdav',dbname, username ) )</field>
+ <field eval="1" name="do_subst"/>
+ </record>
+
+</data>
+</openerp>
diff --git a/addons/document_webdav/webdav_view.xml b/addons/document_webdav/webdav_view.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2ea0bca52792ab9e46a06aa0948dd85b0fc74701
--- /dev/null
+++ b/addons/document_webdav/webdav_view.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0"?>
+<openerp>
+<data>
+
+ <record model="ir.ui.view" id="view_dir_props_form">
+ <field name="name">document.webdav.dir.property.form</field>
+ <field name="model">document.webdav.dir.property</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form string="Properties">
+ <field name="namespace"/>
+ <field name="name"/>
+ <newline />
+ <field name="dir_id" />
+ <field name="do_subst" />
+ <newline />
+ <field name="value" colspan="4" />
+ </form>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="view_dir_props_tree">
+ <field name="name">document.webdav.dir.property.tree</field>
+ <field name="model">document.webdav.dir.property</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <tree string="Properties" toolbar="1">
+ <field name="dir_id" />
+ <field name="namespace"/>
+ <field name="name"/>
+ </tree>
+ </field>
+ </record>
+
+ <record id="view_dir_props_filter" model="ir.ui.view">
+ <field name="name">Search View: Directory DAV properties</field>
+ <field name="model">document.webdav.dir.property</field>
+ <field name="type">search</field>
+ <field name="arch" type="xml">
+ <search string="Search Document storage">
+ <field name="name" />
+ <field name="namespace" />
+ <newline/>
+ <group expand="0" string="Group By..." groups="base.group_extended">
+ <filter string="Dir" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'dir_id'}"/>
+ <filter string="Namespace" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'namespace'}"/>
+ </group>
+ </search>
+ </field>
+ </record>
+
+ <record model="ir.actions.act_window" id="action_dir_props_form">
+ <field name="type">ir.actions.act_window</field>
+ <field name="res_model">document.webdav.dir.property</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form</field>
+ <field name="search_view_id" ref="view_dir_props_filter"/>
+ </record>
+ <menuitem
+ name="DAV properties for folders"
+ action="action_dir_props_form"
+ id="menu_dir_props"
+ groups="base.group_extended"
+ parent="document.menu_document_management_configuration"/>
+
+ <!-- Add the properties to the directory form -->
+ <record model="ir.ui.view" id="view_document_directory_form1">
+ <field name="name">document.directory.webdav.inherit</field>
+ <field name="model">document.directory</field>
+ <field name="inherit_id" ref="document.view_document_directory_form" />
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <page string="Dynamic context" position="after">
+ <page string="WebDAV properties">
+ <label string="These properties will be added to WebDAV requests" colspan="4" />
+
+ <field name="dav_prop_ids" nolabel="1" colspan="4">
+ <tree string="Properties">
+ <field name="namespace"/>
+ <field name="name"/>
+ </tree>
+ <form string="Properties">
+ <field name="namespace"/>
+ <field name="name"/>
+ <newline />
+ <field name="do_subst" />
+ <newline />
+ <field name="value" colspan="4" />
+ </form>
+ </field>
+ </page>
+ </page>
+ </field>
+ </record>
+
+
+</data>
+</openerp>
diff --git a/addons/email_template/__openerp__.py b/addons/email_template/__openerp__.py
index 6aa4899feb6de6de966b147bd33e3e5e70c706e6..d5f5e9776d30cf16b7ec53534d7d5d1ff7e6a4cc 100644
--- a/addons/email_template/__openerp__.py
+++ b/addons/email_template/__openerp__.py
@@ -23,10 +23,10 @@
{
"name" : "Email Template for OpenERP",
"version" : "0.7 RC",
- "author" : "Sharoon Thomas, Openlabs",
+ "author" : "Openlabs",
"website" : "http://openerp.com",
"category" : "Added functionality",
- "depends" : ['base'],
+ "depends" : ['marketing'],
"description": """
Email Template is extraction of Power Email basically just to send the emails.
""",
diff --git a/addons/email_template/email_template_account_view.xml b/addons/email_template/email_template_account_view.xml
index 0c30d7d478fee6bb719101b1790ca38ba4c2e99a..97108cb9e33c362a9947b9e2cebf6f6250670b88 100644
--- a/addons/email_template/email_template_account_view.xml
+++ b/addons/email_template/email_template_account_view.xml
@@ -2,7 +2,8 @@
<openerp>
<data>
- <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17" groups="base.group_system,base.res_groups_email_template_admin"/>
+ <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17"
+ groups="marketing.group_marketing_user"/>
<menuitem name="Emails" id="base.menu_emails" parent="base.marketing_menu" sequence="5"/>
<menuitem name="Email Template" id="menu_email_template" parent="base.menu_emails"/>
diff --git a/addons/email_template/i18n/ru.po b/addons/email_template/i18n/ru.po
index 6d812b3a35845121de50f253b1ee2accffe2dddc..689ca686703c1c3bd71f508998dd4baab53d2ad6 100644
--- a/addons/email_template/i18n/ru.po
+++ b/addons/email_template/i18n/ru.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-08-20 05:34+0000\n"
-"PO-Revision-Date: 2010-10-02 08:00+0000\n"
-"Last-Translator: irbiserg@mail.ru <irbiserg@mail.ru>\n"
+"PO-Revision-Date: 2010-10-17 18:13+0000\n"
+"Last-Translator: Wladimir Rossinski <Unknown>\n"
"Language-Team: Russian <ru@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-10-03 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-10-18 04:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: email_template
@@ -392,7 +392,7 @@ msgstr ""
#. module: email_template
#: selection:email.template,template_language:0
msgid "Mako Templates"
-msgstr ""
+msgstr "Шаблоны Mako"
#. module: email_template
#: help:email.template,def_body_html:0
diff --git a/addons/email_template/i18n/sr.po b/addons/email_template/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..9d2d73ceafa581d6e09ea9259f29a8f160c52ef5
--- /dev/null
+++ b/addons/email_template/i18n/sr.po
@@ -0,0 +1,1293 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 05:34+0000\n"
+"PO-Revision-Date: 2010-10-16 09:14+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-17 04:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send mail Wizard"
+msgstr "Carobnjak Slanja Emaila"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Email Account Configuration"
+msgstr "Konfiguracija Email-a"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid "Emails for multiple items saved in outbox."
+msgstr "Emailovi sa vise stavki sacuvanih u outbox-u"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Email Data"
+msgstr "Podaci Email-a"
+
+#. module: email_template
+#: field:email.template,def_to:0
+#: field:email_template.mailbox,email_to:0
+msgid "Recipient (To)"
+msgstr "Prima (za)"
+
+#. module: email_template
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Wizard Complete"
+msgstr "Carobnjak je Zavrsio"
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Plain Text & HTML with no attachments"
+msgstr "Cisti Tekst & HTML bez attachemnta"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid ""
+"Mail from Account %s failed on login. Probable Reason:Could not login to "
+"server\n"
+"Error: %s"
+msgstr ""
+"Email naloga %s nije uspeo da se uloguje. MOguci Razlozi: Ne mogu se "
+"konektovati ba server\n"
+"Greska: %s"
+
+#. module: email_template
+#: field:email_template.preview,body_html:0
+#: field:email_template.preview,body_text:0
+#: field:email_template.send.wizard,body_html:0
+#: field:email_template.send.wizard,body_text:0
+msgid "Body"
+msgstr "Sadrzaj"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "Deletion of Record failed"
+msgstr "Brisanje zapisa nije uspleo"
+
+#. module: email_template
+#: help:email_template.account,company:0
+msgid ""
+"Select if this mail account does not belong to specific user but to the "
+"organization as a whole. eg: info@companydomain.com"
+msgstr ""
+"Selektuj ako ovaj nalog ne pripada specificiranom korisniku ali je deo neke "
+"organizacije npr:info@companydomain.com"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send now"
+msgstr "Posalji sada"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,state:0
+msgid "Not Applicable"
+msgstr "Ne moze se dodati"
+
+#. module: email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_account_all
+msgid "Email Accounts"
+msgstr "Email Nalozi"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send all mails"
+msgstr "Posalji SVE Emailove"
+
+#. module: email_template
+#: field:email_template.mailbox,server_ref:0
+msgid "Server Reference of mail"
+msgstr "Referenca Servera Email-a"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "My Accounts"
+msgstr "Moji Nalozi"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Send Mail"
+msgstr "Pošalji poštu"
+
+#. module: email_template
+#: selection:email_template.account,state:0
+msgid "Approved"
+msgstr "Odobreno"
+
+#. module: email_template
+#: field:email.template,table_html:0
+msgid "HTML code"
+msgstr "HTML zapis"
+
+#. module: email_template
+#: help:email.template,file_name:0
+msgid ""
+"File name pattern can be specified with placeholders.eg. 2009_SO003.pdf"
+msgstr ""
+"Ime fajla moze biti napisano i sa razmaknicama( donja crta) npr "
+"2009_SO003.pdf"
+
+#. module: email_template
+#: field:email.template,from_account:0
+msgid "Email Account"
+msgstr "Email nalog"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid "Email sending failed for one or more objects."
+msgstr "Slanje Emaila je neuspesno zbog jednog ili vise objekata"
+
+#. module: email_template
+#: help:email.template,lang:0
+msgid ""
+"The default language for the email. Placeholders can be used here. eg. "
+"${object.partner_id.lang}"
+msgstr ""
+"Predlozeni jezik Email-a. Razmaknice(donja crta) se mogu ovde koristiti. Npr "
+"${object.partner_id.lang}"
+
+#. module: email_template
+#: help:email_template.account,smtpport:0
+msgid "Enter port number,eg:SMTP-587 "
+msgstr "Upisi broj Port-a npr SMTP-587 "
+
+#. module: email_template
+#: field:email.template,reply_to:0
+#: field:email_template.mailbox,reply_to:0
+#: field:email_template.preview,reply_to:0
+#: field:email_template.send.wizard,reply_to:0
+msgid "Reply-To"
+msgstr "Odgovor - Za"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Delete Action"
+msgstr "Obriši radnju"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Approve Account"
+msgstr "Dozvoli Nalog"
+
+#. module: email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_all
+msgid "E-MAIL Templates"
+msgstr "E-MAIL Obrasci"
+
+#. module: email_template
+#: field:email_template.preview,rel_model_ref:0
+#: field:email_template.send.wizard,rel_model_ref:0
+msgid "Referred Document"
+msgstr "Referentni Dokumenat"
+
+#. module: email_template
+#: field:email_template.send.wizard,full_success:0
+msgid "Complete Success"
+msgstr "Uspesno kompletirano"
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Both HTML & Text (Mixed)"
+msgstr "Oba HTML & Tekst ( Miksovano)"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "OK"
+msgstr "U redu"
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Both HTML & Text (Alternative)"
+msgstr "Oba HTML & Tekst ( Aternativno)"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "Mako templates not installed"
+msgstr "Mako Obrazac nije instaliran"
+
+#. module: email_template
+#: field:email_template.send.wizard,requested:0
+msgid "No of requested Mails"
+msgstr "Br. trazenih Poruka"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Download Full Mail"
+msgstr "Download Celu poruku"
+
+#. module: email_template
+#: help:email.template,def_to:0
+msgid "The default recipient of email.Placeholders can be used here."
+msgstr ""
+"Predlozeni primalac Email-a. Razmaknice se mogu koristiti ( donja crta)"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Mailboxes"
+msgstr "Postanski Sanducici"
+
+#. module: email_template
+#: field:email.template,attachment_ids:0
+msgid "Attached Files"
+msgstr "PrikaÄeni fajlovi"
+
+#. module: email_template
+#: field:email_template.account,smtpssl:0
+msgid "SSL/TLS (only in python 2.6)"
+msgstr "SSL/TLS (samo u python 2.6)"
+
+#. module: email_template
+#: field:email_template.account,email_id:0
+msgid "From Email"
+msgstr "Od Email-a"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "Warning"
+msgstr "Upozorenje"
+
+#. module: email_template
+#: view:email_template.account:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_account_tree_all
+msgid "Accounts"
+msgstr "Nalozi"
+
+#. module: email_template
+#: field:email.template,track_campaign_item:0
+msgid "Track campaign items"
+msgstr "Prati stavke Kampanje"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Body(Text)"
+msgstr "Sadrzaj ( text)"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"Tip: Multiple emails are sent in the same language (the first one is "
+"proposed). We suggest you send emails in groups according to language."
+msgstr ""
+"TIP: Visestruki emailovi su poslati na istom jeziku( prvi koji je "
+"predlozen). Savetujemo vam da saljete E mailove u grupama po odgovarajucim "
+"jezicima."
+
+#. module: email_template
+#: help:email.template,reply_to:0
+#: help:email_template.preview,reply_to:0
+#: help:email_template.send.wizard,reply_to:0
+msgid ""
+"The address recipients should reply to, if different from the From address. "
+"Placeholders can be used here."
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,subject:0
+#: field:email_template.preview,subject:0
+#: field:email_template.send.wizard,subject:0
+msgid "Subject"
+msgstr "Tema"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Reason: %s"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,email_id:0
+msgid "eg: yourname@yourdomain.com "
+msgstr "npr: yourname@yourdomain.com "
+
+#. module: email_template
+#: field:email_template.mailbox,email_from:0
+msgid "From"
+msgstr "Od"
+
+#. module: email_template
+#: field:email_template.preview,ref_template:0
+#: field:email_template.send.wizard,ref_template:0
+msgid "Template"
+msgstr "Å ablon"
+
+#. module: email_template
+#: field:email.template,def_body_text:0
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,body_text:0
+msgid "Standard Body (Text)"
+msgstr "Standarni Sadrzaj ( text)"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,state:0
+msgid "Sending"
+msgstr "Слање"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Insert Simple Field"
+msgstr "Ubaci Prosto polje"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Body(Html)"
+msgstr "Telo ( HTML )"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Send/Receive"
+msgstr "Slanje/Prijem"
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
+msgid "Template Preview"
+msgstr "Pregled Å ablona"
+
+#. module: email_template
+#: field:email.template,def_body_html:0
+msgid "Body (Text-Web Client Only)"
+msgstr "Sadrzaj ( Samo TEKST-WEB Klijent)"
+
+#. module: email_template
+#: field:email.template,ref_ir_value:0
+msgid "Wizard Button"
+msgstr "Dugme Äarobnjaka"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Out going connection test failed"
+msgstr "Test izlazne konekcije nije uspeo"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Mail from Account %s successfully Sent."
+msgstr "Mail od naloga %s je uspesno poslat"
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.mailbox:0
+msgid "Standard Body"
+msgstr "Standardan sadrzaj"
+
+#. module: email_template
+#: selection:email.template,template_language:0
+msgid "Mako Templates"
+msgstr "Mako Sabloni"
+
+#. module: email_template
+#: help:email.template,def_body_html:0
+#: help:email.template,def_body_text:0
+msgid "The text version of the mail"
+msgstr "Tekstualna verzija poruke"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid " (Email Attachment)"
+msgstr " (Email Attachment)"
+
+#. module: email_template
+#: selection:email_template.mailbox,folder:0
+msgid "Sent Items"
+msgstr "Poslate Stavke"
+
+#. module: email_template
+#: code:addons/email_template/email_template_mailbox.py:0
+#, python-format
+msgid ""
+"Sending of Mail %s failed. Probable Reason:Could not login to server\n"
+"Error: %s"
+msgstr ""
+"Slanje poruke %s nije uspelo. Verovatan uzrok: Ne mogu se logovati na "
+"server\n"
+"Greska: %s"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Test Outgoing Connection"
+msgstr "Test Izlazne Konekcije"
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
+msgid "Mailbox"
+msgstr "Postansko SanduÄe"
+
+#. module: email_template
+#: help:email.template,attachment_ids:0
+msgid ""
+"You may attach existing files to this template, so they will be added in all "
+"emails created from this template"
+msgstr ""
+"Mozete pridodati postojeci fajl ovom sablonu, tako da ce on biti dodat u "
+"svim poruka,a kreiranih iz ovog sablona"
+
+#. module: email_template
+#: field:email_template.mailbox,account_id:0
+msgid "User account"
+msgstr "Korisnicki nalog"
+
+#. module: email_template
+#: field:email_template.send.wizard,signature:0
+msgid "Attach my signature to mail"
+msgstr "Dodaj moj potpis poruci"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: view:email.template:0
+#, python-format
+msgid "Report"
+msgstr "Izveštaj"
+
+#. module: email_template
+#: help:email.template,model_object_field:0
+msgid ""
+"Select the field from the model you want to use.\n"
+"If it is a relationship field you will be able to choose the nested values "
+"in the box below\n"
+"(Note:If there are no values make sure you have selected the correct model)"
+msgstr ""
+"Selektuj polje modela koje zelis da koristis\n"
+"Ako je to vezno polje,. bicete u mogucnosti da izaberete podveze u polju "
+"ispod\n"
+"( Napomena: Ako nema nikakvog izbora budite sigurni da ste izabrali ispravan "
+"model)"
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.mailbox:0
+msgid "Advanced"
+msgstr "Napredno"
+
+#. module: email_template
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr "Neispravni Argumenti"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Expression Builder"
+msgstr "Gradilac Ekstenizja"
+
+#. module: email_template
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "HTML Body"
+msgstr "HTML Sadrzaj"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Suspend Account"
+msgstr "Suspendovan nalog"
+
+#. module: email_template
+#: help:email.template,null_value:0
+msgid "This Value is used if the field is empty"
+msgstr "Ova se vrednost koristi ako je polje prazno"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Preview Template"
+msgstr "Pregled Sablona"
+
+#. module: email_template
+#: field:email_template.account,smtpserver:0
+msgid "Server"
+msgstr "Server"
+
+#. module: email_template
+#: help:email.template,copyvalue:0
+msgid ""
+"Copy and paste the value in the location you want to use a system value."
+msgstr ""
+"Iskopiraj i zalepi vrednost na lokaciju koju zelis da se koristi kao "
+"sistemsku vrednost"
+
+#. module: email_template
+#: help:email.template,sub_model_object_field:0
+msgid ""
+"When you choose relationship fields this field will specify the sub value "
+"you can use."
+msgstr ""
+"Kada izaberete vezu polja, ovo polje ce specificirati sub vrednost koju "
+"mozete koristiti"
+
+#. module: email_template
+#: help:email.template,sub_object:0
+msgid ""
+"When a relation field is used this field will show you the type of field you "
+"have selected"
+msgstr ""
+"Kada se koristi vezno polje, ovo polje ce vam pokazati tip polja koje ste "
+"izabrali"
+
+#. module: email_template
+#: field:email.template,lang:0
+msgid "Language"
+msgstr "Jezik"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Body (Raw HTML)"
+msgstr "Sadrzaj Texta (Raw HTML)"
+
+#. module: email_template
+#: field:email.template,use_sign:0
+msgid "Signature"
+msgstr "Potpis"
+
+#. module: email_template
+#: field:email.template,sub_object:0
+msgid "Sub-model"
+msgstr "Sub-model"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Body (Plain Text)"
+msgstr "Telo teksta (Plain Text)"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Body (Text)"
+msgstr "Telo teksta (Text)"
+
+#. module: email_template
+#: field:email_template.mailbox,date_mail:0
+msgid "Rec/Sent Date"
+msgstr "Datum Slanja/Prijema"
+
+#. module: email_template
+#: field:email.template,report_template:0
+msgid "Report to send"
+msgstr "Izvestaj za slanje"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Server Information"
+msgstr "podaci o serveru"
+
+#. module: email_template
+#: field:email_template.send.wizard,generated:0
+msgid "No of generated Mails"
+msgstr "Br. Generisanih poruka"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Mail Details"
+msgstr "Detalji poruke"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "SMTP SERVER or PORT not specified"
+msgstr "SMTP SERVER ili PORT nije specificiran"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Note: This is Raw HTML."
+msgstr "Napomena: Ovo je Raw HTML."
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Multiple Mail Wizard Step 1"
+msgstr "Visestruki Carobnjak Meilova Korak 1"
+
+#. module: email_template
+#: field:email_template.account,user:0
+msgid "Related User"
+msgstr "Vezni Korisnik"
+
+#. module: email_template
+#: field:email_template.mailbox,body_html:0
+msgid "Body (Rich Text Clients Only)"
+msgstr "Telo poruke (Rich Text Clients Only)"
+
+#. module: email_template
+#: selection:email_template.account,company:0
+msgid "Yes"
+msgstr "Da"
+
+#. module: email_template
+#: field:email.template,ref_ir_act_window:0
+msgid "Window Action"
+msgstr "Radnja prozora"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid ""
+"Datetime Extraction failed.Date:%s \\n \tError:%s"
+msgstr ""
+"Preuzimanje datuma i vremena nije uspelo. Datum:Date:%s \\n \tGreska:%s"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "SMTP Server"
+msgstr "SMTP server"
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "HTML, otherwise Text"
+msgstr "HTML, a drugacije Text"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Drafts"
+msgstr "U pripremi"
+
+#. module: email_template
+#: selection:email_template.account,company:0
+msgid "No"
+msgstr "Ne"
+
+#. module: email_template
+#: field:email_template.mailbox,mail_type:0
+msgid "Mail Contents"
+msgstr "Sadrzaj Poste"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "The template name must be unique !"
+msgstr "Ime Sablona mora biti jedinstveno"
+
+#. module: email_template
+#: field:email.template,def_bcc:0
+#: field:email_template.mailbox,email_bcc:0
+#: field:email_template.preview,bcc:0
+#: field:email_template.send.wizard,bcc:0
+msgid "BCC"
+msgstr "BCC"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid ""
+"Mail from Account %s failed. Probable Reason:Server Send Error\n"
+"Description: %s"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Plain Text"
+msgstr "Samo tekst"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Draft"
+msgstr "Priprema"
+
+#. module: email_template
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Greska! Ne mozete kreirati rekursivni meni."
+
+#. module: email_template
+#: field:email.template,model_int_name:0
+msgid "Model Internal Name"
+msgstr "Interni Naziv Modula"
+
+#. module: email_template
+#: field:email.template,message_id:0
+#: field:email_template.mailbox,message_id:0
+#: field:email_template.preview,message_id:0
+#: field:email_template.send.wizard,message_id:0
+msgid "Message-ID"
+msgstr "Sifra Poruke"
+
+#. module: email_template
+#: help:email_template.mailbox,server_ref:0
+msgid "Applicable for inward items only"
+msgstr "Prihvatljivo samo za unutrasnje stavke"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"After clicking send all mails, mails will be sent to outbox and cleared in "
+"next Send/Recieve"
+msgstr ""
+"Nakon klika na 'posalji sve poruke', poruke ce biti poslate u outbox i "
+"ociscene u sledecem koraku Posalji/Primi"
+
+#. module: email_template
+#: field:email_template.account,state:0
+#: field:email_template.mailbox,state:0
+#: field:email_template.send.wizard,state:0
+msgid "Status"
+msgstr "Status"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Outgoing"
+msgstr "Odlazno"
+
+#. module: email_template
+#: selection:email_template.account,state:0
+msgid "Initiated"
+msgstr "Inicirano"
+
+#. module: email_template
+#: help:email.template,use_sign:0
+msgid "the signature from the User details will be appended to the mail"
+msgstr "Potpis iz detalja korisnika ce biti pridodat poruci"
+
+#. module: email_template
+#: field:email_template.send.wizard,from:0
+msgid "From Account"
+msgstr "Od Naloga"
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Intermixed content"
+msgstr "Izmesani sadrzaj"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Request Re-activation"
+msgstr "Zahtev za Re-Aktivacijom"
+
+#. module: email_template
+#: view:email.template:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_tree_all
+msgid "Email Templates"
+msgstr "Sabloni Poruka"
+
+#. module: email_template
+#: field:email_template.account,smtpuname:0
+msgid "User Name"
+msgstr "KorisniÄko ime"
+
+#. module: email_template
+#: field:email.template,sub_model_object_field:0
+msgid "Sub Field"
+msgstr "Pod Polje"
+
+#. module: email_template
+#: field:email_template.mailbox,user:0
+msgid "User"
+msgstr "Korisnik"
+
+#. module: email_template
+#: help:email.template,allowed_groups:0
+msgid ""
+"Only users from these groups will be allowed to send mails from this Template"
+msgstr ""
+"Samo korisnicima iz ovih grupa ce biti dozvoljeno da salju poruke iz ovog "
+"Sablona"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Outbox"
+msgstr "OutBox"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Save in Drafts"
+msgstr "Sacuvaj u Pripremi"
+
+#. module: email_template
+#: help:email.template,def_subject:0
+msgid "The default subject of email. Placeholders can be used here."
+msgstr ""
+"Podrazumevana Tema poruke. Razmaknice se mogu ovde koristiti ( donja crta)"
+
+#. module: email_template
+#: field:email_template.account,smtptls:0
+msgid "TLS"
+msgstr "TLS"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"Add here all attachments of the current document you want to include in the "
+"e-mail."
+msgstr ""
+"Ubaci ovde sve attachmente za dati dokument koji zelis da prikljucis poruci"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_send_wizard
+msgid "This is the wizard for sending mail"
+msgstr "Craobnjak Slanja Poste"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_mailbox.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: model:ir.ui.menu,name:email_template.menu_email_template
+#, python-format
+msgid "Email Template"
+msgstr "Sablon Poruka"
+
+#. module: email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
+msgid "Personal Mails"
+msgstr "Licne Poruke"
+
+#. module: email_template
+#: code:addons/email_template/email_template_mailbox.py:0
+#, python-format
+msgid ""
+"Error sending mail: %s\" % str(e)))\n"
+" \n"
+" def send_all_mail(self, cr, uid, ids=None, context=None):\n"
+" if ids is None:\n"
+" ids = []\n"
+" if context is None:\n"
+" context = {}\n"
+" filters = [('folder', '=', 'outbox"
+msgstr ""
+"Greska slanja poruke: %s\" % str(e)))\n"
+" \n"
+" def send_all_mail(self, cr, uid, ids=None, context=None):\n"
+"if ids is None:\n"
+"ids = []\n"
+"if context is None:\n"
+"context = {}\n"
+"filters = [('folder', '=', 'outbox"
+
+#. module: email_template
+#: field:email.template,file_name:0
+msgid "File Name Pattern"
+msgstr "Ime fajla paterna"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "Send Mail (%s)"
+msgstr "Slanje POruke (%s)"
+
+#. module: email_template
+#: field:email_template.send.wizard,report:0
+msgid "Report File Name"
+msgstr "Ime Fajla Izvestaja"
+
+#. module: email_template
+#: field:email.template,copyvalue:0
+msgid "Expression"
+msgstr "Izraz"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,history:0
+msgid "History"
+msgstr "Istorija"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "Django templates not installed"
+msgstr "Django Sabloni nisu instalirani"
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,attachments_ids:0
+#: view:email_template.send.wizard:0
+#: field:email_template.send.wizard,attachment_ids:0
+msgid "Attachments"
+msgstr "Prilozi"
+
+#. module: email_template
+#: field:email_template.preview,to:0
+#: field:email_template.send.wizard,to:0
+msgid "To"
+msgstr "Za"
+
+#. module: email_template
+#: field:email_template.account,smtpport:0
+msgid "SMTP Port "
+msgstr "SMTP Port "
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Text, otherwise HTML"
+msgstr "Text, inace HTML"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#, python-format
+msgid "Copy of template "
+msgstr "Kopija Sablona "
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Discard Mail"
+msgstr "Izbrisi poruku"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template
+msgid "Email Templates for Models"
+msgstr "Sabloni Poruka za Modele"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Close"
+msgstr "Zatvori"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Body (HTML-Web Client Only)"
+msgstr "Sadrzaj (HTML-Web Client Only)"
+
+#. module: email_template
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da poÄinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid "%s (Email Attachment)"
+msgstr "Copy text \t %s (Email Attachment)"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid ""
+"No personal email accounts are configured for you. \n"
+"Either ask admin to enforce an account for this template or get yourself a "
+"personal email account."
+msgstr ""
+"Ni jedan locni nalog nije kreiran za vas. \n"
+"Ili pitajte administratora ili napravite sami sebi licni postanski nalog."
+
+#. module: email_template
+#: field:email.template,allowed_groups:0
+msgid "Allowed User Groups"
+msgstr "Dozvoljene Korisnicke Grupe"
+
+#. module: email_template
+#: field:email.template,model_object_field:0
+msgid "Field"
+msgstr "Polje"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "User Information"
+msgstr "Podaci o korisniku"
+
+#. module: email_template
+#: view:email_template.account:0
+#: selection:email_template.account,state:0
+msgid "Suspended"
+msgstr "СуÑпендован"
+
+#. module: email_template
+#: field:email_template.mailbox,folder:0
+msgid "Folder"
+msgstr "Fascikla"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Trash"
+msgstr "Smeće"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_mailbox
+msgid "Email Mailbox"
+msgstr "Postansko Sanduce"
+
+#. module: email_template
+#: help:email_template.account,smtpuname:0
+msgid ""
+"Specify the username if your SMTP server requires authentication, otherwise "
+"leave it empty."
+msgstr ""
+"Specificiraj korisnicko ime ako tvoj SMTP zahteva autorizaciju, inace ostavi "
+"prazno."
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid "Missing mail account"
+msgstr "Nedostaje Email nalog"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "SMTP Test Connection Was Successful"
+msgstr "SMTP test je prosao uspesno"
+
+#. module: email_template
+#: model:ir.module.module,shortdesc:email_template.module_meta_information
+msgid "Email Template for OpenERP"
+msgstr "Sablon poruka za OpenERP"
+
+#. module: email_template
+#: field:email_template.account,name:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Create Action"
+msgstr "Kreiraj akciju"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Mail from Account %s failed. Probable Reason:Account not approved"
+msgstr "Poruka sa naloga %s nije uspela. Moguci razlog: Nalog nije omogucen"
+
+#. module: email_template
+#: field:email.template,null_value:0
+msgid "Null Value"
+msgstr "Null вредноÑÑ‚"
+
+#. module: email_template
+#: field:email.template,template_language:0
+msgid "Templating Language"
+msgstr "Jezik Sablona"
+
+#. module: email_template
+#: field:email.template,def_cc:0
+#: field:email_template.mailbox,email_cc:0
+#: field:email_template.preview,cc:0
+#: field:email_template.send.wizard,cc:0
+msgid "CC"
+msgstr "CC"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Sent"
+msgstr "Poslato"
+
+#. module: email_template
+#: field:email_template.account,smtppass:0
+msgid "Password"
+msgstr "Lozinka"
+
+#. module: email_template
+#: help:email.template,message_id:0
+#: help:email_template.preview,message_id:0
+#: help:email_template.send.wizard,message_id:0
+msgid ""
+"The Message-ID header value, if you need tospecify it, for example to "
+"automatically recognize the replies later. Placeholders can be used here."
+msgstr ""
+"Vrednost Sifre poruke, ako trebas da je specificiras. Na primer da bi je "
+"automatski prepoznao kasnije."
+
+#. module: email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
+msgid "Emails"
+msgstr "Email-ovi"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Templates"
+msgstr "Å abloni"
+
+#. module: email_template
+#: field:email_template.preview,report:0
+msgid "Report Name"
+msgstr "Naziv izveštaja"
+
+#. module: email_template
+#: field:email.template,name:0
+msgid "Name"
+msgstr "Ime"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_preview
+msgid "Email Template Preview"
+msgstr "Pregled Sablona Poruke"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Email Preview"
+msgstr "Pregled Poruke"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Existing files"
+msgstr "Postojeci fajlovi"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Personal Accounts"
+msgstr "Licni Nalozi"
+
+#. module: email_template
+#: model:ir.module.module,description:email_template.module_meta_information
+msgid ""
+"\n"
+" Email Template is extraction of Power Email basically just to send the "
+"emails.\n"
+" "
+msgstr ""
+"\n"
+" Sablon Poruke je izvucen iz Power Email, samo da bi poslao poruke.\n"
+" "
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Body (HTML)"
+msgstr "Sadrzaj (HTML)"
+
+#. module: email_template
+#: help:email.template,table_html:0
+msgid ""
+"Copy this html code to your HTML message body for displaying the info in "
+"your mail."
+msgstr ""
+"Iskopiraj ovaj HTML kod u telo svoje HTML poruke da bi se prikazala "
+"informacija u vasoj poruci"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_account
+msgid "email_template.account"
+msgstr "email_template.account"
+
+#. module: email_template
+#: field:email.template,object_name:0
+#: field:email_template.preview,rel_model:0
+#: field:email_template.send.wizard,rel_model:0
+msgid "Model"
+msgstr "Model"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Core connection for the given ID does not exist"
+msgstr "Osnovna Konekcija za datu Sifru NE postoji"
+
+#. module: email_template
+#: field:email_template.account,company:0
+msgid "Corporate"
+msgstr "Saradjivanje"
+
+#. module: email_template
+#: help:email_template.account,smtpserver:0
+msgid "Enter name of outgoing server, eg:smtp.gmail.com "
+msgstr "Upisi ime izlaznog servera, npr: smtp.gmail.com "
+
+#. module: email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_company_mails
+msgid "Company Mails"
+msgstr "Poruke Preduzeca"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Addresses"
+msgstr "Adrese"
+
+#. module: email_template
+#: help:email.template,from_account:0
+msgid "Emails will be sent from this approved account."
+msgstr "Poruke ce biti poslate sa ovog omogucenog naloga"
+
+#. module: email_template
+#: field:email.template,def_subject:0
+msgid "Default Subject"
+msgstr "Predefinisana tema"
+
+#. module: email_template
+#: help:email.template,def_bcc:0
+msgid ""
+"Blind Carbon Copy address(es), comma-separated. Placeholders can be used "
+"here."
+msgstr ""
+"Blind Carbon Copy address(es), comma-separated. Placeholders can be used "
+"here."
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid ""
+"Mail from Account %s failed. Probable Reason:MIME Error\n"
+"Description: %s"
+msgstr ""
+"Poruka sa Naloga %s nije prosla. MOguci Razlog: MIME GRESKA\n"
+"Opis: %s"
+
+#. module: email_template
+#: field:email_template.account,send_pref:0
+msgid "Mail Format"
+msgstr "Format Poruke"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Actions"
+msgstr "Akcije"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Company Accounts"
+msgstr "Nalozi Preduzeca"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid "email-template"
+msgstr "sablon-poruke"
+
+#. module: email_template
+#: help:email.template,def_cc:0
+msgid ""
+"Carbon Copy address(es), comma-separated. Placeholders can be used here."
+msgstr ""
+"Carbon Copy address(es), comma-separated. Placeholders can be used here."
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Simple Mail Wizard Step 1"
+msgstr "Jednostavni Carobnjak POruka Korak 1"
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Has Attachments"
+msgstr "Ima Attachment"
+
+#. module: email_template
+#: help:email.template,track_campaign_item:0
+msgid ""
+"Enable this if you want the outgoing e-mails to include a tracking marker "
+"that makes it possible to identify the replies an link them back to the "
+"campaign item"
+msgstr ""
+"Omogucava vam , ako zelite da vase izlazne poruke sadrze markera pratnje "
+"koji vam daju mogucnost da kasnije identifikujete odgovore i posaljewte ih "
+"npr stavci Kampanje."
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#, python-format
+msgid "No Description"
+msgstr "Bez Opisa"
diff --git a/addons/email_template/security/email_template_security.xml b/addons/email_template/security/email_template_security.xml
index 7e6c1f4b560e2a0e0fad76092a423dbdf67e8ace..e3f3401217c374546bfa27f791494a3127f85c10 100755
--- a/addons/email_template/security/email_template_security.xml
+++ b/addons/email_template/security/email_template_security.xml
@@ -2,9 +2,5 @@
<openerp>
<data noupdate="0">
- <record id="base.res_groups_email_template_admin" model="res.groups">
- <field name="name">Marketing / User</field>
- </record>
-
</data>
</openerp>
diff --git a/addons/email_template/security/ir.model.access.csv b/addons/email_template/security/ir.model.access.csv
index fd5cf2d0f098c27b24c0cca621253922c6eb63b8..79135b0de4d782f72c87a6a42a1e637be85acaf3 100644
--- a/addons/email_template/security/ir.model.access.csv
+++ b/addons/email_template/security/ir.model.access.csv
@@ -1,7 +1,7 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_email_template_account","email_template.account","model_email_template_account","base.res_groups_email_template_admin",1,0,0,0
-"access_email_template","email.template","model_email_template","base.res_groups_email_template_admin",1,0,0,0
-"access_email_template_mailbox","email_template.mailbox","model_email_template_mailbox","base.res_groups_email_template_admin",1,1,1,1
+"access_email_template_account","email_template.account","model_email_template_account","marketing.group_marketing_user",1,0,0,0
+"access_email_template","email.template","model_email_template","marketing.group_marketing_user",1,0,0,0
+"access_email_template_mailbox","email_template.mailbox","model_email_template_mailbox","marketing.group_marketing_user",1,1,1,1
"access_email_template_account_system","email_template.account system","model_email_template_account","base.group_system",1,1,1,1
"access_email_template_system","email.template system","model_email_template","base.group_system",1,1,1,1
"access_email_template_mailbox_system","email_template.mailbox system","model_email_template_mailbox","base.group_system",1,0,0,0
diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 4e65009f422cc1154e124c5635bc7d547835305b..9f479a2d9412bde586d07d1d9f655a3832484dc2 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -39,7 +39,7 @@
Events / Reporting
""",
'author': 'OpenERP SA',
- 'depends': ['crm', 'base_contact', 'account'],
+ 'depends': ['crm', 'base_contact', 'account', 'marketing'],
'init_xml': [],
'update_xml': [
'security/event_security.xml',
diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml
index 6b223b2c4d078b06fd51a47eb445dc6401092ae9..d62e4336202a9eeca2ada77389b330d4d0868450 100644
--- a/addons/event/board_association_view.xml
+++ b/addons/event/board_association_view.xml
@@ -8,7 +8,7 @@
<field name="model">report.event.registration</field>
<field name="type">graph</field>
<field name="arch" type="xml">
- <graph string="Event on Registration" type="bar" >
+ <graph string="Events Filling Status" type="bar" >
<field name="event_id"/>
<field name="draft_state" operator="+"/>
<field name="confirm_state" operator="+"/>
@@ -18,9 +18,10 @@
</record>
<record model="ir.actions.act_window" id="act_event_reg">
- <field name="name">Events On Registrations</field>
+ <field name="name">Events Filling Status</field>
<field name="res_model">report.event.registration</field>
<field name="view_type">form</field>
+ <field name="domain">[('state','not in',('cancel','done'))]</field>
<field name="view_mode">graph,tree</field>
<field name="view_id" ref="view_report_event_reg_graph"/>
</record>
@@ -47,20 +48,19 @@
<child1>
<action string="Next Events"
name="%(act_event_view)d"
+ domain="[('state','not in',('cancel','done'))]"
colspan="4"/>
<action
- string="Unpaid Invoices"
- name="%(account.action_invoice_tree)d"
+ string="Unconfirmed Registrations"
+ name="%(event.act_event_list_register_event)d"
colspan="4"
- domain="[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','out_invoice')]"/>
+ domain="[('state','=','draft')]"/>
</child1>
<child2>
- <action string="Register Events"
+ <action string="Events Filling Status"
name="%(act_event_reg)d"
colspan="4"/>
-
</child2>
-
</hpaned>
</form>
</field>
@@ -80,7 +80,6 @@
sequence="1"
id="menu_board_associations_manager"
icon="terp-graph"/>
- <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17" action="open_board_associations_manager"/>
</data>
</openerp>
diff --git a/addons/event/event.py b/addons/event/event.py
index 192844f3f20330c5ba0143c128cf86667a031abe..61a24901b0a0ac75aed34b90016d0bf6d2cf465f 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -19,14 +19,14 @@
#
##############################################################################
+import time
+
from crm import crm
from osv import fields, osv
from tools.translate import _
-import time
import tools
import decimal_precision as dp
-
class event_type(osv.osv):
""" Event Type """
_name = 'event.type'
@@ -34,6 +34,7 @@ class event_type(osv.osv):
_columns = {
'name': fields.char('Event type', size=64, required=True),
}
+
event_type()
class event_event(osv.osv):
@@ -310,14 +311,14 @@ class event_registration(osv.osv):
_columns = {
'name': fields.char('Summary', size=124, readonly=True, states={'draft': [('readonly', False)]}),
- 'email_cc': fields.text('CC', size=252 , readonly=False, states={'done': [('readonly', True)]}, help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"),
+ 'email_cc': fields.text('CC', size=252, readonly=False, states={'done': [('readonly', True)]}, help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"),
'nb_register': fields.integer('Quantity', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="Number of Registrations or Tickets"),
'event_id': fields.many2one('event.event', 'Event', required=True, readonly=True, states={'draft': [('readonly', False)]}),
'partner_id': fields.many2one('res.partner', 'Partner', states={'done': [('readonly', True)]}),
"partner_invoice_id": fields.many2one('res.partner', 'Partner Invoiced', readonly=True, states={'draft': [('readonly', False)]}),
"contact_id": fields.many2one('res.partner.contact', 'Partner Contact', readonly=False, states={'done': [('readonly', True)]}), #TODO: filter only the contacts that have a function into the selected partner_id
"unit_price": fields.float('Unit Price', required=True, digits_compute=dp.get_precision('Sale Price'), readonly=True, states={'draft': [('readonly', False)]}),
- 'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute=dp.get_precision('Sale Price')),
+ 'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute=dp.get_precision('Sale Price'), store=True),
"badge_ids": fields.one2many('event.registration.badge', 'registration_id', 'Badges', readonly=False, states={'done': [('readonly', True)]}),
"event_product": fields.char("Invoice Name", size=128, readonly=True, states={'draft': [('readonly', False)]}),
"tobe_invoiced": fields.boolean("To be Invoiced", readonly=True, states={'draft': [('readonly', False)]}),
@@ -326,8 +327,8 @@ class event_registration(osv.osv):
'ref': fields.reference('Reference', selection=crm._links_get, size=128),
'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128),
'email_from': fields.char('Email', size=128, states={'done': [('readonly', True)]}, help="These people will receive email."),
- 'create_date': fields.datetime('Creation Date' , readonly=True),
- 'write_date': fields.datetime('Write Date' , readonly=True),
+ 'create_date': fields.datetime('Creation Date', readonly=True),
+ 'write_date': fields.datetime('Write Date', readonly=True),
'description': fields.text('Description', states={'done': [('readonly', True)]}),
'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
'log_ids': fields.one2many('mailgate.message', 'res_id', 'Logs', domain=[('history', '=', False),('model','=',_name)]),
@@ -346,21 +347,19 @@ class event_registration(osv.osv):
_defaults = {
'nb_register': 1,
'tobe_invoiced': True,
- 'state': lambda *a: 'draft',
- 'active': lambda *a: 1,
+ 'state': 'draft',
+ 'active': 1,
'user_id': lambda self, cr, uid, ctx: uid,
}
def _make_invoice(self, cr, uid, reg, lines, context=None):
""" Create Invoice from Invoice lines
- @param reg : Model of Event Registration
+ @param reg: Model of Event Registration
@param lines: Ids of Invoice lines
"""
if context is None:
context = {}
inv_pool = self.pool.get('account.invoice')
- inv_lines_pool = self.pool.get('account.invoice.line')
-
val_invoice = inv_pool.onchange_partner_id(cr, uid, [], 'out_invoice', reg.partner_invoice_id.id, False, False)
val_invoice['value'].update({'partner_id': reg.partner_invoice_id.id})
val_invoice['value'].update({
@@ -393,12 +392,9 @@ class event_registration(osv.osv):
context['date_inv'] = date_inv
for reg in self.browse(cr, uid, ids, context=context):
-
val_invoice = inv_pool.onchange_partner_id(cr, uid, [], 'out_invoice', reg.partner_invoice_id.id, False, False)
-
val_invoice['value'].update({'partner_id': reg.partner_invoice_id.id})
partner_address_id = val_invoice['value']['address_invoice_id']
-
if not partner_address_id:
raise osv.except_osv(_('Error !'),
_("Registered partner doesn't have an address to make the invoice."))
@@ -407,7 +403,6 @@ class event_registration(osv.osv):
product = product_pool.browse(cr, uid, reg.event_id.product_id.id, context=context)
for tax in product.taxes_id:
tax_ids.append(tax.id)
-
vals = value['value']
c_name = reg.contact_id and ('-' + contact_pool.name_get(cr, uid, [reg.contact_id.id])[0][1]) or ''
vals.update({
@@ -419,17 +414,16 @@ class event_registration(osv.osv):
})
inv_line_ids = self._create_invoice_lines(cr, uid, [reg.id], vals)
invoices.setdefault(reg.partner_id.id, []).append((reg, inv_line_ids))
-
for val in invoices.values():
res = False
if grouped:
- res = self._make_invoice(cr, uid, val[0][0], [v for k , v in val], context=context)
+ res = self._make_invoice(cr, uid, val[0][0], [v for k, v in val], context=context)
- for k , v in val:
+ for k, v in val:
self.do_close(cr, uid, [k.id], context={'invoice_id': res})
else:
- for k , v in val:
+ for k, v in val:
res = self._make_invoice(cr, uid, k, [v], context=context)
self.do_close(cr, uid, [k.id], context={'invoice_id': res})
if res: new_invoice_ids.append(res)
@@ -466,6 +460,8 @@ class event_registration(osv.osv):
"""
if not context:
context = {}
+ if type(ids) in (int, long,):
+ ids = [ids]
data_pool = self.pool.get('ir.model.data')
unconfirmed_ids = []
for registration in self.browse(cr, uid, ids, context=context):
@@ -529,8 +525,7 @@ class event_registration(osv.osv):
"""
registrations = self.browse(cr, uid, ids)
self.history(cr, uid, registrations, _('Cancel'))
- self.write(cr, uid, ids, {'state': 'cancel'})
- return True
+ return self.write(cr, uid, ids, {'state': 'cancel'})
def mail_user(self, cr, uid, ids, confirm=False, context=None):
"""
@@ -583,7 +578,7 @@ class event_registration(osv.osv):
def onchange_contact_id(self, cr, uid, ids, contact, partner):
- """This function returns value of Badge Name , Badge Title based on Partner contact.
+ """This function returns value of Badge Name, Badge Title based on Partner contact.
@param self: The object pointer
@param cr: the current row, from the database cursor,
@param uid: the current user’s ID for security checks,
@@ -594,7 +589,6 @@ class event_registration(osv.osv):
data ={}
if not contact:
return data
- contact_obj = self.pool.get('res.partner.contact')
addr_obj = self.pool.get('res.partner.address')
job_obj = self.pool.get('res.partner.job')
@@ -674,7 +668,6 @@ class event_registration(osv.osv):
data['contact_id'] = job_obj.browse(cr, uid, job_ids[0]).contact_id.id
d = self.onchange_contact_id(cr, uid, ids, data['contact_id'], part)
data.update(d['value'])
- partner_data = res_obj.browse(cr, uid, part)
return {'value': data}
def onchange_partner_invoice_id(self, cr, uid, ids, event_id, partner_invoice_id):
@@ -719,7 +712,7 @@ class event_registration_badge(osv.osv):
"name": fields.char('Name', size=128, required=True),
"address_id": fields.many2one('res.partner.address', 'Address'),
}
-event_registration_badge()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+event_registration_badge()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
index 4603a9cf141cba6f337f2c55777034b1d3852462..5cbfecde4ebb6adfae0209271499659130daf5bc 100644
--- a/addons/event/event_demo.xml
+++ b/addons/event/event_demo.xml
@@ -91,5 +91,38 @@
</record>
<function model="event.event" name="button_confirm" eval="[ref('event_2')]"/>
<function model="event.event" name="button_done" eval="[ref('event_2')]"/>
+
+<!-- Demo data for Event Registration-->
+ <record id="reg_1_1" model="event.registration">
+ <field name="event_id" ref="event_1"/>
+ <field name="partner_id" ref="base.res_partner_asus"/>
+ <field name="partner_invoice_id" ref="base.res_partner_asus"/>
+ <field name="nb_register">5</field>
+ <field name="event_product">Ticket for Opera</field>
+ <field name="unit_price">24.00</field>
+ </record>
+
+ <record id="reg_1_2" model="event.registration">
+ <field name="event_id" ref="event_1"/>
+ <field name="partner_id" ref="base.res_partner_agrolait"/>
+ <field name="partner_invoice_id" ref="base.res_partner_agrolait"/>
+ <field name="nb_register">10</field>
+ <field name="event_product">Ticket for Opera</field>
+ <field name="unit_price">24.00</field>
+ </record>
+
+ <function model="event.registration" name="check_confirm" eval="[ref('reg_1_2')]"/>
+
+ <record id="reg_0_1" model="event.registration">
+ <field name="event_id" ref="event_0"/>
+ <field name="partner_id" ref="base.res_partner_c2c"/>
+ <field name="partner_invoice_id" ref="base.res_partner_c2c"/>
+ <field name="nb_register">6</field>
+ <field name="event_product">Ticket for Concert</field>
+ <field name="unit_price">15.50</field>
+ </record>
+
+ <function model="event.registration" name="check_confirm" eval="[ref('reg_0_1')]"/>
+
</data>
</openerp>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 04ae5ce9c5676f2c63316591d3d52d6c56b606e5..918147b79cb08388c0cbfde610500f6dd47ff140 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -240,7 +240,6 @@
domain="[('user_id','=',uid)]"/>
</field>
<field name="date_begin" select="1"/>
- <field name="state" select="1"/>
<field name="section_id" default="context.get('section_id', False)" widget="selection" groups="base.group_extended">
<filter icon="terp-personal+"
context="{'invisible_section': False}"
@@ -273,6 +272,7 @@
<field name="view_mode">tree,form,calendar,graph</field>
<field name="context">{"search_default_draft": "1", "search_default_section_id": section_id}</field>
<field name="search_view_id" ref="view_event_search"/>
+ <field name="help">Event is the low-level object used by meeting and others documents that have to be synchronized with mobile or calendar applications through caldav. Most of the users should work on the Calendar menu, and not on the list of events.</field>
</record>
<act_window
@@ -449,7 +449,7 @@
<field name="type">calendar</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
- <calendar color="event_id" date_start="date" date_delay="duration" string="Event Registration">
+ <calendar color="event_id" date_start="date" date_delay="date_closed" string="Event Registration">
<field name="event_id"/>
<field name="partner_invoice_id"/>
</calendar>
diff --git a/addons/event/i18n/sr.po b/addons/event/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..8c204fdbea8be3a264059664836413b2b0685cab
--- /dev/null
+++ b/addons/event/i18n/sr.po
@@ -0,0 +1,646 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-17 07:58+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-18 04:55+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: event
+#: field:event.event,date_end:0
+#: field:report.event.registration,date_end:0
+msgid "Ending date"
+msgstr "Datum zavrsetka"
+
+#. module: event
+#: field:event.event,register_min:0
+msgid "Minimum Registrations"
+msgstr "Registracioni Minimum"
+
+#. module: event
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: event
+#: field:event.event,mail_registr:0
+msgid "Registration Email"
+msgstr ""
+
+#. module: event
+#: model:crm.case.section,name:event.event_0_crm_case_section
+msgid "Concert of Bon Jovi"
+msgstr "Bon Jovi Koncert"
+
+#. module: event
+#: field:event.event,mail_confirm:0
+msgid "Confirmation Email"
+msgstr "Konfirmacioni Email"
+
+#. module: event
+#: constraint:crm.case.section:0
+msgid "Error ! You cannot create recursive sections."
+msgstr "Greška ! Ne možete stvarati rekurzivne sekcije."
+
+#. module: event
+#: model:ir.model,name:event.model_event_registration
+msgid "Event Registration"
+msgstr "Registracioni Dogadjaj"
+
+#. module: event
+#: model:ir.actions.wizard,name:event.event_reg_invoice
+msgid "Make Invoice"
+msgstr "Kreiraj raÄun"
+
+#. module: event
+#: field:report.event.type.registration,draft_state:0
+msgid "Draft Registrations"
+msgstr "Registracije u Pripremi"
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Event on Registration"
+msgstr "Sogadjaj pri registraciji"
+
+#. module: event
+#: wizard_button:event.reg_make_invoice,init,end:0
+msgid "Ok"
+msgstr "U redu"
+
+#. module: event
+#: field:event.event,mail_auto_confirm:0
+msgid "Mail Auto Confirm"
+msgstr "Auto potvrdjivanje Email-a"
+
+#. module: event
+#: model:product.template,name:event.event_product_1_product_template
+msgid "Ticket for Opera"
+msgstr "Karta za Operu"
+
+#. module: event
+#: wizard_field:event.reg_make_invoice,init,inv_rejected:0
+msgid "Invoice Rejected"
+msgstr "Racun Odbijen"
+
+#. module: event
+#: view:event.event:0
+msgid "Confirm Event"
+msgstr "Potvrdi Dogadjaj"
+
+#. module: event
+#: model:crm.case.section,name:event.event_1_crm_case_section
+msgid "Opera of Verdi"
+msgstr "Verdijeva Opera"
+
+#. module: event
+#: field:report.event.registration,draft_state:0
+msgid "Draft Registration"
+msgstr "Registracija u pripremi"
+
+#. module: event
+#: wizard_view:event.reg_make_invoice,init:0
+msgid "Create Invoices"
+msgstr "Kreiraj Racune"
+
+#. module: event
+#: model:ir.module.module,description:event.module_meta_information
+msgid ""
+"Organization and management of events.\n"
+"\n"
+" This module allow you\n"
+" * to manage your events and their registrations\n"
+" * to use emails to automatically confirm and send acknowledgements "
+"for any registration to an event\n"
+" * ...\n"
+"\n"
+" Note that:\n"
+" - You can define new types of events in\n"
+" Events / Configuration / Types of Events\n"
+" - You can access predefined reports about number of registration per "
+"event or per event category in :\n"
+" Events / Reporting\n"
+msgstr ""
+"Organizacija i Upravljanje Dogadjajima\n"
+"\n"
+" Ovaj vam modul omogucuje\n"
+" *da upravljate dogadjajima i njihovim registracijama\n"
+" *da koristite Emailove za automatsku potvrdu i slanje upozorenja za "
+"bilo koju registraciju nekog dogadjaja\n"
+" *\n"
+" Upamtite da:\n"
+" -Mozete da definisete nove tipove dogadjaja u\n"
+" "
+"Dogadjaji/Podesavanja/Tipovi Dogadjaja\n"
+" -Mozete da pristupite predefinisanim izvestajima o broju registracija po "
+"dogadjaju ili cak po kategorijama u:\n"
+" "
+"Dogadjaji/Izvestavanje\n"
+
+#. module: event
+#: view:event.registration:0
+msgid "Extra Info"
+msgstr "Dodatne Informacije"
+
+#. module: event
+#: view:event.registration:0
+msgid "Registration"
+msgstr "Registracija"
+
+#. module: event
+#: field:event.type,name:0
+#: model:ir.model,name:event.model_event_type
+msgid "Event type"
+msgstr "Tip dogadjaja"
+
+#. module: event
+#: view:event.event:0
+#: model:ir.model,name:event.model_event_event
+#: model:ir.module.module,shortdesc:event.module_meta_information
+#: field:report.event.registration,name:0
+msgid "Event"
+msgstr "Događaj"
+
+#. module: event
+#: selection:event.event,state:0
+msgid "Confirmed"
+msgstr "Potvrđeno"
+
+#. module: event
+#: wizard_view:event.confirm_registration,split:0
+msgid "Registration Confirmation"
+msgstr "Potvrda Registracije"
+
+#. module: event
+#: view:event.registration:0
+msgid "Dates"
+msgstr "Datumi"
+
+#. module: event
+#: field:event.event,register_current:0
+#: model:ir.actions.act_window,name:event.action_registration_confirm
+#: model:ir.ui.menu,name:event.menu_action_registration_confirm
+msgid "Confirmed Registrations"
+msgstr "Potvrdjene Registracije"
+
+#. module: event
+#: field:event.event,mail_auto_registr:0
+msgid "Mail Auto Register"
+msgstr "Auto Registracija Mailom"
+
+#. module: event
+#: view:event.registration:0
+msgid "Badge"
+msgstr "Znacka"
+
+#. module: event
+#: field:event.event,section_id:0
+msgid "Case section"
+msgstr "Tip Sekcije"
+
+#. module: event
+#: field:event.registration,tobe_invoiced:0
+msgid "To be Invoiced"
+msgstr "Da bude Fakturisano"
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_event_event
+msgid "All Events"
+msgstr "Svi Dogadjaji"
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_report_event
+msgid "Reporting"
+msgstr "Izveštavanje"
+
+#. module: event
+#: view:event.registration:0
+msgid "Cancel Registration"
+msgstr "Otkazi Registraciju"
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_action_event_categories
+msgid "Events by Categories"
+msgstr "Dogadjaji po Kategorijama"
+
+#. module: event
+#: wizard_view:event.confirm_registration,split:0
+msgid "The event limit is reached. What do you want to do?"
+msgstr "Limit Dogadjaja je postignut. Sta zelis da uradis?"
+
+#. module: event
+#: field:report.event.type.registration,confirm_state:0
+msgid "Confirm Registrations"
+msgstr "potvrdi Registraciju"
+
+#. module: event
+#: view:event.registration:0
+msgid "References"
+msgstr "Reference"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_event_type_registration
+#: model:ir.ui.menu,name:event.menu_report_event_type_registration
+#: view:report.event.type.registration:0
+msgid "Registration By Event Types"
+msgstr "Registracije po Tipu Dogadjaja"
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_event_config
+msgid "Configuration"
+msgstr "Podešavanje"
+
+#. module: event
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: event
+#: wizard_button:event.confirm_registration,split,confirm:0
+msgid "Confirm Anyway"
+msgstr "Sve jedno Potvrdi"
+
+#. module: event
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr ""
+"GreÅ¡ka: JU (jedinice usluga) i JM moraju da budu u razliÄitim kategorijama"
+
+#. module: event
+#: view:event.event:0
+msgid "Parent Category"
+msgstr "Roditeljska Kategorija"
+
+#. module: event
+#: view:event.registration:0
+msgid "Registration Invoiced"
+msgstr "Registracija fakturisana"
+
+#. module: event
+#: field:report.event.type.registration,nbevent:0
+msgid "Number Of Events"
+msgstr "Broj Dogadjaja"
+
+#. module: event
+#: view:event.event:0
+msgid "Cancel Event"
+msgstr "Otkazi Dogadjaj"
+
+#. module: event
+#: wizard_field:event.reg_make_invoice,init,inv_rej_reason:0
+msgid "Error Messages"
+msgstr "Poruke o greskama"
+
+#. module: event
+#: view:event.event:0
+msgid "Mailing"
+msgstr "E-Postanska"
+
+#. module: event
+#: model:product.template,name:event.event_product_0_product_template
+msgid "Ticket for Concert"
+msgstr "Karta za koncert"
+
+#. module: event
+#: field:event.event,register_prospect:0
+#: model:ir.actions.act_window,name:event.action_registration_draft
+#: model:ir.ui.menu,name:event.menu_action_registration_draft
+msgid "Unconfirmed Registrations"
+msgstr "Nepotvrdjene Registracije"
+
+#. module: event
+#: field:event.registration,partner_invoice_id:0
+msgid "Partner Invoiced"
+msgstr "Partner Fakturisan"
+
+#. module: event
+#: view:event.registration:0
+msgid "Communication history"
+msgstr "Istorija Komunikacija"
+
+#. module: event
+#: selection:event.event,state:0
+msgid "Canceled"
+msgstr "Отказано"
+
+#. module: event
+#: view:event.event:0
+msgid "Event Done"
+msgstr "Dogadjaj Zavrsen"
+
+#. module: event
+#: field:event.registration,badge_name:0
+msgid "Badge Name"
+msgstr "Naziv Znacke"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_event_registration
+#: model:ir.ui.menu,name:event.menu_report_event_registration
+msgid "Events On Registrations"
+msgstr "Dogadjaji pri Registraciji"
+
+#. module: event
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+"Greška: Podrazumevana JM i kupljena JM moraju da budu u istoj kategoriji."
+
+#. module: event
+#: wizard_field:event.reg_make_invoice,init,inv_created:0
+msgid "Invoice Created"
+msgstr "Racun Kreiran"
+
+#. module: event
+#: view:event.event:0
+msgid "Statistics"
+msgstr "Statistike"
+
+#. module: event
+#: selection:event.event,state:0
+msgid "Draft"
+msgstr "Priprema"
+
+#. module: event
+#: view:event.event:0
+msgid "Event description"
+msgstr "Opis Dogadjaja"
+
+#. module: event
+#: model:ir.model,name:event.model_report_event_type_registration
+msgid "Event type on registration"
+msgstr "Tip Dogadjaja pri registraciji"
+
+#. module: event
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da poÄinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: event
+#: field:event.registration,event_id:0
+msgid "Event Related"
+msgstr "Vezani Dogadjaj"
+
+#. module: event
+#: model:crm.case.section,name:event.case_section_event
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.action_event_view
+msgid "Events"
+msgstr "Događaji"
+
+#. module: event
+#: field:event.registration,nb_register:0
+msgid "Number of Registration"
+msgstr "Broj Registracija"
+
+#. module: event
+#: view:event.event:0
+#: field:event.event,state:0
+#: view:event.registration:0
+msgid "Status"
+msgstr "Status"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_event_categories
+msgid "Events by section"
+msgstr "Dogadjaji po Sekciji"
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_action_registration
+msgid "All Registrations"
+msgstr "Sve Registracije"
+
+#. module: event
+#: help:event.event,mail_auto_registr:0
+msgid ""
+"Check this box if you want to use the automatic mailing for new registration"
+msgstr ""
+"Cekiraj ovu Kucicu ako zelite da koristite automatski mailing pri novoj "
+"registraciji"
+
+#. module: event
+#: view:event.event:0
+msgid "Set To Draft"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+#: model:ir.actions.wizard,name:event.event_confirm_registration
+#: field:report.event.registration,confirm_state:0
+msgid "Confirm Registration"
+msgstr "Posalji na Pripremu"
+
+#. module: event
+#: view:event.registration:0
+msgid "History"
+msgstr "Istorija"
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_event_type
+msgid "Types of Events"
+msgstr "Tipovi Dogadjaja"
+
+#. module: event
+#: field:event.registration,contact_id:0
+msgid "Partner Contact"
+msgstr "Kontakt partnera"
+
+#. module: event
+#: view:event.event:0
+msgid "Auto Confirmation Email"
+msgstr "Auto-Mail za potvrdu"
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+msgid "General"
+msgstr "Opšte"
+
+#. module: event
+#: view:event.registration:0
+msgid "Send Reminder"
+msgstr "Posalji Podsetnik"
+
+#. module: event
+#: selection:event.event,state:0
+msgid "Done"
+msgstr "Gotovo"
+
+#. module: event
+#: field:event.event,date_begin:0
+#: field:report.event.registration,date_begin:0
+msgid "Beginning date"
+msgstr "Datum pocetka"
+
+#. module: event
+#: field:event.registration,invoice_id:0
+msgid "Invoice"
+msgstr "RaÄun"
+
+#. module: event
+#: model:ir.model,name:event.model_report_event_registration
+msgid "Events on registrations"
+msgstr "Dogadjaji pri Registraciji"
+
+#. module: event
+#: wizard_button:event.confirm_registration,split,end:0
+msgid "Cancel"
+msgstr "Otkaži"
+
+#. module: event
+#: wizard_button:event.reg_make_invoice,init,open:0
+msgid "Open"
+msgstr "Otvori"
+
+#. module: event
+#: field:event.registration,badge_title:0
+msgid "Badge Title"
+msgstr "Naslov Znacke"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_new_event_form
+#: model:ir.ui.menu,name:event.menu_event_new_event
+msgid "New event"
+msgstr "Novi Dogadjaj"
+
+#. module: event
+#: field:event.registration,unit_price:0
+msgid "Unit Price"
+msgstr "JediniÄna cijena"
+
+#. module: event
+#: model:crm.case.section,name:event.event_2_crm_case_section
+msgid "Conference on ERP Buisness"
+msgstr "Konferencija o ERP Biznisu"
+
+#. module: event
+#: field:event.registration,badge_partner:0
+msgid "Badge Partner"
+msgstr "Partner Znacke"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_event_view_confirm
+#: model:ir.ui.menu,name:event.menu_event_event_confirm
+msgid "Confirmed Events"
+msgstr "Potvrdi Dogadjaje"
+
+#. module: event
+#: field:event.event,register_max:0
+#: field:report.event.registration,register_max:0
+msgid "Maximum Registrations"
+msgstr "Maksimum Registracija"
+
+#. module: event
+#: field:event.event,type:0
+msgid "Type"
+msgstr "Tip"
+
+#. module: event
+#: help:event.event,mail_registr:0
+msgid "This email will be sent when someone subscribes to the event."
+msgstr "Ovaj ce Email biti poslan kada se neko bude prijavio za dogadjaj"
+
+#. module: event
+#: model:product.template,name:event.event_product_2_product_template
+msgid "Ticket for Conference"
+msgstr "Karta za konferenciju"
+
+#. module: event
+#: field:event.registration,case_id:0
+msgid "Case"
+msgstr "Slucaj"
+
+#. module: event
+#: view:event.event:0
+msgid "Name"
+msgstr "Ime"
+
+#. module: event
+#: help:event.event,mail_auto_confirm:0
+msgid ""
+"Check this box if you want ot use the automatic confirmation emailing or the "
+"reminder"
+msgstr ""
+"Cekiraj ovu kucicu ako zelis da koristis automatsko slanje E-podsetnika"
+
+#. module: event
+#: help:event.event,mail_confirm:0
+msgid ""
+"This email will be sent when the event gets confimed or when someone "
+"subscribes to a confirmed event. This is also the email sent to remind "
+"someone about the event."
+msgstr ""
+"Ovaj ce Email biti poslan kada se dogadjaj potvrdi ili kada se neko upise na "
+"potvrdjeni dogadjaj. Ovo je takodje Email koji ce biti poslat da podseti "
+"nekog o dogadjaju."
+
+#. module: event
+#: field:event.event,product_id:0
+msgid "Product"
+msgstr "Proizvod"
+
+#. module: event
+#: field:event.registration,invoice_label:0
+msgid "Label Invoice"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Payments"
+msgstr "Isplate"
+
+#. module: event
+#: view:event.type:0
+#: field:report.event.type.registration,name:0
+msgid "Event Type"
+msgstr "Vrsta događaja"
+
+#. module: event
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.action_registration
+#: model:ir.actions.wizard,name:event.wizard_event_registration
+msgid "Registrations"
+msgstr "Registracije"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_event_view_draft
+#: model:ir.ui.menu,name:event.menu_event_event_draft
+msgid "Draft Events"
+msgstr "Dodgadjaji iz Pripreme"
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_event_main
+msgid "Events Organisation"
+msgstr "Organizacija Dogadjaja"
+
+#. module: event
+#: view:event.registration:0
+msgid "Actions"
+msgstr "Akcije"
+
+#. module: event
+#: model:ir.actions.wizard,name:event.wizard_event_reg_partners
+msgid "List Register Partners"
+msgstr "Spisak Registrovanih Partnera"
+
+#. module: event
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Greška: Neispravan EAN kod"
+
+#. module: event
+#: view:event.event:0
+msgid "Auto Registration Email"
+msgstr "Auto Registracioni Email"
diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py
index 1aa0af9ee2bcad698cc00fe2af8a44b1c3141c47..1b586f3f3015263e8f2d7794adf25214d14bf2f7 100644
--- a/addons/event/report/report_event_registration.py
+++ b/addons/event/report/report_event_registration.py
@@ -25,25 +25,28 @@ import tools
class report_event_registration(osv.osv):
_name = "report.event.registration"
- _description = "Events on registrations and Events on type"
+ _description = "Events Analysis"
_auto = False
_rec_name = 'date'
_columns = {
- 'date': fields.date('Date', readonly=True),
+ 'date': fields.date('Event Start Date', readonly=True),
'year': fields.char('Year', size=4, readonly=True),
'month': fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
- 'day': fields.char('Day', size=128, readonly=True),
- 'event_id': fields.many2one('event.event', 'Event Related', required=True),
- 'draft_state': fields.integer(' # No of draft Registration.', size=20),
- 'confirm_state': fields.integer(' # No of Confirm Registration', size=20),
+ 'event_id': fields.many2one('event.event', 'Event', required=True),
+ 'draft_state': fields.integer(' # No of Draft Registrations', size=20),
+ 'confirm_state': fields.integer(' # No of Confirmed Registrations', size=20),
'register_max': fields.integer('Maximum Registrations'),
'nbevent': fields.integer('Number Of Events'),
'type': fields.many2one('event.type', 'Event Type'),
'state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, required=True),
'user_id': fields.many2one('res.users', 'Responsible', readonly=True),
'speaker_id': fields.many2one('res.partner', 'Speaker', readonly=True),
+ 'company_id': fields.many2one('res.company', 'Company', readonly=True),
+ 'product_id': fields.many2one('product.product', 'Product', readonly=True),
+ 'total': fields.float('Total'),
+ 'section_id': fields.related('event_id', 'section_id', type='many2one', relation='crm.case.section', string='Sale Team', store=True, readonly=True),
}
_order = 'date desc'
def init(self, cr):
@@ -55,32 +58,72 @@ class report_event_registration(osv.osv):
cr.execute("""
CREATE OR REPLACE view report_event_registration AS (
SELECT
- e.id AS id,
- c.event_id AS event_id,
+ id,
+ event_id,
+ date,
+ user_id,
+ section_id,
+ company_id,
+ product_id,
+ speaker_id,
+ year,
+ month,
+ nbevent,
+ type,
+ SUM(draft_state) AS draft_state,
+ SUM(confirm_state) AS confirm_state,
+ SUM(total) AS total,
+ register_max,
+ state
+ FROM(
+ SELECT
+ MIN(e.id) AS id,
+ e.id AS event_id,
e.date_begin AS date,
e.user_id AS user_id,
+ e.section_id AS section_id,
+ e.company_id AS company_id,
+ e.product_id AS product_id,
e.main_speaker_id AS speaker_id,
to_char(e.date_begin, 'YYYY') AS year,
to_char(e.date_begin, 'MM') AS month,
- to_char(e.date_begin, 'YYYY-MM-DD') AS day,
- count(t.id) AS nbevent,
+ count(e.id) AS nbevent,
t.id AS type,
- (SELECT SUM(c.nb_register) FROM event_registration c WHERE c.event_id=e.id AND t.id=e.type AND state IN ('draft')) AS draft_state,
- (SELECT SUM(c.nb_register) FROM event_registration c WHERE c.event_id=e.id AND t.id=e.type AND state IN ('open')) AS confirm_state,
+ CASE WHEN c.state IN ('draft') THEN c.nb_register ELSE 0 END AS draft_state,
+ CASE WHEN c.state IN ('open','done') THEN c.nb_register ELSE 0 END AS confirm_state,
+ CASE WHEN c.state IN ('done') THEN c.price_subtotal ELSE 0 END AS total,
e.register_max AS register_max,
e.state AS state
FROM
event_event e
- INNER JOIN
+ LEFT JOIN
event_registration c ON (e.id=c.event_id)
- INNER JOIN
+ LEFT JOIN
event_type t ON (e.type=t.id)
GROUP BY
to_char(e.date_begin, 'YYYY'),
to_char(e.date_begin, 'MM'),
+ c.state,
+ c.nb_register,
t.id, e.id, e.date_begin, e.main_speaker_id,
- e.register_max, e.type, e.state, c.event_id, e.user_id,
- to_char(e.date_begin, 'YYYY-MM-DD')
- )""")
+ e.register_max, e.type, e.state, c.event_id, e.user_id,e.company_id,e.product_id,e.section_id,
+ to_char(e.date_begin, 'YYYY-MM-DD'), c.id, c.price_subtotal )AS foo
+ GROUP BY
+ id,
+ event_id,
+ date,
+ user_id,
+ section_id,
+ company_id,
+ product_id,
+ speaker_id,
+ year,
+ month,
+ nbevent,
+ type,
+ register_max,
+ state
+ )
+ """)
report_event_registration()
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index 2ed0fe9a300be9b8a91004b246df803d8d56cd89..d8cc84a054783a2a09022c584689797c142830c4 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -1,30 +1,35 @@
<?xml version="1.0"?>
<openerp>
<data>
+
<!-- report , event on registration... start -->
<record model="ir.ui.view" id="report_event_registration_tree">
<field name="name">report.event.registration.tree</field>
<field name="model">report.event.registration</field>
<field name="type">tree</field>
<field name="arch" type="xml">
- <tree colors="blue:state in ('draft');black:state in ('confirm','approved');gray:state in('done','cancel')" string="Event on Registration">
+ <tree colors="blue:state in ('draft');black:state in ('confirm');gray:state in('done','cancel')" string="Events Analysis">
<field name="date" invisible="1"/>
<field name="user_id" invisible="1"/>
<field name="speaker_id" invisible="1"/>
<field name="year" invisible="1"/>
- <field name="day" invisible="1"/>
<field name="month" invisible="1"/>
<field name="event_id" invisible="1"/>
<field name="state" invisible="1"/>
<field name="type" invisible="1"/>
<field name="nbevent"/>
- <field name="draft_state"/>
+ <field name="draft_state" invisible="context.get('no_of_draft_invisible', False)"/>
<field name="confirm_state"/>
- <field name="register_max"/>
+ <field name="register_max" invisible="context.get('max_reg_event_visible', True)"/>
+ <field name="company_id" invisible="1"/>
+ <field name="product_id" invisible="1"/>
+ <field name="section_id" invisible="1"/>
+ <field name="total" invisible="context.get('total_invisible', True)" sum="Total"/>
</tree>
</field>
</record>
+
<record model ="ir.ui.view" id="report_event_registration_graph">
<field name="name">report.event.registration.graph</field>
<field name="model">report.event.registration</field>
@@ -42,73 +47,87 @@
<!-- Event on Registration search view -->
<record model="ir.ui.view" id="view_report_event_registration_search">
- <field name="name">.search</field>
+ <field name="name">report.event.registration.search</field>
<field name="model">report.event.registration</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Event on Registration">
<group col="8" colspan="4">
- <filter icon="terp-go-year" string="Last 365 Days"
+ <filter icon="terp-go-year" string="Last 365 Days" name="365day"
domain="[('date','<=', time.strftime('%%Y-%%m-%%d')),('date','>',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
- help="Tasks performed in last 365 days"/>
+ help="Events with beginning date in last 365 days"/>
<filter icon="terp-go-month" string="Last 30 Days"
name="month"
domain="[('date','<=', time.strftime('%%Y-%%m-%%d')), ('date','>',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
- help="Tasks performed in last 30 days"/>
+ help="Events with beginning date in last 30 days"/>
<filter icon="terp-go-week"
string="Last 7 Days"
separator="1"
domain="[('date','<=', time.strftime('%%Y-%%m-%%d')), ('date','>',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
- help="Tasks during last 7 days"/>
-
+ help="Events with beginning date in last 7 days"/>
+ <separator orientation="vertical"/>
+ <filter icon="terp-check"
+ string="Current Events" name="draft"
+ domain="[('state','in',('draft', 'confirm'))]" help="Events in draft or confirmed state"/>
<separator orientation="vertical"/>
- <filter icon="terp-document-new"
- string="Draft"
- domain="[('state','=','draft')]"/>
<filter icon="terp-camera_test"
- string="Confirm"
- domain="[('state', '=', 'confirm')]"/>
+ string="Confirmed Registrations"
+ help="Registrations in confirmed or done state"
+ context="{'no_of_draft_invisible':1}"/>
+ <filter string="Invoiced"
+ name="invoiced"
+ icon="terp-dolar"
+ help = "Invoiced Registrations only" context="{'total_invisible':0, 'no_of_draft_invisible':1}"/>
<separator orientation="vertical"/>
- <field name="event_id" widget="selection"/>
- <field name="type" widget="selection"/>
- <field name="user_id" widget="selection">
- <filter icon="terp-personal"
- string="My Events"
- help="My Events"
- domain="[('user_id','=',uid)]"/>
- </field>
- <field name="date"/>
+ <field name="event_id" string="Event"/>
+ <field name="user_id" widget="selection">
+ <filter icon="terp-personal"
+ string="My Events"
+ help="My Events"
+ domain="[('user_id','=',uid)]"/>
+ </field>
</group>
<newline/>
- <group expand="0" string="Group By..." colspan="4" col="12">
- <filter string="Event" name="event" icon="terp-crm" context="{'group_by':'event_id'}"/>
- <filter string="Event Type" icon="terp-crm" context="{'group_by':'type'}"/>
+
+ <group expand="1" string="Group By..." colspan="4" col="12">
+ <filter string="Responsible" name="user_id" icon="terp-personal" context="{'group_by': 'user_id'}"/>
+ <filter string="Speaker" name="speaker" icon="terp-personal+" context="{'group_by': 'speaker_id'}"/>
+ <filter string="Sale Team" icon="terp-personal" context="{'group_by': 'section_id'}"/>
<separator orientation="vertical"/>
- <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+ <filter string="Event" name="event" icon="terp-crm" context="{'group_by':'event_id', 'max_reg_event_visible':0}"/>
+ <filter string="Product" icon="terp-product" context="{'group_by': 'product_id'}"/>
<separator orientation="vertical"/>
- <filter string="Speaker" name="user" icon="terp-personal+" context="{'group_by': 'speaker_id'}"/>
+ <filter string="Event Type" icon="terp-crm" context="{'group_by':'type'}"/>
+ <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" help="Events States"/>
+ <separator orientation="vertical" groups="base.group_multi_company"/>
+ <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<separator orientation="vertical" />
- <filter string="Day" icon="terp-go-month"
- domain="[]" context="{'group_by':'day'}"/>
+ <filter string="Date" icon="terp-go-month"
+ domain="[]" context="{'group_by':'date'}" help="Event Beginning Date"/>
<filter string="Month" icon="terp-go-month"
- domain="[]" context="{'group_by':'month'}"/>
+ domain="[]" context="{'group_by':'month'}" help="Event Beginning Date"/>
<filter string="Year" icon="terp-go-year"
- domain="[]" context="{'group_by':'year'}"/>
+ domain="[]" context="{'group_by':'year'}" help="Event Beginning Date"/>
+ </group>
+ <newline/>
+ <group expand="0" string="Extended Filters..." groups="base.group_extended">
+ <field name="type" widget="selection"/>
+ <field name="date"/>
</group>
</search>
</field>
</record>
<record model="ir.actions.act_window" id="action_report_event_registration">
- <field name="name">Events On Registrations</field>
+ <field name="name">Events Analysis</field>
<field name="res_model">report.event.registration</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="search_view_id" ref="view_report_event_registration_search"/>
- <field name="context">{"search_default_user":1,"search_default_month":1,'group_by_no_leaf':1,'group_by':[]}</field>
+ <field name="context">{"search_default_365day":1, "search_default_invoiced":1, "search_default_event":1, 'group_by_no_leaf':1, 'group_by':[]}</field>
</record>
- <record model="ir.actions.act_window.view" id="action_report_event_registration_tree">
+ <record model="ir.actions.act_window.view" id="action_report_event_registration_tree">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="report_event_registration_tree"/>
@@ -122,8 +141,7 @@
<field name="act_window_id" ref="action_report_event_registration"/>
</record>
- <menuitem parent="base.menu_report_association" action="action_report_event_registration" id="menu_report_event_registration" sequence="3" groups="base.group_system,base.group_marketing_manager"/>
+ <menuitem parent="base.menu_report_association" action="action_report_event_registration" id="menu_report_event_registration" sequence="3" groups="base.group_marketing_manager"/>
- <!-- end... -->
</data>
</openerp>
diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
index bcd172ce8c787627f7c334de86d2918b439c527f..4415b11a8e44e2c9c28cea6a7199d9d79883ce4b 100644
--- a/addons/event/security/event_security.xml
+++ b/addons/event/security/event_security.xml
@@ -6,7 +6,7 @@
<field name="name">Marketing / Manager</field>
</record>
- <record id="base.res_groups_email_template_admin" model="res.groups">
+ <record id="marketing.group_marketing_user" model="res.groups">
<field name="name">Marketing / User</field>
</record>
diff --git a/addons/event/security/ir.model.access.csv b/addons/event/security/ir.model.access.csv
index 747f12a479cdacc50a60f55a2554548247cd6fc9..9ee5ae7ec8041ea176c3a7b9c708fb272fa8a770 100644
--- a/addons/event/security/ir.model.access.csv
+++ b/addons/event/security/ir.model.access.csv
@@ -1,20 +1,15 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_event_type","event.type","model_event_type","base.res_groups_email_template_admin",1,0,0,0
+"access_event_type","event.type","model_event_type","marketing.group_marketing_user",1,0,0,0
"access_event_type_manager","event.type manager","model_event_type","base.group_marketing_manager",1,1,1,1
-"access_event_event","event.event","model_event_event","base.res_groups_email_template_admin",1,1,1,0
-"access_event_registration","event.registration","model_event_registration","base.res_groups_email_template_admin",1,1,1,0
-"access_report_event_registration","report.event.registration","model_report_event_registration","base.res_groups_email_template_admin",1,1,1,1
+"access_event_event","event.event","model_event_event","marketing.group_marketing_user",1,1,1,0
+"access_event_registration","event.registration","model_event_registration","marketing.group_marketing_user",1,1,1,0
+"access_report_event_registration","report.event.registration","model_report_event_registration","marketing.group_marketing_user",1,1,1,1
"access_event_event_manager","event.event manager","model_event_event","base.group_marketing_manager",1,0,0,0
"access_event_registration_manager","event.registration manager","model_event_registration","base.group_marketing_manager",1,0,0,0
"access_crm_case_section_manager","crm.case.section manager","crm.model_crm_case_section","base.group_marketing_manager",1,1,1,1
"access_product_product","product.product.product manager","product.model_product_product","base.group_marketing_manager",1,1,1,1
"access_report_event_registration","report.event.registration","model_report_event_registration","base.group_marketing_manager",1,1,1,1
-"access_event_registration_badge","event.registration.badge","model_event_registration_badge","base.res_groups_email_template_admin",1,1,1,1
-"access_event_registration_badge","event.registration.badge","model_event_registration_badge","base.group_marketing_manager",1,1,1,1
+"access_event_registration_badge_manager","event.registration.badge manager","model_event_registration_badge","base.group_marketing_manager",1,1,1,1
"access_event_event_sale_salesman","event.event.sale","model_event_event","base.group_sale_salesman",1,0,0,0
-"access_event_event_system","event.event system","model_event_event","base.group_system",1,0,0,0
-"access_event_registration_system","event.registration system","model_event_registration","base.group_system",1,0,0,0
-"access_report_event_registration_system","report.event.registration system","model_report_event_registration","base.group_system",1,1,1,1
-"access_account_account_invoice_system","account.account.invoice","account.model_account_invoice","base.group_system",1,0,0,0
-"access_event_type_sytem","event.type system","model_event_type","base.group_system",1,1,1,1
"access_account_account_invoice_manager","account.account.invoice","account.model_account_invoice","base.group_marketing_manager",1,0,0,0
+"access_event_registration_badge","event.registration.badge","model_event_registration_badge","marketing.group_marketing_user",1,0,0,0
diff --git a/addons/event/wizard/partner_event_registration.py b/addons/event/wizard/partner_event_registration.py
index 33ed6e60cdb76928807661d9af98efdd06a6df7b..6c6f739aa5f0c36e1a53e00417111b12d4fa83af 100644
--- a/addons/event/wizard/partner_event_registration.py
+++ b/addons/event/wizard/partner_event_registration.py
@@ -81,11 +81,11 @@ class partner_event_registration(osv.osv_memory):
for current in self.browse(cr, uid, ids, context=context):
for partner in res_obj.browse(cr, uid, record_ids, context=context):
new_case = reg_obj.create(cr, uid, {
- 'name' : 'Registration',
- 'event_id' : current.event_id and current.event_id.id or False,
- 'unit_price' : current.unit_price,
- 'partner_id' : partner.id,
- 'partner_invoice_id' : partner.id,
+ 'name': 'Registration',
+ 'event_id': current.event_id and current.event_id.id or False,
+ 'unit_price': current.unit_price,
+ 'partner_id': partner.id,
+ 'partner_invoice_id': partner.id,
'event_product': current.event_id.product_id.name,
'contact_id': contact_id,
'email_from': email,
@@ -98,7 +98,7 @@ class partner_event_registration(osv.osv_memory):
'view_type': 'form',
'view_mode': 'tree,form',
'res_model': 'event.registration',
- 'res_id' : new_case,
+ 'res_id': new_case,
'views': [(id2, 'form'), (id3, 'tree'), (False, 'calendar'), (False, 'graph')],
'type': 'ir.actions.act_window',
'search_view_id': res['res_id']
diff --git a/addons/event_project/i18n/it.po b/addons/event_project/i18n/it.po
index 9d5270feb865d0380a78c90ef3b72018f9676d5b..f89562f72a43a82e0cd691bc303f2833c9a9ff18 100644
--- a/addons/event_project/i18n/it.po
+++ b/addons/event_project/i18n/it.po
@@ -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-09-29 10:49+0000\n"
+"PO-Revision-Date: 2010-10-17 07:54+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-10-18 04:55+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: event_project
@@ -48,7 +48,7 @@ msgstr "Attività Rimanenti"
#. module: event_project
#: model:ir.module.module,shortdesc:event_project.module_meta_information
msgid "Event - Project"
-msgstr ""
+msgstr "Evento - Progetto"
#. module: event_project
#: field:event.event,project_id:0
diff --git a/addons/event_project/i18n/sr.po b/addons/event_project/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..b85948dd3f30cce99d59c473fd3344b043f33675
--- /dev/null
+++ b/addons/event_project/i18n/sr.po
@@ -0,0 +1,88 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-17 07:55+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-18 04:55+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: event_project
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: event_project
+#: model:ir.actions.wizard,name:event_project.wizard_event_task
+msgid "Tasks"
+msgstr "Zadaci"
+
+#. module: event_project
+#: wizard_button:event.project,init,done:0
+msgid "Ok"
+msgstr "U redu"
+
+#. module: event_project
+#: model:ir.module.module,description:event_project.module_meta_information
+msgid ""
+"Organization and management of events.\n"
+"\n"
+" This module allow you to create retro planning for managing your "
+"events.\n"
+msgstr ""
+"Organizacija i Upravljanje Dogadjajima.\n"
+"\n"
+" Ovaj modul vam omogucava da kreirate retro planiranje za upravljanje "
+"vasim dogadjajima.\n"
+
+#. module: event_project
+#: view:event.event:0
+msgid "Remaining Tasks"
+msgstr "Preostali Zadaci"
+
+#. module: event_project
+#: model:ir.module.module,shortdesc:event_project.module_meta_information
+msgid "Event - Project"
+msgstr "Projekat-Dogadjaj"
+
+#. module: event_project
+#: field:event.event,project_id:0
+#: wizard_field:event.project,init,project_id:0
+#: model:ir.actions.wizard,name:event_project.event_wiz
+msgid "Project"
+msgstr "Projekat"
+
+#. module: event_project
+#: field:event.event,task_ids:0
+msgid "Project tasks"
+msgstr "Projekat Zadataka"
+
+#. module: event_project
+#: wizard_button:event.project,init,end:0
+msgid "Cancel"
+msgstr "Otkaži"
+
+#. module: event_project
+#: view:event.event:0
+msgid "Create Retro-Planning"
+msgstr "Kreiraj Retro-Planiranje"
+
+#. module: event_project
+#: wizard_view:event.project,init:0
+msgid "Event"
+msgstr "Događaj"
+
+#. module: event_project
+#: view:event.event:0
+msgid "Tasks management"
+msgstr "Upravljanje Zadacima"
diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
index 94dbdf4ef5c5b2520585548f397ab26ebe7ab4dd..e9050fda07565c3a725f943c389241b5f5554a4b 100644
--- a/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@ -33,7 +33,6 @@
* Automatic Email Receive
* Email based Records (Add, Update)
""",
- 'author': 'Tiny',
'website': 'http://www.openerp.com',
'init_xml': [],
'update_xml': [
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 7d527442391144bc6b825a7e09283362f4f514b2..2147d7747623bc219cb913aac27553b6d503c515 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -71,8 +71,9 @@ class email_server(osv.osv):
}
def check_duplicate(self, cr, uid, ids):
+ # RFC *-* Why this limitation? why not in SQL constraint?
vals = self.read(cr, uid, ids, ['user', 'password'])[0]
- cr.execute("select count(id) from email_server where user='%s' and password='%s'" % (vals['user'], vals['password']))
+ cr.execute("select count(id) from email_server where user='%s' and password='%s'", (vals['user'], vals['password']))
res = cr.fetchone()
if res:
if res[0] > 1:
diff --git a/addons/fetchmail/i18n/sr.po b/addons/fetchmail/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..12e87b88fe764482fe613add8422f74ce5609a16
--- /dev/null
+++ b/addons/fetchmail/i18n/sr.po
@@ -0,0 +1,274 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 13:33+0000\n"
+"PO-Revision-Date: 2010-10-17 07:58+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-18 04:56+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Confirmed"
+msgstr "Potvrđeno"
+
+#. module: fetchmail
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da poÄinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: fetchmail
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree_imap
+#: model:ir.ui.menu,name:fetchmail.menu_action_email_server_tree_imap
+msgid "IMAP Servers"
+msgstr "IMAP Serveri"
+
+#. module: fetchmail
+#: field:email.server,action_id:0
+msgid "Reply Email"
+msgstr "Odgovori na Email"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Server & Login"
+msgstr "Server & Login"
+
+#. module: fetchmail
+#: field:email.server,priority:0
+msgid "Server Priority"
+msgstr "Prioritet Servera"
+
+#. module: fetchmail
+#: field:email.server,state:0
+msgid "State"
+msgstr "Stanje"
+
+#. module: fetchmail
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Greska! Ne mozete kreirati rekursivni meni."
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Not Confirmed"
+msgstr "Nije potvrdjeno"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "POP/IMAP Servers"
+msgstr "POP/IMAP Serveri"
+
+#. module: fetchmail
+#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
+msgid "Fetchmail Server"
+msgstr "Email Server"
+
+#. module: fetchmail
+#: view:email.server:0
+#: field:email.server,note:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: fetchmail
+#: field:email.server,attach:0
+msgid "Add Attachments ?"
+msgstr "Dodajes Attachmente ( dodatke) ?"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Set to Draft"
+msgstr "Postavi u pripremu"
+
+#. module: fetchmail
+#: field:email.server,user:0
+msgid "User Name"
+msgstr "KorisniÄko ime"
+
+#. module: fetchmail
+#: field:email.server,user_id:0
+msgid "User"
+msgstr "Korisnik"
+
+#. module: fetchmail
+#: field:email.server,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Waiting for Verification"
+msgstr "Cekanje na Potvrdu"
+
+#. module: fetchmail
+#: field:email.server,password:0
+msgid "Password"
+msgstr "Lozinka"
+
+#. module: fetchmail
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr "Neispravni Argumenti"
+
+#. module: fetchmail
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Auto Reply?"
+msgstr "Auto Odgovor?"
+
+#. module: fetchmail
+#: field:email.server,name:0
+msgid "Name"
+msgstr "Ime"
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr "Poruka Email prolaza"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_email_server_tree
+msgid "POP Servers"
+msgstr "POP Serveri"
+
+#. module: fetchmail
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Fetchmail Services"
+msgstr "Email Servisi"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.action_mailgate_message_tree
+#: model:ir.actions.act_window,name:fetchmail.action_mailgate_message_tree_pop
+#: model:ir.ui.menu,name:fetchmail.menu_action_mailgate_message_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_mailgate_message_tree_pop
+msgid "Received Email History"
+msgstr "Istorija Primljenih E-mailova"
+
+#. module: fetchmail
+#: field:email.server,active:0
+msgid "Active"
+msgstr "Aktivan"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Process Parameter"
+msgstr "Obradi Parametar"
+
+#. module: fetchmail
+#: field:email.server,is_ssl:0
+msgid "SSL ?"
+msgstr "SSL ?"
+
+#. module: fetchmail
+#: selection:email.server,type:0
+#: selection:mailgate.message,type:0
+msgid "IMAP Server"
+msgstr "MAP Server"
+
+#. module: fetchmail
+#: field:email.server,object_id:0
+msgid "Model"
+msgstr "Model"
+
+#. module: fetchmail
+#: field:email.server,server:0
+msgid "Server"
+msgstr "Server"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Email History"
+msgstr "Email Istorija"
+
+#. module: fetchmail
+#: view:email.server:0
+#: model:ir.model,name:fetchmail.model_email_server
+msgid "POP/IMAP Server"
+msgstr "POP/IMAP Server"
+
+#. module: fetchmail
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr "Pravila nisu podrzana od strane osv_memory objekata !"
+
+#. module: fetchmail
+#: field:email.server,type:0
+#: field:mailgate.message,type:0
+msgid "Server Type"
+msgstr "Tup Servera"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Login Information"
+msgstr "Informacije o Prijavi"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Server Information"
+msgstr "Podaci o Serveru"
+
+#. module: fetchmail
+#: selection:email.server,type:0
+#: selection:mailgate.message,type:0
+msgid "POP Server"
+msgstr "POP Server"
+
+#. module: fetchmail
+#: field:email.server,port:0
+msgid "Port"
+msgstr "Port"
+
+#. module: fetchmail
+#: model:ir.module.module,description:fetchmail.module_meta_information
+msgid ""
+"Fetchmail: \n"
+" * Fetch email from Pop / IMAP server\n"
+" * Support SSL\n"
+" * Integrated with all Modules\n"
+" * Automatic Email Receive\n"
+" * Email based Records (Add, Update)\n"
+" "
+msgstr ""
+"Fetchmail: \n"
+" *Hvata emailove sa pop/imap servera\n"
+" *Podrzava SSL\n"
+" *Integrise se sa svim modulima\n"
+" *Automatski prima Emailove\n"
+" *Na bazi Email-a pravi snimanja ( Dodaje, Dopunjava)\n"
+" "
+
+#. module: fetchmail
+#: help:email.server,priority:0
+msgid "Priority between 0 to 10, select define the order of Processing"
+msgstr "Vaznost izmedju 0 i 10, izaberi i definisi redosled Procesuiranja"
+
+#. module: fetchmail
+#: field:mailgate.message,server_id:0
+msgid "Mail Server"
+msgstr "Email Server"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Fetch Emails"
+msgstr "Hvata Emailove"
diff --git a/addons/google_map/i18n/sr.po b/addons/google_map/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..0959a60eb51e52449e66f564fae5d4a5f436d7df
--- /dev/null
+++ b/addons/google_map/i18n/sr.po
@@ -0,0 +1,51 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-17 07:57+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-18 04:55+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: google_map
+#: model:ir.actions.wizard,name:google_map.wizard_google_map
+msgid "Launch Google Map"
+msgstr "Ppkreni Google Map"
+
+#. module: google_map
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: google_map
+#: view:res.partner:0
+#: view:res.partner.address:0
+msgid "Street2 : "
+msgstr "Ulica2 "
+
+#. module: google_map
+#: model:ir.module.module,description:google_map.module_meta_information
+msgid ""
+"The module adds google map field in partner address\n"
+"so that we can directly open google map from the\n"
+"url widget."
+msgstr ""
+"Ovaj Modul ubacuje sliku google map u partnerovoj adresi\n"
+"tako da mozemo direktno da otvorimo google map iz tog\n"
+"prozora."
+
+#. module: google_map
+#: view:res.partner:0
+#: view:res.partner.address:0
+msgid "Map"
+msgstr "mapa"
diff --git a/addons/google_map/i18n/vi.po b/addons/google_map/i18n/vi.po
index fee07730ccec2badb6c28c89e06ee8f42a5786e4..6e69566877206809d42dce2fd72402b1d506a671 100644
--- a/addons/google_map/i18n/vi.po
+++ b/addons/google_map/i18n/vi.po
@@ -8,24 +8,24 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 14:36+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-10-17 08:01+0000\n"
+"Last-Translator: nlhnam <nlhnam@gmail.com>\n"
"Language-Team: Vietnamese <vi@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-09-29 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-18 04:55+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: google_map
#: model:ir.actions.wizard,name:google_map.wizard_google_map
msgid "Launch Google Map"
-msgstr ""
+msgstr "Khởi động Google Map"
#. module: google_map
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML không hợp lệ để xem Kiến trúc"
#. module: google_map
#: view:res.partner:0
@@ -45,4 +45,4 @@ msgstr ""
#: view:res.partner:0
#: view:res.partner.address:0
msgid "Map"
-msgstr ""
+msgstr "Bản đồ"
diff --git a/addons/hr/board_hr_view.xml b/addons/hr/board_hr_view.xml
index c740114789a833d5ced96ebce938f7f22b7d524e..8e1a442e025f8be5979c76f6c6027d923aaf39e0 100644
--- a/addons/hr/board_hr_view.xml
+++ b/addons/hr/board_hr_view.xml
@@ -2,10 +2,6 @@
<openerp>
<data>
<menuitem id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
- <menuitem
- id="menu_hr_deshboard"
- name="Human Resources"
- parent="base.dashboard"/>
<!-- This board view will be complete by other hr_* modules-->
<record id="board_hr_form" model="ir.ui.view">
@@ -32,6 +28,10 @@
<field name="usage">menu</field>
<field name="view_id" ref="board_hr_form"/>
</record>
- <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15" action="open_board_hr"/>
+ <menuitem
+ id="menu_hr_deshboard"
+ name="Human Resources"
+ parent="base.dashboard"
+ action="open_board_hr"/>
</data>
</openerp>
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index c05836c393aed8af5a061417cafe8069b7d4e738..240511a03a01573f9b72c7de9755cb7d730de096 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -82,16 +82,23 @@ class hr_job(osv.osv):
def _no_of_employee(self, cr, uid, ids, name, args, context=None):
res = {}
- for emp in self.browse(cr, uid, ids):
- res[emp.id] = len(emp.employee_ids or [])
+ for job in self.browse(cr, uid, ids, context):
+ res[job.id] = len(job.employee_ids or [])
+ return res
+
+ def _no_of_recruitement(self, cr, uid, ids, name, args, context=None):
+ res = {}
+ for job in self.browse(cr, uid, ids, context):
+ res[job.id] = job.expected_employees - job.no_of_employee
return res
_name = "hr.job"
_description = "Job Description"
_columns = {
'name': fields.char('Job Name', size=128, required=True, select=True),
- 'expected_employees': fields.integer('Expected Employees', help='Required number of Employees'),
- 'no_of_employee': fields.function(_no_of_employee, method=True, string='No of Employees', type='integer', help='Number of Employees selected'),
+ 'expected_employees': fields.integer('Expected Employees', help='Required number of Employees in total for that job.'),
+ 'no_of_employee': fields.function(_no_of_employee, method=True, string="No of Employee", help='Number of employee with that job.'),
+ 'no_of_recruitment': fields.function(_no_of_recruitement, method=True, string='Expected in Recruitment', readonly=True),
'employee_ids': fields.one2many('hr.employee', 'job_id', 'Employees'),
'description': fields.text('Job Description'),
'requirements': fields.text('Requirements'),
@@ -102,9 +109,17 @@ class hr_job(osv.osv):
_defaults = {
'expected_employees': 1,
'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'hr.job', context=c),
- 'state': 'open'
+ 'state': 'open',
}
+ def on_change_expected_employee(self, cr, uid, ids, expected_employee, no_of_employee, context=None):
+ if context is None:
+ context = {}
+ result={}
+ if expected_employee:
+ result['no_of_recruitment'] = expected_employee - no_of_employee
+ return {'value': result}
+
def job_old(self, cr, uid, ids, *args):
self.write(cr, uid, ids, {'state': 'old'})
return True
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 2b1cd5960247058b4337250a4e6c644da84150a9..9e807d43cab94e44867cb04da2705eac1db958fd 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -2,8 +2,9 @@
<openerp>
<data>
- <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15"/>
- <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0" groups="base.group_hr_manager,base.group_hr_user"/>
+ <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15"
+ groups="base.group_hr_manager,base.group_hr_user"/>
+ <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0" groups="base.group_hr_manager"/>
<menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
<menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="1"/>
<menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" groups="base.group_hr_manager" name="Employees" sequence="1" />
@@ -324,8 +325,9 @@
<field name="name" />
<field name="department_id" />
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
- <field name="expected_employees"/>
+ <field name="expected_employees" on_change="on_change_expected_employee(expected_employees,no_of_employee)"/>
<field name="no_of_employee"/>
+ <field name="no_of_recruitment"/>
</group>
<newline/>
<notebook colspan="4">
@@ -360,6 +362,7 @@
<field name="company_id" groups="base.group_multi_company"/>
<field name="expected_employees"/>
<field name="no_of_employee"/>
+ <field name="no_of_recruitment"/>
<field name="state"/>
</tree>
</field>
diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py
index 3714050cbdbe50949153b8a7c667ede1f9a19a3f..8a52d0e2577fb5a9f3d8e6acb994cb5f33e1c8ba 100644
--- a/addons/hr_attendance/__openerp__.py
+++ b/addons/hr_attendance/__openerp__.py
@@ -32,7 +32,6 @@
'author': 'OpenERP SA',
'depends': ['hr'],
'update_xml': [
- 'security/hr_security.xml',
'security/ir.model.access.csv',
'hr_attendance_view.xml',
'hr_attendance_report.xml',
diff --git a/addons/hr_attendance/report/attendance_by_month.py b/addons/hr_attendance/report/attendance_by_month.py
index da761f3bb0c35b979cbb8e3138e0a4652ea5dc8a..c8d0378b971b8c73446984730608eb895eef813c 100644
--- a/addons/hr_attendance/report/attendance_by_month.py
+++ b/addons/hr_attendance/report/attendance_by_month.py
@@ -80,11 +80,13 @@ class report_custom(report_rml):
if attendences and attendences[-1]['action'] == 'sign_in':
attendences.append({'name': tomor.strftime('%Y-%m-%d %H:%M:%S'), 'action':'sign_out'})
# sum up the attendances' durations
+ ldt = None
for att in attendences:
dt = datetime.strptime(att['name'], '%Y-%m-%d %H:%M:%S')
- if att['action'] == 'sign_out':
+ if ldt and att['action'] == 'sign_out':
wh += (dt - ldt).seconds/60/60
- ldt = dt
+ else:
+ ldt = dt
# Week xml representation
# wh = hour2str(wh)
today_xml = '<day num="%s"><wh>%s</wh></day>' % ((today - month).days+1, round(wh,2))
diff --git a/addons/hr_attendance/report/attendance_errors.rml b/addons/hr_attendance/report/attendance_errors.rml
index 685f228a7102508161ed77e0b108293a46623675..9ad71c84476e5c88242245ea8381374d39bba610 100644
--- a/addons/hr_attendance/report/attendance_errors.rml
+++ b/addons/hr_attendance/report/attendance_errors.rml
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
-<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Attendance Errors" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Attendance Errors.pdf">
+ <template pageSize="(595.0,842.0)" title="Attendance Errors" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
- <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+ <frame id="first" x1="28.0" y1="26.0" width="536" height="784"/>
</pageTemplate>
</template>
<stylesheet>
@@ -10,7 +10,7 @@
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
- <blockTableStyle id="Table_employee_detail_header">
+ <blockTableStyle id="Table1">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
@@ -19,21 +19,7 @@
<lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
</blockTableStyle>
- <blockTableStyle id="tbl_detail">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
- </blockTableStyle>
- <blockTableStyle id="Table_employee_detail_content">
+ <blockTableStyle id="Table2">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
@@ -42,24 +28,23 @@
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
</blockTableStyle>
- <blockTableStyle id="Table_employee_total">
+ <blockTableStyle id="Table3">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
- <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
- <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
- <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="Standard" fontName="Times-Roman"/>
- <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Standard" fontName="Helvetica"/>
+ <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Table Contents" fontName="Times-Roman"/>
- <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="Index" fontName="Times-Roman"/>
+ <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="Table Contents" fontName="Helvetica"/>
+ <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+ <paraStyle name="Index" fontName="Helvetica"/>
<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -71,9 +56,9 @@
<paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="Footer" fontName="Times-Roman"/>
- <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
- <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+ <paraStyle name="Footer" fontName="Helvetica"/>
+ <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+ <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
<paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
@@ -83,16 +68,13 @@
<paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <images/>
</stylesheet>
- <images/>
<story>
<para style="terp_default_8">[[ repeatIn(get_employees(data['form']['emp_ids']),'employee') ]]</para>
<para style="terp_header_Centre">Attendance Errors</para>
- <para style="P1">[[ employee.name ]]</para>
- <para style="terp_default_8">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="78.0,118.0,151.0,98.0,75.0" style="Table_employee_detail_header">
+ <para style="terp_tblheader_Details">[[ employee.name ]]</para>
+ <blockTable colWidths="107.0,107.0,107.0,107.0,107.0" style="Table1">
<tr>
<td>
<para style="terp_tblheader_Details">Operation</para>
@@ -111,36 +93,32 @@
</td>
</tr>
</blockTable>
- <blockTable colWidths="519.0" style="tbl_detail">
- <tr>
- <td>
- <para style="terp_default_8">[[ repeatIn(lst(employee.id,data['form']['init_date'], data['form']['end_date'], data['form']['max_delay']), 'att') ]]</para>
- <blockTable colWidths="62.0,123.0,154.0,100.0,75.0" style="Table_employee_detail_content">
- <tr>
- <td>
- <para style="terp_default_9">[[ att['action'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Centre_9">[[ formatLang(att['date'],date_time=True) ]]</para>
- </td>
- <td>
- <para style="terp_default_Centre_9">[[ formatLang(att['create_date'],date_time=True) ]]</para>
- </td>
- <td>
- <para style="terp_default_Centre_9">[[ att['delay'] ]]</para>
- </td>
- <td>
- <para style="terp_default_Centre_9">[[ att['delay2'] ]]</para>
- </td>
- </tr>
- </blockTable>
- </td>
- </tr>
- </blockTable>
- <blockTable colWidths="357.0,99.0,63.0" style="Table_employee_total">
+ <section>
+ <para style="terp_default_8">[[ repeatIn(lst(employee.id,data['form']['init_date'], data['form']['end_date'], data['form']['max_delay']), 'att') ]]</para>
+ <blockTable colWidths="107.0,107.0,107.0,107.0,107.0" style="Table2">
+ <tr>
+ <td>
+ <para style="terp_default_9">[[ att['action'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_9">[[ formatLang(att['date'],date_time=True) ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_9">[[ formatLang(att['create_date'],date_time=True) ]] </para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_9">[[ att['delay'] ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_9">[[ att['delay2'] ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ </section>
+ <blockTable colWidths="322.0,108.0,107.0" style="Table3">
<tr>
<td>
- <para style="terp_default_Bold_9">Total period:<font face="Times">[[ repeatIn(total(employee.id,data['form']['init_date'], data['form']['end_date'], data['form']['max_delay']),'total')]] </font></para>
+ <para style="terp_default_Bold_9">Total period:[[ repeatIn(total(employee.id,data['form']['init_date'], data['form']['end_date'], data['form']['max_delay']),'total') ]]</para>
</td>
<td>
<para style="terp_default_Centre_9_Bold">[[ total['total'] ]]</para>
diff --git a/addons/hr_attendance/report/timesheet.py b/addons/hr_attendance/report/timesheet.py
index abedddd50c578917d976e3c3f8cee92b19384c81..ff759fb3eaf49b507fd0fd8f554ff0d2f93e589e 100644
--- a/addons/hr_attendance/report/timesheet.py
+++ b/addons/hr_attendance/report/timesheet.py
@@ -79,10 +79,13 @@ class report_custom(report_rml):
if attendances and attendances[-1]['action'] == 'sign_in':
attendances.append({'name': n_monday.strftime('%Y-%m-%d %H:%M:%S'), 'action': 'sign_out'})
# sum up the attendances' durations
+ ldt = None
for att in attendances:
dt = datetime.strptime(att['name'], '%Y-%m-%d %H:%M:%S')
- if att['action'] == 'sign_out':
+ if ldt and att['action'] == 'sign_out':
week_wh[ldt.date().weekday()] = week_wh.get(ldt.date().weekday(), 0) + ((dt - ldt).seconds/3600)
+ else:
+ ldt = dt
# Week xml representation
week_repr = ['<week>', '<weekstart>%s</weekstart>' % monday.strftime('%Y-%m-%d'), '<weekend>%s</weekend>' % n_monday.strftime('%Y-%m-%d')]
diff --git a/addons/hr_attendance/security/hr_security.xml b/addons/hr_attendance/security/hr_security.xml
deleted file mode 100644
index 39f923a895bb2b43ef8b4964dda5af397032ea85..0000000000000000000000000000000000000000
--- a/addons/hr_attendance/security/hr_security.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
- <data noupdate="1">
-
- </data>
-</openerp>
diff --git a/addons/hr_contract/__openerp__.py b/addons/hr_contract/__openerp__.py
index 2851a9aa86b207542fd9b9f8cffbd28b256a5791..aea686e4279f060e748b39cbca5404b39a95ebd7 100755
--- a/addons/hr_contract/__openerp__.py
+++ b/addons/hr_contract/__openerp__.py
@@ -36,7 +36,6 @@
'depends': ['hr'],
'init_xml': ['hr_contract_data.xml'],
'update_xml': [
- 'security/hr_contract_security.xml',
'security/ir.model.access.csv',
'hr_contract_view.xml'
],
diff --git a/addons/hr_contract/security/hr_contract_security.xml b/addons/hr_contract/security/hr_contract_security.xml
deleted file mode 100644
index 39f923a895bb2b43ef8b4964dda5af397032ea85..0000000000000000000000000000000000000000
--- a/addons/hr_contract/security/hr_contract_security.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
- <data noupdate="1">
-
- </data>
-</openerp>
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 960849bdfd45e9d23bda1220a9bf8adccc3856c9..20bd8a0b327638a343db480ef459cba16f581539 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -235,12 +235,12 @@ class hr_evaluation(osv.osv):
hr_eval_inter_obj.survey_req_waiting_answer(cr, uid, [int_id], context=context)
if (not wait) and phase.mail_feature:
- body = phase.mail_body % {'employee_name': child.name, 'user_signature': user.signature,
+ body = phase.mail_body % {'employee_name': child.name, 'user_signature': child.user_id.signature,
'eval_name': phase.survey_id.title, 'date': time.strftime('%Y-%m-%d'), 'time': time }
sub = phase.email_subject
dest = [child.work_email]
if dest:
- tools.email_send(src, dest, sub, body)
+ tools.email_send(evaluation.employee_id.work_email, dest, sub, body)
self.write(cr, uid, ids, {'state':'wait'}, context=context)
return True
@@ -267,7 +267,18 @@ class hr_evaluation(osv.osv):
context = {}
self.write(cr, uid, ids,{'state':'cancel'}, context=context)
return True
-
+
+ def write(self, cr, uid, ids, vals, context=None):
+ if context is None:
+ context = {}
+ if 'date' in vals:
+ new_vals = {'date_deadline': vals.get('date')}
+ obj_hr_eval_iterview = self.pool.get('hr.evaluation.interview')
+ for evalutation in self.browse(cr, uid, ids, context=context):
+ for survey_req in evalutation.survey_request_ids:
+ obj_hr_eval_iterview.write(cr, uid, [survey_req.id], new_vals, context=context)
+ return super(hr_evaluation, self).write(cr, uid, ids, vals, context=context)
+
hr_evaluation()
class survey_request(osv.osv):
@@ -320,7 +331,7 @@ class hr_evaluation_interview(osv.osv):
for id in self.browse(cr, uid, ids, context=context):
flag = False
wating_id = 0
- tot_done_req = 0
+ tot_done_req = 1
if not id.evaluation_id.id:
raise osv.except_osv(_('Warning !'),_("You cannot start evaluation without Evaluation."))
records = hr_eval_obj.browse(cr, uid, [id.evaluation_id.id], context=context)[0].survey_request_ids
diff --git a/addons/hr_evaluation/i18n/ru.po b/addons/hr_evaluation/i18n/ru.po
new file mode 100644
index 0000000000000000000000000000000000000000..343cc77f37c95a5fb5f7c56f4c91bbb5cbbe10f8
--- /dev/null
+++ b/addons/hr_evaluation/i18n/ru.po
@@ -0,0 +1,279 @@
+# Russian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-25 12:18+0000\n"
+"PO-Revision-Date: 2010-10-16 08:48+0000\n"
+"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
+"Language-Team: Russian <ru@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-10-17 04:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+#: field:hr_evaluation.type,info:0
+msgid "Information"
+msgstr "ИнформациÑ"
+
+#. module: hr_evaluation
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ðазвание объекта должно начинатьÑÑ Ñ x_ и не должно Ñодержать Ñпециальных "
+"Ñимволов !"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Schedule next evaluation"
+msgstr "РаÑпиÑание Ñледующей оценки"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_bad:0
+msgid "Bad Points"
+msgstr "Плохие моменты"
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.open_view_employee_evaluation_next_my_list
+msgid "My Next Evaluation"
+msgstr "ÐœÐ¾Ñ ÑÐ»ÐµÐ´ÑƒÑŽÑˆÐ°Ñ Ð¾Ñ†ÐµÐ½ÐºÐ°"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type,value_ids:0
+msgid "Values"
+msgstr "ЗначениÑ"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_good:0
+msgid "Good Points"
+msgstr "Хорошие моменты"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,state:0
+msgid "State"
+msgstr "СтатуÑ"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,score:0
+#: field:hr_evaluation.quote,score:0
+#: field:hr_evaluation.type,score:0
+#: field:hr_evaluation.type.value,score:0
+msgid "Score"
+msgstr "Оценка"
+
+#. module: hr_evaluation
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Draft"
+msgstr "Черновик"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Informal Data"
+msgstr "Ðеофициальные данные"
+
+#. module: hr_evaluation
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "ÐедопуÑтимое Ð¸Ð¼Ñ Ð¼Ð¾Ð´ÐµÐ»Ð¸ в определении дейÑтвиÑ."
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,employee_id:0
+msgid "Employee"
+msgstr "Сотрудник"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_improve:0
+msgid "To Improve"
+msgstr "Улучшить"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,evaluation_id:0
+msgid "Evaluation"
+msgstr "Оценка"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type.value,type_id:0
+msgid "Evaluation Type"
+msgstr "Тип оценки"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Status"
+msgstr "СтатуÑ"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+msgid "Apply to categories"
+msgstr "Применить категории"
+
+#. module: hr_evaluation
+#: model:ir.module.module,description:hr_evaluation.module_meta_information
+msgid "Ability to create employees evaluation."
+msgstr "ВозможноÑÑ‚ÑŒ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¾Ñ†ÐµÐ½ÐºÐ¸ Ñотрудников."
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,name:0
+msgid "Quote"
+msgstr "Цитата"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type,category_ids:0
+msgid "Appliable Role"
+msgstr "ГибкоÑÑ‚ÑŒ роли"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,user_id:0
+msgid "Evaluation User"
+msgstr "Оценка пользователÑ"
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+msgid "Choices Results"
+msgstr "Результаты выбора"
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,date:0
+msgid "Date"
+msgstr "Дата"
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_form
+msgid "Evaluations"
+msgstr "Оценки"
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_eval_config
+msgid "Configuration"
+msgstr "КонфигурациÑ"
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_next_list
+msgid "Next Evaluations"
+msgstr "ПоÑледующие оценки"
+
+#. module: hr_evaluation
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Ðеправильный XML Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñмотра архитектуры!"
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_evaluation_type_form
+msgid "Evaluation Criterions"
+msgstr "Критерии оценки"
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_my_old_evaluation_list
+msgid "My Preceeding Evaluations"
+msgstr "Мои предыдущие оценки"
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_resp_hr
+msgid "HR Responsible"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,value_id:0
+#: field:hr_evaluation.type.value,name:0
+msgid "Value"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,name:0
+msgid "Summary"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.type,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+msgid "Notes"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
+msgid "Employee Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_type
+msgid "Employee Evaluation Type"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+msgid "Quotations"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.actions.act_window,name:hr_evaluation.open_view_employee_evaluation_next_list
+msgid "Next Employee Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.quote,type_id:0
+msgid "Type"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.type:0
+#: field:hr_evaluation.type,name:0
+msgid "Evaluation Criterion"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_next_my_list
+msgid "My Next Evaluations"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.quote:0
+msgid "Evalution Quote"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.module.module,shortdesc:hr_evaluation.module_meta_information
+msgid "Human Resources Evaluation"
+msgstr ""
+
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,quote_ids:0
+msgid "Quotes"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Done"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_quote
+msgid "Employee Evaluation Quote"
+msgstr ""
+
+#. module: hr_evaluation
+#: view:hr_evaluation.evaluation:0
+#: field:hr_evaluation.evaluation,info_employee:0
+msgid "Employee Response"
+msgstr ""
+
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_hr_evaluation_type_value
+msgid "Evaluation Type Value"
+msgstr ""
diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail.py b/addons/hr_evaluation/wizard/hr_evaluation_mail.py
index 576c782bfd8a47a4298580f7685b9667eec2941a..3464c4beaee098ba80b293897d727733eb8253a1 100644
--- a/addons/hr_evaluation/wizard/hr_evaluation_mail.py
+++ b/addons/hr_evaluation/wizard/hr_evaluation_mail.py
@@ -29,14 +29,14 @@ class hr_evaluation_reminder(osv.osv_memory):
}
def send_mail(self, cr, uid, ids, context=None):
- hr_evaluation_obj = self.pool.get('hr_evaluation.evaluation')
+ hr_evaluation_interview_obj = self.pool.get('hr.evaluation.interview')
if context is None:
context = {}
evaluation_data = self.read(cr, uid, ids, context=context)[0]
- for waiting_id in hr_evaluation_obj.browse(cr, uid, evaluation_data['evaluation_id'], context=context).survey_request_ids:
- if waiting_id.state == "waiting_answer" and waiting_id.user_to_review_id.work_email :
- msg = " Hello %s, \n\n Kindly post your response for %s survey. \n\n Thanks," %(waiting_id.user_to_review_id.name, waiting_id.survey_id.title)
- tools.email_send(tools.config['email_from'], [waiting_id.user_to_review_id.work_email],\
+ current_interview = hr_evaluation_interview_obj.browse(cr, uid, evaluation_data.get('evaluation_id'))
+ if current_interview.state == "waiting_answer" and current_interview.user_to_review_id.work_email :
+ msg = " Hello %s, \n\n Kindly post your response for '%s' survey interview. \n\n Thanks," %(current_interview.user_to_review_id.name, current_interview.survey_id.title)
+ tools.email_send(tools.config['email_from'], [current_interview.user_to_review_id.work_email],\
'Reminder to fill up Survey', msg)
return {'type': 'ir.actions.act_window_close'}
diff --git a/addons/hr_expense/board_hr_expense_view.xml b/addons/hr_expense/board_hr_expense_view.xml
index e79f581dce0cf38e2130e86c9f2439c07a405633..4b64a1bdf1900182fa00b6e687c7d74edae6f2ef 100644
--- a/addons/hr_expense/board_hr_expense_view.xml
+++ b/addons/hr_expense/board_hr_expense_view.xml
@@ -2,7 +2,7 @@
<openerp>
<data>
- <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0" groups="base.group_system,base.group_hr_manager,base.group_hr_user"/>
+ <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0" groups="base.group_hr_manager,base.group_hr_user"/>
<menuitem
action="hr.open_board_hr"
icon="terp-graph"
@@ -16,14 +16,14 @@
<field name="domain">[('state','in',('confirm', 'accepted')),('user_id','=',uid)]</field>
<field name="view_id" ref="hr_expense.view_editable_expenses_tree"/>
</record>
-
+
<record id="board_hr_expense_form" model="ir.ui.view">
<field name="name">board.hr.expense.form</field>
<field name="model">board.board</field>
- <field name="inherit_id" ref="hr.board_hr_form"/>
+ <field name="inherit_id" ref="hr.board_hr_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
- <xpath expr="/form/hpaned/child1" position="inside">
+ <xpath expr="/form/hpaned/child1" position="inside">
<action colspan="4" height="220" name="%(action_my_expense)d" string="My Expenses" />
</xpath>
</field>
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 0679fee37b1b176c4aa1bff1a92f7218f60032be..143d27f2d9b0604ca52593b7e714c47c2ae4184b 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -226,7 +226,7 @@ class hr_expense_line(osv.osv):
return res
_columns = {
- 'name': fields.char('Short Description', size=128, required=True),
+ 'name': fields.char('Expense Note', size=128, required=True),
'date_value': fields.date('Date', required=True),
'expense_id': fields.many2one('hr.expense.expense', 'Expense', ondelete='cascade', select=True),
'total_amount': fields.function(_amount, method=True, string='Total'),
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 3d92a76a3c3c4e38b820950dc253fd8eb94309ef..9eb073ce52e849469d570c6bcfad4cbe1c5940cf 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -16,7 +16,7 @@
<field domain="[('type','=','normal'), ('parent_id','!=',False)]" name="analytic_account" groups="analytic.group_analytic_accounting"/>
<field name="unit_amount"/>
<field name="unit_quantity"/>
- <field name="total_amount"/>
+ <field name="total_amount" sum="Total"/>
</tree>
</field>
</record>
@@ -68,10 +68,9 @@
<form string="Expenses Sheet">
<group colspan="4" col="6">
<field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
- <field name="name" select="1"/>
+ <field name="name"/>
<field name="ref" groups="base.group_extended"/>
- <field name="date" select="1"/>
- <field name="amount"/>
+ <field name="date"/>
<field name="currency_id"/>
<field name="department_id" groups="base.group_extended"/>
<field name="company_id" groups="base.group_multi_company"/>
@@ -81,17 +80,23 @@
<newline/>
<field colspan="4" name="line_ids" nolabel="1">
<form string="Expense Lines">
- <field name="product_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)"/>
- <field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)" widget="selection"/>
- <field name="name" />
- <field name="date_value" />
- <field name="unit_quantity"/>
- <field name="unit_amount"/>
- <field name="ref"/>
- <field name="sequence" groups="base.group_extended"/>
- <field domain="[('type','=','normal'), ('parent_id','!=',False)]" name="analytic_account" groups="base.group_extended"/>
- <newline/>
- <field name="total_amount"/>
+ <group col="6" colspan="4">
+ <field name="product_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)"/>
+ <field name="name" colspan="4"/>
+ <newline/>
+ <field name="unit_amount"/>
+ <field name="unit_quantity"/>
+ <field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)" widget="selection"/>
+ </group>
+ <group colspan="2" col="2" groups="analytic.group_analytic_accounting">
+ <separator string="Customer Project" colspan="2"/>
+ <field domain="[('type','=','normal')]" name="analytic_account"/>
+ </group>
+ <group colspan="2" col="2">
+ <separator string="References" colspan="2"/>
+ <field name="date_value" />
+ <field name="ref"/>
+ </group>
</form>
</field>
<field name="state"/>
@@ -99,8 +104,8 @@
<button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" icon="gtk-convert"/>
<button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_manager" />
<button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/>
- <button name="invoice" states="accepted" string="Invoice" type="workflow" icon="gtk-execute"/>
- <button name="validate" states="confirm" string="Approve" type="workflow" icon="terp-camera_test"/>
+ <button name="invoice" states="accepted" string="Invoice" type="workflow" icon="gtk-go-forward"/>
+ <button name="validate" states="confirm" string="Approve" type="workflow" icon="gtk-go-forward"/>
</group>
</page>
<page string="Other Info" groups="base.group_extended">
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 70b8625d7b6f892e7a59a87ab70bfed2e2b4857b..0d94204f426ff3a017f0bb1f4ce51d01ce646e24 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -95,7 +95,7 @@
<separator orientation="vertical"/>
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
<separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
- <filter string="Analytic account" icon="terp-folder-green" context="{'group_by':'analytic_account'}" groups="analytic.group_analytic_accounting"/>
+ <filter string="Analytic account" icon="terp-folder-violet" context="{'group_by':'analytic_account'}" groups="analytic.group_analytic_accounting"/>
<separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
<filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
diff --git a/addons/hr_holidays/board_hr_holidays_view.xml b/addons/hr_holidays/board_hr_holidays_view.xml
index 004120735329e06ab29270dc5fa4b5a8e5438a33..aa654f1aa4c07c3ea9b5b0e1cff605adf7181361 100644
--- a/addons/hr_holidays/board_hr_holidays_view.xml
+++ b/addons/hr_holidays/board_hr_holidays_view.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
-
+
<menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0" groups="base.group_hr_user"/>
<menuitem
action="hr.open_board_hr"
@@ -9,6 +9,20 @@
id="base.menu_hr_project"
parent="base.menu_hr_dasboard"
sequence="4"/>
+
+ <record model="ir.ui.view" id="view_holiday_allocation_leave_tree">
+ <field name="name">hr.holidays.allocation.leave.tree</field>
+ <field name="model">hr.holidays</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <tree string="Leaves" >
+ <field name="name"/>
+ <field name="date_from"/>
+ <field name="date_to"/>
+ <field name="holiday_status_id"/>
+ </tree>
+ </field>
+ </record>
<record id="action_view_holiday_status_board" model="ir.actions.act_window">
<field name="name">My Leaves</field>
<field name="type">ir.actions.act_window</field>
@@ -16,21 +30,21 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','in',('confirm', 'validate')),('user_id','=',uid)]</field>
- <field name="view_id" ref="hr_holidays.open_allocation_holidays"/>
+ <field name="view_id" ref="view_holiday_allocation_leave_tree"/>
</record>
-
+
<record id="board_hr_holidays_form" model="ir.ui.view">
<field name="name">board.hr.holidays.form</field>
<field name="model">board.board</field>
- <field name="inherit_id" ref="hr.board_hr_form"/>
+ <field name="inherit_id" ref="hr.board_hr_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
- <xpath expr="/form/hpaned/child1" position="inside">
+ <xpath expr="/form/hpaned/child1" position="inside">
<action colspan="4" height="220" name="%(action_view_holiday_status_board)d" string="My Leaves"/>
</xpath>
</field>
</record>
-
+
<!-- Need to merge in above view -->
<record id="action_hr_holidays_leaves_by_month" model="ir.actions.act_window">
@@ -40,18 +54,18 @@
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="domain">[('user_id','=',uid)]</field>
- <field name="context">{'group_by_no_leaf':1,'group_by':['month']}</field>
+ <field name="context">{'group_by_no_leaf':1}</field>
<field name="view_id" ref="hr_holidays.view_hr_available_holidays_report_graph"/>
</record>
<record id="board_hr_holidays_leave_by_month_form" model="ir.ui.view">
<field name="name">board.hr.holidays.leave.month.form</field>
<field name="model">board.board</field>
- <field name="type">form</field>
- <field name="inherit_id" ref="hr.board_hr_form"/>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="hr.board_hr_form"/>
<field name="arch" type="xml">
- <xpath expr="/form/hpaned/child2" position="inside">
- <action colspan="4" height="220" name="%(action_hr_holidays_leaves_by_month)d" string="Leaves by Month" />
- </xpath>
+ <xpath expr="/form/hpaned/child2" position="inside">
+ <action colspan="4" height="220" name="%(action_hr_holidays_leaves_by_month)d" string="My Leaves by Type" />
+ </xpath>
</field>
</record>
</data>
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index eca3c02f3019f69363830b187ed5bac233c3675f..79710a569fbaa9d1adbbf75f1716fa46b1ccb35a 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -240,8 +240,7 @@ class hr_holidays(osv.osv):
if record.case_id:
self.pool.get('crm.meeting').unlink(cr, uid, [record.case_id.id])
if record.linked_request_ids:
- list_ids = []
- [list_ids.append(i) for id in record.linked_request_ids]
+ list_ids = [ lr.id for lr in record.linked_request_ids]
self.holidays_cancel(cr, uid, list_ids)
self.unlink(cr, uid, list_ids)
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index b5380c4e5a9f6833f7e5d145b651ad5bf87121c4..0d78af879754ff1b0c0da960dc13717091fe59bd 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -137,7 +137,7 @@
<field name="notes" nolabel="1" colspan="4" />
<newline/>
<field name="state" colspan="2"/>
- <group colspan="2">
+ <group colspan="2" col="6">
<button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
<button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
<button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index 5d173764ff61cc5478d19056d5050a07900ba0ba..374e6300cd0f5fa36cbfb198de8ef8df40ab07fc 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -32,13 +32,10 @@
<field name="model">available.holidays.report</field>
<field name="type">graph</field>
<field name="arch" type="xml">
- <graph orientation="horizontal" string="Available Holidays" type="bar">
- <field name="employee_id"/>
- <field name="max_leave" operator="+"/>
- <field name="taken_leaves" operator="+"/>
- <field name="remaining_leave" operator="+"/>
- <field name="month" group = "True" operator="+" invisible="1"/>
- <field group="True" name="holiday_status_id"/>
+ <graph string="Available Holidays" type="bar">
+ <field name="holiday_status_id"/>
+ <field name="taken_leaves" string="Leave Days" operator="+"/>
+ <field name="remaining_leave" string="Remaining Days" operator="+"/>
</graph>
</field>
</record>
@@ -91,7 +88,7 @@
</record>
<record id="action_hr_available_holidays_report" model="ir.actions.act_window">
- <field name="name">Available Holidays</field>
+ <field name="name">Leaves Analysis</field>
<field name="res_model">available.holidays.report</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
@@ -113,7 +110,7 @@
<field name="act_window_id" ref="action_hr_available_holidays_report"/>
</record>
- <menuitem name="Available Holidays" id="menu_hr_available_holidays_report_tree" action="action_hr_available_holidays_report" parent="menu_hr_reporting_holidays"/>
+ <menuitem name="Leaves Analysis" id="menu_hr_available_holidays_report_tree" action="action_hr_available_holidays_report" parent="menu_hr_reporting_holidays"/>
</data>
</openerp>
diff --git a/addons/hr_holidays/report/holidays_summary.xsl b/addons/hr_holidays/report/holidays_summary.xsl
index 67bb2a58769e136126b97d48ff8c66b6ac05a034..c0a24e551ff2fd4b8ec82ea47ef8a18f12c78d91 100644
--- a/addons/hr_holidays/report/holidays_summary.xsl
+++ b/addons/hr_holidays/report/holidays_summary.xsl
@@ -4,257 +4,257 @@
xmlns:fo="http://www.w3.org/1999/XSL/Format">
<xsl:import href="hr_custom_default.xsl"/>
- <xsl:import href="hr_custom_rml.xsl"/>
+ <xsl:import href="hr_custom_rml.xsl"/>
- <xsl:template match="/">
- <xsl:call-template name="rml" />
- </xsl:template>
+ <xsl:template match="/">
+ <xsl:call-template name="rml" />
+ </xsl:template>
- <xsl:template name="stylesheet">
- <paraStyle name="normal" fontName="Helvetica" fontSize="6" alignment="left" />
- <paraStyle name="normal-title" fontName="Helvetica" fontSize="10" alignment="center"/>
- <paraStyle name="digits" fontName="Helvetica" fontSize="6" alignment="left"/>
- <paraStyle name="title" fontName="Helvetica" fontSize="18" alignment="center" />
- <paraStyle name="dept" fontName="Helvetica-Bold" fontSize="8" alignment="left" />
- <paraStyle name="employee" fontName="Helvetica-Bold" fontSize="6" textColor="black" />
- <paraStyle name="leaveid" fontName="Helvetica" fontSize="6" alignment="center" />
- <paraStyle name="print-date" fontName="Helvetica" fontSize="11" alignment="right" />
- <paraStyle name="sum" fontName="Helvetica-BoldOblique" fontSize="6" alignment="left" />
- <paraStyle name="company" textColor="purple" fontName="Helvetica-Bold" fontSize="11" alignment="left"/>
- <blockTableStyle id="header">
- <blockAlignment value="LEFT" start="0,0" stop="-1,-1"/>
- <blockFont name="Helvetica" size="8" start="0,0" stop="-1,-1"/>
- <blockValign value="TOP"/>
- </blockTableStyle>
- <blockTableStyle id="products">
- <blockAlignment value="CENTER" start="1,0" stop="-1,-1"/>
- <lineStyle kind="LINEABOVE" colorName="black" start="0,0" stop="-1,-1" />
- <lineStyle kind="LINEBEFORE" colorName="black" start="0,0" stop="-1,-1"/>
- <lineStyle kind="LINEAFTER" colorName="black" start="-1,0" stop="-1,-1"/>
- <lineStyle kind="LINEBELOW" colorName="black" start="0,-1" stop="-1,-1"/>
- <blockFont name="Helvetica-Bold" size="8" start="0,-1" stop="-1,-1"/>
- <blockValign value="TOP"/>
- </blockTableStyle>
- <blockTableStyle id="legend">
- <blockAlignment value="CENTER" start="0,0" stop="-1,-1" />
- <blockFont name="Helvetica" size="7" start="0,0" stop="-1,-1"/>
- <lineStyle kind="LINEABOVE" colorName="black" start="0,0" stop="-1,-1" />
- <lineStyle kind="LINEBEFORE" colorName="black" start="0,0" stop="-1,-1"/>
- <lineStyle kind="LINEAFTER" colorName="black" start="-1,0" stop="-1,-1"/>
- <lineStyle kind="LINEBELOW" colorName="black" start="0,-1" stop="-1,-1"/>
- <blockBackground colorName="#FFFFFF" start="0,0" stop="-1,-1"/>
- <xsl:for-each select="/report/legend">
- <blockBackground>
- <xsl:attribute name="colorName">
- <xsl:value-of select="attribute::color" />
- </xsl:attribute>
- <xsl:attribute name="start">
- <xsl:text>0,</xsl:text>
- <xsl:value-of select="attribute::row" />
- </xsl:attribute>
- <xsl:attribute name="stop">
- <xsl:text>0,</xsl:text>
- <xsl:value-of select="attribute::row" />
- </xsl:attribute>
- </blockBackground>
- </xsl:for-each>
- <blockValign value="TOP"/>
- </blockTableStyle>
- <blockTableStyle id="month">
- <blockAlignment value="CENTER" start="1,0" stop="-1,-1" />
- <blockFont name="Helvetica" size="5" start="0,0" stop="-1,-1"/>
- <blockFont name="Helvetica-BoldOblique" size="4.5" start="-1,0" stop="-1,-1"/>
- <blockBackground colorName="#FFFFFF" start="1,0" stop="-2,1"/>
- <xsl:for-each select="/report/days/dayy[@name='Sat' or @name='Sun']">
- <xsl:variable name="col" select="attribute::cell" />
- <blockBackground>
- <xsl:attribute name="colorName">lightgrey</xsl:attribute>
- <xsl:attribute name="start">
- <xsl:value-of select="$col" />
- <xsl:text>,0</xsl:text>
- </xsl:attribute>
- <xsl:attribute name="stop">
- <xsl:value-of select="$col" />
- <xsl:text>,-1</xsl:text>
- </xsl:attribute>
- </blockBackground>
- </xsl:for-each>
- <xsl:for-each select="/report/info">
- <xsl:variable name="val" select="attribute::val" />
- <xsl:variable name="col" select="attribute::number" />
- <xsl:variable name="row" select="attribute::id" />
- <xsl:for-each select="/report/legend">
- <xsl:variable name="val_id" select="attribute::id" />
- <xsl:variable name="color" select="attribute::color" />
- <xsl:if test="$val_id = $val ">
- <blockBackground>
- <xsl:attribute name="colorName"><xsl:value-of select="$color" /></xsl:attribute>
- <xsl:attribute name="start">
- <xsl:value-of select="$col" />
- <xsl:text>,</xsl:text>
- <xsl:value-of select="$row + 1" />
- </xsl:attribute>
- <xsl:attribute name="stop">
- <xsl:value-of select="$col" />
- <xsl:text>,</xsl:text>
- <xsl:value-of select="$row + 1" />
- </xsl:attribute>
- </blockBackground>
- </xsl:if>
- </xsl:for-each>
- </xsl:for-each>
- <xsl:for-each select="report/employee">
- <xsl:variable name="dept" select="attribute::id" />
- <xsl:variable name="row" select="attribute::row" />
- <xsl:if test="$dept = 1">
- <blockBackground>
- <xsl:attribute name="colorName">lightgrey</xsl:attribute>
- <xsl:attribute name="start">
- <xsl:text>0,</xsl:text>
- <xsl:value-of select="$row +1" />
- </xsl:attribute>
- <xsl:attribute name="stop">
- <xsl:text>0,</xsl:text>
- <xsl:value-of select="$row +1" />
- </xsl:attribute>
- </blockBackground>
- </xsl:if>
- </xsl:for-each>
- <lineStyle kind="LINEABOVE" colorName="black" start="0,0" stop="-1,-1" />
- <lineStyle kind="LINEBEFORE" colorName="black" start="0,0" stop="-1,-1"/>
- <lineStyle kind="LINEAFTER" colorName="black" start="-1,0" stop="-1,-1"/>
- <lineStyle kind="LINEBELOW" colorName="black" start="0,-1" stop="-1,-1"/>
- <blockValign value="TOP"/>
- </blockTableStyle>
- </xsl:template>
+ <xsl:template name="stylesheet">
+ <paraStyle name="normal" fontName="Helvetica" fontSize="6" alignment="left" />
+ <paraStyle name="normal-title" fontName="Helvetica" fontSize="10" alignment="center"/>
+ <paraStyle name="digits" fontName="Helvetica" fontSize="6" alignment="left"/>
+ <paraStyle name="title" fontName="Helvetica" fontSize="18" alignment="center" />
+ <paraStyle name="dept" fontName="Helvetica-Bold" fontSize="8" alignment="left" />
+ <paraStyle name="employee" fontName="Helvetica-Bold" fontSize="6" textColor="black" />
+ <paraStyle name="leaveid" fontName="Helvetica" fontSize="6" alignment="center" />
+ <paraStyle name="print-date" fontName="Helvetica" fontSize="11" alignment="right" />
+ <paraStyle name="sum" fontName="Helvetica-BoldOblique" fontSize="6" alignment="left" />
+ <paraStyle name="company" textColor="purple" fontName="Helvetica-Bold" fontSize="11" alignment="left"/>
+ <blockTableStyle id="header">
+ <blockAlignment value="LEFT" start="0,0" stop="-1,-1"/>
+ <blockFont name="Helvetica" size="8" start="0,0" stop="-1,-1"/>
+ <blockValign value="TOP"/>
+ </blockTableStyle>
+ <blockTableStyle id="products">
+ <blockAlignment value="CENTER" start="1,0" stop="-1,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="black" start="0,0" stop="-1,-1" />
+ <lineStyle kind="LINEBEFORE" colorName="black" start="0,0" stop="-1,-1"/>
+ <lineStyle kind="LINEAFTER" colorName="black" start="-1,0" stop="-1,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="black" start="0,-1" stop="-1,-1"/>
+ <blockFont name="Helvetica-Bold" size="8" start="0,-1" stop="-1,-1"/>
+ <blockValign value="TOP"/>
+ </blockTableStyle>
+ <blockTableStyle id="legend">
+ <blockAlignment value="CENTER" start="0,0" stop="-1,-1" />
+ <blockFont name="Helvetica" size="7" start="0,0" stop="-1,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="black" start="0,0" stop="-1,-1" />
+ <lineStyle kind="LINEBEFORE" colorName="black" start="0,0" stop="-1,-1"/>
+ <lineStyle kind="LINEAFTER" colorName="black" start="-1,0" stop="-1,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="black" start="0,-1" stop="-1,-1"/>
+ <blockBackground colorName="#FFFFFF" start="0,0" stop="-1,-1"/>
+ <xsl:for-each select="/report/legend">
+ <blockBackground>
+ <xsl:attribute name="colorName">
+ <xsl:value-of select="attribute::color" />
+ </xsl:attribute>
+ <xsl:attribute name="start">
+ <xsl:text>0,</xsl:text>
+ <xsl:value-of select="attribute::row" />
+ </xsl:attribute>
+ <xsl:attribute name="stop">
+ <xsl:text>0,</xsl:text>
+ <xsl:value-of select="attribute::row" />
+ </xsl:attribute>
+ </blockBackground>
+ </xsl:for-each>
+ <blockValign value="TOP"/>
+ </blockTableStyle>
+ <blockTableStyle id="month">
+ <blockAlignment value="CENTER" start="1,0" stop="-1,-1" />
+ <blockFont name="Helvetica" size="5" start="0,0" stop="-1,-1"/>
+ <blockFont name="Helvetica-BoldOblique" size="4.5" start="-1,0" stop="-1,-1"/>
+ <blockBackground colorName="#FFFFFF" start="1,0" stop="-2,1"/>
+ <xsl:for-each select="/report/days/dayy[@name='Sat' or @name='Sun']">
+ <xsl:variable name="col" select="attribute::cell" />
+ <blockBackground>
+ <xsl:attribute name="colorName">lightgrey</xsl:attribute>
+ <xsl:attribute name="start">
+ <xsl:value-of select="$col" />
+ <xsl:text>,0</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute name="stop">
+ <xsl:value-of select="$col" />
+ <xsl:text>,-1</xsl:text>
+ </xsl:attribute>
+ </blockBackground>
+ </xsl:for-each>
+ <xsl:for-each select="/report/info">
+ <xsl:variable name="val" select="attribute::val" />
+ <xsl:variable name="col" select="attribute::number" />
+ <xsl:variable name="row" select="attribute::id" />
+ <xsl:for-each select="/report/legend">
+ <xsl:variable name="val_id" select="attribute::id" />
+ <xsl:variable name="color" select="attribute::color" />
+ <xsl:if test="$val_id = $val ">
+ <blockBackground>
+ <xsl:attribute name="colorName"><xsl:value-of select="$color" /></xsl:attribute>
+ <xsl:attribute name="start">
+ <xsl:value-of select="$col" />
+ <xsl:text>,</xsl:text>
+ <xsl:value-of select="$row + 1" />
+ </xsl:attribute>
+ <xsl:attribute name="stop">
+ <xsl:value-of select="$col" />
+ <xsl:text>,</xsl:text>
+ <xsl:value-of select="$row + 1" />
+ </xsl:attribute>
+ </blockBackground>
+ </xsl:if>
+ </xsl:for-each>
+ </xsl:for-each>
+ <xsl:for-each select="report/employee">
+ <xsl:variable name="dept" select="attribute::id" />
+ <xsl:variable name="row" select="attribute::row" />
+ <xsl:if test="$dept = 1">
+ <blockBackground>
+ <xsl:attribute name="colorName">lightgrey</xsl:attribute>
+ <xsl:attribute name="start">
+ <xsl:text>0,</xsl:text>
+ <xsl:value-of select="$row +1" />
+ </xsl:attribute>
+ <xsl:attribute name="stop">
+ <xsl:text>0,</xsl:text>
+ <xsl:value-of select="$row +1" />
+ </xsl:attribute>
+ </blockBackground>
+ </xsl:if>
+ </xsl:for-each>
+ <lineStyle kind="LINEABOVE" colorName="black" start="0,0" stop="-1,-1" />
+ <lineStyle kind="LINEBEFORE" colorName="black" start="0,0" stop="-1,-1"/>
+ <lineStyle kind="LINEAFTER" colorName="black" start="-1,0" stop="-1,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="black" start="0,-1" stop="-1,-1"/>
+ <blockValign value="TOP"/>
+ </blockTableStyle>
+ </xsl:template>
- <xsl:template name="story">
- <xsl:variable name="cols_header">
- <xsl:text>13.7cm,13.7cm</xsl:text>
- </xsl:variable>
- <blockTable>
- <xsl:attribute name="style">header</xsl:attribute>
- <xsl:attribute name="colWidths"><xsl:value-of select="$cols_header"/></xsl:attribute>
- <tr>
- <xsl:for-each select="report/res">
- <td>
- <para>
- </para>
- </td>
- <td>
- <para>
- </para>
- </td>
- </xsl:for-each>
- </tr>
- </blockTable>
- <spacer length="1.0cm" />
- <para style="title" t="1">Off-Days' Summary</para>
- <spacer length="0.5cm" />
- <para style="normal-title" t="1">Analyze from <u><xsl:value-of select="report/from" /></u> to <u> <xsl:value-of select="report/to" /> </u> of the <u><xsl:value-of select="report/type" /></u> holidays. </para>
- <spacer length="1.0cm" />
- <xsl:variable name="cols_legend">
- <xsl:text>0.7cm,5.0cm</xsl:text>
- </xsl:variable>
- <blockTable>
- <xsl:attribute name="style">products</xsl:attribute>
- <xsl:attribute name="colWidths"><xsl:value-of select="report/cols_months"/></xsl:attribute>
- <tr>
- <td>Month</td>
- <xsl:for-each select="report/months">
- <td>
- <xsl:value-of select="attribute::name" />
- </td>
- </xsl:for-each>
- <td> </td>
- </tr>
- </blockTable>
+ <xsl:template name="story">
+ <xsl:variable name="cols_header">
+ <xsl:text>13.7cm,13.7cm</xsl:text>
+ </xsl:variable>
+ <blockTable>
+ <xsl:attribute name="style">header</xsl:attribute>
+ <xsl:attribute name="colWidths"><xsl:value-of select="$cols_header"/></xsl:attribute>
+ <tr>
+ <xsl:for-each select="report/res">
+ <td>
+ <para>
+ </para>
+ </td>
+ <td>
+ <para>
+ </para>
+ </td>
+ </xsl:for-each>
+ </tr>
+ </blockTable>
+ <spacer length="1.0cm" />
+ <para style="title" t="1">Off-Days' Summary</para>
+ <spacer length="0.5cm" />
+ <para style="normal-title" t="1">Analyze from <u><xsl:value-of select="report/from" /></u> to <u> <xsl:value-of select="report/to" /> </u> of the <u><xsl:value-of select="report/type" /></u> holidays. </para>
+ <spacer length="1.0cm" />
+ <xsl:variable name="cols_legend">
+ <xsl:text>0.7cm,5.0cm</xsl:text>
+ </xsl:variable>
+ <blockTable>
+ <xsl:attribute name="style">products</xsl:attribute>
+ <xsl:attribute name="colWidths"><xsl:value-of select="report/cols_months"/></xsl:attribute>
+ <tr>
+ <td>Month</td>
+ <xsl:for-each select="report/months">
+ <td>
+ <xsl:value-of select="attribute::name" />
+ </td>
+ </xsl:for-each>
+ <td> </td>
+ </tr>
+ </blockTable>
- <blockTable>
- <xsl:attribute name="style">month</xsl:attribute>
- <xsl:attribute name="colWidths"><xsl:value-of select="report/cols" /></xsl:attribute>
- <tr>
- <td> </td>
- <xsl:for-each select="report/days/dayy">
- <td>
- <xsl:value-of select="attribute::name" />
- </td>
- </xsl:for-each>
- <td> </td>
- </tr>
- <tr>
- <td><para>
- <xsl:attribute name="style">employee</xsl:attribute>
- Departments & Employees
- </para>
- </td>
- <xsl:for-each select="report/days/dayy">
- <td><para><xsl:attribute name="style">digits</xsl:attribute>
- <xsl:value-of select="attribute::number" /></para>
- </td>
- </xsl:for-each>
- <td>Sum</td>
+ <blockTable>
+ <xsl:attribute name="style">month</xsl:attribute>
+ <xsl:attribute name="colWidths"><xsl:value-of select="report/cols" /></xsl:attribute>
+ <tr>
+ <td> </td>
+ <xsl:for-each select="report/days/dayy">
+ <td>
+ <xsl:value-of select="attribute::name" />
+ </td>
+ </xsl:for-each>
+ <td> </td>
+ </tr>
+ <tr>
+ <td><para>
+ <xsl:attribute name="style">employee</xsl:attribute>
+ Departments and Employees
+ </para>
+ </td>
+ <xsl:for-each select="report/days/dayy">
+ <td><para><xsl:attribute name="style">digits</xsl:attribute>
+ <xsl:value-of select="attribute::number" /></para>
+ </td>
+ </xsl:for-each>
+ <td>Sum</td>
</tr>
- <xsl:apply-templates select="report/employee"/>
- <xsl:for-each select="report/employee">
- <xsl:variable name="id" select="attribute::id"/>
- <xsl:variable name="rw" select="attribute::row"/>
- <xsl:variable name="sum" select="attribute::sum"/>
- <tr>
- <td t="1">
- <para>
- <xsl:choose>
- <xsl:when test="$id = 1">
- <xsl:attribute name="style">dept</xsl:attribute>
- </xsl:when>
- <xsl:otherwise>
- <xsl:attribute name="style">normal</xsl:attribute>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:value-of select="attribute::name"/>
- </para>
- </td>
- <xsl:for-each select="//report/days/dayy">
- <xsl:variable name="cell" select="attribute::cell" />
- <td>
- <para><xsl:attribute name="style">digits</xsl:attribute>
- <xsl:value-of select="//employee[@row=$rw]/time-element[@index=$cell]"/>
- </para>
+ <xsl:apply-templates select="report/employee"/>
+ <xsl:for-each select="report/employee">
+ <xsl:variable name="id" select="attribute::id"/>
+ <xsl:variable name="rw" select="attribute::row"/>
+ <xsl:variable name="sum" select="attribute::sum"/>
+ <tr>
+ <td t="1">
+ <para>
+ <xsl:choose>
+ <xsl:when test="$id = 1">
+ <xsl:attribute name="style">dept</xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute name="style">normal</xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:value-of select="attribute::name"/>
+ </para>
+ </td>
+ <xsl:for-each select="//report/days/dayy">
+ <xsl:variable name="cell" select="attribute::cell" />
+ <td>
+ <para><xsl:attribute name="style">digits</xsl:attribute>
+ <xsl:value-of select="//employee[@row=$rw]/time-element[@index=$cell]"/>
+ </para>
- </td>
- </xsl:for-each>
- <td><para>
- <xsl:attribute name="style">sum</xsl:attribute><xsl:value-of select="attribute::sum"/></para></td>
- </tr>
- </xsl:for-each>
+ </td>
+ </xsl:for-each>
+ <td><para>
+ <xsl:attribute name="style">sum</xsl:attribute><xsl:value-of select="attribute::sum"/></para></td>
+ </tr>
+ </xsl:for-each>
- </blockTable>
- <spacer length="1cm" />
- <condPageBreak height="1in" />
- <blockTable>
- <xsl:attribute name="style">legend</xsl:attribute>
- <xsl:attribute name="colWidths"><xsl:value-of select="$cols_legend"/></xsl:attribute>
- <tr>
- <td>Color</td>
- <td>Holiday Type</td>
+ </blockTable>
+ <spacer length="1cm" />
+ <condPageBreak height="1in" />
+ <blockTable>
+ <xsl:attribute name="style">legend</xsl:attribute>
+ <xsl:attribute name="colWidths"><xsl:value-of select="$cols_legend"/></xsl:attribute>
+ <tr>
+ <td>Color</td>
+ <td>Holiday Type</td>
- </tr>
- <xsl:for-each select="report/legend">
- <tr>
- <td>
- <para>
- <xsl:attribute name="style">digits</xsl:attribute>
- <xsl:value-of select="attribute::id"/>
- </para>
- </td>
- <td>
- <para>
- <xsl:attribute name="style">normal</xsl:attribute>
- <xsl:value-of select="attribute::name"/>
- </para>
- </td>
+ </tr>
+ <xsl:for-each select="report/legend">
+ <tr>
+ <td>
+ <para>
+ <xsl:attribute name="style">digits</xsl:attribute>
+ <xsl:value-of select="attribute::id"/>
+ </para>
+ </td>
+ <td>
+ <para>
+ <xsl:attribute name="style">normal</xsl:attribute>
+ <xsl:value-of select="attribute::name"/>
+ </para>
+ </td>
</tr>
</xsl:for-each>
- </blockTable>
- </xsl:template>
+ </blockTable>
+ </xsl:template>
</xsl:stylesheet>
diff --git a/addons/hr_holidays/report/hr_holidays_report.py b/addons/hr_holidays/report/hr_holidays_report.py
index 5d2dc27c0de25e1a9dc5c703a3bbf2a6f4c2e733..f7b813f9cc5cf8a1bd538d3133cd5a8ea6314bc3 100644
--- a/addons/hr_holidays/report/hr_holidays_report.py
+++ b/addons/hr_holidays/report/hr_holidays_report.py
@@ -22,67 +22,6 @@
import tools
from osv import fields,osv
-class hr_holidays_report(osv.osv):
- _name = "hr.holidays.report"
- _description = "Leaves Statistics By Employee and category"
- _auto = False
- _rec_name = 'date'
- _columns = {
- 'date': fields.date('Date', readonly=True),
- 'delay_approve': fields.float('Delay to Approve', digits=(16,2),readonly=True),
- 'year': fields.char('Year', size=4, readonly=True),
- 'day': fields.char('Day', size=15, readonly=True),
- 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
- ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
- ('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True),
- 'date_from' : fields.datetime('Start Date', readonly=True),
- 'date_to' : fields.datetime('End Date', readonly=True),
- 'number_of_days_temp': fields.float('Number of Days', readonly=True),
- 'employee_id' : fields.many2one('hr.employee', "Employee's Name", readonly=True),
- 'category_id' : fields.many2one('hr.employee.category', "Category's Name", readonly=True),
- 'user_id':fields.many2one('res.users', 'User', readonly=True),
- 'holiday_status_id' : fields.many2one("hr.holidays.status", "Leave Type",readonly=True),
- 'department_id':fields.many2one('hr.department','Department',readonly=True),
- 'state': fields.selection([('draft', 'Draft'),
- ('confirm', 'Waiting Validation'),
- ('refuse', 'Refused'),
- ('validate', 'Validated'),
- ('cancel', 'Cancelled')]
- ,'State', readonly=True),
- }
- _order = 'date desc'
- def init(self, cr):
- tools.drop_view_if_exists(cr, 'hr_holidays_report')
- cr.execute("""
- create or replace view hr_holidays_report as (
- select
- min(s.id) as id,
- date_trunc('day',s.create_date) as date,
- date_trunc('day',s.date_from) as date_from,
- date_trunc('day',s.date_to) as date_to,
- sum(s.number_of_days_temp) as number_of_days_temp,
- s.employee_id,
- s.category_id,
- s.user_id as user_id,
- to_char(s.date_from, 'YYYY') as year,
- to_char(s.date_from, 'MM') as month,
- to_char(s.date_from, 'YYYY-MM-DD') as day,
- s.holiday_status_id,
- s.department_id,
- s.state,
- avg(extract('epoch' from age(s.create_date,CURRENT_DATE)))/(3600*24) as delay_approve
- from
- hr_holidays s
- WHERE type='remove'
- GROUP BY
- s.create_date,s.state,s.date_from,s.date_to,
- s.employee_id,s.user_id,s.holiday_status_id,
- s.department_id, s.category_id
- )
- """)
-
-hr_holidays_report()
-
class hr_holidays_remaining_leaves_user(osv.osv):
_name = "hr.holidays.remaining.leaves.user"
_description = "Total holidays by type"
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index e59cf8523662b77bf664aa75699794389c20571e..51ff25fea75a73b3bb7d477dc3b2d0ace6141254 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -2,111 +2,6 @@
<openerp>
<data>
- <record id="view_hr_holidays_report_tree" model="ir.ui.view">
- <field name="name">hr.holidays.report.tree</field>
- <field name="model">hr.holidays.report</field>
- <field name="type">tree</field>
- <field name="arch" type="xml">
- <tree colors="blue:state in ('draft');black:state in ('confirm','refuse','validate');gray:state in('cancel')" string="Leaves Statistics">
- <field name="date" invisible="1"/>
- <field name="employee_id" invisible="1"/>
- <field name="category_id" invisible="1"/>
- <field name="user_id" invisible="1"/>
- <field name="date_from" invisible="1"/>
- <field name="date_to" invisible="1"/>
- <field name="number_of_days_temp" sum="#Days"/>
- <field name="delay_approve"/>
- <field name="holiday_status_id" invisible="1"/>
- <field name="department_id" invisible="1"/>
- <field name="year" invisible="1"/>
- <field name="day" invisible="1"/>
- <field name="month" invisible="1"/>
- <field name="state" invisible="1"/>
- </tree>
- </field>
- </record>
-
- <record id="view_hr_holidays_report_graph" model="ir.ui.view">
- <field name="name">hr.holidays.report.graph</field>
- <field name="model">hr.holidays.report</field>
- <field name="type">graph</field>
- <field name="arch" type="xml">
- <graph string="Leaves Statistics" type="bar">
- <field name="employee_id"/>
- <field name="number_of_days_temp" operator="+"/>
- <field name="state" group = "True"/>
- </graph>
- </field>
- </record>
-
- <record id="view_hr_holidays_report_search" model="ir.ui.view">
- <field name="name">hr.holidays.report.search</field>
- <field name="model">hr.holidays.report</field>
- <field name="type">search</field>
- <field name="arch" type="xml">
- <search string="Leaves">
- <group>
- <filter icon="terp-go-year" string=" Year "
- domain="[('date','<=', time.strftime('%%Y-%%m-%%d')),('date','>=',time.strftime('%%Y-01-01'))]" help="Leaves taken in current year"/>
- <filter icon="terp-go-month" string=" Month " name="month"
- domain="[('date','<=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','>=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
- help="Leaves taken in current month"/>
- <filter icon="terp-go-month" string=" Month-1 " separator="1"
- domain="[('date','<=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','>=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
- help="Leaves taken in last month"/>
- <separator orientation="vertical"/>
- <filter string="Future Leaves" icon="terp-gtk-media-pause" domain="[('state', 'in' ,('draft','confirm'))]"
- help = "Draft and Confirmed leaves"/>
- <filter string="Validated" name="Validated" icon="terp-camera_test" domain="[('state','=','validate')]"
- help = "Pending Leaves"/>
- <filter icon="gtk-cancel" string="Cancelled" domain="[('state','=','cancel')]"/>
- <separator orientation="vertical"/>
- <field name="department_id"/>
- <field name="employee_id"/>
- </group>
- <newline/>
- <group expand="0" string="Extended Filters..." colspan="10" col="12">
- <field name="holiday_status_id"/>
- <field name="category_id"/>
- <separator orientation="vertical"/>
- <field name="user_id"/>
- <newline/>
- <field name="date_from"/>
- <field name="date_to"/>
- </group>
- <newline/>
- <group expand="1" string="Group By..." colspan="10" col="12">
- <filter icon="terp-personal" string="Employee" name="Employee" context="{'group_by':'employee_id'}"
- help="Leaves by empolyee"/>
- <filter string="Validation User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
- <separator orientation="vertical"/>
- <filter string="Department" name="department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
- <separator orientation="vertical"/>
- <filter icon="terp-stock_symbol-selection" string="Category" context="{'group_by':'category_id'}"
- help="Leaves by category"/>
- <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'holiday_status_id'}"/>
- <separator orientation="vertical"/>
- <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
- <separator orientation="vertical"/>
- <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
- <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Creation Date"/>
- <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Creation Date"/>
- </group>
- </search>
- </field>
- </record>
-
- <record id="action_hr_holidays_report_all" model="ir.actions.act_window">
- <field name="name">Leaves Analysis</field>
- <field name="res_model">hr.holidays.report</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,graph</field>
- <field name="context">{'search_default_Employee':1,'search_default_department':1,"search_default_Validated":1, 'group_by':[], 'group_by_no_leaf':1} </field>
- <field name="search_view_id" ref="view_hr_holidays_report_search"/>
- </record>
-
- <menuitem action="action_hr_holidays_report_all" id="menu_hr_holidays_report_all" parent="menu_hr_reporting_holidays" sequence="0"/>
-
<record id="view_hr_holidays_remaining_leaves_user_tree" model="ir.ui.view">
<field name="name">hr.holidays.remaining.leaves.user.tree</field>
<field name="model">hr.holidays.remaining.leaves.user</field>
diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index 20da4832fe2abb2c7ca77fda09b40908f88c09b5..f350b73ed64cd5bacf804f3ca825db1123cd83d8 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -2,6 +2,5 @@
"access_hr_holydays_status_user","hr.holidays.status user","model_hr_holidays_status","base.group_hr_user",1,1,1,1
"access_hr_holidays_user","hr.holidays.user","model_hr_holidays","base.group_hr_user",1,1,1,1
"access_hr_holidays_remain_user","hr.holidays.ramain.user","model_hr_holidays_remaining_leaves_user","base.group_hr_user",1,1,1,1
-"access_hr_holidays_report_manager","hr.holidays.report.manager","model_hr_holidays_report","base.group_hr_manager",1,1,1,1
"access_resource_calendar_leaves_manager","resource_calendar_leaves_manager","resource.model_resource_calendar_leaves","base.group_hr_manager",1,1,1,1
"access_available_holidays_report_user","hr.available.holidays.report.user","model_available_holidays_report","base.group_hr_user",1,1,1,1
diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py
index c9339ce013c0078434e9ed3c7708aad590337e91..65b593c5891a1a46676b619a92ed889c1f29fb05 100644
--- a/addons/hr_payroll/__openerp__.py
+++ b/addons/hr_payroll/__openerp__.py
@@ -33,7 +33,7 @@
* Monthly Payroll Register
* Integrated with Holiday Management
""",
- 'author':'OpenERP SA/Axelor',
+ 'author':'OpenERP SA',
'website':'http://www.openerp.com',
'depends': [
'hr',
diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index dd85444d4876a60dca07241e8922e9423a446950..77b58ac861b866036183471a2ebb6485c4f918a3 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -11,7 +11,6 @@
<record id="hr_payslip_line_houserantallowance1" model="hr.payslip.line">
<field name="amount_type">per</field>
-<!-- <field name="account_id" ref="account.a_expense"/>-->
<field eval="5" name="sequence"/>
<field eval="0.4" name="amount"/>
<field name="code">HRA</field>
@@ -23,7 +22,6 @@
<record id="hr_payslip_line_convanceallowance1" model="hr.payslip.line">
<field name="amount_type">fix</field>
-<!-- <field name="account_id" ref="account.a_expense"/>-->
<field eval="10" name="sequence"/>
<field eval="800.0" name="amount"/>
<field name="code">CA</field>
@@ -35,7 +33,6 @@
<record id="hr_payslip_line_professionaltax1" model="hr.payslip.line">
<field name="amount_type">fix</field>
-<!-- <field name="account_id" ref="account.a_pay"/>-->
<field eval="15" name="sequence"/>
<field eval="200.0" name="amount"/>
<field name="code">PT</field>
@@ -47,7 +44,6 @@
<record id="hr_payslip_line_providentfund1" model="hr.payslip.line">
<field name="amount_type">per</field>
-<!-- <field name="account_id" ref="account.a_pay"/>-->
<field eval="20" name="sequence"/>
<field eval="0.125" name="amount"/>
<field name="code">PF</field>
@@ -84,14 +80,12 @@
<!-- Payslip -->
<record id="hr_payslip_salaryslipofbonamyforjune0" model="hr.payslip">
<field name="number">SLIP/001</field>
-<!-- <field name="journal_id" ref="account.expenses_journal"/>-->
<field name="deg_id" ref="hr_payroll.structure_001"/>
<field name="employee_id" ref="hr_employee_bonamy0"/>
<field name="contract_id" ref="hr_contract_firstcontract1"/>
<field name="company_id" ref="base.main_company"/>
<field name="date" eval="time.strftime('%Y-%m')+'-5'"/>
-<!-- <field name="bank_journal_id" ref="account.bank_journal"/>-->
- <field name="name">Salary Slip of Bonamy for June-2010</field>
+ <field name="name" eval="'Salary Slip of Bonamy for June-'+time.strftime('%Y')"/>
</record>
</data>
</openerp>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 9d99be20b8ae39444e7fa753ae8a757c03347557..8c4fe1000993b1ab4fb91ebde12ee51082f7d174 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -1049,7 +1049,7 @@
<field name="note" colspan="4" nolabel="1"/>
</page>
</notebook>
- <group col="2" colspan="2">
+ <group col="2" colspan="2" name="Month">
<separator colspan="2" string="Month"/>
<field name="monthly_total_by_emp"/>
<field name="monthly_total_by_comp"/>
diff --git a/addons/hr_payroll/report/payroll_register.rml b/addons/hr_payroll/report/payroll_register.rml
index e28353ecea921b6fa1977c93b162a2c2ffcb1ade..7ad99b465029e9d8d03d7afb66c5fa62ec88c044 100644
--- a/addons/hr_payroll/report/payroll_register.rml
+++ b/addons/hr_payroll/report/payroll_register.rml
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
-<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+<document filename="Salary Payment Register.pdf">
+ <template pageSize="(595.0,842.0)" title="Salary Payment Register" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
- <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+ <frame id="first" x1="33.0" y1="30.0" width="529" height="782"/>
</pageTemplate>
</template>
<stylesheet>
@@ -10,10 +10,6 @@
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
- <blockTableStyle id="Table3">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- </blockTableStyle>
<blockTableStyle id="Table6">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
@@ -29,6 +25,14 @@
<blockTableStyle id="Table1">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
</blockTableStyle>
<blockTableStyle id="Table4">
<blockAlignment value="LEFT"/>
@@ -91,30 +95,16 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
- <blockTable colWidths="72.0,295.0,47.0,68.0" style="Table3">
- <tr>
- <td>
- <para style="terp_tblheader_general">Number</para>
- </td>
- <td>
- <para style="terp_default_8">[[o.number]]</para>
- </td>
- <td>
- <para style="terp_tblheader_general">Date</para>
- </td>
- <td>
- <para style="terp_default_8">[[formatLang(time.strftime('%Y-%m-%d'), date = True)]]</para>
- </td>
- </tr>
- </blockTable>
<para style="terp_default_8">
<font color="white"> </font>
</para>
+ <para style="terp_tblheader_general">Number : <font face="Helvetica">[[o.number]]</font></para>
+ <para style="terp_tblheader_general">Date : <font face="Helvetica">[[formatLang(time.strftime('%Y-%m-%d'), date = True)]]</font></para>
+ <para style="terp_default_9">
+ <font color="white"> </font>
+ </para>
<section>
- <para style="terp_default_8">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="24.0,96.0,60.0,60.0,60.0,60.0,60.0,60.0" style="Table6">
+ <blockTable colWidths="26.0,106.0,66.0,66.0,66.0,66.0,66.0,66.0" style="Table6">
<tr>
<td>
<para style="terp_tblheader_details_center">#</para>
@@ -142,13 +132,10 @@
</td>
</tr>
</blockTable>
- <para style="P1">
- <font color="white"> </font>
- </para>
</section>
<section>
<para style="terp_default_9">[[repeatIn(o.line_ids, 'l')]]</para>
- <blockTable colWidths="24.0,96.0,60.0,60.0,60.0,60.0,60.0,60.0" style="Table1">
+ <blockTable colWidths="26.0,106.0,66.0,66.0,66.0,66.0,66.0,66.0" style="Table1">
<tr>
<td>
<para style="terp_default_8">[[ get_no() ]]</para>
@@ -157,30 +144,27 @@
<para style="terp_default_8">[[ l.employee_id.name ]]</para>
</td>
<td>
- <para style="terp_default_9_right">[[ formatLang(l.basic) ]] [[ company.currency_id.symbol]] </para>
+ <para style="terp_default_9_right">[[ formatLang(l.basic) ]] [[ (company.currency_id and company.currency_id.symbol) or '']] </para>
</td>
<td>
- <para style="terp_default_9_right">[[ formatLang(l.other_pay)]] [[ company.currency_id.symbol]] </para>
+ <para style="terp_default_9_right">[[ formatLang(l.other_pay)]] [[ (company.currency_id and company.currency_id.symbol) or '']] </para>
</td>
<td>
- <para style="terp_default_9_right">[[ formatLang(l.allounce)]] [[ company.currency_id.symbol]] </para>
+ <para style="terp_default_9_right">[[ formatLang(l.allounce)]] [[ (company.currency_id and company.currency_id.symbol) or '']] </para>
</td>
<td>
- <para style="terp_default_9_right">[[ formatLang(l.grows)]] [[ company.currency_id.symbol]] </para>
+ <para style="terp_default_9_right">[[ formatLang(l.grows)]] [[ (company.currency_id and company.currency_id.symbol) or '']] </para>
</td>
<td>
- <para style="terp_default_9_right">[[ formatLang(l.deduction)]] [[ company.currency_id.symbol]] </para>
+ <para style="terp_default_9_right">[[ formatLang(l.deduction)]] [[ (company.currency_id and company.currency_id.symbol) or '']] </para>
</td>
<td>
- <para style="terp_default_9_right">[[ formatLang(l.net)]] [[ company.currency_id.symbol]] </para>
+ <para style="terp_default_9_right">[[ formatLang(l.net)]] [[ (company.currency_id and company.currency_id.symbol) or '']] </para>
</td>
</tr>
</blockTable>
- <para style="P1">
- <font color="white"> </font>
- </para>
</section>
- <blockTable colWidths="24.0,96.0,60.0,60.0,60.0,60.0,60.0,60.0" style="Table4">
+ <blockTable colWidths="26.0,106.0,66.0,66.0,66.0,66.0,66.0,66.0" style="Table4">
<tr>
<td>
<para style="terp_default_8">
@@ -191,22 +175,22 @@
<para style="terp_tblheader_details">Total Salary</para>
</td>
<td>
- <para style="terp_tbleheader_details_right">[[formatLang(get_basic(o))]][[ company.currency_id.symbol]] </para>
+ <para style="terp_tbleheader_details_right">[[formatLang(get_basic(o))]][[ (company.currency_id and company.currency_id.symbol) or '']] </para>
</td>
<td>
- <para style="terp_tbleheader_details_right">[[formatLang(get_other(o))]] [[ company.currency_id.symbol]]</para>
+ <para style="terp_tbleheader_details_right">[[formatLang(get_other(o))]] [[ (company.currency_id and company.currency_id.symbol) or '']] </para>
</td>
<td>
- <para style="terp_tbleheader_details_right">[[formatLang(get_allow(o))]] [[ company.currency_id.symbol]]</para>
+ <para style="terp_tbleheader_details_right">[[formatLang(get_allow(o))]] [[ (company.currency_id and company.currency_id.symbol) or '']] </para>
</td>
<td>
- <para style="terp_tbleheader_details_right">[[formatLang(get_grows(o))]] [[ company.currency_id.symbol]]</para>
+ <para style="terp_tbleheader_details_right">[[formatLang(get_grows(o))]] [[ (company.currency_id and company.currency_id.symbol) or '']] </para>
</td>
<td>
- <para style="terp_tbleheader_details_right">[[formatLang(get_deduct(o))]] [[ company.currency_id.symbol]]</para>
+ <para style="terp_tbleheader_details_right">[[formatLang(get_deduct(o))]] [[ (company.currency_id and company.currency_id.symbol) or '']] </para>
</td>
<td>
- <para style="terp_tbleheader_details_right">[[formatLang(get_net(o))]] [[ company.currency_id.symbol]]</para>
+ <para style="terp_tbleheader_details_right">[[formatLang(get_net(o))]] [[ (company.currency_id and company.currency_id.symbol) or '']] </para>
</td>
</tr>
</blockTable>
@@ -216,7 +200,7 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
- <blockTable colWidths="241.0,241.0" style="Table5">
+ <blockTable colWidths="265.0,265.0" style="Table5">
<tr>
<td>
<para style="terp_default_9_bold">For [[company.name]],</para>
@@ -243,4 +227,4 @@
<font color="white"> </font>
</para>
</story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/hr_payroll/report/report_employees_detail.py b/addons/hr_payroll/report/report_employees_detail.py
index efa4c1ee2363ef7625d95390fe5fa5fd8c0d7422..67481dc1a7d6745d077dd975d7c42ec13898056c 100644
--- a/addons/hr_payroll/report/report_employees_detail.py
+++ b/addons/hr_payroll/report/report_employees_detail.py
@@ -192,8 +192,13 @@ class employees_salary_report(rml_parse.rml_parse):
append_index = len(result) - 1
tot += line.total
else:
- result.append(0.00)
- res[mnth] = 0.00
+ if mnth == 'None':
+ result.append('')
+ res[mnth] = ''
+ self.month_total_list[cnt] = ''
+ else:
+ result.append(0.00)
+ res[mnth] = 0.00
if not res:
result.append(0.00)
res = {}
diff --git a/addons/hr_payroll/report/report_employees_detail.rml b/addons/hr_payroll/report/report_employees_detail.rml
index 542e370eb34865ae898bc3b3aa960ec928f40cc2..a74ca7ee6f85ffecd80f209a6b5826b112d7bd26 100644
--- a/addons/hr_payroll/report/report_employees_detail.rml
+++ b/addons/hr_payroll/report/report_employees_detail.rml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<document filename="test.pdf">
- <template pageSize="(1120.0,770.0)" title="Test" author="Martin Simon" allowSplitting="20">
+<document filename="Employees Salary Details.pdf">
+ <template pageSize="(1120.0,770.0)" title="Employees Salary Details" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="28.0" y1="28.0" width="1064" height="714"/>
</pageTemplate>
@@ -202,8 +202,6 @@
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
- <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Standard" fontName="Helvetica"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Text body" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -264,7 +262,7 @@
<blockTable colWidths="1063.0" style="Table12">
<tr>
<td>
- <para style="P2">Employees Salary Details </para>
+ <para style="terp_header_Centre">Employees Salary Details </para>
<para style="terp_default_Centre_9">From [[ formatLang(data['form']['date_from'], date=True) ]] To [[ formatLang(data['form']['date_to'], date=True) ]]</para>
</td>
</tr>
@@ -342,8 +340,8 @@
<font color="white"> </font>
</para>
<section>
- <para style="terp_default_8">[[ repeatIn(get_periods(data['form']),'m') ]] [[ get_employee_detail(o) ]]</para>
- <blockTable colWidths="137.0,64.0,62.0,64.0,68.0,69.0,76.0,71.0,80.0,75.0,79.0,78.0,70.0,70.0" style="Table4">
+ <para style="terp_default_1">[[ repeatIn(get_periods(data['form']),'m') ]] [[ get_employee_detail(o) ]]</para>
+ <blockTable colWidths="244.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,71.0" style="Table4">
<tr>
<td>
<para style="terp_tblheader_Details">Title</para>
@@ -396,52 +394,76 @@
<blockTable colWidths="1063.0" style="Table7">
<tr>
<td>
- <para style="P1">Allowances with Basic:</para>
+ <para style="terp_tblheader_Details">Allowances with Basic: </para>
</td>
</tr>
</blockTable>
<section>
<para style="terp_default_1">[[ repeatIn(get_allow(),'e1') ]]</para>
- <blockTable colWidths="138.0,62.0,62.0,64.0,68.0,70.0,75.0,70.0,80.0,75.0,79.0,77.0,71.0,70.0" style="Table6">
+ <blockTable colWidths="244.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,71.0" style="Table6">
<tr>
<td>
<para style="terp_default_9">[[ e1[0] ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e1[1]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e1[1]!='' and formatLang(e1[1])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e1[2]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e1[2]!='' and formatLang(e1[2])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e1[3]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e1[3]!='' and formatLang(e1[3])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e1[4]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e1[4]!='' and formatLang(e1[4])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e1[5]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e1[5]!='' and formatLang(e1[5])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e1[6]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e1[6]!='' and formatLang(e1[6])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e1[7]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e1[7]!='' and formatLang(e1[7])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e1[8]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e1[8]!='' and formatLang(e1[8])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e1[9]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e1[9]!='' and formatLang(e1[9])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e1[10]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e1[10]!='' and formatLang(e1[10])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e1[11]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e1[11]!='' and formatLang(e1[11])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e1[12]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e1[12]!='' and formatLang(e1[12])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ formatLang(e1[13]) ]] [[ company.currency_id.symbol ]]</para>
@@ -452,52 +474,76 @@
<blockTable colWidths="1063.0" style="Table10">
<tr>
<td>
- <para style="P1">Deductions:</para>
+ <para style="terp_tblheader_Details">Deductions: </para>
</td>
</tr>
</blockTable>
<section>
<para style="terp_default_1">[[ repeatIn(get_deduct(),'e2') ]]</para>
- <blockTable colWidths="137.0,63.0,62.0,63.0,70.0,69.0,76.0,71.0,79.0,76.0,79.0,77.0,73.0,70.0" style="Table8">
+ <blockTable colWidths="244.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,71.0" style="Table8">
<tr>
<td>
<para style="terp_default_9">[[ e2[0] ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e2[1]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e2[1]!='' and formatLang(e2[1])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e2[2]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e2[2]!='' and formatLang(e2[2])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e2[3]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e2[3]!='' and formatLang(e2[3])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e2[4]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e2[4]!='' and formatLang(e2[4])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e2[5]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e2[5]!='' and formatLang(e2[5])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e2[6]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e2[6]!='' and formatLang(e2[6])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e2[7]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e2[7]!='' and formatLang(e2[7])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e2[8]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e2[8]!='' and formatLang(e2[8])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e2[9]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e2[9]!='' and formatLang(e2[9])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e2[10]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e2[10]!='' and formatLang(e2[10])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e2[11]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e2[11]!='' and formatLang(e2[11])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e2[12]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e2[12]!='' and formatLang(e2[12])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ formatLang(e2[13]) ]] [[ company.currency_id.symbol ]]</para>
@@ -508,52 +554,76 @@
<blockTable colWidths="1063.0" style="Table11">
<tr>
<td>
- <para style="P1">Others:</para>
+ <para style="terp_tblheader_Details">Others: </para>
</td>
</tr>
</blockTable>
<section>
<para style="terp_default_1">[[ repeatIn(get_other(),'e3') ]]</para>
- <blockTable colWidths="137.0,62.0,64.0,62.0,69.0,70.0,77.0,70.0,78.0,77.0,79.0,77.0,73.0,69.0" style="Table9">
+ <blockTable colWidths="244.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,71.0" style="Table9">
<tr>
<td>
<para style="terp_default_9">[[ e3[0] ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e3[1]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e3[1]!='' and formatLang(e3[1])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e3[2]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e3[2]!='' and formatLang(e3[2])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e3[3]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e3[3]!='' and formatLang(e3[3])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e3[4]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e3[4]!='' and formatLang(e3[4])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e3[5]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e3[5]!='' and formatLang(e3[5])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e3[6]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e3[6]!='' and formatLang(e3[6])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e3[7]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e3[7]!='' and formatLang(e3[7])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e3[8]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e3[8]!='' and formatLang(e3[8])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e3[9]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e3[9]!='' and formatLang(e3[9])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e3[10]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e3[10]!='' and formatLang(e3[10])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e3[11]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e3[11]!='' and formatLang(e3[11])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e3[12]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e3[12]!='' and formatLang(e3[12])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ formatLang(e3[13]) ]] [[ company.currency_id.symbol ]]</para>
@@ -562,58 +632,52 @@
</blockTable>
</section>
</section>
- <blockTable colWidths="137.0,62.0,64.0,62.0,60.0,78.0,78.0,70.0,78.0,77.0,78.0,77.0,74.0,68.0" style="Table1">
+ <blockTable colWidths="244.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,62.0,71.0" style="Table1">
<tr>
<td>
<para style="terp_tblheader_Details">[[ get_monthly_total()[0] ]]</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[1]) ]][[ company.currency_id.symbol ]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[1]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[2]) ]][[ company.currency_id.symbol ]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[2]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[3]) ]][[ company.currency_id.symbol ]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[3]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[4]) ]][[ company.currency_id.symbol ]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[4]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[5]) ]][[ company.currency_id.symbol ]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[5]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[6]) ]][[ company.currency_id.symbol ]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[6]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[7]) ]][[ company.currency_id.symbol ]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[7]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[8]) ]][[ company.currency_id.symbol ]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[8]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[9]) ]][[ company.currency_id.symbol ]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[9]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[10]) ]][[ company.currency_id.symbol ]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[10]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[11]) ]][[ company.currency_id.symbol ]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[11]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[12]) ]][[ company.currency_id.symbol ]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[12]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
</td>
<td>
<para style="terp_tblheader_General_Right">[[ formatLang(get_total()) ]][[ company.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
- <para style="terp_default_1">
- <font color="white"> </font>
- </para>
</section>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
</story>
</document>
\ No newline at end of file
diff --git a/addons/hr_payroll/report/report_payroll_advice.rml b/addons/hr_payroll/report/report_payroll_advice.rml
index 8fe18772c2fe6a1eb937e9ea6f0ca1c42eb9b8ac..18f56cc98830f05b2fc0d482ef399a4c30572d50 100644
--- a/addons/hr_payroll/report/report_payroll_advice.rml
+++ b/addons/hr_payroll/report/report_payroll_advice.rml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Payroll Advice" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Payment Advice.pdf">
+ <template pageSize="(595.0,842.0)" title="Payment Advice" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
</pageTemplate>
@@ -41,6 +41,12 @@
<blockTableStyle id="Table5">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
</blockTableStyle>
<blockTableStyle id="Table6">
<blockAlignment value="LEFT"/>
@@ -212,9 +218,6 @@
</td>
</tr>
</blockTable>
- <para style="terp_default_1">
- <font color="white"> </font>
- </para>
<section>
<para style="terp_default_8">[[ repeatIn(get_detail(o.line_ids),'line') ]]</para>
<blockTable colWidths="60.0,167.0,84.0,82.0,110.0,35.0" style="Table5">
@@ -229,10 +232,10 @@
<para style="terp_default_9">[[ line['name'] ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(line['amount' ]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(line['amount' ]) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(line['bysal']) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(line['bysal']) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
</td>
<td>
<para style="terp_default_9">[[ line['acc_no'] ]]</para>
@@ -242,13 +245,7 @@
</td>
</tr>
</blockTable>
- <para style="terp_default_1">
- <font color="white"> </font>
- </para>
</section>
- <para style="terp_default_1">
- <font color="white"> </font>
- </para>
<blockTable colWidths="60.0,167.0,84.0,82.0,145.0" style="Table6">
<tr>
<td>
@@ -257,13 +254,13 @@
</para>
</td>
<td>
- <para style="terp_tblheader_Details">Total([[ company.currency_id.code ]]):</para>
+ <para style="terp_tblheader_Details">Total:</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(get_total()) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(get_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(get_bysal_total()) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">
@@ -338,4 +335,4 @@
<seqReset id="L1"/>
</para>
</story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/hr_payroll/report/report_year_report.rml b/addons/hr_payroll/report/report_year_report.rml
index 212bb59e7b3e808c631d8bcd8c9922a4b60a22ff..d121ce0dd984a04d686743eae79c0d66f2d4ef47 100755
--- a/addons/hr_payroll/report/report_year_report.rml
+++ b/addons/hr_payroll/report/report_year_report.rml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<document filename="test.pdf">
- <template pageSize="(1120.0,770.0)" title="Test" author="Martin Simon" allowSplitting="20">
+<document filename="Yearly Salary Details.pdf">
+ <template pageSize="(1120.0,770.0)" title="Yearly Salary Details" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="28.0" y1="28.0" width="1064" height="714"/>
</pageTemplate>
@@ -201,40 +201,64 @@
<para style="terp_default_9">[[ e[0] ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e[1]) ]] [[company.currency_id.symbol]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e[1]!='' and formatLang(e[1])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e[2]) ]] [[company.currency_id.symbol]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e[2]!='' and formatLang(e[2])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e[3]) ]] [[company.currency_id.symbol]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e[3]!='' and formatLang(e[3])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e[4]) ]] [[company.currency_id.symbol]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e[4]!='' and formatLang(e[4])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e[5]) ]] [[company.currency_id.symbol]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e[5]!='' and formatLang(e[5])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e[6]) ]] [[company.currency_id.symbol]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e[6]!='' and formatLang(e[6])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e[7]) ]] [[company.currency_id.symbol]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e[7]!='' and formatLang(e[7])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e[8]) ]] [[company.currency_id.symbol]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e[8]!='' and formatLang(e[8])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e[9]) ]] [[company.currency_id.symbol]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e[9]!='' and formatLang(e[9])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e[10]) ]] [[company.currency_id.symbol]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e[10]!='' and formatLang(e[10])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e[11]) ]] [[company.currency_id.symbol]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e[11]!='' and formatLang(e[11])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(e[12]) ]] [[company.currency_id.symbol]]</para>
+ <para style="terp_default_Right_8">
+ <font face="Helvetica" size="9.0">[[ (e[12]!='' and formatLang(e[12])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+ </para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ formatLang(e[13]) ]] [[company.currency_id.symbol]]</para>
@@ -251,40 +275,40 @@
<para style="terp_tblheader_Details">Total</para>
</td>
<td>
- <para style="terp_tblheader_General_Right">[[ formatLang(t[1]) ]] [[company.currency_id.symbol]]</para>
+ <para style="terp_tblheader_General_Right">[[ formatLang(t[1]) or removeParentNode('para') ]] [[company.currency_id.symbol]]</para>
</td>
<td>
- <para style="terp_tblheader_General_Right">[[ formatLang(t[2]) ]] [[company.currency_id.symbol]]</para>
+ <para style="terp_tblheader_General_Right">[[ formatLang(t[2]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
</td>
<td>
- <para style="terp_tblheader_General_Right">[[ formatLang(t[3]) ]] [[company.currency_id.symbol]]</para>
+ <para style="terp_tblheader_General_Right">[[ formatLang(t[3]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
</td>
<td>
- <para style="terp_tblheader_General_Right">[[ formatLang(t[4]) ]] [[company.currency_id.symbol]]</para>
+ <para style="terp_tblheader_General_Right">[[ formatLang(t[4]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
</td>
<td>
- <para style="terp_tblheader_General_Right">[[ formatLang(t[5]) ]] [[company.currency_id.symbol]]</para>
+ <para style="terp_tblheader_General_Right">[[ formatLang(t[5]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
</td>
<td>
- <para style="terp_tblheader_General_Right">[[ formatLang(t[6]) ]] [[company.currency_id.symbol]]</para>
+ <para style="terp_tblheader_General_Right">[[ formatLang(t[6]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
</td>
<td>
- <para style="terp_tblheader_General_Right">[[ formatLang(t[7]) ]] [[company.currency_id.symbol]]</para>
+ <para style="terp_tblheader_General_Right">[[ formatLang(t[7]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
</td>
<td>
- <para style="terp_tblheader_General_Right">[[ formatLang(t[8]) ]] [[company.currency_id.symbol]]</para>
+ <para style="terp_tblheader_General_Right">[[ formatLang(t[8]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
</td>
<td>
- <para style="terp_tblheader_General_Right">[[ formatLang(t[9]) ]] [[company.currency_id.symbol]]</para>
+ <para style="terp_tblheader_General_Right">[[ formatLang(t[9]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
</td>
<td>
- <para style="terp_tblheader_General_Right">[[ formatLang(t[10]) ]] [[company.currency_id.symbol]]</para>
+ <para style="terp_tblheader_General_Right">[[ formatLang(t[10]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
</td>
<td>
- <para style="terp_tblheader_General_Right">[[ formatLang(t[11]) ]] [[company.currency_id.symbol]]</para>
+ <para style="terp_tblheader_General_Right">[[ formatLang(t[11]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
</td>
<td>
- <para style="terp_tblheader_General_Right">[[ formatLang(t[12]) ]] [[company.currency_id.symbol]]</para>
+ <para style="terp_tblheader_General_Right">[[ formatLang(t[12]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
</td>
<td>
<para style="terp_tblheader_General_Right">[[ formatLang(get_total()) ]] [[company.currency_id.symbol]]</para>
diff --git a/addons/hr_payroll/report/report_year_salary.py b/addons/hr_payroll/report/report_year_salary.py
index 0a7857582d4a3b681789d277ad9686c7064eeb8c..2db2d7d7e2db6dfbaa6c14640d58ea544763ca19 100755
--- a/addons/hr_payroll/report/report_year_salary.py
+++ b/addons/hr_payroll/report/report_year_salary.py
@@ -67,17 +67,16 @@ class year_salary_report(rml_parse.rml_parse):
query = "select net from hr_payslip where employee_id = "+str(emp_id.id)+" and to_char(date,'mm-yyyy') like '%"+mnth+"%' and state = 'done' "
self.cr.execute(query)
sal = self.cr.fetchall()
+ if sal:
+ ls1.append(sal[0][0])
+ tol += sal[0][0]
+ tol_mnths[cnt] = tol_mnths[cnt] + sal[0][0]
+ else:
+ ls1.append(0.00)
+ tol_mnths[cnt] = 0.0
else:
- sal = [(0.0,)]
- try:
- ls1.append(sal[0][0])
- except:
- ls1.append(0)
- try:
- tol += sal[0][0]
- tol_mnths[cnt] = tol_mnths[cnt] + sal[0][0]
- except:
- tol += 0
+ ls1.append('')
+ tol_mnths[cnt] = ''
cnt = cnt + 1
cnt = 1
ls1.append(tol)
@@ -92,6 +91,8 @@ class year_salary_report(rml_parse.rml_parse):
def get_total(self):
for item in self.mnths_tol:
for count in range(1,len(item)):
+ if item[count] == '':
+ continue
self.total += item[count]
return self.total
diff --git a/addons/hr_payroll/report/rml_parse.py b/addons/hr_payroll/report/rml_parse.py
index 7abb29711b61b1ae619a02bd3ec33a335abb37a9..0eb783de39fe925da3381bfb31fa4a230619acbc 100755
--- a/addons/hr_payroll/report/rml_parse.py
+++ b/addons/hr_payroll/report/rml_parse.py
@@ -68,7 +68,7 @@ class rml_parse(report_sxw.rml_parse):
def _get_and_change_date_format_for_swiss (self,date_to_format):
date_formatted=''
if date_to_format:
- date_formatted = strptime (date_to_format,'%Y-%m-%d').strftime('%d.%m.%Y')
+ date_formatted = strptime(date_to_format,'%Y-%m-%d').strftime('%d.%m.%Y')
return date_formatted
def _explode_name(self,chaine,length):
@@ -107,7 +107,7 @@ class rml_parse(report_sxw.rml_parse):
return Stringer
def explode_this(self,chaine,length):
- chaine = rstrip(chaine)
+ chaine = chaine.rstrip()
ast = list(chaine)
i = length
while i <= len(ast):
diff --git a/addons/hr_payroll_account/__openerp__.py b/addons/hr_payroll_account/__openerp__.py
index 5dec5dc4fb82d04c6754e20a30f19b1652a5265b..d65570a1ad9561a97ae2595146aa887bacc11848 100644
--- a/addons/hr_payroll_account/__openerp__.py
+++ b/addons/hr_payroll_account/__openerp__.py
@@ -28,11 +28,12 @@
* Payment Encoding
* Company Contribution Management
""",
- 'author':'OpenERP SA/Axelor',
+ 'author':'OpenERP SA',
'website':'http://www.openerp.com',
'depends': [
'hr_payroll',
'account',
+ 'hr_expense'
],
'init_xml': [
],
@@ -40,6 +41,7 @@
"hr_payroll_account_view.xml",
],
'demo_xml': [
+ 'hr_payroll_demo.xml'
],
'installable': True,
'active': False,
diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py
index 87b76895e1a28b4e96afc83977537253dc05ba2e..d9f963ed5370fd0781db91ce0885999c4041ca29 100644
--- a/addons/hr_payroll_account/hr_payroll_account.py
+++ b/addons/hr_payroll_account/hr_payroll_account.py
@@ -28,8 +28,6 @@ from osv import fields, osv
from tools import config
from tools.translate import _
-
-
def prev_bounds(cdate=False):
when = date.fromtimestamp(time.mktime(time.strptime(cdate,"%Y-%m-%d")))
this_first = date(when.year, when.month, 1)
@@ -42,6 +40,172 @@ def prev_bounds(cdate=False):
prev_end = next_month - timedelta(days=1)
return this_first, prev_end
+class hr_payroll_structure(osv.osv):
+ _inherit = 'hr.payroll.structure'
+ _description = 'Salary Structure'
+
+ _columns = {
+ 'account_id':fields.many2one('account.analytic.account', 'Analytic Account'),
+ }
+hr_payroll_structure()
+
+class hr_employee(osv.osv):
+ '''
+ Employee
+ '''
+ _inherit = 'hr.employee'
+ _description = 'Employee'
+
+ _columns = {
+ 'property_bank_account': fields.property(
+ 'account.account',
+ type='many2one',
+ relation='account.account',
+ string="Bank Account",
+ method=True,
+ domain="[('type', '=', 'liquidity')]",
+ view_load=True,
+ help="Select Bank Account from where Salary Expanse will be Paid"),
+ 'salary_account':fields.property(
+ 'account.account',
+ type='many2one',
+ relation='account.account',
+ string="Salary Account",
+ method=True,
+ domain="[('type', '=', 'other')]",
+ view_load=True,
+ help="Expanse account when Salary Expanse will be recorded"),
+ 'employee_account':fields.property(
+ 'account.account',
+ type='many2one',
+ relation='account.account',
+ string="Employee Account",
+ method=True,
+ domain="[('type', '=', 'other')]",
+ view_load=True,
+ help="Employee Payable Account"),
+ 'analytic_account':fields.property(
+ 'account.analytic.account',
+ type='many2one',
+ relation='account.analytic.account',
+ string="Analytic Account",
+ method=True,
+ view_load=True,
+ help="Analytic Account for Salary Analysis"),
+ }
+hr_employee()
+
+class payroll_register(osv.osv):
+ _inherit = 'hr.payroll.register'
+ _description = 'Payroll Register'
+
+ _columns = {
+ 'journal_id': fields.many2one('account.journal', 'Expanse Journal'),
+ 'bank_journal_id': fields.many2one('account.journal', 'Bank Journal'),
+ 'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], help="Keep empty to use the period of the validation(Payslip) date."),
+ }
+
+ def compute_sheet(self, cr, uid, ids, context={}):
+ emp_pool = self.pool.get('hr.employee')
+ slip_pool = self.pool.get('hr.payslip')
+ func_pool = self.pool.get('hr.payroll.structure')
+ slip_line_pool = self.pool.get('hr.payslip.line')
+ wf_service = netsvc.LocalService("workflow")
+ vals = self.browse(cr, uid, ids)[0]
+ emp_ids = emp_pool.search(cr, uid, [])
+
+ for emp in emp_pool.browse(cr, uid, emp_ids):
+ old_slips = slip_pool.search(cr, uid, [('employee_id','=', emp.id), ('date','=',vals.date)])
+ if old_slips:
+ slip_pool.write(cr, uid, old_slips, {'register_id':ids[0]})
+ for sid in old_slips:
+ wf_service.trg_validate(uid, 'hr.payslip', sid, 'compute_sheet', cr)
+ else:
+ res = {
+ 'employee_id':emp.id,
+ 'basic':0.0,
+ 'register_id':ids[0],
+ 'name':vals.name,
+ 'date':vals.date,
+ 'journal_id':vals.journal_id.id,
+ 'bank_journal_id':vals.bank_journal_id.id
+ }
+ slip_id = slip_pool.create(cr, uid, res)
+ wf_service.trg_validate(uid, 'hr.payslip', slip_id, 'compute_sheet', cr)
+
+ number = self.pool.get('ir.sequence').get(cr, uid, 'salary.register')
+ self.write(cr, uid, ids, {'state':'draft', 'number':number})
+ return True
+
+payroll_register()
+
+class payroll_advice(osv.osv):
+ _inherit = 'hr.payroll.advice'
+ _description = 'Bank Advice Note'
+
+ _columns = {
+ 'account_id': fields.many2one('account.account', 'Account'),
+ }
+payroll_advice()
+
+class contrib_register(osv.osv):
+ _inherit = 'hr.contibution.register'
+ _description = 'Contribution Register'
+
+ def _total_contrib(self, cr, uid, ids, field_names, arg, context={}):
+ line_pool = self.pool.get('hr.contibution.register.line')
+ period_id = self.pool.get('account.period').search(cr,uid,[('date_start','<=',time.strftime('%Y-%m-%d')),('date_stop','>=',time.strftime('%Y-%m-%d'))])[0]
+ fiscalyear_id = self.pool.get('account.period').browse(cr, uid, period_id).fiscalyear_id
+ res = {}
+ for cur in self.browse(cr, uid, ids):
+ current = line_pool.search(cr, uid, [('period_id','=',period_id),('register_id','=',cur.id)])
+ years = line_pool.search(cr, uid, [('period_id.fiscalyear_id','=',fiscalyear_id.id), ('register_id','=',cur.id)])
+
+ e_month = 0.0
+ c_month = 0.0
+ for i in line_pool.browse(cr, uid, current):
+ e_month += i.emp_deduction
+ c_month += i.comp_deduction
+
+ e_year = 0.0
+ c_year = 0.0
+ for j in line_pool.browse(cr, uid, years):
+ e_year += i.emp_deduction
+ c_year += i.comp_deduction
+
+ res[cur.id]={
+ 'monthly_total_by_emp':e_month,
+ 'monthly_total_by_comp':c_month,
+ 'yearly_total_by_emp':e_year,
+ 'yearly_total_by_comp':c_year
+ }
+ return res
+
+ _columns = {
+ 'account_id': fields.many2one('account.account', 'Account'),
+ 'analytic_account_id':fields.many2one('account.analytic.account', 'Analytic Account'),
+ 'yearly_total_by_emp': fields.function(_total_contrib, method=True, multi='dc', store=True, string='Total By Employee', digits=(16, 4)),
+ 'yearly_total_by_comp': fields.function(_total_contrib, method=True, multi='dc', store=True, string='Total By Company', digits=(16, 4)),
+ }
+contrib_register()
+
+class contrib_register_line(osv.osv):
+ _inherit = 'hr.contibution.register.line'
+ _description = 'Contribution Register Line'
+
+ _columns = {
+ 'period_id': fields.many2one('account.period', 'Period'),
+ }
+contrib_register_line()
+
+class hr_holidays_status(osv.osv):
+ _inherit = 'hr.holidays.status'
+ _columns = {
+ 'account_id': fields.many2one('account.account', 'Account'),
+ 'analytic_account_id':fields.many2one('account.analytic.account', 'Analytic Account'),
+ }
+hr_holidays_status()
+
class hr_payslip(osv.osv):
'''
Pay Slip
@@ -50,7 +214,9 @@ class hr_payslip(osv.osv):
_description = 'Pay Slip'
_columns = {
- 'move_ids':fields.one2many('hr.payslip.account.move', 'slip_id', 'Accounting vouchers', required=False),
+ 'journal_id': fields.many2one('account.journal', 'Expanse Journal'),
+ 'bank_journal_id': fields.many2one('account.journal', 'Bank Journal'),
+ 'move_ids':fields.one2many('hr.payslip.account.move', 'slip_id', 'Accounting vouchers'),
'move_line_ids':fields.many2many('account.move.line', 'payslip_lines_rel', 'slip_id', 'line_id', 'Accounting Lines', readonly=True),
'move_payment_ids':fields.many2many('account.move.line', 'payslip_payment_rel', 'slip_id', 'payment_id', 'Payment Lines', readonly=True),
'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], help="Keep empty to use the period of the validation(Payslip) date."),
@@ -404,8 +570,9 @@ class hr_payslip(osv.osv):
line_ids += [movel_pool.create(cr, uid, rec, context=context)]
- for contrub in line.category_id.contribute_ids:
- print contrib.name, contrub.code, contrub.amount_type, contrib.contribute_per, line.total
+ # if self._debug:
+ # for contrib in line.category_id.contribute_ids:
+ # _log.debug("%s %s %s %s %s", contrib.name, contrub.code, contrub.amount_type, contrib.contribute_per, line.total)
adj_move_id = False
if total_deduct > 0:
@@ -479,6 +646,14 @@ class hr_payslip(osv.osv):
hr_payslip()
+class hr_payslip_line(osv.osv):
+ _inherit = 'hr.payslip.line'
+ _columns = {
+ 'account_id': fields.many2one('account.account', 'General Account'),
+ 'analytic_account_id':fields.many2one('account.analytic.account', 'Analytic Account'),
+ }
+hr_payslip_line()
+
class account_move_link_slip(osv.osv):
'''
Account Move Link to Pay Slip
diff --git a/addons/hr_payroll_account/hr_payroll_account_view.xml b/addons/hr_payroll_account/hr_payroll_account_view.xml
index 6ef6c812c0bd924fac7c3d51be89f969d872f709..43734060243108887c5b395fa70c3ee580a61c42 100644
--- a/addons/hr_payroll_account/hr_payroll_account_view.xml
+++ b/addons/hr_payroll_account/hr_payroll_account_view.xml
@@ -1,61 +1,258 @@
<?xml version="1.0"?>
<openerp>
<data>
-
- <record id="view_hr_payslip_form_inherit" model="ir.ui.view">
- <field name="name">hr.payslip.form</field>
- <field name="model">hr.payslip</field>
+
+ <record id="hr_hr_employee_view_form2_inherit_2" model="ir.ui.view">
+ <field name="name">hr.hr.employee.view.form2.inherit_1</field>
+ <field name="model">hr.employee</field>
<field name="type">form</field>
- <field name="inherit_id" ref="hr_payroll.view_hr_payslip_form"/>
+ <field name="inherit_id" ref="hr_contract.hr_hr_employee_view_form2"/>
<field name="arch" type="xml">
- <page string="Accounting Details" position="replace">
- <page string="Accounting Details">
- <group col="4" colspan="3">
- <separator colspan="4" string="Accounting Informations"/>
- <field name="move_ids" colspan="4" nolabel="1" readonly="1">
- <tree string="Accounting Vouchers">
- <field name="sequence"/>
- <field name="name"/>
- <field name="move_id"/>
- </tree>
- <form string="Accounting Vouchers">
- <field name="sequence"/>
- <field name="name"/>
- <field name="move_id"/>
- </form>
- </field>
- </group>
- <group col="2" colspan="1">
- <separator colspan="2" string="Other Informations"/>
- <field name="paid" readonly="1"/>
- <field name="company_id"/>
- <field name="register_id"/>
- <field name="deg_id"/>
- <field name="contract_id" domain="[('employee_id','=',employee_id)]"/>
- </group>
- <separator colspan="4" string="Description"/>
- <field name="note" colspan="4" nolabel="1"/>
+ <xpath expr="/form/notebook/page[@string='Salary Structure']" position="after">
+ <page string="Accounting">
+ <field name="property_bank_account" required="1"/>
+ <field name="salary_account" required="1"/>
+ <field name="employee_account" required="1"/>
+ <field name="analytic_account"/>
+ <field name="slip_ids" colspan="4" nolabel="1"/>
</page>
- </page>
+ </xpath>
</field>
</record>
-
- <record id="view_hr_payslip_form_inherit1" model="ir.ui.view">
- <field name="name">hr.payslip.form</field>
+
+ <record id="hr_hr_employee_view_form2_inherit_1" model="ir.ui.view">
+ <field name="name">hr.hr.employee.view.form2.inherit</field>
+ <field name="model">hr.employee</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="hr_contract.hr_hr_employee_view_form2"/>
+ <field name="arch" type="xml">
+ <xpath expr="/form/notebook/page[@string='Salary Structure']/field[@name='line_ids']/tree/field[@name='amount']" position="after">
+ <field name="account_id"/>
+ <field name="analytic_account_id"/>
+ </xpath>
+ <xpath expr="/form/notebook/page[@string='Salary Structure']/field[@name='line_ids']/form/group/field[@name='code']" position="after">
+ <field name="account_id"/>
+ <field name="analytic_account_id"/>
+ </xpath>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="view_holiday_status_inherit_form1">
+ <field name="name">hr.holidays.status.inherit1</field>
+ <field name="model">hr.holidays.status</field>
+ <field name="inherit_id" ref="hr_payroll.view_holiday_status_form1"/>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <field name="code" position="after">
+ <field name="analytic_account_id"/>
+ <field name="account_id"/>
+ </field>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="view_hr_payslip_line_inherit_tree">
+ <field name="name">hr.payslip.line.inherit.tree</field>
+ <field name="model">hr.payslip.line</field>
+ <field name="inherit_id" ref="hr_payroll.view_hr_payslip_line_tree"/>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <field name="amount" position="after">
+ <field name="analytic_account_id"/>
+ <field name="account_id" required="1"/>
+ </field>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="view_hr_payslip_line_inherit_form">
+ <field name="name">hr.payslip.line.inherit.form</field>
+ <field name="model">hr.payslip.line</field>
+ <field name="inherit_id" ref="hr_payroll.view_hr_payslip_line_form"/>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <field name="company_contrib" position="before">
+ <field name="analytic_account_id"/>
+ <field name="account_id" required="1"/>
+ </field>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="view_hr_payslip_inherit_form">
+ <field name="name">hr.payslip.inherit.form</field>
<field name="model">hr.payslip</field>
+ <field name="inherit_id" ref="hr_payroll.view_hr_payslip_form"/>
<field name="type">form</field>
- <field name="inherit_id" ref="view_hr_payslip_form_inherit"/>
<field name="arch" type="xml">
- <notebook position="inside">
- <page string="Account Lines">
- <field name="move_line_ids" colspan="4" nolabel="1"/>
- </page>
- <page string="Payment Lines">
- <field name="move_payment_ids" colspan="4" nolabel="1"/>
- </page>
- </notebook>
+ <field name="date" position="before">
+ <field name="journal_id" required="1"/>
+ <field name="bank_journal_id" domain="[('type','=','cash')]" required="1"/>
+ </field>
+ </field>
+ </record>
+
+
+ <record id="view_hr_payslip_form_inherit_1" model="ir.ui.view">
+ <field name="name">hr.payslip.form.inherit1</field>
+ <field name="model">hr.payslip</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="hr_payroll.view_hr_payslip_form"/>
+ <field name="arch" type="xml">
+ <xpath expr="/form/notebook/page[@string='Salary Computation']/field[@name='line_ids']/tree/field[@name='total']" position="after">
+ <field name="account_id" required="1"/>
+ <field name="analytic_account_id"/>
+ </xpath>
+ <xpath expr="/form/notebook/page[@string='Salary Computation']/field[@name='line_ids']/form/group/field[@name='company_contrib']" position="before">
+ <field name="account_id" required="1"/>
+ <field name="analytic_account_id"/>
+ </xpath>
</field>
</record>
+
+ <record model="ir.ui.view" id="view_hr_bank_advice_inherit_form">
+ <field name="name">hr.payroll.advice.inherit.form</field>
+ <field name="model">hr.payroll.advice</field>
+ <field name="inherit_id" ref="hr_payroll.view_hr_bank_advice_form"/>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <field name="name" position="after">
+ <field name="account_id" required="1"/>
+ </field>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="view_hr_payroll_register_inherit_tree">
+ <field name="name">hr.payroll.register.inherit.tree</field>
+ <field name="model">hr.payroll.register</field>
+ <field name="inherit_id" ref="hr_payroll.view_hr_payroll_register_tree"/>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <field name="state" position="before">
+ <field name="journal_id" required="1"/>
+ <field name="bank_journal_id" required="1"/>
+ </field>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="view_hr_payroll_register_inherit_form">
+ <field name="name">hr.payroll.register.inherit.form</field>
+ <field name="model">hr.payroll.register</field>
+ <field name="inherit_id" ref="hr_payroll.view_hr_payroll_register_form"/>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <field name="number" position="after">
+ <field name="journal_id" required="1"/>
+ <field name="bank_journal_id" required="1"/>
+ </field>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="hr_contibution_register_inherit_tree">
+ <field name="name">hr.contibution.register.inherit.tree</field>
+ <field name="model">hr.contibution.register</field>
+ <field name="inherit_id" ref="hr_payroll.hr_contibution_register_tree"/>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <field name="monthly_total_by_comp" position="after">
+ <field name="yearly_total_by_emp"/>
+ <field name="yearly_total_by_comp"/>
+ </field>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="hr_contibution_register_inherit_form">
+ <field name="name">hr.contibution.register.inherit.form</field>
+ <field name="model">hr.contibution.register</field>
+ <field name="inherit_id" ref="hr_payroll.hr_contibution_register_form"/>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <field name="name" position="after">
+ <field name="account_id" required="1"/>
+ <field name="analytic_account_id"/>
+ </field>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="hr_contibution_register_inherit1_form">
+ <field name="name">hr.contibution.register.inherit1.form</field>
+ <field name="model">hr.contibution.register</field>
+ <field name="inherit_id" ref="hr_payroll.hr_contibution_register_form"/>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <group name="Month" position="after">
+ <group col="2" colspan="2">
+ <separator colspan="4" string="Year"/>
+ <field name="yearly_total_by_emp"/>
+ <field name="yearly_total_by_comp"/>
+ </group>
+ </group>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="hr_contibution_register_line_inherit_form">
+ <field name="name">hr.contibution.register.line.form.inherit</field>
+ <field name="model">hr.contibution.register.line</field>
+ <field name="inherit_id" ref="hr_payroll.hr_contibution_register_line_form"/>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <field name="employee_id" position="after">
+ <field name="period_id"/>
+ </field>
+ </field>
+ </record>
+
+ <record id="view_hr_payslip_form_inherit" model="ir.ui.view">
+ <field name="name">hr.payslip.form</field>
+ <field name="model">hr.payslip</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="hr_payroll.view_hr_payslip_form"/>
+ <field name="arch" type="xml">
+ <page string="Other Informations" position="replace">
+ <page string="Accounting Details">
+ <group col="4" colspan="3">
+ <separator colspan="4" string="Accounting Informations"/>
+ <field name="move_ids" colspan="4" nolabel="1" readonly="1">
+ <tree string="Accounting Vouchers">
+ <field name="sequence"/>
+ <field name="name"/>
+ <field name="move_id"/>
+ </tree>
+ <form string="Accounting Vouchers">
+ <field name="sequence"/>
+ <field name="name"/>
+ <field name="move_id"/>
+ </form>
+ </field>
+ </group>
+ <group col="2" colspan="1">
+ <separator colspan="2" string="Other Informations"/>
+ <field name="paid" readonly="1"/>
+ <field name="company_id"/>
+ <field name="register_id"/>
+ <field name="deg_id"/>
+ <field name="contract_id" domain="[('employee_id','=',employee_id)]"/>
+ </group>
+ <separator colspan="4" string="Description"/>
+ <field name="note" colspan="4" nolabel="1"/>
+ </page>
+ </page>
+ </field>
+ </record>
+
+ <record id="view_hr_payslip_form_inherit1" model="ir.ui.view">
+ <field name="name">hr.payslip.form</field>
+ <field name="model">hr.payslip</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="view_hr_payslip_form_inherit"/>
+ <field name="arch" type="xml">
+ <notebook position="inside">
+ <page string="Account Lines">
+ <field name="move_line_ids" colspan="4" nolabel="1"/>
+ </page>
+ <page string="Payment Lines">
+ <field name="move_payment_ids" colspan="4" nolabel="1"/>
+ </page>
+ </notebook>
+ </field>
+ </record>
</data>
</openerp>
diff --git a/addons/hr_payroll_account/hr_payroll_demo.xml b/addons/hr_payroll_account/hr_payroll_demo.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3aecf5455c5665fe21ede533f65419e2eef39aeb
--- /dev/null
+++ b/addons/hr_payroll_account/hr_payroll_demo.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+ <data>
+
+ <record id="hr_payroll.hr_payslip_line_houserantallowance1" model="hr.payslip.line">
+ <field name="account_id" ref="account.a_expense"/>
+ </record>
+
+ <record id="hr_payroll.hr_payslip_line_convanceallowance1" model="hr.payslip.line">
+ <field name="account_id" ref="account.a_expense"/>
+ </record>
+
+ <record id="hr_payroll.hr_payslip_line_professionaltax1" model="hr.payslip.line">
+ <field name="account_id" ref="account.a_pay"/>
+ </record>
+
+ <record id="hr_payroll.hr_payslip_line_providentfund1" model="hr.payslip.line">
+ <field name="account_id" ref="account.a_pay"/>
+ </record>
+
+ <!-- Payslip -->
+ <record id="hr_payroll.hr_payslip_salaryslipofbonamyforjune0" model="hr.payslip">
+ <field name="journal_id" ref="account.expenses_journal"/>
+ <field name="bank_journal_id" ref="account.bank_journal"/>
+ </record>
+
+ <!-- Assigned Default Account in Different Demo Employees -->
+
+ <record id="hr.employee" model="hr.employee">
+ <field name="property_bank_account" ref="account.bnk"/>
+ <field name="salary_account" ref="account.a_salary_expense"/>
+ <field name="employee_account" ref="account.a_expense"/>
+ </record>
+
+ <record id="hr.employee1" model="hr.employee">
+ <field name="property_bank_account" ref="account.bnk"/>
+ <field name="salary_account" ref="account.a_salary_expense"/>
+ <field name="employee_account" ref="account.a_expense"/>
+ </record>
+
+ <record id="hr.employee2" model="hr.employee">
+ <field name="property_bank_account" ref="account.bnk"/>
+ <field name="salary_account" ref="account.a_salary_expense"/>
+ <field name="employee_account" ref="account.a_expense"/>
+ </record>
+
+ <record id="hr.employee3" model="hr.employee">
+ <field name="property_bank_account" ref="account.bnk"/>
+ <field name="salary_account" ref="account.a_salary_expense"/>
+ <field name="employee_account" ref="account.a_expense"/>
+ </record>
+
+ <record id="hr_payroll.hr_employee_bonamy0" model="hr.employee">
+ <field name="property_bank_account" ref="account.bnk"/>
+ <field name="salary_account" ref="account.a_salary_expense"/>
+ <field name="employee_account" ref="account.a_expense"/>
+ </record>
+
+ </data>
+</openerp>
diff --git a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
index 7416ff8b0abccd96ade1fbd3a6f853f9ff6d9255..0cf34e36de4fbbcc27b34ce24c36b9ab8bf6f323 100644
--- a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
+++ b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
@@ -38,7 +38,7 @@
</xpath>
</field>
</record>
- <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0" groups="base.group_system,base.group_hr_manager,base.group_hr_user"/>
+ <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0" groups="base.group_hr_manager,base.group_hr_user"/>
<menuitem
action="hr.open_board_hr_manager"
icon="terp-graph"
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 3dbcd946e8784b10c673d2c23c6094a44b2ec063..c676b4199bef188a93be5a700886fc4156acd128 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -332,9 +332,6 @@ class hr_applicant(crm.crm_case, osv.osv):
vals.update(res)
res = self.create(cr, uid, vals, context=context)
- message = _('A Job Request created') + " '" + subject + "' " + _("from Mailgate.")
- self.log(cr, uid, res, message)
-
attachents = msg.get('attachments', [])
for attactment in attachents or []:
data_attach = {
@@ -410,7 +407,7 @@ class hr_applicant(crm.crm_case, osv.osv):
if not date['date_open']:
self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S'),})
for (id, name) in self.name_get(cr, uid, ids):
- message = _('Job request for') + " '" + name + "' "+ _("is Open.")
+ message = _("The job request '%s' has been set 'in progress'.") % name
self.log(cr, uid, id, message)
return res
@@ -426,20 +423,12 @@ class hr_applicant(crm.crm_case, osv.osv):
job_obj = self.pool.get('hr.job')
res = super(hr_applicant, self).case_close(cr, uid, ids, *args)
for (id, name) in self.name_get(cr, uid, ids):
- message = _('Applicant ') + " '" + name + "' "+ _("is Hired.")
+ message = _("Applicant '%s' is being hired.") % name
self.log(cr, uid, id, message)
- stage_id = self.pool.get('hr.recruitment.stage').search(cr, uid, [('name','=','Contract Signed')])
- self.write(cr, uid, ids,{'stage_id':stage_id[0]})
-
applicant = self.browse(cr, uid, ids)[0]
if applicant.job_id :
emp_id = employee_obj.create(cr,uid,{'name':applicant.name,'job_id':applicant.job_id.id})
- job_data = job_obj.browse(cr,uid, applicant.job_id.id)
- expected_emp = job_data['expected_employees'] - 1
- if expected_emp == 0:
- job_obj.write(cr,uid, [applicant.job_id.id],{'state':'old'})
- job_obj.write(cr,uid, [applicant.job_id.id],{'expected_employees':expected_emp})
return res
def case_reset(self, cr, uid, ids, *args):
@@ -450,18 +439,9 @@ class hr_applicant(crm.crm_case, osv.osv):
@param ids: List of case Ids
@param *args: Tuple Value for additional Params
"""
- applicant = self.browse(cr, uid, ids)[0]
- if applicant.job_id :
- job_obj = self.pool.get('hr.job')
- emp_obj = self.pool.get('hr.employee')
- job_data = job_obj.browse(cr,uid, applicant.job_id.id)
- expected_emp = job_data['expected_employees'] + 1
- emp_id = emp_obj.search(cr,uid, [('job_id','=',applicant.job_id.id),('name','=',applicant.name)])
- emp_obj.unlink(cr, uid, emp_id)
- job_obj.write(cr,uid, [applicant.job_id.id],{'expected_employees':expected_emp})
+
res = super(hr_applicant, self).case_reset(cr, uid, ids, *args)
self.write(cr, uid, ids, {'date_open': False, 'date_closed':False})
-
return res
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 033fd68052c02525871c8ac4ce79337bcb0ff67e..cf2097b2454bc6ebc85d254c7044406c9f0b5684 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -297,7 +297,7 @@
<field name="type">form</field>
<field name="inherit_id" ref="hr.view_hr_job_form"/>
<field name="arch" type="xml">
- <field name="no_of_employee" position="after">
+ <field name="department_id" position="after">
<field name="survey_id"/>
</field>
</field>
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index f5e74724c252b21e0ce0792166e57df174ec14b5..a38cf0185dff3a7b9af1bad1e49f6a4a0f26e37e 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -49,39 +49,39 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Recruitment Analysis">
- <group>
- <filter icon="terp-go-year" string="Year"
- domain="[('date','<=', time.strftime('%%Y-%%m-%%d')),('date','>=',time.strftime('%%Y-01-01'))]"
- help="Recruitment performed in current year"/>
- <filter icon="terp-go-month" string="Month"
- name="month"
- domain="[('date','<=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','>=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
- help="Recruitment performed in current month"/>
- <filter icon="terp-go-month"
- string=" Month-1 "
- separator="1"
- domain="[('date','<=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','>=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
- help="Recruitment during last month"/>
- <separator orientation="vertical"/>
- <filter string="New"
- icon="terp-document-new"
- domain="[('state','=','draft')]"
- help = "Draft recruitment"/>
- <filter string="In progress"
- icon="terp-check"
- domain="[('state', '=' ,'open')]"
- help = "In progress recruitment"/>
- <filter string="Pending"
- icon="terp-gtk-media-pause"
- domain="[('state','=','pending')]"
- help = "Pending recruitment"/>
+ <group>
+ <filter icon="terp-go-year" string="Year"
+ domain="[('date','<=', time.strftime('%%Y-%%m-%%d')),('date','>=',time.strftime('%%Y-01-01'))]"
+ help="Recruitment performed in current year"/>
+ <filter icon="terp-go-month" string="Month"
+ name="month"
+ domain="[('date','<=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','>=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+ help="Recruitment performed in current month"/>
+ <filter icon="terp-go-month"
+ string=" Month-1 "
+ separator="1"
+ domain="[('date','<=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','>=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+ help="Recruitment during last month"/>
+ <separator orientation="vertical"/>
+ <filter string="New"
+ icon="terp-document-new"
+ domain="[('state','=','draft')]"
+ help = "Draft recruitment"/>
+ <filter string="In progress"
+ icon="terp-check"
+ domain="[('state', '=' ,'open')]"
+ help = "In progress recruitment"/>
+ <filter string="Pending"
+ icon="terp-gtk-media-pause"
+ domain="[('state','=','pending')]"
+ help = "Pending recruitment"/>
<filter string="Hired"
- icon="terp-camera_test"
- domain="[('state','=','done')]"
- help = "Hired employees"/>
- <separator orientation="vertical"/>
- <field name="job_id"/>
- <field name="department_id" widget="selection"/>
+ icon="terp-camera_test"
+ domain="[('state','=','done')]"
+ help = "Hired employees"/>
+ <separator orientation="vertical"/>
+ <field name="job_id"/>
+ <field name="department_id" widget="selection"/>
<field name="user_id" string="Responsible">
<filter icon="terp-personal"
string="My Recruitment"
@@ -108,13 +108,13 @@
<filter string="Department" name="department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
<separator orientation="vertical"/>
<filter string="Degree" name="degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/>
- <separator orientation="vertical"/>
- <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
+ <separator orientation="vertical"/>
+ <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'}"/>
<separator orientation="vertical"/>
- <filter string="Day" name = "day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Creation Date"/>
- <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/>
- <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" help="Creation Date"/>
+ <filter string="Day" name = "day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Creation Date"/>
+ <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/>
+ <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" help="Creation Date"/>
</group>
@@ -130,7 +130,7 @@
<field name="context">{'search_default_month':1,'search_default_department':1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="search_view_id" ref="view_hr_recruitment_report_search"/>
</record>
- <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10" groups="base.group_hr_manager,base.group_hr_user"/>
+ <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10" groups="base.group_hr_manager,base.group_hr_user"/>
<menuitem action="action_hr_recruitment_report_all" id="menu_hr_recruitment_report_all" parent="hr.menu_hr_reporting" sequence="1"/>
</data>
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py b/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
index 7cb5366a275c0c7b1c61d9e86d9c4a488b2c610c..6e817eaf49af0a53f405799afd64bb8221fba8e7 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
+++ b/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
@@ -42,8 +42,10 @@ class job2phonecall(osv.osv_memory):
return case.user_id and case.user_id.id or False
def _date_category(self, cr, uid, context=None):
+ case_obj = self.pool.get('hr.applicant')
if context is None:
context = {}
+ case = case_obj.browse(cr, uid, context['active_id'], context=context)
categ_id = self.pool.get('crm.case.categ').search(cr, uid, [('name','=','Outbound')], context=context)
return categ_id and categ_id[0] or case.categ_id and case.categ_id.id or False
diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index 84e7db409abd73e09512ea2c0ca5b4918c882840..20d976342149fefa0789dcf8db1aebb4c5e2cc9d 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -23,7 +23,6 @@ import time
from osv import fields
from osv import osv
-from osv.orm import except_orm
from tools.translate import _
class hr_employee(osv.osv):
@@ -39,7 +38,7 @@ class hr_employee(osv.osv):
try:
result = md.get_object_reference(cr, uid, 'hr_timesheet', 'analytic_journal')
return result[1]
- except ValueError, e:
+ except ValueError:
pass
return False
@@ -48,7 +47,7 @@ class hr_employee(osv.osv):
try:
result = md.get_object_reference(cr, uid, 'hr_timesheet', 'product_consultant')
return result[1]
- except ValueError, e:
+ except ValueError:
pass
return False
@@ -87,7 +86,9 @@ class hr_analytic_timesheet(osv.osv):
if prod_id and unit_amount:
# find company
company_id = self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=context)
- res.update(self.pool.get('account.analytic.line').on_change_unit_amount(cr, uid, id, prod_id, unit_amount, company_id, unit, journal_id, context=context))
+ r = self.pool.get('account.analytic.line').on_change_unit_amount(cr, uid, id, prod_id, unit_amount, company_id, unit, journal_id, context=context)
+ if r:
+ res.update(r)
# update unit of measurement
if prod_id:
uom = self.pool.get('product.product').browse(cr, uid, prod_id, context=context)
diff --git a/addons/hr_timesheet/hr_timesheet_data.xml b/addons/hr_timesheet/hr_timesheet_data.xml
index e7cb3d5e0d4e33283ecfce9e39de1dee3a935c0e..a19b2c67291784fb4ec1a7df9203da0596bb9cb9 100644
--- a/addons/hr_timesheet/hr_timesheet_data.xml
+++ b/addons/hr_timesheet/hr_timesheet_data.xml
@@ -18,5 +18,10 @@
<field eval="False" name="purchase_ok"/>
</record>
+ <record id="hr.employee" model="hr.employee">
+ <field name="product_id" ref="product_consultant"/>
+ <field name="journal_id" ref="analytic_journal"/>
+ </record>
+
</data>
</openerp>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index d7700d16db30c347186c20a0c3530a42ccb81544..98c4413ade1bec0644c753c3dee13425d068cc12 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -69,9 +69,8 @@
<filter name="today" icon="terp-go-today" domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" string="Today"/>
<separator orientation="vertical"/>
<field name="user_id"/>
- <field name="account_id" select="1" widget="selection"/>
- <field name="product_id" select="1"/>
- <field name="date" select="1"/>
+ <field name="account_id"/>
+ <field name="date"/>
</group>
<newline/>
<group expand="0" string="Group By...">
@@ -95,7 +94,7 @@
<field name="view_mode">tree,form</field>
<field name="context">{"search_default_user_id":uid, "search_default_today":1}</field>
<field name="search_view_id" ref="hr_timesheet_line_search"/>
- <field name="help">This functionality gives you a list of work done by user, product and analytic account (or project). A search tool allows you to make fine-grained analysis.</field>
+ <field name="help">Working Hours allows you to log your working hours by project every day.</field>
</record>
<menuitem id="menu_project_working_hours" parent="base.menu_project_management_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index f605fd760beab0a735210727e48946eb1af68a46..cc1ff3b93244984bc9541f7f85bd508cd83b20dd 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -27,8 +27,8 @@ class hr_timesheet_invoice_factor(osv.osv):
_name = "hr_timesheet_invoice.factor"
_description = "Invoice Rate"
_columns = {
- 'name': fields.char('Internal name', size=128, required=True),
- 'customer_name': fields.char('Name', size=128, help="Name of the customer"),
+ 'name': fields.char('Internal name', size=128, required=True, translate=True),
+ 'customer_name': fields.char('Name', size=128, help="Label for the customer"),
'factor': fields.float('Discount (%)', required=True, help="Discount in percentage"),
}
_defaults = {
@@ -45,7 +45,10 @@ class account_analytic_account(osv.osv):
context = {}
res = {}
- cr.execute('select account_id as account_id, l.invoice_id from hr_analytic_timesheet h left join account_analytic_line l on (h.line_id=l.id)')
+ cr.execute('SELECT account_id as account_id, l.invoice_id '
+ 'FROM hr_analytic_timesheet h LEFT JOIN account_analytic_line l '
+ 'ON (h.line_id=l.id) '
+ 'WHERE l.account_id = ANY(%s)', (ids,))
account_to_invoice_map = {}
for rec in cr.dictfetchall():
account_to_invoice_map.setdefault(rec['account_id'], []).append(rec['invoice_id'])
@@ -163,6 +166,7 @@ class account_invoice(osv.osv):
obj_analytic_account = self.pool.get('account.analytic.account')
for il in iml:
if il['account_analytic_id']:
+ # *-* browse (or refactor to avoid read inside the loop)
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]
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml
index a81af0788b6a76edcf1c8a274c4416e13cf8d1b4..462888e0b392bc4ec395ac0327b8c46695b1912a 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml
@@ -6,5 +6,15 @@
<field name="customer_name">100%</field>
<field name="factor">0.0</field>
</record>
+ <record id="timesheet_invoice_factor2" model="hr_timesheet_invoice.factor">
+ <field name="name">90%</field>
+ <field name="customer_name">90%</field>
+ <field name="factor">10.0</field>
+ </record>
+ <record id="timesheet_invoice_factor3" model="hr_timesheet_invoice.factor">
+ <field name="name">50%</field>
+ <field name="customer_name">50%</field>
+ <field name="factor">50.0</field>
+ </record>
</data>
</openerp>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 4a70a80f3816611c0bd6c89b63452078ce46916b..408835fe9930fcfa9117fe99544a32f1a6cab91c 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -118,7 +118,7 @@
<field name="view_mode">tree,form</field>
<field name="domain">[]</field>
<field name="context">{'search_default_to_invoice': 1}</field>
- <field name="help">OpenERP automatically group the entries to be invoiced so you can keep an eye on them on real time in one glance.</field>
+ <field name="help">This lists show you every task work you can invoice to the customer. Select the lines in order to generate the invoices automatically.</field>
</record>
<menuitem
action="action_hr_analytic_timesheet_open_tree"
@@ -126,13 +126,25 @@
parent="account.menu_finance_periodical_processing_billing"
sequence="1"/>
+ <record id="view_hr_timesheet_invoice_factor_search" model="ir.ui.view">
+ <field name="name">hr_timesheet_invoice.factor.search</field>
+ <field name="model">hr_timesheet_invoice.factor</field>
+ <field name="type">search</field>
+ <field name="arch" type="xml">
+ <search string="Type of invoicing">
+ <group>
+ <field name="name"/>
+ </group>
+ </search>
+ </field>
+ </record>
<record id="view_hr_timesheet_invoice_factor_form" model="ir.ui.view">
<field name="name">hr_timesheet_invoice.factor.form</field>
<field name="model">hr_timesheet_invoice.factor</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Type of invoicing">
- <field colspan="1" name="name" select="1"/>
+ <field colspan="1" name="name"/>
<field colspan="1" name="customer_name"/>
<field colspan="2" name="factor"/>
</form>
@@ -156,6 +168,7 @@
<field name="res_model">hr_timesheet_invoice.factor</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_hr_timesheet_invoice_factor_tree"/>
+ <field name="search_view_id" ref="view_hr_timesheet_invoice_factor_search"/>
</record>
<menuitem
action="action_hr_timesheet_invoice_factor_form"
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index 6b436f4ef99c9df6d566e2ebadffaab54c0ffc7e..1d03581ca22f9eb048bbbcd09530339b6e1fa0a8 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -468,7 +468,7 @@
<filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/>
<filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
- <filter string="Analytic Account" icon="terp-folder-green" domain="[]" context="{'group_by':'analytic_account_id'}"/>
+ <filter string="Analytic Account" icon="terp-folder-violet" domain="[]" context="{'group_by':'analytic_account_id'}"/>
<filter string="General Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'general_account_id'}"/>
</group>
</search>
diff --git a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
index cda4574845a3a1cb2aa8eee7083085694274c5fd..9a22de4d828a3073cad80e08d3c70490fd534645 100644
--- a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
+++ b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
@@ -28,8 +28,6 @@
I create invoice on analytic Line using "Invoice analytic Line" wizard.
-
!record {model: hr.timesheet.invoice.create, id: hr_timesheet_invoice_create_0}:
- accounts:
- - account.analytic_sednacom
date: 1
name: 1
price: 1
@@ -46,10 +44,12 @@
I check that Invoice is created for this timesheet.
-
!python {model: account.analytic.line}: |
+ account_id = self.pool.get('account.analytic.line')
+ accounts = account_id.browse(cr, uid, [ref("account_analytic_line_developyamlforhrmodule0")])[0]
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']
+ account_ids = accounts['account_id']
for account in analytic_account_obj.browse(cr, uid, account_ids, context):
partner = account.partner_id.id
@@ -81,4 +81,4 @@
-
I can also make some theoretical revenue reports.
-
- I can also see timesheet profit using Timesheet profit report.
\ No newline at end of file
+ I can also see timesheet profit using Timesheet profit report.
diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py
index d00ee91a3049f1a0a850568303f16b4552748157..383521b399d379e79e853764a2b9aac17a3846cc 100644
--- a/addons/hr_timesheet_sheet/__openerp__.py
+++ b/addons/hr_timesheet_sheet/__openerp__.py
@@ -55,6 +55,7 @@ The validation can be configured in the company:
'process/hr_timesheet_sheet_process.xml',
'board_hr_timesheet_view.xml',
'report/hr_timesheet_report_view.xml',
+ 'report/timesheet_report_view.xml',
'wizard/hr_timesheet_current_view.xml',
'hr_timesheet_sheet_data.xml'
],
diff --git a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
index a50042c3dfbf806eb3b02402c3e1a004b31d941b..13193e66d992808a33e75f0f08f96129047cfc95 100644
--- a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
+++ b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
@@ -3,7 +3,7 @@
<data>
<menuitem
id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting"
- sequence="0" groups="base.group_hr_manager"/>
+ sequence="0"/>
<menuitem
action="hr.open_board_hr"
icon="terp-graph"
diff --git a/addons/hr_timesheet_sheet/report/__init__.py b/addons/hr_timesheet_sheet/report/__init__.py
index 8dac73f07ec77d3ad6dc83c4528f0d2ea30edfe0..b06b0608356a9761cd5ec1e5b86c96e883a58264 100644
--- a/addons/hr_timesheet_sheet/report/__init__.py
+++ b/addons/hr_timesheet_sheet/report/__init__.py
@@ -19,5 +19,7 @@
#
##############################################################################
+import timesheet_report
import hr_timesheet_report
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
index 36ea5b6418a2d4dc4fd3058fe88a5ca8c0e5f52b..054a4def9f243f672d72b76f2a41c36b18e52544 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
@@ -72,7 +72,7 @@
<filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
<separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
- <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
+ <filter string="Analytic Account" icon="terp-folder-violet" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
<filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<separator orientation="vertical"/>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report.py b/addons/hr_timesheet_sheet/report/timesheet_report.py
new file mode 100644
index 0000000000000000000000000000000000000000..a8c0440a053d623aa62fb631b4a8494104631926
--- /dev/null
+++ b/addons/hr_timesheet_sheet/report/timesheet_report.py
@@ -0,0 +1,122 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import tools
+from osv import fields,osv
+
+class timesheet_report(osv.osv):
+ _name = "timesheet.report"
+ _description = "Timesheet"
+ _auto = False
+ _columns = {
+ 'year': fields.char('Year',size=64,required=False, readonly=True),
+ 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
+ ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
+ ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
+ 'day': fields.char('Day', size=128, readonly=True),
+ 'name': fields.char('Description', size=64,readonly=True),
+ 'product_id' : fields.many2one('product.product', 'Product'),
+ 'general_account_id' : fields.many2one('account.account', 'General Account', readonly=True),
+ 'user_id': fields.many2one('res.users', 'User',readonly=True),
+ 'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Type of Invoicing',readonly=True),
+ 'account_id': fields.many2one('account.analytic.account', 'Analytic Account',readonly=True),
+ 'nbr': fields.integer('#Nbr',readonly=True),
+ 'total_diff': fields.float('#Total Diff',readonly=True),
+ 'total_timesheet': fields.float('#Total Timesheet',readonly=True),
+ 'total_attendance': fields.float('#Total Attendance',readonly=True),
+ 'company_id': fields.many2one('res.company', 'Company',readonly=True),
+ 'department_id':fields.many2one('hr.department','Department',readonly=True),
+ 'date_from': fields.date('Date from',readonly=True,),
+ 'date_to': fields.date('Date to',readonly=True),
+ 'date_current': fields.date('Current date', required=True),
+ 'state' : fields.selection([
+ ('new', 'New'),
+ ('draft','Draft'),
+ ('confirm','Confirmed'),
+ ('done','Done')], 'State', readonly=True),
+ 'quantity': fields.float('#Quantity',readonly=True),
+ 'cost': fields.float('#Cost',readonly=True),
+ }
+
+ def init(self, cr):
+ tools.drop_view_if_exists(cr, 'timesheet_report')
+ cr.execute("""
+ create or replace view timesheet_report as (
+ select
+ min(aal.id) as id,
+ htss.date_current,
+ htss.name,
+ htss.date_from,
+ htss.date_to,
+ to_char(htss.date_current,'YYYY') as year,
+ to_char(htss.date_current,'MM') as month,
+ to_char(htss.date_current, 'YYYY-MM-DD') as day,
+ count(*) as nbr,
+ aal.unit_amount as quantity,
+ aal.amount as cost,
+ aal.account_id,
+ aal.product_id,
+ (SELECT sum(day.total_difference)
+ FROM hr_timesheet_sheet_sheet AS sheet
+ LEFT JOIN hr_timesheet_sheet_sheet_day AS day
+ ON (sheet.id = day.sheet_id
+ AND day.name = sheet.date_current) where sheet.id=htss.id) as total_diff,
+ (SELECT sum(day.total_timesheet)
+ FROM hr_timesheet_sheet_sheet AS sheet
+ LEFT JOIN hr_timesheet_sheet_sheet_day AS day
+ ON (sheet.id = day.sheet_id
+ AND day.name = sheet.date_current) where sheet.id=htss.id) as total_timesheet,
+ (SELECT sum(day.total_attendance)
+ FROM hr_timesheet_sheet_sheet AS sheet
+ LEFT JOIN hr_timesheet_sheet_sheet_day AS day
+ ON (sheet.id = day.sheet_id
+ AND day.name = sheet.date_current) where sheet.id=htss.id) as total_attendance,
+ aal.to_invoice,
+ aal.general_account_id,
+ htss.user_id,
+ htss.company_id,
+ htss.department_id,
+ htss.state
+ from account_analytic_line as aal
+ left join hr_analytic_timesheet as hat ON (hat.line_id=aal.id)
+ left join hr_timesheet_sheet_sheet as htss ON (hat.line_id=htss.id)
+ group by
+ to_char(htss.date_current,'YYYY'),
+ to_char(htss.date_current,'MM'),
+ to_char(htss.date_current, 'YYYY-MM-DD'),
+ aal.account_id,
+ htss.date_from,
+ htss.date_to,
+ aal.unit_amount,
+ aal.amount,
+ htss.date_current,
+ aal.to_invoice,
+ aal.product_id,
+ aal.general_account_id,
+ htss.name,
+ htss.company_id,
+ htss.state,
+ htss.id,
+ htss.department_id,
+ htss.user_id
+ )
+ """)
+timesheet_report()
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
new file mode 100644
index 0000000000000000000000000000000000000000..08abc6db63b4821192930e9fb84b3f7dd4bfbd45
--- /dev/null
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+ <data>
+ <record id="view_timesheet_report_graph" model="ir.ui.view">
+ <field name="name">timesheet.report.graph</field>
+ <field name="model">timesheet.report</field>
+ <field name="type">graph</field>
+ <field name="arch" type="xml">
+ <graph string="Timesheet" type="bar">
+ <field name="user_id" />
+ <field name="quantity" operator = "+"/>
+ <field name="state" group = "True"/>
+ </graph>
+ </field>
+ </record>
+ <record id="view_timesheet_report_tree" model="ir.ui.view">
+ <field name="name">timesheet.report.tree</field>
+ <field name="model">timesheet.report</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <tree colors="blue:state in ('draft');black:state in ('confirm','new');gray:state in('cancel')" string="Timesheet">
+ <field name="date_current" invisible="1"/>
+ <field name="name" invisible="1"/>
+ <field name="user_id" invisible="1"/>
+ <field name="date_from" invisible="1"/>
+ <field name="date_to" invisible="1"/>
+ <field name="state" invisible="1"/>
+ <field name="department_id" invisible="1"/>
+ <field name="company_id" invisible="1"/>
+ <field name="to_invoice" invisible="1"/>
+ <field name="product_id" invisible="1"/>
+ <field name="account_id" invisible="1"/>
+ <field name="general_account_id" invisible="1"/>
+ <field name="year" invisible="1"/>
+ <field name="day" invisible="1"/>
+ <field name="month" invisible="1"/>
+ <field name="quantity" sum="#Quantity"/>
+ <field name="cost" sum="#Cost"/>
+ <field name="total_diff" sum="#Total Diff"/>
+ <field name="total_timesheet" sum="#Total Timesheet"/>
+ <field name="total_attendance" sum="#Total Attendance"/>
+ </tree>
+ </field>
+ </record>
+ <record id="view_timesheet_report_search" model="ir.ui.view">
+ <field name="name">timesheet.report.search</field>
+ <field name="model">timesheet.report</field>
+ <field name="type">search</field>
+ <field name="arch" type="xml">
+ <search string="Timesheet">
+ <group col="10" colspan="12">
+ <filter icon="terp-go-year" string=" Year "
+ domain="[('date_current','<=', time.strftime('%%Y-%%m-%%d')),('date_current','>',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
+ help="Timesheet in current year"/>
+ <filter icon="terp-go-month" string=" Month "
+ name="month"
+ domain="[('date_current','<=', time.strftime('%%Y-%%m-%%d')), ('date_current','>',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+ help="Timesheet in current month"/>
+ <filter icon="terp-go-month"
+ string=" Month-1 "
+ domain="[('date_current','<=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date_current','>',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+ help="Timesheet of last month"/>
+ <separator orientation="vertical"/>
+ <filter icon="terp-document-new"
+ string="Draft"
+ domain="[('state','=','draft')]"/>
+ <filter icon="terp-camera_test"
+ string="Confirmed"
+ domain="[('state','=','confirm')]"/>
+ <filter icon="terp-dialog-close"
+ string="Done"
+ domain="[('state','=','done')]"/>
+ <separator orientation="vertical"/>
+ <field name="account_id"/>
+ <field name="user_id" />
+ </group>
+ <newline/>
+ <group expand="0" string="Extended Filters..." groups="base.group_extended">
+ <field name="general_account_id"/>
+ <field name="to_invoice" widget="selection"/>
+ <separator orientation="vertical"/>
+ <field name="product_id"/>
+ <separator orientation="vertical"/>
+ <field name="department_id" widget="selection"/>
+ <separator orientation="vertical"/>
+ <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+ <newline/>
+ <field name="date_to"/>
+ <field name="date_from"/>
+ </group>
+ <newline/>
+ <group expand="1" string="Group By...">
+ <filter string="User" name="User_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
+ <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
+ <separator orientation="vertical"/>
+ <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+ <separator orientation="vertical"/>
+ <filter string="Type of Invoicing" icon="terp-stock_symbol-selection" context="{'group_by':'to_invoice'}"/>
+ <separator orientation="vertical"/>
+ <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}"/>
+ <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
+ <separator orientation="vertical"/>
+ <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+ <separator orientation="vertical"/>
+ <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+ <separator orientation="vertical"/>
+ <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by day of date"/>
+ <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Group by month of date"/>
+ <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Group by year of date"/>
+ </group>
+ </search>
+ </field>
+ </record>
+
+ <record id="action_timesheet_report_stat_all" model="ir.actions.act_window">
+ <field name="name">Timesheet Sheet Analysis</field>
+ <field name="res_model">timesheet.report</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,graph</field>
+ <field name="context">{'search_default_month':1,'search_default_User_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
+ <field name="search_view_id" ref="view_timesheet_report_search"/>
+ </record>
+ <menuitem action="action_timesheet_report_stat_all" id="menu_timesheet_report_all"
+ parent="hr_timesheet.menu_hr_reporting_timesheet" sequence="1" groups="base.group_hr_manager"/>
+ </data>
+</openerp>
diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv
index 9d0159bbc1aa7dae2cbd0e554935f04d089d05c1..f55ee0fb5e09076b3b03b701f0cfff25273c7ca8 100644
--- a/addons/hr_timesheet_sheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet_sheet/security/ir.model.access.csv
@@ -6,3 +6,4 @@
"access_hr_timesheet_report","hr.timesheet.report","model_hr_timesheet_report","base.group_hr_manager",1,1,1,1
"access_hr_analytic_timesheet_system_user","hr.analytic.timesheet.system.user","model_hr_analytic_timesheet","base.group_user",1,0,0,0
"access_hr_timesheet_sheet_sheet_day","hr.timesheet.sheet.sheet.day.user","model_hr_timesheet_sheet_sheet_day","base.group_user",1,0,0,0
+"access_timesheet_report_user","timesheet.report.user","model_timesheet_report","base.group_hr_manager",1,1,1,1
diff --git a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
index f9944d0949ff10bdbdd203ae083fc0df0c60c1d7..fe63a4ce7b32078b5eb75be7d051d02bd99220b2 100644
--- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
+++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
@@ -23,6 +23,7 @@
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_hr_timesheet_current_open"/>
<field name="target">new</field>
+ <field name="help">My Timesheet opens your timesheet so that you can book your activities into the system. From the same form, you can register your attendances (Sign In/Out) and describe the working hours made on the different projects. At the end of the period defined in the company, the timesheet is confirmed by the user and can be validated by his manager. If required, as defined on the project, you can generate the invoices based on the timesheet.</field>
</record>
<menuitem action="action_hr_timesheet_current_open" icon="STOCK_NEW" id="menu_act_hr_timesheet_sheet_form_my_current" name="My Timesheet" parent="hr_attendance.menu_hr_time_tracking" sequence="1"/>
diff --git a/addons/lunch/lunch_demo.xml b/addons/lunch/lunch_demo.xml
index 91be819d430f291068761ef8b65897af2c177559..30172b9e0a26831a71f842d05b09492863c97a0f 100644
--- a/addons/lunch/lunch_demo.xml
+++ b/addons/lunch/lunch_demo.xml
@@ -14,7 +14,7 @@
<record model="lunch.cashbox" id="cashbox_cashbox">
<field name="name">Cashbox</field>
- <field name="manager" ref="base.user_admin"/>
+ <field name="manager" ref="base.user_root"/>
</record>
</data>
</openerp>
diff --git a/addons/lunch/report/order.py b/addons/lunch/report/order.py
index 838ab108c234b9775c39a6309e1c36c9a5975017..29c9d381745caf590c000734cb138bafb176a692 100644
--- a/addons/lunch/report/order.py
+++ b/addons/lunch/report/order.py
@@ -26,18 +26,38 @@ from osv import osv
class order(report_sxw.rml_parse):
- def sum_price(self, orders):
- res = 0.0
- for o in orders:
- res += o.price
- return res
+ def get_lines(self, user,objects):
+ lines=[]
+ for obj in objects:
+ if user.id==obj.user_id.id:
+ lines.append(obj)
+ return lines
+
+ def get_total(self, user,objects):
+ lines=[]
+ for obj in objects:
+ if user.id==obj.user_id.id:
+ lines.append(obj)
+ total=0.0
+ for line in lines:
+ total+=line.price
+ return total
+
+ def get_users(self, objects):
+ users=[]
+ for obj in objects:
+ if obj.user_id not in users:
+ users.append(obj.user_id)
+ return users
def __init__(self, cr, uid, name, context):
super(order, self).__init__(cr, uid, name, context)
self.localcontext.update({
'time': time,
- 'sum_price': self.sum_price,
+ 'get_lines': self.get_lines,
+ 'get_users': self.get_users,
+ 'get_total': self.get_total,
})
report_sxw.report_sxw('report.lunch.order', 'lunch.order',
diff --git a/addons/lunch/report/order.rml b/addons/lunch/report/order.rml
index 62003478c4c8573a2dc9c2b218713ede23229bd6..d47816abd9ca1039a2984926e3c16ab204581559 100644
--- a/addons/lunch/report/order.rml
+++ b/addons/lunch/report/order.rml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Lunch Order" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Lunch Order.pdf">
+ <template pageSize="(595.0,842.0)" title="Lunch Order" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="34.0" y1="42.0" width="527" height="758"/>
</pageTemplate>
@@ -10,89 +10,37 @@
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
- <blockTableStyle id="Table5">
+ <blockTableStyle id="Table1">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
- <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,0" stop="0,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="1,0" stop="1,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="2,0" stop="2,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#ffffff" start="2,0" stop="2,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="2,-1" stop="2,-1"/>
</blockTableStyle>
- <blockTableStyle id="Table4">
+ <blockTableStyle id="Table2">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
- <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,0" stop="0,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#ffffff" start="0,0" stop="0,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
</blockTableStyle>
<blockTableStyle id="Table3">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
- </blockTableStyle>
- <blockTableStyle id="Table1">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="0,0" stop="0,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="1,0" stop="1,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,0" stop="1,0"/>
- <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
- <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
</blockTableStyle>
- <blockTableStyle id="Table2">
+ <blockTableStyle id="Table4">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="1,0" stop="1,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
- <paraStyle name="P1" fontName="Helvetica-BoldOblique" fontSize="9.0" leading="11" alignment="LEFT"/>
- <paraStyle name="P2" fontName="Helvetica-BoldOblique" fontSize="9.0" leading="11"/>
- <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER"/>
- <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
- <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
- <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
- <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
- <paraStyle name="P8" fontName="Helvetica" fontSize="9.0" leading="11"/>
- <paraStyle name="P9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
- <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT"/>
- <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER"/>
- <paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
- <paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
- <paraStyle name="P14" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="P15" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Standard" fontName="Helvetica"/>
<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -108,112 +56,96 @@
<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_tbl_detail_header" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_tbl_detail_header_right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_tbl_detail_header_center" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_9_right" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_9_right_bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_header_center" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="terp_default_9_center" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<images/>
</stylesheet>
<story>
- <para style="P15">[[repeatIn(objects,'o')]]</para>
+ <blockTable colWidths="293.0,235.0" style="Table1">
+ <tr>
+ <td>
+ <para style="terp_default_8">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_default_8">[[ (user.address_id and user.address_id.partner_id and user.address_id.partner_id.title and user.address_id.partner_id.title.name) or '' ]] [[ (user.address_id and user.address_id.partner_id and user.address_id.partner_id.name) or '' ]]</para>
+ <para style="terp_default_8">[[ (user.address_id and user.address_id.street) or '' ]]</para>
+ <para style="terp_default_8">[[ (user.address_id and user.address_id.street2) or removeParentNode('para') ]]</para>
+ <para style="terp_default_8">[[ (user.address_id and user.address_id.zip) or '' ]] [[ (user.address_id and user.address_id.city) or '' ]]</para>
+ <para style="terp_default_8">[[ (user.address_id and user.address_id.state_id and user.address_id.state_id.name) or removeParentNode('para')]]</para>
+ <para style="terp_default_8">[[ (user.address_id and user.address_id.country_id and user.address_id.country_id.name) or '' ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <para style="terp_header">Lunch Order</para>
+
+ <section>
+ <para style="terp_default_8">[[repeatIn(get_users(objects),'o')]]</para>
+ <blockTable colWidths="80.0,70.0,141.0,172.0,65.0" style="Table2">
+ <tr>
+ <td>
+ <para style="terp_tbl_detail_header">Name</para>
+ </td>
+ <td>
+ <para style="terp_tbl_detail_header_center">Date</para>
+ </td>
+ <td>
+ <para style="terp_tbl_detail_header">Order</para>
+ </td>
+ <td>
+ <para style="terp_tbl_detail_header">Description</para>
+ </td>
+ <td>
+ <para style="terp_tbl_detail_header_right">Unit Price</para>
+ </td>
+ </tr>
+ </blockTable>
<section>
- <para style="P15">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="262.0,6.0,260.0" style="Table5">
+ <para style="terp_default_8">[[ repeatIn(get_lines(o,objects),'lines') ]]</para>
+ <blockTable colWidths="80.0,70.0,141.0,172.0,64.0" style="Table3">
<tr>
<td>
- <para style="P15">
- <font color="white"> </font>
- </para>
+ <para style="terp_default_9">[[ (lines.user_id and lines.user_id.name) or '']]</para>
</td>
<td>
- <para style="P9">
- <font color="white"> </font>
- </para>
+ <para style="terp_default_9_center">[[ formatLang(lines.date,date='True') ]]</para>
</td>
<td>
- <para style="P14">[[ o.user_id.address_id.partner_id.title.name or '' ]] [[ o.user_id.address_id.partner_id.name ]]</para>
- <para style="P14">[[ o.user_id.address_id.street ]]</para>
- <para style="P14">[[ o.user_id.address_id.street2 or removeParentNode('para') ]]</para>
- <para style="P14">[[ o.user_id.address_id.zip or '' ]] [[ o.user_id.address_id.city or '' ]]</para>
- <para style="P14">[[ (o.user_id.address_id.state_id and o.user_id.address_id.state_id.name) or removeParentNode('para')]] [[ (o.user_id.address_id.country_id and o.user_id.address_id.country_id.name) or '' ]]</para>
- <para style="P14">
- <font color="white"> </font>
- </para>
+ <para style="terp_default_9">[[ (lines.product and lines.product.name) or '' ]]</para>
</td>
- </tr>
- </blockTable>
- <para style="P1">
- <font color="white"> </font>
- </para>
- <para style="P1">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="527.0" style="Table4">
- <tr>
<td>
- <para style="P11">Lunch Order</para>
+ <para style="terp_default_9">[[ lines.descript]]</para>
</td>
- </tr>
- </blockTable>
- <para style="P1">
- <font color="white"> </font>
- </para>
- <para style="P1">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="132.0,153.0,141.0,101.0" style="Table3">
- <tr>
<td>
- <para style="P10">Name</para>
- </td>
- <td>
- <para style="P3">Order</para>
- </td>
- <td>
- <para style="P3">Description</para>
- </td>
- <td>
- <para style="P4">Unit Price</para>
+ <para style="terp_default_9_right">[[ lines.price ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]</para>
</td>
</tr>
</blockTable>
</section>
- <blockTable colWidths="132.0,153.0,142.0,101.0" style="Table1">
+ <blockTable colWidths="409.0,55.0,64.0" style="Table4">
<tr>
<td>
- <para style="P5">[[ o.user_id.name ]]</para>
- </td>
- <td>
- <para style="P7">[[o.product.name ]]</para>
- </td>
- <td>
- <para style="P12">[[ o.descript ]]</para>
- </td>
- <td>
- <para style="P6">[[formatLang(o.price) ]] [[company.currency_id.symbol]]</para>
- </td>
- </tr>
- </blockTable>
- <blockTable colWidths="132.0,153.0,142.0,101.0" style="Table2">
- <tr>
- <td>
- <para style="P8">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="P8">
+ <para style="terp_default_8">
<font color="white"> </font>
</para>
</td>
<td>
- <para style="P3">Total:</para>
+ <para style="terp_tbl_detail_header">Total:</para>
</td>
<td>
- <para style="P13">[[ formatLang(sum_price(objects)) ]] <font face="Helvetica">[[company.currency_id.symbol]]</font></para>
+ <para style="terp_default_9_right_bold">[[ formatLang(get_total(o,objects)) ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]</para>
</td>
</tr>
</blockTable>
- <para style="P2">
+ <para style="terp_default_8">
<font color="white"> </font>
</para>
+ </section>
</story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index 9edd7689484418d6fd32e6c856869cfc6e997c4c..69ee91d52dc417e6360fd7d74b5232af2ef97ba5 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -2,7 +2,7 @@
<openerp>
<data>
- <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17" groups="base.group_system,base.res_groups_email_template_admin"/>
+ <menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17" groups="marketing.group_marketing_user"/>
<record id="view_marketing_installer" model="ir.ui.view">
<field name="name">marketing.installer.view</field>
diff --git a/addons/marketing/marketing_wizard.py b/addons/marketing/marketing_wizard.py
index 4b95bbb86da255103194be65cfa6fd3621f197c3..a97d0ca16bca78147f3df6d946a9cf5a9c88193a 100644
--- a/addons/marketing/marketing_wizard.py
+++ b/addons/marketing/marketing_wizard.py
@@ -32,6 +32,10 @@ class marketing_installer(osv.osv_memory):
'crm_profiling':fields.boolean('Profiling Tools',
help="Helps you to perform segmentation of partners and design segmentation questionnaires")
}
+ _defaults = {
+ 'marketing_campaign': lambda *a: 1,
+ }
+
marketing_installer()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing/security/marketing_security.xml b/addons/marketing/security/marketing_security.xml
index 2eda88c4481d8fee2006794b2de5d8cf4ee7e028..740b9b3a2c5f07247fca67f0cc0058200617d2b6 100644
--- a/addons/marketing/security/marketing_security.xml
+++ b/addons/marketing/security/marketing_security.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
- <record id="base.res_groups_email_template_admin" model="res.groups">
+ <record id="marketing.group_marketing_user" model="res.groups">
<field name="name">Marketing / User</field>
</record>
</data>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index b23826969a8ad8a3e6022aebf0773284f4d88f3d..26690757234b009dc1618f6d2cf5dc4e94d929d6 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -115,9 +115,9 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,diagram</field>
<field name="view_id" ref="view_marketing_campaign_tree"/>
- <field name="context">{'group_by': []}</field>
- <field name="search_view_id" ref="view_marketing_campaign_search"/>
-
+ <field name="context">{'group_by': []}</field>
+ <field name="search_view_id" ref="view_marketing_campaign_search"/>
+ <field name="help">Campaigns are used to tag the source of the new business opportunities or leads. They are mainly used for reporting on the performance of each marketing campaign.</field>
</record>
<menuitem name="Campaigns" id="menu_marketing_campaign" parent="base.marketing_menu"/>
diff --git a/addons/marketing_campaign/security/ir.model.access.csv b/addons/marketing_campaign/security/ir.model.access.csv
index ae5cad3d70635e7981dd868aee0fa5ca654b7c05..082cafd705404493598b40a0784bc64e0208968a 100644
--- a/addons/marketing_campaign/security/ir.model.access.csv
+++ b/addons/marketing_campaign/security/ir.model.access.csv
@@ -1,13 +1,13 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_marketing_campaign_admin","marketing.campaign","model_marketing_campaign","base.res_groups_email_template_admin",1,1,1,1
-"access_marketing_campaign_segment_campaignadmin","marketing.campaign.segment","model_marketing_campaign_segment","base.res_groups_email_template_admin",1,1,1,1
-"access_marketing_campaign_activity_campaignadmin","marketing.campaign.activity","model_marketing_campaign_activity","base.res_groups_email_template_admin",1,1,1,1
-"access_marketing_campaign_workitem_campaignadmin","marketing.campaign.workitem","model_marketing_campaign_workitem","base.res_groups_email_template_admin",1,1,1,1
-"access_marketing_campaign_transition_campaignadmin","marketing.campaign.transition","model_marketing_campaign_transition","base.res_groups_email_template_admin",1,1,1,1
-"access_marketing_campaign_analysis_campaignadmin","campaign.analysis","model_campaign_analysis","base.res_groups_email_template_admin",1,1,1,1
+"access_marketing_campaign_admin","marketing.campaign","model_marketing_campaign","marketing.group_marketing_user",1,1,1,1
+"access_marketing_campaign_segment_campaignadmin","marketing.campaign.segment","model_marketing_campaign_segment","marketing.group_marketing_user",1,1,1,1
+"access_marketing_campaign_activity_campaignadmin","marketing.campaign.activity","model_marketing_campaign_activity","marketing.group_marketing_user",1,1,1,1
+"access_marketing_campaign_workitem_campaignadmin","marketing.campaign.workitem","model_marketing_campaign_workitem","marketing.group_marketing_user",1,1,1,1
+"access_marketing_campaign_transition_campaignadmin","marketing.campaign.transition","model_marketing_campaign_transition","marketing.group_marketing_user",1,1,1,1
+"access_marketing_campaign_analysis_campaignadmin","campaign.analysis","model_campaign_analysis","marketing.group_marketing_user",1,1,1,1
"access_marketing_campaign_workitem_all","marketing.campaign.workitem","model_marketing_campaign_workitem","base.group_user",1,0,0,0
-"access_email_template_user","email.template","model_email_template","base.res_groups_email_template_admin",1,1,1,1
-"access_email_template_account_user","email_template.account.user","email_template.model_email_template_account","base.res_groups_email_template_admin",1,1,1,1
+"access_email_template_user","email.template","model_email_template","marketing.group_marketing_user",1,1,1,1
+"access_email_template_account_user","email_template.account.user","email_template.model_email_template_account","marketing.group_marketing_user",1,1,1,1
"access_marketing_campaign_system","marketing.campaign system","model_marketing_campaign","base.group_system",1,0,0,0
"access_marketing_campaign_segment_system","marketing.campaign.segment system","model_marketing_campaign_segment","base.group_system",1,0,0,0
"access_marketing_campaign_workitem_system","marketing.campaign.workitem system","model_marketing_campaign_workitem","base.group_system",1,0,0,0
diff --git a/addons/marketing_campaign/security/marketing_campaign_security.xml b/addons/marketing_campaign/security/marketing_campaign_security.xml
index bb933fdcdc3477bda126e283d16548548a9febea..14710cf8f379cab147e014adafe9727fe7c859db 100644
--- a/addons/marketing_campaign/security/marketing_campaign_security.xml
+++ b/addons/marketing_campaign/security/marketing_campaign_security.xml
@@ -2,9 +2,5 @@
<openerp>
<data>
- <record id="base.res_groups_email_template_admin" model="res.groups">
- <field name="name">Marketing / User</field>
- </record>
-
</data>
</openerp>
diff --git a/addons/marketing_campaign_crm_demo/i18n/nl.po b/addons/marketing_campaign_crm_demo/i18n/nl.po
index 27fab4873672a2caa7d2b43caca8ac0e7791dd2b..22534597f072722a92e68ae570274fc3ec2cc816 100644
--- a/addons/marketing_campaign_crm_demo/i18n/nl.po
+++ b/addons/marketing_campaign_crm_demo/i18n/nl.po
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-08-20 08:14+0000\n"
-"PO-Revision-Date: 2010-09-13 17:02+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-10-17 14:29+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
"Language-Team: Dutch <nl@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-09-29 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-10-18 04:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: marketing_campaign_crm_demo
#: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
msgid "Marketing campaign demo report"
-msgstr ""
+msgstr "Marketing campagne demo overzicht"
#. module: marketing_campaign_crm_demo
#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_1
@@ -28,16 +28,18 @@ msgid ""
"Hello,Thanks for generous interest you have shown in the "
"openERP.Regards,OpenERP Team,"
msgstr ""
+"Hallo, bedankt voor de royale interesse die u in OpenERP heeft getoond. "
+"Groeten, OpenERP Team,"
#. module: marketing_campaign_crm_demo
#: constraint:document.directory:0
msgid "Error! You can not create recursive Directories."
-msgstr ""
+msgstr "Fout! U kunt geen recursieve mappen maken"
#. module: marketing_campaign_crm_demo
#: model:ir.module.module,description:marketing_campaign_crm_demo.module_meta_information
msgid "Demo data for the module marketing_campaign."
-msgstr ""
+msgstr "Demo gegevens voor de module marketing_campaign."
#. module: marketing_campaign_crm_demo
#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_4
@@ -47,31 +49,36 @@ msgid ""
" I really appreciate your co-operation on this.\n"
" Regards,OpenERP Team,"
msgstr ""
+"Hallo,bedankt voor de getoonde interesse en het aanschaffen van het OpenERP "
+"boek.\n"
+" Als er meer informatie nodig is dan graag terugkeren.\n"
+" Ik waardeer uw medewerking hierbij.\n"
+" Groeten,OpenERP Team,"
#. module: marketing_campaign_crm_demo
#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_2
msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
-msgstr ""
+msgstr "Stel inschrijven voor OpenERP Discovery Day in Mei 2010 voor"
#. module: marketing_campaign_crm_demo
#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_6
msgid "Propose paid training to Silver partners"
-msgstr ""
+msgstr "Stel betaalde training aan Zilver partners voor"
#. module: marketing_campaign_crm_demo
#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_1
msgid "Thanks for showing interest in OpenERP"
-msgstr ""
+msgstr "Bedankt voor getoonde interesse in OpenERP"
#. module: marketing_campaign_crm_demo
#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_4
msgid "Thanks for buying the OpenERP book"
-msgstr ""
+msgstr "Bedankt voor het aanschaffen van het OpenERP boek"
#. module: marketing_campaign_crm_demo
#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_5
msgid "Propose a free technical training to Gold partners"
-msgstr ""
+msgstr "Stel een gratis technische training aan Gold partners voor"
#. module: marketing_campaign_crm_demo
#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_7
@@ -82,11 +89,16 @@ msgid ""
" I really appreciate your co-operation on this.\n"
" Regards,OpenERP Team,"
msgstr ""
+"Hallo, we hebben een mooie aanbieding die bij u kan passen.\n"
+" Voor onze zilver partners bieden we goud partnerschap aan.\n"
+" Als er meer informatie nodig is, dan graag terugkeren.\n"
+" Ik waerdeer uw medewerking hierbij.\n"
+" Groeten,OpenERP Team,"
#. module: marketing_campaign_crm_demo
#: rml:crm.lead.demo:0
msgid "Partner :"
-msgstr ""
+msgstr "Relatie :"
#. module: marketing_campaign_crm_demo
#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_8
@@ -96,21 +108,25 @@ msgid ""
"appreciate your co-operation on this.\n"
" Regards,OpenERP Team,"
msgstr ""
+"Hallo, bedankt voor de getoonde interessen en voor de inschrijving voor de "
+"technische training. Als er meer informatie nodig is dan graag terugkeren.Ik "
+"waardeer uw medewerking hierin.\n"
+" Groeten,OpenERP Team,"
#. module: marketing_campaign_crm_demo
#: rml:crm.lead.demo:0
msgid "Company :"
-msgstr ""
+msgstr "Bedrijf :"
#. module: marketing_campaign_crm_demo
#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_8
msgid "Thanks for subscribing to technical training"
-msgstr ""
+msgstr "Bedankt voor het inschrijven voor de techniche training"
#. module: marketing_campaign_crm_demo
#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_3
msgid "Thanks for subscribing to the OpenERP Discovery Day"
-msgstr ""
+msgstr "Bedankt voor het inschrijven op de OpenERP Discovery Day"
#. module: marketing_campaign_crm_demo
#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_5
@@ -122,6 +138,12 @@ msgid ""
" I really appreciate your co-operation on this.\n"
" Regards,OpenERP Team,"
msgstr ""
+"Hallo, We hebben een erg mooie aanbieding die bij u kan passen.\n"
+" Voor onze goud partners verzorgen we gratis technische training "
+"in juni 2010.\n"
+" Als er meer informatie nodig is, dan graag terugkeren.\n"
+" Ik waardeer uw medewerking hierbij.\n"
+" Groeten,OpenERP Team,"
#. module: marketing_campaign_crm_demo
#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_3
@@ -132,6 +154,11 @@ msgid ""
" I really appreciate your co-operation on this.\n"
" Regards,OpenERP Team,"
msgstr ""
+"Hallo,bedankt voor de getoonde interesse en het inschrijven op de OpenERP "
+"Discovery Day.\n"
+" Als er meer informatie nodig is, dan graag terugkeren.\n"
+" Ik waardeer uw medewerking hierin.\n"
+" Groeten,OpenERP Team,"
#. module: marketing_campaign_crm_demo
#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_2
@@ -143,6 +170,12 @@ msgid ""
" We really appreciate your co-operation on this.\n"
" Regards,OpenERP Team,"
msgstr ""
+"Hallo, We hebben een erg mooie aanbieding die bij u kan passen.\n"
+" We stellen voor om in te schrijven op de OpenERP Discovery Day "
+"in Mei 2010.\n"
+" Als er meer informatie nodig is, dan graag terugkeren.\n"
+" Ik waardeer uw medewerking hierbij.\n"
+" Groeten,OpenERP Team,"
#. module: marketing_campaign_crm_demo
#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_6
@@ -154,18 +187,24 @@ msgid ""
" I really appreciate your co-operation on this.\n"
" Regards,OpenERP Team,"
msgstr ""
+"Hallo, We hebben een erg mooie aanbieding die bij u kan passen.\n"
+" Voor onze zilver partners verzorgen we betaalde technische "
+"training in juni 2010.\n"
+" Als er meer informatie nodig is, dan graag terugkeren.\n"
+" Ik waardeer uw medewerking hierbij.\n"
+" Groeten,OpenERP Team,"
#. module: marketing_campaign_crm_demo
#: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
msgid "Dummy Action"
-msgstr ""
+msgstr "Dummy Actie"
#. module: marketing_campaign_crm_demo
#: model:ir.module.module,shortdesc:marketing_campaign_crm_demo.module_meta_information
msgid "marketing_campaign_crm_demo"
-msgstr ""
+msgstr "marketing_campaign_crm_demo"
#. module: marketing_campaign_crm_demo
#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7
msgid "Propose gold partnership to silver partners"
-msgstr ""
+msgstr "Stel goud partnerschap voor aan zilver partners"
diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 8f68149f9e30205443b6ca5db4a660c8054aa322..4cd16b7232203a37bb424a432aa89901312b25fe 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -37,13 +37,13 @@ STATE = [
]
STATE_PRIOR = {
- 'none' : 0,
- 'canceled' : 1,
- 'old' : 2,
- 'waiting' : 3,
- 'invoiced' : 4,
- 'free' : 6,
- 'paid' : 7
+ 'none': 0,
+ 'canceled': 1,
+ 'old': 2,
+ 'waiting': 3,
+ 'invoiced': 4,
+ 'free': 6,
+ 'paid': 7
}
class membership_line(osv.osv):
@@ -109,7 +109,7 @@ class membership_line(osv.osv):
)
''', (line.id,))
fetched = cr.fetchone()
- if not fetched :
+ if not fetched:
res[line.id] = 'canceled'
continue
istate = fetched[0]
@@ -137,7 +137,7 @@ class membership_line(osv.osv):
'membership_id': fields.many2one('product.product', string="Membership Product", required=True),
'date_from': fields.date('From', readonly=True),
'date_to': fields.date('To', readonly=True),
- 'date_cancel' : fields.date('Cancel date'),
+ 'date_cancel': fields.date('Cancel date'),
'date': fields.date('Join Date'),
'member_price':fields.float('Member Price', digits_compute= dp.get_precision('Sale Price'), required=True),
'account_invoice_line': fields.many2one('account.invoice.line', 'Account Invoice line', readonly=True),
@@ -344,7 +344,7 @@ class Partner(osv.osv):
}
_defaults = {
'free_member': False,
- 'membership_cancel' : False,
+ 'membership_cancel': False,
}
def _check_recursion(self, cr, uid, ids):
@@ -423,6 +423,8 @@ class Partner(osv.osv):
tax_value = invoice_tax_obj.compute(cr, uid, invoice_id).values()
for tax in tax_value:
invoice_tax_obj.create(cr, uid, tax, context=context)
+ #recompute the membership_state of those partners
+ self.pool.get('res.partner').write(cr, uid, ids, {})
return invoice_list
Partner()
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index afa1ee9bebe65e37b85da26f58ac2c1bc6fc89b9..b9d99e6cdb7d3ac63d08940a8c75774a273fd269 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -14,17 +14,16 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Membership Products">
- <filter string="To Sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
- <filter string="To Purchase" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]" />
+ <filter string="Inactive" icon="terp-gdu-smart-failing" domain="[('active','=',0)]"/>
<separator orientation="vertical"/>
- <field name="default_code"/>
+ <field name="code"/>
<field name="name"/>
<field name="categ_id" widget="selection" operator="child_of"/>
<newline/>
<group expand='0' string='Group by...' groups="base.group_extended">
<filter string='Category' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'categ_id'}" />
<separator orientation="vertical"/>
- <filter string='Default UOM' icon="terp-mrp" domain="[]" context="{'group_by' : 'uom_id'}" />
+ <filter string='Date From' icon="terp-go-month" domain="[]" context="{'group_by' : 'membership_date_from'}" />
</group>
<newline/>
<group expand="0" string="Extended Filters..." groups="base.group_extended">
@@ -65,13 +64,12 @@
<field name="membership_date_from" required="1"/>
<field name="membership_date_to" required="1"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
- <field name="membership"/>
</group>
<notebook colspan="4">
<page string="General">
<separator string="Accounting Info" colspan="2"/>
<separator string="Categorization" colspan="2"/>
- <field name="price" />
+ <field name="list_price" string="Membership Fee"/>
<field name="type" />
<field name="property_account_income"/>
<field name="categ_id"/>
@@ -88,10 +86,6 @@
<field colspan="4" name="description_purchase" nolabel="1"/>
</page>
</notebook>
- <!--field name="list_price" string="Membership Fee"/>
- <separator colspan="4" string="Customer Taxes:"/>
- <field name="taxes_id" colspan="4" nolabel="1"/-->
-
</form>
</field>
</record>
@@ -251,7 +245,7 @@
<group colspan="4" col="3">
<field name="free_member"/>
<button name="%(action_membership_invoice_view)d" type="action" string="Join Membership" attrs="{'readonly':[('free_member','=',True)]}" icon="gtk-apply"/>
- <field colspan="4" name="associate_member" attrs="{'invisible':[('membership_state', '!=', 'none')], 'readonly':[('free_member','=',True)]}"/>
+ <field colspan="4" name="associate_member" attrs="{'readonly':[('membership_state','!=', 'none')]}"/>
<field colspan="4" name="membership_state"/>
</group>
</group>
diff --git a/addons/membership/report/report_membership.py b/addons/membership/report/report_membership.py
index b631ef64d9be73a0f1fea30126e8b2f134958e4f..4718866d8a3e26acc450382d6723b59c31922bbc 100644
--- a/addons/membership/report/report_membership.py
+++ b/addons/membership/report/report_membership.py
@@ -36,7 +36,7 @@ STATE = [
class report_membership(osv.osv):
- '''Membership by Years'''
+ '''Membership Analysis'''
_name = 'report.membership'
_description = __doc__
@@ -52,17 +52,15 @@ class report_membership(osv.osv):
('11', 'November'), ('12', 'December')], 'Month', readonly=True),
'date_from': fields.datetime('Start Date', readonly=True, help="Start membership date"),
'date_to': fields.datetime('End Date', readonly=True, help="End membership date"),
- 'num_canceled': fields.integer('# Canceled', readonly=True),
- 'num_old': fields.integer('# Old', readonly=True),
'num_waiting': fields.integer('# Waiting', readonly=True),
'num_invoiced': fields.integer('# Invoiced', readonly=True),
- 'num_free': fields.integer('# Free', readonly=True),
'num_paid': fields.integer('# Paid', readonly=True),
'tot_pending': fields.float('Pending Amount', digits_compute= dp.get_precision('Account'), readonly=True),
'tot_earned': fields.float('Earned Amount', digits_compute= dp.get_precision('Account'), readonly=True),
- 'state':fields.selection(STATE, 'Membership State'),
- 'partner_id': fields.many2one('res.partner', 'Members', readonly=True),
+ 'partner_id': fields.many2one('res.partner', 'Member', readonly=True),
+ 'associate_member_id': fields.many2one('res.partner', 'Associate Member', readonly=True),
'membership_id': fields.many2one('product.product', 'Membership Product', readonly=True),
+ 'membership_state': fields.selection(STATE, 'Current Membership State', readonly=True),
'user_id': fields.many2one('res.users', 'Salesman', readonly=True),
'company_id': fields.many2one('res.company', 'Company', readonly=True)
}
@@ -71,63 +69,77 @@ class report_membership(osv.osv):
'''Create the view'''
tools.drop_view_if_exists(cr, 'report_membership')
cr.execute("""
- CREATE OR REPLACE VIEW report_membership AS (
+ CREATE OR REPLACE VIEW report_membership AS (
SELECT
MIN(id) AS id,
- COUNT(num_canceled) AS num_canceled,
- COUNT(num_old) AS num_old,
+ partner_id,
+ user_id,
+ membership_state,
+ associate_member_id,
+ membership_amount,
+ date_from,
+ date_to,
+ year,
+ month,
COUNT(num_waiting) AS num_waiting,
COUNT(num_invoiced) AS num_invoiced,
- COUNT(num_free) AS num_free,
COUNT(num_paid) AS num_paid,
SUM(tot_pending) AS tot_pending,
SUM(tot_earned) AS tot_earned,
- year,
- month,
- date_from,
- date_to,
- partner_id,
membership_id,
- company_id,
- user_id,
- state
+ company_id
FROM
(SELECT
- CASE WHEN ml.state = 'canceled' THEN ml.id END AS num_canceled,
- CASE WHEN ml.state = 'old' THEN ml.id END AS num_old,
+ MIN(p.id) AS id,
+ p.id AS partner_id,
+ p.user_id AS user_id,
+ p.membership_state AS membership_state,
+ p.associate_member AS associate_member_id,
+ p.membership_amount AS membership_amount,
+ TO_CHAR(p.membership_start, 'YYYY-MM-DD') AS date_from,
+ TO_CHAR(p.membership_stop, 'YYYY-MM-DD') AS date_to,
+ TO_CHAR(p.membership_start, 'YYYY') AS year,
+ TO_CHAR(p.membership_start,'MM') AS month,
CASE WHEN ml.state = 'waiting' THEN ml.id END AS num_waiting,
CASE WHEN ml.state = 'invoiced' THEN ml.id END AS num_invoiced,
- CASE WHEN ml.state = 'free' THEN ml.id END AS num_free,
CASE WHEN ml.state = 'paid' THEN ml.id END AS num_paid,
CASE WHEN ml.state IN ('waiting', 'invoiced') THEN SUM(il.price_subtotal) ELSE 0 END AS tot_pending,
- CASE WHEN ml.state IN ('old', 'paid') THEN SUM(il.price_subtotal) ELSE 0 END AS tot_earned,
- TO_CHAR(ml.date_from, 'YYYY') AS year,
- TO_CHAR(ml.date_from, 'MM') AS month,
- TO_CHAR(ml.date_from, 'YYYY-MM-DD') AS date_from,
- TO_CHAR(ml.date_to, 'YYYY-MM-DD') AS date_to,
- ml.partner AS partner_id,
- MIN(ml.id) AS id,
+ CASE WHEN ml.state = 'paid' OR p.membership_state = 'old' THEN SUM(il.price_subtotal) ELSE 0 END AS tot_earned,
ml.membership_id AS membership_id,
- p.user_id AS user_id,
- ml.company_id AS company_id,
- ml.state AS state
- FROM membership_membership_line ml
+ p.company_id AS company_id
+ FROM res_partner p
+ LEFT JOIN membership_membership_line ml ON (ml.partner = p.id)
LEFT JOIN account_invoice_line il ON (ml.account_invoice_line = il.id)
LEFT JOIN account_invoice ai ON (il.invoice_id = ai.id)
- LEFT JOIN res_partner p ON (ml.partner = p.id)
+ WHERE p.membership_state != 'none'
GROUP BY
- TO_CHAR(ml.date_from, 'YYYY'),
- TO_CHAR(ml.date_from, 'MM'),
- TO_CHAR(ml.date_from, 'YYYY-MM-DD'),
- TO_CHAR(ml.date_to, 'YYYY-MM-DD'),
- ml.partner,
- ml.id,
- p.user_id,
- ml.company_id,
- ml.state,
- ml.membership_id) AS foo
- GROUP BY year, month, date_from, date_to, partner_id, user_id, membership_id, company_id, state)
- """)
+ p.id,
+ p.user_id,
+ p.membership_state,
+ p.associate_member,
+ p.membership_amount,
+ TO_CHAR(p.membership_start, 'YYYY-MM-DD'),
+ TO_CHAR(p.membership_stop, 'YYYY-MM-DD'),
+ TO_CHAR(p.membership_start, 'YYYY'),
+ TO_CHAR(p.membership_start,'MM'),
+ ml.membership_id,
+ p.company_id,
+ ml.state,
+ ml.id
+ ) AS foo
+ GROUP BY
+ year,
+ month,
+ date_from,
+ date_to,
+ partner_id,
+ user_id,
+ membership_id,
+ company_id,
+ membership_state,
+ associate_member_id,
+ membership_amount
+ )""")
report_membership()
diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
index 291efee4834829d433d7255cd8561b315ec5d479..d36b4af0afe580e1b45dab1d9cd473cf6117acd1 100644
--- a/addons/membership/report/report_membership_view.xml
+++ b/addons/membership/report/report_membership_view.xml
@@ -10,24 +10,21 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<tree colors="blue:state in ('draft');black:state in ('open','free');gray:state in ('done','cancel') " string="Membership">
- <field name="state" invisible="context.get('free_cancel_visible', False) or context.get('waiting_invoiced_totpending_visible', False) or context.get('paid_old_totearned_visible', False)"/>
- <field name="partner_id" invisible="context.get('free_cancel_visible', False) or context.get('waiting_invoiced_totpending_visible', False) or context.get('paid_old_totearned_visible', False)"/>
- <field name="user_id" invisible="context.get('free_cancel_visible', False) or context.get('waiting_invoiced_totpending_visible', False) or context.get('paid_old_totearned_visible', False)"/>
- <field name="membership_id" invisible="context.get('free_cancel_visible', False) or context.get('waiting_invoiced_totpending_visible', False) or context.get('paid_old_totearned_visible', False)"/>
- <field name="num_canceled" invisible="context.get('waiting_invoiced_totpending_visible', False) or context.get('paid_old_totearned_visible', False)"/>
- <field name="num_waiting" invisible="context.get('free_cancel_visible', False) or context.get('paid_old_totearned_visible', False)"/>
- <field name="num_invoiced" invisible="context.get('free_cancel_visible', False) or context.get('paid_old_totearned_visible', False)"/>
- <field name="tot_pending" invisible="context.get('free_cancel_visible', False) or context.get('paid_old_totearned_visible', False)"/>
- <field name="num_paid" invisible="context.get('free_cancel_visible', False) or context.get('waiting_invoiced_totpending_visible', False)"/>
- <field name="num_old" invisible="context.get('free_cancel_visible', False) or context.get('waiting_invoiced_totpending_visible', False)"/>
- <field name="tot_earned" invisible="context.get('free_cancel_visible', False) or context.get('waiting_invoiced_totpending_visible', False)"/>
- <field name="num_free" invisible="context.get('waiting_invoiced_totpending_visible', False) or context.get('paid_old_totearned_visible', False)"/>
- <field name="date_from" invisible="context.get('free_cancel_visible', False) or context.get('waiting_invoiced_totpending_visible', False) or context.get('paid_old_totearned_visible', False)"/>
- <field name="date_to" invisible="context.get('free_cancel_visible', False) or context.get('waiting_invoiced_totpending_visible', False) or context.get('paid_old_totearned_visible', False)"/>
+ <field name="partner_id"/>
+ <field name="membership_state"/>
+ <field name="associate_member_id" invisible="1"/>
+ <field name="date_from"/>
+ <field name="date_to"/>
+ <field name="user_id" invisible="1"/>
+ <field name="membership_id"/>
+ <field name="num_waiting" invisible="context.get('waiting_invoiced_totpending_visible', True)"/>
+ <field name="num_invoiced" invisible="context.get('waiting_invoiced_totpending_visible', True)"/>
+ <field name="tot_pending" invisible="context.get('waiting_invoiced_totpending_visible', True)"/>
+ <field name="num_paid" invisible="context.get('paid_old_totearned_visible', True)"/>
+ <field name="tot_earned" invisible="context.get('paid_old_totearned_visible', True)"/>
<field name="year" invisible="1"/>
<field name="month" invisible="1"/>
<field name="company_id" invisible="1"/>
- <field name="state" invisible="1"/>
</tree>
</field>
</record>
@@ -44,9 +41,8 @@
<filter string="Last 30 Days" icon="terp-go-month" name="month"
domain="[('date_from','<=', time.strftime('%%Y-%%m-%%d')), ('date_from','>',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
<separator orientation="vertical"/>
- <filter string="Cancel & Free" icon="terp-check" context="{'free_cancel_visible':1}" help="This will display free and cancel column"/>
- <filter string="Forecast" icon="terp-check" context="{'waiting_invoiced_totpending_visible':1}" help="This will display waiting, invoiced and total pending columns"/>
- <filter string="Revenue Done" name="Revenue" icon="terp-check" context="{'paid_old_totearned_visible':1}" help="This will display paid, old and total earned columns"/>
+ <filter string="Forecast" icon="terp-gtk-jump-to-ltr" context="{'waiting_invoiced_totpending_visible':0}" help="This will display waiting, invoiced and total pending columns"/>
+ <filter string="Revenue Done" name="Revenue" icon="terp-dolar" context="{'paid_old_totearned_visible':0}" help="This will display paid, old and total earned columns"/>
<separator orientation="vertical"/>
<field name="partner_id"/>
<field name="membership_id"/>
@@ -57,13 +53,13 @@
<group expand="1" string="Group By..." colspan="4" col="12">
<filter string="Salesman" icon="terp-personal" name="salesman"
domain="[]" context="{'group_by':'user_id'}"/>
- <filter string="Partner" icon="terp-partner" name="partner"
- domain="[]" context="{'group_by':'partner_id'}"/>
+ <filter string="Associated Partner" icon="terp-partner" name="associate_member_id"
+ domain="[]" context="{'group_by':'associate_member_id'}"/>
<separator orientation="vertical"/>
<filter string="Membership Product" icon="terp-product" name="product"
domain="[]" context="{'group_by':'membership_id'}"/>
- <filter string="Membership State" icon="terp-stock_effects-object-colorize"
- domain="[]" context="{'group_by':'state'}"/>
+ <filter string="Current Membership State" icon="terp-stock_effects-object-colorize"
+ domain="[]" context="{'group_by':'membership_state'}"/>
<separator orientation="vertical" groups="base.group_multi_company"/>
<filter string="Company" icon="terp-go-home"
domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
@@ -96,7 +92,7 @@
<field name="res_model">report.membership</field>
<field name="view_type">form</field>
<field name="search_view_id" ref="view_report_membership_search"/>
- <field name="context">{"search_default_member":1, 'search_default_Revenue':1}</field>
+ <field name="context">{"search_default_member":1, 'search_default_Revenue':1, 'search_default_salesman':1, }</field>
</record>
<record model="ir.actions.act_window.view" id="action_report_membership_tree_view1">
@@ -114,7 +110,7 @@
<field name="act_window_id" ref="action_report_membership_tree"/>
</record>
- <menuitem name="Membership Analysis" parent="base.menu_report_association"
+ <menuitem name="Members Analysis" parent="base.menu_report_association"
action="action_report_membership_tree"
id="menu_report_membership"
groups="base.group_partner_manager"/>
diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index c5474670d9b626925f9b70254e8388fc68949f1e..a181e5ba41d1f178d2bcaecd80ba9088501958a3 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -13,14 +13,13 @@
<form string="Manufacturing board">
<hpaned position="100">
<child1>
- <action colspan="4" height="200" name="%(mrp.mrp_production_action2)d" string="Next production orders" width="510"/>
- <action colspan="4" name="%(stock.action_picking_tree)d" string="Deliveries (Out picking)" domain="[('state','=','assigned'),('type','=','out')]"/>
+ <action colspan="4" height="200" name="%(mrp.mrp_production_action2)d" string="Next Production Orders" width="510"/>
<action colspan="4" name="%(procurement.procurement_exceptions)d" string="Procurements in Exception"/>
</child1>
<child2>
- <action colspan="4" name="%(mrp.action_report_workcenter_load_tree)d" string="Work Center future load"/>
+ <action colspan="4" name="%(mrp.action_report_workcenter_load_tree)d" string="Work Center Future load"/>
- <action colspan="4" name="%(mrp.action_report_in_out_picking_tree)d" string="Stock value variation"/>
+ <action colspan="4" name="%(mrp.action_report_in_out_picking_tree)d" string="Stock Value Variation"/>
</child2>
</hpaned>
</form>
@@ -43,8 +42,5 @@
id="menu_board_manufacturing"
parent="menus_dash_mrp"
sequence="1" groups="mrp.group_mrp_manager,mrp.group_mrp_user"/>
- <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing"
- groups="group_mrp_user,group_mrp_manager,base.group_system" sequence="8"
- action="open_board_manufacturing"/>
</data>
</openerp>
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 5f2695cf3a70a91e9c410d706db1c0946eb8ce9c..50ed21eb298407235efe34de0300deebee5256a2 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -644,11 +644,7 @@ class mrp_production(osv.osv):
move_obj.write(cr, uid, [production.move_prod_id.id],
{'location_id': production.location_dest_id.id})
- message = ("Manufacturing Order '%s' for %s %s is Ready to produce.") % (
- name,
- production.product_qty,
- production.product_id.name,
- )
+ message = _("Manufacturing order '%s' is ready to produce.") % ( name,)
self.log(cr, uid, production_id, message)
return True
@@ -759,9 +755,6 @@ class mrp_production(osv.osv):
wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'mrp.production', production_id, 'button_produce_done', cr)
- for (id, name) in self.pool.get('product.product').name_get(cr, uid, [production.product_id.id]):
- message = str(production_qty) + ' ' + production.product_uom.name +" '" + name + _("' have been manufactured for ") + production.name
- self.log(cr, uid, production_id, message)
return True
def _costs_generate(self, cr, uid, production):
@@ -929,16 +922,10 @@ class mrp_production(osv.osv):
proc_ids.append(proc_id)
wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
self.write(cr, uid, [production.id], {'picking_id': picking_id, 'move_lines': [(6,0,moves)], 'state':'confirmed'})
- message = ("%s '%s' %s %s %s %s %s %s.") % (
- _('Manufacturing Order'),
- production.name,
- _('for'),
- production.product_qty,
- production.product_id.name,
- _('scheduled for date '),
- datetime.strptime(production.date_planned,'%Y-%m-%d %H:%M:%S').strftime('%Y-%m-%d'),
- _('is waiting')
- )
+ message = _("Manufacturing order '%s' is scheduled for the %s.") % (
+ production.name,
+ datetime.strptime(production.date_planned,'%Y-%m-%d %H:%M:%S').strftime('%m/%d/%Y'),
+ )
self.log(cr, uid, production.id, message)
return picking_id
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 32f3100b8689b64eb90925348f4d2e49bd9a287a..c946777b219fe8a634a89696bb5fa12393349850 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -3,7 +3,7 @@
<data>
<menuitem icon="terp-mrp" id="base.menu_mrp_root" parent="" name="Manufacturing"
- groups="group_mrp_user,group_mrp_manager,base.group_system" sequence="8"/>
+ groups="group_mrp_user,group_mrp_manager" sequence="8"/>
<menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="base.menu_mrp_root" sequence="1"/>
@@ -11,7 +11,7 @@
<menuitem name="Master Data"
id="menu_mrp_bom"
parent="base.menu_mrp_root"
- groups="mrp.group_mrp_manager,base.group_system"
+ groups="mrp.group_mrp_manager"
sequence="5" />
<!--
@@ -37,12 +37,13 @@
<field name="res_model">mrp.property.group</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
+ <field name="help">Define specific property groups that can be assigned to the properties of your bills of materials.</field>
</record>
<menuitem
id="menu_mrp_configuration"
name="Configuration"
parent="base.menu_mrp_root"
- groups="base.group_system"
+ groups="base.group_extended"
sequence="50" />
<record id="mrp_property_tree_view" model="ir.ui.view">
@@ -99,6 +100,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_mrp_property_search"/>
+ <field name="help">The Properties in OpenERP are used to select the right bill of material in order to manufacture a product, when you have different ways of building the same product. You can assign several properties to each Bill of Materials. When a sales person creates a sales order, he can relate it to several properties and OpenERP will select automatically the BoM to use according the the needs.</field>
</record>
<menuitem name="Master Bill of Materials"
id="menu_mrp_property"
@@ -109,11 +111,10 @@
action="mrp_property_action"
id="menu_mrp_property_action"
parent="menu_mrp_property"
- groups="base.group_extended,base.group_system" />
+ groups="base.group_extended" />
<menuitem
action="mrp_property_group_action"
id="menu_mrp_property_group_action"
- groups="base.group_system"
parent="menu_mrp_property"/>
<!--
@@ -184,9 +185,9 @@
<field name="arch" type="xml">
<search string="Search for mrp workcenter">
<group col='15' colspan='4'>
- <field name="code"/>
- <field name="name"/>
- <field name="resource_type"/>
+ <field name="code"/>
+ <field name="name"/>
+ <field name="resource_type"/>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
@@ -207,7 +208,7 @@
<field name="view_type">form</field>
<field name="view_id" ref="mrp_workcenter_tree_view"/>
<field name="search_view_id" ref="view_mrp_workcenter_search"/>
- <field name="help">Work Centers are units of manufacture consisting of one or several people and/or machines that can be considered as a unit for the purposes of forecasting capacity and planning.</field>
+ <field name="help">Work Centers allows you to create and manage manufacturing units consisting of one or several people and/or machines that can be considered as a unit for capacity and planning forecasting.</field>
</record>
<!--
@@ -257,10 +258,10 @@
<field name="location_id"/>
<field name="active" groups="base.group_extended"/>
<notebook colspan="4">
- <page string="Work Center Operations">
- <field colspan="4" name="workcenter_lines" nolabel="1" widget="one2many_list"/>
- </page>
- <page string="Notes">
+ <page string="Work Center Operations">
+ <field colspan="4" name="workcenter_lines" nolabel="1" widget="one2many_list"/>
+ </page>
+ <page string="Notes">
<field colspan="4" name="note" nolabel="1"/>
</page>
</notebook>
@@ -298,7 +299,7 @@
<field name="view_type">form</field>
<field name="view_id" ref="mrp_routing_tree_view"/>
<field name="search_view_id" ref="mrp_routing_search_view"/>
- <field name="help">Routings define the assembly operations to be done in work centers for manufacturing a certain product. They are usually attached to bills of materials which will define the assembly of products required for manufacture or for finished products.</field>
+ <field name="help">Routings allows you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials.</field>
</record>
<menuitem action="mrp_workcenter_action" id="menu_mrp_workcenter_action" parent="mrp.menu_mrp_property" groups="base.group_extended" sequence="40" />
<menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="mrp.menu_mrp_property" groups="base.group_extended" sequence="30"/>
@@ -415,7 +416,7 @@
<field name="view_type">form</field>
<field name="domain">[('bom_id','=',False)]</field>
<field name="search_view_id" ref="view_mrp_bom_filter"/>
- <field name="help">Master Bills of Materials are documents that describe the list of raw materials used to make a finished product. You can generate documents for a product manufacturing (defining each manufacturing step) or you could define a single multi-level bill of materials.</field>
+ <field name="help">Master Bill of Materials allows you to create and manage the list of necessary raw materials used to make a finished product. OpenERP will use these BoM in order to propose automatically manufacturing orders according to products' needs. You can either create a bill of materials to define specific production steps or define a single multi-level bill of materials.</field>
</record>
<record id="mrp_bom_form_action2" model="ir.actions.act_window">
<field name="name">Bill of Material Components</field>
@@ -423,7 +424,7 @@
<field name="res_model">mrp.bom</field>
<field name="view_type">form</field>
<field name="domain">[('bom_id','!=',False)]</field>
- <field name="help">Bills of materials Components are components and sub-product used to create master bills of materials.</field>
+ <field name="help">Bills of materials Components are components and sub-products used to create master bills of materials. Use this menu to search in which BoM is used a specific component.</field>
</record>
<!-- BOM menus -->
@@ -432,7 +433,7 @@
action="mrp_bom_form_action"
id="menu_mrp_bom_form_action"
parent="menu_mrp_bom"
- groups="mrp.group_mrp_user,mrp.group_mrp_manager,base.group_system"
+ groups="mrp.group_mrp_user,mrp.group_mrp_manager"
sequence="10"/>
<menuitem
action="mrp_bom_form_action2"
@@ -757,9 +758,9 @@
<field name="view_id" eval="False"/>
<field name="search_view_id" ref="view_mrp_production_filter"/>
<field name="context">{'search_default_Current':1}</field>
- <field name="help">Manufacturing Orders describe the operations that need to be carried out and the raw materials usage for each stage of production. You use specifications (bills of materials) to work out the raw material requirements and the manufacturing orders needed for the finished products. Once the bills of materials have been defined, OpenERP becomes capable of automatically deciding on the manufacturing route depending on the needs of the company.</field>
+ <field name="help">Manufacturing Orders are usually proposed automatically by OpenERP based on the bill of materials and the procurement rules, but you can also create manufacturing orders manually. OpenERP will handle the consumation of the raw materials (stock decrease) and the production of the finished products (stock increase) when the order is processed.</field>
</record>
- <menuitem action="mrp_production_action" id="menu_mrp_production_action" parent="menu_mrp_manufacturing" groups="base.group_system,mrp.group_mrp_user,mrp.group_mrp_manager" sequence="1"/>
+ <menuitem action="mrp_production_action" id="menu_mrp_production_action" parent="menu_mrp_manufacturing" groups="mrp.group_mrp_user,mrp.group_mrp_manager" sequence="1"/>
<record id="mrp_production_action_planning" model="ir.actions.act_window">
<field name="name">Manufacturing Orders Planning</field>
@@ -882,10 +883,10 @@
<field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]"/>
</xpath>
<xpath expr="/form/notebook/page/field[@name='close_move']" position="after">
- <group colspan="4" groups="base.group_extended">
- <separator colspan="4" string="Properties" />
- <field colspan="4" name="property_ids" nolabel="1"/>
- </group>
+ <group colspan="4" groups="base.group_extended">
+ <separator colspan="4" string="Properties" />
+ <field colspan="4" name="property_ids" nolabel="1"/>
+ </group>
</xpath>
</data>
</field>
diff --git a/addons/mrp/procurement.py b/addons/mrp/procurement.py
index 29eb2d3bddf8f3d32765a4a2dbf3c8f67106dedf..9af65a473a30de5472db4e797e97567a3129d76c 100644
--- a/addons/mrp/procurement.py
+++ b/addons/mrp/procurement.py
@@ -40,10 +40,10 @@ class procurement_order(osv.osv):
"""
properties = [x.id for x in procurement.property_ids]
bom_id = self.pool.get('mrp.bom')._bom_find(cr, uid, procurement.product_id.id, procurement.product_uom.id, properties)
- if not bom_id:
+ if not bom_id:
cr.execute('update procurement_order set message=%s where id=%s', (_('No BoM defined for this product !'), procurement.id))
for (id, name) in self.name_get(cr, uid, procurement.id):
- message = _('Procurement ') + " '" + name + "' "+ _("has an exception.") + _('No BoM defined for this product !')
+ message = _("Procurement '%s' has an exception: 'No BoM defined for this product !'") % name
self.log(cr, uid, id, message)
return False
return True
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index 01b3381b0bbd794cb7a243b759b218b05b3439be..61a0c641a241a4907d68e2325c3ad4274afdb8e0 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -111,6 +111,7 @@
<field name="view_id" ref="view_report_mrp_production_order_tree"/>
<field name="search_view_id" ref="view_report_mrp_production_order_filter"/>
<field name="context">{'search_default_Product': 1,'search_default_month':1,'group_by_no_leaf':1,'group_by':[]}</field>
+ <field name="help">This reporting allows you to analyse your manufacturing activities and performance.</field>
</record>
<record model="ir.actions.act_window.view" id="action_report_mrp_production_order_tree">
diff --git a/addons/mrp/report/mrp_report_view.xml b/addons/mrp/report/mrp_report_view.xml
index dcb2bcb356624139def82a97a33da749f3ea8f39..db628eb5431c7c782a61a390f7f1b2175c56628f 100644
--- a/addons/mrp/report/mrp_report_view.xml
+++ b/addons/mrp/report/mrp_report_view.xml
@@ -47,7 +47,7 @@
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="search_view_id" ref="view_workcenter_load_search"/>
- <field name="help">Work Center Load is a projection of load in a work center given a period. The load is express in hour and cycle (for machines).</field>
+ <field name="help">Work Center Loads gives you a projection of work center loads over a specified period. It is expressed in number of hours and machine related cycles.</field>
</record>
<menuitem id="next_id_77" name="Reporting"
parent="base.menu_mrp_root" sequence="49"/>
@@ -99,7 +99,7 @@
<field name="res_model">report.mrp.inout</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
- <field name="help">Weekly Stock Value Variation enables you to track stock value evolution as a result of manufacturing activities (consumption of raw materials, production of finished goods, added accounting value of stock by the creation of value following the transformation of products).</field>
+ <field name="help">Weekly Stock Value Variation enables you to track the stock value evolution linked to manufacturing activities, receptions of products and delivery orders.</field>
</record>
<menuitem action="action_report_in_out_picking_tree" id="menu_report_in_out_picking"
parent="next_id_77" groups="mrp.group_mrp_manager"/>
diff --git a/addons/mrp/report/order.rml b/addons/mrp/report/order.rml
index 03bd0377cc553866144897ca587f12f41cc8b2b2..e07966ff5c9e902a0debf7313bef625314dcacc1 100644
--- a/addons/mrp/report/order.rml
+++ b/addons/mrp/report/order.rml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<document filename="test.pdf">
+<document filename="Production Order.pdf">
<template pageSize="(595.0,842.0)" title="Production Order" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="34.0" y1="42.0" width="527" height="758"/>
@@ -17,9 +17,12 @@
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+ <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
</blockTableStyle>
<blockTableStyle id="Table5">
<blockAlignment value="LEFT"/>
@@ -28,9 +31,12 @@
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+ <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
</blockTableStyle>
<blockTableStyle id="Table1">
<blockAlignment value="LEFT"/>
@@ -175,7 +181,7 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
- <blockTable colWidths="200.0,199.0,128.0" style="Table2">
+ <blockTable colWidths="193.0,206.0,129.0" style="Table3">
<tr>
<td>
<para style="terp_tblheader_General_Centre">Source Document</para>
@@ -188,16 +194,16 @@
</td>
</tr>
</blockTable>
- <blockTable colWidths="200.0,199.0,129.0" style="Table2">
+ <blockTable colWidths="193.0,205.0,129.0" style="Table5">
<tr>
<td>
<para style="terp_default_Centre_8">[[ o.origin ]]</para>
</td>
<td>
- <para style="terp_default_Centre_8">[[ o.product_id.code ]] [[ o.product_id.name ]]</para>
+ <para style="terp_default_Centre_8">[[ (o.product_id and o.product_id.code) or '' ]] [[ (o.product_id and o.product_id.name) or '' ]]</para>
</td>
<td>
- <para style="terp_default_Centre_8">[[formatLang(o.product_qty) ]] [[ o.product_uom.name ]]</para>
+ <para style="terp_default_Centre_8">[[formatLang(o.product_qty) ]] [[ (o.product_id and o.product_uom and o.product_uom.name) or '']]</para>
</td>
</tr>
</blockTable>
@@ -245,7 +251,7 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
- <blockTable colWidths="74.0,203.0,121.0,66.0,64.0" style="Table6">
+ <blockTable colWidths="74.0,212.0,112.0,66.0,64.0" style="Table6">
<tr>
<td>
<para style="terp_tblheader_General_Centre">Sequence</para>
@@ -266,7 +272,7 @@
</blockTable>
<section>
<para style="terp_default_8">[[ repeatIn(o.workcenter_lines,'line2') ]]</para>
- <blockTable colWidths="74.0,203.0,121.0,66.0,64.0" style="Table4">
+ <blockTable colWidths="74.0,212.0,112.0,66.0,64.0" style="Table4">
<tr>
<td>
<para style="terp_default_Centre_8">[[ line2.sequence ]]</para>
@@ -275,7 +281,7 @@
<para style="terp_default_Centre_8">[[ line2.name ]]</para>
</td>
<td>
- <para style="terp_default_Centre_8">[[ line2.workcenter_id.name ]]</para>
+ <para style="terp_default_Centre_8">[[ (line2.workcenter_id and line2.workcenter_id.name) or '' ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ formatLang(line2.cycle) ]]</para>
@@ -315,45 +321,45 @@
<section>
<para style="terp_default_Bold_9">Products to Consume [[ o.move_lines ==[] and removeParentNode('section')]]</para>
<section>
- <para style="terp_default_8">[[ repeatIn(o.move_lines,'line') ]]</para>
+ <para style="terp_default_2">[[ repeatIn(o.move_lines,'line') ]]</para>
<blockTable colWidths="250.0,65.0,108.0,104.0" style="Table9">
<tr>
<td>
- <para style="terp_default_9">[[ line.product_id.code ]] [[ line.product_id.name ]]</para>
+ <para style="terp_default_9">[[ (line.product_id and line.product_id.code) or '' ]] [[ (line.product_id and line.product_id.name) or '' ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang( line.product_qty) ]] [[ line.product_uom.name]] </para>
+ <para style="terp_default_Right_9">[[ formatLang( line.product_qty) ]] [[ (line.product_uom and line.product_uom.name) or '']] </para>
</td>
<td>
- <para style="terp_default_Centre_9">[[ line.location_id.name ]]</para>
+ <para style="terp_default_Centre_9">[[ (line.location_id and line.location_id.name) or '' ]]</para>
</td>
<td>
- <para style="terp_default_Centre_9">[[ line.location_dest_id.name ]]</para>
+ <para style="terp_default_Centre_9">[[ (line.location_dest_id and line.location_dest_id.name) or '' ]]</para>
</td>
</tr>
</blockTable>
</section>
</section>
- <para style="terp_default_8">
- <font color="white"> </font>
- </para>
<section>
+ <para style="terp_default_Bold_9">
+ <font color="white"> </font>
+ </para>
<para style="terp_default_Bold_9">Consumed Products [[ o.move_lines2 ==[] and removeParentNode('section')]]</para>
<section>
- <para style="terp_default_8">[[ repeatIn(o.move_lines2,'line2') ]]</para>
+ <para style="terp_default_2">[[ repeatIn(o.move_lines2,'line2') ]]</para>
<blockTable colWidths="251.0,66.0,106.0,104.0" style="Table10">
<tr>
<td>
- <para style="terp_default_9">[[ line2.product_id.code ]] [[ line2.product_id.name ]]</para>
+ <para style="terp_default_9">[[ (line2.product_id and line2.product_id.code) or '' ]] [[ (line2.product_id and line2.product_id.name) or '' ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang( line2.product_qty) ]] [[ line2.product_uom.name]] </para>
+ <para style="terp_default_Right_9">[[ formatLang( line2.product_qty) ]] [[ (line2.product_uom and line2.product_uom.name) or '']] </para>
</td>
<td>
- <para style="terp_default_Centre_9">[[ line2.location_id.name ]]</para>
+ <para style="terp_default_Centre_9">[[ (line2.location_id and line2.location_id.name) or '' ]]</para>
</td>
<td>
- <para style="terp_default_Centre_9">[[ line2.location_dest_id.name ]]</para>
+ <para style="terp_default_Centre_9">[[ (line2.location_dest_id and line2.location_dest_id.name) or '' ]]</para>
</td>
</tr>
</blockTable>
diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py
index 52bcf3bcd4aafff9c9d290fd3beb936122c6594d..d41ee26bba9d713949876fe87786f96bc655f538 100644
--- a/addons/mrp/report/price.py
+++ b/addons/mrp/report/price.py
@@ -120,7 +120,7 @@ class report_custom(report_rml):
<col t='yes'>%s</col>
</row>
</lines>
- """ % (_('Work Center name'), _('Cycles Cost')+'('+company_currency.code+')', _('Hourly Cost')+'('+company_currency.code+')',_('Work Cost')+'('+company_currency.code+')')
+ """ % (_('Work Center name'), _('Cycles Cost'), _('Hourly Cost'),_('Work Cost'))
prod_header = """
<row>
<col>%s</col>
@@ -129,7 +129,7 @@ class report_custom(report_rml):
<col t='yes'>%s</col>
<col t='yes'>%s</col>
</row>
- """ % (_('Component'), _('Component suppliers'), _('Quantity'),_('Cost Price per Uom')+'('+company_currency.code+')', _('Supplier Price per Uom')+'('+company_currency.code+')')
+ """ % (_('Component'), _('Component suppliers'), _('Quantity'),_('Cost Price per Uom'), _('Supplier Price per Uom'))
purchase_price_digits = rml_obj.get_digits(dp='Purchase Price')
@@ -149,7 +149,7 @@ class report_custom(report_rml):
<col para='yes'>-</col>
</row></lines>"""
xml += """<lines style='total'> <row>
- <col> """ + _('Total Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'('+company_currency.code+')'+ """: </col>
+ <col> """ + _('Total Cost ') + _('of ') + str(number) +' '+ product.uom_id.name + """: </col>
<col/>
<col f='yes'/>
<col t='yes'>"""+ rml_obj.formatLang(total_strd, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col>
@@ -176,7 +176,7 @@ class report_custom(report_rml):
xml += "<lines style='lines'>" + xml_tmp + '</lines>'
xml += """<lines style='sub_total'> <row>
- <col> """ + _('Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'(' + company_currency.code +')'+ """: </col>
+ <col> """ + _('Cost ') + _('of ') + str(number) +' '+ product.uom_id.name + """: </col>
<col/>
<col t='yes'/>
<col t='yes'>"""+ rml_obj.formatLang(total_strd, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col>
@@ -193,14 +193,14 @@ class report_custom(report_rml):
xml += workcenter_header
xml += "<lines style='lines'>" + xml_tmp + '</lines>'
xml += """<lines style='sub_total'> <row>
- <col> """ + _('Work Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'('+company_currency.code+')'+""": </col>
+ <col> """ + _('Work Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +""": </col>
<col/>
<col/>
<col/>
<col t='yes'>"""+ rml_obj.formatLang(total2, digits=purchase_price_digits) +' '+ company_currency.symbol +"""</col>
</row></lines>'"""
xml += """<lines style='total'> <row>
- <col> """ + _('Total Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'('+company_currency.code+')'+ """: </col>
+ <col> """ + _('Total Cost ') + _('of ') + str(number) +' '+ product.uom_id.name + """: </col>
<col/>
<col t='yes'/>
<col t='yes'>"""+ rml_obj.formatLang(total_strd+total2, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col>
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index e63ced1499705bafa4b7e9c04424e0f30283928e..586f82f1b53a100e1a6922a82fd18d13c03d6493 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -62,33 +62,6 @@
"access_stock_move_mrp_manager","stock.move mrp_manager","stock.model_stock_move","mrp.group_mrp_manager",1,0,0,1
"access_mrp_production_product_line_manager","mrp.production.product.line manager","model_mrp_production_product_line","mrp.group_mrp_manager",1,0,0,0
"access_account_sequence_fiscalyear_system","account.sequence.fiscalyear.system","account.model_account_sequence_fiscalyear","mrp.group_mrp_manager",1,0,0,0
-"access_product_template_system","product.template mgr.system","product.model_product_template","base.group_system",1,0,0,0
-"access_product_uom_system","product.uom user.system","product.model_product_uom","base.group_system",1,0,0,0
-"access_product_supplierinfo_system","product.supplierinfo system","product.model_product_supplierinfo","base.group_system",1,0,0,0
-"access_res_partner_address_system","res.partner.address.system","base.model_res_partner_address","base.group_system",1,0,0,0
-"access_stock_tracking_system","stock.tracking.system","stock.model_stock_tracking","base.group_system",1,0,0,0
-"access_res_partner_system","res.partner.system","base.model_res_partner","base.group_system",1,0,0,0
-"access_product_puom_categ_system","product.uom.categ.system","product.model_product_uom_categ","base.group_system",1,0,0,0
-"access_resource_resource_system","resource.resource.system","resource.model_resource_resource","base.group_system",1,0,0,0
-"access_board_board_system","mrp.board.board.system","board.model_board_board","base.group_system",1,0,0,0
-"access_mrp_production_system","mrp.production.system","model_mrp_production","base.group_system",1,0,0,0
-"access_procurement_system","procurement.order.system","model_procurement_order","base.group_system",1,0,0,0
-"access_workcenter_system","mrp.production.workcenter.line.system","model_mrp_production_workcenter_line","base.group_system",1,0,0,0
-"access_stock_move_mrp_system","stock.move mrp_manager.system","stock.model_stock_move","base.group_system",1,0,0,0
-"access_mrp_production_product_line_system","mrp.production.product.line manager.system","model_mrp_production_product_line","base.group_system",1,0,0,0
-"access_mrp_production_order_system","mrp.production.order.system","model_mrp_production_order","base.group_system",1,0,0,0
-"access_report_workcenter_load_system","report.workcenter.load.system","model_report_workcenter_load","base.group_system",1,0,0,0
-"access_report_mrp_inout_system","report.mrp.inout.system","model_report_mrp_inout","base.group_system",1,0,0,0
-"access_product_product_system","product.product system","model_product_product","base.group_system",1,0,0,0
-"access_mrp_routing_system","mrp.routing.system","model_mrp_routing","base.group_system",1,0,0,0
-"access_mrp_routing_workcenter_system","mrp.routing.workcenter.system","model_mrp_routing_workcenter","base.group_system",1,0,0,0
-"access_mrp_bom_system","mrp.bom.system","model_mrp_bom","base.group_system",1,0,0,0
-"access_mrp_bom_revision_system","mrp.bom.revision.system","model_mrp_bom_revision","base.group_system",1,0,0,0
-"access_mrp_property_system","mrp.property.system","procurement.model_mrp_property","base.group_system",1,1,1,1
-"access_mrp_property_group_system","mrp.property.group.system","procurement.model_mrp_property_group","base.group_system",1,1,1,1
-"access_mrp_routing_system","mrp.routing.system","model_mrp_routing","base.group_system",1,1,1,1
-"access_mrp_workcenter_system","mrp.workcenter.system","model_mrp_workcenter","base.group_system",1,0,0,0
-"access_mrp_production_system","mrp.production system","model_mrp_production","base.group_system",1,0,0,0
"access_stock_production_lot_user","stock.production.lot","stock.model_stock_production_lot","mrp.group_mrp_user",1,1,1,1
"access_stock_warehouse_orderpoint_manager","stock.warehouse.orderpoint","procurement.model_stock_warehouse_orderpoint","mrp.group_mrp_manager",1,0,0,0
"access_stock_picking_mrp_manager","stock.picking mrp_manager","stock.model_stock_picking","mrp.group_mrp_manager",1,0,0,0
diff --git a/addons/mrp_jit/i18n/ru.po b/addons/mrp_jit/i18n/ru.po
index 05ad7866e702bbd05d3782e4be91613badea3fe6..6a197c5f04265d0e58e2ae61a05d8af498cb81ac 100644
--- a/addons/mrp_jit/i18n/ru.po
+++ b/addons/mrp_jit/i18n/ru.po
@@ -7,16 +7,16 @@ 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: 2009-04-10 14:08+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-10-15 09:29+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp_jit
#: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
msgid "MRP JIT"
-msgstr ""
+msgstr "MRP JIT"
diff --git a/addons/mrp_operations/i18n/hr.po b/addons/mrp_operations/i18n/hr.po
index ab7c0e8691026ce52cef3719e61282ab31372f1d..362ffedb2c22b4e332c09eeddc4e06c70c993f14 100644
--- a/addons/mrp_operations/i18n/hr.po
+++ b/addons/mrp_operations/i18n/hr.po
@@ -7,62 +7,64 @@ 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: 2009-02-03 06:26+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-10-15 09:07+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp_operations
#: model:process.node,name:mrp_operations.process_node_startoperation0
msgid "Start Operation"
-msgstr ""
+msgstr "pokreni operaciju"
#. module: mrp_operations
#: selection:mrp.production.workcenter.line,state:0
msgid "In Progress"
-msgstr ""
+msgstr "U Tijeku"
#. module: mrp_operations
#: view:mrp.production.workcenter.line:0
#: selection:mrp.production.workcenter.line,state:0
#: selection:mrp_operations.operation.code,start_stop:0
msgid "Pause"
-msgstr ""
+msgstr "Pauza"
#. module: mrp_operations
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Naziv objekta mora zapoÄinjati sa x_ i ne smije sadržavati specijalne "
+"znakove !"
#. module: mrp_operations
#: model:process.node,note:mrp_operations.process_node_startoperation0
msgid "Operation is started"
-msgstr ""
+msgstr "operacija je startana"
#. module: mrp_operations
#: view:mrp.production.workcenter.line:0
msgid "Information"
-msgstr ""
+msgstr "Obavijest"
#. module: mrp_operations
#: model:process.transition,name:mrp_operations.process_transition_startcanceloperation0
msgid "Start Cancel Operation"
-msgstr ""
+msgstr "startaj oitkazivanje opercije"
#. module: mrp_operations
#: selection:mrp.production.workcenter.line,production_state:0
msgid "In Production"
-msgstr ""
+msgstr "U proizvodnji"
#. module: mrp_operations
#: model:ir.actions.act_window,name:mrp_operations.mrp_production_code_action
msgid "Operations Code"
-msgstr ""
+msgstr "kod operacije"
#. module: mrp_operations
#: model:process.process,name:mrp_operations.process_process_mrpoperationprocess0
diff --git a/addons/mrp_operations/i18n/sr.po b/addons/mrp_operations/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..bf173288c9d6320c8b31ced929f6c1bf27426bd3
--- /dev/null
+++ b/addons/mrp_operations/i18n/sr.po
@@ -0,0 +1,443 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-16 09:44+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-17 04:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: mrp_operations
+#: model:process.node,name:mrp_operations.process_node_startoperation0
+msgid "Start Operation"
+msgstr "ZapoÄni postupak"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,state:0
+msgid "In Progress"
+msgstr "U toku"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+#: selection:mrp.production.workcenter.line,state:0
+#: selection:mrp_operations.operation.code,start_stop:0
+msgid "Pause"
+msgstr "Pauza"
+
+#. module: mrp_operations
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da poÄinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: mrp_operations
+#: model:process.node,note:mrp_operations.process_node_startoperation0
+msgid "Operation is started"
+msgstr "Postupak je pokrenut"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Information"
+msgstr "Informacija"
+
+#. module: mrp_operations
+#: model:process.transition,name:mrp_operations.process_transition_startcanceloperation0
+msgid "Start Cancel Operation"
+msgstr "Pokreni ponistenje Operacije"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,production_state:0
+msgid "In Production"
+msgstr "U produkciji"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_code_action
+msgid "Operations Code"
+msgstr "Sifre Operacija"
+
+#. module: mrp_operations
+#: model:process.process,name:mrp_operations.process_process_mrpoperationprocess0
+msgid "Mrp Operation Process"
+msgstr "Mrp Procesni Postupak"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+#: field:mrp.production.workcenter.line,state:0
+#: field:mrp_operations.operation.code,start_stop:0
+msgid "Status"
+msgstr "Status"
+
+#. module: mrp_operations
+#: model:process.transition,name:mrp_operations.process_transition_startdoneoperation0
+msgid "Start Done Operation"
+msgstr "Pokreni Zavrsetak Postupka"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+#: selection:mrp_operations.operation.code,start_stop:0
+msgid "Start"
+msgstr "Pokreni"
+
+#. module: mrp_operations
+#: field:mrp_operations.operation,production_id:0
+msgid "Production"
+msgstr "Proizvodnja"
+
+#. module: mrp_operations
+#: view:mrp_operations.operation:0
+msgid "Calendar View"
+msgstr "Kalendarski pogled"
+
+#. module: mrp_operations
+#: model:process.node,name:mrp_operations.process_node_workorder0
+msgid "Work Center"
+msgstr "Radionica"
+
+#. module: mrp_operations
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: mrp_operations
+#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_operation_action
+msgid "Work Order Events Using Bar Codes"
+msgstr "Radni Nalozi Koriscenjem Bar-Koda"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Set Draft"
+msgstr "Postavi u Pripremu"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
+#: view:mrp.production.workcenter.line:0
+msgid "Work Orders"
+msgstr "Radni Nalozi"
+
+#. module: mrp_operations
+#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_code_action
+msgid "Start - Stop Codes"
+msgstr "Pokreni - Zaustavi Sifre"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,uom:0
+msgid "UOM"
+msgstr "JM"
+
+#. module: mrp_operations
+#: view:mrp_operations.operation.code:0
+msgid "Production Operation Code"
+msgstr "Operaciona Sifra Proizvodnje"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,date_planned:0
+msgid "Scheduled Date"
+msgstr "Planirani datum"
+
+#. module: mrp_operations
+#: model:process.transition,note:mrp_operations.process_transition_productionstart0
+msgid "From production order, create the workorder"
+msgstr "Iz Naloga proizvodnje kreiraj Radni Nalog"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Hours by Workcenter"
+msgstr "Radionicki Sati"
+
+#. module: mrp_operations
+#: help:mrp.production,allow_reorder:0
+msgid ""
+"Check this to be able to move independently all production orders, without "
+"moving dependent ones."
+msgstr ""
+"Cekiraj ovde da bi bio u mogucnosti da nezavisno premestas sve proizvodne "
+"naloge, bez pomeranja onih zavisnih."
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action
+#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_action
+msgid "All Work Orders"
+msgstr "Svi Radni Nalozi"
+
+#. module: mrp_operations
+#: rml:mrp.code.barcode:0
+msgid "("
+msgstr "("
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Product to Produce"
+msgstr "Proizvod za Proizvodnju"
+
+#. module: mrp_operations
+#: model:ir.actions.report.xml,name:mrp_operations.report_wc_barcode
+msgid "Workcenters Barcode"
+msgstr "Radionicki Bar-Kod"
+
+#. module: mrp_operations
+#: model:process.node,note:mrp_operations.process_node_doneoperation0
+#: model:process.transition,note:mrp_operations.process_transition_startdoneoperation0
+msgid "Operation is done"
+msgstr "Postupak je zavrsen"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Planned Date"
+msgstr "Planirani datum"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,production_state:0
+msgid "Ready to Produce"
+msgstr "Spreman za Proizvodnju"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+#: selection:mrp_operations.operation.code,start_stop:0
+msgid "Cancel"
+msgstr "Otkaži"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+#: selection:mrp.production.workcenter.line,state:0
+msgid "Finished"
+msgstr "Završeno"
+
+#. module: mrp_operations
+#: field:mrp.production,allow_reorder:0
+msgid "Free Serialisation"
+msgstr "Slobodna Serializacija"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_planning
+#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_draft_action_planning
+msgid "Work Orders Planning"
+msgstr "Planiranje Radnih Naloga"
+
+#. module: mrp_operations
+#: model:process.node,name:mrp_operations.process_node_productionorder0
+msgid "Production Order"
+msgstr "Proizvodni Nalog"
+
+#. module: mrp_operations
+#: model:process.node,note:mrp_operations.process_node_productionorder0
+msgid "Production order for any products"
+msgstr "Proizvodni nalog za bilo koji proizvod"
+
+#. module: mrp_operations
+#: field:stock.move,move_dest_id_lines:0
+msgid "Children Moves"
+msgstr "Pomeranje Podgurpa"
+
+#. module: mrp_operations
+#: field:mrp_operations.operation.code,name:0
+msgid "Operation Name"
+msgstr "Ime Postupka"
+
+#. module: mrp_operations
+#: model:ir.model,name:mrp_operations.model_mrp_operations_operation
+msgid "mrp_operations.operation"
+msgstr "mrp_operacije.operacija"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,date_finished:0
+#: field:mrp.production.workcenter.line,date_planned_end:0
+#: field:mrp_operations.operation,date_finished:0
+msgid "End Date"
+msgstr "Završni Datum"
+
+#. module: mrp_operations
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Real"
+msgstr "Реални"
+
+#. module: mrp_operations
+#: model:ir.module.module,shortdesc:mrp_operations.module_meta_information
+msgid "Workcenter Production start end workflow"
+msgstr "Radionicka Proizvodnja pocetak i kraj posla"
+
+#. module: mrp_operations
+#: help:mrp.production.workcenter.line,delay:0
+msgid "This is delay between operation start and stop in this workcenter"
+msgstr "Ovo je razlika izmedju pocetka i kraja posla ove Radionice"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,product:0
+msgid "Product"
+msgstr "Proizvod"
+
+#. module: mrp_operations
+#: model:process.transition,note:mrp_operations.process_transition_workstartoperation0
+msgid "From work order, define the cycles and hour for creating product"
+msgstr ""
+"Iz Radnog Naloga, definisi cikluse i sate potrebne za zavrsetak proizvoda"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,delay:0
+msgid "Working Hours"
+msgstr "Radni Sati"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_draft_action
+#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_draft_action
+msgid "Future Work Orders"
+msgstr "Buduci Radni Nalozi"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,production_state:0
+msgid "Prod.State"
+msgstr "Stanje Proizvoda"
+
+#. module: mrp_operations
+#: field:mrp_operations.operation,order_date:0
+msgid "Order Date"
+msgstr "Datum Naloga"
+
+#. module: mrp_operations
+#: model:process.node,note:mrp_operations.process_node_workorder0
+msgid "Production Work Center"
+msgstr "Proizvodna Radionica"
+
+#. module: mrp_operations
+#: model:process.transition,name:mrp_operations.process_transition_productionstart0
+msgid "Production start Operation"
+msgstr "Pocetak Operacije Proizvodnje"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,production_state:0
+msgid "Packing Exception"
+msgstr "Izuzetak Pakovanja"
+
+#. module: mrp_operations
+#: field:mrp_operations.operation,workcenter_id:0
+msgid "Workcenter"
+msgstr "Radionica"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,date_start:0
+#: field:mrp.production.workcenter.line,date_start_date:0
+#: field:mrp_operations.operation,date_start:0
+msgid "Start Date"
+msgstr "PoÄetni datum"
+
+#. module: mrp_operations
+#: model:ir.model,name:mrp_operations.model_mrp_operations_operation_code
+msgid "mrp_operations.operation.code"
+msgstr "mrp_operacije.postupak.sifra"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_operation_action
+#: view:mrp.production.workcenter.line:0
+msgid "Operations"
+msgstr "Radnje"
+
+#. module: mrp_operations
+#: field:mrp_operations.operation,code_id:0
+#: field:mrp_operations.operation.code,code:0
+msgid "Code"
+msgstr "Å ifra"
+
+#. module: mrp_operations
+#: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_confirm_action
+msgid "Confirmed Work Orders"
+msgstr "Potvrdi Radne naloge"
+
+#. module: mrp_operations
+#: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_confirm_action
+msgid "Work Orders to Do"
+msgstr "Radni Nalozi na cekanju"
+
+#. module: mrp_operations
+#: model:process.node,name:mrp_operations.process_node_canceloperation0
+msgid "Cancel Operation"
+msgstr "Otkazi Operaciju"
+
+#. module: mrp_operations
+#: model:process.transition,name:mrp_operations.process_transition_workstartoperation0
+msgid "Work start Operation"
+msgstr "Pocetak Rada Operacije"
+
+#. module: mrp_operations
+#: model:ir.actions.report.xml,name:mrp_operations.report_code_barcode
+msgid "Start/Stop Barcode"
+msgstr "pokreni/Zaustavi Bar-Kod"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+#: selection:mrp_operations.operation.code,start_stop:0
+msgid "Resume"
+msgstr "Nastavi"
+
+#. module: mrp_operations
+#: model:process.node,name:mrp_operations.process_node_doneoperation0
+msgid "Done Operation"
+msgstr "Zavrsena Operacija"
+
+#. module: mrp_operations
+#: field:mrp.production.workcenter.line,qty:0
+msgid "Qty"
+msgstr "Kol."
+
+#. module: mrp_operations
+#: rml:mrp.code.barcode:0
+msgid ")"
+msgstr ")"
+
+#. module: mrp_operations
+#: view:mrp_operations.operation:0
+msgid "Production Operation"
+msgstr "Operacije Proizvoda"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,production_state:0
+#: selection:mrp_operations.operation.code,start_stop:0
+msgid "Done"
+msgstr "Gotovo"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,production_state:0
+msgid "Waiting Goods"
+msgstr "Cekamo Dobra"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Duration"
+msgstr "Trajanje"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,production_state:0
+#: selection:mrp.production.workcenter.line,state:0
+msgid "Draft"
+msgstr "Priprema"
+
+#. module: mrp_operations
+#: model:process.node,note:mrp_operations.process_node_canceloperation0
+#: model:process.transition,note:mrp_operations.process_transition_startcanceloperation0
+msgid "Operation is cancelled"
+msgstr "Operacija je otkazana"
+
+#. module: mrp_operations
+#: selection:mrp.production.workcenter.line,production_state:0
+#: selection:mrp.production.workcenter.line,state:0
+msgid "Canceled"
+msgstr "Отказано"
+
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Start working"
+msgstr "Pocetak Posla"
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index 9585a34df360576bb3fe6dc658a4e7041238119e..206dfabbc74ff5813a04536bc61e657abe745201 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -66,15 +66,17 @@ class mrp_production_workcenter_line(osv.osv):
""" Finds ending date.
@return: Dictionary of values.
"""
+
ops = self.browse(cr, uid, ids, context=context)
- date_and_hours_by_cal = [(op.production_id.date_planned, op.hour, op.workcenter_id.calendar_id.id) for op in ops]
+ date_and_hours_by_cal = [(op.date_planned, op.hour, op.workcenter_id.calendar_id.id) for op in ops if op.date_planned]
+
intervals = self.pool.get('resource.calendar').interval_get_multi(cr, uid, date_and_hours_by_cal)
res = {}
for op in ops:
res[op.id] = False
if op.date_planned:
- i = intervals[(op.date_planned, op.hour, op.workcenter_id.calendar_id.id)]
+ i = intervals.get((op.date_planned, op.hour, op.workcenter_id.calendar_id.id))
if i:
res[op.id] = i[-1][1].strftime('%Y-%m-%d %H:%M:%S')
else:
@@ -286,6 +288,7 @@ class mrp_production(osv.osv):
dt_end = max(dt_end, i[-1][1])
else:
dt_end = datetime.strptime(wc.date_planned_end, '%Y-%m-%d %H:%M:%S')
+
old = wc.sequence or 0
super(mrp_production, self).write(cr, uid, [po.id], {
'date_finished': dt_end
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 62298f4aa5fc594027372cef0c9cc449d5a15630..cd208b2d5a63ba767ccde3691e8faa16fbde8998 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -202,7 +202,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,gantt,calendar,graph</field>
<field name="search_view_id" ref="view_mrp_production_workcenter_form_view_filter"/>
- <field name="help">Work Orders are manufacturing operations required to produce or assemble products. The different work orders will have different impacts on the costs of manufacture and planning depending on the available workload.</field>
+ <field name="help">Work Orders is the list of operations to be performed for each manufacturing order. Once you start the first work order of a manufacturing order, the manufacturing order is automatically marked as started. Once you finish the latest operation of a manufacturing order, the MO is automatically done and the related products are produced.</field>
</record>
<record model="ir.actions.act_window" id="mrp_production_wc_action_planning">
diff --git a/addons/mrp_repair/i18n/sr.po b/addons/mrp_repair/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..743247668bca46846fd17b137ac0b80b0aa1e519
--- /dev/null
+++ b/addons/mrp_repair/i18n/sr.po
@@ -0,0 +1,685 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-16 08:53+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-17 04:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Fees Line"
+msgstr "Dodatne Linije"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,repair_id:0
+#: field:mrp.repair.line,repair_id:0
+msgid "Repair Order Ref"
+msgstr "Ref.Nalog za Popravku"
+
+#. module: mrp_repair
+#: field:mrp.repair.line,move_id:0
+msgid "Inventory Move"
+msgstr "Premesti Inventar"
+
+#. module: mrp_repair
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Untaxed amount"
+msgstr "Iznos bez Poreza"
+
+#. module: mrp_repair
+#: field:mrp.repair,state:0
+msgid "Repair State"
+msgstr "Stanje Popravke"
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Printing Date"
+msgstr "Datum Å¡tampe"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,product_uom_qty:0
+#: rml:repair.order:0
+msgid "Quantity"
+msgstr "KoliÄina"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Set to Draft"
+msgstr "Postavi u pripremu"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+msgid "Invoice Exception"
+msgstr "Izuzetak u izdavanju RaÄuna"
+
+#. module: mrp_repair
+#: field:mrp.repair,address_id:0
+msgid "Delivery Address"
+msgstr "Adresa Dostave"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Make Invoice"
+msgstr "Kreiraj raÄun"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,price_subtotal:0
+#: field:mrp.repair.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Invoice address :"
+msgstr "Adresa raÄuna:"
+
+#. module: mrp_repair
+#: field:mrp.repair,guarantee_limit:0
+msgid "Guarantee limit"
+msgstr "Garancija"
+
+#. module: mrp_repair
+#: field:mrp.repair,amount_tax:0
+#: field:mrp.repair.fee,tax_id:0
+#: field:mrp.repair.line,tax_id:0
+msgid "Taxes"
+msgstr "Porezi"
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Net Total :"
+msgstr "Ukupno neto"
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "VAT"
+msgstr "PDV"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Operations"
+msgstr "Radnje"
+
+#. module: mrp_repair
+#: field:mrp.repair,move_id:0
+msgid "Move"
+msgstr "Pomeri"
+
+#. module: mrp_repair
+#: model:ir.actions.act_window,name:mrp_repair.action_repair_order_tree
+msgid "Repair Orders"
+msgstr "Nalozi Popravke"
+
+#. module: mrp_repair
+#: model:ir.actions.report.xml,name:mrp_repair.report_mrp_repair
+msgid "Quotation / Order"
+msgstr "Ponude / Nalozi"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Extra Info"
+msgstr "Dodatne Informacije"
+
+#. module: mrp_repair
+#: field:mrp.repair,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: mrp_repair
+#: model:ir.actions.act_window,name:mrp_repair.action_repair_quotation_tree
+#: model:ir.ui.menu,name:mrp_repair.menu_repair_quotation
+msgid "Repairs in quotation"
+msgstr "Popravke u Najavi"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+#: selection:mrp.repair.line,state:0
+msgid "Confirmed"
+msgstr "Potvrđeno"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Recreate Invoice"
+msgstr "Osvežavanje raÄuna"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Repairs order"
+msgstr "Nalozi Popravke"
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Repair Order N° :"
+msgstr "Nalog Br :"
+
+#. module: mrp_repair
+#: field:mrp.repair,prodlot_id:0
+#: rml:repair.order:0
+msgid "Lot Number"
+msgstr "Serijski Broj"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+msgid "Under Repair"
+msgstr "Popravka u Toku"
+
+#. module: mrp_repair
+#: field:mrp.repair,fees_lines:0
+msgid "Fees Lines"
+msgstr "Dodatne Linije"
+
+#. module: mrp_repair
+#: model:ir.model,name:mrp_repair.model_mrp_repair_fee
+msgid "Repair Fees line"
+msgstr "Dodatne Linije Popravke"
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Fees Line(s)"
+msgstr "Dodana linija(e)"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+msgid "To be Invoiced"
+msgstr "Da bude Fakturisano"
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Shipping address :"
+msgstr "Adresa isporuke:"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Start Repair"
+msgstr "Start Popravke"
+
+#. module: mrp_repair
+#: field:mrp.repair.line,product_uom_qty:0
+msgid "Quantity (UoM)"
+msgstr "KoliÄina (UoM)"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,to_invoice:0
+#: field:mrp.repair.line,to_invoice:0
+msgid "To Invoice"
+msgstr "Fakturisati"
+
+#. module: mrp_repair
+#: model:ir.ui.menu,name:mrp_repair.menu_repair_order
+msgid "Repairs"
+msgstr "Popravke"
+
+#. module: mrp_repair
+#: field:mrp.repair,picking_id:0
+msgid "Packing"
+msgstr "Pakovanje"
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Total :"
+msgstr "Ukupno:"
+
+#. module: mrp_repair
+#: field:mrp.repair,pricelist_id:0
+msgid "Pricelist"
+msgstr "Cenovnik"
+
+#. module: mrp_repair
+#: help:mrp.repair,state:0
+msgid "Gives the state of the Repair Order"
+msgstr "Dato Stanje Naloga Popravke"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+#: field:mrp.repair,quotation_notes:0
+msgid "Quotation Notes"
+msgstr "Kotacija napomene"
+
+#. module: mrp_repair
+#: model:ir.actions.act_window,name:mrp_repair.action_repair_progress_tree
+#: model:ir.ui.menu,name:mrp_repair.menu_repair_progress
+msgid "Repairs in progress"
+msgstr "Popravka u Toku"
+
+#. module: mrp_repair
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: mrp_repair
+#: help:mrp.repair,guarantee_limit:0
+msgid ""
+"The garantee limit is computed as: last move date + warranty defined on "
+"selected product. If the current date is below the garantee limit, each "
+"operation and fee you will add will be set as 'not to invoiced' by default. "
+"Note that you can change manually afterwards."
+msgstr ""
+"Garancija je izracunata kao: Datum odlaska + garancija definisana za dati "
+"proizvod. Ako je dati datum manji od garanciskog limita, svaka radnja i "
+"dopune bice poostavljene kao \"za ne fakturisati' kao osnovna postavka. "
+"Trebate znati da ovo mozete kasnije rucno promeniri."
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Repair Line"
+msgstr "Linija Popravke"
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "N° :"
+msgstr "Br.:"
+
+#. module: mrp_repair
+#: field:mrp.repair,invoice_method:0
+msgid "Invoice Method"
+msgstr "Metod Fakturisanja"
+
+#. module: mrp_repair
+#: field:mrp.repair,repaired:0
+msgid "Repaired"
+msgstr "Popravljeno"
+
+#. module: mrp_repair
+#: wizard_field:mrp.repair.make_invoice,init,group:0
+msgid "Group by partner invoice address"
+msgstr "Grupisano po adresama faktura partnera"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,invoice_line_id:0
+#: field:mrp.repair.line,invoice_line_id:0
+msgid "Invoice Line"
+msgstr "Red raÄuna"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Total amount"
+msgstr "Ukupan iznos"
+
+#. module: mrp_repair
+#: selection:mrp.repair.line,state:0
+msgid "Canceled"
+msgstr "Отказано"
+
+#. module: mrp_repair
+#: selection:mrp.repair,invoice_method:0
+msgid "Before Repair"
+msgstr "Pre POpravke"
+
+#. module: mrp_repair
+#: field:mrp.repair,location_id:0
+msgid "Current Location"
+msgstr "Trenutna Lokacija"
+
+#. module: mrp_repair
+#: wizard_button:mrp.repair.cancel,display,yes:0
+msgid "Yes"
+msgstr "Da"
+
+#. module: mrp_repair
+#: field:mrp.repair,invoiced:0
+#: field:mrp.repair.fee,invoiced:0
+#: field:mrp.repair.line,invoiced:0
+msgid "Invoiced"
+msgstr "Fakturisano"
+
+#. module: mrp_repair
+#: wizard_button:mrp.repair.cancel,display,end:0
+msgid "No"
+msgstr "Ne"
+
+#. module: mrp_repair
+#: wizard_view:mrp.repair.make_invoice,init:0
+#: wizard_button:mrp.repair.make_invoice,init,invoice:0
+msgid "Create invoices"
+msgstr "Kreiranje raÄuna"
+
+#. module: mrp_repair
+#: selection:mrp.repair.line,type:0
+#: rml:repair.order:0
+msgid "Add"
+msgstr "Dodaj"
+
+#. module: mrp_repair
+#: selection:mrp.repair.line,state:0
+msgid "Draft"
+msgstr "Priprema"
+
+#. module: mrp_repair
+#: model:ir.actions.act_window,name:mrp_repair.action_repair_order_form
+#: model:ir.ui.menu,name:mrp_repair.menu_repair_form
+msgid "New Repair"
+msgstr "Nova Popravka"
+
+#. module: mrp_repair
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da poÄinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: mrp_repair
+#: field:mrp.repair,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Iznos bez poreza"
+
+#. module: mrp_repair
+#: field:mrp.repair.line,state:0
+msgid "Status"
+msgstr "Status"
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Guarantee Limit"
+msgstr "Garancija traje do"
+
+#. module: mrp_repair
+#: field:mrp.repair,product_id:0
+#: rml:repair.order:0
+msgid "Product to Repair"
+msgstr "Proizvod za Popravku"
+
+#. module: mrp_repair
+#: help:mrp.repair,pricelist_id:0
+msgid "The pricelist comes from the selected partner, by default."
+msgstr "Cenovnik stize od selektovanog partnera, po postavci"
+
+#. module: mrp_repair
+#: wizard_view:mrp.repair.cancel,display:0
+msgid ""
+"This operation will cancel the Repair process, but will not cancel it's "
+"Invoice. Do you want to continue?"
+msgstr ""
+"Ova operacija ce otkazati proces popravke, ali nece ponistiti i fakturu "
+"iste. Zelis li da nastavim"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+msgid "Quotation"
+msgstr "Najava"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Compute"
+msgstr "Izracunaj"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Confirm Repair"
+msgstr "Potvrdi Popravku"
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Repair Quotation"
+msgstr "Pretpostavka Popravke"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "End Repair"
+msgstr "Kraj Popravke"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "History"
+msgstr ""
+
+#. module: mrp_repair
+#: model:ir.model,name:mrp_repair.model_mrp_repair
+msgid "Repairs Order"
+msgstr "Nalog Popravki"
+
+#. module: mrp_repair
+#: model:ir.actions.act_window,name:mrp_repair.action_repair_ready_tree
+#: model:ir.ui.menu,name:mrp_repair.menu_repair_ready
+msgid "Repairs Ready to Start"
+msgstr "Popravke spremne za start"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Qty"
+msgstr "Kol."
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+#: selection:mrp.repair.line,state:0
+msgid "Done"
+msgstr "Gotovo"
+
+#. module: mrp_repair
+#: model:ir.actions.act_window,name:mrp_repair.action_repair_2binvoiced_tree
+#: model:ir.ui.menu,name:mrp_repair.menu_repair_2binvoiced
+msgid "Repairs to be invoiced"
+msgstr "Popravke za fakturisanje"
+
+#. module: mrp_repair
+#: field:mrp.repair,invoice_id:0
+msgid "Invoice"
+msgstr "RaÄun"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Fees"
+msgstr "Porezi"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+#: wizard_button:mrp.repair.make_invoice,init,end:0
+msgid "Cancel"
+msgstr "Otkaži"
+
+#. module: mrp_repair
+#: field:mrp.repair.line,location_dest_id:0
+msgid "Dest. Location"
+msgstr "Odredišna lokacija"
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Operation Line(s)"
+msgstr "Linija(e) Operacije"
+
+#. module: mrp_repair
+#: model:ir.model,name:mrp_repair.model_mrp_repair_line
+msgid "Repair Operations Lines"
+msgstr "Operacione Linije Popravke"
+
+#. module: mrp_repair
+#: field:mrp.repair,location_dest_id:0
+msgid "Delivery Location"
+msgstr "Lokacija Ispostave"
+
+#. module: mrp_repair
+#: model:ir.module.module,shortdesc:mrp_repair.module_meta_information
+msgid "Products Repairs Module"
+msgstr "Modul Popravki Proizvoda"
+
+#. module: mrp_repair
+#: help:mrp.repair,invoice_method:0
+msgid ""
+"This field allow you to change the workflow of the repair order. If value "
+"selected is different from 'No Invoice', it also allow you to select the "
+"pricelist and invoicing address."
+msgstr ""
+"Ovo ti polje omogucava da promenis radni prozor u nalogu popravki. Ako je "
+"selektovana vrednost drugacija od onog gde pise ( nema Faktura), on ti "
+"takodje omogucava da selektujes cenovnik i adresu afkturisanja."
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,price_unit:0
+#: field:mrp.repair.line,price_unit:0
+#: rml:repair.order:0
+msgid "Unit Price"
+msgstr "JediniÄna cijena"
+
+#. module: mrp_repair
+#: wizard_view:mrp.repair.make_invoice,init:0
+msgid "Do you really want to create the invoices ?"
+msgstr "Da li zaista želite da kreirate raÄun?"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,name:0
+#: field:mrp.repair.line,name:0
+#: rml:repair.order:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: mrp_repair
+#: field:mrp.repair,operations:0
+msgid "Operation Lines"
+msgstr "Operacione Linije"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,product_id:0
+#: field:mrp.repair.line,product_id:0
+msgid "Product"
+msgstr "Proizvod"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Invoice Corrected"
+msgstr "Ispravljen raÄun"
+
+#. module: mrp_repair
+#: help:mrp.repair,deliver_bool:0
+msgid ""
+"Check this box if you want to manage the delivery once the product is "
+"repaired. If cheked, it will create a packing with selected product. Note "
+"that you can select the locations in the Info tab, if you have the extended "
+"view."
+msgstr ""
+"Cekiraj ovu kucicu ako zelis da upravljas sa isporukama, onda kada je "
+"proizvod popravljen. ako je cekirano, kreirace pakovanje za selektovani "
+"proizvod. Treba napomenuti da mozes selektovati lokaciju u Info tabu, ako si "
+"omogucio prosireni prozor,"
+
+#. module: mrp_repair
+#: field:mrp.repair.line,type:0
+msgid "Type"
+msgstr "Tip"
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Price"
+msgstr "Cena"
+
+#. module: mrp_repair
+#: field:mrp.repair,deliver_bool:0
+msgid "Deliver"
+msgstr "Isporuka"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+#: field:mrp.repair,internal_notes:0
+msgid "Internal Notes"
+msgstr "Interne Napomene"
+
+#. module: mrp_repair
+#: rml:repair.order:0
+msgid "Taxes:"
+msgstr "Porezi:"
+
+#. module: mrp_repair
+#: model:ir.actions.wizard,name:mrp_repair.wizard_mrp_repair_make_invoice
+msgid "Make invoices"
+msgstr "Kreiranje raÄuna"
+
+#. module: mrp_repair
+#: field:mrp.repair,name:0
+msgid "Repair Ref"
+msgstr "Ref Popravke"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "UoM"
+msgstr "JM"
+
+#. module: mrp_repair
+#: selection:mrp.repair.line,type:0
+#: rml:repair.order:0
+msgid "Remove"
+msgstr "Уклони"
+
+#. module: mrp_repair
+#: wizard_view:mrp.repair.cancel,display:0
+msgid "Cancel Repair...??"
+msgstr "Otkazujes Popravku ??"
+
+#. module: mrp_repair
+#: field:mrp.repair.fee,product_uom:0
+#: field:mrp.repair.line,product_uom:0
+msgid "Product UoM"
+msgstr "JM Proizvoda"
+
+#. module: mrp_repair
+#: field:mrp.repair,partner_invoice_id:0
+msgid "Invoicing Address"
+msgstr "Adresa Fakturisanja"
+
+#. module: mrp_repair
+#: selection:mrp.repair,invoice_method:0
+msgid "After Repair"
+msgstr "Nakon Popravke"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Invoicing"
+msgstr "Fakturisanje"
+
+#. module: mrp_repair
+#: field:mrp.repair.line,location_id:0
+msgid "Source Location"
+msgstr "Lokacija izvora"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "Quality"
+msgstr "Kvalitet"
+
+#. module: mrp_repair
+#: model:ir.actions.wizard,name:mrp_repair.action_cancel_repair
+#: view:mrp.repair:0
+msgid "Cancel Repair"
+msgstr "Otkazi Popravku"
+
+#. module: mrp_repair
+#: selection:mrp.repair,invoice_method:0
+msgid "No Invoice"
+msgstr "Ne Fakturisi"
+
+#. module: mrp_repair
+#: view:mrp.repair:0
+msgid "States"
+msgstr "Stanja"
+
+#. module: mrp_repair
+#: help:mrp.repair,partner_id:0
+msgid ""
+"This field allow you to choose the parner that will be invoiced and delivered"
+msgstr ""
+"Ovo polje ti omogucava da izaberes partnera kojem ce biti isporuceno i "
+"fakturisano"
+
+#. module: mrp_repair
+#: field:mrp.repair,amount_total:0
+msgid "Total"
+msgstr "Ukupno"
+
+#. module: mrp_repair
+#: selection:mrp.repair,state:0
+msgid "Ready to Repair"
+msgstr "Spremno za Popravku"
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 15878ec1b37ae1a707d45ad71986b213dbb72958..756fa94568a47606e04dcee8431f3f33225b2da4 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -211,6 +211,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_repair_order_form_filter"/>
+ <field name="help">Repair orders allows you to organize your reparations on the products. On a repair order, you can detail the components you remove, add or replace and record the time you spent on the different operations. The repair order uses the warranty date on the production lot in order to know if you have to invoice the reparation to the customer or not.</field>
</record>
<menuitem action="action_repair_order_tree" id="menu_repair_order" parent="mrp.menu_mrp_manufacturing" groups="mrp.group_mrp_user" name="Repair Orders" sequence="50"/>
diff --git a/addons/mrp_subproduct/i18n/sr.po b/addons/mrp_subproduct/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..a0427bb335692832113483ec9c8bdfacb68b0c77
--- /dev/null
+++ b/addons/mrp_subproduct/i18n/sr.po
@@ -0,0 +1,90 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-16 09:18+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-17 04:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: mrp_subproduct
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: mrp_subproduct
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da poÄinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "pod proizvodi"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Proizvod"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Mrp Sub Product"
+msgstr "Mrp Pod Proizvod"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr "Tip Kolicine"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Kol, Proizvoda"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "JM proizvoda"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "BoM"
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Pod proizvodi"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Promjenljiva"
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "pod_proizvod"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Fiksno"
+
+#. module: mrp_subproduct
+#: model:ir.module.module,shortdesc:mrp_subproduct.module_meta_information
+msgid "MRP Sub Product"
+msgstr "MRP Pod Proizvod"
diff --git a/addons/mrp_subproduct/security/ir.model.access.csv b/addons/mrp_subproduct/security/ir.model.access.csv
index cd093fa6ff1a580cd1e916335d2ffc75fef5ed63..307827265f2778458d364591a64fb1b989049c17 100644
--- a/addons/mrp_subproduct/security/ir.model.access.csv
+++ b/addons/mrp_subproduct/security/ir.model.access.csv
@@ -1,4 +1,3 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_mrp_subproduct_user","mrp.subproduct","model_mrp_subproduct","mrp.group_mrp_user",1,1,1,1
"access_mrp_subproduct_manager","mrp.subproduct manager","model_mrp_subproduct","mrp.group_mrp_manager",1,0,0,0
-"access_mrp_subproduct_system","mrp.subproduct system","model_mrp_subproduct","base.group_system",1,0,0,0
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
index af2c5afd35c53166d490ff4739942085b0037383..d520283bd2dc88c783a847b211ba3b99f1e9fe8e 100755
--- a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
@@ -43,7 +43,7 @@ def execute(connector, method, *args):
if e.args[0] == 111:
if wait_count > wait_limit:
print "Server is taking too long to start, it has exceeded the maximum limit of %d seconds."%(wait_limit)
- clean()
+ # clean() Commented...
sys.exit(1)
print 'Please wait %d sec to start server....'%(waittime)
wait_count += 1
diff --git a/addons/point_of_sale/i18n/sr.po b/addons/point_of_sale/i18n/sr.po
index 88a975b8f89b69da8622cc32e4234c26715a7b56..4efa16dc46bbe64152033501ca131fa2ad0c3f56 100644
--- a/addons/point_of_sale/i18n/sr.po
+++ b/addons/point_of_sale/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-13 07:42+0000\n"
+"PO-Revision-Date: 2010-10-15 07:35+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Serbian <sr@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-10-14 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: point_of_sale
@@ -83,7 +83,7 @@ msgstr "Neto Ukupno"
#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.menu_action_pos_order_tree2
msgid "Orders of the day"
-msgstr "Dnevne narudzbe"
+msgstr "Današnje narudžbe"
#. module: point_of_sale
#: model:ir.actions.report.xml,name:point_of_sale.pos_details_summary
@@ -98,7 +98,7 @@ msgstr "Ovo je prijavljeni korisnik( ne nuzno prodavac)"
#. module: point_of_sale
#: wizard_view:pos.sale.get,init:0
msgid "Select an Open Sale Order"
-msgstr "Novi Nalog Prodaje"
+msgstr "Odaberi otvoreni prodajni nalog"
#. module: point_of_sale
#: rml:pos.lines:0
@@ -199,7 +199,7 @@ msgstr "Br.Artikala"
#: field:pos.config.journal,code:0
#: rml:pos.details:0
msgid "Code"
-msgstr "Kod"
+msgstr "Å ifra"
#. module: point_of_sale
#: field:pos.order,date_validity:0
@@ -222,7 +222,7 @@ msgstr "PDV"
#. module: point_of_sale
#: model:ir.actions.wizard,name:point_of_sale.pos_refund
msgid "Refund Orders"
-msgstr "Refundiraj narudzbe"
+msgstr "Storno"
#. module: point_of_sale
#: field:pos.order,last_out_picking:0
@@ -232,7 +232,7 @@ msgstr "Izlaz zadnjeg biranja"
#. module: point_of_sale
#: wizard_view:pos.config.journal,init:0
msgid "Select default journals"
-msgstr ""
+msgstr "Izaberi POdrazumevani Dnevnik(knjigu)"
#. module: point_of_sale
#: rml:pos.details:0
@@ -263,7 +263,7 @@ msgstr "Ukupna Transakcija"
#. module: point_of_sale
#: rml:pos.details:0
msgid "Disc"
-msgstr "Disk"
+msgstr "Popust"
#. module: point_of_sale
#: rml:pos.invoice:0
@@ -284,7 +284,7 @@ msgstr "Partner"
#. module: point_of_sale
#: field:pos.order,payments:0
msgid "Order Payments"
-msgstr ""
+msgstr "Nalozi Plaćanja"
#. module: point_of_sale
#: rml:pos.receipt:0
@@ -305,7 +305,7 @@ msgstr "Potvrdi"
#. module: point_of_sale
#: view:pos.order:0
msgid "POS Orders"
-msgstr "POS Narudzbe"
+msgstr "POS Nalozi"
#. module: point_of_sale
#: rml:pos.lines:0
@@ -366,7 +366,7 @@ msgstr "Datum kreiranja"
#. module: point_of_sale
#: rml:pos.invoice:0
msgid "PRO-FORMA"
-msgstr "PRO-FORMA"
+msgstr "PredraÄun"
#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.menu_point_rep
@@ -381,7 +381,7 @@ msgstr "POS "
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_config_journal
msgid "Point of Sale journal configuration."
-msgstr ""
+msgstr "Dnevnik konfiguracije Prodajnog Mesta ( POS)"
#. module: point_of_sale
#: rml:pos.receipt:0
@@ -391,17 +391,17 @@ msgstr "Ukupno:"
#. module: point_of_sale
#: wizard_field:pos.config.journal,init,default_journal:0
msgid "Default journal"
-msgstr ""
+msgstr "Glavna Knjiga"
#. module: point_of_sale
#: field:pos.order,account_receivable:0
msgid "Default Receivable"
-msgstr ""
+msgstr "Osnovna Potrazivanja"
#. module: point_of_sale
#: model:ir.actions.wizard,name:point_of_sale.pos_sale_get
msgid "Get From Order"
-msgstr ""
+msgstr "Uzmi iz Naloga"
#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.menu_point_config
@@ -423,7 +423,7 @@ msgstr "Nevažeći XML za pregled arhitekture"
#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.menu_action_pos_order_line_day
msgid "POS Lines of the day"
-msgstr ""
+msgstr "Dnevna prodaja blagajne"
#. module: point_of_sale
#: field:pos.order,nb_print:0
@@ -433,7 +433,7 @@ msgstr "Br. za Stampu"
#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.menu_wizard_default_journal
msgid "Default journals"
-msgstr ""
+msgstr "Osnovni Dnevnik"
#. module: point_of_sale
#: rml:pos.invoice:0
@@ -448,7 +448,7 @@ msgstr "Popust (%)"
#. module: point_of_sale
#: rml:pos.invoice:0
msgid "Fiscal Position Remark :"
-msgstr ""
+msgstr "Napomena Fiskalne pozicije:"
#. module: point_of_sale
#: model:ir.actions.wizard,name:point_of_sale.pos_add_product
@@ -463,17 +463,17 @@ msgstr "Ukupna kol."
#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.menu_action_pos_order_line
msgid "POS Lines"
-msgstr ""
+msgstr "Blagajne"
#. module: point_of_sale
#: view:pos.order:0
msgid "Sales Order POS"
-msgstr ""
+msgstr "Prodajni nalozi POS-a"
#. module: point_of_sale
#: wizard_button:pos.config.journal,init,set_default_journal:0
msgid "Define default journals"
-msgstr ""
+msgstr "Definisi Glavnu Knjigu"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
@@ -499,12 +499,12 @@ msgstr "Fakturisani"
#. module: point_of_sale
#: wizard_field:pos.config.journal,init,default_journal_rebate:0
msgid "Default rebate journal"
-msgstr ""
+msgstr "Osnovni Dnevnik Rabat-a"
#. module: point_of_sale
#: model:ir.actions.wizard,name:point_of_sale.wizard_default_journal
msgid "Wizard default journals"
-msgstr ""
+msgstr "Carobnjak Glavne Knjige"
#. module: point_of_sale
#: rml:pos.details:0
@@ -535,7 +535,7 @@ msgstr "PDV :"
#. module: point_of_sale
#: view:pos.order.line:0
msgid "POS Order lines"
-msgstr ""
+msgstr "Nalozi Blagajne"
#. module: point_of_sale
#: rml:pos.receipt:0
@@ -562,7 +562,7 @@ msgstr "nepoznato"
#. module: point_of_sale
#: view:pos.order.line:0
msgid "POS Order line"
-msgstr ""
+msgstr "Nalog Blagajne"
#. module: point_of_sale
#: model:ir.actions.wizard,name:point_of_sale.pos_discount
@@ -595,7 +595,7 @@ msgstr "Datum"
#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
msgid "Sales by user"
-msgstr ""
+msgstr "Prodaje po korisniku"
#. module: point_of_sale
#: wizard_button:pos.add_product,init,add:0
@@ -687,7 +687,7 @@ msgstr "Racun"
#. module: point_of_sale
#: wizard_view:pos.refund_order,init:0
msgid "Refund order :"
-msgstr "Redosled refundiranja:"
+msgstr "Nalog Refundacije"
#. module: point_of_sale
#: field:report.transaction.pos,no_trans:0
@@ -773,7 +773,7 @@ msgstr "Popust Ukupno"
#. module: point_of_sale
#: field:pos.order,invoice_wanted:0
msgid "Create Invoice"
-msgstr "Kreiranje raÄuna"
+msgstr "Kreiraj RaÄun"
#. module: point_of_sale
#: wizard_view:pos.refund_order,init:0
@@ -783,7 +783,7 @@ msgstr "Refunidraj "
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_order_line
msgid "Lines of Point of Sale"
-msgstr ""
+msgstr "Blagajne"
#. module: point_of_sale
#: rml:pos.invoice:0
@@ -825,7 +825,7 @@ msgstr "Bar-Kod"
#. module: point_of_sale
#: rml:pos.invoice:0
msgid "Canceled Invoice"
-msgstr "Otkazani Racuni"
+msgstr "PoniÅ¡ten raÄun"
#. module: point_of_sale
#: view:report.transaction.pos:0
@@ -835,7 +835,7 @@ msgstr "POS"
#. module: point_of_sale
#: model:ir.actions.report.xml,name:point_of_sale.pos_lines_report
msgid "Pos Lines"
-msgstr ""
+msgstr "Blagajne"
#. module: point_of_sale
#: rml:pos.invoice:0
@@ -850,7 +850,7 @@ msgstr "Br. Komada"
#. module: point_of_sale
#: wizard_field:pos.config.journal,init,default_journal_gift:0
msgid "Default gift journal"
-msgstr ""
+msgstr "Glavna Knjiga Poklona"
#. module: point_of_sale
#: model:ir.actions.wizard,name:point_of_sale.pos_payment
@@ -861,12 +861,12 @@ msgstr "Isplata"
#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.menu_action_pos_order_tree3
msgid "All orders"
-msgstr "Sve porudzbine"
+msgstr "Svi Nalozi"
#. module: point_of_sale
#: wizard_field:pos.sale.get,init,picking_id:0
msgid "Sale Order"
-msgstr "Narudžbenica"
+msgstr "Nalog za prodaju"
#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.menu_trans_pos_tree_month
@@ -891,7 +891,7 @@ msgstr "Isplate"
#. module: point_of_sale
#: rml:pos.invoice:0
msgid "Supplier Refund"
-msgstr "Povraćaj dobavljaÄa"
+msgstr "Povrat DobavljaÄu"
#. module: point_of_sale
#: field:pos.config.journal,name:0
@@ -929,7 +929,7 @@ msgstr "Radnje"
#. module: point_of_sale
#: help:pos.order,salesman_id:0
msgid "This is the salesman actually making the order."
-msgstr ""
+msgstr "Ovaj prodavac upravo pravi nalog"
#. module: point_of_sale
#: rml:pos.details:0
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 7453682f56685b3319e749bc74bc7e942c2df518..4d277d216c8fa509ac4ad896ff47beba7df5c797 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -3,7 +3,7 @@
<data>
<menuitem name="Point of Sale" id="menu_point_root" sequence="21"
icon="terp-partner"
- groups="group_pos_manager,group_pos_user,base.group_system"/>
+ groups="group_pos_manager,group_pos_user"/>
<record model="ir.ui.view" id="view_pos_pos_form">
<field name="name">pos.order</field>
@@ -150,7 +150,7 @@
</record>
<menuitem name="Daily Operations" id="menu_point_of_sale" parent="menu_point_root" sequence="1" />
- <menuitem name="Sales Order" parent="menu_point_of_sale" id="menu_point_ofsale" action="action_pos_pos_form" sequence="1" groups="group_pos_manager,group_pos_user,base.group_system"/>
+ <menuitem name="Sales Order" parent="menu_point_of_sale" id="menu_point_ofsale" action="action_pos_pos_form" sequence="1" groups="group_pos_manager,group_pos_user"/>
<menuitem name="Products" id="menu_point_of_sale_product" parent="menu_point_root" sequence="15" />
<menuitem action="product.product_normal_action" id="menu_pos_products" parent="menu_point_of_sale_product" sequence="2" name="Products"/>
@@ -697,7 +697,7 @@
<group colspan="2" col="2" name="Prices">
<separator string="Prices" colspan="2"/>
<field name="lst_price"/>
- <field name="standard_price"/>
+ <field name="standard_price"/>
</group>
</page>
</notebook>
@@ -706,7 +706,7 @@
</record>
<menuitem name="Configuration" parent="menu_point_root"
- id="menu_point_config_product" sequence="25" groups="base.group_system,group_pos_manager"/>
+ id="menu_point_config_product" sequence="25" groups="group_pos_manager"/>
<record model="ir.actions.act_window" id="action_product_input">
<field name="name">Products</field>
@@ -732,7 +732,7 @@
parent="menu_point_config_product"
action="action_product_input"
id="products_for_input_operations"
- groups="base.group_system,group_pos_manager"/>
+ groups="group_pos_manager"/>
<record model="ir.actions.act_window" id="action_product_output">
<field name="name">Products</field>
@@ -758,7 +758,7 @@
parent="menu_point_config_product"
action="action_product_output"
id="products_for_output_operations"
- groups="base.group_system,group_pos_manager"/>
+ groups="group_pos_manager"/>
<menuitem
name="Input Operations" parent="menu_point_of_sale"
@@ -796,7 +796,7 @@
</record>
<!-- Miscelleanous Operations/Reporting -->
- <menuitem name="Reporting" parent="menu_point_root" id="menu_point_rep" sequence="20" groups="group_pos_manager,base.group_system"/>
+ <menuitem name="Reporting" parent="menu_point_root" id="menu_point_rep" sequence="20" groups="group_pos_manager"/>
<!-- Invoice -->
<record model="ir.actions.act_window" id="action_pos_invoice">
diff --git a/addons/point_of_sale/report/pos_details.py b/addons/point_of_sale/report/pos_details.py
index 69a691a14f9d8cb151cc07edad64c10f874fc95c..0e77dd391888d31299b279b39048a7bea15165f7 100644
--- a/addons/point_of_sale/report/pos_details.py
+++ b/addons/point_of_sale/report/pos_details.py
@@ -75,8 +75,8 @@ class pos_details(report_sxw.rml_parse):
def _get_sum_invoice_2(self,form,user):
res2=[]
self.cr.execute ("select sum(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0))" \
- "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt ,res_users as ru,res_company as rc " \
- "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and po.state in('invoiced') " \
+ "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt ,res_users as ru,res_company as rc,account_invoice as ai " \
+ "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and ai.id=po.invoice_id " \
"and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date >= %s and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date <= %s " \
"and po.user_id = ru.id and rc.id = %s and ru.id = %s " \
,(form['date_start'],form['date_end'],str(user.company_id.id),str(self.uid)))
@@ -88,7 +88,7 @@ class pos_details(report_sxw.rml_parse):
res3=[]
self.cr.execute ("select sum(pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0))" \
"from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt, res_users as ru,res_company as rc " \
- "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and po.state in('paid','invoiced','done') " \
+ "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and po.state IN ('paid','invoiced','done') " \
"and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date >= %s and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date <= %s " \
"and po.user_id = ru.id and rc.id = %s and ru.id = %s " \
,(form['date_start'],form['date_end'],str(user.company_id.id),str(self.uid)))
@@ -96,6 +96,19 @@ class pos_details(report_sxw.rml_parse):
self.total_paid=res3[0]
return res3[0] or False
+ def _get_sum_dis_2(self,form,user):
+ res4=[]
+ self.cr.execute ("select sum(pol.price_ded * pol.qty)" \
+ "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt ,res_users as ru,res_company as rc " \
+ "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and po.state IN ('paid') " \
+ "and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date >= %s and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date <= %s " \
+ "and po.user_id = ru.id and rc.id = %s and ru.id = %s " \
+ ,(form['date_start'],form['date_end'],str(user.company_id.id),str(self.uid)))
+ res4=self.cr.fetchone()
+ self.total_invoiced=res4[0]
+ return res4[0] or False
+
+
def _get_sum_discount(self, objects):
#code for the sum of discount value
return reduce(lambda acc, object:
@@ -187,7 +200,7 @@ class pos_details(report_sxw.rml_parse):
'time': time,
'strip_name': self._strip_name,
'getpayments': self._get_payments,
- 'getsumdisc': self._get_sum_discount,
+ 'getsumdisc': self._get_sum_dis_2,
'gettotalofthaday': self._total_of_the_day,
'gettaxamount': self._get_tax_amount,
'getperiod': self._get_period,
diff --git a/addons/point_of_sale/report/pos_details.rml b/addons/point_of_sale/report/pos_details.rml
index 388c30a42ce9d0f41aae4f5b467aaec427760c89..ae9d7252984dc7b110f233b8b137c66c10b54ae0 100644
--- a/addons/point_of_sale/report/pos_details.rml
+++ b/addons/point_of_sale/report/pos_details.rml
@@ -247,7 +247,7 @@
<para style="terp_default_Centre_9">[[ formatLang(line_ids['discount']) ]]</para>
</td>
<td>
- <para style="terp_default_9">[[ getinvoice(line_ids['invoice_id'],user) or removeParentNode('font') ]]</para>
+ <para style="terp_default_Centre_9">[[ getinvoice(line_ids['invoice_id'],user) or removeParentNode('font') ]]</para>
</td>
</tr>
</blockTable>
@@ -332,7 +332,7 @@
<blockTable colWidths="257.0,254.0" style="Table7">
<tr>
<td>
- <para style="terp_default_Bold_9">Sales total</para>
+ <para style="terp_default_Bold_9">Sales total(Revenue)</para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ formatLang(getsalestotal2(data['form'],user)) ]] [[ company.currency_id.symbol ]]</para>
@@ -359,7 +359,7 @@
<para style="terp_default_Bold_9">Total discount</para>
</td>
<td>
- <para style="terp_default_Right_9_Bold">[[ formatLang(getsumdisc(objects)) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9_Bold">[[ formatLang(getsumdisc(data['form'],user)) ]] [[ company.currency_id.symbol ]]</para>
</td>
</tr>
<tr>
diff --git a/addons/point_of_sale/security/ir.model.access.csv b/addons/point_of_sale/security/ir.model.access.csv
index 70a98128c2a8151cdf14eeac9a4ef76a057e5bc2..db62c9c8361ece7c826027adb54e2699592d913b 100644
--- a/addons/point_of_sale/security/ir.model.access.csv
+++ b/addons/point_of_sale/security/ir.model.access.csv
@@ -21,11 +21,9 @@
"access_report_sales_by_margin_pos","report.sales.by.margin.pos","model_report_sales_by_margin_pos","group_pos_user",1,0,0,0
"access_report_sales_by_margin_pos_month","report.sales.by.margin.pos.month","model_report_sales_by_margin_pos_month","group_pos_user",1,0,0,0
"access_report_pos_order","report.pos.order","model_report_pos_order","group_pos_user",1,1,1,1
-"access_report_pos_order_system","report.pos.order.system","model_report_pos_order","base.group_system",1,1,1,1
"access_report_pos_order","report.pos.order","model_report_pos_order","group_pos_manager",1,1,1,1
"access_account_bank_statement","account.bank.statement","account.model_account_bank_statement","group_pos_user",1,1,1,0
"access_account_bank_statement_manager","account.bank.statement manager","account.model_account_bank_statement","group_pos_manager",1,1,1,1
-"access_account_bank_statement_system","account.bank.statement system","account.model_account_bank_statement","base.group_system",1,0,0,0
"access_account_bank_statement_line","account.bank.statement.line","account.model_account_bank_statement_line","group_pos_user",1,1,1,0
"access_account_invoice_pos","account.invoice pos user","account.model_account_invoice","group_pos_user",1,1,1,0
"access_account_invoice_pos_manager","account.invoice pos manager","account.model_account_invoice","group_pos_manager",1,0,0,0
@@ -35,10 +33,8 @@
"access_account_invoice_tax_pos_manager","account.invoice.tax pos manager","account.model_account_invoice_tax","group_pos_manager",1,0,0,0
"access_account_period_pos","account.period pos user","account.model_account_period","group_pos_user",1,1,1,0
"access_account_period_pos_manager","account.period pos manager","account.model_account_period","group_pos_manager",1,0,0,0
-"access_account_period_pos_system","account.period pos system","account.model_account_period","base.group_system",1,0,0,0
"access_account_fiscalyear_pos_user","account.fiscalyear user","account.model_account_fiscalyear","group_pos_user",1,1,1,0
"access_account_fiscalyear_pos_manager","account.fiscalyear manager","account.model_account_fiscalyear","group_pos_manager",1,0,0,0
-"access_account_fiscalyear_pos_system","account.fiscalyear user","account.model_account_fiscalyear","base.group_system",1,0,0,0
"access_account_cashbox_line","account.cashbox.line","account.model_account_cashbox_line","group_pos_user",1,1,1,0
"access_account_cashbox_line_manager","account.cashbox.line manager","account.model_account_cashbox_line","group_pos_manager",1,1,1,1
"access_product_product","product.product","product.model_product_product","group_pos_user",1,0,0,0
@@ -50,31 +46,20 @@
"access_account_move","account.move","account.model_account_move","group_pos_manager",1,0,0,0
"access_account_journal","account.journal","account.model_account_journal","group_pos_user",1,1,1,0
"access_account_journal_manager","account.journal manager","account.model_account_journal","group_pos_manager",1,0,0,0
-"access_account_journal_system","account.journal system","account.model_account_journal","base.group_system",1,0,0,0
"access_account_journal_period_user","account.journal.period user","account.model_account_journal_period","group_pos_user",1,1,1,1
"access_account_journal_period_manager","account.journal.period manager","account.model_account_journal_period","group_pos_manager",1,0,0,0
"access_account_journal_view","account.journal.view","account.model_account_journal_view","group_pos_user",1,1,1,0
"access_account_journal_view_manager","account.journal.view manager","account.model_account_journal_view","group_pos_manager",1,0,0,0
-"access_account_journal_view_system","account.journal.view system","account.model_account_journal_view","base.group_system",1,0,0,0
"access_account_analytic_line","account.analytic.line","analytic.model_account_analytic_line","group_pos_user",1,1,1,0
"access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","group_pos_user",1,1,1,0
"access_account_journal_column","account.journal.column","account.model_account_journal_column","group_pos_user",1,1,1,0
"access_account_journal_column_manager","account.journal.column manager","account.model_account_journal_column","group_pos_manager",1,0,0,0
-"access_account_journal_column_system","account.journal.column system","account.model_account_journal_column","base.group_system",1,0,0,0
"access_report_check_register","report.cash.register","model_report_cash_register","group_pos_manager",1,1,1,1
-"access_product_product_pos","product.product.pos","product.model_product_product","base.group_system",1,0,0,0
-"access_product_template_pos","product.template pos","product.model_product_template","base.group_system",1,1,1,1
"access_ir_property_pos_manager","ir.property manager","base.model_ir_property","group_pos_manager",1,1,1,1
-"access_pos_order_system","pos.order system","model_pos_order","base.group_system",1,0,0,0
-"access_pos_order_line_system","pos.order.line system","model_pos_order_line","base.group_system",1,0,0,0
"access_account_bank_statement_line_manager","account.bank.statement.line manager","account.model_account_bank_statement_line","group_pos_manager",1,1,1,1
"access_account_invoice_manager","account.invoice manager","account.model_account_invoice","group_pos_manager",1,1,1,1
-"access_report_transaction_pos_system","report.transaction.pos system","model_report_transaction_pos","base.group_system",1,1,1,1
-"access_account_bank_statement_line_system","account.bank.statement.line system","account.model_account_bank_statement_line","base.group_system",1,0,0,0
-"access_product_product_supplierinfo","product.supplierinfo system","product.model_product_supplierinfo","base.group_system",1,0,0,0
"access_product_product_supplierinfo_manager","product.supplierinfo manager","product.model_product_supplierinfo","group_pos_manager",1,0,0,0
"access_product_product_supplierinfo_user","product.supplierinfo user","product.model_product_supplierinfo","group_pos_user",1,0,0,0
-"access_product_product_packaging_system","product.packaging system","product.model_product_packaging","base.group_system",1,0,0,0
"access_product_product_packaging_user","product.packaging user","product.model_product_packaging","group_pos_user",1,0,0,0
"access_product_product_packaging_manager","product.packaging manager","product.model_product_packaging","group_pos_manager",1,0,0,0
"access_account_sequence_fiscalyear_manager","account.sequence.fiscalyear manager","account.model_account_sequence_fiscalyear","group_pos_manager",1,0,0,0
diff --git a/addons/point_of_sale/wizard/pos_payment.xml b/addons/point_of_sale/wizard/pos_payment.xml
index 58b4dc447cd41b261d28372c14e83929916d0109..f0536ae0ac892c2cd22934ecb271fdb8873c3b60 100644
--- a/addons/point_of_sale/wizard/pos_payment.xml
+++ b/addons/point_of_sale/wizard/pos_payment.xml
@@ -1,48 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
-
+
<!-- Select an Open Sale Order -->
-
+
<record id="view_pos_payment" model="ir.ui.view">
<field name="name">Add payment :</field>
<field name="model">pos.make.payment</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Add payment :">
- <group colspan="8" col="8" width="660" height="230">
- <group colspan="4" col="4" width="150">
- <label align="0.0" string="The register must be opened to be able to execute a payment." colspan="2"/>
- <separator string="" orientation="vertical" rowspan="6"/>
- </group>
- <group colspan="4" col="4">
- <field name="journal"/>
- <field name="amount"/>
- <field name="payment_date"/>
- <!--field name="payment_name" /-->
- <field name="invoice_wanted"/>
- <field name="num_sale"/>
- <field name="is_acc"/>
- <group attrs="{'invisible':[('is_acc','=',False)]}" colspan="4" col="2">
- <field name="product_id" attrs="{'required':[('is_acc', '=', True)]}" domain="[('type','=','service')]" on_change="onchange_product_id(product_id, amount)"/>
- </group>
- <newline/>
- <group attrs="{'invisible':[('invoice_wanted','=',False)]}" colspan="4">
- <field name="partner_id" attrs="{'required':[('invoice_wanted', '=', True)]}" colspan="2"/>
- <field name="pricelist_id" attrs="{'required':[('invoice_wanted', '=', True)]}" colspan="2"/>
- </group>
- </group>
- <separator colspan="8"/>
- <group col="4" colspan="4"/>
- <group col="4" colspan="4">
- <group col="2" colspan="2"/>
- <group col="2" colspan="2">
- <button icon="gtk-stop" special="cancel" string="Cancel"/>
- <button name="check" string="Make Payment" colspan="1" type="object" icon="terp-dolar"/>
- </group>
- </group>
- </group>
- </form>
+ <group colspan="6" col="6" >
+ <group colspan="3" >
+ <separator string="The register must be opened to be able to execute a payment." />
+ </group>
+ <newline/>
+ <group colspan="6">
+ <field name="journal"/>
+ <field name="payment_date"/>
+ <field name="num_sale" />
+ <field name="amount" />
+ <!--field name="payment_name" /-->
+ <field name="invoice_wanted" />
+ <field name="is_acc" />
+ </group>
+ <group attrs="{'invisible':[('is_acc','=',False)]}" colspan="3" >
+ <field name="product_id" attrs="{'required':[('is_acc', '=', True)]}" domain="[('type','=','service')]" on_change="onchange_product_id(product_id, amount)"/>
+ </group>
+ <newline/>
+ <group attrs="{'invisible':[('invoice_wanted','=',False)]}" colspan="3">
+ <field name="partner_id" attrs="{'required':[('invoice_wanted', '=', True)]}" colspan="2"/>
+ <field name="pricelist_id" attrs="{'required':[('invoice_wanted', '=', True)]}" colspan="2"/>
+ </group>
+ <separator colspan="6"/>
+ <group colspan="3"/>
+ <group colspan="3">
+ <group colspan="2"/>
+ <group colspan="2">
+ <button icon="gtk-stop" special="cancel" string="Cancel"/>
+ <button name="check" string="Make Payment" colspan="1" type="object" icon="terp-dolar"/>
+ </group>
+ </group>
+ </group>
+ </form>
</field>
</record>
<record id="action_pos_payment" model="ir.actions.act_window">
@@ -54,5 +54,5 @@
<field name="target">new</field>
</record>
</data>
-</openerp>
-
+</openerp>
+
diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
index 99e697ea826f84b11185f6f47b24f1f213274ec0..abeadfc993177dd3e4e106c982165f359c605c79 100644
--- a/addons/point_of_sale/wizard/pos_return.py
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -143,6 +143,23 @@ class pos_return(osv.osv_memory):
@return: Return the add product form again for adding more product
"""
+ current_rec = self.read(cr, uid, data[0], context=context)
+ order_obj =self.pool.get('pos.order')
+ line_obj = self.pool.get('pos.order.line')
+ pos_current = order_obj.browse(cr, uid, context.get('active_id'))
+ pos_line_ids = pos_current.lines
+ if pos_line_ids:
+ for pos_line in pos_line_ids:
+ line_field = "return"+str(pos_line.id)
+ pos_list = current_rec.keys()
+ newline_vals = {}
+ if line_field in pos_list :
+ less_qty = current_rec.get(line_field)
+ pos_cur_line = line_obj.browse(cr, uid, pos_line.id, context=context)
+ qty = pos_cur_line.qty
+ qty = qty - less_qty
+ newline_vals.update({'qty':qty})
+ line_obj.write(cr, uid, pos_line.id, newline_vals, context=context)
return {
'name': _('Add Product'),
'view_type': 'form',
diff --git a/addons/process/i18n/sr.po b/addons/process/i18n/sr.po
index 503559cf02d1f1431090189d4ff21a523126b869..a27778e2c9561116fd63e9003c1cf5fc93f67066 100644
--- a/addons/process/i18n/sr.po
+++ b/addons/process/i18n/sr.po
@@ -8,67 +8,68 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-08 10:39+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-10-15 08:27+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Serbian <sr@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-09-29 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: process
#: view:process.node:0
#: view:process.process:0
msgid "Process Node"
-msgstr ""
+msgstr "Procesni Ävor"
#. module: process
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
+"Ime objekta mora da poÄinje sa x_ i ne sme da sadrži specijalne karaktere !"
#. module: process
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Pogrešno ime modela u definiciji akcije."
#. module: process
#: view:process.node:0
#: view:process.process:0
#: view:process.transition:0
msgid "Roles from Workflow"
-msgstr ""
+msgstr "Uloge iz TokaPosla"
#. module: process
#: field:process.node,menu_id:0
msgid "Related Menu"
-msgstr ""
+msgstr "Referentni Meni"
#. module: process
#: view:process.node:0
#: view:process.process:0
#: field:process.transition,action_ids:0
msgid "Buttons"
-msgstr ""
+msgstr "Dugmad"
#. module: process
#: selection:process.node,kind:0
msgid "State"
-msgstr ""
+msgstr "Stanje"
#. module: process
#: view:process.node:0
#: view:process.process:0
#: view:process.transition:0
msgid "Details"
-msgstr ""
+msgstr "Detalji"
#. module: process
#: field:process.node,help_url:0
msgid "Help URL"
-msgstr ""
+msgstr "URL za Pomoc"
#. module: process
#: model:ir.actions.act_window,name:process.action_process_node_form
@@ -77,84 +78,84 @@ msgstr ""
#: view:process.node:0
#: view:process.process:0
msgid "Process Nodes"
-msgstr ""
+msgstr "Procesna ÄvoriÅ¡ta"
#. module: process
#: view:process.process:0
#: field:process.process,node_ids:0
msgid "Nodes"
-msgstr ""
+msgstr "Čvorišta"
#. module: process
#: view:process.node:0
#: field:process.node,condition_ids:0
#: view:process.process:0
msgid "Conditions"
-msgstr ""
+msgstr "Uslovi"
#. module: process
#: field:process.condition,node_id:0
msgid "Node"
-msgstr ""
+msgstr "Čvorište"
#. module: process
#: selection:process.transition.action,state:0
msgid "Workflow Trigger"
-msgstr ""
+msgstr "OkidaÄ TokaPosla"
#. module: process
#: field:process.transition,note:0
msgid "Description"
-msgstr ""
+msgstr "Opis"
#. module: process
#: model:ir.model,name:process.model_process_transition_action
msgid "Process Transitions Actions"
-msgstr ""
+msgstr "Akcije Procesa Tranzicije"
#. module: process
#: field:process.condition,model_id:0
#: field:process.node,model_id:0
#: field:process.process,model_id:0
msgid "Object"
-msgstr ""
+msgstr "objekat"
#. module: process
#: field:process.transition,source_node_id:0
msgid "Source Node"
-msgstr ""
+msgstr "pocetno Čvorište"
#. module: process
#: field:process.transition,transition_ids:0
msgid "Workflow Transitions"
-msgstr ""
+msgstr "TRanzicije TokaPosla"
#. module: process
#: field:process.transition.action,action:0
msgid "Action ID"
-msgstr ""
+msgstr "Sifra Akcije"
#. module: process
#: view:process.transition:0
msgid "Process Transition"
-msgstr ""
+msgstr "Prelazni Proces"
#. module: process
#: model:ir.model,name:process.model_process_condition
#: view:process.node:0
#: view:process.process:0
msgid "Condition"
-msgstr ""
+msgstr "uslov"
#. module: process
#: selection:process.transition.action,state:0
msgid "Dummy"
-msgstr ""
+msgstr "Lažni"
#. module: process
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nevažeći XML za pregled arhitekture"
#. module: process
#: field:process.condition,name:0
@@ -163,80 +164,80 @@ msgstr ""
#: field:process.transition,name:0
#: field:process.transition.action,name:0
msgid "Name"
-msgstr ""
+msgstr "Ime"
#. module: process
#: field:process.transition,role_ids:0
msgid "Roles"
-msgstr ""
+msgstr "Uloge"
#. module: process
#: field:process.node,transition_in:0
msgid "Starting Transitions"
-msgstr ""
+msgstr "Startni Prelazi"
#. module: process
#: field:process.node,note:0
#: field:process.process,note:0
#: view:process.transition:0
msgid "Notes"
-msgstr ""
+msgstr "Napomene"
#. module: process
#: view:process.node:0
#: view:process.process:0
#: field:process.transition.action,transition_id:0
msgid "Transition"
-msgstr ""
+msgstr "Prelaz"
#. module: process
#: view:process.node:0
#: view:process.process:0
#: view:process.transition:0
msgid "Roles Required"
-msgstr ""
+msgstr "Neophodne Uloge"
#. module: process
#: view:process.node:0
#: view:process.process:0
msgid "Extra Information"
-msgstr ""
+msgstr "Dodatne INformacije"
#. module: process
#: selection:process.node,kind:0
#: field:process.node,subflow_id:0
msgid "Subflow"
-msgstr ""
+msgstr "Podtok"
#. module: process
#: field:process.process,active:0
msgid "Active"
-msgstr ""
+msgstr "Aktivan"
#. module: process
#: selection:process.transition.action,state:0
msgid "Action"
-msgstr ""
+msgstr "Радња"
#. module: process
#: field:process.node,flow_start:0
msgid "Starting Flow"
-msgstr ""
+msgstr "Startni tok"
#. module: process
#: field:process.condition,model_states:0
msgid "Expression"
-msgstr ""
+msgstr "Izraz"
#. module: process
#: field:process.transition.action,state:0
msgid "Type"
-msgstr ""
+msgstr "Tip"
#. module: process
#: field:process.node,transition_out:0
msgid "Ending Transitions"
-msgstr ""
+msgstr "Zavrsni Prelazi"
#. module: process
#: model:ir.actions.act_window,name:process.action_process_form
@@ -245,60 +246,60 @@ msgstr ""
#: field:process.node,process_id:0
#: view:process.process:0
msgid "Process"
-msgstr ""
+msgstr "Proces"
#. module: process
#: model:ir.module.module,shortdesc:process.module_meta_information
msgid "Enterprise Process"
-msgstr ""
+msgstr "Proces preduzeca"
#. module: process
#: view:process.node:0
#: view:process.process:0
#: view:process.transition:0
msgid "Actions"
-msgstr ""
+msgstr "Radnje"
#. module: process
#: field:process.node,model_states:0
msgid "States Expression"
-msgstr ""
+msgstr "Izraz Stanja"
#. module: process
#: model:ir.actions.act_window,name:process.action_process_transition_form
#: model:ir.model,name:process.model_process_transition
#: model:ir.ui.menu,name:process.menu_process_transition_form
msgid "Process Transitions"
-msgstr ""
+msgstr "Prelazni Proces"
#. module: process
#: field:process.transition,target_node_id:0
msgid "Target Node"
-msgstr ""
+msgstr "Ciljno ÄvoriÅ¡te"
#. module: process
#: field:process.node,kind:0
msgid "Kind of Node"
-msgstr ""
+msgstr "Vrsta ÄvoriÅ¡ta"
#. module: process
#: view:process.node:0
#: view:process.process:0
msgid "Outgoing Transitions"
-msgstr ""
+msgstr "Odlazni prelazi"
#. module: process
#: model:ir.ui.menu,name:process.menu_process
msgid "Enterprise Processes"
-msgstr ""
+msgstr "Preocesi Preduzeca"
#. module: process
#: view:process.node:0
#: view:process.process:0
msgid "Transitions"
-msgstr ""
+msgstr "Prelazi"
#. module: process
#: selection:process.transition.action,state:0
msgid "Object Method"
-msgstr ""
+msgstr "Metoda Objekta"
diff --git a/addons/process/process.py b/addons/process/process.py
index 479b8748ff30cc7cc02545e0967ef8ca022769fd..544ff73e761a3b8622e68a0c31725845c91926d1 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -30,16 +30,12 @@ class Env(dict):
self.__usr = user
def __getitem__(self, name):
-
if name in ('__obj', '__user'):
- return super(ExprContext, self).__getitem__(name)
-
+ return super(Env, self).__getitem__(name)
if name == 'user':
return self.__user
-
if name == 'object':
return self.__obj
-
return self.__obj[name]
class process_process(osv.osv):
diff --git a/addons/process/security/ir.model.access.csv b/addons/process/security/ir.model.access.csv
index 064f0454d022ab2901a1d20a8c6772d078f5e4a9..7356880f47a55eaac994dbf13f99d303092c6c6c 100644
--- a/addons/process/security/ir.model.access.csv
+++ b/addons/process/security/ir.model.access.csv
@@ -4,8 +4,3 @@
"access_process_transition","process.transition","model_process_transition","base.group_user",1,0,0,0
"access_process_transition_action","process.transition.action","model_process_transition_action","base.group_user",1,0,0,0
"access_process_condition","process.condition","model_process_condition","base.group_user",1,0,0,0
-"access_process_process_manager","process.process manager","model_process_process","base.group_system",1,1,1,1
-"access_process_node_manager","process.node manager","model_process_node","base.group_system",1,1,1,1
-"access_process_transition_manager","process.transition manager","model_process_transition","base.group_system",1,1,1,1
-"access_process_transition_action_manager","process.transition.action manager","model_process_transition_action","base.group_system",1,1,1,1
-"access_process_condition_manager","process.condition manager","model_process_condition","base.group_system",1,1,1,1
diff --git a/addons/procurement/i18n/mn.po b/addons/procurement/i18n/mn.po
index 02d6c295c84b7d94174f41b042a43f33494c44c7..b631a5fa86e8880ccf76de98fea5d889738ffec8 100644
--- a/addons/procurement/i18n/mn.po
+++ b/addons/procurement/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-08-20 08:51+0000\n"
-"PO-Revision-Date: 2010-10-13 07:43+0000\n"
+"PO-Revision-Date: 2010-10-14 07:28+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Mongolian <mn@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-10-14 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-10-15 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: procurement
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 4f0d3530a806c4c0c6f82c1de28edc8480dab417..359586fae7e1f41550a70c62f6071bc1510f0f83 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -335,8 +335,6 @@ class procurement_order(osv.osv):
})
move_obj.action_confirm(cr, uid, [id], context=context)
self.write(cr, uid, [procurement.id], {'move_id': id, 'close_move': 1})
- message = _("Procurement '%s' is running.") % procurement.name
- self.log(cr, uid, procurement.id, message)
self.write(cr, uid, ids, {'state': 'confirmed', 'message': ''})
return True
@@ -370,9 +368,8 @@ class procurement_order(osv.osv):
cr.execute('update procurement_order set message=%s where id=%s',
(_('Not enough stock and no minimum orderpoint rule defined.'),
procurement.id))
- message = _("Procurement '%s' has an exception." \
- "Not enough stock and no minimum orderpoint rule defined.") % \
- procurement.name
+ message = _("Procurement '%s' is in exception: not enough stock.") % \
+ (procurement.name,)
self.log(cr, uid, procurement.id, message)
return ok
@@ -451,8 +448,6 @@ class procurement_order(osv.osv):
if procurement.move_id:
if procurement.close_move and (procurement.move_id.state <> 'done'):
move_obj.action_done(cr, uid, [procurement.move_id.id])
- message = _("Procurement '%s' is done.") % procurement.name
- self.log(cr, uid, procurement.id, message)
res = self.write(cr, uid, ids, {'state': 'done', 'date_close': time.strftime('%Y-%m-%d')})
wf_service = netsvc.LocalService("workflow")
for id in ids:
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 4d54fa256a865b4b78d617950c9d40a5431a8a64..53f84367b178ffee74067773857f6792bcb64d1b 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -132,7 +132,7 @@
<field name="view_id" eval="False"/>
<field name="search_view_id" ref="view_procurement_filter"/>
<field name="context">{'search_default_current':1}</field>
- <field name="help">Procurement Orders represent the need for a certain quantity of products, at a given time, in a given location. Sale Orders are one typical source of Procurement Orders (but these are distinct documents). Depending on the procurement parameters and the products configuration, the procurement engine will attempt to satisfy the need by reserving products from stock, or ordering products from a supplier, or passing a manufacturing order, etc.</field>
+ <field name="help">A procurement order is used to record a need in a specific product at a specific location. They are usually created automatically by the sales orders, the Pull Logistics rules or the minimum stock rules. When the procurement order is confirmed, it creates automatically the necessary operations to fullfil the need: purchase order proposition, manufacturing order, etc.</field>
</record>
<record id="procurement_exceptions" model="ir.actions.act_window">
@@ -235,6 +235,7 @@
<field name="view_type">form</field>
<field name="view_id" ref="view_warehouse_orderpoint_tree"/>
<field name="search_view_id" ref="warehouse_orderpoint_search" />
+ <field name="help">You can define your minimum stock rules, so that OpenERP will trigger automatically the propositions of manufacturing or purchase orders according to the stock level. Once the virtual stock of a product (=stock on hand minus all confirmed orders and reservations) is bellow the minimum quantity, OpenERP will generate a procurement request in order to fullfil the stock up to the maximum quantity.</field>
</record>
<act_window
diff --git a/addons/procurement/security/ir.model.access.csv b/addons/procurement/security/ir.model.access.csv
index b1dadfb3ee04ebaddd7863a1face21399d35fd7d..382543c9df40afe2812a43181684b0eabf9a2913 100644
--- a/addons/procurement/security/ir.model.access.csv
+++ b/addons/procurement/security/ir.model.access.csv
@@ -1,8 +1,9 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_procurement","procurement.order","model_procurement_order","base.group_user",1,0,0,0
-"access_stock_warehouse_orderpoint","stock.warehouse.orderpoint","model_stock_warehouse_orderpoint","stock.group_stock_manager",1,1,1,1
+"access_procurement_stock_manager","procurement.order stock.manager","model_procurement_order","stock.group_stock_manager",1,1,1,1
+"access_procurement_stock_user","procurement.order stock.user","model_procurement_order","stock.group_stock_user",1,1,1,1
+"access_stock_warehouse_orderpoint","stock.warehouse.orderpoint","model_stock_warehouse_orderpoint","stock.group_stock_user",1,1,1,1
"access_stock_warehouse_orderpoint_system","stock.warehouse.orderpoint system","model_stock_warehouse_orderpoint","stock.group_stock_manager",1,1,1,1
-"access_stock_warehouse_orderpoint_user","stock.warehouse.orderpoint user","model_stock_warehouse_orderpoint","base.group_system",1,0,0,0
"access_mrp_property_group","mrp.property.group","model_mrp_property_group","stock.group_stock_manager",1,1,1,1
"access_mrp_property","mrp.property","model_mrp_property","stock.group_stock_manager",1,1,1,1
"access_mrp_property_group","mrp.property.group","model_mrp_property_group","base.group_user",1,0,0,0
diff --git a/addons/procurement/wizard/schedulers_all_view.xml b/addons/procurement/wizard/schedulers_all_view.xml
index 40c72ee68c72ed3f8454f9908159d1a194176b44..00b6225101ebb4a24016f36c8614ca219fe0b6e7 100644
--- a/addons/procurement/wizard/schedulers_all_view.xml
+++ b/addons/procurement/wizard/schedulers_all_view.xml
@@ -10,7 +10,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Scheduler Parameters">
- <label string="Wizard run all the procurements, and generate task, production order or purchase order based on the product type" colspan="4"/>
+ <label string="This wizard allows you to run all procurement, production and/or purchase orders that should be processed based on their configuration. By default, the scheduler is launched automatically every night by OpenERP. You can use this menu to force it to be launched now. Note that it runs in the background, you may have to wait for a few minutes until it has finished computing." colspan="4"/>
<separator colspan="4"/>
<field name="automatic"/>
<separator colspan="4"/>
diff --git a/addons/product/i18n/sr.po b/addons/product/i18n/sr.po
index 2a17ab4b5a710fa620bf9327e76f3daf27afc57f..8cc0f2990fa0029f12d491ca347e56440b37ba9b 100644
--- a/addons/product/i18n/sr.po
+++ b/addons/product/i18n/sr.po
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-09 07:17+0000\n"
-"Last-Translator: Sonja Sardelić <sardelic.sonja@gmail.com>\n"
+"PO-Revision-Date: 2010-10-16 08:45+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Serbian <sr@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-09-29 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-10-17 04:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product
#: view:product.pricelist.item:0
msgid "Max. Margin"
-msgstr ""
+msgstr "Maks. marža"
#. module: product
#: view:product.pricelist.item:0
@@ -121,7 +121,7 @@ msgstr "Obezbeđene metode"
#. module: product
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Pogrešno ime modela u definiciji akcije."
#. module: product
#: model:process.process,name:product.process_process_productprocess0
@@ -197,7 +197,7 @@ msgstr "Zalihe proizvoda"
#. module: product
#: model:product.category,name:product.product_category_services
msgid "Services"
-msgstr "Servisi"
+msgstr "Usluge"
#. module: product
#: help:product.template,list_price:0
@@ -230,12 +230,12 @@ msgstr "Datum od kada je ova verzija cenovnika validna."
#. module: product
#: field:product.product,incoming_qty:0
msgid "Incoming"
-msgstr "Dolazno"
+msgstr "Ulazna"
#. module: product
#: selection:product.template,procure_method:0
msgid "Make to Stock"
-msgstr "Pravljenje zaliha"
+msgstr "Prebaci na zalihu"
#. module: product
#: view:product.product:0
@@ -246,7 +246,7 @@ msgstr "Težina"
#. module: product
#: model:product.template,name:product.product_product_fan2_product_template
msgid "Silent fan"
-msgstr ""
+msgstr "Tihi ventilator"
#. module: product
#: help:product.template,supply_method:0
@@ -276,7 +276,7 @@ msgstr "Prodajni cenovnik"
#. module: product
#: field:product.pricelist.item,base_pricelist_id:0
msgid "If Other Pricelist"
-msgstr ""
+msgstr "Ako je drugi cjenik"
#. module: product
#: model:ir.actions.act_window,name:product.product_normal_action
@@ -294,7 +294,7 @@ msgid ""
"Rounding is applied after the discount and before the surcharge.\n"
"To have prices that end in 9.99, set rounding 10, surcharge -0.01"
msgstr ""
-"Postavite cenu tako da je ona višestruka ova vrednost.\n"
+"Postavlja cenu tako da je ona višestruka vrednost ove vrednosti.\n"
"Zaokruženje se primenjuje nakon popusta a pre poskupljenja.\n"
"Ako hoćete da Vam se cena završava sa 9.99, postavite zaokruženje 10, "
"dodatak -0.01"
@@ -307,7 +307,7 @@ msgstr "Nova cena ="
#. module: product
#: field:product.product,virtual_available:0
msgid "Virtual Stock"
-msgstr "Stvarne zalihe"
+msgstr "Efektivna zaliha"
#. module: product
#: selection:product.template,mes_type:0
@@ -355,7 +355,7 @@ msgstr "Naziv pravila"
#. module: product
#: model:ir.ui.menu,name:product.menu_config_product
msgid "Configuration"
-msgstr "Konfiguracija"
+msgstr "Podešavanje"
#. module: product
#: field:product.packaging,rows:0
@@ -401,7 +401,7 @@ msgstr "Tastatura"
#. module: product
#: field:product.supplierinfo,name:0
msgid "Partner"
-msgstr "Партнер"
+msgstr "Partner"
#. module: product
#: field:product.template,sale_delay:0
@@ -452,7 +452,7 @@ msgstr "Eksplicitno ime pravila za ovu stavku cenovnika."
#. module: product
#: view:product.pricelist.item:0
msgid "Min. Margin"
-msgstr ""
+msgstr "Min. marža"
#. module: product
#: view:product.pricelist.item:0
@@ -467,7 +467,7 @@ msgstr "Procesor AMD Athlon XP 1800+"
#. module: product
#: selection:product.template,state:0
msgid "In Production"
-msgstr "U produkciji"
+msgstr "U proizvodnji"
#. module: product
#: field:product.category,child_id:0
@@ -536,7 +536,7 @@ msgstr "Cenovnici"
#. module: product
#: field:product.supplierinfo,product_name:0
msgid "Partner Product Name"
-msgstr "Naziv proizvoda partnera"
+msgstr "Partnerov naziv proizvoda"
#. module: product
#: view:product.product:0
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 589dfb5f290e5d15791a8c437eae380f6f8d654c..76623dc57102fd882834530112e97c25c8476e96 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -42,6 +42,7 @@
<field name="res_model">product.pricelist.version</field>
<field name="view_type">form</field>
<field name="view_id" ref="product_pricelist_version_tree_view"/>
+ <field name="help">There can be more than one version of a pricelist. If you need to create new versions of a pricelist, you can do it and manage them from here. Some examples of versions: 2010, 2011, Promotion of February 2010, etc.</field>
</record>
<menuitem
action="product_pricelist_action" id="menu_product_pricelist_action"
@@ -163,6 +164,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="product_pricelist_view_search" />
+ <field name="help">A pricelist contains rules to be evaluated in order to compute the purchase or sale price for all the partners assigned to a pricelist. Pricelists have several versions (2010, 2011, Promotion of February 2010, etc.) and each version has several rules. Example: the customer price of this category of product will be based on the supplier price multiplied by 1.80.</field>
</record>
<menuitem
action="product_pricelist_action2" id="menu_product_pricelist_action2"
diff --git a/addons/product/product.py b/addons/product/product.py
index 3e4d48e5c746c937f4a535e6752666153af51d2a..91a823d1a98fa441075f8c2f5b44863327566207 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -283,12 +283,8 @@ class product_template(osv.osv):
return res and res[1] or False
def onchange_uom(self, cursor, user, ids, uom_id,uom_po_id):
- if uom_id and uom_po_id:
- uom_obj=self.pool.get('product.uom')
- uom=uom_obj.browse(cursor,user,[uom_id])[0]
- uom_po=uom_obj.browse(cursor,user,[uom_po_id])[0]
- if uom.category_id.id != uom_po.category_id.id:
- return {'value': {'uom_po_id': uom_id}}
+ if uom_id:
+ return {'value': {'uom_po_id': uom_id}}
return False
_defaults = {
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index b58fa4cc81176564f31e7418209a4a240f2a2c56..d0107c56ffeeb7d35227a7f56b5a4687d6e5c060 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -10,14 +10,14 @@
<field name="arch" type="xml">
<search string="Product">
<filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>
- <filter string="Consumable/Stockable" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]"/>
+ <filter string="Stockable" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]"/>
<separator orientation="vertical"/>
<filter string="To Sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
<filter string="To Purchase" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]" />
<separator orientation="vertical"/>
<field name="default_code"/>
<field name="name"/>
- <field name="categ_id" widget="selection" operator="child_of"/>
+ <field name="categ_id" widget="selection" operator="child_of" groups="base.group_extended"/>
<newline/>
<group expand="0" string="Extended Filters..." groups="base.group_extended">
<field name="pricelist_id" widget="selection" context="{'pricelist': self}" />
@@ -53,7 +53,7 @@
<field name="lst_price"/>
<field name="standard_price"/>
<field name="price" invisible="not context.get('pricelist',False)"/>
- <field name="state"/>
+ <field name="state" groups="base.group_extended"/>
</tree>
</field>
</record>
@@ -90,6 +90,16 @@
<field name="procure_method" groups="base.group_extended"/>
<field name="supply_method"/>
</group>
+ <group colspan="2" col="2">
+ <separator string="Base Prices" colspan="2"/>
+ <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
+ <field name="list_price"/>
+ <newline/>
+ <field name="price_margin" groups="product.group_product_variant"/>
+ <field name="price_extra" groups="product.group_product_variant"/>
+ <newline/>
+ <field groups="base.group_extended" name="cost_method"/>
+ </group>
<group colspan="2" col="2" groups="base.group_extended">
<separator string="Weigths" colspan="2"/>
@@ -98,11 +108,11 @@
<field digits="(14, 3)" name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
</group>
- <group colspan="2" col="2" name="status">
+ <group colspan="2" col="2" name="status" groups="base.group_extended">
<separator string="Status" colspan="2"/>
- <field name="categ_id" select="1"/>
+ <field name="categ_id"/>
<field name="state"/>
- <field groups="base.group_extended" name="product_manager"/>
+ <field name="product_manager"/>
</group>
<group colspan="2" col="2" name="uom">
@@ -140,16 +150,7 @@
</group>
</page>
- <page string="Prices & Suppliers">
- <separator string="Base Prices" colspan="4"/>
- <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
- <field name="list_price"/>
- <newline/>
- <field name="price_margin" groups="product.group_product_variant"/>
- <field name="price_extra" groups="product.group_product_variant"/>
- <newline/>
- <field groups="base.group_extended" name="cost_method"/>
- <newline/>
+ <page string="Suppliers">
<field colspan="4" name="seller_ids" nolabel="1"/>
</page>
<page string="Descriptions">
@@ -193,11 +194,11 @@
<field name="view_type">form</field>
<field name="view_id" ref="product_product_tree_view"/>
<field name="search_view_id" ref="product_search_form_view"/>
- <field name="help">In OpenERP, a product is something you can buy and sell. It can be a raw material, a stockable product, a consumable or a service. The product form contains a detailed information on the products like procurement logistic, sales price, product category, suppliers, etc.</field>
+ <field name="help">You must define a Product for everything you buy or sell. They can be raw materials, stockable products, consumables or services. The Product form contains a detailed information of your products related to procurement logistics, sales price, product category, suppliers and so on.</field>
</record>
- <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9" groups="group_product_manager,base.group_sale_salesman,base.group_system"/>
- <menuitem action="product.product_normal_action" id="product.menu_products" parent="base.menu_product" sequence="1" groups="base.group_sale_salesman,base.group_sale_manager,base.group_system,group_product_manager"/>
+ <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9" groups="group_product_manager,base.group_sale_salesman"/>
+ <menuitem action="product.product_normal_action" id="product.menu_products" parent="base.menu_product" sequence="1" groups="base.group_sale_salesman,base.group_sale_manager,group_product_manager"/>
<record id="product_normal_action_puchased" model="ir.actions.act_window">
<field name="name">Products</field>
@@ -207,6 +208,7 @@
<field name="domain">[('purchase_ok','=',1)]</field>
<field name="view_id" ref="product_product_tree_view"/>
<field name="search_view_id" ref="product_search_form_view"/>
+ <field name="help">Products can be purchased and/or sold. They can be raw materials, stockable products, consumables or services. The Product form contains a detailed information on your products related to procurement logistics, sales price, product category, suppliers and so on.</field>
</record>
<record id="product_category_form_view" model="ir.ui.view">
@@ -252,7 +254,7 @@
<field name="domain">[('parent_id','=',False)]</field>
<field name="view_type">tree</field>
<field name="view_id" ref="product_category_tree_view"/>
- <field name="help">This is a hyerarchical structure of your product's categories, you can enter a category to browse all products in this category and his children.</field>
+ <field name="help">Create and manage product categories you want to be maintained in the system. This allows you to classify your products according to your needs.</field>
</record>
<menuitem
action="product_category_action"
@@ -346,6 +348,7 @@
<field name="res_model">product.uom</field>
<field name="view_type">form</field>
<field name="view_id" ref="product_uom_tree_view"/>
+ <field name="help">Create and manage the units of measure you want to be used in your system. You can define a conversion rate to be used between the several Unit of Measure within the same category.</field>
</record>
<menuitem id="next_id_16" name="Units of Measure" parent="prod_config_main" sequence="65"/>
<menuitem action="product_uom_form_action" id="menu_product_uom_form_action" parent="next_id_16"/>
@@ -366,6 +369,7 @@
<field name="res_model">product.uom.categ</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
+ <field name="help">Create and manage the units of measure categories you want to be used in your system. If several units of measures are in the same category, they can be converted within each other. For example, in the unit of measure category "Time", you will have the following UoM: Hours, Days.</field>
</record>
<menuitem action="product_uom_categ_form_action" id="menu_product_uom_categ_form_action" parent="product.next_id_16" sequence="5"/>
@@ -397,6 +401,7 @@
<field name="res_model">product.ul</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
+ <field name="help">Create and manage your packaging dimensions and types you want to be maintained in your system.</field>
</record>
<menuitem
action="product_ul_form_action" groups="base.group_extended" id="menu_product_ul_form_action" parent="prod_config_main" sequence="3"/>
@@ -526,7 +531,7 @@
<field name="name"/>
<field name="categ_id"/>
<field name="type"/>
- <field name="state"/>
+ <field name="state" groups="base.group_extended"/>
</tree>
</field>
</record>
@@ -555,6 +560,13 @@
<field name="supply_method"/>
</group>
+ <group colspan="2" col="2">
+ <separator string="Base Prices" colspan="2"/>
+ <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
+ <field name="list_price"/>
+ <field groups="base.group_extended" name="cost_method"/>
+ </group>
+
<group colspan="2" col="2" groups="base.group_extended">
<separator string="Weigths" colspan="2"/>
<field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
@@ -562,11 +574,11 @@
<field digits="(14, 3)" name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
</group>
- <group colspan="2" col="2" name="status">
+ <group colspan="2" col="2" name="status" groups="base.group_extended">
<separator string="Status" colspan="2"/>
<field name="categ_id" select="1"/>
<field name="state"/>
- <field groups="base.group_extended" name="product_manager"/>
+ <field name="product_manager"/>
</group>
<group colspan="2" col="2" name="uom">
@@ -601,12 +613,7 @@
</group>
</page>
- <page string="Prices & Suppliers">
- <separator string="Base Prices" colspan="4"/>
- <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
- <field name="list_price"/>
- <field groups="base.group_extended" name="cost_method"/>
- <newline/>
+ <page string="Suppliers">
<field colspan="4" name="seller_ids" nolabel="1"/>
</page>
<page string="Descriptions">
diff --git a/addons/product/security/ir.model.access.csv b/addons/product/security/ir.model.access.csv
index 7b8da0dd675c026dbd28927f7c6b1ddc5890c228..2e4e598fdfe247c882a6287ef8a8d189e5e38212 100644
--- a/addons/product/security/ir.model.access.csv
+++ b/addons/product/security/ir.model.access.csv
@@ -30,14 +30,4 @@
"access_product_pricelist_partner_manager","product.pricelist partner manager","model_product_pricelist","base.group_partner_manager",1,0,0,0
"access_ir_property_group_product_manager","ir_property group_product_manager","base.model_ir_property","product.group_product_manager",1,1,1,1
"access_product_group_res_partner","res_partner group_product_manager","base.model_res_partner","product.group_product_manager",1,1,1,1
-"access_product_price_type","product.price.type ","model_product_price_type","base.group_system",1,1,1,1
-"access_product_pricelist_type","product.pricelist.type ","model_product_pricelist_type","base.group_system",1,1,1,1
-"access_product_pricelist","product.pricelist ","model_product_pricelist","base.group_system",1,1,1,1
-"access_product_pricelist_version","product.pricelist.version ","model_product_pricelist_version","base.group_system",1,1,1,1
-"access_product_pricelist_item","product.pricelist.item ","model_product_pricelist_item","base.group_system",1,1,1,1
-"access_product_uom_categ","product.uom.categ","model_product_uom_categ","base.group_system",1,1,1,1
-"access_product_uom","product.uom","model_product_uom","base.group_system",1,1,1,1
-"access_product_ul_system","product.ul system","model_product_ul","base.group_system",1,1,1,1
-"access_product_product_system","product.product system","model_product_product","base.group_system",1,0,0,0
-"access_product_category_system","product.category.system","model_product_category","base.group_system",1,1,1,1
"access_product_product_employee","product.product employee","model_product_product","base.group_user",1,0,0,0
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index 171cf523b8b340392814834d8eeb2fc31fc51d97..32399358f68d9f178816a273231e1ae0f8c80340 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -6,7 +6,7 @@
<field name="name">Useability / Product UoS View</field>
</record>
<record id="group_product_manager" model="res.groups">
- <field name="name">Product / Manager</field>
+ <field name="name">Product Manager</field>
</record>
<record id="base.group_sale_manager" model="res.groups">
diff --git a/addons/product_expiry/i18n/sr.po b/addons/product_expiry/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..0e23a25ed56f1bacf64e93bfa8c137df80f79622
--- /dev/null
+++ b/addons/product_expiry/i18n/sr.po
@@ -0,0 +1,177 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-06-30 15:09+0000\n"
+"PO-Revision-Date: 2010-10-15 09:06+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-16 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: product_expiry
+#: field:product.product,life_time:0
+msgid "Product lifetime"
+msgstr "Rok Trajanja"
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_from_product_template
+msgid "Ham"
+msgstr "Å unka"
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_lait_product_template
+msgid "Cow milk"
+msgstr "Kravlje Mleko"
+
+#. module: product_expiry
+#: model:ir.module.module,shortdesc:product_expiry.module_meta_information
+msgid "Products date of expiry"
+msgstr "Datum isteka roka trajanja"
+
+#. module: product_expiry
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+"Greška: Podrazumevana JM i kupljena JM moraju da budu u istoj kategoriji."
+
+#. module: product_expiry
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: product_expiry
+#: help:stock.production.lot,life_date:0
+msgid "The date the lot may become dangerous and should not be consumed."
+msgstr ""
+"Datum kada serija proizvoda postaje opasna i ne smije se konzumirati."
+
+#. module: product_expiry
+#: field:stock.production.lot,removal_date:0
+msgid "Removal Date"
+msgstr "Datum uklanjanja"
+
+#. module: product_expiry
+#: model:ir.module.module,description:product_expiry.module_meta_information
+msgid ""
+"Track different dates on products and production lots:\n"
+" - end of life\n"
+" - best before date\n"
+" - removal date\n"
+" - alert date\n"
+"Used, for example, in food industries."
+msgstr ""
+"Pratite razliÄite datume proizvoda i grupa proizvoda:\n"
+"- rok trajanja\n"
+"- najbolje pre datuma\n"
+"- datum uklanjanja\n"
+"- datum alarma\n"
+"Primer korištenja je u industriji prehrane."
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_pain_product_template
+msgid "Bread"
+msgstr "Hleb"
+
+#. module: product_expiry
+#: model:product.uom,name:product_expiry.product_uom_ltr
+#: model:product.uom.categ,name:product_expiry.product_uom_categ_vol
+msgid "LTR"
+msgstr ""
+
+#. module: product_expiry
+#: view:product.product:0
+#: view:stock.production.lot:0
+msgid "Dates"
+msgstr "Datumi"
+
+#. module: product_expiry
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr ""
+"GreÅ¡ka: JU (jedinice usluga) i JM moraju da budu u razliÄitim kategorijama"
+
+#. module: product_expiry
+#: field:stock.production.lot,life_date:0
+msgid "End of Life Date"
+msgstr "Istek roka trajanja"
+
+#. module: product_expiry
+#: field:stock.production.lot,use_date:0
+msgid "Best before Date"
+msgstr "Najbolje pre Datuma"
+
+#. module: product_expiry
+#: help:stock.production.lot,use_date:0
+msgid "The date the lot starts deteriorating without becoming dangerous."
+msgstr ""
+"Datum kada serija proizvoda poÄinje propadati, a da nije opasna po zdravlje."
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_jambon_product_template
+msgid "French cheese Camenbert"
+msgstr "Francuski sir Camembert"
+
+#. module: product_expiry
+#: help:product.product,removal_time:0
+msgid "The number of days before a production lot should be removed."
+msgstr ""
+"Broj dana pre nego Å¡to bi trebalo ukloniti produkcijsku seriju proizvoda."
+
+#. module: product_expiry
+#: field:product.product,use_time:0
+#: field:stock.production.lot,dlc:0
+msgid "Product usetime"
+msgstr "Trajanje proizvoda"
+
+#. module: product_expiry
+#: field:stock.production.lot,alert_date:0
+msgid "Alert Date"
+msgstr "Datum alarma"
+
+#. module: product_expiry
+#: field:product.product,removal_time:0
+msgid "Product removal time"
+msgstr "Vreme uklanjanja proizvoda"
+
+#. module: product_expiry
+#: help:product.product,use_time:0
+msgid ""
+"The number of days before a production lot starts deteriorating without "
+"becoming dangerous."
+msgstr ""
+"Broj dana pre nego proizvodna serija poÄne propadati, a da nije opasna po "
+"zdravlje."
+
+#. module: product_expiry
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Greška: Neispravan EAN kod"
+
+#. module: product_expiry
+#: help:product.product,life_time:0
+msgid ""
+"The number of days before a production lot may become dangerous and should "
+"not be consumed."
+msgstr ""
+"Broj dana pre nego proizvodna serija postane opasna i ne smije se "
+"konzumirati."
+
+#. module: product_expiry
+#: help:stock.production.lot,removal_date:0
+msgid "The date the lot should be removed."
+msgstr "Datum kada bi trebalo ukloniti seriju proizvoda."
+
+#. module: product_expiry
+#: field:product.product,alert_time:0
+msgid "Product alert time"
+msgstr "Vreme alarma proizvoda"
diff --git a/addons/product_manufacturer/i18n/mn.po b/addons/product_manufacturer/i18n/mn.po
index 634d811682c3b53e321be0bd412179b1807542c0..b8c7ddbf7b764e9194b683517bdcd1b95d9ef630 100644
--- a/addons/product_manufacturer/i18n/mn.po
+++ b/addons/product_manufacturer/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-08-12 12:35+0000\n"
-"PO-Revision-Date: 2010-08-13 08:22+0000\n"
-"Last-Translator: ub121 <ubs121@gmail.com>\n"
+"PO-Revision-Date: 2010-10-15 10:00+0000\n"
+"Last-Translator: sugi <Unknown>\n"
"Language-Team: Mongolian <mn@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-09-29 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product_manufacturer
@@ -27,7 +27,7 @@ msgstr ""
#. module: product_manufacturer
#: field:product.product,manufacturer_pref:0
msgid "Manufacturer Product Code"
-msgstr ""
+msgstr "Бараа үйлдвÑрлÑгчийн код"
#. module: product_manufacturer
#: constraint:ir.ui.view:0
@@ -56,7 +56,7 @@ msgstr "Барааны атрибутууд"
#: view:product.manufacturer.attribute:0
#: view:product.product:0
msgid "Product Attributes"
-msgstr ""
+msgstr "Барааны онцлогууд"
#. module: product_manufacturer
#: field:product.manufacturer.attribute,name:0
@@ -88,7 +88,7 @@ msgstr "БүтÑÑгдÑхүүний Ðтрибут & ҮйлдвÑрлÑгч"
#. module: product_manufacturer
#: field:product.product,manufacturer_pname:0
msgid "Manufacturer Product Name"
-msgstr ""
+msgstr "Бараа үйлдвÑрлÑгчийн нÑÑ€"
#. module: product_manufacturer
#: view:product.product:0
diff --git a/addons/product_manufacturer/i18n/sr.po b/addons/product_manufacturer/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..7c6ff6fc36d5a84e694a3c4df2a905bca2bc8020
--- /dev/null
+++ b/addons/product_manufacturer/i18n/sr.po
@@ -0,0 +1,94 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-12 12:35+0000\n"
+"PO-Revision-Date: 2010-10-14 16:37+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-15 04:42+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. 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 "Modul koji dodaje proizvoÄ‘aÄe i atribute na proizvodnu formu"
+
+#. module: product_manufacturer
+#: field:product.product,manufacturer_pref:0
+msgid "Manufacturer Product Code"
+msgstr "ProizvoÄ‘aÄka Å¡ifra artikla"
+
+#. module: product_manufacturer
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: product_manufacturer
+#: view:product.manufacturer.attribute:0
+msgid "Product Template Name"
+msgstr "Naziv predloška proizvoda"
+
+#. module: product_manufacturer
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da poÄinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: product_manufacturer
+#: model:ir.model,name:product_manufacturer.model_product_manufacturer_attribute
+msgid "Product attributes"
+msgstr "Atributi Proizvoda"
+
+#. module: product_manufacturer
+#: view:product.manufacturer.attribute:0
+#: view:product.product:0
+msgid "Product Attributes"
+msgstr "Atributi Proizvoda"
+
+#. module: product_manufacturer
+#: field:product.manufacturer.attribute,name:0
+msgid "Attribute"
+msgstr "Atribut"
+
+#. module: product_manufacturer
+#: model:ir.model,name:product_manufacturer.model_product_product
+#: field:product.manufacturer.attribute,product_id:0
+msgid "Product"
+msgstr "Proizvod"
+
+#. module: product_manufacturer
+#: field:product.manufacturer.attribute,value:0
+msgid "Value"
+msgstr "Vrednost"
+
+#. module: product_manufacturer
+#: view:product.product:0
+#: field:product.product,attribute_ids:0
+msgid "Attributes"
+msgstr "Aтрибути"
+
+#. module: product_manufacturer
+#: model:ir.module.module,shortdesc:product_manufacturer.module_meta_information
+msgid "Products Attributes & Manufacturers"
+msgstr "Atributi i ProizvoÄ‘aÄi Proizvoda"
+
+#. module: product_manufacturer
+#: field:product.product,manufacturer_pname:0
+msgid "Manufacturer Product Name"
+msgstr "ProizvoÄ‘aÄev Naziv Proizvoda"
+
+#. module: product_manufacturer
+#: view:product.product:0
+#: field:product.product,manufacturer:0
+msgid "Manufacturer"
+msgstr "ProizvoÄ‘aÄ"
diff --git a/addons/product_margin/i18n/sr.po b/addons/product_margin/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..c2e99bd28784fbc826b1e1b82bdbe1284a1e023f
--- /dev/null
+++ b/addons/product_margin/i18n/sr.po
@@ -0,0 +1,279 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-15 09:21+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-16 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: product_margin
+#: field:product.product,expected_margin_rate:0
+msgid "Expected Margin (%)"
+msgstr "OÄekivana marža (%)"
+
+#. module: product_margin
+#: wizard_field:product.margins,init,from_date:0
+msgid "From"
+msgstr "Od"
+
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multification of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+"Suma mnozenja kataloÅ¡ke cene proizvoda sa koliÄinama proizvoda na fakturama "
+"kupca"
+
+#. module: product_margin
+#: wizard_field:product.margins,init,to_date:0
+msgid "To"
+msgstr "Do"
+
+#. module: product_margin
+#: field:product.product,date_to:0
+msgid "To Date"
+msgstr "Do datuma"
+
+#. module: product_margin
+#: field:product.product,date_from:0
+msgid "From Date"
+msgstr "Od datuma"
+
+#. module: product_margin
+#: selection:product.margins,init,invoice_state:0
+#: selection:product.product,invoice_state:0
+msgid "Draft, Open and Paid"
+msgstr "Pripremljeno, Otvoreno i Plaćeno"
+
+#. module: product_margin
+#: model:ir.ui.menu,name:product_margin.menu_product_reporting
+msgid "Reporting"
+msgstr "Izveštavanje"
+
+#. module: product_margin
+#: field:product.product,purchase_avg_price:0
+#: field:product.product,sale_avg_price:0
+msgid "Avg. Unit Price"
+msgstr "Srednja jediniÄna cijena"
+
+#. module: product_margin
+#: model:ir.module.module,shortdesc:product_margin.module_meta_information
+msgid "Margins in Product"
+msgstr "Marže proizvoda"
+
+#. module: product_margin
+#: help:product.product,total_cost:0
+msgid ""
+"Sum of Multification of Invoice price and quantity of Supplier Invoices "
+msgstr "Suma mnozenja fakturne cijene i koliÄine na dobavljaÄevim fakturama "
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Catalog Price"
+msgstr "Kataloška cena"
+
+#. module: product_margin
+#: selection:product.margins,init,invoice_state:0
+#: selection:product.product,invoice_state:0
+msgid "Paid"
+msgstr "Plaćeno"
+
+#. module: product_margin
+#: help:product.product,sales_gap:0
+msgid "Excepted Sale - Turn Over"
+msgstr "OÄekivana prodaja - Zarada"
+
+#. module: product_margin
+#: field:product.product,sale_expected:0
+msgid "Expected Sale"
+msgstr "OÄekivana prodaja"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Standard Price"
+msgstr "Standardna cena"
+
+#. module: product_margin
+#: help:product.product,purchase_num_invoiced:0
+msgid "Sum of Quantity in Supplier Invoices"
+msgstr "Suma koliÄina na dobavljaÄevim fakturama"
+
+#. module: product_margin
+#: help:product.product,normal_cost:0
+msgid "Sum of Multification of Cost price and quantity of Supplier Invoices"
+msgstr "Suma mnozenja nabavne cene i koliÄine na dobavljaÄevim fakturama"
+
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,turnover:0
+msgid "Turnover"
+msgstr "Zarada"
+
+#. module: product_margin
+#: field:product.product,purchase_num_invoiced:0
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced"
+msgstr "# Fakturisano"
+
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,total_cost:0
+msgid "Total Cost"
+msgstr "Ukupni trošak"
+
+#. module: product_margin
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Excepted Sale - Normal Cost"
+msgstr "OÄekivana prodaja - Normalan troÅ¡ak"
+
+#. module: product_margin
+#: field:product.product,expected_margin:0
+msgid "Expected Margin"
+msgstr "OÄekivana marža"
+
+#. module: product_margin
+#: help:product.product,total_margin:0
+msgid "Turnorder - Total Cost"
+msgstr "Zarada-Ukupni trošak"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "#Purchased"
+msgstr "# Kupljeno"
+
+#. module: product_margin
+#: help:product.product,turnover:0
+msgid ""
+"Sum of Multification of Invoice price and quantity of Customer Invoices"
+msgstr "Suma mnozenja fakturne cijene i koliÄine na fakturama kupca"
+
+#. module: product_margin
+#: help:product.product,expected_margin_rate:0
+msgid "Expected margin * 100 / Expected Sale"
+msgstr "OÄekivana marža * 100 / OÄekivana prodaja"
+
+#. module: product_margin
+#: help:product.product,sale_avg_price:0
+msgid "Avg. Price in Customer Invoices)"
+msgstr "Srednja cena na fakturama kupca"
+
+#. module: product_margin
+#: wizard_view:product.margins,init:0
+msgid "Select "
+msgstr "Selektuj "
+
+#. module: product_margin
+#: wizard_field:product.margins,init,invoice_state:0
+#: field:product.product,invoice_state:0
+msgid "Invoice State"
+msgstr "Stanje fakture"
+
+#. module: product_margin
+#: help:product.product,purchase_gap:0
+msgid "Normal Cost - Total Cost"
+msgstr "Normalni trošak - Ukupni trošak"
+
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr "Razmak u prodaji"
+
+#. module: product_margin
+#: field:product.product,normal_cost:0
+msgid "Normal Cost"
+msgstr "Normalna cijena"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Purchases"
+msgstr "Nabavke"
+
+#. module: product_margin
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "Srednja cena u fakturama dobavljaÄa "
+
+#. module: product_margin
+#: field:product.product,total_margin:0
+msgid "Total Margin"
+msgstr "Ukupna marža"
+
+#. module: product_margin
+#: help:product.product,total_margin_rate:0
+msgid "Total margin * 100 / Turnover"
+msgstr "Ukupna marža * 100 / Zarada"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "Kriterijum Analize"
+
+#. module: product_margin
+#: selection:product.margins,init,invoice_state:0
+#: selection:product.product,invoice_state:0
+msgid "Open and Paid"
+msgstr "Otvoreno i plaćeno"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Sales"
+msgstr "Prodaje"
+
+#. module: product_margin
+#: model:ir.actions.wizard,name:product_margin.action_open_margin
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+msgid "Product Margins"
+msgstr "Marže proizvoda"
+
+#. module: product_margin
+#: field:product.product,purchase_gap:0
+msgid "Purchase Gap"
+msgstr "Razmak u kupovini"
+
+#. module: product_margin
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin (%)"
+msgstr "Ukupna marža (%)"
+
+#. module: product_margin
+#: wizard_button:product.margins,init,open:0
+msgid "Open Margins"
+msgstr "Otvorene marže"
+
+#. module: product_margin
+#: wizard_button:product.margins,init,end:0
+msgid "Cancel"
+msgstr "Otkaži"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Margins"
+msgstr "Marže"
+
+#. module: product_margin
+#: help:product.product,sale_num_invoiced:0
+msgid "Sum of Quantity in Customer Invoices"
+msgstr "Suma koliÄina na fakturama kupca"
+
+#. module: product_margin
+#: wizard_view:product.margins,init:0
+msgid "View Stock of Products"
+msgstr "Pogledaj zalihu proizvoda"
diff --git a/addons/product_margin/product_margin_view.xml b/addons/product_margin/product_margin_view.xml
index 7ebd5f34588d37ea5fc7f05c50a9fb2032d7c625..cde2d514560fe3ca633f8374ac7fe3c2898bd622 100644
--- a/addons/product_margin/product_margin_view.xml
+++ b/addons/product_margin/product_margin_view.xml
@@ -84,7 +84,7 @@
</field>
</record>
- <menuitem icon="STOCK_JUSTIFY_FILL" action="product_margin_act_window" id="menu_action_product_margin" name="Product Margins" sequence="5" parent="base.menu_product" groups="base.group_sale_salesman,base.group_sale_manager,product.group_product_manager,base.group_system"/>
+ <menuitem icon="STOCK_JUSTIFY_FILL" action="product_margin_act_window" id="menu_action_product_margin" name="Product Margins" sequence="5" parent="base.menu_product" groups="base.group_sale_salesman,base.group_sale_manager,product.group_product_manager"/>
</data>
</openerp>
diff --git a/addons/product_visible_discount/i18n/sr.po b/addons/product_visible_discount/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..94fa025a2e81badbf276f57ac71bec5152007e3c
--- /dev/null
+++ b/addons/product_visible_discount/i18n/sr.po
@@ -0,0 +1,58 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-03-25 12:11+0000\n"
+"PO-Revision-Date: 2010-10-15 09:38+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-16 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: product_visible_discount
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: product_visible_discount
+#: model:ir.module.module,description:product_visible_discount.module_name_translation
+msgid ""
+"\n"
+" This module lets you calculate discounts on Sale Order lines and Invoice "
+"lines base on the partner's pricelist.\n"
+" To this end, a new check box named \"Visible Discount\" is added to the "
+"pricelist form.\n"
+" Example:\n"
+" For the product PC1 and the partner \"Asustek\": if listprice=450, "
+"and the price calculated using Asustek's pricelist is 225\n"
+" If the check box is checked, we will have on the sale order line: "
+"Unit price=450, Discount=50,00, Net price=225\n"
+" If the check box is unchecked, we will have on Sale Order and "
+"Invoice lines: Unit price=225, Discount=0,00, Net price=225\n"
+" "
+msgstr ""
+"\n"
+" Ovaj modul dozvoljava proracun popusta na stavke narudžbi na osnovu "
+"stavaka faktura na partnerovom cjeniku.\n"
+"Zbog toga je dodata nova kućica \"Vidljivi popust\" na formu cenovnika.\n"
+"Primer:\n"
+"Za proizvod PC1 i partnera \"Asustek\": ako je prikazana cena=450, a cena "
+"izraÄunata prema Asustekovom cenovniku iznosi 225\n"
+"Ako je kućica oznaÄena, na stavki raÄuna će pisati: Cena=450, Popust=50,00, "
+"Neto cena=225\n"
+"Ako kućica nije oznaÄena, na stavkama raÄuna i fakture će pisati: Cena=225, "
+"Popust=0,00, Neto cena=225\n"
+" "
+
+#. module: product_visible_discount
+#: field:product.pricelist,visible_discount:0
+msgid "Visible Discount"
+msgstr "Vidljivi Popust"
diff --git a/addons/profile_tools/installer.py b/addons/profile_tools/installer.py
index 54fd06028021548c139343b4e03dc4daab4f815b..6ea024aebbe29554f2ba08cb078159361276c94d 100644
--- a/addons/profile_tools/installer.py
+++ b/addons/profile_tools/installer.py
@@ -29,9 +29,10 @@ class misc_tools_installer(osv.osv_memory):
'subscription':fields.boolean('Recurring Documents',help='Helps to generate automatically recurring documents.'),
'survey':fields.boolean('Survey',help='Allows you to organize surveys.'),
'idea':fields.boolean('Ideas Box',help='Promote ideas of the employees, votes and discussion on best ideas.'),
+ 'share':fields.boolean('Share Data / Portals',help='This module allows you to easily give restricted access of any filtered list of objects to any customer or supplier.' \
+ 'Just click on the share icon to give access to your customers on their project\'s tasks, support requests, invoices, etc.'),
}
_defaults = {
- 'lunch': True,
}
misc_tools_installer()
diff --git a/addons/profile_tools/misc_tools_installer.xml b/addons/profile_tools/misc_tools_installer.xml
index b59f95ab908ecda6288ac0b1127c78b2ef94cea2..d81936756a643764e64f1a114e30fd0acbb14fe0 100644
--- a/addons/profile_tools/misc_tools_installer.xml
+++ b/addons/profile_tools/misc_tools_installer.xml
@@ -25,6 +25,7 @@
<attribute name="string">Configure</attribute>
</xpath>
<group colspan="8">
+ <field name="share"/>
<field name="lunch"/>
<field name="idea"/>
<field name="survey"/>
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index 71b5d87aa1f6be4f963e71fcbb31f41299567a1b..bc86872110aafedba3b0d117f19cdda13d4b447c 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -21,6 +21,11 @@
<field name="planned_hours" widget="float_time"/>
<field name="effective_hours" widget="float_time"/>
<field name="progress" widget="progressbar"/>
+ <field name="state" invisible="context.get('set_visible',False)"/>
+ <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
+ <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
+ <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/>
+ <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="gtk-apply" help="For changing to done state"/>
</tree>
</field>
</record>
@@ -31,14 +36,17 @@
<field name="type">tree</field>
<field eval="99" name="priority"/>
<field name="arch" type="xml">
- <tree colors="red:date_deadline<current_date;blue:date_deadline==current_date;black:date_deadline>current_date" string="My Delegated Tasks">
- <field name="user_id"/>
+ <tree colors="red:date_deadline<current_date" string="My Delegated Tasks">
<field name="name"/>
<field name="project_id"/>
+ <field name="delegated_user_id"/>
<field name="date_deadline"/>
<field name="total_hours" widget="float_time"/>
<field name="progress" widget="progressbar"/>
- <field name="type_id"/>
+ <field name="state" invisible="context.get('set_visible',False)"/>
+ <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
+ <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
+ <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="gtk-apply" help="For changing to done state"/>
</tree>
</field>
</record>
@@ -120,10 +128,5 @@
parent="next_id_86"
sequence="1"/>
- <menuitem
- icon="terp-project" id="base.menu_main_pm"
- name="Project" sequence="10" action="open_board_project"
- groups="group_project_manager,group_project_user,base.group_system"/>
-
</data>
</openerp>
diff --git a/addons/project/company.py b/addons/project/company.py
index 18f970118a4e9345a7ff649f1e2ba32ca50343b0..0967d13073758fada259f964d5d10a9d01028805 100644
--- a/addons/project/company.py
+++ b/addons/project/company.py
@@ -31,13 +31,5 @@ class res_company(osv.osv):
"forget to setup the right unit of measure in your employees.",
),
}
-
- def write(self, cr, uid, ids,vals, context={}):
- task_ids=self.pool.get('project.task').search(cr, uid, [('state','in',['open', 'pending'])])
- if ('project_time_mode_id' in vals) and task_ids:
- raise osv.except_osv(_('Error !'), _('You cannot modify Project Time Unit as there are open or pending tasks created with current time unit.'))
- return super(res_company,self).write(cr, uid, ids, vals, context=context)
-
res_company()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/installer.py b/addons/project/installer.py
index 7a147737768fe7587b76b0e992dadbe791f91bbb..693e2d5801865383d5ecb6be7718137edba60ea3 100644
--- a/addons/project/installer.py
+++ b/addons/project/installer.py
@@ -47,11 +47,6 @@ class project_installer(osv.osv_memory):
'project_gtd': fields.boolean('Getting Things Done',
help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
}
-
- _defaults={
- 'project_issue': True,
- }
-
project_installer()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/project.py b/addons/project/project.py
index a09855d3bce49bdae7706ae17bedc8c54caccebb..254d447b618c0fec5327ed3da9f540c32c25a782 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -78,82 +78,30 @@ class project(osv.osv):
pricelist_id = pricelist.get('property_product_pricelist', False) and pricelist.get('property_product_pricelist')[0] or False
return {'value':{'contact_id': addr['contact'], 'pricelist_id': pricelist_id}}
- def _get_user_and_default_uom_ids(self, cr, uid):
- users_obj = self.pool.get('res.users')
- model_data_obj = self.pool.get('ir.model.data')
- model_data_id = model_data_obj._get_id(cr, uid, 'product', 'uom_hour')
- default_uom = user_uom = model_data_obj.read(cr, uid, [model_data_id], ['res_id'])[0]['res_id']
- obj_tm = users_obj.browse(cr, uid, uid).company_id.project_time_mode_id
- if obj_tm:
- user_uom = obj_tm.id
- return user_uom, default_uom
-
def _progress_rate(self, cr, uid, ids, names, arg, context=None):
- def _get_all_child_projects(ids):
- """Recursively get child project ids"""
- child_ids = flatten([project_hierarchy.get(idn, []) for idn in ids])
- if child_ids:
- child_ids = _get_all_child_projects(child_ids)
- return ids + child_ids
- # END _get_all_child_projects
-
res = {}.fromkeys(ids, 0.0)
progress = {}
if not ids:
return res
-
- par_child_projects = {}
- all_projects = list(ids)
-
- # get project hierarchy:
- cr.execute('''SELECT prp.id AS pr_parent_id, prpc.id AS pr_child_id
- FROM account_analytic_account AS p
- JOIN account_analytic_account AS c ON p.id = c.parent_id
- JOIN project_project AS prp ON prp.analytic_account_id = p.id
- JOIN project_project AS prpc ON prpc.analytic_account_id = c.id''')
-
- project_hierarchy = dict((k, list(set([v[1] for v in itr]))) for k, itr in groupby(cr.fetchall(), itemgetter(0)))
-
- for id in ids:
- child_projects = _get_all_child_projects([id])
- par_child_projects[id] = child_projects
- all_projects.extend(child_projects)
-
- all_projects = dict.fromkeys(all_projects).keys()
cr.execute('''SELECT
project_id, sum(planned_hours), sum(total_hours), sum(effective_hours)
FROM
- project_task
+ project_task
WHERE
- project_id IN %s AND
+ project_id in %s AND
state<>'cancelled'
GROUP BY
- project_id''',(tuple(all_projects),))
- progress = dict(map(lambda x: (x[0], (x[1] or 0.0, x[2] or 0.0, x[3] or 0.0)), cr.fetchall()))
-
- user_uom, def_uom = self._get_user_and_default_uom_ids(cr, uid)
- for project in self.browse(cr, uid, par_child_projects.keys(), context=context):
- s = [0.0, 0.0, 0.0]
- tocompute = par_child_projects[project.id]
- while tocompute:
- p = tocompute.pop()
- for i in range(3):
- s[i] += progress.get(p, (0.0, 0.0, 0.0))[i]
-
- uom_obj = self.pool.get('product.uom')
- if user_uom != def_uom:
- s[0] = uom_obj._compute_qty(cr, uid, user_uom, s[0], def_uom)
- s[1] = uom_obj._compute_qty(cr, uid, user_uom, s[1], def_uom)
- s[2] = uom_obj._compute_qty(cr, uid, user_uom, s[2], def_uom)
- if project.state == 'close':
- progress_rate = 100.0
- else:
- progress_rate = s[1] and round(min(100.0 * s[2] / s[1], 99.99), 2)
+ project_id''',
+ (tuple(ids),))
+ progress = dict(map(lambda x: (x[0], (x[1],x[2],x[3])), cr.fetchall()))
+
+ for project in self.browse(cr, uid, ids, context=context):
+ s = progress.get(project.id, (0.0,0.0,0.0))
res[project.id] = {
'planned_hours': s[0],
'effective_hours': s[2],
'total_hours': s[1],
- 'progress_rate': progress_rate
+ 'progress_rate': s[1] and (100.0 * s[2] / s[1]) or 0.0
}
return res
@@ -173,7 +121,6 @@ class project(osv.osv):
if work.task_id and work.task_id.project_id: result[work.task_id.project_id.id] = True
return result.keys()
-
def unlink(self, cr, uid, ids, *args, **kwargs):
for proj in self.browse(cr, uid, ids):
if proj.tasks:
@@ -227,11 +174,12 @@ class project(osv.osv):
'sequence': 10,
}
+ # TODO: Why not using a SQL contraints ?
def _check_dates(self, cr, uid, ids):
- leave = self.read(cr, uid, ids[0], ['date_start', 'date'])
- if leave['date_start'] and leave['date']:
- if leave['date_start'] > leave['date']:
- return False
+ for leave in self.read(cr, uid, ids, ['date_start', 'date']):
+ if leave['date_start'] and leave['date']:
+ if leave['date_start'] > leave['date']:
+ return False
return True
_constraints = [
@@ -248,7 +196,7 @@ class project(osv.osv):
task_obj.write(cr, uid, task_ids, {'state': 'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S'), 'remaining_hours': 0.0})
self.write(cr, uid, ids, {'state':'close'}, context=context)
for (id, name) in self.name_get(cr, uid, ids):
- message = _('Project ') + " '" + name + "' "+ _("is Closed.")
+ message = _("The project '%s' has been closed.") % name
self.log(cr, uid, id, message)
return True
@@ -270,7 +218,7 @@ class project(osv.osv):
def reset_project(self, cr, uid, ids, context=None):
res = self.setActive(cr, uid, ids, value=True, context=context)
for (id, name) in self.name_get(cr, uid, ids):
- message = _('Project ') + " '" + name + "' "+ _("is Open.")
+ message = _("The project '%s' has been opened.") % name
self.log(cr, uid, id, message)
return res
@@ -387,23 +335,9 @@ class task(osv.osv):
res = {}
cr.execute("SELECT task_id, COALESCE(SUM(hours),0) FROM project_task_work WHERE task_id IN %s GROUP BY task_id",(tuple(ids),))
hours = dict(cr.fetchall())
-
- uom_obj = self.pool.get('product.uom')
- user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)
- if user_uom != default_uom:
- for task in self.browse(cr, uid, ids, context=context):
- if hours.get(task.id, False):
- dur_in_user_uom = uom_obj._compute_qty(cr, uid, default_uom, hours.get(task.id, 0.0), user_uom)
- hours[task.id] = dur_in_user_uom
- timespent=0
for task in self.browse(cr, uid, ids, context=context):
- res[task.id] = {'effective_hours': hours.get(task.id, 0.0), 'total_hours': task.remaining_hours + hours.get(task.id, 0.0)}
-# res[task.id]['delay_hours'] = res[task.id]['total_hours'] - task.planned_hours
-
- for ctimespent in task.work_ids:
- timespent=timespent+ctimespent.hours
- res[task.id]['delay_hours'] = task.planned_hours - timespent
-
+ res[task.id] = {'effective_hours': hours.get(task.id, 0.0), 'total_hours': (task.remaining_hours or 0.0) + hours.get(task.id, 0.0)}
+ res[task.id]['delay_hours'] = res[task.id]['total_hours'] - task.planned_hours
res[task.id]['progress'] = 0.0
if (task.remaining_hours + hours.get(task.id, 0.0)):
res[task.id]['progress'] = round(min(100.0 * hours.get(task.id, 0.0) / res[task.id]['total_hours'], 99.99),2)
@@ -468,7 +402,7 @@ class task(osv.osv):
'description': fields.text('Description'),
'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'), ('0','Very urgent')], 'Priority'),
'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of tasks."),
- 'type_id': fields.many2one('project.task.type', 'Type',),
+ 'type_id': fields.many2one('project.task.type', 'Stage'),
'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
help='If the task is created the state is \'Draft\'.\n If the task is started, the state becomes \'In Progress\'.\n If review is needed the task is in \'Pending\' state.\
\n If the task is over, the states is set to \'Done\'.'),
@@ -483,23 +417,23 @@ class task(osv.osv):
'planned_hours': fields.float('Planned Hours', help='Estimated time to do the task, usually set by the project manager when the task is in draft state.'),
'effective_hours': fields.function(_hours_get, method=True, string='Hours Spent', multi='hours', help="Computed using the sum of the task work done.",
store = {
- 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids'], 10),
+ 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours'], 10),
'project.task.work': (_get_task, ['hours'], 10),
}),
'remaining_hours': fields.float('Remaining Hours', digits=(16,2), help="Total remaining time, can be re-estimated periodically by the assignee of the task."),
'total_hours': fields.function(_hours_get, method=True, string='Total Hours', multi='hours', help="Computed as: Time Spent + Remaining Time.",
store = {
- 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids'], 10),
+ 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours'], 10),
'project.task.work': (_get_task, ['hours'], 10),
}),
'progress': fields.function(_hours_get, method=True, string='Progress (%)', multi='hours', group_operator="avg", help="Computed as: Time Spent / Total Time.",
store = {
- 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids'], 10),
+ 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours','state'], 10),
'project.task.work': (_get_task, ['hours'], 10),
}),
'delay_hours': fields.function(_hours_get, method=True, string='Delay Hours', multi='hours', help="Computed as difference of the time estimated by the project manager and the real time to close the task.",
store = {
- 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids'], 10),
+ 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours'], 10),
'project.task.work': (_get_task, ['hours'], 10),
}),
'user_id': fields.many2one('res.users', 'Assigned to'),
@@ -634,7 +568,7 @@ class task(osv.osv):
if reopen:
self.do_reopen(cr, uid, [parent_id.id])
self.write(cr, uid, [task.id], {'state': 'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S'), 'remaining_hours': 0.0})
- message = _('Task ') + " '" + task.name + "' "+ _("is Done.")
+ message = _("The task '%s' is done") % (task.name,)
self.log(cr, uid, task.id, message)
return True
@@ -675,7 +609,7 @@ class task(osv.osv):
'ref_doc1': 'project.task,%d' % task.id,
'ref_doc2': 'project.project,%d' % project.id,
})
- message = _('Task ') + " '" + task.name + "' "+ _("is Cancelled.")
+ message = _("The task '%s' is cancelled.") % (task.name,)
self.log(cr, uid, task.id, message)
self.write(cr, uid, [task.id], {'state': 'cancelled', 'remaining_hours':0.0})
return True
@@ -687,7 +621,7 @@ class task(osv.osv):
if not t.date_start:
data['date_start'] = time.strftime('%Y-%m-%d %H:%M:%S')
self.write(cr, uid, [t.id], data)
- message = _('Task ') + " '" + t.name + "' "+ _("is Open.")
+ message = _("The task '%s' is opened.") % (t.name,)
self.log(cr, uid, t.id, message)
return True
@@ -724,15 +658,15 @@ class task(osv.osv):
else:
self.do_close(cr, uid, [task.id], context)
user_pool = self.pool.get('res.users')
- delegrate_user = user_pool.browse(cr, uid, delegate_data['user_id'], context=context)
- message = _('Task ') + " '" + delegate_data['name'] + "' "+ _("is Delegated to User:") +" '"+ delegrate_user.name +"' "
+ delegate_user = user_pool.browse(cr, uid, delegate_data['user_id'], context=context)
+ message = _("The task '%s' has been delegated to %s.") % (delegate_data['name'], delegate_user.name)
self.log(cr, uid, task.id, message)
return True
def do_pending(self, cr, uid, ids, *args):
self.write(cr, uid, ids, {'state': 'pending'})
for (id, name) in self.name_get(cr, uid, ids):
- message = _('Task ') + " '" + name + "' "+ _("is Pending.")
+ message = _("The task '%s' is pending.") % name
self.log(cr, uid, id, message)
return True
@@ -778,54 +712,25 @@ class project_work(osv.osv):
}
_order = "date desc"
-
def create(self, cr, uid, vals, *args, **kwargs):
- project_obj = self.pool.get('project.project')
- uom_obj = self.pool.get('product.uom')
- if vals.get('hours', False):
- user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)
- duration = vals['hours']
- if user_uom != default_uom:
- duration = uom_obj._compute_qty(cr, uid, default_uom, duration, user_uom)
- cr.execute('update project_task set remaining_hours=remaining_hours - %s where id=%s', (duration, vals['task_id']))
- return super(project_work, self).create(cr, uid, vals, *args, **kwargs)
-
- def write(self, cr, uid, ids, vals, context=None):
- project_obj = self.pool.get('project.project')
- uom_obj = self.pool.get('product.uom')
- if vals.get('hours', False):
- old_hours = self.browse(cr, uid, ids, context=context)
- user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)
- duration = vals['hours']
- for old in old_hours:
- if vals.get('hours') != old.hours:
- # this code is only needed when we update the hours of the project
- # TODO: it may still a second calculation if the task.id is changed
- # at this task.
- if user_uom == default_uom:
- for work in self.browse(cr, uid, ids, context=context):
- cr.execute('update project_task set remaining_hours=remaining_hours - %s + (%s) where id=%s', (duration, work.hours, work.task_id.id))
- else:
- for work in self.browse(cr, uid, ids, context=context):
- duration = uom_obj._compute_qty(cr, uid, default_uom, duration, user_uom)
- del_work = uom_obj._compute_qty(cr, uid, default_uom, work.hours, user_uom)
- cr.execute('update project_task set remaining_hours=remaining_hours - %s + (%s) where id=%s', (duration, del_work, work.task_id.id))
- return super(project_work,self).write(cr, uid, ids, vals, context=context)
-
- def unlink(self, cr, uid, ids, *args, **kwargs):
- context = kwargs.get('context', {})
- project_obj = self.pool.get('project.project')
- uom_obj = self.pool.get('product.uom')
- user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)
- if user_uom == default_uom:
+ if 'hours' in vals and (not vals['hours']):
+ vals['hours'] = 0.00
+ if 'task_id' in vals:
+ cr.execute('update project_task set remaining_hours=remaining_hours - %s where id=%s', (vals.get('hours',0.0), vals['task_id']))
+ return super(project_work,self).create(cr, uid, vals, *args, **kwargs)
+
+ def write(self, cr, uid, ids,vals,context={}):
+ if 'hours' in vals and (not vals['hours']):
+ vals['hours'] = 0.00
+ if 'hours' in vals:
for work in self.browse(cr, uid, ids, context):
- cr.execute('update project_task set remaining_hours=remaining_hours + %s where id=%s', (work.hours, work.task_id.id))
- else:
- for work in self.browse(cr, uid, ids, context):
- duration = uom_obj._compute_qty(cr, uid, default_uom, work.hours, user_uom)
- cr.execute('update project_task set remaining_hours=remaining_hours + %s where id=%s', (duration, work.task_id.id))
- return super(project_work, self).unlink(cr, uid, ids, *args, **kwargs)
+ cr.execute('update project_task set remaining_hours=remaining_hours - %s + (%s) where id=%s', (vals.get('hours',0.0), work.hours, work.task_id.id))
+ return super(project_work,self).write(cr, uid, ids, vals, context)
+ def unlink(self, cr, uid, ids, *args, **kwargs):
+ for work in self.browse(cr, uid, ids):
+ cr.execute('update project_task set remaining_hours=remaining_hours + %s where id=%s', (work.hours, work.task_id.id))
+ return super(project_work,self).unlink(cr, uid, ids,*args, **kwargs)
project_work()
class account_analytic_account(osv.osv):
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 8d3752c09793ce405d5182e35a0ddb73c002f13a..0c1c386a70048eb8e02c111b4ae68b32db57ce42 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -42,7 +42,7 @@
</record>
<record id="res_users_finacial_manager" model="res.users">
<field name="name">Fabian</field>
- <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_finance')])]" name="groups_id"/>
+ <field eval="[(6, 0, [ref('base.group_user')])]" name="groups_id"/>
<field name="login">fbs</field>
<field name="password">fbs</field>
</record>
@@ -271,7 +271,7 @@
<record id="project_task_116" model="project.task">
<field name="planned_hours">38.0</field>
<field name="remaining_hours">38.0</field>
- <field name="type" ref="project_tt_development"/>
+ <field name="type_id" ref="project_tt_development"/>
<field name="user_id" ref="base.user_root"/>
<field name="project_id" ref="project_project_22"/>
<field name="description">BoM, After sales returns, interventions. Traceability.</field>
@@ -280,7 +280,7 @@
<record id="project_task_130" model="project.task">
<field name="planned_hours">16.0</field>
<field name="remaining_hours">16.0</field>
- <field name="type" ref="project_tt_development"/>
+ <field name="type_id" ref="project_tt_development"/>
<field model="res.users" name="user_id" search="[('login','=','demo')]"/>
<field name="project_id" ref="project_project_23"/>
<field name="name">Data importation + Doc</field>
@@ -288,7 +288,7 @@
<record id="project_task_131" model="project.task">
<field name="planned_hours">16.0</field>
<field name="remaining_hours">16.0</field>
- <field name="type" ref="project_tt_development"/>
+ <field name="type_id" ref="project_tt_development"/>
<field model="res.users" name="user_id" search="[('login','=','demo')]"/>
<field name="project_id" ref="project_project_23"/>
<field name="name">Modifications asked by the customer.</field>
@@ -296,7 +296,7 @@
<record id="project_task_184" model="project.task">
<field name="planned_hours">16.0</field>
<field name="remaining_hours">16.0</field>
- <field name="type" ref="project_tt_development"/>
+ <field name="type_id" ref="project_tt_development"/>
<field model="res.users" name="user_id" search="[('login','=','demo')]"/>
<field name="priority">0</field>
<field name="project_id" ref="project_project_21"/>
@@ -306,7 +306,7 @@
<field name="sequence">15</field>
<field name="planned_hours">8.0</field>
<field name="remaining_hours">8.0</field>
- <field name="type" ref="project_tt_development"/>
+ <field name="type_id" ref="project_tt_development"/>
<field model="res.users" name="user_id" search="[('login','=','demo')]"/>
<field name="project_id" ref="project_project_21"/>
<field name="name">Internal testing + Software Install</field>
@@ -315,7 +315,7 @@
<field name="sequence">17</field>
<field name="planned_hours">16.0</field>
<field name="remaining_hours">16.0</field>
- <field name="type" ref="project_tt_development"/>
+ <field name="type_id" ref="project_tt_development"/>
<field model="res.users" name="user_id" search="[('login','=','demo')]"/>
<field name="priority">2</field>
<field name="state">open</field>
@@ -357,7 +357,6 @@
<field name="project_id" ref="project_project_21"/>
<field name="name">MRP; functional layer</field>
<field name="state">done</field>
- <field eval="time.strftime('%Y-%m-%d 12:12')" name="date_close"/>
</record>
<record id="project_task_194" model="project.task">
<field name="sequence">30</field>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 3d483658eb0973238793ad72ae5df77fa9082978..8cf262237daa07bd161bdeec871b5f537509c182 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -5,10 +5,10 @@
<menuitem
icon="terp-project" id="base.menu_main_pm"
name="Project" sequence="10"
- groups="group_project_manager,group_project_user,base.group_system,group_project_finance_user"/>
+ groups="group_project_manager,group_project_user"/>
<menuitem id="menu_project_management" name="Project" parent="base.menu_main_pm" sequence="1"/>
- <menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60" groups="base.group_system,group_project_finance_user"/>
+ <menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
<!-- Project -->
<record id="edit_project" model="ir.ui.view">
@@ -158,7 +158,7 @@
<field name="view_id" ref="view_project"/>
<field name="search_view_id" ref="view_project_project_filter"/>
<field name="context">{'search_default_Current':1}</field>
- <field name="help">Consult and define your projects here. A project contains a set of related activities that will be performed by your company. Any project can be put into a hierarchy, as a child of a Parent Project. This allows you to design large project structure very useful for work organization.</field>
+ <field name="help">A project contains a set of tasks or issues that will be performed by your resources assigned on it. A project can be put into a hierarchy, as a child of a Parent Project. This allows you to design large project structure with different phases spread over the project duration cycle. Each user can set his default project in his own preferences, in order to filter automatically the tasks or issues he usually works on.</field>
</record>
<menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_management" sequence="1"/>
@@ -304,17 +304,14 @@
<field name="type">tree</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
- <tree colors="grey:state in ('cancelled','done');blue:remaining_hours<0 and state in ('pending');red:date_deadline and (date_deadline<current_date) and (state in ('draft','open'))" string="Tasks">
- <field name="id"/>
+ <tree colors="grey:state in ('cancelled','done');blue:state == 'pending';red:date_deadline and (date_deadline<current_date) and (state in ('draft','pending','open'))" string="Tasks">
<field name="sequence" invisible="not context.get('seq_visible', False)"/>
<field name="name"/>
<field name="project_id" icon="gtk-indent" domain="['|',('user_id','=',uid),('members','=',uid)]" invisible="context.get('user_invisible', False)"/>
<field name="user_id" invisible="context.get('user_invisible', False)"/>
<field name="delegated_user_id" invisible="context.get('show_delegated', True)"/>
<field name="remaining_hours" widget="float_time" sum="Remaining Hours" on_change="onchange_remaining(remaining_hours,planned_hours)"/>
- <field name="planned_hours"/>
- <field name="delay_hours"/>
- <field name="date_deadline" invisible="context.get('set_visible',False)"/>
+ <field name="date_deadline" invisible="context.get('deadline_visible',True)"/>
<field name="type_id" groups="base.group_extended" invisible="context.get('set_visible',False)"/>
<button name="next_type" invisible="context.get('set_visible',False)"
states="draft,open,pending"
@@ -328,7 +325,7 @@
<field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
<field name="state" invisible="context.get('set_visible',False)"/>
<button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
- <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
+ <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
<button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/>
<button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
</tree>
@@ -391,11 +388,9 @@
icon="gtk-execute"
groups="base.group_extended"/>
<separator orientation="vertical"/>
- <filter string="Deadlines" domain="[('date_deadline','<>',False)]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
+ <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','<>',False)]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
<separator orientation="vertical"/>
<field name="name" select="1"/>
- <field name="type_id" widget="selection"/>
- <separator orientation="vertical"/>
<field name="project_id" select="1">
<filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
</field>
@@ -407,7 +402,7 @@
<group expand="0" string="Group By..." colspan="4" col="20">
<filter string="Users" name="group_user_id" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/>
- <filter string="Project" name="group_project_id" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
+ <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
<separator orientation="vertical"/>
<filter string="Stage" name="group_stage_id" icon="terp-stage" domain="[]" context="{'group_by':'type_id'}"/>
<filter string="State" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
@@ -430,9 +425,9 @@
<field name="view_id" ref="view_task_tree2"/>
<field name="context">{"search_default_project_id":project_id, "search_default_user_id":uid, "search_default_current": 1}</field>
<field name="search_view_id" ref="view_task_search_form"/>
- <field name="help">In OpenERP, a project is made of a set of activities (or tasks) for completion. A list view allows the manager to quickly check for task status and make it evolve, delegate task, etc. A search tool allows a multi-criteria sort of activities.</field>
+ <field name="help">A task represents a work that has to be done. Each user works in his own list of tasks where he can record his task work in hours. He can work and close the task itself or delegate it to antoher user. If you delegate a task to another user, you get a new task in pending state, which will be re-opened when you have to review the work achieved. If you install the project_timesheet module, tasks works can be invoiced based on the project configuration. With the project_mrp module, sales orders can create tasks automatically when they are confirmed.</field>
</record>
- <menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" sequence="2"/>
+ <menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" sequence="3"/>
<record id="action_view_task_overpassed_draft" model="ir.actions.act_window">
<field name="name">Overpassed Tasks</field>
@@ -494,9 +489,10 @@
<field name="res_model">project.task.type</field>
<field name="view_type">form</field>
<field name="view_id" ref="task_type_tree"/>
+ <field name="help">Define here the steps that will be used on the project from the creation of the task, up to the closing of the task or issue. You will use these stages in order to track the progress of the resolution of a task or an issue.</field>
</record>
- <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1" groups="base.group_system,group_project_finance_user"/>
+ <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1"/>
<menuitem action="open_task_type_form" id="menu_task_types_view" parent="menu_tasks_config" sequence="1"/>
<act_window context="{'search_default_user_id': [active_id]}" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index eb781690c1b50a1a3d63bbd6881d10e2813f46bd..53d97c028029459061299a32240d4461fe640da4 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -89,7 +89,7 @@
domain="[('state','=','done')]"/>
<separator orientation="vertical"/>
<field name="project_id">
- <filter icon="terp-folder-blue"
+ <filter icon="terp-folder-violet"
string="My Projects"
help="My Projects" domain="[('project_id.user_id','=',uid)]"/>
</field>
@@ -121,7 +121,7 @@
</group>
<newline/>
<group expand="1" string="Group By..." colspan="10" col="12">
- <filter string="Project" name="project" icon="terp-folder-blue" context="{'group_by':'project_id'}"/>
+ <filter string="Project" name="project" icon="terp-folder-violet" context="{'group_by':'project_id'}"/>
<filter string="Task" icon="terp-stock_align_left_24" context="{'group_by':'name'}" />
<separator orientation="vertical"/>
<filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
@@ -146,10 +146,10 @@
<field name="view_mode">tree,graph</field>
<field name="search_view_id" ref="view_task_project_user_search"/>
<field name="context">{'search_default_month':1,'search_default_project':1,'group_by_no_leaf':1,'group_by':[]}</field>
- <field name="help">Get detailed analysis by task</field>
+ <field name="help">This report allows you to analyse the performance of your projects and users. You can analyse the quantities of tasks, the hours spent compared to the planned hours, the average number of days to open or close a task, etc.</field>
</record>
- <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1" groups="base.group_system,group_project_finance_user"/>
+ <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1"/>
<!-- Views and action for project dashboard -->
<record id="view_project_vs_remaining_hours_tree" model="ir.ui.view">
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index d842574f5ce8b998fdef1443740b34a4c7e1c5f7..fb237e88769d899233628880eda5851535a196a6 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -18,21 +18,6 @@
"access_partner_address_task manager","base.res.partner.address manager","base.model_res_partner_address","project.group_project_manager",1,0,0,0
"access_task_on_partner","project.task on partners","model_project_task","base.group_user",1,0,0,0
"access_project_on_partner","project.project on partners","model_project_project","base.group_user",1,0,0,0
-"access_project_task_system","project.task system","model_project_task","base.group_system",1,0,0,0
-"access_project_project_system","project.project system","model_project_project","base.group_system",1,1,1,1
-"access_project_task_work_system","project.task.work system","model_project_task_work","base.group_system",1,0,0,0
-"access_project_task_type_system","project.task.type system","model_project_task_type","base.group_system",1,1,1,1
-"access_report_project_task_user_system","report.project.task.user system","model_report_project_task_user","base.group_system",1,0,0,0
"access_project_vs_hours_manager","project.vs.hours.manager","model_project_vs_hours","project.group_project_manager",1,1,1,1
-"access_account_analytic_account_system","account.analytic.account system","analytic.model_account_analytic_account","base.group_system",1,0,0,0
-"access_project_vs_hours_system","project.vs.hours.system","model_project_vs_hours","base.group_system",1,0,0,0
"access_project_task_sale_user","project.task salesman","model_project_task","base.group_sale_salesman",1,0,0,0
"access_project_project_sale_user","project.project salesman","model_project_project","base.group_sale_salesman",1,0,0,0
-"access_project_project_project_financial_user","project.project.project.financial.user","model_project_project","group_project_finance_user",1,0,0,0
-"access_project_task_project_financial_user","project.task.project.financial.user","model_project_task","group_project_finance_user",1,0,0,0
-"access_project_task_work_project_financial_user","project.task.work.project.financial.user","model_project_task_work","group_project_finance_user",1,0,0,0
-"access_report_project_task_user_project_financial_user","report.project.task.user.project.financial.user","model_report_project_task_user","group_project_finance_user",1,0,0,0
-"access_project_board_project_financial_user","board.board.project.financial.user","board.model_board_board","group_project_finance_user",1,0,0,0
-"access_account_analytic_account_project_financial_user","account.analytic.account.project.financial.user","analytic.model_account_analytic_account","group_project_finance_user",1,0,0,0
-"access_project_task_type_project_financial_user","project.task.type.project.financial.user","model_project_task_type","group_project_finance_user",1,0,0,0
-"access_project_vs_hours_project_financial_user","project.vs.hours.project.financial.user","model_project_vs_hours","group_project_finance_user",1,0,0,0
\ No newline at end of file
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 97453dcb33b61c63b77495c6d5ad7bc68b9e65b4..e77b1f338d10f9d6d6a60caa979cfaaf134165a5 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -2,14 +2,6 @@
<openerp>
<data noupdate="1">
- <record id="group_project_finance" model="res.groups">
- <field name="name">Project / Financial Manager</field>
- </record>
-
- <record id="group_project_finance_user" model="res.groups">
- <field name="name">Project / Financial User</field>
- </record>
-
<record id="group_project_manager" model="res.groups">
<field name="name">Project / Manager</field>
</record>
diff --git a/addons/project/test/test_project.yml b/addons/project/test/test_project.yml
index bc65ab67f770f01aedaee202b5eb8026b9d79296..8cf8e0afb19e38b822f69a3eb55fd0c7f94f90d5 100644
--- a/addons/project/test/test_project.yml
+++ b/addons/project/test/test_project.yml
@@ -65,10 +65,6 @@
-
!assert {model: project.project, id: project_project_openerptrainingprogramme0, severity: error, string: Project is in open state}:
- state == "open"
-
-
-
-
-
Test for different project-states
-
@@ -109,8 +105,6 @@
-
!assert {model: project.project, id: project_project_openerptrainingprogramme0, severity: error, string: Project is in open state}:
- state == "open"
-
-
-
Test for task work allocation
-
@@ -140,7 +134,7 @@
-
Make a work task entry 'Training on OpenERP modules, models and classes' of 10 hours
-
- !record {model: project.task, id: project_task_technicaltraining0, context: {'withoutemployee': True}}:
+ !record {model: project.task, id: project_task_technicaltraining0}:
work_ids:
- date: '2010-05-31 15:04:22'
hours: 10.0
@@ -155,7 +149,7 @@
-
Make a work task entry 'Training on OpenERP xml views' of 10 hours
-
- !record {model: project.task, id: project_task_technicaltraining0, context: {'withoutemployee': True}}:
+ !record {model: project.task, id: project_task_technicaltraining0}:
work_ids:
- date: '2010-06-01 15:04:46'
hours: 10.0
@@ -170,7 +164,7 @@
-
Make a work task entry 'Training on workflows' of 10 hours
-
- !record {model: project.task, id: project_task_technicaltraining0, context: {'withoutemployee': True}}:
+ !record {model: project.task, id: project_task_technicaltraining0}:
work_ids:
- date: '2010-06-02 15:05:24'
hours: 10.0
@@ -206,7 +200,7 @@
-
Make a work task entry 'Training on reports and wizards' of 10 hours
-
- !record {model: project.task, id: project_task_technicaltraining0, context: {'withoutemployee': True}}:
+ !record {model: project.task, id: project_task_technicaltraining0}:
work_ids:
- date: '2010-05-31 15:08:40'
hours: 10.0
@@ -257,7 +251,7 @@
-
Make a work task entry 'Training on yml' of 5 hours
-
- !record {model: project.task, id: project_task_technicaltraining0, context: {'withoutemployee': True}}:
+ !record {model: project.task, id: project_task_technicaltraining0}:
work_ids:
- date: '2010-05-31 16:55:27'
hours: 5.0
diff --git a/addons/project/test/test_project_delegation.yml b/addons/project/test/test_project_delegation.yml
index 722f58e65c26a00bb324fc5dfdcbcdad116a7121..02bc9afaae8e6d76a7e5b54fab376534783d3bbf 100644
--- a/addons/project/test/test_project_delegation.yml
+++ b/addons/project/test/test_project_delegation.yml
@@ -204,7 +204,7 @@
- state == "pending"
-
- Close the child project 'Prepare a technical reference for creating your modules'
+ Close the child task 'Prepare a technical reference for creating your modules'
-
!python {model: project.task}: |
self.do_close(cr, uid, [ref("project_task_delegate_developer_book")], {"lang": "en_US",
@@ -214,7 +214,7 @@
})
-
- Close the child project 'Prepare a book that gives functional overview of OpenERP'
+ Close the child task 'Prepare a book that gives functional overview of OpenERP'
-
!python {model: project.task}: |
self.do_close(cr, uid, [ref("project_task_delegate_openerp_tutorial")], {"lang": "en_US",
diff --git a/addons/project_caldav/__openerp__.py b/addons/project_caldav/__openerp__.py
index 1e78db79bf04e2fe21ead8d6a8a17b37d7d91353..f298fc9e1d5f4d3ad74be43d53087ea441003a1e 100644
--- a/addons/project_caldav/__openerp__.py
+++ b/addons/project_caldav/__openerp__.py
@@ -20,13 +20,13 @@
##############################################################################
{
- "name": "Caldav task management",
- "version": "1.0",
+ "name": "CalDAV for task management",
+ "version": "1.1",
"author": "OpenERP SA",
"category": "Generic Modules/Others",
"description": """ Synchronize between Project task and Caldav Vtodo.""",
"depends": ["project", "caldav", "base_calendar"],
- "init_xml": ["project_caldav_data.xml"],
+ "init_xml": ["project_caldav_data.xml", 'project_caldav_setup.xml', ],
"demo_xml": [],
"update_xml": ["project_caldav_view.xml"],
"active": False,
diff --git a/addons/project_caldav/project_caldav_data.xml b/addons/project_caldav/project_caldav_data.xml
index 0a4d36580fc55b1027aba919155bb32f35261c39..3030b28dba911c0db440c6ee607a87b6d5c9748d 100644
--- a/addons/project_caldav/project_caldav_data.xml
+++ b/addons/project_caldav/project_caldav_data.xml
@@ -3,10 +3,10 @@
<data noupdate="1">
<record model="basic.calendar" id="caldav.basic_calendar2">
- <field name="name">Tasks</field>
- <field name="collection_id" ref="document.dir_calendars"></field>
- <field name="type">vtodo</field>
- </record>
+ <field name="name">Tasks</field>
+ <field name="collection_id" ref="document.dir_calendars"></field>
+ <field name="type">vtodo</field>
+ </record>
<record model="basic.calendar.lines" id="caldav.calendar_lines_todo">
<field name="name">vtodo</field>
diff --git a/addons/project_caldav/project_caldav_setup.xml b/addons/project_caldav/project_caldav_setup.xml
new file mode 100644
index 0000000000000000000000000000000000000000..96d9c0ad3b66ef5cb417aa4ce4aee7ac73c5b433
--- /dev/null
+++ b/addons/project_caldav/project_caldav_setup.xml
@@ -0,0 +1,272 @@
+<?xml version="1.0"?>
+<openerp>
+<data noupdate="1">
+ <record id="basic_calendar_tasks0" model="basic.calendar">
+ <field eval="1" name="has_webcal"/>
+ <field name="description">Tasks per user</field>
+ <field name="calendar_color">#FFEF74</field>
+ <field model="document.directory" name="collection_id" ref="caldav.document_directory_c0"/>
+ <field name="type">vtodo</field>
+ <field name="name">Tasks</field>
+ </record>
+
+ <record id="basic_calendar_lines_attendee0" model="basic.calendar.lines">
+ <field model="basic.calendar" name="calendar_id" ref="basic_calendar_tasks0"/>
+ <field name="domain">[]</field>
+ <field name="name">attendee</field>
+ <field name="object_id" ref="base_calendar.model_calendar_attendee"/>
+ </record>
+ <record id="basic_calendar_lines_valarm0" model="basic.calendar.lines">
+ <field model="basic.calendar" name="calendar_id" ref="basic_calendar_tasks0"/>
+ <field name="domain">[]</field>
+ <field name="name">valarm</field>
+ <field name="object_id" ref="base_calendar.model_calendar_alarm"/>
+ </record>
+ <record id="basic_calendar_lines_vtodo0" model="basic.calendar.lines">
+ <field model="basic.calendar" name="calendar_id" ref="basic_calendar_tasks0"/>
+ <field name="domain">[('user_id','=', dctx_user_id)]</field>
+ <field name="name">vtodo</field>
+ <field name="object_id" ref="project.model_project_task"/>
+ </record>
+
+ <record id="basic_calendar_fields_0" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_todo_status"/>
+ <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
+ <field name="field_id" ref="project.field_project_task_state"/>
+ <field name="mapping">{'needs-action': 'draft', 'completed': 'done', 'in-process': 'open', 'cancelled': 'cancelled'}</field>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_1" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_todo_exdate"/>
+ <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_todo_exdate"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_2" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_todo_attendee"/>
+ <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
+ <field name="field_id" ref="project_caldav.field_project_task_attendee_ids"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_3" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_todo_valarm"/>
+ <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_todo_base_calendar_alarm_id"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_4" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_todo_description"/>
+ <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_todo_description"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_5" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_todo_url"/>
+ <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_todo_base_calendar_url"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_6" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_todo_percent"/>
+ <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
+ <field name="field_id" ref="project.field_project_task_progress"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_7" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_todo_vtimezone"/>
+ <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_todo_vtimezone"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_8" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_todo_summary"/>
+ <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_todo_name"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_9" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_event_priority"/>
+ <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
+ <field name="field_id" ref="project.field_project_task_priority"/>
+ <field name="mapping">{'1': '0', '2': '1', '3': '1','4': '1', '5': '2', '6': '3', '7': '3', '8': '3', '9': '4'}</field>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_10" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_todo_location"/>
+ <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_todo_location"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_11" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_todo_exrule"/>
+ <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_todo_exrule"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_12" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_todo_duration"/>
+ <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
+ <field name="field_id" ref="project.field_project_task_planned_hours"/>
+ <field name="fn">hours</field>
+ </record>
+ <record id="basic_calendar_fields_13" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_todo_dtstart"/>
+ <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_todo_date"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_14" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_todo_rrule"/>
+ <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_todo_rrule"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_15" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_todo_class"/>
+ <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_todo_class"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_16" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_todo_uid"/>
+ <field model="basic.calendar.lines" name="type_id" ref="basic_calendar_lines_vtodo0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_todo_id"/>
+ <field name="fn">field</field>
+ </record>
+
+ <record id="basic_calendar_fields_17" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_alarm_attendee"/>
+ <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_alarm_attendee_ids"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_18" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_alarm_trigger_duration"/>
+ <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+ <field name="field_id" ref="base_calendar.field_res_alarm_trigger_duration"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_19" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_alarm_description"/>
+ <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_alarm_description"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_20" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_alarm_attach"/>
+ <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_alarm_attach"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_21" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_alarm_trigger_occurs"/>
+ <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+ <field name="field_id" ref="base_calendar.field_res_alarm_trigger_occurs"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_22" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_alarm_trigger_interval"/>
+ <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+ <field name="field_id" ref="base_calendar.field_res_alarm_trigger_interval"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_23" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_alarm_summary"/>
+ <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_alarm_name"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_24" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_alarm_duration"/>
+ <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+ <field name="field_id" ref="base_calendar.field_res_alarm_duration"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_25" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_alarm_repeat"/>
+ <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+ <field name="field_id" ref="base_calendar.field_res_alarm_repeat"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_226" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_alarm_action"/>
+ <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_alarm_action"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_27" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_alarm_trigger_related"/>
+ <field name="type_id" ref="basic_calendar_lines_valarm0"/>
+ <field name="field_id" ref="base_calendar.field_res_alarm_trigger_related"/>
+ <field name="fn">field</field>
+ </record>
+
+ <record id="basic_calendar_fields_28" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_attendee_cn"/>
+ <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_attendee_cn"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_29" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_attendee_sent-by"/>
+ <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_attendee_sent_by"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_30" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_attendee_language"/>
+ <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_attendee_language"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_31" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_attendee_delegated-from"/>
+ <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_attendee_delegated_from"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_32" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_attendee_member"/>
+ <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_attendee_member"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_33" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_attendee_cutype"/>
+ <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_attendee_cutype"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_34" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_attendee_role"/>
+ <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_attendee_role"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_35" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_attendee_partstat"/>
+ <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_attendee_state"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_36" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_attendee_delegated-to"/>
+ <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_attendee_delegated_to"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_37" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_attendee_dir"/>
+ <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_attendee_dir"/>
+ <field name="fn">field</field>
+ </record>
+ <record id="basic_calendar_fields_38" model="basic.calendar.fields">
+ <field name="name" ref="caldav.field_attendee_rsvp"/>
+ <field name="type_id" ref="basic_calendar_lines_attendee0"/>
+ <field name="field_id" ref="base_calendar.field_calendar_attendee_rsvp"/>
+ <field name="fn">field</field>
+ </record>
+
+</data>
+</openerp>
\ No newline at end of file
diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py
index 092738d2cf696aa11b90503ba2b4603ab81d8aca..bac2f621f37690bdbb8582b34191fedbdb2794c5 100644
--- a/addons/project_gtd/project_gtd.py
+++ b/addons/project_gtd/project_gtd.py
@@ -29,7 +29,7 @@ class project_gtd_context(osv.osv):
_name = "project.gtd.context"
_description = "Context"
_columns = {
- 'name': fields.char('Context', size=64, required=True, select=1),
+ 'name': fields.char('Context', size=64, required=True, select=1, translate=1),
'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of contexts."),
}
_defaults = {
@@ -44,7 +44,7 @@ class project_gtd_timebox(osv.osv):
_name = "project.gtd.timebox"
_order = "sequence"
_columns = {
- 'name': fields.char('Timebox', size=64, required=True, select=1),
+ 'name': fields.char('Timebox', size=64, required=True, select=1, translate=1),
'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of timebox."),
'icon': fields.selection(tools.icons, 'Icon', size=64),
}
@@ -104,9 +104,10 @@ class project_task(osv.osv):
res = super(project_task,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
search_extended = False
timebox_obj = self.pool.get('project.gtd.timebox')
- if res['type'] == 'search':
+ access_pool = self.pool.get('ir.model.access')
+ if (res['type'] == 'search') and access_pool.check_groups(cr, uid, "project_gtd.group_project_getting"):
tt = timebox_obj.browse(cr, uid, timebox_obj.search(cr,uid,[]))
- search_extended ='''<newline/><group col="%d" expand="1" string="%s" groups="project_gtd.group_project_getting">''' % (len(tt)+7,_('Getting Things Done'))
+ search_extended ='''<newline/><group col="%d" expand="%d" string="%s">''' % (len(tt)+7,1,_('Getting Things Done'))
search_extended += '''<filter domain="[('timebox_id','=', False)]" context="{'set_editable':True,'set_visible':True,'gtd_visible':True,'user_invisible':True}" icon="gtk-new" help="Undefined Timebox" string="%s"/>''' % (_('Inbox'),)
search_extended += '''<filter context="{'set_editable':True,'set_visible':True,'gtd_visible':True,'user_invisible':True}" icon="gtk-new" string="%s"/>''' % (_('GTD'),)
search_extended += '''<separator orientation="vertical"/>'''
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index d80dd86a243c5b005417c1528dcaf4d06dd538f1..427bd7fd87e887a2cbc502e1d5d58f6c10aa15d3 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -28,9 +28,10 @@
<record model="ir.actions.act_window" id="open_gtd_context_tree">
<field name="name">Contexts</field>
<field name="res_model">project.gtd.context</field>
+ <field name="help">Contexts are defined in the "Getting Things Done" methodology. It allows you to categorize your tasks according to the context in which they have to be done: at office, at home, when I take my car, etc.</field>
</record>
- <menuitem name="Contexts" id="menu_open_gtd_time_contexts" groups="group_project_getting,base.group_system,project.group_project_finance_user"
+ <menuitem name="Contexts" id="menu_open_gtd_time_contexts" groups="group_project_getting"
parent="project.menu_tasks_config" action="open_gtd_context_tree"/>
<record model="ir.ui.view" id="view_gtd_timebox_tree">
@@ -66,6 +67,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_gtd_timebox_tree"/>
+ <field name="help">Timeboxes are defined in the "Getting Things Done" methodology. It defines a period of time in order to categorize your tasks: today, this week, this month, long term.</field>
</record>
<menuitem name="Timeboxes" id="menu_open_gtd_time_timeboxes" parent="project.menu_tasks_config" action="open_gtd_timebox_tree"/>
diff --git a/addons/project_gtd/security/ir.model.access.csv b/addons/project_gtd/security/ir.model.access.csv
index 0986ea1570f82a37622ee4faf8afad0d3a573f30..0398fbfb0ee327dc3915f3044d31d06e7020a109 100644
--- a/addons/project_gtd/security/ir.model.access.csv
+++ b/addons/project_gtd/security/ir.model.access.csv
@@ -5,7 +5,3 @@
"access_project_gtd_timebox_user","project.gtd.timebox project user","model_project_gtd_timebox","project.group_project_user",1,0,0,0
"access_project_gtd_context_manager","project.gtd.context project manager","model_project_gtd_context","project.group_project_manager",1,1,1,1
"access_project_gtd_timebox_manager","project.gtd.timebox project manager","model_project_gtd_timebox","project.group_project_manager",1,1,1,1
-"access_project_gtd_context_system","project.gtd.context system","model_project_gtd_context","base.group_system",1,1,1,1
-"access_project_gtd_timebox_system","project.gtd.timebox system","model_project_gtd_timebox","base.group_system",1,1,1,1
-"access_project_gtd_context_finacial_user","project.gtd.context.financial.user","model_project_gtd_context","project.group_project_finance_user",1,0,0,0
-"access_project_gtd_timebox_finacial_user","project.gtd.timebox.financial.user","model_project_gtd_timebox","project.group_project_finance_user",1,0,0,0
\ No newline at end of file
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 0e9807c865b1e3b131d339fdc81aa11b49dcc1e6..2887b25610d52d96240649b53d0129c235729aad 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -58,7 +58,7 @@ class project_issue(crm.crm_case, osv.osv):
res = super(project_issue, self).case_open(cr, uid, ids, *args)
self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
for (id, name) in self.name_get(cr, uid, ids):
- message = _('Issue ') + " '" + name + "' "+ _("is Open.")
+ message = _("Issue '%s' has been opened.") % name
self.log(cr, uid, id, message)
return res
@@ -73,7 +73,7 @@ class project_issue(crm.crm_case, osv.osv):
res = super(project_issue, self).case_close(cr, uid, ids, *args)
for (id, name) in self.name_get(cr, uid, ids):
- message = _('Issue ') + " '" + name + "' "+ _("is Closed.")
+ message = _("Issue '%s' has been closed.") % name
self.log(cr, uid, id, message)
return res
@@ -401,8 +401,6 @@ class project_issue(crm.crm_case, osv.osv):
vals.update(res)
context.update({'state_to' : 'draft'})
res = self.create(cr, uid, vals, context)
- message = _('An Issue created') + " '" + subject + "' " + _("from Mailgate.")
- self.log(cr, uid, res, message)
self.convert_to_bug(cr, uid, [res], context=context)
attachents = msg.get('attachments', [])
diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml
index df76e808bfff4cae4ce45ef9dd1c68fedff69b61..518fc37056a61ba71b02b898eea13f1486c0db23 100644
--- a/addons/project_issue/project_issue_menu.xml
+++ b/addons/project_issue/project_issue_menu.xml
@@ -15,7 +15,7 @@
<field name="domain" eval=""/>
<field name="context">{"search_default_user_id": uid, "search_default_current":1, "search_default_project_id":project_id}</field>
<field name="search_view_id" ref="view_project_issue_filter"/>
- <field name="help">Issues like bugs in a system, client complain, materials breakdown are collected here. A list view allows the manager to quickly check for them, assign them, make their status evolved.</field>
+ <field name="help">Issues such as system bugs, client complains, material breakdowns are collected here. You can define the stages assigned to the resolution of the issue on the project. (analysis, development, done) Using the mailgateway module, the issues can be integrated to an email address (example: support@mycompany.com)</field>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view0">
@@ -49,6 +49,6 @@
view_type="form"/>
<menuitem name="Issues" id="menu_project_issue_track" parent="project.menu_project_management"
- action="project_issue_categ_act0" sequence="3"/>
+ action="project_issue_categ_act0" sequence="4"/>
</data>
</openerp>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 9e79f367ca409415964bb42037264ab7ad7f48fe..3894740f0f1255d6fed290e1f740f266dfd92ca0 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -2,7 +2,7 @@
<openerp>
<data>
- <menuitem id="menu_project_confi" name="Project Issue" parent="project.menu_definitions" sequence="2" groups="base.group_system,project.group_project_finance_user"/>
+ <menuitem id="menu_project_confi" name="Project Issue" parent="project.menu_definitions" sequence="2"/>
<record model="ir.ui.view" id="project_issue_version_search_view">
<field name="name">Issue Version</field>
@@ -30,6 +30,7 @@
<field name="name">Versions</field>
<field name="res_model">project.issue.version</field>
<field name="view_type">form</field>
+ <field name="help">You can use the issues tracker in OpenERP to handle bugs in the software development project, to handle claims in after-sales services, etc. Define here the different versions of your products on which you can work on issues.</field>
</record>
<menuitem action="project_issue_version_action" id="menu_project_issue_version_act" parent="menu_project_confi" />
@@ -236,7 +237,7 @@
<filter string="Partner" icon="terp-partner" domain="[]"
context="{'group_by':'partner_id'}" />
<separator orientation="vertical"/>
- <filter string="Project" icon="terp-folder-blue" domain="[]"
+ <filter string="Project" icon="terp-folder-violet" domain="[]"
context="{'group_by':'project_id'}" />
<filter string="Version" icon="terp-gtk-jump-to-rtl"
domain="[]" context="{'group_by':'version_id'}" />
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index dd09592916d88f6e20184fbc8ed20257b1687ec1..5a8c4886d2f630d9ec03262d6e405627c1b99b39 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -121,7 +121,7 @@
domain="[]"
context="{'group_by':'section_id'}" />
<separator orientation="vertical" />
- <filter string="Project" name="project" icon="terp-folder-blue" context="{'group_by':'project_id'}" />
+ <filter string="Project" name="project" icon="terp-folder-violet" context="{'group_by':'project_id'}" />
<filter string="Task" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'task_id'}"/>
<separator orientation="vertical" />
<filter string="Category" icon="terp-stock_symbol-selection"
@@ -159,7 +159,7 @@
<field name="context">{'search_default_This Month':1,'search_default_project':1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="view_id" ref="view_project_issue_report_tree"/>
<field name="search_view_id" ref="view_project_issue_report_filter"/>
- <field name="help">Track your projects issues and fixing delay with a high accuracy. A multicriteria search tool allows fine-grained analysis.</field>
+ <field name="help">This report on the project issues allows you to analyse the quality of your support or after-sales services. You can track the issues per age. You can analyse the time required to open or close an issue, the number of email to exchange and the time spent on average by issues.</field>
</record>
@@ -177,7 +177,7 @@
</record>
<menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
<menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
- <menuitem action="action_project_issue_report" id="menu_project_issue_report_tree" parent="base.menu_project_report" groups="project.group_project_manager,project.group_project_finance_user"/>
+ <menuitem action="action_project_issue_report" id="menu_project_issue_report_tree" parent="base.menu_project_report" groups="project.group_project_manager"/>
</data>
diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv
index b113853cbd256826b6d1f806a9d6c9cf339108a6..f5602f5ae4b968a59869aba3c838318cba270763 100755
--- a/addons/project_issue/security/ir.model.access.csv
+++ b/addons/project_issue/security/ir.model.access.csv
@@ -8,17 +8,7 @@
"access_crm_case_categ_supp","crm.case.categ","crm.model_crm_case_categ","project_issue.group_project_supporter",1,0,0,0
"access_project_issue_version_project","project_issue_version manager","model_project_issue_version","project.group_project_manager",1,1,1,1
"access_project_issue_version","project_issue_version manager","model_project_issue_version","project_issue.group_project_supporter",1,0,0,0
-"access_project_issue_system","project.issue system","model_project_issue","base.group_system",1,0,0,0
-"access_project_issue_report_system","project.issue.report system","model_project_issue_report","base.group_system",1,0,0,0
-"access_crm_case_section_system","crm.case.section system","crm.model_crm_case_section","base.group_system",1,1,1,1
-"access_project_issue_version_financial_user","project.issue.version.financial.user","model_project_issue_version","project.group_project_finance_user",1,0,0,0
-"access_crm_case_categ_financial_user","crm.case.categ.financial.user","crm.model_crm_case_categ","project.group_project_finance_user",1,0,0,0
-"access_crm_case_stage_financial_user","crm.case.stage.financial.user","crm.model_crm_case_stage","project.group_project_finance_user",1,0,0,0
-"access_project_issue_report_financial_user","project.issue.report.financial.user","model_project_issue_report","project.group_project_finance_user",1,0,0,0
-"access_project_issue_board_project_financial_user","board.board.project.issue.financial.user","board.model_board_board","project.group_project_finance_user",1,0,0,0
-"access_project_issue_project_financial_user","project.issue.financial.user","model_project_issue","project.group_project_finance_user",1,0,0,0
-"access_mailgate_message_project_financial_user","mailgate.message.financial.user","mail_gateway.model_mailgate_message","project.group_project_finance_user",1,0,0,0
"access_mailgate_message_project_manager","mailgate.message.manager","mail_gateway.model_mailgate_message","project.group_project_manager",1,1,1,1
"access_resource_calendar_project_manager","resource.calendar.project.manager","resource.model_resource_calendar","project.group_project_manager",1,1,1,1
"access_project_issue_report_user","project.issue.report user","model_project_issue_report","project.group_project_user",1,1,1,0
-"access_mailgate_message_issue_project_user","project.mailgate.message.issue.user","mail_gateway.model_mailgate_message","project.group_project_user",1,1,1,0
\ No newline at end of file
+"access_mailgate_message_issue_project_user","project.mailgate.message.issue.user","mail_gateway.model_mailgate_message","project.group_project_user",1,1,1,0
diff --git a/addons/project_issue_sheet/security/ir.model.access.csv b/addons/project_issue_sheet/security/ir.model.access.csv
index 25bcbe03ccd73ba372302395121a04b8a0e65f9e..0e6c92c038ba2cc36facee071742add3854a355f 100644
--- a/addons/project_issue_sheet/security/ir.model.access.csv
+++ b/addons/project_issue_sheet/security/ir.model.access.csv
@@ -3,13 +3,6 @@
"access_hr_analytic_timesheet_project_user","hr_analytic_timesheet user","hr_timesheet_sheet.model_hr_analytic_timesheet","project.group_project_user",1,1,1,0
"access_hr_analytic_timesheet_project_manager","hr_analytic_timesheet manager","hr_timesheet_sheet.model_hr_analytic_timesheet","project.group_project_manager",1,0,0,0
"access_hr_timesheet_sheet_sheet_project_manager","hr_timesheet_sheet.sheet manager","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","project.group_project_manager",1,0,0,0
-"access_hr_analytic_timesheet_system","hr_analytic_timesheet system","hr_timesheet_sheet.model_hr_analytic_timesheet","base.group_system",1,0,0,0
-"access_hr_timesheet_sheet_sheet_project_system","hr_timesheet_sheet.sheet system","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","base.group_system",1,0,0,0
-"access_hr_analytic_timesheet_project_financial_user","account.analytic.line.timesheet.project.financial.user","account.model_account_analytic_line","project.group_project_finance_user",1,1,1,0
-"access_account_analytic_journal_project_financial_user","account.analytic.journal.project.financial.user","account.model_account_analytic_journal","project.group_project_finance_user",1,1,1,0
-"access_account_fiscalyear_project_financial_user","account.fiscalyear.project.financial.user","account.model_account_fiscalyear","project.group_project_finance_user",1,1,1,0
-"access_hr_timesheet_invoice_factor_project_financial_user","hr_timesheet_invoice.factor.project.financial.user","hr_timesheet_invoice.model_hr_timesheet_invoice_factor","project.group_project_finance_user",1,1,1,0
-"access_account_invoice_project_financial_user","account.invoice.project.financial.user","account.model_account_invoice","project.group_project_finance_user",1,1,1,0
"access_hr_analytic_timesheet_project_manager","account.analytic.line.timesheet.project.manager","account.model_account_analytic_line","project.group_project_manager",1,1,1,1
"access_account_analytic_journal_project_manager","account.analytic.journal.project.manager","account.model_account_analytic_journal","project.group_project_manager",1,1,1,1
"access_account_fiscalyear_project_manager","account.fiscalyear.project.manager","account.model_account_fiscalyear","project.group_project_manager",1,1,1,1
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index cfe4ff4f283ef6f1e7f9e46f6fe4e2a3dc85a766..faea0916906eec597f1823def1fcbe57bb51731a 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -399,9 +399,7 @@ class project_resource_allocation(osv.osv):
def get_name(self, cr, uid, ids, field_name, arg, context=None):
res = {}
for allocation in self.browse(cr, uid, ids, context=context):
- name = allocation.resource_id.name
- if allocation.user_id:
- name = '%s' %(allocation.user_id.name)
+ name = allocation.phase_id.name
name += ' (%s%%)' %(allocation.useability)
res[allocation.id] = name
return res
diff --git a/addons/project_long_term/project_long_term_demo.xml b/addons/project_long_term/project_long_term_demo.xml
index 3bc236dee26773406d6ee22e4573c4edab07a3f1..8a37f4cc4446c1225099488a34729b755a7dbe39 100644
--- a/addons/project_long_term/project_long_term_demo.xml
+++ b/addons/project_long_term/project_long_term_demo.xml
@@ -4,8 +4,6 @@
<!--
This Demo data file Human Resources, Phases and Resources,Tasks allocation and also run scheduling of phase and tasks.
-->
-
-
<!-- Human Resources -->
<record id="resource_analyst" model="resource.resource">
<field name="user_id" ref="project.res_users_analyst"/>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 5e6ccebfe75e3394f932513dd58a3854aaff37b3..71e965432327a13ad94369bcee28f356862ed122 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -14,7 +14,7 @@
<field name="type">gantt</field>
<field name="arch" type="xml">
<gantt color="project_id" date_start="date_start" date_stop="date_end" mode="year">
- <level object="project.phase" link="phase_id" domain="[]">
+ <level object="res.users" link="user_id" domain="[]">
<field name="name"/>
</level>
</gantt>
@@ -73,7 +73,7 @@
<field name="model">project.resource.allocation</field>
<field name="type">search</field>
<field name="arch" type="xml">
- <search string="Resource Allocations">
+ <search string="Resources Allocation">
<group colspan="4" col="20">
<field name="resource_id"/>
<field name="phase_id"/>
@@ -83,15 +83,14 @@
<group expand="0" string="Group By..." colspan="4" col="20">
<filter name="resource" string="Resource" icon="terp-personal" domain="[]" context="{'group_by':'resource_id'}"/>
<separator orientation="vertical"/>
- <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
+ <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
<filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/>
</group>
</search>
</field>
</record>
-
<record id="act_resouce_allocation" model="ir.actions.act_window">
- <field name="name">Resource Allocations</field>
+ <field name="name">Resources Allocation</field>
<field name="res_model">project.resource.allocation</field>
<field name="view_type">form</field>
<field name="view_mode">gantt,tree,form,calendar</field>
@@ -243,7 +242,7 @@
<field name="type">gantt</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
- <gantt color="project_id" date_stop="date_end" date_start="date_start" mode="year">
+ <gantt color="project_id" date_stop="date_end" date_start="date_start" mode="month">
<level object="project.project" link="project_id" domain="[]">
<field name="name"/>
</level>
@@ -264,7 +263,7 @@
<separator orientation="vertical"/>
<field name="name"/>
<field name="project_id">
- <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
+ <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-violet"/>
</field>
<field name="responsible_id"/>
<field name="date_start"/>
@@ -273,7 +272,7 @@
<group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
<filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'responsible_id'}"/>
<separator orientation="vertical"/>
- <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}" name="project"/>
+ <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}" name="project"/>
<separator orientation="vertical"/>
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<separator orientation="vertical"/>
@@ -290,7 +289,7 @@
<field name="view_mode">gantt,tree,form,calendar</field>
<field name="context">{'search_default_responsible_id':uid,'search_default_project':1}</field>
<field name="search_view_id" ref="view_project_phase_search"/>
- <field name="help">You can subdivide your larger projects into several phases. For each phase, you can define your resources allocation (humans or engine), describe de differend task and link your phase with previous and next one, add constraints date and scheduling. A gantt view of your project phase is also available from this menu. Gantt view is a graphically draw of the project plan; it includes any task dependencies by visually adjusting task durations and priorities, and by linking tasks to each other.</field>
+ <field name="help">A project can be split into the different phases. For each phase, you can define your resources allocation, describe different tasks and link your phase to previous and next ones, add date constraints for the automated scheduling. Use the long term planning in order to planify your available human resources, convert your phases into a series of tasks when you start working on it.</field>
</record>
<record id="act_project_phase_list" model="ir.actions.act_window">
@@ -298,7 +297,7 @@
<field name="res_model">project.phase</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar</field>
- <field name="context">{'search_default_responsible_id':uid,'search_default_project':1}</field>
+ <field name="context">{'search_default_responsible_id':uid,'search_default_project':1}</field>
<field name="search_view_id" ref="view_project_phase_search"/>
</record>
@@ -356,7 +355,7 @@
context="{'search_default_phase_id': [active_id]}"/>
<act_window
- context="{'search_default_project_id': [active_id]}"
+ context="{'search_default_project_id': [active_id]}"
id="act_project_phases"
name="Phases"
res_model="project.phase"
@@ -368,19 +367,23 @@
# Menu Items
# ------------------------------------------------------
+ <menuitem action="act_project_phase_list"
+ groups="base.group_extended"
+ id="menu_project_phase_list" parent="project.menu_project_management" sequence="2"/>
+
<menuitem action="act_project_phase"
- groups="base.group_extended,project.group_project_finance_user,project.group_project_manager"
+ groups="base.group_extended"
id="menu_project_phase" parent="base.menu_project_long_term" sequence="1"/>
<menuitem id="menu_resouce_allocation" action="act_resouce_allocation"
name="Resource Allocations" parent="base.menu_project_long_term" sequence="2"/>
<menuitem id="menu_pm_resources_project1"
- groups="base.group_extended,project.group_project_finance_user"
+ groups="base.group_extended"
name="Resources" parent="project.menu_definitions" sequence="3"/>
- <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_project_long_term" sequence="4" groups="project.group_project_user,project.group_project_manager,base.group_system,project.group_project_finance_user"/>
- <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="base.menu_project_long_term" sequence="2"/>
+ <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_main_pm" sequence="4" groups="project.group_project_user,project.group_project_manager"/>
+ <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="menu_pm_resources_project1" sequence="2"/>
<menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_resources_project1" sequence="1"/>
<menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_resources_project1" sequence="1"/>
diff --git a/addons/project_long_term/security/ir.model.access.csv b/addons/project_long_term/security/ir.model.access.csv
index 08297cee95d9e7b5f78a592d800fb0526591f88d..3aaebb64294bb8cdbf2d8501e90b4cbc887fafb6 100644
--- a/addons/project_long_term/security/ir.model.access.csv
+++ b/addons/project_long_term/security/ir.model.access.csv
@@ -3,14 +3,7 @@
"access_project_resource_allocation","project.resource.allocation","model_project_resource_allocation","project.group_project_user",1,0,0,0
"access_project_phase_manager","project.phase manager","model_project_phase","project.group_project_manager",1,0,0,0
"access_project_resource_allocation_manager","project.resource.allocation manager","model_project_resource_allocation","project.group_project_manager",1,0,0,0
-"access_project_resource_allocation_system","project.resource.allocation system","model_project_resource_allocation","base.group_system",1,0,0,0
-"access_project_phase_system","project.phase system","model_project_phase","base.group_system",1,0,0,0
"access_resource_resource_user","resource.resource user","resource.model_resource_resource","project.group_project_user",1,0,0,0
"access_resource_calendar_leaves_user","resource.calendar.leaves user","resource.model_resource_calendar_leaves","project.group_project_user",1,1,1,1
"access_resource_resource_manager","resource.resource manager","resource.model_resource_resource","project.group_project_manager",1,1,1,1
-"access_project_resource_allocation_financial_user","project.resource.allocation.financial.user","model_project_resource_allocation","project.group_project_finance_user",1,0,0,0
-"access_project_phase_financial_user","project.phase.financial.user","model_project_phase","project.group_project_finance_user",1,0,0,0
-"access_resource_resource_financial_user","resource.resource.financial.user","model_resource_resource","project.group_project_finance_user",1,0,0,0
-"access_resource_calendar_financial_user","resource.calendar.financial.user","resource.model_resource_calendar","project.group_project_finance_user",1,0,0,0
-"access_resource_calendar_financial_user","resource.calendar.financial.user","resource.model_resource_calendar_leaves","project.group_project_finance_user",1,0,0,0
-"access_project_resource_allocation_manager","project.resource.allocation.manager","model_project_resource_allocation","project.group_project_manager",1,1,1,1
\ No newline at end of file
+"access_project_resource_allocation_manager","project.resource.allocation.manager","model_project_resource_allocation","project.group_project_manager",1,1,1,1
diff --git a/addons/project_mailgate/project_mailgate.py b/addons/project_mailgate/project_mailgate.py
index 9b6b7d77f7b5992279d96b79cee3baa2e9582393..c232b41fe767f1505b8c0f7bbabafc95f63a3a50 100644
--- a/addons/project_mailgate/project_mailgate.py
+++ b/addons/project_mailgate/project_mailgate.py
@@ -54,9 +54,6 @@ class project_tasks(osv.osv):
data.update(res)
res = self.create(cr, uid, data)
- message = _('A task created') + " '" + subject + "' " + _("from Mailgate.")
- self.log(cr, uid, res, message)
-
attachments = msg.get('attachments', [])
for attachment in attachments or []:
data_attach = {
diff --git a/addons/project_messages/i18n/sr.po b/addons/project_messages/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..cb2e777e1231bd123539aea848bab16b891a92e9
--- /dev/null
+++ b/addons/project_messages/i18n/sr.po
@@ -0,0 +1,127 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-20 10:28+0000\n"
+"PO-Revision-Date: 2010-10-15 09:07+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-16 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_messages
+#: field:project.messages,to_id:0
+msgid "To"
+msgstr "Do"
+
+#. module: project_messages
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: project_messages
+#: field:project.messages,from_id:0
+msgid "From"
+msgstr "Od"
+
+#. module: project_messages
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
+#: view:project.messages:0
+msgid "Communication Messages"
+msgstr "Komunikacione Poruke"
+
+#. module: project_messages
+#: help:project.messages,to_id:0
+msgid "Keep this empty to broadcast the message."
+msgstr "Ostavi ovo praznim da pratis poruke"
+
+#. module: project_messages
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da poÄinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: project_messages
+#: model:ir.model,name:project_messages.model_project_messages
+msgid "project.messages"
+msgstr ""
+
+#. module: project_messages
+#: view:project.messages:0
+#: view:project.project:0
+#: field:project.project,message_ids:0
+msgid "Messages"
+msgstr "Poruke"
+
+#. module: project_messages
+#: model:ir.model,name:project_messages.model_project_project
+#: view:project.messages:0
+#: field:project.messages,project_id:0
+msgid "Project"
+msgstr "Projekat"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Group By..."
+msgstr "Grupirano po"
+
+#. module: project_messages
+#: model:ir.module.module,description:project_messages.module_meta_information
+msgid ""
+"\n"
+" This module provides the functionality to send messages within a "
+"project.\n"
+" A user can send messages individually to other user. He can even "
+"broadcast\n"
+" it to all the users.\n"
+" "
+msgstr ""
+"\n"
+" Ovaj modul obezbedjuje funkcionalnost da saljete poruke vezane za "
+"projekat.\n"
+" Korisnik moze slati poruke individualno drugom korisniku, Moze ih cak "
+"proslediti\n"
+" svim korisnicima.\n"
+" "
+
+#. module: project_messages
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Greska! Ne mozete kreirati rekursivni meni."
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Message To"
+msgstr "Poruka za"
+
+#. module: project_messages
+#: view:project.messages:0
+#: field:project.messages,message:0
+#: view:project.project:0
+msgid "Message"
+msgstr "Poruka"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Message From"
+msgstr "Poruka od"
+
+#. module: project_messages
+#: model:ir.module.module,shortdesc:project_messages.module_meta_information
+msgid "In-Project Messaging System"
+msgstr "Projektni sistem dopisivanja"
diff --git a/addons/project_messages/project_messages_view.xml b/addons/project_messages/project_messages_view.xml
index 7042ce9d9b2cf632c050105e9664fa7db0e345eb..bffd1af050337cb4a80fe834aa609b06cfe3f4e3 100644
--- a/addons/project_messages/project_messages_view.xml
+++ b/addons/project_messages/project_messages_view.xml
@@ -82,7 +82,7 @@
<filter string="Message To" icon="terp-personal" domain="[]" context="{'group_by':'to_id'}"/>
<filter string="Message From" icon="terp-personal" domain="[]" context="{'group_by':'from_id'}"/>
<separator orientation="vertical"/>
- <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
+ <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
</group>
</search>
</field>
diff --git a/addons/project_messages/security/ir.model.access.csv b/addons/project_messages/security/ir.model.access.csv
index e31ffd860cb51bd77d22adec820f69af14ddde35..5756a7456bb5e14eb86b9b420abb23911f493a1b 100644
--- a/addons/project_messages/security/ir.model.access.csv
+++ b/addons/project_messages/security/ir.model.access.csv
@@ -1,5 +1,4 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_project_messages","project.messages","model_project_messages","project.group_project_user",1,1,1,1
"access_project_messages_manager","project.messages manager","model_project_messages","project.group_project_manager",1,1,1,1
-"access_project_messages_financial_user","project.messages.financial.user","model_project_messages","project.group_project_finance_user",1,0,0,0
"access_project_message_project_user","project.project.user","model_project_project","project.group_project_user",1,0,0,0
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index 5c8d4cc5af92e74631fed79d4bd5e39295f38966..9abff817d17065da518dae62e2364e525ffc971b 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -219,7 +219,7 @@
parent="base.menu_main_pm" />
<menuitem action="action_account_analytic_planning_form"
- id="menu_report_account_analytic_planning" parent="base.menu_project_long_term" sequence="3" groups="project.group_project_user,project.group_project_manager,base.group_system,project.group_project_finance_user"/>
+ id="menu_report_account_analytic_planning" parent="base.menu_project_long_term" sequence="3" groups="project.group_project_user,project.group_project_manager"/>
<!--
Planning statistics
diff --git a/addons/project_planning/security/ir.model.access.csv b/addons/project_planning/security/ir.model.access.csv
index 2c6c92db8ff704366b2c33845d9039a0811290ed..d5cb64be83da0714f182165950761751895cebe2 100644
--- a/addons/project_planning/security/ir.model.access.csv
+++ b/addons/project_planning/security/ir.model.access.csv
@@ -8,8 +8,4 @@
"access_report_account_analytic_planning_account_project_manager","report_account_analytic.planning.account","model_report_account_analytic_planning_account","project.group_project_manager",1,1,1,1
"access_report_account_analytic_planning_line_project_user","report_account_analytic.planning.line user","model_report_account_analytic_planning_line","project.group_project_user",1,1,1,0
"access_report_account_analytic_planning_account_project_user","report_account_analytic.planning.account user","model_report_account_analytic_planning_account","project.group_project_user",1,1,1,0
-"access_report_account_analytic_planning_system","report_account_analytic.planning system","model_report_account_analytic_planning","base.group_system",1,0,0,0
-"access_report_account_analytic_planning_financial_user","report_account_analytic.planning.financial.user","model_report_account_analytic_planning","project.group_project_finance_user",1,0,0,0
-"access_report_account_analytic_planning_stat_financial_user","report_account_analytic.planning.stat.financial.user","model_report_account_analytic_planning_stat","project.group_project_finance_user",1,0,0,0
"access_report_account_analytic_planning__project_manager","report_account_analytic.planning.manager","model_report_account_analytic_planning_user","project.group_project_manager",1,1,1,1
-"access_report_account_analytic_planning__project_finance_user","report_account_analytic.planning.finance.user","model_report_account_analytic_planning_user","project.group_project_finance_user",1,0,0,0
\ No newline at end of file
diff --git a/addons/project_retro_planning/i18n/sr.po b/addons/project_retro_planning/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..d70f5b3f565dcf9ef540653d61c48e8d9a0855cf
--- /dev/null
+++ b/addons/project_retro_planning/i18n/sr.po
@@ -0,0 +1,23 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-15 09:18+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-16 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_retro_planning
+#: model:ir.module.module,shortdesc:project_retro_planning.module_meta_information
+msgid "Project Retro planning"
+msgstr "Retro Projektno Planiranje"
diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py
index e02e16c478bbc7d18966938650b91b1084a9cedd..82395c3eb3534cefdc48bc267ea1809fb2d1cc2c 100644
--- a/addons/project_scrum/project_scrum.py
+++ b/addons/project_scrum/project_scrum.py
@@ -86,7 +86,7 @@ class project_scrum_sprint(osv.osv):
context = {}
self.write(cr, uid, ids, {'state':'open'}, context=context)
for (id, name) in self.name_get(cr, uid, ids):
- message = _('Sprint ') + " '" + name + "' "+ _("is Open.")
+ message = _("The sprint '%s' has been opened.") % (name,)
self.log(cr, uid, id, message)
return True
@@ -95,7 +95,7 @@ class project_scrum_sprint(osv.osv):
context = {}
self.write(cr, uid, ids, {'state':'done'}, context=context)
for (id, name) in self.name_get(cr, uid, ids):
- message = _('Sprint ') + " '" + name + "' "+ _("is Closed.")
+ message = _("The sprint '%s' has been closed.") % (name,)
self.log(cr, uid, id, message)
return True
@@ -214,9 +214,6 @@ class project_scrum_product_backlog(osv.osv):
if context is None:
context = {}
self.write(cr, uid, ids, {'state':'open'}, context=context)
- for (id, name) in self.name_get(cr, uid, ids):
- message = _('Product Backlog ') + " '" + name + "' "+ _("is Open.")
- self.log(cr, uid, id, message)
return True
def button_close(self, cr, uid, ids, context=None):
@@ -226,8 +223,6 @@ class project_scrum_product_backlog(osv.osv):
self.write(cr, uid, ids, {'state':'done'}, context=context)
for backlog in self.browse(cr, uid, ids, context=context):
obj_project_task.write(cr, uid, [i.id for i in backlog.tasks_id], {'state': 'done'})
- message = _('Product Backlog ') + " '" + backlog.name + "' "+ _("is Closed.")
- self.log(cr, uid, backlog.id, message)
return True
def button_pending(self, cr, uid, ids, context=None):
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index cd4eb8e61b403c30c57b0aa9cc142543148fd468..6978f09c8f66892fc5dd880ba22c9edcc9754d31 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -166,7 +166,7 @@
<group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
<filter string="Author" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<separator orientation="vertical"/>
- <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
+ <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
<filter string="Sprint" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'sprint_id'}"/>
<separator orientation="vertical"/>
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
@@ -181,6 +181,7 @@
<field name="view_type">form</field>
<field name="context">{'search_default_current': 1,'search_default_user_id':uid,'search_default_project_id':project_id}</field>
<field name="search_view_id" ref="view_scrum_product_backlog_search"/>
+ <field name="help">The scrum agile methodology is used in software development projects. The Product Backlog is the list of features to be implemented. A product backlog can be planified in a sprint of developement and can be split into several tasks. The product backlog is managed by the product owner of the project.</field>
</record>
<menuitem
action="action_product_backlog_form"
@@ -332,7 +333,7 @@
<filter string="Product owner" icon="terp-personal" domain="[]" context="{'group_by':'product_owner_id'}"/>
<filter string="Scrum Master" icon="terp-personal" domain="[]" context="{'group_by':'scrum_master_id'}"/>
<separator orientation="vertical"/>
- <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
+ <filter string="Project" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
<separator orientation="vertical"/>
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<separator orientation="vertical"/>
@@ -350,6 +351,7 @@
<field name="view_id" ref="view_scrum_sprint_tree"/>
<field name="context">{"search_default_filter_current": 1}</field>
<field name="search_view_id" ref="view_scrum_sprint_search"/>
+ <field name="help">The scrum agile methodology is used in software development projects. In this methodology, a sprint is a short period of time (one month) on which the team implement a list of product backlogs. The sprint review is organized when the team presents his work to the customer and product owner.</field>
</record>
<menuitem
sequence="20"
@@ -448,6 +450,7 @@
<field name="view_mode">tree,form,calendar</field>
<field name="context">{'search_default_scrum_daily':1,'search_default_project_id':project_id}</field>
<field name="search_view_id" ref="view_scrum_meeting_search"/>
+ <field name="help">The scrum agile methodology is used in software development projects. In this methodology, a daily meeting is organized by the scrum master with his team in order to detect the difficulties the team faced/will face.</field>
</record>
<menuitem sequence="30"
action="action_meeting_form" id="menu_action_meeting_form" parent="menu_scrum"/>
diff --git a/addons/project_scrum/security/ir.model.access.csv b/addons/project_scrum/security/ir.model.access.csv
index 385996447516fc635b1cd00d57ba271c2c6b276a..88e8c506e14ba77ab1bd79285f08a72dbd491c56 100644
--- a/addons/project_scrum/security/ir.model.access.csv
+++ b/addons/project_scrum/security/ir.model.access.csv
@@ -7,9 +7,3 @@
"access_scrum_product_backlog_manager","project_scrum.product.backlog manager","model_project_scrum_product_backlog","project.group_project_manager",1,1,1,1
"access_product_uom_project_manager","product.uom project manager","product.model_product_uom","project.group_project_manager",1,1,1,1
"access_product_uom_project_user","product.uom project user","product.model_product_uom","project.group_project_user",1,0,0,0
-"access_scrum_sprint_system","project_scrum.sprint system","model_project_scrum_sprint","base.group_system",1,0,0,0
-"access_scrum_product_backlog_system","project_scrum.product.backlog system","model_project_scrum_product_backlog","base.group_system",1,0,0,0
-"access_scrum_meeting_system","project_scrum.meeting system","model_project_scrum_meeting","base.group_system",1,0,0,0
-"access_project_scrum_backlog_financial_user","project_scrum.product.backlog.financial.user","model_project_scrum_product_backlog","project.group_project_finance_user",1,0,0,0
-"access_project_scrum_sprint_financial_user","project_scrum.sprint.financial.user","model_project_scrum_sprint","project.group_project_finance_user",1,0,0,0
-"access_scrum_meeting_financial_user","project_scrum.meeting.financial.user","model_project_scrum_meeting","project.group_project_finance_user",1,0,0,0
\ No newline at end of file
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index f5480793adc285816a659c260da738e43b548d05..601fbfa578bf8195b91d9d497bebfff81f35e526 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -26,6 +26,20 @@ import pooler
import tools
from tools.translate import _
+class project_project(osv.osv):
+ _inherit = 'project.project'
+ def onchange_partner_id(self, cr, uid, ids, part=False, context=None):
+ result = super(project_project, self).onchange_partner_id(cr, uid, ids, part, context)
+ if result.get('value', False):
+ try:
+ d = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'hr_timesheet_invoice', 'timesheet_invoice_factor1')
+ if d:
+ result['value']['to_invoice'] = d[1]
+ except ValueError, e:
+ pass
+ return result
+project_project()
+
class project_work(osv.osv):
_inherit = "project.task.work"
@@ -66,10 +80,7 @@ class project_work(osv.osv):
vals_line = {}
context = kwargs.get('context', {})
- #TOFIX: after loading project_timesheet module, it's fail yml of other project* modules.
- #Temporary: pass context['withoutemployee'] = True in all yml.
- if 'withoutemployee' in context and context['withoutemployee']:
- return super(project_work,self).create(cr, uid, vals, context=context)
+
obj_task = task_obj.browse(cr, uid, vals['task_id'])
result = self.get_user_related_details(cr, uid, vals.get('user_id', uid))
vals_line['name'] = '%s: %s' % (tools.ustr(obj_task.name), tools.ustr(vals['name']) or '/')
@@ -79,7 +90,8 @@ class project_work(osv.osv):
#calculate quantity based on employee's product's uom
vals_line['unit_amount'] = vals['hours']
- user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)
+
+ default_uom = self.pool.get('res.users').browse(cr, uid, uid).company_id.project_time_mode_id.id
if result['product_uom_id'] != default_uom:
vals_line['unit_amount'] = uom_obj._compute_qty(cr, uid, default_uom, vals['hours'], result['product_uom_id'])
acc_id = obj_task.project_id and obj_task.project_id.analytic_account_id.id or False
@@ -136,7 +148,7 @@ class project_work(osv.osv):
if 'date' in vals:
vals_line['date'] = vals['date'][:10]
if 'hours' in vals:
- user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)
+ default_uom = self.pool.get('res.users').browse(cr, uid, uid).company_id.project_time_mode_id.id
vals_line['unit_amount'] = vals['hours']
prod_id = vals_line.get('product_id', line_id.product_id.id) # False may be set
@@ -145,13 +157,13 @@ class project_work(osv.osv):
# Compute based on pricetype
amount_unit = timesheet_obj.on_change_unit_amount(cr, uid, line_id.id,
- prod_id=prod_id,
- quantity=vals_line['unit_amount'], unit=False, context=context)
+ prod_id=prod_id, company_id=False,
+ unit_amount=vals_line['unit_amount'], unit=False, context=context)
if amount_unit and 'amount' in amount_unit.get('value',{}):
vals_line['amount'] = amount_unit['value']['amount']
- obj.write(cr, uid, [line_id.id], vals_line, context=context)
+ self.pool.get('hr.analytic.timesheet').write(cr, uid, [line_id.id], vals_line, context=context)
return super(project_work,self).write(cr, uid, ids, vals, context)
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 05be6d5466ee1e9e7511797c3ab7bc8629a5c40d..5ceaf83890e760800286cc7ee3c1495e2fa9e5e1 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -27,16 +27,16 @@
<field name="arch" type="xml">
<xpath expr='//filter[@string="Member"]' position='after'>
<separator orientation="vertical"/>
- <filter icon="terp-camera_test" string="Billable" domain="[('to_invoice','!=', False)]" help="Billable Project"/>
+ <filter icon="terp-camera_test" string="Invoiceble" domain="[('to_invoice','!=', False)]" help="Invoiceable Project"/>
</xpath>
</field>
</record>
- <menuitem id="menu_project_billing" name="Billing"
+ <menuitem id="menu_project_billing" name="Invoicing"
parent="base.menu_main_pm" sequence="5"/>
- <menuitem id="menu_project_billing_line" name="Bill Tasks Work"
+ <menuitem id="menu_project_billing_line" name="Invoice Tasks Work"
parent="menu_project_billing" action="hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree"/>
<menuitem id="base.menu_project_management_time_tracking" name="Time Tracking"
- parent="base.menu_main_pm" sequence="5" groups="project.group_project_finance_user"/>
+ parent="base.menu_main_pm" sequence="5"/>
</data>
</openerp>
diff --git a/addons/project_timesheet/security/ir.model.access.csv b/addons/project_timesheet/security/ir.model.access.csv
index 8f10009fa12e0789be7fc93dd2c09d0be35c72e5..4888811df2f9343e7b8c295253e4bfee256e9ce7 100644
--- a/addons/project_timesheet/security/ir.model.access.csv
+++ b/addons/project_timesheet/security/ir.model.access.csv
@@ -2,7 +2,3 @@
"access_report_timesheet_task_user_manager","report.timesheet.task.user.manager","model_report_timesheet_task_user","project.group_project_manager",1,1,1,1
"access_hr_analytic_timesheet_user","hr.analytic.timesheet.user","hr_timesheet_sheet.model_hr_analytic_timesheet","project.group_project_user",1,1,1,0
"access_hr_timesheet_sheet_sheet_user","hr.timesheet.sheet.sheet.user","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","project.group_project_user",1,1,1,0
-"access_hr_analytic_timesheet_system","hr.analytic.timesheet.system","hr_timesheet_sheet.model_hr_analytic_timesheet","base.group_system",1,1,1,1
-"access_hr_timesheet_sheet_sheet_system","hr.timesheet.sheet.sheet.system","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","base.group_system",1,1,1,1
-"access_project_timesheet_project_financial_user","hr_timesheet_sheet.sheet.project.financial.user","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","project.group_project_finance_user",1,1,1,0
-"access_report_timesheet_task_user_financial_user","report.timesheet.task.user.financial.user","model_report_timesheet_task_user","project.group_project_finance_user",1,0,0,0
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index 6bbbe0e73e7263fe77e15b4ff31fc90371612268..283941029223fe047881ab6f082ad2346d5f1816 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -17,7 +17,7 @@
<field name="search_view_id" ref="purchase.purchase_order_tree"/>
</record>
<record id="purchase_waiting" model="ir.actions.act_window">
- <field name="name">Waiting Approval</field>
+ <field name="name">Purchase Order Waiting Approval</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">purchase.order</field>
<field name="view_type">form</field>
@@ -125,7 +125,7 @@
<action colspan="4" height="220" name="%(purchase.action_po_per_month_tree)d" string="Purchase order per month" width="510"/>
-->
<action colspan="4" height="220" name="%(purchase_draft)d" string="Request for Quotations" width="510"/>
- <action colspan="4" height="220" name="%(purchase_waiting)d" string="Waiting Approval" width="510"/>
+ <action colspan="4" height="220" name="%(purchase_waiting)d" string="Purchase Order Waiting Approval" width="510"/>
</child1>
<child2>
<action colspan="4" height="220" name="%(action_purchase_order_monthly_categ_graph)d" string="Monthly Purchase by Category" />
@@ -156,7 +156,6 @@
id="menu_board_purchase"
parent="menu_purchase_deshboard"
sequence="4"/>
- <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases" sequence="3" groups="base.group_system,group_purchase_manager,group_purchase_user,base.group_extended" action="open_board_purchase"/>
</data>
</openerp>
diff --git a/addons/purchase/i18n/ru.po b/addons/purchase/i18n/ru.po
index ab3c213f91d0f4c02b2eed2475eb157a3c923ddd..2648a5b55b2570e1cc12455aaff39c82ee7608ef 100644
--- a/addons/purchase/i18n/ru.po
+++ b/addons/purchase/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-30 06:38+0000\n"
+"PO-Revision-Date: 2010-10-17 07:59+0000\n"
"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-01 08:47+0000\n"
+"X-Launchpad-Export-Date: 2010-10-18 04:55+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: purchase
@@ -373,7 +373,7 @@ msgstr "ÐŸÐ»Ð°Ð½Ð¸Ñ€ÑƒÐµÐ¼Ð°Ñ Ð´Ð°Ñ‚Ð°"
#. module: purchase
#: view:purchase.order:0
msgid "Approved by Supplier"
-msgstr "Утверждено поÑтавщком"
+msgstr "Утверждено поÑтавщиком"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 1522c4543f3b85de2a2d72d765e6c4ee59f74795..57b9a477ac94a920889e0ebd03cc25b39bbb0572 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -37,6 +37,7 @@ from osv.orm import browse_record, browse_null
# Model definition
#
class purchase_order(osv.osv):
+
def _calc_amount(self, cr, uid, ids, prop, unknow_none, unknow_dict):
res = {}
for order in self.browse(cr, uid, ids):
@@ -44,7 +45,7 @@ class purchase_order(osv.osv):
for oline in order.order_line:
res[order.id] += oline.price_unit * oline.product_qty
return res
-
+
def _amount_all(self, cr, uid, ids, field_name, arg, context=None):
res = {}
cur_obj=self.pool.get('res.currency')
@@ -269,9 +270,6 @@ class purchase_order(osv.osv):
def wkf_approve_order(self, cr, uid, ids, context={}):
self.write(cr, uid, ids, {'state': 'approved', 'date_approve': time.strftime('%Y-%m-%d')})
- for (id,name) in self.name_get(cr, uid, ids):
- message = _('Purchase order ') + " '" + name + "' "+_("is approved by the supplier")
- self.log(cr, uid, id, message)
return True
#TODO: implement messages system
@@ -284,15 +282,12 @@ class purchase_order(osv.osv):
for line in po.order_line:
if line.state=='draft':
todo.append(line.id)
+ message = _("Purchase order '%s' is confirmed.") % (po.name,)
+ self.log(cr, uid, po.id, message)
current_name = self.name_get(cr, uid, ids)[0][1]
self.pool.get('purchase.order.line').action_confirm(cr, uid, todo, context)
for id in ids:
self.write(cr, uid, [id], {'state' : 'confirmed', 'validator' : uid})
- for line in po.order_line:
- product.append(line.product_id.default_code or '')
- params = ', '.join(map(lambda x : str(x), product))
- message = _('Purchase order ') + " '" + po.name + "' "+_('placed on')+ " '" + po.date_order + "' "+_('for')+" '" + params + "' "+ _("is confirmed")
- self.log(cr, uid, id, message)
return True
def wkf_warn_buyer(self, cr, uid, ids):
@@ -335,8 +330,8 @@ class purchase_order(osv.osv):
wf_service.trg_delete(uid, 'purchase.order', p_id, cr)
wf_service.trg_create(uid, 'purchase.order', p_id, cr)
for (id,name) in self.name_get(cr, uid, ids):
- message = _('Purchase order') + " '" + name + "' "+ _("is in the draft state")
- self.log(cr, uid, id, message)
+ message = _("Purchase order '%s' has been set in draft state.") % name
+ self.log(cr, uid, id, message)
return True
def action_invoice_create(self, cr, uid, ids, *args):
@@ -416,8 +411,9 @@ class purchase_order(osv.osv):
wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'account.invoice', inv.id, 'invoice_cancel', cr)
self.write(cr,uid,ids,{'state':'cancel'})
- message = _('Purchase order ') + " '" + purchase.name + "' "+ _("is cancelled")
- self.log(cr, uid, id, message)
+ for (id,name) in self.name_get(cr, uid, ids):
+ message = _("Purchase order '%s' is cancelled.") % name
+ self.log(cr, uid, id, message)
return True
def action_picking_create(self,cr, uid, ids, *args):
@@ -721,9 +717,6 @@ class purchase_order_line(osv.osv):
def action_confirm(self, cr, uid, ids, context={}):
self.write(cr, uid, ids, {'state': 'confirmed'}, context)
- for (id,name) in self.name_get(cr, uid, ids):
- message = _('Purchase order line') + " '" + name + "' "+ _("is confirmed")
- self.log(cr, uid, id, message)
return True
purchase_order_line()
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index a9996202b20073cc9c5d1b52d9708b10bb0a58db..f825a11cac570599c7c8bb9eb1a049a89294dcbe 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
- <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases" sequence="3" groups="base.group_system,group_purchase_manager,group_purchase_user,base.group_extended"/>
+ <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases" sequence="3"
+ groups="group_purchase_manager,group_purchase_user"/>
<menuitem id="menu_procurement_management" name="Purchase Management"
parent="base.menu_purchase_root" sequence="1" />
@@ -13,6 +14,7 @@
<field name="view_type">form</field>
<field name="context">{"search_default_supplier":1}</field>
<field name="search_view_id" ref="base.view_res_partner_address_filter"/>
+ <field name="help">Access your supplier records and maintain your relationship with them. You can track all your interactions with them through the history tab: emails, orders, meeting, etc.</field>
</record>
<record id="action_supplier_address_form_view1" model="ir.actions.act_window.view">
<field eval="10" name="sequence"/>
@@ -55,7 +57,7 @@
<field name="domain">[('type','=','in_invoice')]</field>
<field name="context">{'type':'in_invoice', 'journal_type': 'purchase', 'search_default_draft': 1}</field>
<field name="search_view_id" ref="account.view_account_invoice_filter"/>
- <field name="help">This is the list of supplier invoice you are waiting for. You can select invoices and validate them once you have received the invoice and checked his data.</field>
+ <field name="help">Use this menu to control the invoices to be received by your supplier. OpenERP pre-generates draft of invoices based on your purchase orders or your receptions. Once you receive a supplier invoice, you can control it according to the draft of invoice and validate it.</field>
</record>
<menuitem name="Supplier Invoices to Receive"
@@ -239,7 +241,7 @@
<field name="context">{'search_default_draft': 1}</field>
<field name="view_mode">tree,form,graph,calendar</field>
<field name="search_view_id" ref="view_purchase_order_filter"/>
- <field name="help">With the Requests for quotation menu you can create new quotations, review existing one and confirm them to order once the supplier offer is approved.</field>
+ <field name="help">With the Requests for quotation menu you can create new request for quotations, review existing one and confirm them to order once the supplier offer is approved. When you confirm a RfQ, OpenERP will convert it to a Purchase Order and generate the next steps: draft reception of the products, invoice to control.</field>
</record>
<menuitem action="purchase_rfq" id="menu_purchase_rfq" parent="menu_procurement_management"
sequence="6" groups="group_purchase_manager,group_purchase_user"/>
@@ -251,7 +253,8 @@
<field name="view_mode">tree,form,graph,calendar</field>
<field name="context">{'search_default_approved': 1,'search_default_create_uid':uid}</field>
<field name="search_view_id" ref="view_purchase_order_filter"/>
- <field name="help">From the Purchase Orders menu, you can create directly new orders and consult the list of your orders in their various state.</field>
+ <field name="help">From the Purchase Orders menu, you can track the status of your orders: products received, invoice received and controlled.
+</field>
</record>
<menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="menu_procurement_management" />
@@ -401,7 +404,8 @@
<field name="domain">[('state','in',('confirmed','done')), ('invoiced','=',False)]</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
- <field name="search_view_id" ref="purchase_order_line_search"/>
+ <field name="search_view_id" ref="purchase_order_line_search"/>
+ <field name="help">If you set the invoicing control on a purchase order as "Manual", you can track here all the purchase order lines for which you did not received the supplier invoice yet. Once you are ready to receive a supplier invoice, you can generate a draft supplier invoice based on the lines from this menu.</field>
</record>
<record id="purchase_line_form_action_tree2" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml
index 2c5651300301ce4d78ccca787f7364b17e472756..60ee35b92bb929dab9f64e914f96dd2b604207c7 100644
--- a/addons/purchase/report/order.rml
+++ b/addons/purchase/report/order.rml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Purchase Order" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Purchase Order.pdf">
+ <template pageSize="(595.0,842.0)" title="Purchase Order" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="18.0" y1="42.0" width="535" height="758"/>
</pageTemplate>
@@ -149,7 +149,7 @@
<td>
<para style="terp_default_9">[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]</para>
<para style="terp_default_Bold_9">Shipping address :</para>
- <para style="terp_default_9">[[ addr.partner_id.title.name or '' ]] [[ addr.partner_id.name ]]</para>
+ <para style="terp_default_9">[[ (addr.partner_id and addr.partner_id.title and addr.partner_id.title.name) or '' ]] [[ (addr.partner_id and addr.partner_id.name) or '' ]]</para>
<para style="terp_default_9">[[ addr.street ]]</para>
<para style="terp_default_9">[[ addr.street2 or removeParentNode('para') ]]</para>
<para style="terp_default_9">[[ addr.zip or '' ]] [[ addr.city or '' ]]</para>
@@ -168,18 +168,18 @@
</para>
</td>
<td>
- <para style="terp_default_9">[[ o.partner_id.title.name or '' ]] [[ o.partner_id.name ]]</para>
- <para style="terp_default_9">[[ o.partner_address_id.street ]]</para>
- <para style="terp_default_9">[[ o.partner_address_id.street2 or removeParentNode('para') ]]</para>
- <para style="terp_default_9">[[ o.partner_address_id.zip or '' ]] [[ o.partner_address_id.city or '' ]]</para>
- <para style="terp_default_9">[[ o.partner_address_id.state_id and o.partner_address_id.state_id.name or removeParentNode('para')]]</para>
- <para style="terp_default_9">[[ o.partner_address_id.country_id and o.partner_address_id.country_id.name or '' ]]</para>
+ <para style="terp_default_9">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
+ <para style="terp_default_9">[[ (o.partner_address_id and o.partner_address_id.street ) or '']]</para>
+ <para style="terp_default_9">[[ (o.partner_address_id and o.partner_address_id.street2) or removeParentNode('para') ]]</para>
+ <para style="terp_default_9">[[ (o.partner_address_id and o.partner_address_id.zip) or '' ]] [[ (o.partner_address_id and o.partner_address_id.city) or '' ]]</para>
+ <para style="terp_default_9">[[ (o.partner_address_id and o.partner_address_id.state_id and o.partner_address_id.state_id.name) or removeParentNode('para')]]</para>
+ <para style="terp_default_9">[[ (o.partner_address_id and o.partner_address_id.country_id and o.partner_address_id.country_id.name) or '' ]]</para>
<para style="terp_default_9">
<font color="white"> </font>
</para>
- <para style="terp_default_9">Tél. : [[ o.partner_address_id.phone or '' ]]</para>
- <para style="terp_default_9">Fax : [[ o.partner_address_id.fax or '' ]]</para>
- <para style="terp_default_9">TVAÂ : [[ o.partner_id.vat or '' ]]</para>
+ <para style="terp_default_9">Tél. : [[ (o.partner_address_id and o.partner_address_id.phone) or removeParentNode('para') ]]</para>
+ <para style="terp_default_9">Fax : [[ (o.partner_address_id and o.partner_address_id.fax) or removeParentNode('para') ]]</para>
+ <para style="terp_default_9">TVAÂ : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
</td>
</tr>
</blockTable>
@@ -219,7 +219,7 @@
<para style="terp_default_Centre_8">[[formatLang(o.date_order,date=True) ]]</para>
</td>
<td>
- <para style="terp_default_Centre_8">[[ o.validator and o.validator.name or '' ]]</para>
+ <para style="terp_default_Centre_8">[[ (o.validator and o.validator.name) or '' ]]</para>
</td>
</tr>
</blockTable>
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index d2dbff3be941421d229c6566fc3a3f571819c1d2..f5d1f7a3b421e58dd87135b7cc01687f04424c13 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -149,6 +149,7 @@
<field name="view_mode">tree,graph</field>
<field name="view_id" ref="view_purchase_order_tree"></field>
<field name="context">{'search_default_month':1,'search_default_group_partner_id':1,'search_default_group_product_id': 1, 'search_default_orders': 1, 'group_by_no_leaf':1,'group_by':[]}</field>
+ <field name="help">Purchase Analysis allows you to easily check and analyse your company purchase history and performance. From this menu you can track your negotiation performance, the delivery performance of your suppliers, etc.</field>
</record>
<record id="action_purchase_order_report_graph" model="ir.actions.act_window">
@@ -177,6 +178,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="context">{'search_default_month':1, 'search_default_group_product':1, 'search_default_group_partner':1, 'search_default_done':1, 'search_default_in': 1, 'group_by':[], 'group_by_no_leaf':1}</field>
+ <field name="help">Reception Analysis allows you to easily check and analyse your company order receptions and the performance of your supplier's deliveries.</field>
</record>
<menuitem action="action_stock_move_report_po" id="menu_action_stock_move_report_po" parent="base.next_id_73" sequence="8"/>
diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml
index 95de453dca0de936e5f4738b77ff3eff8f2a1202..edc82087e5a7fa1a8fce469f80b4481b5bcfc5bc 100644
--- a/addons/purchase/report/request_quotation.rml
+++ b/addons/purchase/report/request_quotation.rml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Request for Quotation" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Request for Quotation.pdf">
+ <template pageSize="(595.0,842.0)" title="Request for Quotation" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="23.0" y1="43.0" width="530" height="799"/>
</pageTemplate>
@@ -88,7 +88,7 @@
</para>
</td>
<td>
- <para style="terp_default_9">[[ (order.partner_id and order.partner_id.title.name) or '' ]] [[ order.partner_id.name ]]</para>
+ <para style="terp_default_9">[[ (order.partner_id and order.partner_id.title and order.partner_id.title.name) or '' ]] [[ order.partner_id.name ]]</para>
<para style="terp_default_9">[[ (order.partner_address_id and order.partner_address_id.street) or '']]</para>
<para style="terp_default_9">[[ (order.partner_address_id.street2) or removeParentNode('para') ]]</para>
<para style="terp_default_9">[[ (order.partner_address_id and order.partner_address_id.zip) or '' ]][[ (order.partner_address_id and order.partner_address_id.city) or '' ]]</para>
@@ -97,9 +97,9 @@
<para style="terp_default_9">
<font color="white"> </font>
</para>
- <para style="terp_default_9">Tel.: [[ (order.partner_address_id and order.partner_address_id.phone) or '' ]]</para>
- <para style="terp_default_9">Fax: [[ (order.partner_address_id and order.partner_address_id.fax) or '' ]]</para>
- <para style="terp_default_9">TVA: [[ (order.partner_id and order.partner_id.vat) or '' ]]</para>
+ <para style="terp_default_9">Tel.: [[ (order.partner_address_id and order.partner_address_id.phone) or removeParentNode('para') ]]</para>
+ <para style="terp_default_9">Fax: [[ (order.partner_address_id and order.partner_address_id.fax) or removeParentNode('para') ]]</para>
+ <para style="terp_default_9">TVA: [[ (order.partner_id and order.partner_id.vat) or removeParentNode('para') ]]</para>
</td>
</tr>
</blockTable>
@@ -124,8 +124,8 @@
</tr>
</blockTable>
<section>
- <para style="terp_default_9">[[repeatIn(order.order_line,'order_line')]]</para>
- <blockTable colWidths="371.0,100.0,39.0,20.0" style="Table_Product_Line">
+ <para style="terp_default_2">[[repeatIn(order.order_line,'order_line')]]</para>
+ <blockTable colWidths="370.0,100.0,39.0,20.0" style="Table_Product_Line">
<tr>
<td>
<para style="terp_default_9">[[ order_line.name ]]</para>
diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index 77a0aff7bb43dbbe9e96a7ed4fc2d9902a72fadd..ef854f8f03884743de71573ffe92c7644c5fbbfe 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -18,7 +18,7 @@
"access_stock_picking_purchase_user_manager","stock.picking","stock.model_stock_picking","group_purchase_manager",1,1,1,1
"access_stock_move_purchase_user_manager","stock.move","stock.model_stock_move","group_purchase_manager",1,1,1,1
"access_account_tax_purchase_user_manager","account.tax","account.model_account_tax","group_purchase_manager",1,0,0,0
-"access_product_product_purchase_user","product.product.purchase.user","product.model_product_product","group_purchase_user",1,1,1,1
+"access_product_product_purchase_user","product.product.purchase.user","product.model_product_product","group_purchase_user",1,0,0,0
"access_product_product_purchase_manager","product.product.purchase.manager","product.model_product_product","group_purchase_manager",1,0,0,0
"access_product_template_purchase_user","product.template purchase_user","product.model_product_template","group_purchase_user",1,1,1,1
"access_product_template_purchase_manager","product.template purchase_manager","product.model_product_template","group_purchase_manager",1,0,0,0
diff --git a/addons/purchase/test/purchase_from_picking.yml b/addons/purchase/test/purchase_from_picking.yml
index d0c1cbcb527c68c3af185da9422b09f84f63caec..20dd3f0f9077dc32016230b30f7a556c95952e26 100644
--- a/addons/purchase/test/purchase_from_picking.yml
+++ b/addons/purchase/test/purchase_from_picking.yml
@@ -122,36 +122,23 @@
I check that an entry gets created related to stock move.
-
!python {model: purchase.order}: |
- from tools.translate import _
pur_id1=self.browse(cr, uid, ref("purchase_order_po2"))
picking_obj = self.pool.get('stock.picking')
ids = picking_obj.search(cr, uid, [('origin', '=', pur_id1.name)])
pick_id = picking_obj.browse(cr, uid, ids)[0]
move_obj = self.pool.get('stock.move')
search_id = move_obj.search(cr, uid, [('picking_id', '=', pick_id.name)])
- assert search_id, _('No Incoming Product!')
--
- I check that Traceability moves are created.
+ assert search_id, 'No Incoming Product!'
-
Then I create an invoice from picking by clicking on "Create Invoice" wizard
--
- I create stock invoice on shipping entry.
--
- !record {model: stock.invoice.onshipping, id: stock_invoice_onshipping_0}:
- invoice_date: '2010-05-11'
- journal_id: account.bank_journal
- type: in_invoice
--
- I create Invoice.
-
!python {model: stock.invoice.onshipping}: |
- pur_obj=self.pool.get('purchase.order')
+ pur_obj=self.pool.get('purchase.order')
pur_id1=pur_obj.browse(cr, uid, ref("purchase_order_po2"))
- picking_obj = self.pool.get('stock.picking')
- ids = picking_obj.search(cr, uid, [('origin', '=', pur_id1.name)])
- self.create_invoice(cr, uid, [ref("stock_invoice_onshipping_0")], {"lang": "en_US",
- "tz": False, "search_default_approved": 1, "active_model": "stock.picking",
- "active_ids": ids, "active_id": ids[0], })
+ pick_ids = [x.id for x in pur_id1.picking_ids]
+ id = self.create(cr, uid, {'invoice_date': '2010-05-11', 'journal_id': ref('account.expenses_journal')},
+ {'active_ids': pick_ids})
+ self.create_invoice(cr, uid, [id], {"active_ids": pick_ids})
-
I check that an invoice_id field of Delivery&Invoices gets bind with the value.
-
diff --git a/addons/purchase/wizard/purchase_order_group_view.xml b/addons/purchase/wizard/purchase_order_group_view.xml
index fe04af1a32b080b47ad7a5dd8a883b3101033c42..cb67f489a99d9abeb13396e3a9305a1dd3d0091f 100644
--- a/addons/purchase/wizard/purchase_order_group_view.xml
+++ b/addons/purchase/wizard/purchase_order_group_view.xml
@@ -30,7 +30,8 @@ Lines will only be merged if:
res_model="purchase.order.group"
src_model="purchase.order"
view_mode="form"
- target="new"
+ target="new"
+ multi="True"
key2="client_action_multi"
groups="base.group_extended"
id="action_view_purchase_order_group"/>
diff --git a/addons/purchase_analytic_plans/i18n/sr.po b/addons/purchase_analytic_plans/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..f3a1d1b86dc9415308764f3fc6c006c3da1ebe20
--- /dev/null
+++ b/addons/purchase_analytic_plans/i18n/sr.po
@@ -0,0 +1,33 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-15 09:31+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-16 04:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: purchase_analytic_plans
+#: field:purchase.order.line,analytics_id:0
+msgid "Analytic Distribution"
+msgstr "AnalitiÄka Distribucija"
+
+#. module: purchase_analytic_plans
+#: model:ir.module.module,shortdesc:purchase_analytic_plans.module_meta_information
+msgid "Purchase Analytic Distribution Management"
+msgstr "Menadzment Analiticke Distribucije Nabavke"
+
+#. module: purchase_analytic_plans
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index 1e0c4f0683883bf13dd3ec8c7a6213c057cd340c..c22ced3e1592cd2f26618243123dcb790b11b80b 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -68,30 +68,18 @@ class purchase_requisition(osv.osv):
if str(purchase_id.state) in('draft','wait'):
purchase_order_obj.action_cancel(cr,uid,[purchase_id.id])
self.write(cr, uid, ids, {'state': 'cancel'})
- for (id,name) in self.name_get(cr, uid, ids):
- message = _('Tender') + " '" + name + "' "+ _("is cancelled")
- self.log(cr, uid, id, message)
return True
def tender_in_progress(self, cr, uid, ids, context=None):
self.write(cr, uid, ids, {'state':'in_progress'} ,context=context)
- for (id,name) in self.name_get(cr, uid, ids):
- message = _('Tender') + " '" + name + "' "+ _(" is In Progress")
- self.log(cr, uid, id, message)
return True
def tender_reset(self, cr, uid, ids, context=None):
self.write(cr, uid, ids, {'state': 'draft'})
- for (id,name) in self.name_get(cr, uid, ids):
- message = _('Tender') + " '" + name + "' "+ _("is in draft state")
- self.log(cr, uid, id, message)
return True
def tender_done(self, cr, uid, ids, context=None):
self.write(cr, uid, ids, {'state':'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
- for (id,name) in self.name_get(cr, uid, ids):
- message = _('Tender') + " '" + name + "' "+ _("is done")
- self.log(cr, uid, id, message)
return True
purchase_requisition()
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index d209ef6b3fde7796013848758b0c55520aaf8ae0..2a30c3789dfab4cbbd93bf06dfcfdbc36c68c7cb 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -152,6 +152,7 @@
<field name="view_mode">tree,form</field>
<field name="context">{"search_default_create_uid":uid,'search_default_draft': 1}</field>
<field name="search_view_id" ref="view_purchase_requisition_filter"/>
+ <field name="help">A purchase requisition is a step before the request for quotation. In a purchase requisition (or purchase tender), you can record the products you need to buy and trigger the creation of RfQs to supplier. After the negotiation, once you have reviewed all the supplier's offers, you can validate some and cancel others.</field>
</record>
<menuitem
diff --git a/addons/purchase_requisition/report/purchase_requisition.rml b/addons/purchase_requisition/report/purchase_requisition.rml
index 95f1dd47d3105a280c22173db1e67059dcf1dd11..e7734ce54a0b9c75d39eb15883d72b578c70172e 100644
--- a/addons/purchase_requisition/report/purchase_requisition.rml
+++ b/addons/purchase_requisition/report/purchase_requisition.rml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+<document filename="Purchase for Requisitions.pdf">
+ <template pageSize="(595.0,842.0)" title="Purchase for Requisitions" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="34.0" y1="28.0" width="530" height="786"/>
</pageTemplate>
@@ -10,10 +10,9 @@
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
- <blockTableStyle id="Table1">
+ <blockTableStyle id="Table2">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,0"/>
<lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
@@ -27,12 +26,10 @@
<lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,2" stop="-1,-1"/>
</blockTableStyle>
- <blockTableStyle id="Table2">
+ <blockTableStyle id="Table1">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,0"/>
<lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
@@ -46,34 +43,38 @@
<lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,2" stop="-1,-1"/>
</blockTableStyle>
- <blockTableStyle id="Table3">
+ <blockTableStyle id="Table4">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table5">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table6">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+ </blockTableStyle>
+ <blockTableStyle id="Table7">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,0"/>
- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,2" stop="-1,-1"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
- <paraStyle name="P1" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0" textColor="#008000"/>
<paraStyle name="Standard" fontName="Helvetica"/>
<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -108,19 +109,18 @@
<paraStyle name="terp_default_White_2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
<paraStyle name="terp_default_Note" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Table" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="terp_header_left" fontName="Helvetica-Bold" fontSize="10.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<images/>
</stylesheet>
<story>
- <para style="terp_header_Centre">
+ <para style="terp_default_8">[[ repeatIn(objects,'requisition') ]]</para>
+ <para style="terp_default_8">
<font color="white"> </font>
</para>
- <para style="terp_default_8">[[ repeatIn(objects,'requisition') ]]</para>
- <para style="P3">Purchase for Requisitions [[ requisition.name ]]</para>
- <para style="terp_header_Centre">
+ <para style="terp_header">Purchase for Requisitions [[ requisition.name ]]</para>
+ <para style="terp_default_8">
<font color="white"> </font>
</para>
- <blockTable colWidths="159.0,159.0,106.0,106.0" style="Table1">
+ <blockTable colWidths="159.0,159.0,106.0,106.0" style="Table2">
<tr>
<td>
<para style="terp_tblheader_General_Centre">Requisition Reference</para>
@@ -135,92 +135,88 @@
<para style="terp_tblheader_General_Centre">Origin</para>
</td>
</tr>
+ </blockTable>
+ <blockTable colWidths="159.0,159.0,106.0,106.0" style="Table1">
<tr>
<td>
<para style="terp_default_Centre_8">[[ requisition.name ]]</para>
</td>
<td>
- <para style="terp_default_Centre_8">[[ requisition.date_start ]]</para>
+ <para style="terp_default_Centre_8">[[ formatLang(requisition.date_start,date_time='True') ]]</para>
</td>
<td>
- <para style="terp_default_Centre_8">[[ requisition.exclusive=='multiple' and 'Multiple Requisitions' or requisition.exclusive=='exclusive' and 'Purchase Requisitions (exclusive)' ]]</para>
+ <para style="terp_default_Centre_8">[[ requisition.exclusive=='multiple' and 'Multiple Requisitions' or requisition.exclusive=='exclusive' and 'Purchase Requisitions (exclusive)' ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ requisition.origin ]]</para>
</td>
</tr>
</blockTable>
- <para style="terp_default_Centre_8">
+ <para style="terp_default_8">
<font color="white"> </font>
</para>
- <para style="terp_default_Centre_8">
- <font color="white"> </font>
- </para>
+ <para style="terp_tblheader_Details">Product Detail [[ requisition.line_ids==[] and removeParentNode('para') ]]</para>
+ <blockTable colWidths="375.0,71.0,84.0" style="Table4">
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">Description [[ requisition.line_ids==[] and removeParentNode('blockTable') ]]</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Qty</para>
+ </td>
+ <td>
+ <para style="terp_tblheader_Details_Centre">Product UoM</para>
+ </td>
+ </tr>
+ </blockTable>
<section>
- <para style="terp_header_left">Product Detail</para>
- <blockTable colWidths="177.0,177.0,177.0" style="Table2">[[ requisition.line_ids or removeParentNode('section') ]]
+ <para style="terp_default_2">[[ requisition.line_ids==[] and removeParentNode('section') ]] [[ repeatIn(requisition.line_ids,'line_ids') ]]</para>
+ <blockTable colWidths="375.0,71.0,84.0" style="Table5">
<tr>
<td>
- <para style="terp_tblheader_Details_Centre">Description</para>
+ <para style="terp_default_9">[ [[ (line_ids.product_id and line_ids.product_id.code) or '' ]] ] [[ (line_ids.product_id and line_ids.product_id.name) or '' ]]</para>
</td>
<td>
- <para style="terp_tblheader_Details_Centre">Qty</para>
+ <para style="terp_default_Centre_9">[[ formatLang(line_ids.product_qty) ]]</para>
</td>
<td>
- <para style="terp_tblheader_Details_Centre">Product UoM</para>
- </td>
- </tr>
- <tr><para style="terp_default_8">[[ repeatIn(requisition.line_ids,'line_ids') ]]</para>
- <td>
- <para style="terp_default_Centre_8">[[ line_ids.product_id.name ]]</para>
- </td>
- <td>
- <para style="terp_default_Centre_8">[[ line_ids.product_qty ]]</para>
- </td>
- <td>
- <para style="terp_default_Centre_8">[[ line_ids.product_uom_id.category_id.name ]]</para>
+ <para style="terp_default_Centre_9">[[ (line_ids.product_uom_id and line_ids.product_uom_id.category_id and line_ids.product_uom_id.category_id.name) or '' ]]</para>
</td>
</tr>
</blockTable>
</section>
- <para style="terp_default_Centre_8">
- <font color="white"> </font>
- </para>
- <para style="terp_default_Centre_8">
+ <para style="terp_default_8">
<font color="white"> </font>
- </para>
- <section>
- <para style="terp_header_left">Quotation Detail</para>
- <blockTable colWidths="133.0,163.0,235.0" style="Table3">[[ requisition.purchase_ids or removeParentNode('section') ]]
+ </para>
+ <para style="terp_tblheader_Details">Quotation Detail [[ requisition.purchase_ids ==[] and removeParentNode('para') ]]</para>
+ <blockTable colWidths="337.0,96.0,97.0" style="Table6">
<tr>
<td>
- <para style="terp_tblheader_Details_Centre">Order Reference</para>
+ <para style="terp_tblheader_Details">Supplier [[ requisition.purchase_ids ==[] and removeParentNode('blockTable') ]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Centre">Date Ordered</para>
</td>
<td>
- <para style="terp_tblheader_Details_Centre">Supplier</para>
- </td>
- </tr>
- <tr><para style="P2">[[ repeatIn(requisition.purchase_ids,'purchase_ids') ]]</para>
- <td>
- <para style="terp_default_Centre_8">[[ purchase_ids.name ]]</para>
- </td>
- <td>
- <para style="terp_default_Centre_8">[[ purchase_ids.date_order ]]</para>
- </td>
- <td>
- <para style="terp_default_Centre_8">[[ purchase_ids.partner_address_id.partner_id.name ]]</para>
+ <para style="terp_tblheader_Details_Centre">Order Reference</para>
</td>
</tr>
</blockTable>
+ <section>
+ <para style="terp_default_2">[[ requisition.purchase_ids ==[] and removeParentNode('section') ]] [[ repeatIn(requisition.purchase_ids,'purchase_ids') ]]</para>
+ <blockTable colWidths="338.0,96.0,96.0" style="Table7">
+ <tr>
+ <td>
+ <para style="terp_default_9">[[ (purchase_ids.partner_address_id and purchase_ids.partner_address_id.partner_id and purchase_ids.partner_address_id.partner_id.name) or '' ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_9">[[ formatLang(purchase_ids.date_order,date='True') ]]</para>
+ </td>
+ <td>
+ <para style="terp_default_Centre_9">[[ purchase_ids.name ]]</para>
+ </td>
+ </tr>
+ </blockTable>
</section>
- <para style="P3">
- <font color="white"> </font>
- </para>
- <para style="P4">
- <font color="white"> </font>
- </para>
</story>
</document>
\ No newline at end of file
diff --git a/addons/report_webkit/__init__.py b/addons/report_webkit/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..a97025f4896f0a55fdffead848b4481936c5abad
--- /dev/null
+++ b/addons/report_webkit/__init__.py
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com)
+# All Right Reserved
+#
+# Author : Nicolas Bessi (Camptocamp)
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+import header
+import company
+import report_helper
+import webkit_report
+import ir_report
+import wizard
\ No newline at end of file
diff --git a/addons/report_webkit/__openerp__.py b/addons/report_webkit/__openerp__.py
new file mode 100644
index 0000000000000000000000000000000000000000..c585403353cc3d3cd72855067d572a39932802bc
--- /dev/null
+++ b/addons/report_webkit/__openerp__.py
@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com)
+# All Right Reserved
+#
+# Author : Nicolas Bessi (Camptocamp)
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+{
+ "name" : "Webkit Report Engine",
+ "description" : """This module adds a new Report Engine based on WebKit library (wkhtmltopdf) to support reports designed in HTML + CSS.
+The module structure and some code is inspired by the report_openoffice module.
+The module allows:
+ -HTML report definition
+ -Multi header support
+ -Multi logo
+ -Multi company support
+ -HTML and CSS-3 support (In the limit of the actual WebKIT version)
+ -JavaScript support
+ -Raw HTML debugger
+ -Book printing capabilities
+ -Margins definition
+ -Paper size definition
+and much more
+
+Multiple headers and logos can be defined per company.
+CSS style, header and footer body are defined per company
+
+The library to install can be found here
+http://code.google.com/p/wkhtmltopdf/
+The system libraries are available for Linux, Mac OS X i386 and Windows 32.
+
+After installing the wkhtmltopdf library on the OpenERP Server machine, you need to set the
+path to the wkthtmltopdf executable file on the Company.
+
+For a sample report see also the webkit_report_sample module, and this video:
+ http://files.me.com/nbessi/06n92k.mov
+
+
+TODO :
+JavaScript support activation deactivation
+Collated and book format support
+Zip return for separated PDF
+Web client WYSIWYG
+ """,
+ "version" : "0.9",
+ "depends" : ["base"],
+ "author" : "Camptocamp SA - NBessi",
+ "category": "Reports/Webkit",
+ "url": "http://http://www.camptocamp.com/",
+ "data": [ "security/ir.model.access.csv",
+ "data.xml",
+ "wizard/report_webkit_actions_view.xml",
+ "company_view.xml",
+ "header_view.xml",
+ "ir_report_view.xml",
+ ],
+ "installable" : True,
+ "active" : False,
+}
\ No newline at end of file
diff --git a/addons/report_webkit/company.py b/addons/report_webkit/company.py
new file mode 100644
index 0000000000000000000000000000000000000000..82e9f4065678dd8defa0612a904cf618eb915c43
--- /dev/null
+++ b/addons/report_webkit/company.py
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com)
+# All Right Reserved
+#
+# Author : Nicolas Bessi (Camptocamp)
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+from osv import fields, osv
+
+class ResCompany(osv.osv):
+ """Override company to add Header object link a company can have many header and logos"""
+
+ _inherit = "res.company"
+ _columns = {
+ 'header_image' : fields.many2many(
+ 'ir.header_img',
+ 'company_img_rel',
+ 'company_id',
+ 'img_id',
+ 'Available Images',
+ ),
+ 'header_webkit' : fields.many2many(
+ 'ir.header_webkit',
+ 'company_html_rel',
+ 'company_id',
+ 'html_id',
+ 'Available html',
+ ),
+ 'lib_path' : fields.char('Webkit Executable Path', size=264, help="Complete (Absolute) path to the wkhtmltopdf executable."),
+
+ }
+ResCompany()
\ No newline at end of file
diff --git a/addons/report_webkit/company_view.xml b/addons/report_webkit/company_view.xml
new file mode 100644
index 0000000000000000000000000000000000000000..04c21037e8ef83a36bdd69c23c930f9a90bd832d
--- /dev/null
+++ b/addons/report_webkit/company_view.xml
@@ -0,0 +1,22 @@
+<openerp>
+ <data>
+ <record model="ir.ui.view" id="currency_del_img">
+ <field name="name">res.company.form.inherit</field>
+ <field name="model">res.company</field>
+ <field name="inherit_id" ref="base.view_company_form"/>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <notebook position="inside">
+ <page string="Webkit">
+ <field name="lib_path" colspan="4"/>
+ <separator string="Images" colspan="4"/>
+ <field name="header_image" colspan="4" nolabel="1"/>
+ <separator string="Headers" colspan="4"/>
+ <field name="header_webkit" colspan="4" nolabel="1"/>
+ </page>
+ </notebook>
+ </field>
+ </record>
+ </data>
+</openerp>
+
diff --git a/addons/report_webkit/data.xml b/addons/report_webkit/data.xml
new file mode 100644
index 0000000000000000000000000000000000000000..508cf426860c46005c56d55d7d667d3ff228b87c
--- /dev/null
+++ b/addons/report_webkit/data.xml
@@ -0,0 +1,225 @@
+<?xml version="1.0" ?>
+<openerp>
+ <data noupdate="1">
+ <record id="ir_property_webkitheaderdefault0" model="ir.property">
+ <field name="fields_id" ref="field_ir_act_report_xml_webkit_header"/>
+ <field eval=""""webkit_header_default"""" name="name"/>
+ <field eval=""""ir.header_webkit,1"""" name="value"/>
+ </record>
+ <record id="ir_header_webkit_basesample0" model="ir.header_webkit">
+ <field name="footer_html"><![CDATA[<html>
+ <head>
+ <script>
+ function subst() {
+ var vars={};
+ var x=document.location.search.substring(1).split('&');
+ for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
+ var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
+ for(var i in x) {
+ var y = document.getElementsByClassName(x[i]);
+ for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
+ }
+ }
+ </script>
+ </head>
+ <body style="border:0; margin: 0;" onload="subst()">
+ <table style="border-top: 1px solid black; width: 100%">
+ <tr >
+ <td style="text-align:right;font-size:12;" width="95%">Page <span class="page"/></td><td style="text-align:left;font-size:12;"> of <span class="topage"/></td>
+ </tr>
+ </table>
+ </body>
+</html>]]></field>
+ <field eval=""""Portrait"""" name="orientation"/>
+ <field eval=""""A4"""" name="format"/>
+ <field name="html"><![CDATA[<html>
+ <head>
+ <script>
+ function subst() {
+ var vars={};
+ var x=document.location.search.substring(1).split('&');
+ for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
+ var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
+ for(var i in x) {
+ var y = document.getElementsByClassName(x[i]);
+ for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
+ }
+ }
+ </script>
+ <style type="text/css">
+ ${css}
+ </style>
+ </head>
+ <body style="border:0; margin: 0;" onload="subst()">
+ <table class="header" style="border-bottom: 0px solid black; width: 100%">
+ <tr>
+ <td>${helper.embed_logo_by_name('camptocamp_logo')}</td>
+ <td style="text-align:right"> </td>
+ </tr>
+ <tr>
+ <td><br/></td>
+ <td style="text-align:right"> </td>
+ </tr>
+ <tr>
+ <td>${company.partner_id.name |entity}</td>
+ <td/>
+ </tr>
+ <tr>
+ <td >${company.partner_id.address and company.partner_id.address[0].street or ''|entity}</td>
+ <td/>
+ </tr>
+ <tr>
+ <td>Phone: ${company.partner_id.address and company.partner_id.address[0].phone or ''|entity} </td>
+ <td/>
+ </tr>
+ <tr>
+ <td>Mail: ${company.partner_id.address and company.partner_id.address[0].email or ''|entity}<br/></td>
+ </tr>
+ </table> ${_debug or ''} </body>
+</html>]]>
+</field>
+ <field eval="55.0" name="margin_top"/>
+ <field name="css" ><![CDATA[
+body {
+font-family:helvetica;
+font-size:12;
+}
+
+
+.dest_address {
+margin-left:60%;
+font-size:12;
+}
+.header {
+margin-left:0;
+text-align:left;
+width:300px;
+font-size:12;
+}
+
+.title {
+font-size:16;
+font-weight: bold;
+
+}
+
+
+.basic_table{
+text-align:center;
+border:1px solid lightGrey;
+border-collapse: collapse;
+}
+.basic_table td {
+border:1px solid lightGrey;
+font-size:12;
+
+
+}
+
+.list_table {
+border-color:black;
+text-align:center;
+border-collapse: collapse;
+
+}
+.list_table td {
+border-color:gray;
+border-top:1px solid gray;
+text-align:left;
+font-size:12;
+padding-right:3px
+padding-left:3px
+padding-top:3px
+padding-bottom:3px
+}
+
+.list_table th {
+border-bottom:2px solid black;
+text-align:left;
+font-size:12;
+font-weight:bold;
+padding-right:3px
+padding-left:3px
+}
+
+.list_tabe thead {
+ display:table-header-group;
+}
+
+
+.total {
+width:100%;
+}
+.lib {
+width:10.3%;
+}
+.tot {
+text-align:right;
+width:15%;
+}
+.lefttot {
+width:74%;
+}
+.tax {
+width:50%;
+}]]> </field>
+ <field eval=""""Base Sample"""" name="name"/>
+ </record>
+ <record id="ir_header_img_camptocamplogo0" model="ir.header_img">
+ <field eval=""""png"""" name="type"/>
+ <field eval=""""iVBORw0KGgoAAAANSUhEUgAAAH4AAABaCAYAAAB+HuKoAAAABHNCSVQICAgIfAhkiAAAAAlwSFlz
+AAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAArWSURB
+VHic7Z17cFTVHcc/dzebTciTkDcBDElAhAJahCKoRUWrqOgoiNrxUUcRX1Ar0lLLKKPio6PVGUd0
+tCoj8rA+ihW0an0BNVSRFizyEBUIgRA2CUnIZrPZ2z9+G+9u9m7IwqZJPOczk8m5J+ee+7u/73n8
+ztm7N4ZpmmjiyKwUe4c+3Wj8ny3pEEd3G6DpHrTwiqKFVxQtvKJo4RUlobsN6LVEj96bYyzfLdG+
+Fj7+uLvbgM6gh3pF0cIrihZeUbTwitL7g7uujpZjjd5jDe66Kdrv/cJ3H70ieo+GHuoVRQuvKFp4
+RdHCK0rvCe562F53vFiw+Iht/kK69n51j1cULbyiaOEVRQuvKFp4RTF63HP10aP3aOXt82ONfmO9
+bvR6YisfKzqq1xwPWnhF0cIrihZeUbTwitJ79uqjET3aj225Eq/oPdbVR6zE6TML3eMVRQuvKFp4
+RdHCK4oWXlHiF9XHGm3G63n1O/od1bTjItb6u9qeONETl3OxPa/e4u0iM46x/q62J07ooV5RtPCK
+ooVXlNjn+FkpSVH+Eu0VILGV73nfSesddkbz89ONtkHHsQR3TVEuEM2g2MpHo6ufbIm+924vcFfb
+Ezv2fgbbVZUe6hVFC68oWnhF0cIrihZeUeyjelkaxCUa7+DboPYnxBrtx4uufnKmh6F7vKJo4RVF
+C68oWnhF0cIrimHe3MfuSZjmHrdHrVjU3dXoHq8oWnhF0cIrihZeUbTwihItqtf8yNE9XlG08Iqi
+hVcULbyiaOEVRQuvKFp4RdHCK4oWXlG08IqihVcUJYSv8gS624Qex49aeE+dybJ3m1n+d193m9Lj
+6IkvP4obL/3NS029SXbmj7p9HxMde8SVBH2LoE9mx7UYBvTtLz8OZ+eu7EqCzMLI/MQ+kFHQuTpA
+rum2f+Cys583NzaZNDZ1snRColwzpW/nbOtbBI5O9q8Et71PXMn2+dHILISk1A6L2H8enz8ELlsE
+w84GpwtMEyq2wJqHYeMbVrnkDJj2CIy60Gocfh/sKoeVd8k5AGWnw3XPSvqZK2HSLTDmcrlRzx5Y
+cSfsWAdXPQGjp4pzPbvhtfnh17tnAySnwfolct5FfxDHBvzwxeuw4jfQ6KHZZ/LUq14ON5gETHA4
+ID3FYOggJ1MmJoqZrbB2Uwsbv/ZTWy8uSE02GFnm5KxTE0l0tfNJXhlcej8MP1fsA6jcCqsfgs//
+YpVLSoPLH4bRF1uNo7VFfPLq3bDn35E+WTwDJs2CMdOkQ9Tug5VzYev7cMVjlq9qKmDVvfDZK9b1
+7npfGtj6JVD1DUy9F/oNEp9sfBOW/xoaPZ0QvvAkqSw5I6IwpgmLp8N/VsvxHW/BsLMk3dIEhtNy
+Sl0lLBgJviMwfDLc9qbk1+wVsZobrZ7a4oVD30P+UKnHlWw57L5T4OAuOX6sEpLTofpbyC6OtG/3
+JvjjOXgbjvDgC5Hf+RxR4mT6ZDf+VnjxLS+799sHfblZDm6Y6ibZHXyLSF4ZzPs4uk+evxa+eE2O
+b30dRpxn75NGD/x+GDQ3hPvEsxuyBob7xO+DA9uh/wjxYWIfyQ/44YHxsO+/cvzAVjl3/3bIKwWj
+3SBe8RU8OknqDiFyqL/yCbnB1hZ47hqYnQOLJkDDIRnSL39YfhcMgwGj5Jy3F8GcPCn7yXOSl1EA
+BSdGOirBLWLOyYX3npA8VxJkDYBHz5Y6Vj8k+U4XnDQ5so7sYihfBvOK4XdlsHmN5A8cDROvJ9Fl
+cP3FblKTRbiMVDmeNEa68dpNLT+IfuIJTmZfmcydVyczdrgMyVWeAKvXtVjXm/G4+MQMwAu/Ehvv
+HweHD4gvpj0itmYNgEGnyDnv/Qnm5MPsbPjHU5KXkiU2ticxReqbkyujKkhjySuDx8+X661aGFQs
+AUZeEFlH/hAZ9eYNht+WwJfBRtV/OJw5M6J4uPDpuVB6mqQ3viGt2HdEetIrt8PLt8CLN0qrqtwK
+cwfC3SeIsYFWcLnDhxW7HvLp87B/m6S3rLHyv3gNdn0mPWhzSH6qzStCGw7B0tvgcJUMi0tmSk8A
+GHEeDgcUFzpJCE6trgSD4kInOX3ldjdskbLpKQbTJ7vpl2GQmWZw4emJ9M+VMpt3+vH6TLmHoT8P
+2vsubFghPqnYIjYsvQ2evVoahWeP+GPuQFh1n9iU4Ib6Ksv2pLTI+/nXCmta3PyOlb/pLdj+STC9
+KqSO9Mg6mhvh5VulMdbthyU3gz/4wq5RUyKKh0cduaVW+sCO8JJf/jXyYk4XlIyHIWdA2QQoHB4e
+3LUfdgCqv7PS3norXbXTSvtDll+GzUubKraEvzq04ZBMFTkl0vI7oL7RpCEYyA0qcJDQLhYtLXJS
+URUgEIDqWpOishLLhr2bwwu3TXmhOJxQchoMPQNKJ0iPCw3u7HwS6uvQ+wr1SUvI1GXnkz2bZApp
+w1svHaxopPilHeHCO9tHNB2QlApz1lhDm2e39Fq/D8b/UvLM1sjzQm8sEDLH+mJ4B6zdP0n0B4fm
+o9xDa8glXQmRDnSGNIRAAHAmhl64Y7tcSTDnbRj8MzmuqZDht6kOzrgxWKmNT8woG0y+kJdKHO0f
+Q9rV4Qs2FptVRXhO7T4r3W9geMmRU2R+2r8NtrwD46+xRF8yE/75sqRPnW4Jb3eT8SB/iLT6NmcY
+DgkYQSLbDkhPNXAlQIsfKqsjnRWal5lmhPskr91ocuIkGHI67Nsq09bYGZboS2+HtX+W9JhplvDR
+RD5eBowWgdumPMNh2VuzN6J4+LhTtVPmKYBTLpUADiSivHgBTJkPVwcDlZyQqHpXuZVumw/l6sd+
+Ix2RWQhn324dT5plrVt3rP0h2xG8O3+rNBATcBhQNkC6dWV1gPLgfA+w7ftWvv5OGuvg/k7SUwwZ
+yQ4GG9NPzreCM1cyXLIQzp8H1z4jTs8K6SzfrLfSZROtdCyjaiwkpcHk2dbxxOut5eTWDyKKh/d4
+05Sg5LrnwJ0K89fBd5/L3J+eJ2U+eBK8DVD5tXXezGUyzBePlXVuG0fb+DkeLlskjdMMWL2s6bC1
+qkCCN0+dSW29yZPLveRmGcw4180541x8szdAc4vJ22t9bPjKj9sFFVUBTMDtMrhgQohAbyyAm5bK
+UD73Q/FJTrG10fThYjhSC/tDfHLTMvh8pax8Rl1k5UfZbIoLlyyEk6fKdFoSDNK99fDRMxFFIyON
+8mWyeeBtkIi0dIKIbgYkIl8dXG6se8mKvguGwYX3SNmVd1nRZNsaP97sKpcNi+Kxluh1lbD4Cvkd
+5OShCT+MOdW1AQ7VSc/PznRwwyVuCrLl9g/WBNgbFD0708F1F7nJzQpxzZfBjZCmOllmlZ4mopsB
+WPsCvLlAypUvtzac8oeIT06aDK/Pl0YJMPTMrvHJzvViy6Cfig6GIRH+s1fJqNWO6N+k6ZMpEXtq
+P1kqfLtBgpX2DB4HuSVSZvsn0Fgj609XMvi9srGQlArZg6X8oe/FgSBl8sokXbsPGqoj8w8fkB+w
+NnB2fAqP/QIGngyFw8Sp2z6SxtqOKk+AyuoADodB/xwHWRnh088BT4Aqj0lrwKRfhoOiXIdt0AzI
+0m7wOEjLkV61q9x2/uSEMWK/rwl2roP6gzJqJvax90nNXmsZHHrvdZVyLkiDyw/ui9RXyZINrA2c
+Np8UjYSiEUGffBy+cgqhd32Fqr3wmkjhO4n+2EpRtPCK8j8CgILN0JP4oAAAAABJRU5ErkJggg==
+"""" name="img"/>
+ <field eval=""""camptocamp_logo"""" name="name"/>
+ </record>
+ </data>
+</openerp>
diff --git a/addons/report_webkit/header.py b/addons/report_webkit/header.py
new file mode 100644
index 0000000000000000000000000000000000000000..b8ff6fb2956dbc6edeb7bcf8d66d68b64b0c72fd
--- /dev/null
+++ b/addons/report_webkit/header.py
@@ -0,0 +1,101 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com)
+# All Right Reserved
+#
+# Author : Nicolas Bessi (Camptocamp)
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+from osv import fields, osv
+
+class HeaderHTML(osv.osv):
+ """HTML Header allows you to define HTML CSS and Page format"""
+
+ _name = "ir.header_webkit"
+ _columns = {
+ 'company_id' : fields.many2one('res.company', 'Company'),
+ 'html' : fields.text('webkit header', help="Set Webkit Report Header"),
+ 'footer_html' : fields.text('webkit footer', help="Set Webkit Report Footer."),
+ 'css' : fields.text('Header CSS'),
+ 'name' : fields.char('Name', size=128, required=True),
+ 'margin_top' : fields.float('Top Margin (mm)'),
+ 'margin_bottom' : fields.float('Bottom Margin (mm)'),
+ 'margin_left' : fields.float('Left Margin (mm)'),
+ 'margin_right' : fields.float('Right Margin (mm)'),
+ 'orientation' : fields.selection(
+ [('Landscape','Landscape'),('Portrait', 'Portrait')],
+ 'Orientation'
+ ),
+ 'format': fields.selection(
+ [
+ ('A0' ,'A0 5 841 x 1189 mm'),
+ ('A1' ,'A1 6 594 x 841 mm'),
+ ('A2' ,'A2 7 420 x 594 mm'),
+ ('A3' ,'A3 8 297 x 420 mm'),
+ ('A4' ,'A4 0 210 x 297 mm, 8.26 x 11.69 inches'),
+ ('A5' ,'A5 9 148 x 210 mm'),
+ ('A6' ,'A6 10 105 x 148 mm'),
+ ('A7' ,'A7 11 74 x 105 mm'),
+ ('A8' ,'A8 12 52 x 74 mm'),
+ ('A9' ,'A9 13 37 x 52 mm'),
+ ('B0' ,'B0 14 1000 x 1414 mm'),
+ ('B1' ,'B1 15 707 x 1000 mm'),
+ ('B2' ,'B2 17 500 x 707 mm'),
+ ('B3' ,'B3 18 353 x 500 mm'),
+ ('B4' ,'B4 19 250 x 353 mm'),
+ ('B5' ,'B5 1 176 x 250 mm, 6.93 x 9.84 inches'),
+ ('B6' ,'B6 20 125 x 176 mm'),
+ ('B7' ,'B7 21 88 x 125 mm'),
+ ('B8' ,'B8 22 62 x 88 mm'),
+ ('B9' ,'B9 23 33 x 62 mm'),
+ ('B10',':B10 16 31 x 44 mm'),
+ ('C5E','C5E 24 163 x 229 mm'),
+ ('Comm10E','Comm10E 25 105 x 241 mm, U.S. Common 10 Envelope'),
+ ('DLE', 'DLE 26 110 x 220 mm'),
+ ('Executive','Executive 4 7.5 x 10 inches, 190.5 x 254 mm'),
+ ('Folio','Folio 27 210 x 330 mm'),
+ ('Ledger', 'Ledger 28 431.8 x 279.4 mm'),
+ ('Legal', 'Legal 3 8.5 x 14 inches, 215.9 x 355.6 mm'),
+ ('Letter','Letter 2 8.5 x 11 inches, 215.9 x 279.4 mm'),
+ ('Tabloid', 'Tabloid 29 279.4 x 431.8 mm'),
+ ],
+ 'Paper size',
+ required=True,
+ help="Select Proper Paper size"
+ )
+ }
+HeaderHTML()
+
+class HeaderImage(osv.osv):
+ """Logo allows you to define multiple logo per company"""
+ _name = "ir.header_img"
+ _columns = {
+ 'company_id' : fields.many2one('res.company', 'Company'),
+ 'img' : fields.binary('Image'),
+ 'name' : fields.char('Name', size=128, required =True, help="Name of Image"),
+ 'type' : fields.char('Type', size=32, required =True, help="Image type(png,gif,jpeg)")
+ }
+HeaderImage()
\ No newline at end of file
diff --git a/addons/report_webkit/header_view.xml b/addons/report_webkit/header_view.xml
new file mode 100644
index 0000000000000000000000000000000000000000..baca42d663f9575d101e45898f8cb7cd513e580a
--- /dev/null
+++ b/addons/report_webkit/header_view.xml
@@ -0,0 +1,64 @@
+<openerp>
+ <data>
+ <record model="ir.ui.view" id="header_img">
+ <field name="name">res.company.header.img</field>
+ <field name="model">ir.header_img</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form>
+ <field name='company_id' />
+ <newline />
+ <field name="name"/>
+ <field name="type"/>
+ <field name="img" widget="image" colspan="4"/>
+ </form>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="header_webkit">
+ <field name="name">res.company.header.html</field>
+ <field name="model">ir.header_webkit</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form>
+ <field name="name"/>
+ <newline/>
+ <notebook>
+ <page string="Content and styling" >
+ <field name='company_id' />
+ <field name="css" colspan="4"/>
+ <field name="html" colspan="4"/>
+ <field name="footer_html" colspan="4" />
+ </page>
+ <page string="page setup" >
+ <field name="orientation" />
+ <field name="format" />
+ <field name="margin_top" />
+ <field name="margin_bottom" />
+ <field name="margin_left" />
+ <field name="margin_right" />
+ </page>
+ </notebook>
+ </form>
+ </field>
+ </record>
+
+ <record id="action_header_img" model="ir.actions.act_window">
+ <field name="name">Header IMG</field>
+ <field name="res_model">ir.header_img</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form</field>
+ </record>
+ <menuitem action="action_header_img" id="menu_header_img" parent="base.menu_action_res_company_tree" sequence="14"/>
+
+ <record id="action_header_webkit" model="ir.actions.act_window">
+ <field name="name">Header HTML</field>
+ <field name="res_model">ir.header_webkit</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form</field>
+ </record>
+ <menuitem action="action_header_webkit" id="menu_header_webkit" parent="base.menu_action_res_company_tree" sequence="14"/>
+
+
+ </data>
+</openerp>
diff --git a/addons/report_webkit/ir_report.py b/addons/report_webkit/ir_report.py
new file mode 100644
index 0000000000000000000000000000000000000000..831403412982934c9264e488e44fdc2b8db7d2ac
--- /dev/null
+++ b/addons/report_webkit/ir_report.py
@@ -0,0 +1,132 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com)
+# All Right Reserved
+#
+# Author : Nicolas Bessi (Camptocamp)
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+from osv import osv, fields
+import netsvc
+from webkit_report import WebKitParser
+from report.report_sxw import rml_parse
+
+def register_report(name, model, tmpl_path, parser):
+ "Register the report into the services"
+ name = 'report.%s' % name
+ if netsvc.Service._services.get(name, False):
+ del netsvc.Service._services[name]
+ WebKitParser(name, model, tmpl_path, parser=parser)
+
+
+class ReportXML(osv.osv):
+
+ def __init__(self, pool, cr):
+ super(ReportXML, self).__init__(pool, cr)
+
+ def register_all(self,cursor):
+ value = super(ReportXML, self).register_all(cursor)
+ cursor.execute("SELECT * FROM ir_act_report_xml")
+ records = cursor.dictfetchall()
+ for record in records:
+ if record['report_type'] == 'webkit':
+ parser=rml_parse
+ register_report(record['report_name'], record['model'], record['report_rml'], parser)
+ return value
+
+ def unlink(self, cursor, user, ids, context=None):
+ """Delete report and unregister it"""
+ trans_obj = self.pool.get('ir.translation')
+ trans_ids = trans_obj.search(
+ cursor,
+ user,
+ [('type', '=', 'report'), ('res_id', 'in', ids)]
+ )
+ trans_obj.unlink(cursor, user, trans_ids)
+
+ # Warning: we cannot unregister the services at the moment
+ # because they are shared across databases. Calling a deleted
+ # report will fail so it's ok.
+
+ res = super(ReportXML, self).unlink(
+ cursor,
+ user,
+ ids,
+ context
+ )
+ return res
+
+ def create(self, cursor, user, vals, context=None):
+ "Create report and register it"
+ res = super(ReportXML, self).create(cursor, user, vals, context)
+ parser=rml_parse
+ register_report(
+ vals['report_name'],
+ vals['model'],
+ vals.get('report_rml', False),
+ parser
+ )
+ return res
+
+ def write(self, cursor, user, ids, vals, context=None):
+ "Edit report and manage it registration"
+ parser=rml_parse
+ record = self.read(cursor, user, ids)
+ if isinstance(record, list) :
+ record = record[0]
+ if vals.get('report_name', False) and \
+ vals['report_name']!=record['report_name']:
+ report_name = vals['report_name']
+ else:
+ report_name = record['report_name']
+
+ register_report(
+ report_name,
+ vals.get('model', record['model']),
+ vals.get('report_rml', record['report_rml']),
+ parser
+ )
+ res = super(ReportXML, self).write(cursor, user, ids, vals, context)
+ return res
+
+ _name = 'ir.actions.report.xml'
+ _inherit = 'ir.actions.report.xml'
+ _columns = {
+ 'webkit_header': fields.property(
+ 'ir.header_webkit',
+ type='many2one',
+ relation='ir.header_webkit',
+ string='WebKit Header',
+ help="The header linked to the report",
+ method=True,
+ view_load=True,
+ required=True
+ ),
+ 'webkit_debug' : fields.boolean('Webkit debug', help="Enable the webkit engine debugger"),
+ 'report_webkit_data': fields.text('Webkit Template', help="This template will be used if the main report file is not found"),
+ }
+
+ReportXML()
\ No newline at end of file
diff --git a/addons/report_webkit/ir_report_view.xml b/addons/report_webkit/ir_report_view.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e92c5a5345bb0ef79723df2caa0511c935f4b366
--- /dev/null
+++ b/addons/report_webkit/ir_report_view.xml
@@ -0,0 +1,20 @@
+<openerp>
+ <data>
+ <record id="act_report_xml_view" model="ir.ui.view">
+ <field name="name">ir.actions.report.xml.inherit</field>
+ <field name="model">ir.actions.report.xml</field>
+ <field name="inherit_id" ref="base.act_report_xml_view"/>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <xpath expr="/form/notebook/page[@string='Security']" position="before" >
+ <page string="Webkit" attrs="{'invisible':[('report_type','!=','webkit')]}">
+ <field name="webkit_header"/>
+ <field name="webkit_debug"/>
+ <separator string="Webkit Template (used if Report File is not found)" colspan="4"/>
+ <field name="report_webkit_data" colspan="4" nolabel="1"/>
+ </page>
+ </xpath>
+ </field>
+ </record>
+ </data>
+</openerp>
diff --git a/addons/report_webkit/report_helper.py b/addons/report_webkit/report_helper.py
new file mode 100644
index 0000000000000000000000000000000000000000..80896fa4ba2b2ca3d3d9af5ffd6c8579076aebf4
--- /dev/null
+++ b/addons/report_webkit/report_helper.py
@@ -0,0 +1,82 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com)
+# All Right Reserved
+#
+# Author : Nicolas Bessi (Camptocamp)
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+import pooler
+
+class WebKitHelper(object):
+ """Set of usefull report helper"""
+ def __init__(self, cursor, uid, report_id, context):
+ "constructor"
+ self.cursor = cursor
+ self.uid = uid
+ self.pool = pooler.get_pool(self.cursor.dbname)
+ self.report_id = report_id
+
+ def embed_image(self, type, img, width=0, height=0) :
+ "Transform a DB image into an embedded HTML image"
+
+ if width :
+ width = 'width="%spx"'%(width)
+ else :
+ width = ' '
+ if height :
+ height = 'width="%spx"'%(height)
+ else :
+ height = ' '
+ toreturn = '<img %s %s src="data:image/%s;base64,%s">'%(
+ width,
+ height,
+ type,
+ str(img))
+ return toreturn
+
+
+ def get_logo_by_name(self, name):
+ """Return logo by name"""
+ header_obj = self.pool.get('ir.header_img')
+ header_img_id = header_obj.search(
+ self.cursor,
+ self.uid,
+ [('name','=',name)]
+ )
+ if not header_img_id :
+ return u''
+ if isinstance(header_img_id, list):
+ header_img_id = header_img_id[0]
+
+ head = header_obj.browse(self.cursor, self.uid, header_img_id)
+ return (head.img, head.type)
+
+ def embed_logo_by_name(self, name, width=0, height=0) :
+ """Return HTML embedded logo by name"""
+ img, type = self.get_logo_by_name(name)
+ return self.embed_image(type, img, width, height)
+
\ No newline at end of file
diff --git a/addons/report_webkit/security/ir.model.access.csv b/addons/report_webkit/security/ir.model.access.csv
new file mode 100644
index 0000000000000000000000000000000000000000..59c423f66551e878efc90abc74e60e332a0b2749
--- /dev/null
+++ b/addons/report_webkit/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_ir_header_webkit","ir.header_webkit","model_ir_header_webkit",,,,,
+"access_ir_header_img","ir.header_img","model_ir_header_img",,,,,
diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py
new file mode 100644
index 0000000000000000000000000000000000000000..3e90b69dee1c35d0002aaf3d2bfd58d6ba1842ab
--- /dev/null
+++ b/addons/report_webkit/webkit_report.py
@@ -0,0 +1,347 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com)
+# All Right Reserved
+#
+# Author : Nicolas Bessi (Camptocamp)
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+import commands
+import os
+import report
+import tempfile
+import time
+from mako.template import Template
+
+import netsvc
+import pooler
+from report_helper import WebKitHelper
+from report.report_sxw import *
+from tools.config import config
+from tools.translate import _
+from osv.osv import except_osv
+
+class WebKitParser(report_sxw):
+ """Custom class that use webkit to render HTML reports
+ Code partially taken from report openoffice. Thanks guys :)
+ """
+
+ def __init__(self, name, table, rml=False, parser=False,
+ header=True, store=False):
+ self.parser_instance = False
+ self.localcontext={}
+ report_sxw.__init__(self, name, table, rml, parser,
+ header, store)
+
+ def get_lib(self, cursor, uid, company) :
+ """Return the lib wkhtml path"""
+ #TODO Detect lib in system first
+ path = self.pool.get('res.company').read(cursor, uid, company, ['lib_path',])
+ path = path['lib_path']
+ if not path:
+ raise except_osv(
+ _('Wkhtmltopdf library path is not set in company'),
+ _('Please install executable on your system'+
+ ' (sudo apt-get install wkhtmltopdf) or download it from here:'+
+ ' http://code.google.com/p/wkhtmltopdf/downloads/list and set the'+
+ ' path to the executable on the Company form.')
+ )
+ if os.path.isabs(path) :
+ if (os.path.exists(path) and os.access(path, os.X_OK)\
+ and os.path.basename(path).startswith('wkhtmltopdf')):
+ return path
+ else:
+ raise except_osv(
+ _('Wrong Wkhtmltopdf path set in company'+
+ 'Given path is not executable or path is wrong'),
+ 'for path %s'%(path)
+ )
+ else :
+ raise except_osv(
+ _('path to Wkhtmltopdf is not absolute'),
+ 'for path %s'%(path)
+ )
+ def generate_pdf(self, comm_path, report_xml, header, footer, html_list):
+ """Call webkit in order to generate pdf"""
+ tmp_dir = tempfile.gettempdir()
+ out = report_xml.name+str(time.time())+'.pdf'
+ out = os.path.join(tmp_dir, out.replace(' ',''))
+ files = []
+ file_to_del = []
+ if comm_path:
+ command = [comm_path]
+ else:
+ command = ['wkhtmltopdf']
+
+ command.append('-q')
+ if header :
+ head_file = file( os.path.join(
+ tmp_dir,
+ str(time.time()) + '.head.html'
+ ),
+ 'w'
+ )
+ head_file.write(header)
+ head_file.close()
+ file_to_del.append(head_file.name)
+ command.append("--header-html '%s'"%(head_file.name))
+ if footer :
+ foot_file = file( os.path.join(
+ tmp_dir,
+ str(time.time()) + '.foot.html'
+ ),
+ 'w'
+ )
+ foot_file.write(footer)
+ foot_file.close()
+ file_to_del.append(foot_file.name)
+ command.append("--footer-html '%s'"%(foot_file.name))
+
+ if report_xml.webkit_header.margin_top :
+ command.append('--margin-top %s'%(report_xml.webkit_header.margin_top))
+ if report_xml.webkit_header.margin_bottom :
+ command.append('--margin-bottom %s'%(report_xml.webkit_header.margin_bottom))
+ if report_xml.webkit_header.margin_left :
+ command.append('--margin-left %s'%(report_xml.webkit_header.margin_left))
+ if report_xml.webkit_header.margin_right :
+ command.append('--margin-right %s'%(report_xml.webkit_header.margin_right))
+ if report_xml.webkit_header.orientation :
+ command.append("--orientation '%s'"%(report_xml.webkit_header.orientation))
+ if report_xml.webkit_header.format :
+ command.append(" --page-size '%s'"%(report_xml.webkit_header.format))
+ for html in html_list :
+ html_file = file(os.path.join(tmp_dir, str(time.time()) + '.body.html'), 'w')
+ html_file.write(html)
+ html_file.close()
+ file_to_del.append(html_file.name)
+ command.append(html_file.name)
+ command.append(out)
+ generate_command = ' '.join(command)
+ try:
+ status = commands.getstatusoutput(generate_command)
+ if status[0] :
+ raise except_osv(
+ _('Webkit raise an error' ),
+ status[1]
+ )
+ except Exception:
+ for f_to_del in file_to_del :
+ os.unlink(f_to_del)
+
+ pdf = file(out).read()
+ for f_to_del in file_to_del :
+ os.unlink(f_to_del)
+
+ os.unlink(out)
+ return pdf
+
+
+ def setLang(self, lang):
+ if not lang:
+ lang = 'en_US'
+ self.localcontext['lang'] = lang
+
+ def translate_call(self, src):
+ """Translate String."""
+ ir_translation = self.pool.get('ir.translation')
+ res = ir_translation._get_source(self.parser_instance.cr, self.parser_instance.uid, self.name, 'report', self.localcontext.get('lang', 'en_US'), src)
+ return res
+
+ def formatLang(self, value, digits=None, date=False, date_time=False, grouping=True, monetary=False):
+ """format using the know cursor, language from localcontext"""
+ if digits is None:
+ digits = self.parser_instance.get_digits(value)
+ if isinstance(value, (str, unicode)) and not value:
+ return ''
+ pool_lang = self.pool.get('res.lang')
+ lang = self.localcontext['lang']
+
+ lang_ids = pool_lang.search(self.parser_instance.cr, self.parser_instance.uid, [('code','=',lang)])[0]
+ lang_obj = pool_lang.browse(self.parser_instance.cr, self.parser_instance.uid, lang_ids)
+
+ if date or date_time:
+ if not str(value):
+ return ''
+
+ date_format = lang_obj.date_format
+ parse_format = '%Y-%m-%d'
+ if date_time:
+ value=value.split('.')[0]
+ date_format = date_format + " " + lang_obj.time_format
+ parse_format = '%Y-%m-%d %H:%M:%S'
+ if not isinstance(value, time.struct_time):
+ return time.strftime(date_format, time.strptime(value, parse_format))
+
+ else:
+ date = datetime(*value.timetuple()[:6])
+ return date.strftime(date_format)
+
+ return lang_obj.format('%.' + str(digits) + 'f', value, grouping=grouping, monetary=monetary)
+
+ # override needed to keep the attachments' storing procedure
+ def create_single_pdf(self, cursor, uid, ids, data, report_xml, context=None):
+ """generate the PDF"""
+
+ if not context:
+ context={}
+
+ if report_xml.report_type != 'webkit':
+ return super(WebKitParser,self).create_single_pdf(cursor, uid, ids, data, report_xml, context=context)
+
+ self.parser_instance = self.parser(
+ cursor,
+ uid,
+ self.name2,
+ context=context
+ )
+
+ self.pool = pooler.get_pool(cursor.dbname)
+ objs = self.getObjects(cursor, uid, ids, context)
+ self.parser_instance.set_context(objs, data, ids, report_xml.report_type)
+
+ template = False
+
+ if report_xml.report_file :
+ path = os.path.join(config['addons_path'], report_xml.report_file)
+ if os.path.exists(path) :
+ template = file(path).read()
+ if not template and report_xml.report_webkit_data :
+ template = report_xml.report_webkit_data
+ if not template :
+ raise except_osv(_('Webkit Report template not found !'), _(''))
+ header = report_xml.webkit_header.html
+ footer = report_xml.webkit_header.footer_html
+ if not header and report_xml.header:
+ raise except_osv(
+ _('No header defined for this Webkit report!'),
+ _('Please set a header in company settings')
+ )
+ if not report_xml.header :
+ #I know it could be cleaner ...
+ header = u"""
+<html>
+ <head>
+ <style type="text/css">
+ ${css}
+ </style>
+ <script>
+ function subst() {
+ var vars={};
+ var x=document.location.search.substring(1).split('&');
+ for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
+ var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
+ for(var i in x) {
+ var y = document.getElementsByClassName(x[i]);
+ for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
+ }
+ }
+ </script>
+ </head>
+<body style="border:0; margin: 0;" onload="subst()">
+</body>
+</html>"""
+ css = report_xml.webkit_header.css
+ if not css :
+ css = ''
+ user = self.pool.get('res.users').browse(cursor, uid, uid)
+ company= user.company_id
+
+ #default_filters=['unicode', 'entity'] can be used to set global filter
+ body_mako_tpl = Template(template ,input_encoding='utf-8')
+ helper = WebKitHelper(cursor, uid, report_xml.id, context)
+ html = body_mako_tpl.render( helper=helper,
+ css=css,
+ _=self.translate_call,
+ **self.parser_instance.localcontext
+ )
+ head_mako_tpl = Template(header, input_encoding='utf-8')
+ head = head_mako_tpl.render(
+ company=company,
+ time=time,
+ helper=helper,
+ css=css,
+ formatLang=self.formatLang,
+ setLang=self.setLang,
+ _=self.translate_call,
+ _debug=False
+ )
+ foot = False
+ if footer :
+ foot_mako_tpl = Template(footer ,input_encoding='utf-8')
+ foot = foot_mako_tpl.render(
+ company=company,
+ time=time,
+ helper=helper,
+ css=css,
+ formatLang=self.formatLang,
+ setLang=self.setLang,
+ _=self.translate_call,
+ )
+ if report_xml.webkit_debug :
+ deb = head_mako_tpl.render(
+ company=company,
+ time=time,
+ helper=helper,
+ css=css,
+ _debug=html,
+ formatLang=self.formatLang,
+ setLang=self.setLang,
+ _=self.translate_call,
+ )
+ return (deb, 'html')
+ bin = self.get_lib(cursor, uid, company.id)
+ pdf = self.generate_pdf(bin, report_xml, head, foot, [html])
+ return (pdf, 'pdf')
+
+
+ def create(self, cursor, uid, ids, data, context=None):
+ """We override the create function in order to handle generator
+ Code taken from report openoffice. Thanks guys :) """
+ pool = pooler.get_pool(cursor.dbname)
+ ir_obj = pool.get('ir.actions.report.xml')
+ report_xml_ids = ir_obj.search(cursor, uid,
+ [('report_name', '=', self.name[7:])], context=context)
+ if report_xml_ids:
+
+ report_xml = ir_obj.browse(
+ cursor,
+ uid,
+ report_xml_ids[0],
+ context=context
+ )
+ report_xml.report_rml = None
+ report_xml.report_rml_content = None
+ report_xml.report_sxw_content_data = None
+ report_rml.report_sxw_content = None
+ report_rml.report_sxw = None
+ else:
+ return super(WebKitParser, self).create(cursor, uid, ids, data, context)
+ if report_xml.report_type != 'webkit' :
+ return super(WebKitParser, self).create(cursor, uid, ids, data, context)
+ result = self.create_source_pdf(cursor, uid, ids, data, report_xml, context)
+ if not result:
+ return (False,False)
+ return result
diff --git a/addons/report_webkit/wizard/__init__.py b/addons/report_webkit/wizard/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..f6f7b3c80196bac236b6bc4e38ddb1dd52a4f473
--- /dev/null
+++ b/addons/report_webkit/wizard/__init__.py
@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com)
+# All Right Reserved
+#
+# Author : Vincent Renaville
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+import report_webkit_actions
\ No newline at end of file
diff --git a/addons/report_webkit/wizard/report_webkit_actions.py b/addons/report_webkit/wizard/report_webkit_actions.py
new file mode 100644
index 0000000000000000000000000000000000000000..249dd0222d7f740da4334d7ef2e7aa5444d5ef7d
--- /dev/null
+++ b/addons/report_webkit/wizard/report_webkit_actions.py
@@ -0,0 +1,141 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com)
+# All Right Reserved
+#
+# Author : Vincent Renaville
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+import ir
+from tools.translate import _
+from osv import fields, osv
+
+class report_webkit_actions(osv.osv_memory):
+ _name = "report.webkit.actions"
+ _description = "Webkit Actions"
+ _columns = {
+ 'print_button':fields.boolean('Add print button', help="Check this to add a Print action for this Report in the sidebar of the corresponding document types"),
+ 'open_action':fields.boolean('Open added action', help="Check this to view the newly added internal print action after creating it (technical view) "),
+ }
+ _defaults = {
+ 'print_button': lambda *a: True,
+ 'open_action': lambda *a: False,
+ }
+
+ def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+ """ Changes the view dynamically
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param context: A standard dictionary
+ @return: New arch of view.
+ """
+ res = super(report_webkit_actions, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
+ record_id = context and context.get('active_id', False) or False
+ active_model = context.get('active_model')
+
+ if not record_id or (active_model and active_model != 'ir.actions.report.xml'):
+ return res
+
+ report = self.pool.get('ir.actions.report.xml').browse(
+ cr,
+ uid,
+ context.get('active_id'),
+ context=context
+ )
+ ids = self.pool.get('ir.values').search(
+ cr,
+ uid,
+ [('value','=',report.type+','+str(context.get('active_id')))]
+ )
+
+ if ids:
+ res['arch'] = '''<form string="Add Print Buttons">
+ <label string="Report Action already exist for this report."/>
+ <separator colspan="4"/>
+ <group col="2" colspan="4">
+ <button icon='gtk-cancel' special="cancel"
+ string="_Cancel" />
+ </group>
+ </form>
+ '''
+
+ return res
+
+ def do_action(self, cr, uid, ids, context):
+ """ This Function Open added Action.
+ @param self: The object pointer.
+ @param cr: A database cursor
+ @param uid: ID of the user currently logged in
+ @param ids: List of report.webkit.actions's ID
+ @param context: A standard dictionary
+ @return: Dictionary of ir.values form.
+ """
+ report_obj = self.pool.get('ir.actions.report.xml')
+ for current in self.browse(cr, uid, ids):
+ report = report_obj.browse(
+ cr,
+ uid,
+ context.get('active_id'),
+ context=context
+ )
+ if current.print_button:
+ res = ir.ir_set(
+ cr,
+ uid,
+ 'action',
+ 'client_print_multi',
+ report.report_name,
+ [report.model],
+ 'ir.actions.report.xml,%d' % context.get('active_id', False),
+ isobject=True
+ )
+ else:
+ res = ir.ir_set(
+ cr,
+ uid,
+ 'action',
+ 'client_print_multi',
+ report.report_name,
+ [report.model,0],
+ 'ir.actions.report.xml,%d' % context.get('active_id', False),
+ isobject=True
+ )
+ if res[0]:
+ if not current.open_action:
+ return {}
+
+ return {
+ 'name': _('Client Actions Connections'),
+ 'view_type': 'form',
+ 'view_mode': 'form',
+ 'res_id' : res[0],
+ 'res_model': 'ir.values',
+ 'view_id': False,
+ 'type': 'ir.actions.act_window',
+ }
+
+report_webkit_actions()
diff --git a/addons/report_webkit/wizard/report_webkit_actions_view.xml b/addons/report_webkit/wizard/report_webkit_actions_view.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7ef262642e1f2d77f39366137682ed3c5dcca83f
--- /dev/null
+++ b/addons/report_webkit/wizard/report_webkit_actions_view.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+ <data>
+
+ <record model="ir.ui.view" id="view_report_webkit_actions">
+ <field name="name">Report Webkit actions wizard</field>
+ <field name="model">report.webkit.actions</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form string="Add Print Buttons" col="4">
+ <field name="print_button"/>
+ <field name="open_action"/>
+ <separator string="" colspan="6"/>
+ <group colspan="6" col="4" >
+ <button string="_Cancel" icon="gtk-close" special="cancel" />
+ <button name="do_action" type="object" string="_Ok" icon="gtk-ok" />
+ </group>
+ </form>
+ </field>
+ </record>
+
+
+ <act_window name="Add Print Buttons"
+ res_model="report.webkit.actions"
+ src_model="ir.actions.report.xml"
+ view_mode="form"
+ view_type="form"
+ key2="client_print_multi"
+ target="new"
+ id="wizard_ofdo_report_actions"/>
+
+ </data>
+</openerp>
diff --git a/addons/report_webkit_sample/__init__.py b/addons/report_webkit_sample/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..9b406f754d83e38a676758884fd1d8bdc69a9b2e
--- /dev/null
+++ b/addons/report_webkit_sample/__init__.py
@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com)
+# All Right Reserved
+#
+# Author : Nicolas Bessi (Camptocamp)
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+import wizard
+import report
\ No newline at end of file
diff --git a/addons/report_webkit_sample/__openerp__.py b/addons/report_webkit_sample/__openerp__.py
new file mode 100644
index 0000000000000000000000000000000000000000..a0367391c6528ee5846d5bab315ea765910c1e99
--- /dev/null
+++ b/addons/report_webkit_sample/__openerp__.py
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com)
+# All Right Reserved
+#
+# Author : Nicolas Bessi (Camptocamp)
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+{
+ "name" : "Webkit Report Samples",
+ "description" : """Samples for Webkit Report Engine (report_webkit module).
+
+ A sample invoice report is included in this module, as well as a wizard to
+ add Webkit Report entries on any Document in the system.
+
+ You have to create the print buttons by calling the wizard. For more details see:
+ http://files.me.com/nbessi/06n92k.mov
+ """,
+ "version" : "0.9",
+ "depends" : ["base", "account", "report_webkit"],
+ "category": "Reports/Webkit",
+ "author" : "Camptocamp SA - NBessi",
+ "url": "http://www.camptocamp.com/",
+ "data": ["report_webkit_html_view.xml",
+
+ ],
+ "installable" : True,
+ "active" : False,
+}
\ No newline at end of file
diff --git a/addons/report_webkit_sample/i18n/fr_FR.po b/addons/report_webkit_sample/i18n/fr_FR.po
new file mode 100644
index 0000000000000000000000000000000000000000..5b46f9e56fcdde2a766bf6816d7e3b7b0ee0070d
--- /dev/null
+++ b/addons/report_webkit_sample/i18n/fr_FR.po
@@ -0,0 +1,241 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# * report_webkit_sample
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2010-10-05 06:33:26+0000\n"
+"PO-Revision-Date: 2010-10-05 06:33:26+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: report_webkit_sample
+#: wizard_view:ir.report_actions,exist:0
+msgid "Report Action already exist for this report."
+msgstr "Report Action already exist for this report."
+
+#. module: report_webkit_sample
+#: wizard_field:ir.report_actions,add,print_button:0
+msgid "Add print button"
+msgstr "Add print button"
+
+#. module: report_webkit_sample
+#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
+msgid "WebKit invoice"
+msgstr "facture WebKit"
+
+#. module: report_webkit_sample
+#: model:ir.actions.wizard,name:report_webkit_sample.wizard_oo_report_actions
+#: wizard_view:ir.report_actions,add:0
+#: wizard_view:ir.report_actions,exist:0
+msgid "Add Print Buttons"
+msgstr "Ajouter des boutons d'impression"
+
+#. module: report_webkit_sample
+#: code:addons/report_webkit_sample/wizard/report_actions.py:0
+#, python-format
+msgid "Client Actions Connections"
+msgstr "Actions Client Connections"
+
+#. module: report_webkit_sample
+#: model:ir.module.module,description:report_webkit_sample.module_meta_information
+msgid "Report system base on WebKit engine (wkhtmltopd lib) that allows to do HTML2PDF reporting.\n"
+"The module structure and some is inspired of the report_openoffice module\n"
+"The module allows:\n"
+" -HTML report definition\n"
+" -Multi header support \n"
+" -Multi logo\n"
+" -Multi company support\n"
+" -HTML and CSS-3 support (In the limit of the actual WebKIT version)\n"
+" -JavaScript support \n"
+" -Raw HTML debugger\n"
+" -Book printing capabilities\n"
+" -Margins definition \n"
+" -Paper size definition\n"
+"and munch more\n"
+"\n"
+"Many header are defined per company\n"
+"Many logo are defined per company\n"
+"CSS style, header and footer body are defined in the company\n"
+"\n"
+"The mapper library can be found here\n"
+"http://code.google.com/p/wkhtmltopdf/\n"
+"The libraries are included for Linux, Mac OS X i386 and Windows 32.\n"
+"\n"
+"A sample invoice report is defined in the report. \n"
+"You have to create the print button by calling a wizard. For more details :\n"
+" http://files.me.com/nbessi/06n92k.mov \n"
+"\n"
+"TODO :\n"
+"JavaScript support activation deactivation\n"
+"Collated and book format support\n"
+"Zip return for separated PDF\n"
+"Web client WYSIWYG\n"
+" "
+msgstr "Report system base on WebKit engine (wkhtmltopd lib) that allows to do HTML2PDF reporting.\n"
+"The module structure and some is inspired of the report_openoffice module\n"
+"The module allows:\n"
+" -HTML report definition\n"
+" -Multi header support \n"
+" -Multi logo\n"
+" -Multi company support\n"
+" -HTML and CSS-3 support (In the limit of the actual WebKIT version)\n"
+" -JavaScript support \n"
+" -Raw HTML debugger\n"
+" -Book printing capabilities\n"
+" -Margins definition \n"
+" -Paper size definition\n"
+"and munch more\n"
+"\n"
+"Many header are defined per company\n"
+"Many logo are defined per company\n"
+"CSS style, header and footer body are defined in the company\n"
+"\n"
+"The mapper library can be found here\n"
+"http://code.google.com/p/wkhtmltopdf/\n"
+"The libraries are included for Linux, Mac OS X i386 and Windows 32.\n"
+"\n"
+"A sample invoice report is defined in the report. \n"
+"You have to create the print button by calling a wizard. For more details :\n"
+" http://files.me.com/nbessi/06n92k.mov \n"
+"\n"
+"TODO :\n"
+"JavaScript support activation deactivation\n"
+"Collated and book format support\n"
+"Zip return for separated PDF\n"
+"Web client WYSIWYG\n"
+" "
+
+#. module: report_webkit_sample
+#: help:ir.report_actions,add,print_button:0
+msgid "Add action to menu context in print button."
+msgstr "Ajouter à l'action du menu contextuel dans le bouton d'impression."
+
+#. module: report_webkit_sample
+#: wizard_button:ir.report_actions,add,end:0
+msgid "_Cancel"
+msgstr "_Cancel"
+
+#. module: report_webkit_sample
+#: model:ir.module.module,shortdesc:report_webkit_sample.module_meta_information
+msgid "webkit report"
+msgstr "rapport webkit"
+
+#. module: report_webkit_sample
+#: wizard_field:ir.report_actions,add,open_action:0
+msgid "Open added action"
+msgstr "Ouvrir ajouté action"
+
+#. module: report_webkit_sample
+#: wizard_button:ir.report_actions,add,process:0
+msgid "_Ok"
+msgstr "_Ok"
+
+#. module: report_webkit_sample
+#: wizard_button:ir.report_actions,exist,end:0
+msgid "_Close"
+msgstr "_Close"
+
+
+
+#. module: report_webkit_sample
+#: webkit:report.webkitaccount.invoice:0
+msgid "Invoice Date"
+msgstr "Date de la facture"
+
+#. module: report_webkit_sample
+#: webkit:report.webkitaccount.invoice:0
+msgid "QTY"
+msgstr "QTÉ"
+
+#. module: report_webkit_sample
+#: webkit:report.webkitaccount.invoice:0
+msgid "Unit Price"
+msgstr "Prix unitaire"
+
+#. module: report_webkit_sample
+#: field:report.webkitaccount.invoice:0
+msgid "Unit of Measure"
+msgstr "Unité de mesure"
+
+#. module: report_webkit_sample
+#: view:account.invoice:0
+#: field:account.invoice.line,invoice_line_tax_id:0
+#: model:ir.actions.act_window,name:account.action_tax_form
+#: model:ir.ui.menu,name:account.menu_action_tax_form
+#: model:ir.ui.menu,name:account.next_id_27
+msgid "Taxes"
+msgstr "Impôts"
+
+#. module: report_webkit_sample
+#: webkit:report.webkitaccount.invoice:0
+msgid "Price"
+msgstr "Prix"
+
+#. module: report_webkit_sample
+#: webkit:report.webkitaccount.invoice:0
+msgid "Tax Lines"
+msgstr "Lignes de taxe"
+
+#. module: report_webkit_sample
+#: webkit:report.webkitaccount.invoice:0
+msgid "Amount"
+msgstr "Montant"
+
+#. module: report_webkit_sample
+#: webkit:report.webkitaccount.invoice,:0
+msgid "Partner Ref."
+msgstr "Réf. partenaire"
+
+#. module: report_webkit_sample
+#: webkit:report.webkitaccount.invoice:0
+msgid "Invoice Ref"
+msgstr "Réf. Facture"
+
+#. module: report_webkit_sample
+#: field:account.invoice,amount_tax:0
+msgid "Total"
+msgstr "Total"
+
+
+#. module: report_webkit_sample
+#: field:account.invoice,name:0
+#: field:account.invoice.line,name:0
+msgid "Description"
+msgstr "Description"
+
+#. module: report_webkit_sample
+#: view:account.invoice.line:0
+#: webkit:account.invoice.tax,invoice_id:0
+msgid "Invoice Line"
+msgstr "Ligne de facture"
+
+#. module: report_webkit_sample
+#: field:account.analytic.line,product_id:0
+#: field:account.invoice.line,product_id:0
+#: field:account.move.line,product_id:0
+msgid "Product"
+msgstr "Produit"
+
+#. module: report_webkit_sample
+#: field:account.invoice,name:0
+msgid "Document"
+msgstr "Ref. document"
+
+#. module: report_webkit_sample
+#: webkit:account.invoice.line,discount:0
+msgid "Disc.(%)"
+msgstr "Disc.(%)"
+
+#. module: report_webkit_sample
+#: model:account.account.type,name:account.account_type_tax
+#: field:account.invoice,amount_tax:0
+#: field:account.move.line,account_tax_id:0
+msgid "Tax"
+msgstr "Taxe"
diff --git a/addons/report_webkit_sample/report/__init__.py b/addons/report_webkit_sample/report/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..04cc14f1d8062ffc539dd53f8a13804af4ed52bd
--- /dev/null
+++ b/addons/report_webkit_sample/report/__init__.py
@@ -0,0 +1,32 @@
+ #-*- coding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com)
+# All Right Reserved
+#
+# Author : Nicolas Bessi (Camptocamp)
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+import report_webkit_html
\ No newline at end of file
diff --git a/addons/report_webkit_sample/report/report_webkit_html.mako b/addons/report_webkit_sample/report/report_webkit_html.mako
new file mode 100644
index 0000000000000000000000000000000000000000..909e254fa407c985e09e1150bdb2ae67da537d0e
--- /dev/null
+++ b/addons/report_webkit_sample/report/report_webkit_html.mako
@@ -0,0 +1,83 @@
+<html>
+<head>
+ <style type="text/css">
+ ${css}
+ </style>
+</head>
+<body>
+ %for inv in objects :
+ <% setLang(inv.partner_id.lang) %>
+ <table class="dest_address">
+ <tr><td ><b>${inv.partner_id.title or ''|entity} ${inv.partner_id.name |entity}</b></td></tr>
+ <tr><td>${inv.address_invoice_id.street or ''|entity}</td></tr>
+ <tr><td>${inv.address_invoice_id.street2 or ''|entity}</td></tr>
+ <tr><td>${inv.address_invoice_id.zip or ''|entity} ${inv.address_invoice_id.city or ''|entity}</td></tr>
+ %if inv.address_invoice_id.country_id :
+ <tr><td>${inv.address_invoice_id.country_id.name or ''|entity} </td></tr>
+ %endif
+ %if inv.address_invoice_id.phone :
+ <tr><td>${_("Tel")}: ${inv.address_invoice_id.phone|entity}</td></tr>
+ %endif
+ %if inv.address_invoice_id.fax :
+ <tr><td>${_("Fax")}: ${inv.address_invoice_id.fax|entity}</td></tr>
+ %endif
+ %if inv.address_invoice_id.email :
+ <tr><td>${_("E-mail")}: ${inv.address_invoice_id.email|entity}</td></tr>
+ %endif
+ %if inv.partner_id.vat :
+ <tr><td>${_("VAT")}: ${inv.partner_id.vat|entity}</td></tr>
+ %endif
+ </table>
+ <br />
+ %if inv.type == 'out_invoice' :
+ <span class="title">${_("Invoice")} ${inv.number or ''|entity}</span>
+ %elif inv.type == 'in_invoice' :
+ <span class="title">${_("Supplier Invoice")} ${inv.number or ''|entity}</span>
+ %elif inv.type == 'out_refund' :
+ <span class="title">${_("Refund")} ${inv.number or ''|entity}</span>
+ %elif inv.type == 'in_refund' :
+ <span class="title">${_("Supplier Refund")} ${inv.number or ''|entity}</span>
+ %endif
+ <br/>
+ <br/>
+ <table class="basic_table" width="90%">
+ <tr><td>${_("Document")}</td><td>${_("Invoice Date")}</td><td>${_("Partner Ref.")}</td></tr>
+ <tr><td>${inv.name}</td><td>${formatLang(inv.date_invoice, date=True)|entity}</td><td> </td></tr>
+ </table>
+ <h1><br /></h1>
+ <table class="list_table" width="90%">
+ <thead><tr><th>${_("Description")}</th><th class>${_("Taxes")}</th><th class>${_("QTY")}</th><th>${_("Unit Price")}</th><th >${_("Disc.(%)")}</th><th>${_("Price")}</th></tr></thead>
+ %for line in inv.invoice_line :
+ <tbody>
+ <tr><td>${line.name|entity}</td><td>${ ', '.join([ tax.name or '' for tax in line.invoice_line_tax_id ])|entity}</td><td>${line.quantity}</td><td style="text-align:right;">${formatLang(line.price_unit)}</td><td style="text-align:center;">${line.discount or 0.00}</td><td style="text-align:right;">${formatLang(line.price_subtotal)}</td></tr>
+ %if line.note :
+ <tr><td colspan="6" style="border-style:none"><pre style="font-family:Helvetica;padding-left:20px">${line.note |entity}</pre></td></tr>
+ %endif
+ %endfor
+ <tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-top:2px solid"><b>Net Total:</b></td><td style="border-top:2px solid;text-align:right">${formatLang(inv.amount_untaxed)}</td></tr>
+ <tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>Taxes:</b></td><td style="text-align:right">${formatLang(inv.amount_tax)}</td></tr>
+ <tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-top:2px solid"><b>Total:</b></td><td style="border-top:2px solid;text-align:right">${formatLang(inv.amount_total)}</td></tr>
+ </tbody>
+ </table>
+
+ <table class="list_table" width="40%">
+ <tr><th>Tax</th><th>${_("Base")}</th><th>${_("Amount")}</th></tr>
+ %if inv.tax_line :
+ %for t in inv.tax_line :
+ <tr>
+ <td>${ t.name|entity } </td>
+ <td>${ t.base|entity}</td>
+ <td>${ formatLang(t.amount) }</td>
+ </tr>
+ %endfor
+ %endif
+ <tr>
+ <td style="border-style:none"/>
+ <td style="border-top:2px solid"><b>${_("Total")}</b></td>
+ <td style="border-top:2px solid">${ formatLang(inv.amount_tax) }</td>
+ </tr>
+ </table>
+ <p style="page-break-after:always"></p>
+ %endfor
+</body>
+</html>
\ No newline at end of file
diff --git a/addons/report_webkit_sample/report/report_webkit_html.py b/addons/report_webkit_sample/report/report_webkit_html.py
new file mode 100644
index 0000000000000000000000000000000000000000..3e7f70c4154e2499c4a8ab4f0c543a872272423a
--- /dev/null
+++ b/addons/report_webkit_sample/report/report_webkit_html.py
@@ -0,0 +1,17 @@
+import time
+from report import report_sxw
+from osv import osv
+
+class report_webkit_html(report_sxw.rml_parse):
+ def __init__(self, cr, uid, name, context):
+ super(report_webkit_html, self).__init__(cr, uid, name, context=context)
+ self.localcontext.update({
+ 'time': time,
+ 'cr':cr,
+ 'uid': uid,
+ })
+
+report_sxw.report_sxw('report.webkitaccount.invoice',
+ 'account.invoice',
+ 'addons/report_webkit_sample/report/report_webkit_html.mako',
+ parser=report_webkit_html)
diff --git a/addons/report_webkit_sample/report_webkit_html_view.xml b/addons/report_webkit_sample/report_webkit_html_view.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b4839496de2e8d75e4e557d282c99f50db57482f
--- /dev/null
+++ b/addons/report_webkit_sample/report_webkit_html_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+ <data>
+ <report auto="False" id="report_webkit_html" model="account.invoice" name="webkitaccount.invoice" file="report_webkit_sample/report/report_webkit_html.mako" string="WebKit invoice" report_type="webkit" />
+ </data>
+</openerp>
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index a0db745efb46980f2c98ca98517e0c62d2201e76..801e363681fd4efee0f88fc1a4ce7957ad792812 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -201,7 +201,7 @@
<field name="view_mode">tree,form</field>
<field name="context">{}</field>
<field name="search_view_id" ref="view_resource_resource_search"/>
- <field name="help">There you can find clusters of your resources type involved in a specific project phase as well as their workload.</field>
+ <field name="help">Resources allows you to create and manage resources that should be involved in a specific project phase. It also allows you to set their efficiency level and workload based on their weekly working hours</field>
</record>
<record id="resource_calendar_leave_form" model="ir.ui.view">
diff --git a/addons/sale/i18n/mn.po b/addons/sale/i18n/mn.po
index 006f67fca37bdb5e418f8dd4a4bcd7c603c18f08..d0ac621c5f781a8387882858c527234c5cd91f15 100644
--- a/addons/sale/i18n/mn.po
+++ b/addons/sale/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 11:07+0000\n"
-"Last-Translator: ub121 <ubs121@gmail.com>\n"
+"PO-Revision-Date: 2010-10-17 07:57+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Mongolian <mn@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-09-30 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-18 04:55+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale
@@ -58,6 +58,8 @@ msgid ""
"If you don't have enough stock available to deliver all at once, do you "
"accept partial shipments or not?"
msgstr ""
+"Ð¥ÑÑ€Ñв та бүгдийг нÑгÑн зÑÑ€Ñг багтаахад хангалтгүй агуулахтай бол Ñ…ÑÑÑгчилÑÑн "
+"барааг хүлÑÑж авдаг уу ÑÑвÑл авдгүй юу?"
#. module: sale
#: selection:sale.order.line,type:0
@@ -84,7 +86,7 @@ msgstr "Таны нÑÑ…ÑмжлÑл амжилттай Ò¯Ò¯ÑлÑÑ !"
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Automatic Declaration"
-msgstr ""
+msgstr "Ðвтомат мÑдÑгдÑл"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
@@ -281,6 +283,11 @@ msgid ""
"choose if you invoice based on ordered or shipped quantities. If the product "
"is a service, shipped quantities means hours spent on the associated tasks."
msgstr ""
+"Борлуулалтын захиалга нь автоматаар нÑÑ…ÑмжлÑлийн баталгааг Ò¯Ò¯ÑгÑдÑг. "
+"ЗахиалÑан болон хүргÑж өгÑөн тоо Ñ…ÑмжÑÑ Ð½ÑŒ адилхан биш байх боломжтой. Ð¥ÑÑ€Ñв "
+"нÑÑ…ÑмжлÑл гаргах бол захиалагдÑан ÑÑвÑл Ñ‚ÑÑвÑрлÑгдÑÑн тоо Ñ…ÑмжÑÑн дÑÑÑ€ "
+"Ñуурилан гаргах Ñ…ÑÑ€ÑгтÑй. Ð¥ÑÑ€Ñв бүтÑÑгдÑхүүн үйлчилгÑÑ Ð±Ð¾Ð» Ñ‚ÑÑвÑрлÑгдÑÑн тоо "
+"Ñ…ÑмжÑÑ Ð½ÑŒ холбоотой дааллгавар дÑÑÑ€ зарцуулÑан цаг болно."
#. module: sale
#: selection:sale.order.line,state:0
@@ -386,6 +393,8 @@ msgid ""
"When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it "
"will automatic create after delivery."
msgstr ""
+"ТÑÑвÑрлÑлтийн удирдамж нь = 'ХүргÑлтийн дараах автомат нÑÑ…ÑмжлÑл ' гÑÑÑн "
+"Ñонголттой үед хүргÑлтийн дараа автоматаар Ò¯Ò¯ÑÑÑ… болно."
#. module: sale
#: selection:sale.order,picking_policy:0
@@ -524,7 +533,7 @@ msgstr "ÐÑÑ…ÑмжлÑлийг бүлÑглÑÑ…"
#: model:ir.actions.act_window,name:sale.action_order_tree5
#: model:ir.ui.menu,name:sale.menu_action_order_tree5
msgid "All Quotations"
-msgstr ""
+msgstr "Бүх ханш"
#. module: sale
#: field:sale.order.line,discount:0
@@ -540,18 +549,18 @@ msgstr "Ðоорог нÑÑ…ÑмжлÑл нÑгтлангаар Ñ…Ñнагдах
#: model:ir.actions.act_window,name:sale.action_order_tree3
#: model:ir.ui.menu,name:sale.menu_action_order_tree3
msgid "Sales Order To Be Invoiced"
-msgstr ""
+msgstr "Борлуулалтын захаилга нÑÑ…ÑмжлÑгдÑÑн байх"
#. module: sale
#: model:process.node,note:sale.process_node_saleorderprocurement0
msgid "Procurement for each line"
-msgstr ""
+msgstr "Мөр бүрÑÑÑ€ татан авалт хийх"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree10
#: model:ir.ui.menu,name:sale.menu_action_order_tree10
msgid "My Quotations"
-msgstr ""
+msgstr "Миний ханш"
#. module: sale
#: wizard_view:sale.advance_payment_inv,create:0
@@ -566,17 +575,17 @@ msgstr "Захиалгын шугам"
#. module: sale
#: field:sale.config.picking_policy,picking_policy:0
msgid "Packing Default Policy"
-msgstr ""
+msgstr "Савлах заÑамал удирдамж"
#. module: sale
#: model:process.node,note:sale.process_node_saleorder0
msgid "Manages the delivery and invoicing progress"
-msgstr ""
+msgstr "ХүргÑлт болон нÑÑ…ÑмжлÑÑ… үйл ажиллагааг удирдах"
#. module: sale
#: field:sale.config.picking_policy,order_policy:0
msgid "Shipping Default Policy"
-msgstr ""
+msgstr "ТÑÑвÑрлÑлтийн заÑамал арга"
#. module: sale
#: field:sale.order.line,product_packaging:0
@@ -625,7 +634,7 @@ msgstr "ÐÑÑ…ÑмжилÑÑн"
#. module: sale
#: model:ir.actions.wizard,name:sale.advance_payment
msgid "Advance Invoice"
-msgstr ""
+msgstr "УрьдчилÑан нÑÑ…ÑмжлÑл"
#. module: sale
#: field:sale.order,state:0
@@ -636,7 +645,7 @@ msgstr "Төлөв"
#: model:ir.actions.act_window,name:sale.action_order_line_tree2
#: model:ir.ui.menu,name:sale.menu_action_order_line_tree2
msgid "Uninvoiced Lines"
-msgstr ""
+msgstr "ÐÑÑ…ÑмжлÑлгүй мөр"
#. module: sale
#: model:ir.actions.todo,note:sale.config_wizard_step_sale_picking_policy
@@ -669,7 +678,7 @@ msgstr ""
#: model:ir.actions.act_window,name:sale.action_order_tree7
#: model:ir.ui.menu,name:sale.menu_action_order_tree7
msgid "My sales in shipping exception"
-msgstr ""
+msgstr "Миний борлуулалтын алдаатай Ñ‚ÑÑвÑрлÑлт"
#. module: sale
#: view:sale.config.picking_policy:0
@@ -705,7 +714,7 @@ msgstr "ЗаÑварлаÑан нийлүүлÑлт"
#. module: sale
#: selection:sale.order,order_policy:0
msgid "Shipping & Manual Invoice"
-msgstr ""
+msgstr "ТÑÑвÑрлÑÑ… болон нÑÑ…ÑмжлÑÑ… заавар"
#. module: sale
#: model:process.transition,name:sale.process_transition_saleorderprocurement0
@@ -716,7 +725,7 @@ msgstr "Борлуулалт нийлүүлÑлт"
#. module: sale
#: view:sale.config.picking_policy:0
msgid "Configure Sale Order Logistic"
-msgstr ""
+msgstr "Борлуулалтын захиалгын ЛожиÑтик тохиргоо"
#. module: sale
#: field:sale.order,amount_untaxed:0
@@ -751,7 +760,7 @@ msgstr "УрьдчилÑан нÑÑ…ÑмжлÑл Ò¯Ò¯ÑгÑÑ…"
#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid "One procurement for each product."
-msgstr ""
+msgstr "БүтÑÑгдÑхүүн бүр дÑÑÑ€ нÑг татан авалт"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_form
@@ -785,7 +794,7 @@ msgstr "Ò®Ð½Ñ Ð±Ò¯Ò¯Ñ€Ð°Ð»Ñ‚"
#. module: sale
#: model:product.template,name:sale.advance_product_0_product_template
msgid "Advance Product"
-msgstr ""
+msgstr "ТөлÑөн бүтÑÑгдÑхүүн"
#. module: sale
#: model:process.transition,note:sale.process_transition_invoice0
@@ -856,7 +865,7 @@ msgstr "Зөвхөн хүргÑÑ… захиалга"
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales order lines"
-msgstr ""
+msgstr "Борлуулалтын захиалгын мөр"
#. module: sale
#: field:sale.order.line,sequence:0
@@ -866,7 +875,7 @@ msgstr "Дараалал"
#. module: sale
#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
msgid "Sales"
-msgstr ""
+msgstr "Борлуулалт"
#. module: sale
#: view:sale.order:0
@@ -968,12 +977,12 @@ msgstr ""
#. module: sale
#: model:process.transition,note:sale.process_transition_saleinvoice0
msgid "Confirm sale order and Create invoice."
-msgstr ""
+msgstr "Борлуулалтын захиалгыг батлах болон нÑÑ…ÑмжлÑл Ò¯Ò¯ÑгÑÑ…"
#. module: sale
#: selection:sale.config.picking_policy,step:0
msgid "Packing List & Delivery Order"
-msgstr ""
+msgstr "Савлагааны жагÑаалт ба ХүргÑлтийн захаилга"
#. module: sale
#: selection:sale.order.line,state:0
@@ -1005,7 +1014,7 @@ msgstr ""
#. module: sale
#: view:sale.config.picking_policy:0
msgid "Set Default"
-msgstr ""
+msgstr "ҮндÑÑн утга болгох"
#. module: sale
#: view:sale.order:0
@@ -1087,13 +1096,13 @@ msgstr "Ðрх шилжүүлÑхийг цуцлах"
#. module: sale
#: selection:sale.order,order_policy:0
msgid "Invoice from the Packing"
-msgstr ""
+msgstr "Савлагааны нÑÑ…ÑмжлÑл"
#. module: sale
#: model:ir.actions.wizard,name:sale.wizard_sale_order_line_invoice
#: model:ir.actions.wizard,name:sale.wizard_sale_order_make_invoice
msgid "Make invoices"
-msgstr ""
+msgstr "ÐÑÑ…ÑмжлÑл Ò¯Ò¯ÑгÑÑ…"
#. module: sale
#: help:sale.order,partner_order_id:0
@@ -1135,7 +1144,7 @@ msgstr "ÐÑÑ…ÑмжлÑÑ… арга"
#: model:ir.actions.act_window,name:sale.action_order_tree_new
#: model:ir.ui.menu,name:sale.menu_action_order_tree_new
msgid "New Quotation"
-msgstr ""
+msgstr "Ð¨Ð¸Ð½Ñ Ñ…Ð°Ð½Ñˆ"
#. module: sale
#: view:sale.order:0
@@ -1156,7 +1165,7 @@ msgstr "Барааны зарах нÑгж"
#. module: sale
#: selection:sale.order,state:0
msgid "Manual In Progress"
-msgstr ""
+msgstr "Үйл Ñвцын заавар"
#. module: sale
#: field:sale.order.line,product_uom:0
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index 556ed670eaf517866e3145f98660359f56acecff..1aeb2376daa233fba68a09218c348aa9c832ae69 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-30 06:52+0000\n"
+"PO-Revision-Date: 2010-10-17 07:57+0000\n"
"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-01 08:47+0000\n"
+"X-Launchpad-Export-Date: 2010-10-18 04:55+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale
@@ -762,7 +762,7 @@ msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_saleprocurement0
msgid "One procurement for each product."
-msgstr ""
+msgstr "Одна закупка Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ товара."
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_form
@@ -773,12 +773,12 @@ msgstr "Заказы"
#. module: sale
#: field:product.product,pricelist_sale:0
msgid "Sale Pricelists"
-msgstr ""
+msgstr "Каталоги продаж"
#. module: sale
#: selection:sale.config.picking_policy,picking_policy:0
msgid "Direct Delivery"
-msgstr ""
+msgstr "ПрÑÐ¼Ð°Ñ Ð´Ð¾Ñтавка"
#. module: sale
#: view:sale.order:0
@@ -831,7 +831,7 @@ msgstr "Заказы в процеÑÑе выполнениÑ"
#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_assign0
msgid "Assign"
-msgstr ""
+msgstr "Ðазначить"
#. module: sale
#: view:sale.order:0
@@ -905,7 +905,7 @@ msgstr "Цена за ед."
#. module: sale
#: field:sale.order,fiscal_position:0
msgid "Fiscal Position"
-msgstr ""
+msgstr "ÐÐ°Ð»Ð¾Ð³Ð¾Ð²Ð°Ñ Ð¿Ð¾Ð·Ð¸Ñ†Ð¸Ñ"
#. module: sale
#: rml:sale.order:0
diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index b5f037625e65e76fa1b8feb3c5bcecec45e55252..515aa9f74d823ca4020cd50921cb21ed234f9660 100644
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Sale Order" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Sale Order.pdf">
+ <template pageSize="(595.0,842.0)" title="Sale Order" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="15.0" y1="42.0" width="539" height="758"/>
</pageTemplate>
@@ -132,22 +132,22 @@
<tr>
<td>
<para style="terp_default_Bold_9">Shipping address :</para>
- <para style="terp_default_9">[[ o.partner_id.title.name or '' ]] [[ o.partner_id.name ]]</para>
- <para style="terp_default_9">[[ o.partner_shipping_id.street ]]</para>
- <para style="terp_default_9">[[ o.partner_shipping_id.street2 or removeParentNode('para') ]]</para>
- <para style="terp_default_9">[[ o.partner_shipping_id.zip or '' ]] [[ o.partner_shipping_id.city or '' ]]</para>
- <para style="terp_default_9">[[ (o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name) or removeParentNode('para') ]] </para>
- <para style="terp_default_9">[[ (o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name) or '' ]]</para>
+ <para style="terp_default_9">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
+ <para style="terp_default_9">[[ (o.partner_shipping_id and o.partner_shipping_id.street) or '' ]]</para>
+ <para style="terp_default_9">[[ (o.partner_shipping_id and o.partner_shipping_id.street2) or removeParentNode('para') ]]</para>
+ <para style="terp_default_9">[[ (o.partner_shipping_id and o.partner_shipping_id.zip) or '' ]] [[ (o.partner_shipping_id and o.partner_shipping_id.city) or '' ]]</para>
+ <para style="terp_default_9">[[ (o.partner_shipping_id and o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name) or removeParentNode('para') ]] </para>
+ <para style="terp_default_9">[[ (o.partner_shipping_id and o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name) or '' ]]</para>
<para style="terp_default_9">
<font color="white"> </font>
</para>
<para style="terp_default_Bold_9">Invoice address :</para>
- <para style="terp_default_9">[[ o.partner_invoice_id.title.name or '' ]] [[ o.partner_invoice_id.name or '' ]]</para>
- <para style="terp_default_9">[[ o.partner_invoice_id.street ]] </para>
- <para style="terp_default_9">[[ (o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2)) or removeParentNode('para') ]]</para>
- <para style="terp_default_9">[[ o.partner_invoice_id.zip or '' ]] [[ o.partner_invoice_id.city or '' ]]</para>
- <para style="terp_default_9">[[ (o.partner_invoice_id.state_id and o.partner_invoice_id.state_id.name) or removeParentNode('para') ]]</para>
- <para style="terp_default_9">[[ o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '' ]]</para>
+ <para style="terp_default_9">[[ (o.partner_invoice_id and o.partner_invoice_id.title and o.partner_invoice_id.title.name) or '' ]] [[ (o.partner_invoice_id and o.partner_invoice_id.name) or '' ]]</para>
+ <para style="terp_default_9">[[ (o.partner_invoice_id and o.partner_invoice_id.street) or '' ]] </para>
+ <para style="terp_default_9">[[ (o.partner_invoice_id and o.partner_invoice_id.street2) or removeParentNode('para') ]]</para>
+ <para style="terp_default_9">[[ (o.partner_invoice_id and o.partner_invoice_id.zip) or '' ]] [[ (o.partner_invoice_id and o.partner_invoice_id.city) or '' ]]</para>
+ <para style="terp_default_9">[[ (o.partner_invoice_id and o.partner_invoice_id.state_id and o.partner_invoice_id.state_id.name) or removeParentNode('para') ]]</para>
+ <para style="terp_default_9">[[ (o.partner_invoice_id and o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name) or '' ]]</para>
</td>
<td>
<para style="terp_default_8">
@@ -155,17 +155,17 @@
</para>
</td>
<td>
- <para style="terp_default_9">[[ o.partner_id.title.name or '' ]] [[ o.partner_id.name ]]</para>
- <para style="terp_default_9">[[ o.partner_order_id.street ]]</para>
- <para style="terp_default_9">[[ o.partner_order_id.street2 or removeParentNode('para') ]]</para>
- <para style="terp_default_9">[[ o.partner_order_id.zip or '' ]] [[ o.partner_order_id.city or '' ]]</para>
- <para style="terp_default_9">[[ (o.partner_order_id.state_id and o.partner_order_id.state_id.name) or removeParentNode('para')]] [[ (o.partner_order_id.country_id and o.partner_order_id.country_id.name) or '' ]]</para>
+ <para style="terp_default_9">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
+ <para style="terp_default_9">[[ (o.partner_order_id and o.partner_order_id.street) or '' ]]</para>
+ <para style="terp_default_9">[[ (o.partner_order_id and o.partner_order_id.street2) or removeParentNode('para') ]]</para>
+ <para style="terp_default_9">[[ (o.partner_order_id and o.partner_order_id.zip) or '' ]] [[ (o.partner_order_id and o.partner_order_id.city) or '' ]]</para>
+ <para style="terp_default_9">[[ (o.partner_order_id and o.partner_order_id.state_id and o.partner_order_id.state_id.name) or removeParentNode('para')]] [[ (o.partner_order_id and o.partner_order_id.country_id and o.partner_order_id.country_id.name) or '' ]]</para>
<para style="terp_default_9">
<font color="white"> </font>
</para>
- <para style="terp_default_9">Tel. : [[ o.partner_order_id.phone or removeParentNode('para') ]]</para>
- <para style="terp_default_9">Fax : [[ o.partner_order_id.fax or removeParentNode('para') ]]</para>
- <para style="terp_default_9">TVA : [[ o.partner_id.vat or removeParentNode('para') ]]</para>
+ <para style="terp_default_9">Tel. : [[ (o.partner_order_id and o.partner_order_id.phone) or removeParentNode('para') ]]</para>
+ <para style="terp_default_9">Fax : [[ (o.partner_order_id and o.partner_order_id.fax) or removeParentNode('para') ]]</para>
+ <para style="terp_default_9">TVA : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
<para style="terp_default_9">
<font color="white"> </font>
</para>
@@ -206,10 +206,10 @@
<para style="terp_default_Centre_8">[[ formatLang(o.date_order,date = True) ]]</para>
</td>
<td>
- <para style="terp_default_Centre_8">[[ o.user_id.name ]]</para>
+ <para style="terp_default_Centre_8">[[ (o.user_id and o.user_id.name) or '' ]]</para>
</td>
<td>
- <para style="terp_default_Centre_8">[[ o.payment_term.name ]]</para>
+ <para style="terp_default_Centre_8">[[ (o.payment_term and o.payment_term.name) or '' ]]</para>
</td>
</tr>
</blockTable>
@@ -353,7 +353,7 @@
</tr>
<tr>
<td>
- <para style="terp_default_9">[[ format((o.partner_id.property_payment_term and o.partner_id.property_payment_term.note) or '') ]]</para>
+ <para style="terp_default_9">[[ format((o.partner_id and o.partner_id.property_payment_term and o.partner_id.property_payment_term.note) or '') ]]</para>
</td>
</tr>
</blockTable>
@@ -361,4 +361,4 @@
<font color="white"> </font>
</para>
</story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 87f134e857c71ff3af60d1c65376ad8e94693448..c4cc59f7b9a96c4c689813307243e40f0a6e54e0 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -102,7 +102,7 @@
<filter string="Default UoM" icon="terp-mrp" context="{'group_by':'uom_name'}"/>
<filter string="Category of Product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id'}"/>
<separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
- <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_account_id'}" groups="analytic.group_analytic_accounting"/>
+ <filter string="Analytic Account" icon="terp-folder-violet" context="{'group_by':'analytic_account_id'}" groups="analytic.group_analytic_accounting"/>
<separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
<filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
<separator orientation="vertical"/>
@@ -125,7 +125,7 @@
<field name="search_view_id" ref="view_order_product_search"/>
<field name="view_id" ref="view_order_product_tree"/>
<field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
- <field name="help">With Sales Analysis consult your sales total amount suits to different group criteria (salesman, partner, product, etc.)</field>
+ <field name="help">This report performs analysis on your quotations and sales orders. Analysis check your sales revenues and sort it by different group criteria (salesman, partner, product, etc.) Use this report to perform analysis on sales not having invoiced yet. If you want to analyse your turnover, you should use the Invoice Analysis report in the Accounting application.</field>
</record>
<menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="11"/>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index cfb96f7d0957fe4b315d8ca770b93fcb6bd3ced6..409be07a765cab8bd1feac52d2bbca9b7a140b78 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -54,7 +54,7 @@ def _incoterm_get(self, cr, uid, context=None):
class sale_order(osv.osv):
_name = "sale.order"
_description = "Sale Order"
-
+
def copy(self, cr, uid, id, default=None, context=None):
if context is None:
context = {}
@@ -331,7 +331,7 @@ class sale_order(osv.osv):
wf_service.trg_delete(uid, 'sale.order', inv_id, cr)
wf_service.trg_create(uid, 'sale.order', inv_id, cr)
for (id,name) in self.name_get(cr, uid, ids):
- message = _('Sale order ') + " '" + name + "' "+ _("is in draft state")
+ message = _("The sale order '%s' has been set in draft state.") %(name,)
self.log(cr, uid, id, message)
return True
@@ -461,6 +461,7 @@ class sale_order(osv.osv):
return inv_id
def manual_invoice(self, cr, uid, ids, context=None):
+ mod_obj = self.pool.get('ir.model.data')
wf_service = netsvc.LocalService("workflow")
inv_ids = set()
inv_ids1 = set()
@@ -473,18 +474,21 @@ class sale_order(osv.osv):
for record in self.pool.get('sale.order').browse(cr, uid, id).invoice_ids:
inv_ids1.add(record.id)
inv_ids = list(inv_ids1.difference(inv_ids))
-
+
+ result = mod_obj._get_id(cr, uid, 'account', 'invoice_form')
+ res = mod_obj.read(cr, uid, result, ['res_id'])
result = {
'name': 'Invoices',
'view_type': 'form',
- 'view_mode': 'form,tree',
+ 'view_mode': 'form',
+ 'view_id': [res['res_id']],
'res_model': 'account.invoice',
- 'view_id': False,
- 'context': "{'type':'out_refund'}",
+ 'context': "{'type':'out_invoice'}",
'type': 'ir.actions.act_window',
- 'res_id': inv_ids[0],
- 'nodestroy' :True
- }
+ 'nodestroy' :True,
+ 'target': 'current',
+ 'res_id': inv_ids and inv_ids[0] or False,
+ }
return result
@@ -614,7 +618,7 @@ class sale_order(osv.osv):
wf_service.trg_validate(uid, 'account.invoice', inv, 'invoice_cancel', cr)
sale_order_line_obj.write(cr, uid, [l.id for l in sale.order_line],
{'state': 'cancel'})
- message = _('Sale order') + " '" + sale.name + _(" is cancelled")
+ message = _("The sale order '%s' has been cancelled.") % (sale.name,)
self.log(cr, uid, sale.id, message)
self.write(cr, uid, ids, {'state': 'cancel'})
return True
@@ -626,7 +630,7 @@ class sale_order(osv.osv):
else:
self.write(cr, uid, [o.id], {'state': 'progress', 'date_confirm': time.strftime('%Y-%m-%d')})
self.pool.get('sale.order.line').button_confirm(cr, uid, [x.id for x in o.order_line])
- message = _('Quotation') + " '" + o.name + "' "+ _("is converted to Sale order")
+ message = _("The quotation '%s' has been converted to a sale order.") % (o.name,)
self.log(cr, uid, o.id, message)
return True
@@ -985,8 +989,6 @@ class sale_order_line(osv.osv):
raise osv.except_osv(
_('Could not cancel sale order line!'),
_('You must first cancel stock moves attached to this sale order line.'))
- message = _('Sale order line') + " '" + line.name + "' "+_("is cancelled")
- self.log(cr, uid, id, message)
return self.write(cr, uid, ids, {'state': 'cancel'})
def button_confirm(self, cr, uid, ids, context=None):
diff --git a/addons/sale/sale_installer.py b/addons/sale/sale_installer.py
index 4197c0a370be1863f988133b53d1a65c125d487d..a8cc5432020e54ebbc8033d270ad7b67ef919e19 100644
--- a/addons/sale/sale_installer.py
+++ b/addons/sale/sale_installer.py
@@ -28,11 +28,8 @@ class sale_installer(osv.osv_memory):
_columns = {
'delivery': fields.boolean('Delivery Costs',
help="Allows you to compute delivery costs on your quotations."),
- 'sale_journal': fields.boolean('Sales and deliveries by journal',
- help="Allows you to categorise your "
- "sales and deliveries (picking lists) between different journals. "
- "This module is very helpful for bigger companies that "
- "work by departments."),
+ 'sale_journal': fields.boolean('Invoicing journals',
+ help="Allows you to group and invoice your delivery orders according to different invoicing types: daily, weekly, etc."),
'sale_layout': fields.boolean('Sales Order Layout Improvement',
help="Provides some features to improve the layout of the Sales Order reports."),
'sale_margin': fields.boolean('Margins in Sales Orders',
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 85dd4c86c27e499c282cd57b910c5a02f29e00c9..b9eabcaa02ebee6d0a4f621daf094dd271beb76f 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
-
<menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0"
- groups="base.group_sale_salesman,base.group_sale_manager,base.group_system"/>
+ groups="base.group_sale_salesman,base.group_sale_manager"/>
+
<menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
<menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
@@ -46,11 +46,14 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_shop_tree"/>
+ <field name="help">If you have more than one shops reselling your company products, you can create and manage them from here. Whenever you will record a new quotation or sale order, it has to be linked to a shop. The shop also defines the warehouse from which the products will be delivered for each particular sale.</field>
</record>
+ <menuitem id="menu_config_sale"
+ parent="base.menu_base_config"
+ name="Sales" groups="base.group_extended"/>
<menuitem action="action_shop_form" id="menu_action_shop_form"
- parent="product.prod_config_main" sequence="0"
- groups="base.group_extended,base.group_sale_manager"/>
+ parent="menu_config_sale" sequence="0" />
<record id="view_sale_order_calendar" model="ir.ui.view">
<field name="name">sale.order.calendar</field>
@@ -197,7 +200,8 @@
<field name="amount_tax"/>
<field name="amount_total"/>
<button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
- <button name="%(action_view_sale_advance_payment_inv)d" string="Deposit" type="action" icon="gtk-execute" attrs="{'invisible':[('state','!=','draft')]}"/>
+ <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice"
+ type="action" icon="gtk-execute" states="draft,manual" groups="base.group_extended"/>
</group>
<group col="13" colspan="4">
<field name="state"/>
@@ -206,7 +210,7 @@
<button name="ship_recreate" states="shipping_except" string="Recreate Procurement" icon="gtk-ok"/>
<button name="ship_corrected" states="shipping_except" string="Procurement Corrected" icon="gtk-apply"/>
<button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
- <button name="manual_invoice" states="manual" string="Create Invoice" icon="terp-gtk-go-back-rtl" type="object"/>
+ <button name="manual_invoice" states="manual" string="Create Invoice" icon="gtk-go-forward" type="object"/>
<button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
<button name="cancel" states="draft" string="Cancel Order" icon="gtk-cancel"/>
@@ -288,12 +292,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="search_view_id" ref="view_sales_order_filter"/>
- <field name="help">The sales order manages the invoicing, the product fullfilment and the
-delivery processes. OpenERP can handle products, services and
-consumables so that a sales order can trigger tasks, manufacturing
-orders, purchases, etc. It support several invoicing methods according
-to your configuration: from the sales order, from the pickings, etc.
- </field>
+ <field name="help">Sales Orders helps you manage quotations and orders done with your customers. OpenERP suggests that you to start by creating a quotation. Once the order is confirmed, the quotation is converted into a Sale Order. OpenERP can handle several types of products so that a sales order can trigger tasks, delivery orders, manufacturing orders, purchases and so on. Based on the configuration of the sale order, a draft invoice will be generated so that you just have to confirm it when you want to bill your customer.</field>
</record>
<menuitem action="action_order_form" id="menu_sale_order" parent="base.menu_sales" sequence="3" groups="base.group_sale_salesman,base.group_sale_manager"/>
@@ -378,14 +377,15 @@ to your configuration: from the sales order, from the pickings, etc.
<form string="Sales Order Lines">
<group colspan="4" col="6">
<field name="order_id"/>
- <field name="product_id" readonly="1"/>
+ <field name="order_partner_id" readonly="1" invisible="1"/>
<field name="invoiced"/>
+
+ <field name="product_id" readonly="1"/>
<field name="product_uom_qty" readonly="1"/>
- <field groups="product.group_uos" name="product_uos_qty"/>
<field name="product_uom"/>
+
<field colspan="4" name="name" groups="base.group_extended"/>
<field name="company_id" groups="base.group_multi_company" readonly="1"/>
- <field name="order_partner_id" readonly="1" invisible="1"/>
</group>
<separator colspan="4" string="Price"/>
<group colspan="4" col="6">
@@ -398,20 +398,21 @@ to your configuration: from the sales order, from the pickings, etc.
<separator colspan="4"/>
<field name="state"/>
<group col="3" colspan="2">
- <!-- <button colspan="1"
- name="%(action_view_sale_order_line_make_invoice)d"
- string="Make Invoice"
- type="action"
- icon="terp-document-new"
- attrs="{'invisible': ['|',('state', 'in', ('draft','cancel')),('invoiced', '=', 1)]}"/>-->
<button name="button_cancel"
string="Cancel" type="object"
icon="gtk-cancel"
- attrs="{'invisible': ['|',('state', 'not in', ('confirmed', 'exception')),('invoiced', '=', 1)]}"/>
+ states="confirmed,exception"/>
+ <button colspan="1"
+ name="%(action_view_sale_order_line_make_invoice)d"
+ string="Create Invoice"
+ type="action"
+ states="done"
+ icon="gtk-go-forward"
+ attrs="{'invisible': [('invoiced', '=', 1)]}"/>
<button name="button_done"
string="Done" type="object"
- icon="gtk-jump-to"
- attrs="{'invisible': ['|',('state', 'not in', ('confirmed','exception')),('invoiced', '=', 0)]}"/>
+ states="confirmed,exception"
+ icon="gtk-go-forward" />
</group>
</form>
</field>
@@ -448,10 +449,15 @@ to your configuration: from the sales order, from the pickings, etc.
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Uninvoiced Lines">
- <filter icon="terp-check" string="Confirmed"
+ <filter icon="terp-check" string="To Do"
domain="[('state','=','confirmed')]"
name="sale order"
- help="Confirmed Sale Order Lines"
+ help="Confirmed sale order lines, not yet delivered"
+ />
+ <filter icon="terp-check" string="Done"
+ domain="[('state','=','done')]"
+ name="sale_order_done"
+ help="Sale order lines done"
/>
<separator orientation="vertical"/>
<filter icon="terp-accessories-archiver" string="Shipped"
@@ -490,7 +496,7 @@ to your configuration: from the sales order, from the pickings, etc.
<field name="search_view_id" ref="view_sales_order_uninvoiced_line_filter" />
<field name="context">{"search_default_uninvoiced":1}</field>
<field name="filter" eval="True"/>
- <field name="help">Lines to invoice opens a search view with sales order and their status.</field>
+ <field name="help">Here is a list of each sales order line to be invoiced. This view allows you to invoice sales orders partially, by lines of sales order. You don't need this list if you invoice based on the delivery orders or if you invoice sales totally.</field>
</record>
<record id="action_order_line_tree3" model="ir.actions.act_window">
@@ -518,7 +524,7 @@ to your configuration: from the sales order, from the pickings, etc.
src_model="product.product"
groups="base.group_extended"/>
- <menuitem id="menu_invoiced" name="Billing" parent="base.menu_base_partner" sequence="5"
+ <menuitem id="menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="5"
groups="base.group_extended"/>
<menuitem action="action_order_line_tree2" id="menu_invoicing_sales_order_lines" parent="menu_invoiced" sequence="2" groups="base.group_sale_salesman,base.group_sale_manager"/>
<!-- configartion view -->
@@ -534,8 +540,7 @@ to your configuration: from the sales order, from the pickings, etc.
<attribute name="string">Sales Application Configuration</attribute>
</form>
<separator string="title" position="attributes">
- <attribute name="string"
- >Configure Sales Order Logistic</attribute>
+ <attribute name="string">Configure Sales Order Logistic</attribute>
</separator>
<xpath expr="//label[@string='description']" position="attributes">
<attribute name="string">Setup your sales workflow and default values.</attribute>
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 3675ccf32aece9043c3971ecd06cc2692689d8c0..11718051d0433b638411d38ca09e9b8e4f9e1dee 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -1,8 +1,8 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_sale_shop","sale.shop","model_sale_shop","base.group_sale_salesman",1,0,0,0
+"access_sale_shop","sale.shop","model_sale_shop","base.group_user",1,0,0,0
"access_sale_order","sale.order","model_sale_order","base.group_sale_salesman",1,1,1,0
"access_sale_order_line","sale.order.line","model_sale_order_line","base.group_sale_salesman",1,1,1,1
-"access_sale_shop_admin","sale.shop","model_sale_shop","base.group_system",1,1,1,1
+"access_account_invoice_tax_salesman","account_invoice_tax salesman","account.model_account_invoice_tax","base.group_sale_salesman",1,1,1,0
"access_account_invoice_salesman","account_invoice salesman","account.model_account_invoice","base.group_sale_salesman",1,1,1,0
"access_account_invoice_manager","account_invoice manager","account.model_account_invoice","base.group_sale_manager",1,1,1,1
"access_account_invoice_line_salesman","account_invoice.line salesman","account.model_account_invoice_line","base.group_sale_salesman",1,1,1,0
@@ -23,7 +23,6 @@
"access_sale_account_journal","account.journal sale order.user","account.model_account_journal","base.group_sale_salesman",1,0,0,0
"access_res_partner_sale_user","res.partner.sale.user","base.model_res_partner","base.group_sale_salesman",1,0,0,0
"access_res_partner_sale_manager","res.partner.sale.user","base.model_res_partner","base.group_sale_manager",1,0,0,0
-"access_res_partner_sale_system","res.partner.sale.system","base.model_res_partner","base.group_system",1,0,0,0
"access_report_stock_move_sales","report.stock.move.sale","stock.model_report_stock_move","base.group_sale_manager",1,1,1,1
"access_stock_picking_sales","stock.picking.sales","stock.model_stock_picking","base.group_sale_manager",1,1,1,1
"access_product_template_sale_user","product.template sale use","product.model_product_template","base.group_sale_salesman",1,0,0,0
@@ -36,18 +35,8 @@
"access_res_partner_address_user","res.partner.address.user","base.model_res_partner_address","base.group_sale_salesman",1,0,0,0
"access_account_tax_user","account.tax.user","account.model_account_tax","base.group_sale_salesman",1,1,1,0
"access_product_packaging_user","product.packaging.user","product.model_product_packaging","base.group_sale_salesman",1,1,1,0
-"access_res_country_system","res.country system","base.model_res_country","base.group_system",1,1,1,1
-"access_res_country_state_system","res.country.state system","base.model_res_country_state","base.group_system",1,1,1,1
-"access_res_partner_title_system","res.partner.title system","base.model_res_partner_title","base.group_system",1,1,1,1
-"access_sale_order_system","sale.order.system","model_sale_order","base.group_system",1,0,0,0
-"access_sale_order_line_system","sale.order.line.system","model_sale_order_line","base.group_system",1,0,0,0
-"access_product_product_system","product.product.system","product.model_product_product","base.group_system",1,0,0,0
-"access_stock_picking_system","stock.picking.system","stock.model_stock_picking","base.group_system",1,0,0,0
-"access_sale_report_system","sale.report.system","model_sale_report","base.group_system",1,0,0,0
-"access_ir_attachment_system","ir.attachment.system","base.model_ir_attachment","base.group_system",1,0,0,0
"access_ir_attachment_sales","ir.attachment.sales","base.model_ir_attachment","base.group_sale_salesman",1,1,1,0
"access_ir_attachment_manager","ir.attachment.manager","base.model_ir_attachment","base.group_sale_manager",1,1,1,1
-"access_res_partner_bank_type_system","res.partner.bank.type.system","base.model_res_partner_bank_type","base.group_system",1,0,0,0
"access_stock_warehouse_manager","stock.warehouse.manager","stock.model_stock_warehouse","base.group_sale_manager",1,0,0,0
"access_product_uom_manager","product.uom.manager","product.model_product_uom","base.group_sale_manager",1,0,0,0
"access_product_supplierinfo_manager","product.supplierinfo.manager","product.model_product_supplierinfo","base.group_sale_manager",1,0,0,0
@@ -60,6 +49,5 @@
"access_res_partner_bank_type_field_user","res.partner.bank.type.field.user","base.model_res_partner_bank_type_field","base.group_sale_salesman",1,0,0,0
"access_product_uom_user","product.uom.user","product.model_product_uom","base.group_sale_salesman",1,0,0,0
"access_product_supplierinfo_user","product.supplierinfo.user","product.model_product_supplierinfo","base.group_sale_salesman",1,0,0,0
-"access_res_partner_bank_type_field_system","res.partner.bank.type.field.system","base.model_res_partner_bank_type_field","base.group_system",1,0,0,0
"access_product_pricelist_sale_user","product.pricelist.sale.user","product.model_product_pricelist","base.group_sale_salesman",1,0,0,0
"access_account_account_salesman","account_account salesman","account.model_account_account","base.group_sale_salesman",1,0,0,0
diff --git a/addons/sale/stock_view.xml b/addons/sale/stock_view.xml
index dddcad079328fa36e2cd21e6789b9ce98b2a2e68..4075c523cb9ac209b791003a40318ae76e639819 100644
--- a/addons/sale/stock_view.xml
+++ b/addons/sale/stock_view.xml
@@ -25,6 +25,7 @@
</field>
</record>
+ <!--
<act_window
domain="[('sale_id', '=', active_id)]"
id="act_sale_order_2_stock_picking"
@@ -46,6 +47,7 @@
<field name="view_id" ref="stock.view_picking_out_form"/>
<field name="act_window_id" ref="act_sale_order_2_stock_picking"/>
</record>
+ -->
<!-- Adding Sale Order Reference to outgoing picking -->
@@ -61,5 +63,18 @@
</field>
</record>
+ <!-- Add menu: Billing - Deliveries to invoice -->
+ <record id="outgoing_picking_list_to_invoice" model="ir.actions.act_window">
+ <field name="name">Deliveries to Invoice</field>
+ <field name="res_model">stock.picking</field>
+ <field name="type">ir.actions.act_window</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form,calendar</field>
+ <field name="domain">[('type','=','out')]</field>
+ <field name="context">{'contact_display': 'partner_address', 'search_default_to_invoice': 1, 'search_default_done': 1}</field>
+ <field name="search_view_id" ref="stock.view_picking_out_search"/>
+ </record>
+ <menuitem action="outgoing_picking_list_to_invoice" id="menu_action_picking_list_to_invoice" parent="sale.menu_invoiced" sequence="20"/>
+
</data>
</openerp>
diff --git a/addons/sale/test/invoice_on_shipped_qty.yml b/addons/sale/test/invoice_on_shipped_qty.yml
index eb915ac889df721ae5ae4f4c6f82313e3e9f5e54..3ed4387067a5b66ecaf7f55083471afc267bdd01 100644
--- a/addons/sale/test/invoice_on_shipped_qty.yml
+++ b/addons/sale/test/invoice_on_shipped_qty.yml
@@ -65,24 +65,16 @@
'product_uom': move.product_uom.id,
}
self.do_partial(cr, uid, [pick.id],partial_datas)
--
- Then I create the invoice from the two partial picking
--
- !record {model: stock.invoice.onshipping, id: stock_invoice_onshipping_6}:
- invoice_date: '2010-07-17'
- journal_id: account.sales_journal
- type: out_invoice
-
Then I click on 'Create Invoices' button
-
!python {model: stock.invoice.onshipping}: |
sale_obj = self.pool.get('sale.order')
sale_id = sale_obj.browse(cr, uid, ref("sale_order_so6"))
- picking_obj = self.pool.get('stock.picking')
- ids = picking_obj.search(cr, uid, [('origin', '=', sale_id.name)])
- self.create_invoice(cr, uid, [ref("stock_invoice_onshipping_6")], {"lang": "en_US",
- "search_default_available": 1, "tz": False, "active_model": "stock.picking",
- "contact_display": "partner", "active_ids": ids, "active_id": ids[0]})
+ ids = [x.id for x in sale_id.picking_ids]
+ wiz_id = self.create(cr, uid, {'invoice_date': '2010-07-17', 'journal_id': ref('account.sales_journal')},
+ {'active_ids': ids})
+ self.create_invoice(cr, uid, [wiz_id], {"active_ids": ids})
-
I verify whether the invoice has been generated for SO
-
@@ -90,13 +82,13 @@
so = self.browse(cr, uid, ref("sale_order_so6"))
assert so.invoice_ids, "Invoices has not been generated for sale_order_so6"
-
- I verify that an invoice is created on the basis of shipped quantities 199 not ordered quantities 200
+ I verify that an invoice is created on the basis of shipped quantities 100 not ordered quantities 200
-
!python {model: account.invoice}: |
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so6"))
picking_obj = self.pool.get('stock.picking')
- ids = picking_obj.search(cr, uid, [('origin', '=', so.name),('type','=','out')])
+ ids = picking_obj.search(cr, uid, [('origin', '=', so.name),('type','=','out'),('state','=','done')])
qty = qty1 = 0.0
for pick_brw in picking_obj.browse(cr,uid, ids):
for lines in pick_brw.move_lines:
@@ -105,7 +97,7 @@
inv_brw = self.browse(cr,uid,inv_id)[0]
for inv_lines in inv_brw.invoice_line:
qty1=inv_lines.quantity
- assert abs(qty1-qty) < 0.001, "Quantities are not the same"
+ assert (qty1 == qty), "Quantities are not the same"
-
I open the Invoice for the SO.
-
diff --git a/addons/sale/test/picking_order_policy.yml b/addons/sale/test/picking_order_policy.yml
index c3f4ba87aaf927843317d9b0b46b18ceeef25791..b12bddd7ecc9602f2a58b37cecece6041efbabf9 100644
--- a/addons/sale/test/picking_order_policy.yml
+++ b/addons/sale/test/picking_order_policy.yml
@@ -58,24 +58,16 @@
'product_uom': move.product_uom.id,
}
self.do_partial(cr, uid, [pick.id],partial_datas)
--
- Then I create invoice from picking
--
- !record {model: stock.invoice.onshipping, id: stock_invoice_onshipping_0}:
- invoice_date: '2010-07-15'
- journal_id: account.sales_journal
- type: out_invoice
-
Then I click on 'Create Invoices' button
-
!python {model: stock.invoice.onshipping}: |
sale_obj=self.pool.get('sale.order')
sale_id=sale_obj.browse(cr, uid, ref("sale_order_so7"))
- picking_obj = self.pool.get('stock.picking')
- ids = picking_obj.search(cr, uid, [('origin', '=', sale_id.name)])
- self.create_invoice(cr, uid, [ref("stock_invoice_onshipping_0")], {"lang": "en_US",
- "search_default_available": 1, "tz": False, "active_model": "stock.picking",
- "contact_display": "partner", "active_ids": ids, "active_id": ids[0]})
+ ids = [x.id for x in sale_id.picking_ids]
+ wiz_id = self.create(cr, uid, {'invoice_date': '2010-07-15', 'journal_id': ref('account.sales_journal')},
+ {'active_ids': ids})
+ self.create_invoice(cr, uid, [wiz_id], {"active_ids": ids})
-
I check that an invoice has been created.
-
diff --git a/addons/sale/wizard/sale_make_invoice.xml b/addons/sale/wizard/sale_make_invoice.xml
index e8e698e56b9b68d5c78f4579815cba81a40c309c..267167237bcd4187da04dae9dce16e9538b0bc97 100644
--- a/addons/sale/wizard/sale_make_invoice.xml
+++ b/addons/sale/wizard/sale_make_invoice.xml
@@ -26,6 +26,7 @@
<field name="view_mode">form</field>
<field name="view_id" ref="view_sale_order_make_invoice"/>
<field name="target">new</field>
+ <field name="multi">True</field>
</record>
<record model="ir.values" id="sale_order_make_invoice">
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 0eac0308acc78c62dc156400ea20f11a572053f1..0037c10405d31d8998b8cf2ad2feb777f4aab5ce 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -26,8 +26,9 @@ class sale_advance_payment_inv(osv.osv_memory):
_name = "sale.advance.payment.inv"
_description = "Sale Advance Payment Invoice"
_columns = {
- 'product_id': fields.many2one('product.product', 'Product', required=True),
- 'amount': fields.float('Unit Price', size=(16, 2), required=True),
+ 'product_id': fields.many2one('product.product', 'Advance Product', required=True,
+ help="Select a product of type service which is called 'Advance Product'. You may have to create it and set it as a default value on this field."),
+ 'amount': fields.float('Advance Amount', size=(16, 2), required=True, help="The amount to be invoiced in advance."),
'qtty': fields.float('Quantity', size=(16, 2), required=True),
}
_defaults = {
@@ -95,6 +96,7 @@ class sale_advance_payment_inv(osv.osv_memory):
}
inv_id = inv_obj.create(cr, uid, inv)
+ inv_obj.button_reset_taxes(cr, uid, [inv_id], context=context)
for inv in sale.invoice_ids:
ids_inv.append(inv.id)
@@ -168,7 +170,7 @@ class sale_open_invoice(osv.osv_memory):
tree_id = mod_obj._get_id(cr, uid, 'account', 'invoice_tree')
tree_res = mod_obj.browse(cr, uid, tree_id, context=context).res_id
return {
- 'name': 'Invoices',
+ 'name': _('Advance Invoice'),
'view_type': 'form',
'view_mode': 'form,tree',
'res_model': 'account.invoice',
@@ -181,4 +183,4 @@ class sale_open_invoice(osv.osv_memory):
sale_open_invoice()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml
index 6e192d31108d795dfda06791cf12573281ebaa29..2cdcb9b8c996112dcf4b1b73b4cb117f936b7139 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.xml
+++ b/addons/sale/wizard/sale_make_invoice_advance.xml
@@ -2,26 +2,26 @@
<openerp>
<data>
<record id="view_sale_advance_payment_inv" model="ir.ui.view">
- <field name="name">Deposit Invoice</field>
+ <field name="name">Advance Invoice</field>
<field name="model">sale.advance.payment.inv</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Partial Invoice">
+ <form string="Advance Invoice">
<field name="product_id"/>
<newline />
- <field name="qtty"/>
+ <field name="qtty" invisible="1"/>
<field name="amount"/>
<newline />
<separator string="" colspan="4"/>
<label string="" colspan="2" />
- <button special="cancel" string="Cancel" icon="gtk-cancel"/>
- <button name="create_invoices" string="Create Partial Invoice" type="object" icon="terp-gtk-go-back-rtl"/>
+ <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+ <button name="create_invoices" string="Create Invoice" type="object" icon="gtk-go-forward"/>
</form>
</field>
</record>
<record id="action_view_sale_advance_payment_inv" model="ir.actions.act_window">
- <field name="name">Deposit</field>
+ <field name="name">Advance Invoice</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sale.advance.payment.inv</field>
<field name="view_type">form</field>
@@ -34,15 +34,15 @@
<field name="model">sale.open.invoice</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Invoices">
- <label string="You invoice has been successfully created!" />
+ <form string="Invoices">
+ <label string="You invoice has been successfully created!" />
<newline />
<separator string="" colspan="4"/>
- <group colspan="4">
- <button special="cancel" string="Close" icon="gtk-cancel"/>
- <button name="open_invoice" string="Open Invoice" type="object" icon="gtk-open"/>
- </group>
- </form>
+ <group colspan="4">
+ <button special="cancel" string="Close" icon="gtk-cancel"/>
+ <button name="open_invoice" string="Open Invoice" type="object" icon="gtk-go-forward"/>
+ </group>
+ </form>
</field>
</record>
diff --git a/addons/sale_analytic_plans/i18n/sr.po b/addons/sale_analytic_plans/i18n/sr.po
new file mode 100644
index 0000000000000000000000000000000000000000..5332a39285e4736a6a52e87b52d250fec3931462
--- /dev/null
+++ b/addons/sale_analytic_plans/i18n/sr.po
@@ -0,0 +1,33 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-15 08:33+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@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-10-16 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: sale_analytic_plans
+#: field:sale.order.line,analytics_id:0
+msgid "Analytic Distribution"
+msgstr "AnalitiÄka Distribucija"
+
+#. module: sale_analytic_plans
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: sale_analytic_plans
+#: model:ir.module.module,shortdesc:sale_analytic_plans.module_meta_information
+msgid "Sales Analytic Distribution Management"
+msgstr "Menadzment Analiticke Distribucije Prodaje"
diff --git a/addons/sale_journal/__init__.py b/addons/sale_journal/__init__.py
index b41a4be55d19571f012d6f04a6925ee86db14e6e..b05803da6c6cda074010cdf1a50b96e51950030a 100644
--- a/addons/sale_journal/__init__.py
+++ b/addons/sale_journal/__init__.py
@@ -20,7 +20,4 @@
##############################################################################
import sale_journal
-import report
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_journal/__openerp__.py b/addons/sale_journal/__openerp__.py
index 4fde94fc70985bb6c32d1f16d487e87335e17eac..37fc05fd06623c2784d5126a7db298b2dcfe02b4 100644
--- a/addons/sale_journal/__openerp__.py
+++ b/addons/sale_journal/__openerp__.py
@@ -53,14 +53,9 @@
'update_xml': [
'security/ir.model.access.csv',
'sale_journal_view.xml',
- 'report/sale_journal_report_view.xml',
- 'report/picking_journal_report_view.xml',
],
'demo_xml': ['sale_journal_demo.xml'],
- 'test': [
- 'test/sale_journal.yml',
- 'test/picking_journal.yml',
- ],
+ 'test': [ ],
'installable': True,
'active': False,
'certificate': '0077661619085',
diff --git a/addons/sale_journal/report/__init__.py b/addons/sale_journal/report/__init__.py
deleted file mode 100644
index bfe23eb8cce89b18f380158dde1b08846c7d5a62..0000000000000000000000000000000000000000
--- a/addons/sale_journal/report/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import sale_journal_report
-import picking_journal_report
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/sale_journal/report/picking_journal_report.py b/addons/sale_journal/report/picking_journal_report.py
deleted file mode 100644
index 74c00367838a1cba59f2dfaf4e3f128eeeecc37f..0000000000000000000000000000000000000000
--- a/addons/sale_journal/report/picking_journal_report.py
+++ /dev/null
@@ -1,88 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields, osv
-import tools
-from decimal_precision import decimal_precision as dp
-
-
-class sale_journal_picking_report(osv.osv):
- """
- Picking list by journal and by invoice
- """
- _name = "sale.journal.picking.report"
- _description = "Picking lists"
- _auto = False
- _columns = {
- 'name': fields.char('Year', size=64, required=False, readonly=True),
- 'month': fields.selection([('01', 'January'), ('02', 'February'), ('03', 'March'), ('04', 'April'), ('05', 'May'), ('06', 'June'),
- ('07', 'July'), ('08', 'August'), ('09', 'September'), ('10', 'October'), ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
-
- 'invoice_state':fields.selection([
- ("invoiced", "invoiced"),
- ("2binvoiced", "to be invoiced"),
- ("none", "None")
- ], "Invoice state", readonly=True),
- 'state': fields.selection([
- ('draft', 'draft'),
- ('auto', 'waiting'),
- ('confirmed', 'confirmed'),
- ('assigned', 'assigned'),
- ('done', 'done'),
- ('cancel', 'cancel'),
- ], 'State', readonly=True),
- 'invoice_type_id': fields.many2one('sale_journal.invoice.type', 'Invoicing method', readonly=True),
- 'journal_id': fields.many2one('sale_journal.picking.journal', 'Journal', readonly=True),
- 'quantity': fields.float('Quantities', readonly=True),
- 'price_total': fields.float('Total Price', readonly=True, digits_compute=dp.get_precision('Sale Price')),
- 'price_average': fields.float('Average Price', readonly=True, digits_compute=dp.get_precision('Sale Price')),
- 'count': fields.integer('# of Lines', readonly=True),
- }
- _order = 'journal_id, name desc, price_total desc'
-
- def init(self, cr):
- tools.drop_view_if_exists(cr, 'sale_journal_picking_report')
-
- cr.execute("""
- create or replace view sale_journal_picking_report as (
- select
- min(l.id) as id,
- to_char(s.date, 'YYYY') as name,
- to_char(s.date, 'MM') as month,
- s.state,
- s.invoice_state,
- s.invoice_type_id,
- s.journal_id,
- sum(l.product_qty) as quantity,
- count(*) as count,
- sum(l.product_qty*ol.price_unit*(1.0-ol.discount/100.0)) as price_total,
- (sum(l.product_qty*ol.price_unit*(1.0-ol.discount/100.0))/sum(l.product_qty))::decimal(16,2) as price_average
- from stock_picking s
- right join stock_move l on (s.id=l.picking_id)
- left join sale_order_line ol on (l.sale_line_id=ol.id)
- group by s.journal_id, s.invoice_type_id, to_char(s.date, 'YYYY'),to_char(s.date, 'MM'),s.state, s.invoice_state
- order by s.invoice_type_id, s.invoice_state, s.state
- )
- """)
-
-sale_journal_picking_report()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_journal/report/picking_journal_report_view.xml b/addons/sale_journal/report/picking_journal_report_view.xml
deleted file mode 100644
index bcfa293a64cee37c79baddc26d770da62a326247..0000000000000000000000000000000000000000
--- a/addons/sale_journal/report/picking_journal_report_view.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<openerp>
- <data>
-
- <!-- picking by journal and invoice's tree view-->
-
- <record model="ir.ui.view" id="view_sale_journal_picking_report_tree">
- <field name="name">sale.journal.picking.report.tree</field>
- <field name="model">sale.journal.picking.report</field>
- <field name="type">tree</field>
- <field name="arch" type="xml">
- <tree string="Picking Journal">
- <field name="name" invisible="1"/>
- <field name="month" invisible="1"/>
- <field name="invoice_state" invisible="1"/>
- <field name="state" invisible="1"/>
- <field name="invoice_type_id" invisible="1"/>
- <field name="journal_id" invisible="1"/>
- <field name="quantity" />
- <field name="count" />
- <field name="price_average"/>
- <field name="price_total"/>
- </tree>
- </field>
- </record>
-
- <!-- picking journal's graph view -->
-
- <record id="view_sale_journal_picking_graph" model="ir.ui.view">
- <field name="name">sale.journal.picking.report.graph</field>
- <field name="model">sale.journal.picking.report</field>
- <field name="type">graph</field>
- <field name="arch" type="xml">
- <graph string="Picking journal Statistics" type="bar">
- <field name="journal_id"/>
- <field name="invoice_type_id"/>
- <field name="price_total"/>
- </graph>
- </field>
- </record>
-
- <!-- Picking journal search view -->
-
- <record model="ir.ui.view" id="view_sale_journal_picking_report_search">
- <field name="name">sale.journal.picking.report.search</field>
- <field name="model">sale.journal.picking.report</field>
- <field name="type">search</field>
- <field name="arch" type="xml">
- <search string="Picking journal">
- <group col="8" colspan="4">
- <filter icon="terp-go-year" string="This Year" name="year" domain="[('name','=',time.strftime('%%Y'))]" help="Picking by invoice or by journal method in this year"/>
- <filter icon="terp-go-month" string="This Month" name="month" domain="[('month','=',time.strftime('%%m'))]" help="Picking by invoice or by journal method in this month"/>
- <separator orientation="vertical"/>
- <filter icon="terp-document-new"
- string="Draft"
- domain="[('state','=','draft')]"/>
- <filter icon="terp-gtk-media-pause"
- string="Pending"
- domain="[('state','=','waiting')]"/>
- <filter icon="terp-camera_test"
- string="Confirmed"
- domain="[('state','=','confirmed')]"/>
- <separator orientation="vertical"/>
- <field name="name" select="1"/>
- <field name="month" select="1"/>
- <field name="invoice_state" select="1"/>
- <field name="state" select="1"/>
- </group>
- <newline/>
- <group expand="1" string="Group By..." colspan="4" col="12">
- <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
- <filter string="Invoice" icon="terp-dolar" context="{'group_by':'invoice_type_id'}"/>
- <separator orientation="vertical"/>
- <filter string="Invoice state" icon="terp-stock_effects-object-colorize" context="{'group_by':'invoice_state'}"/>
- <filter string="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
- </group>
- </search>
- </field>
- </record>
-
- <record model="ir.actions.act_window" id="action_sale_journal_picking_report_open">
- <field name="name">Statistics on picking to invoice</field>
- <field name="res_model">sale.journal.picking.report</field>
- <field name="type">ir.actions.act_window</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="domain">[('invoice_state','=','2binvoiced'),('invoice_type_id','=',active_id)]</field>
- </record>
-
- <!-- Action for picking journal view -->
-
- <record model="ir.actions.act_window" id="action_sale_journal_picking_report_open_menu_all">
- <field name="name">Picking Journal</field>
- <field name="res_model">sale.journal.picking.report</field>
- <field name="type">ir.actions.act_window</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,graph</field>
- <field name="search_view_id" ref="view_sale_journal_picking_report_search"/>
- <field name="context">{'search_default_month':1, 'group_by_no_leaf':1,'group_by':[]}</field>
- </record>
-
- <menuitem name="Picking journal" id="menu_invoice_type_picking_stats_open_all" parent="stock.next_id_61"
- action="action_sale_journal_picking_report_open_menu_all" sequence="8"/>
-
- </data>
-</openerp>
diff --git a/addons/sale_journal/report/sale_journal_report.py b/addons/sale_journal/report/sale_journal_report.py
deleted file mode 100644
index 723a7f88722eec9afe6ba37fe63fc4c5342cdede..0000000000000000000000000000000000000000
--- a/addons/sale_journal/report/sale_journal_report.py
+++ /dev/null
@@ -1,75 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields, osv
-import tools
-
-class sale_journal_report(osv.osv):
- _name = "sale.journal.report"
- _description = "Sales Orders by Journal"
- _auto = False
- _columns = {
- 'name': fields.char('Year', size=64, required=False, readonly=True),
- 'month':fields.selection([('01', 'January'), ('02', 'February'), ('03', 'March'), ('04', 'April'),
- ('05', 'May'), ('06', 'June'), ('07', 'July'), ('08', 'August'), ('09', 'September'),
- ('10', 'October'), ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
- 'state': fields.selection([
- ('draft', 'Quotation'),
- ('waiting_date', 'Waiting Schedule'),
- ('manual', 'Manual in progress'),
- ('progress', 'In progress'),
- ('shipping_except', 'Shipping Exception'),
- ('invoice_except', 'Invoice Exception'),
- ('done', 'Done'),
- ('cancel', 'Cancel')
- ], 'Order State', readonly=True),
- 'journal_id': fields.many2one('sale_journal.sale.journal', 'Journal', readonly=True),
- 'quantity': fields.float('Quantities', readonly=True),
- 'price_total': fields.float('Total Price', readonly=True),
- 'price_average': fields.float('Average Price', readonly=True),
- 'count': fields.integer('# of Lines', readonly=True),
- }
-
- _order = 'journal_id, name desc,price_total desc'
-
- def init(self, cr):
- tools.drop_view_if_exists(cr, 'sale_journal_report')
- cr.execute("""
- create or replace view sale_journal_report as (
- select
- min(l.id) as id,
- to_char(s.date_order, 'YYYY') as name,
- to_char(s.date_order,'MM') as month,
- s.state,
- s.journal_id,
- sum(l.product_uom_qty) as quantity,
- count(*),
- sum(l.product_uom_qty*l.price_unit) as price_total,
- (sum(l.product_uom_qty*l.price_unit)/sum(l.product_uom_qty))::decimal(16,2) as price_average
- from sale_order s
- right join sale_order_line l on (s.id=l.order_id)
- group by s.journal_id , to_char(s.date_order, 'YYYY'),to_char(s.date_order, 'MM'), s.state
- )
- """)
-
-sale_journal_report()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_journal/report/sale_journal_report_view.xml b/addons/sale_journal/report/sale_journal_report_view.xml
deleted file mode 100644
index 63caea90768f0f3e6200408d295a47b4587e4554..0000000000000000000000000000000000000000
--- a/addons/sale_journal/report/sale_journal_report_view.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<openerp>
- <data>
-
- <!-- Sales by journal's view -->
-
- <record model="ir.ui.view" id="view_sale_journal_report_tree">
- <field name="name">sale.journal.report.tree</field>
- <field name="model">sale.journal.report</field>
- <field name="type">tree</field>
- <field name="arch" type="xml">
- <tree string="Sales by Journal">
- <field name="name" invisible="1"/>
- <field name="state" invisible="1"/>
- <field name="journal_id" invisible="1"/>
- <field name="quantity"/>
- <field name="count"/>
- <field name="price_average"/>
- <field name="price_total"/>
- </tree>
- </field>
- </record>
-
- <!-- sales journal graph view -->
-
- <record id="view_sale_journal_graph" model="ir.ui.view">
- <field name="name">sale.journal.report.graph</field>
- <field name="model">sale.journal.report</field>
- <field name="type">graph</field>
- <field name="arch" type="xml">
- <graph string="Sales journal Statistics" type="bar">
- <field name="journal_id"/>
- <field name="price_total"/>
- </graph>
- </field>
- </record>
-
- <!-- sales by journal search view -->
-
- <record model="ir.ui.view" id="view_sale_journal_report_search">
- <field name="name">sale.journal.report.search</field>
- <field name="model">sale.journal.report</field>
- <field name="type">search</field>
- <field name="arch" type="xml">
- <search string="Sales by Journal">
- <group col="8" colspan="4">
- <filter icon="terp-go-year" string="This Year" domain="[('name','!=','')]" help="Sale journal in this year"/>
- <filter icon="terp-go-month" string="This Month" domain="[('name','=',time.strftime('%%Y-%%m-01'))]" help="Sale journal in this month"/>
- <separator orientation="vertical"/>
- <filter icon="terp-document-new"
- string="Quotations"
- domain="[('state','=','draft')]"/>
- <filter icon="terp-gtk-media-pause"
- string="Waiting Schedule"
- domain="[('state','=','waiting_date')]"/>
- <filter icon="terp-camera_test"
- string="In progress"
- domain="[('state','=','progress')]"/>
- <separator orientation="vertical"/>
- <field name="name" select="1"/>
- <field name="state" select="1"/>
- <field name="journal_id" widget="selection"/>
- </group>
- <newline/>
- <group expand="1" string="Group By..." colspan="4" col="12">
- <filter string="journal" name="journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
- <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
- </group>
- </search>
- </field>
- </record>
-
- <!-- Action of sales by journal view-->
-
- <record model="ir.actions.act_window" id="action_sale_journal_report_open_menu_all">
- <field name="name">Sales by Journal</field>
- <field name="res_model">sale.journal.report</field>
- <field name="type">ir.actions.act_window</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,graph</field>
- <field name="search_view_id" ref="view_sale_journal_report_search"/>
- <field name="context">{'search_default_journal': 1,'group_by_no_leaf':1,'group_by':[]}</field>
- </record>
-
- <menuitem name="Sales by Journal" id="menu_sale_journal_report_open_all"
- parent="base.next_id_64" action="action_sale_journal_report_open_menu_all" sequence="2" groups="base.group_sale_manager"/>
-
- </data>
-</openerp>
diff --git a/addons/sale_journal/sale_journal.py b/addons/sale_journal/sale_journal.py
index 10f2606955aa3d634b14971b36ba652b56420c55..09902b21099dd9e666ec6cd8fa23ec96d5e8b295 100644
--- a/addons/sale_journal/sale_journal.py
+++ b/addons/sale_journal/sale_journal.py
@@ -39,181 +39,6 @@ class sale_journal_invoice_type(osv.osv):
}
sale_journal_invoice_type()
-class sale_journal(osv.osv):
- _name = 'sale_journal.sale.journal'
- _description = 'Sale Journal'
- _columns = {
- 'name': fields.char('Journal', size=64, required=True, states={'close':[('readonly',True)]}),
- 'code': fields.char('Code', size=16, required=True, states={'close':[('readonly',True)]}),
- 'user_id': fields.many2one('res.users', 'Responsible', required=True, states={'close':[('readonly',True)]}),
- 'date': fields.date('Journal date', required=True, states={'close':[('readonly',True)]}),
- 'date_created': fields.date('Creation date', readonly=True, required=True),
- 'date_close': fields.date('Close date ', readonly=True),
- 'sale_stats_ids': fields.one2many("sale.journal.report", "journal_id", 'Sale stats', readonly=True),
- 'state': fields.selection([
- ('draft','Draft'),
- ('open','Open'),
- ('cancel','Cancel'),
- ('confirm','Confirm'),
- ('close','Close'),
- ], 'State', required=True, readonly=True),
- 'note': fields.text('Note'),
- }
- _defaults = {
- 'date': time.strftime('%Y-%m-%d'),
- 'date_created': time.strftime('%Y-%m-%d'),
- 'user_id': lambda self,cr,uid,context: uid,
- 'state': lambda self,cr,uid,context: 'draft',
- }
-
- def button_sale_cancel(self, cr, uid, ids, context={}):
- self.write(cr, uid, ids, {'state':'cancel'})
- for id in ids:
- sale_ids = self.pool.get('sale.order').search(cr, uid, [('journal_id','=',id),('state','=','draft')])
- for saleid in sale_ids:
- wf_service = netsvc.LocalService("workflow")
- wf_service.trg_validate(uid, 'sale.order', saleid, 'cancel', cr)
- for (id,name) in self.name_get(cr, uid, ids):
- message = _('Sale order of Journal') + " '" + name + "' "+ _("is cancelled")
- self.log(cr, uid, id, message)
- return True
-
- def button_sale_confirm(self, cr, uid, ids, context={}):
- self.write(cr, uid, ids, {'state':'confirm'})
- for id in ids:
- sale_ids = self.pool.get('sale.order').search(cr, uid, [('journal_id','=',id),('state','=','draft')])
- for saleid in sale_ids:
- wf_service = netsvc.LocalService("workflow")
- wf_service.trg_validate(uid, 'sale.order', saleid, 'order_confirm', cr)
- for (id,name) in self.name_get(cr, uid, ids):
- message = _('Sale orders of Journal') + " '" + name + "' "+ _("is confirmed")
- self.log(cr, uid, id, message)
- return True
-
- def button_open(self, cr, uid, ids, context={}):
- self.write(cr, uid, ids, {'state':'open'})
- for (id,name) in self.name_get(cr, uid, ids):
- message = _('Sale orders of Journal') + " '" + name + "' "+ _("is opened")
- self.log(cr, uid, id, message)
- return True
-
- def button_draft(self, cr, uid, ids, context={}):
- self.write(cr, uid, ids, {'state':'draft'})
- for (id,name) in self.name_get(cr, uid, ids):
- message = _('Sale orders of Journal') + " '" + name + "' "+ _("is in draft state")
- self.log(cr, uid, id, message)
- return True
-
- def button_close(self, cr, uid, ids, context={}):
- self.write(cr, uid, ids, {'state':'close', 'date_close':time.strftime('%Y-%m-%d')})
- for (id,name) in self.name_get(cr, uid, ids):
- message = _('Sale orders of Journal') + " '" + name + "' "+ _("is closed")
- self.log(cr, uid, id, message)
- return True
- def button_reset(self, cr, uid, ids, context=None):
- self.write(cr, uid, ids, {'state': 'draft'})
- for (id,name) in self.name_get(cr, uid, ids):
- message = _('Sale orders of Journal') + " '" + name + "' "+ _("is in draft state")
- self.log(cr, uid, id, message)
- return True
- def copy(self, cr, uid, id, default=None, context=None):
- """Overrides orm copy method
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of case’s IDs
- @param context: A standard dictionary for contextual values
- """
- if context is None:
- context = {}
- if default is None:
- default = {}
- default.update({'sale_stats_ids': []})
- return super(sale_journal, self).copy(cr, uid, id, default=default, context=context)
-
-sale_journal()
-
-class picking_journal(osv.osv):
- _name = 'sale_journal.picking.journal'
- _description = 'Picking Journal'
- _columns = {
- 'name': fields.char('Journal', size=64, required=True),
- 'code': fields.char('Code', size=16, required=True),
- 'user_id': fields.many2one('res.users', 'Responsible', required=True),
- 'date': fields.date('Journal date', required=True),
- 'date_created': fields.date('Creation date', readonly=True, required=True),
- 'date_close': fields.date('Close date', readonly=True),
- 'picking_stats_ids': fields.one2many("sale.journal.picking.report", "journal_id", 'Journal Stats', readonly=True),
- 'state': fields.selection([
- ('draft','Draft'),
- ('open','Open'),
- ('cancel','Cancel'),
- ('close','Close'),
- ('confirm','Confirm'),
- ], 'Creation date', required=True, readonly=True),
- 'note': fields.text('Note'),
- }
- _defaults = {
- 'date': time.strftime('%Y-%m-%d'),
- 'date_created': time.strftime('%Y-%m-%d'),
- 'user_id': lambda self,cr,uid,context: uid,
- 'state': lambda self,cr,uid,context: 'draft',
- }
- def button_picking_cancel(self, cr, uid, ids, context={}):
- self.write(cr, uid, ids, {'state':'cancel'})
- for id in ids:
- pick_ids = self.pool.get('stock.picking').search(cr, uid, [('journal_id','=',id)])
- for pickid in pick_ids:
- wf_service = netsvc.LocalService("workflow")
- wf_service.trg_validate(uid, 'stock.picking', pickid, 'button_cancel', cr)
- return True
-
- def button_open(self, cr, uid, ids, context={}):
- self.write(cr, uid, ids, {'state':'open'})
- return True
-
- def button_draft(self, cr, uid, ids, context={}):
- self.write(cr, uid, ids, {'state':'draft'})
- return True
-
- def button_close(self, cr, uid, ids, context={}):
- self.write(cr, uid, ids, {'state':'close', 'date_close':time.strftime('%Y-%m-%d')})
- return True
-
- def button_reset(self, cr, uid, ids, context=None):
- self.write(cr, uid, ids, {'state': 'draft'})
- for (id,name) in self.name_get(cr, uid, ids):
- message = _('Sale orders of Journal') + " '" + name + "' "+ _("is in draft state")
- self.log(cr, uid, id, message)
- return True
-
- def button_picking_confirm(self, cr, uid, ids, context={}):
-
- self.write(cr, uid, ids, {'state':'confirm'})
- for id in ids:
- pick_ids = self.pool.get('stock.picking').search(cr, uid, [('journal_id','=',id)])
- for pickid in pick_ids:
- wf_service = netsvc.LocalService("workflow")
- wf_service.trg_validate(uid, 'stock.picking', pickid, 'button_confirm', cr)
- return True
-
- def copy(self, cr, uid, id, default=None, context=None):
- """Overrides orm copy method
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of case’s IDs
- @param context: A standard dictionary for contextual values
- """
- if context is None:
- context = {}
- if default is None:
- default = {}
- default.update({'picking_stats_ids': []})
- return super(picking_journal, self).copy(cr, uid, id, default=default, context=context)
-
-picking_journal()
-
#==============================================
# sale journal inherit
#==============================================
@@ -222,22 +47,20 @@ class res_partner(osv.osv):
_inherit = 'res.partner'
_columns = {
'property_invoice_type': fields.property(
- 'sale_journal.invoice.type',
- type = 'many2one',
- relation = 'sale_journal.invoice.type',
- string = "Invoicing Method",
- method = True,
- view_load = True,
- group_name = "Accounting Properties",
- help = "The type of journal used for sales and picking."),
+ 'sale_journal.invoice.type',
+ type = 'many2one',
+ relation = 'sale_journal.invoice.type',
+ string = "Invoicing Method",
+ method = True,
+ view_load = True,
+ group_name = "Accounting Properties",
+ help = "The type of journal used for sales and picking."),
}
res_partner()
class picking(osv.osv):
_inherit = "stock.picking"
_columns = {
- 'journal_id': fields.many2one('sale_journal.picking.journal', 'Picking Journal', domain=[('state','!=', 'close')],help="Picking Journal"),
- 'sale_journal_id': fields.many2one('sale_journal.sale.journal', 'Sale Journal'),
'invoice_type_id': fields.many2one('sale_journal.invoice.type', 'Invoice Type', readonly=True)
}
picking()
@@ -245,7 +68,6 @@ picking()
class sale(osv.osv):
_inherit = "sale.order"
_columns = {
- 'journal_id': fields.many2one('sale_journal.sale.journal', 'Journal', domain=[('state','not in', ('done', 'draft''cancel'))]),
'invoice_type_id': fields.many2one('sale_journal.invoice.type', 'Invoice Type')
}
def action_ship_create(self, cr, uid, ids, *args):
@@ -253,18 +75,16 @@ class sale(osv.osv):
for order in self.browse(cr, uid, ids, context={}):
pids = [ x.id for x in order.picking_ids]
self.pool.get('stock.picking').write(cr, uid, pids, {
- 'invoice_type_id': order.invoice_type_id.id,
- 'sale_journal_id': order.journal_id.id
+ 'invoice_type_id': order.invoice_type_id and order.invoice_type_id.id or False,
})
return result
def onchange_partner_id(self, cr, uid, ids, part):
result = super(sale, self).onchange_partner_id(cr, uid, ids, part)
if part:
- itype = self.pool.get('res.partner').browse(cr, uid, part).property_invoice_type.id
- result['value']['invoice_type_id'] = itype
+ itype = self.pool.get('res.partner').browse(cr, uid, part).property_invoice_type
+ if itype:
+ result['value']['invoice_type_id'] = itype.id
return result
sale()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/sale_journal/sale_journal_data.xml b/addons/sale_journal/sale_journal_data.xml
index 3639f945c833ccc6db0bbef4c02794da8fbe7dbc..9d305fe9912bf7c68bd2419f6d1c19b020edd800 100644
--- a/addons/sale_journal/sale_journal_data.xml
+++ b/addons/sale_journal/sale_journal_data.xml
@@ -2,11 +2,11 @@
<openerp>
<data noupdate="1">
- <record model="ir.property" id="property_invoice_type_def">
- <field name="name">property_invoice_type</field>
- <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_invoice_type')]"/>
- <field name="value" eval="False"/>
- </record>
+ <record model="ir.property" id="property_invoice_type_def">
+ <field name="name">property_invoice_type</field>
+ <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_invoice_type')]"/>
+ <field name="value" eval="False"/>
+ </record>
</data>
</openerp>
diff --git a/addons/sale_journal/sale_journal_demo.xml b/addons/sale_journal/sale_journal_demo.xml
index 30606e251450f38e4b2903f690c6dc246b67c92a..061a5af854465db4db28de129e6c076e9fbc66d2 100644
--- a/addons/sale_journal/sale_journal_demo.xml
+++ b/addons/sale_journal/sale_journal_demo.xml
@@ -2,17 +2,17 @@
<openerp>
<data noupdate="1">
- <record model="sale_journal.invoice.type" id="daily">
- <field name="name">Daily invoicing</field>
- </record>
- <record model="sale_journal.invoice.type" id="monthly">
- <field name="name">Monthly invoicing</field>
- <field name="invoicing_method">grouped</field>
- </record>
+ <record model="sale_journal.invoice.type" id="daily">
+ <field name="name">Daily invoicing</field>
+ </record>
+ <record model="sale_journal.invoice.type" id="monthly">
+ <field name="name">Monthly invoicing</field>
+ <field name="invoicing_method">grouped</field>
+ </record>
- <record model="ir.property" id="sale_journal.property_invoice_type_def">
- <field name="value" eval="'sale_journal.invoice.type,'+str(daily)"/>
- </record>
+ <record model="ir.property" id="sale_journal.property_invoice_type_def">
+ <field name="value" eval="'sale_journal.invoice.type,'+str(daily)"/>
+ </record>
</data>
</openerp>
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 029908da37ab498065eebfbd95bc149bbbc2c088..ad160ec28ae2aafb57d848920def89118c0f7323 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -1,10 +1,5 @@
<openerp>
<data>
- <menuitem id="base.menu_base_config" name="Configuration" parent="base.menu_base_partner" sequence="30"
- groups="base.group_sale_salesman,base.group_system,base.group_sale_manager"/>
- <menuitem id="menu_sale_journal_config" name="Sale Journals"
- parent="base.menu_base_config" sequence="5" groups="base.group_sale_salesman"/>
-
<!-- sale journal invoice Type's Form view -->
<record model="ir.ui.view" id="view_sale_journal_invoice_type_form">
@@ -14,13 +9,12 @@
<field name="arch" type="xml">
<form string="Invoice Type">
<group colspan="4" col="6">
- <field name="name" select="1"/>
- <field name="invoicing_method" select="1"/>
- <field name="active" select="1"/>
+ <field name="name" select="1"/>
+ <field name="invoicing_method" select="1"/>
+ <field name="active" select="1"/>
</group>
- <separator string="Notes" colspan="3"/>
- <newline/>
- <field name="note" colspan="3" nolabel="1"/>
+ <separator string="Notes" colspan="4"/>
+ <field name="note" colspan="4" nolabel="1"/>
</form>
</field>
</record>
@@ -42,111 +36,15 @@
<!-- Action for sale journal invoice Type -->
<record model="ir.actions.act_window" id="action_definition_journal_invoice_type">
+ <field name="name">Invoice Types</field>
<field name="res_model">sale_journal.invoice.type</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
+ <field name="help">Invoice types are used on partners, sales order and delivery orders. You can create journal to group your invoicing according to customer's needs: daily, each wednesday, monthly, etc.</field>
</record>
- <menuitem name="Invoicing Methods" id="menu_definition_journal_invoice_type" parent="menu_sale_journal_config" action="action_definition_journal_invoice_type"/>
-
- <!-- sale journal Form view -->
-
- <record model="ir.ui.view" id="view_sale_journal_form">
- <field name="name">sale_journal.sale.journal.form</field>
- <field name="model">sale_journal.sale.journal</field>
- <field name="type">form</field>
- <field name="arch" type="xml">
- <form string="Sales Journals">
- <group colspan="4" col="6">
- <field name="name" select="1"/>
- <field name="code" select="1"/>
- <field name="user_id" select="1"/>
- <field name="date" select="1"/>
- <field name="date_created" select="1"/>
- <field name="date_close" select="1"/>
- </group>
- <notebook colspan="4">
- <page string="Sales">
- <field name="sale_stats_ids" colspan="4" nolabel="1">
- <tree string="Sales">
- <field name="name"/>
- <field name="quantity"/>
- <field name="price_total"/>
- <field name="price_average"/>
- <field name="count"/>
- <field name="state"/>
- </tree>
- </field>
- </page>
- <page string="Notes">
- <field name="note" colspan="4" nolabel="1"/>
- </page>
- </notebook>
- <field name="state"/>
- <group col="6" colspan="2">
- <button name="button_open" string="Open Journal" states="draft" type="object" icon="terp-check"/>
- <button string="Confirm Sales" name="button_sale_confirm" states="open" type="object" icon="terp-camera_test"/>
- <button name="button_close" string="Close Journal" states="confirm,open" type="object" icon="terp-dialog-close"/>
- <button name="button_draft" string="Set to Draft" states="cancel" type="object" icon="gtk-convert"/>
- <button string="Cancel Sales" name="button_sale_cancel" states="close,draft,open,confirm" type="object" icon="gtk-cancel"/>
- </group>
- </form>
- </field>
- </record>
-
- <!-- Sale journal tree view -->
-
- <record model="ir.ui.view" id="view_sale_journal_tree">
- <field name="name">sale_journal.sale.journal.tree</field>
- <field name="model">sale_journal.sale.journal</field>
- <field name="type">tree</field>
- <field name="arch" type="xml">
- <tree string="Sales Journals">
- <field name="name" select="1"/>
- <field name="code" select="1"/>
- <field name="user_id" select="1"/>
- <field name="date" select="1"/>
- <field name="state"/>
- </tree>
- </field>
- </record>
-
- <!-- Sale journal search view -->
-
- <record model="ir.ui.view" id="view_sale_journal_search">
- <field name="name">sale_journal.sale.journal.search</field>
- <field name="model">sale_journal.sale.journal</field>
- <field name="type">search</field>
- <field name="arch" type="xml">
- <search string="Sales by Journal">
- <group col="8" colspan="4">
- <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Sales Journal which are in draft state"/>
- <filter icon="terp-check" string="Open" domain="[('state','=','open')]" help="Open Sales Journal"/>
- <filter icon="terp-camera_test" string="Confirm" domain="[('state','=','confirm')]" help="Confirmed Sales Journal"/>
- <filter icon="gtk-cancel" string="Cancel" domain="[('state','=','cancel')]" help="Sales Journal which are cancelled"/>
- <filter icon="terp-dialog-close" string="Close" domain="[('state','=','done')]" help="Sales Journal which are closed"/>
- <separator orientation="vertical"/>
- <field name="name"/>
- <field name="code"/>
- <field name="user_id"/>
- <field name="date"/>
- </group>
- </search>
- </field>
- </record>
-
- <!-- Action for sale journal view -->
-
- <record model="ir.actions.act_window" id="action_definition_journal">
- <field name="res_model">sale_journal.sale.journal</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="context">{'search_default_user_id':uid}</field>
- <field name="search_view_id" ref="view_sale_journal_search"/>
- </record>
-
-
- <menuitem id="menu_definition_journal" name="Sales Journals" parent="menu_sale_journal_config" action="action_definition_journal" sequence="70"/>
+ <menuitem id="menu_definition_journal_invoice_type"
+ parent="sale.menu_config_sale" action="action_definition_journal_invoice_type"/>
<!-- Inherit sales order form view -->
@@ -157,11 +55,7 @@
<field name="inherit_id" ref="sale.view_order_form" />
<field name="arch" type="xml">
<field name="origin" position="after">
- <group colspan="2" col="2">
- <separator string="Journal" colspan="4"/>
- <field name="journal_id" select="1" widget="selection" domain="[('state','in', ('draft', 'open'))]"/>
- <field name="invoice_type_id" select="1" widget="selection"/>
- </group>
+ <field name="invoice_type_id" widget="selection"/>
</field>
</field>
</record>
@@ -175,8 +69,7 @@
<field name="inherit_id" ref="sale.view_order_tree" />
<field name="arch" type="xml">
<field name="state" position="after">
- <field name="invoice_type_id"/>
- <field name="journal_id"/>
+ <field name="invoice_type_id" widget="selection"/>
</field>
</field>
</record>
@@ -190,9 +83,7 @@
<field name="inherit_id" ref="stock.view_picking_form" />
<field name="arch" type="xml">
<field name="origin" position="after">
- <field name="journal_id" select="1"/>
- <field name="sale_journal_id" select="1"/>
- <field name="invoice_type_id" select="1"/>
+ <field name="invoice_type_id" widget="selection"/>
</field>
</field>
</record>
@@ -206,9 +97,7 @@
<field name="inherit_id" ref="stock.vpicktree" />
<field name="arch" type="xml">
<field name="origin" position="after">
- <field name="journal_id" select="1"/>
<field name="invoice_type_id" select="1"/>
- <field name="sale_journal_id" select="1"/>
</field>
</field>
</record>
@@ -220,8 +109,6 @@
<field name="inherit_id" ref="stock.view_picking_in_form" />
<field name="arch" type="xml">
<field name="origin" position="after">
- <field name="journal_id" select="1"/>
- <field name="sale_journal_id" select="1"/>
<field name="invoice_type_id" select="1"/>
</field>
</field>
@@ -234,9 +121,7 @@
<field name="inherit_id" ref="stock.view_picking_in_tree" />
<field name="arch" type="xml">
<field name="origin" position="after">
- <field name="journal_id" select="1"/>
<field name="invoice_type_id" select="1"/>
- <field name="sale_journal_id" select="1"/>
</field>
</field>
</record>
@@ -248,8 +133,6 @@
<field name="inherit_id" ref="stock.view_picking_out_form" />
<field name="arch" type="xml">
<field name="origin" position="after">
- <field name="journal_id" select="1"/>
- <field name="sale_journal_id" select="1"/>
<field name="invoice_type_id" select="1"/>
</field>
</field>
@@ -262,73 +145,11 @@
<field name="inherit_id" ref="stock.view_picking_out_tree" />
<field name="arch" type="xml">
<field name="origin" position="after">
- <field name="journal_id" select="1"/>
<field name="invoice_type_id" select="1"/>
- <field name="sale_journal_id" select="1"/>
</field>
</field>
</record>
- <!-- Action of sale journal report in sale journal -->
-
- <act_window name="Monthly sales"
- context="{'search_default_journal_id': active_id}"
- res_model="sale.journal.report"
- src_model="sale_journal.sale.journal"
- id="act_sale_journal_sale_journal_2_sale_journal_sale_stats"/>
-
- <!-- Action of stock picking in picking journal -->
-
- <act_window name="Assigned picking"
- domain="[('state', '=', 'assigned')]"
- context="{'search_default_journal_id': [active_id]}"
- res_model="stock.picking"
- src_model="sale_journal.picking.journal"
- id="act_sale_journal_picking_journal_2_stock_picking_assigned"/>
-
- <!-- Action of stock picking in picking journal -->
-
- <act_window name="Confirmed picking"
- domain="[('state', '=', 'confirmed')]"
- context="{'search_default_journal_id': [active_id]}"
- res_model="stock.picking"
- src_model="sale_journal.picking.journal"
- id="act_sale_journal_picking_journal_2_stock_picking_confirmed"/>
-
- <!-- Action of stock picking in sale journal -->
-
- <act_window name="Assigned picking"
- domain="[('state', '=', 'assigned')]"
- context="{'search_default_sale_journal_id': [active_id]}"
- res_model="stock.picking"
- src_model="sale_journal.sale.journal"
- id="act_sale_journal_sale_journal_2_stock_picking_assigned"/>
-
- <!-- Action of stock picking in sale journal -->
-
- <act_window name="Confirmed picking"
- domain="[('state', '=', 'confirmed')]"
- context="{'search_default_sale_journal_id': [active_id]}"
- res_model="stock.picking"
- src_model="sale_journal.sale.journal"
- id="act_sale_journal_sale_journal_2_stock_picking_confirmed"/>
-
- <!-- Action of sale order in sale journal -->
-
- <act_window name="Draft sales"
- domain="[('journal_id', '=', active_id),('state', '=', 'draft')]"
- res_model="sale.order"
- src_model="sale_journal.sale.journal"
- id="act_sale_journal_sale_journal_2_sale_order_draft"/>
-
- <!-- Action of sale order in sale journal -->
-
- <act_window name="Approved sales"
- domain="[('journal_id', '=', active_id),('state', '=', 'approved')]"
- res_model="sale.order"
- src_model="sale_journal.sale.journal"
- id="act_sale_journal_sale_journal_2_sale_order_approved"/>
-
<record id="view_partner_property_form" model="ir.ui.view">
<field name="name">res.partner.journal.property.form.inherit</field>
<field name="model">res.partner</field>
@@ -336,161 +157,13 @@
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<page string="Sales & Purchases" position="inside">
- <field name="property_invoice_type"/>
- </page>
- </field>
- </record>
-
- <!--=====================================================-->
- <!-- picking journal view-->
- <!--===================================================== -->
-
- <record model="ir.ui.view" id="view_picking_journal_form">
- <field name="name">sale_journal.picking.journal.form</field>
- <field name="model">sale_journal.picking.journal</field>
- <field name="type">form</field>
- <field name="arch" type="xml">
- <form string="Picking Journal">
- <group colspan="4" col="6">
- <field name="name" select="1"/>
- <field name="code" select="1"/>
- <field name="user_id" select="1"/>
- <newline/>
- <field name="date" select="1"/>
- <field name="date_created" select="1"/>
- <field name="date_close" select="1"/>
- </group>
- <notebook colspan="4">
- <page string="Picking">
- <field name="picking_stats_ids" colspan="4" nolabel="1"/>
- </page>
- <page string="Notes">
- <field name="note" colspan="4" nolabel="1"/>
- </page>
- </notebook>
- <field name="state"/>
- <group col="6" colspan="2">
- <button name="button_open" string="Open Journal" states="draft" type="object" icon="terp-check"/>
- <button string="Confirm Picking" name="button_picking_confirm" states="open" type="object" icon="terp-camera_test"/>
- <button name="button_reset" string="Set to Draft" states="cancel" type="object" icon="gtk-convert"/>
- <button name="button_close" string="Close Journal" states="confirm,open" type="object" icon="terp-dialog-close"/>
- <button string="Cancel Picking" name="button_picking_cancel" states="close,draft,open,confirm" type="object" icon="gtk-cancel"/>
- </group>
- </form>
- </field>
- </record>
-
- <record model="ir.ui.view" id="view_picking_journal_tree">
- <field name="name">sale_journal.picking.journal.tree</field>
- <field name="model">sale_journal.picking.journal</field>
- <field name="type">tree</field>
- <field name="arch" type="xml">
- <tree string="Picking Journal">
- <field name="name"/>
- <field name="code"/>
- <field name="user_id"/>
- <field name="date"/>
- <field name="state"/>
- </tree>
- </field>
- </record>
-
- <!-- Picking journal tree view -->
-
- <record model="ir.ui.view" id="view_picking_journal_search">
- <field name="name">sale_journal.picking.journal.search</field>
- <field name="model">sale_journal.picking.journal</field>
- <field name="type">search</field>
- <field name="arch" type="xml">
- <search string="Picking Journals">
- <group col="8" colspan="4">
- <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Picking Journals which are in draft state"/>
- <filter icon="terp-check" string="Open" domain="[('state','=','open')]" help="Open Picking Journals"/>
- <filter icon="gtk-cancel" string="Cancel" domain="[('state','=','cancel')]" help="Picking Journals which are cancelled"/>
- <filter icon="terp-dialog-close" string="Close" domain="[('state','=','done')]" help="Picking Journals which are closed"/>
- <separator orientation="vertical"/>
- <field name="name"/>
- <field name="code"/>
- <field name="user_id"/>
- <field name="date"/>
+ <group colspan="2" col="2">
+ <separator string="Invoicing" colspan="2"/>
+ <field name="property_invoice_type" widget="selection"/>
</group>
- </search>
- </field>
- </record>
-
-<!-- Action of Picking journals -->
-
- <record model="ir.actions.act_window" id="action_definition_picking_journal">
- <field name="name">Picking Journals</field>
- <field name="res_model">sale_journal.picking.journal</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="context">{'search_default_user_id':uid}</field>
- <field name="search_view_id" ref="view_picking_journal_search"/>
- </record>
-
- <menuitem name="Picking Journals" id="menu_definition_journal_picking" parent="stock.menu_warehouse_config" action="action_definition_picking_journal" groups="base.group_system"/>
-
- <record model="ir.actions.act_window" id="action_invoice_type_tree">
- <field name="name">Picking by invoice_method</field>
- <field name="res_model">sale_journal.invoice.type</field>
- <field name="type">ir.actions.act_window</field>
- <field name="view_type">tree</field>
- </record>
-
- <record model="ir.actions.act_window" id="action_invoice_type_picking_open">
- <field name="name">Picking to invoice</field>
- <field name="res_model">stock.picking</field>
- <field name="type">ir.actions.act_window</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="domain">[('state','=','done'),('invoice_state','=','2binvoiced'),('invoice_type_id','=',active_id)]</field>
- </record>
-
- <record model="ir.values" id="ir_open_invoice_type">
- <field name="key2">tree_but_open</field>
- <field name="model">sale_journal.invoice.type</field>
- <field name="name">Picking to invoice</field>
- <field name="value" eval="'ir.actions.act_window,%d'%action_invoice_type_picking_open"/>
- <field name="object" eval="True"/>
- </record>
-
- <record id="view_picking_out_jorunal_search_form" model="ir.ui.view">
- <field name="name">stock.picking.journal.search</field>
- <field name="model">stock.picking</field>
- <field name="type">search</field>
- <field name="inherit_id" ref="stock.view_picking_out_search"/>
- <field name="arch" type="xml">
- <xpath expr="/search/group[@string='Group By...']/filter[@string='Partner']" position="after">
- <filter string="Picking Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
- </xpath>
- </field>
- </record>
-
- <record id="view_picking_in_jorunal_search_form" model="ir.ui.view">
- <field name="name">stock.picking.journal.search</field>
- <field name="model">stock.picking</field>
- <field name="type">search</field>
- <field name="inherit_id" ref="stock.view_picking_in_search"/>
- <field name="arch" type="xml">
- <xpath expr="/search/group[@string='Group By...']/filter[@string='Partner']" position="after">
- <filter string="Picking Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
- </xpath>
- </field>
- </record>
-
- <record id="view_picking_internal_jorunal_search_form" model="ir.ui.view">
- <field name="name">stock.picking.journal.search</field>
- <field name="model">stock.picking</field>
- <field name="type">search</field>
- <field name="inherit_id" ref="stock.view_picking_internal_search"/>
- <field name="arch" type="xml">
- <xpath expr="/search/group[@string='Group By...']/filter[@string='Origin']" position="after">
- <filter string="Picking Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
- </xpath>
+ </page>
</field>
</record>
-
</data>
</openerp>
diff --git a/addons/sale_journal/security/ir.model.access.csv b/addons/sale_journal/security/ir.model.access.csv
index 645ee5bd534721bc1705fe3c9397b5d6d43e78fa..bc1a3b003c3f9e25dbb55477f4d6203be2710c29 100644
--- a/addons/sale_journal/security/ir.model.access.csv
+++ b/addons/sale_journal/security/ir.model.access.csv
@@ -1,18 +1,6 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_sale_journal_invoice_type_finance_invoice","sale_journal.invoice.type invoice","model_sale_journal_invoice_type","account.group_account_invoice",1,0,0,0
+"access_sale_journal_invoice_type_finance_invoice","sale_journal.invoice.type invoice","model_sale_journal_invoice_type","account.group_account_invoice",1,1,1,1
"access_sale_journal_invoice_type_partner_manager","sale_journal.invoice.type partner manager","model_sale_journal_invoice_type","base.group_partner_manager",1,0,0,0
"access_sale_journal_invoice_type_salesman","sale_journal.invoice.type salesman","model_sale_journal_invoice_type","base.group_sale_salesman",1,0,0,0
-"access_sale_journal_sale_journal","sale_journal.sale.journal","model_sale_journal_sale_journal","base.group_sale_salesman",1,0,0,0
"access_sale_journal_invoice_type_manager","sale_journal.invoice.type.manager","model_sale_journal_invoice_type","base.group_sale_manager",1,1,1,1
-"access_sale_journal_sale_journal_manager","sale_journal.sale.journal.manager","model_sale_journal_sale_journal","base.group_sale_manager",1,1,1,1
-"access_sale_journal_picking_journal_manager","sale_journal.picking.journal.manager","model_sale_journal_picking_journal","base.group_sale_manager",1,1,1,1
-"access_sale_journal_sale_journal_stock_worker","sale_journal.sale.journal stock worker","model_sale_journal_sale_journal","stock.group_stock_user",1,0,0,0
-"access_sale_journal_picking_journal_stock_worker","sale_journal.picking.journal stock worker","model_sale_journal_picking_journal","stock.group_stock_user",1,0,0,0
"access_sale_journal_invoice_type_stock_worker","sale_journal.invoice_type stock worker","model_sale_journal_invoice_type","stock.group_stock_user",1,0,0,0
-"access_sale_journal_sale_journal_report_manager","sale_journal_sale_journal_report_manager","model_sale_journal_report","base.group_sale_manager",1,1,1,1
-"access_sale_journal_sale_journal_report_system","sale_journal_sale_journal_report_system","model_sale_journal_report","base.group_system",1,0,0,0
-"access_sale_journal_picking_report","sale_journal_picking_report","model_sale_journal_picking_report","stock.group_stock_manager",1,1,1,1
-"access_sale_journal_picking_journal","sale_journal_picking_journal","model_sale_journal_picking_journal","base.group_system",1,1,1,1
-"access_stock_picking_journal_system","stock_picking_journal_system","stock.model_stock_picking","base.group_system",1,1,1,1
-"access_sale_journal_invoice_type_system","sale_journal.invoice.type.system","model_sale_journal_invoice_type","base.group_system",1,1,1,1
-"access_sale_journal_sale_journal_system","sale_journal.sale.journal.system","model_sale_journal_sale_journal","base.group_system",1,1,1,1
diff --git a/addons/sale_journal/test/picking_journal.yml b/addons/sale_journal/test/picking_journal.yml
deleted file mode 100644
index 9412c3d40d1a2d76c6837d803975270a47b95eee..0000000000000000000000000000000000000000
--- a/addons/sale_journal/test/picking_journal.yml
+++ /dev/null
@@ -1,87 +0,0 @@
--
- In order to test the sale_journal module in OpenERP,
- I create a picking journal
--
- !record {model: sale_journal.picking.journal, id: sale_journal_picking_journal_pickjournal0}:
- code: PJ
- date: '2010-08-04'
- date_created: '2010-08-04'
- name: Pick_journal
- state: draft
- user_id: base.user_root
--
- I create a picking for product keyboard, quantity 50
--
- !record {model: stock.picking, id: stock_picking_out0}:
- address_id: base.res_partner_address_6
- company_id: base.main_company
- invoice_state: none
- journal_id: sale_journal_picking_journal_pickjournal0
- move_lines:
- - company_id: base.main_company
- date_expected: '2010-08-04 14:09:38'
- date: '2010-08-04 14:09:38'
- location_id: stock.stock_location_stock
- product_id: product.product_product_24
- product_qty: 50.0
- product_uom: product.product_uom_unit
- location_dest_id: stock.stock_location_customers
- name: '[KEYA] Keyboard - AZERTY'
- product_uos_qty: 50.0
- move_type: direct
- name: OUT/00007
- type: out
--
- I verify that a Journal consist of picking order
--
- !python {model: sale_journal.picking.journal}: |
- pick_jour = self.browse(cr, uid, ref("sale_journal_picking_journal_pickjournal0"))
- assert pick_jour.picking_stats_ids, "Journal does not consist of a picking order"
--
- Then I click on the 'Open Journal' button
--
- !python {model: sale_journal.picking.journal}: |
- self.button_open(cr, uid, [ref("sale_journal_picking_journal_pickjournal0")], {"lang": "en_US", "search_default_user_id":
- 1, "tz": False, "active_model": "ir.ui.menu", "active_ids": [ref("sale_journal.menu_definition_journal_picking")],
- "active_id": ref("sale_journal.menu_definition_journal_picking")})
--
- I verify that a state of journal has transit from draft to open state
--
- !python {model: sale_journal.picking.journal}: |
- pick_jour = self.browse(cr, uid, ref("sale_journal_picking_journal_pickjournal0"))
- assert (pick_jour.state == 'open'), "Journal is not in the open state"
--
- Then I click on the 'Confirm Picking' button
--
- !python {model: sale_journal.picking.journal}: |
- self.button_picking_confirm(cr, uid, [ref("sale_journal_picking_journal_pickjournal0")], {"lang": "en_US", "search_default_user_id":
- 1, "tz": False, "active_model": "ir.ui.menu", "active_ids": [ref("sale_journal.menu_definition_journal_picking")],
- "active_id": ref("sale_journal.menu_definition_journal_picking")})
--
- I verify that a state of journal has transit from open to confirm state
--
- !python {model: sale_journal.picking.journal}: |
- pick_jour = self.browse(cr, uid, ref("sale_journal_picking_journal_pickjournal0"))
- assert (pick_jour.state == 'confirm'), "Journal is not in the open state"
--
- I verify that an picking order is now in the confirm state
--
- !python {model: stock.picking}: |
- pick_jour_obj = self.pool.get('sale_journal.picking.journal')
- jour = pick_jour_obj.browse(cr, uid, ref("sale_journal_picking_journal_pickjournal0"))
- stock_pick = self.browse(cr, uid, ref("stock_picking_out0"))
- pick_jour = self.search(cr, uid, [('journal_id','=',jour.name) and ('state','=','confirmed')])
- assert pick_jour, "Sale order is not in the confirm state"
--
- Then I click on the 'Close Journal' button
--
- !python {model: sale_journal.picking.journal}: |
- self.button_close(cr, uid, [ref("sale_journal_picking_journal_pickjournal0")], {"lang": "en_US", "search_default_user_id":
- 1, "tz": False, "active_model": "ir.ui.menu", "active_ids": [ref("sale_journal.menu_definition_journal_picking")],
- "active_id": ref("sale_journal.menu_definition_journal_picking")})
--
- I verify that a state of journal has transit from confirm to close state
--
- !python {model: sale_journal.picking.journal}: |
- pick_jour = self.browse(cr, uid, ref("sale_journal_picking_journal_pickjournal0"))
- assert (pick_jour.state == 'close'), "Journal is not in the open state"
diff --git a/addons/sale_journal/test/sale_journal.yml b/addons/sale_journal/test/sale_journal.yml
deleted file mode 100644
index 365e26400310399e39e169b559c86c4949f88b12..0000000000000000000000000000000000000000
--- a/addons/sale_journal/test/sale_journal.yml
+++ /dev/null
@@ -1,95 +0,0 @@
--
- In order to test the sale_journal module in OpenERP,
- I create a sale journal and place a sale order related to a journal
--
- I create a sale journal
--
- !record {model: sale_journal.sale.journal, id: sale_journal_sale_journal_journal0}:
- code: J1
- date: '2010-08-04'
- date_created: '2010-08-04'
- name: Journal_1
- state: draft
- user_id: base.user_root
--
- I place a sale order for product keyboard, quantity 100
--
- !record {model: sale.order, id: sale_order_so0}:
- date_order: '2010-08-04'
- invoice_quantity: order
- invoice_type_id: sale_journal.daily
- journal_id: sale_journal_sale_journal_journal0
- name: Test_SO012
- order_line:
- - name: '[KEYA] Keyboard - AZERTY'
- price_unit: 7.0
- product_uom: product.product_uom_unit
- product_uom_qty: 100.0
- state: draft
- delay: 7.0
- product_id: product.product_product_24
- product_uos_qty: 100.0
- th_weight: 0.0
- type: make_to_stock
- order_policy: manual
- partner_id: base.res_partner_4
- partner_invoice_id: base.res_partner_address_7
- partner_order_id: base.res_partner_address_7
- partner_shipping_id: base.res_partner_address_7
- picking_policy: direct
- pricelist_id: product.list0
- shop_id: sale.shop
--
- I verify that a Journal consist of sale order
--
- !python {model: sale_journal.sale.journal}: |
- sal_jour = self.browse(cr, uid, ref("sale_journal_sale_journal_journal0"))
- assert sal_jour.sale_stats_ids, "Journal does not consist of a sale order details"
--
- Then I click on the 'Open Journal' button
--
- !python {model: sale_journal.sale.journal}: |
- self.button_open(cr, uid, [ref("sale_journal_sale_journal_journal0")], {"lang": "en_US", "search_default_user_id":
- 1, "tz": False, "active_model": "ir.ui.menu", "active_ids": [ref("sale_journal.menu_definition_journal")],
- "active_id": ref("sale_journal.menu_definition_journal")})
--
- I verify that a state of journal has transit from draft to open state
--
- !python {model: sale_journal.sale.journal}: |
- sal_jour = self.browse(cr, uid, ref("sale_journal_sale_journal_journal0"))
- assert (sal_jour.state == 'open'), "Journal is not in the open state"
--
- Then I click on the 'Confirm Sales' button
--
- !python {model: sale_journal.sale.journal}: |
- self.button_sale_confirm(cr, uid, [ref("sale_journal_sale_journal_journal0")], {"lang": "en_US", "search_default_user_id":
- 1, "tz": False, "active_model": "ir.ui.menu", "active_ids": [ref("sale_journal.menu_definition_journal")],
- "active_id": ref("sale_journal.menu_definition_journal")})
--
- I verify that a state of journal has transit from open to confirm state
--
- !python {model: sale_journal.sale.journal}: |
- sal_jour = self.browse(cr, uid, ref("sale_journal_sale_journal_journal0"))
- assert (sal_jour.state == 'confirm'), "Journal is not in the confirm state"
--
- I verify that a sale order is now in the confirm state
--
- !python {model: sale.order}: |
- sale_jour_obj = self.pool.get('sale_journal.sale.journal')
- jour = sale_jour_obj.browse(cr, uid, ref("sale_journal_sale_journal_journal0"))
- so = self.browse(cr, uid, ref("sale_order_so0"))
- so_jour = self.search(cr, uid, [('journal_id','=',jour.name) and ('state','=','manual')])
- assert so_jour, "Sale order is not in the confirm state"
--
- Then I click on the 'Close Journal' button
--
- !python {model: sale_journal.sale.journal}: |
- self.button_close(cr, uid, [ref("sale_journal_sale_journal_journal0")], {"lang": "en_US", "search_default_user_id":
- 1, "tz": False, "active_model": "ir.ui.menu", "active_ids": [ref("sale_journal.menu_definition_journal")],
- "active_id": ref("sale_journal.menu_definition_journal")})
--
- I verify that a state of journal has transit from confirm to close state
--
- !python {model: sale_journal.sale.journal}: |
- sal_jour = self.browse(cr, uid, ref("sale_journal_sale_journal_journal0"))
- assert (sal_jour.state == 'close'), "Journal is not in the close state"
\ No newline at end of file
diff --git a/addons/sale_layout/report/order.rml b/addons/sale_layout/report/order.rml
deleted file mode 100755
index cde59d18e026a2420267054758dd5d84132b05c8..0000000000000000000000000000000000000000
--- a/addons/sale_layout/report/order.rml
+++ /dev/null
@@ -1,378 +0,0 @@
-<?xml version="1.0"?>
-<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Sale Order" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
- <pageTemplate id="first">
- <frame id="first" x1="15.0" y1="42.0" width="539" height="758"/>
- </pageTemplate>
- </template>
- <stylesheet>
- <blockTableStyle id="Standard_Outline">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- </blockTableStyle>
- <blockTableStyle id="AddressTable">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- </blockTableStyle>
- <blockTableStyle id="Table1">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
- </blockTableStyle>
- <blockTableStyle id="OrderTable">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
- </blockTableStyle>
- <blockTableStyle id="HeadingTable">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
- </blockTableStyle>
- <blockTableStyle id="Order_Desc_Table">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
- </blockTableStyle>
- <blockTableStyle id="Total_Table">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
- <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,1" stop="0,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,2" stop="0,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="1,2" stop="1,2"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="2,2" stop="2,2"/>
- <lineStyle kind="LINEABOVE" colorName="#000000" start="3,2" stop="3,2"/>
- </blockTableStyle>
- <blockTableStyle id="Partner_Note_Table">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- </blockTableStyle>
- <initialize>
- <paraStyle name="all" alignment="justify"/>
- </initialize>
- <paraStyle name="P1" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="P4" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="P5" rightIndent="0.0" leftIndent="11.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="P6" rightIndent="0.0" leftIndent="-2.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="P7" rightIndent="0.0" leftIndent="11.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="Standard" fontName="Times-Roman"/>
- <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Heading" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
- <paraStyle name="Table Contents" fontName="Times-Roman"/>
- <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
- <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="Index" fontName="Times-Roman"/>
- <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="Footer" fontName="Times-Roman"/>
- <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
- <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
- <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
- <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="terp_default_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
- <paraStyle name="Preformatted Text" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
- </stylesheet>
- <images/>
- <story>
- <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
- <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
- <blockTable colWidths="265.0,51.0,225.0" style="AddressTable">
- <tr>
- <td>
- <para style="terp_default_Bold_9">Shipping address :</para>
- <para style="terp_default_9">[[ o.partner_id.title or '' ]][[ o.partner_id.name ]]</para>
- <para style="terp_default_9">[[ o.partner_shipping_id.title or '' ]][[ o.partner_shipping_id.name ]]</para>
- <para style="terp_default_9">[[ o.partner_shipping_id.street ]]</para>
- <para style="terp_default_9">[[ o.partner_shipping_id.street2 or '' ]]</para>
- <para style="terp_default_9">[[ o.partner_shipping_id.city or '' ]] [[ o.partner_shipping_id.zip or '' ]]</para>
- <para style="terp_default_9">[[ o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name or '' ]][[ o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name or '' ]]</para>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
- <para style="terp_default_Bold_9">Invoice address :</para>
- <para style="terp_default_9">[[ o.partner_invoice_id.street ]][[ o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2 or '') ]]</para>
- <para style="terp_default_9">[[ o.partner_invoice_id.city or '' ]] [[ o.partner_invoice_id.zip or '' ]]</para>
- <para style="terp_default_9">[[ o.partner_invoice_id.country_id and ('%s' % (o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '')) ]]</para>
- </td>
- <td>
- <para style="terp_default_8">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_default_9">[[ o.partner_id.title or '' ]][[ o.partner_id.name ]]</para>
- <para style="terp_default_9">[[ o.partner_order_id.title or '' ]][[ o.partner_order_id.name ]]</para>
- <para style="terp_default_9">[[ o.partner_order_id.street ]]</para>
- <para style="terp_default_9">[[ o.partner_order_id.street2 or '' ]]</para>
- <para style="terp_default_9">[[ o.partner_order_id.city or '' ]] [[ o.partner_order_id.zip or '' ]]</para>
- <para style="terp_default_9">[[ o.partner_order_id.state_id and o.partner_order_id.state_id.name or '' ]][[ o.partner_order_id.country_id and o.partner_order_id.country_id.name or '' ]]</para>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
- <para style="terp_default_9">Tel. : [[ o.partner_order_id.phone or removeParentNode('para') ]]</para>
- <para style="terp_default_9">Fax : [[ o.partner_order_id.fax or removeParentNode('para') ]]</para>
- <para style="terp_default_9">TVA : [[ o.partner_id.vat or removeParentNode('para') ]]</para>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
- </td>
- </tr>
- </blockTable>
- <para style="terp_default_8">
- <font color="white"> </font>
- </para>
- <para style="terp_header">[[ o.state<>'draft' and removeParentNode('para') ]] Quotation N° [[ o.name ]]</para>
- <para style="terp_header">[[ o.state=='draft' and removeParentNode('para') ]] Order N° [[ o.name ]]</para>
- <para style="terp_default_8">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="132.0,134.0,135.0,135.0" style="Table1">
- <tr>
- <td>
- <para style="terp_tblheader_General_Centre">Your Reference </para>
- </td>
- <td>
- <para style="terp_tblheader_General_Centre">Date Ordered </para>
- </td>
- <td>
- <para style="terp_tblheader_General_Centre">Our Salesman </para>
- </td>
- <td>
- <para style="terp_tblheader_General_Centre">Payment Terms</para>
- </td>
- </tr>
- </blockTable>
- <blockTable colWidths="132.0,134.0,135.0,135.0" style="OrderTable">
- <tr>
- <td>
- <para style="terp_default_Centre_8">[[ o.name ]]</para>
- </td>
- <td>
- <para style="terp_default_Centre_8">[[ o.date_order ]]</para>
- </td>
- <td>
- <para style="terp_default_Centre_8">[[ o.user_id.name ]]</para>
- </td>
- <td>
- <para style="terp_default_Centre_8">[[ o.payment_term.name ]]</para>
- </td>
- </tr>
- </blockTable>
- <para style="terp_default_8">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="208.0,99.0,64.0,59.0,43.0,65.0" repeatRows="1" style="HeadingTable">
- <tr>
- <td>
- <para style="terp_tblheader_Details">Description</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Centre">VAT</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Centre">Quantity</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">Unit Price</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">Disc.(%)</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Right">Price</para>
- </td>
- </tr>
- </blockTable>
- <section>
- <para style="terp_default_1">[[ repeatIn(o.order_line,'line') ]]</para>
- <blockTable colWidths="207.0,99.0,43.0,21.0,59.0,43.0,65.0" style="Order_Desc_Table">
- <tr>
- <td>
- <para style="terp_default_9">[[ line.name ]]</para>
- </td>
- <td>
- <para style="terp_default_Centre_9">[[ ', '.join(map(lambda x: x.name, line.tax_id)) or '0.00' ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ line.product_uos and line.product_uos_qty or line.product_uom_qty or '0.00']]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ line.product_uos and line.product_uos.name or line.product_uom.name ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ line.price_unit or '0.00' ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ line.discount and str(line.discount) or '0.00' ]]</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ line.price_subtotal or '0.00' ]]</para>
- </td>
- </tr>
- <tr>
- <td>
- <para style="P7">[[ format(line.notes or removeParentNode('tr')) ]]</para>
- </td>
- <td>
- <para style="terp_default_Centre_9">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_default_Right_9">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_default_Right_9">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_default_Right_9">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_default_Right_9">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_default_Right_9">
- <font color="white"> </font>
- </para>
- </td>
- </tr>
- </blockTable>
- </section>
- <blockTable colWidths="384.0,67.0,64.0,22.0" style="Total_Table">
- <tr>
- <td>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="P6">Net Total :</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ o.amount_untaxed or '0.00' ]]</para>
- </td>
- <td>
- <para style="P2">[[ o.pricelist_id.currency_id.name ]]</para>
- </td>
- </tr>
- <tr>
- <td>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="P5">Taxes :</para>
- </td>
- <td>
- <para style="terp_default_Right_9">[[ o.amount_tax or '0.00' ]]</para>
- </td>
- <td>
- <para style="P2">[[ o.pricelist_id.currency_id.name ]]</para>
- </td>
- </tr>
- <tr>
- <td>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="P4">Total :</para>
- </td>
- <td>
- <para style="terp_default_Right_9_Bold">[[ o.amount_total or '0.00' ]] </para>
- </td>
- <td>
- <para style="P3">[[ o.pricelist_id.currency_id.name ]]</para>
- </td>
- </tr>
- </blockTable>
- <para style="terp_default_8">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="533.0" style="Partner_Note_Table">
- <tr>
- <td>
- <para style="terp_default_9">[[ format(o.note or '') ]]</para>
- </td>
- </tr>
- <tr>
- <td>
- <para style="terp_default_9">[[ format((o.partner_id.property_payment_term and o.partner_id.property_payment_term.note) or '') ]]</para>
- </td>
- </tr>
- </blockTable>
- <para style="P1">
- <font color="white"> </font>
- </para>
- </story>
-</document>
diff --git a/addons/sale_layout/report/report_sale_layout.rml b/addons/sale_layout/report/report_sale_layout.rml
index 9413ca09901ee7e588269173d484d4fc48f6d64f..990c4c5c7b1635b7c5d519540b931f3030eec5c5 100755
--- a/addons/sale_layout/report/report_sale_layout.rml
+++ b/addons/sale_layout/report/report_sale_layout.rml
@@ -190,23 +190,23 @@
<blockTable colWidths="254.0,62.0,211.0" style="Tableau2">
<tr>
<td>
- <para style="terp_default_Bold_9">Shipping address :</para>
- <para style="terp_default_9">[[ o.partner_id.title.name or '' ]] [[ o.partner_id.name ]]</para>
- <para style="terp_default_9">[[ o.partner_shipping_id.street ]]</para>
- <para style="terp_default_9">[[ o.partner_shipping_id.street2 or removeParentNode('para') ]]</para>
- <para style="terp_default_9">[[ o.partner_shipping_id.city or '' ]] [[ o.partner_shipping_id.zip or '' ]]</para>
- <para style="terp_default_9">[[ (o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name) or removeParentNode('para') ]]</para>
- <para style="terp_default_9">[[ o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name or '' ]]</para>
+ <para style="terp_default_Bold_9">Shipping address :</para>
+ <para style="terp_default_9">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
+ <para style="terp_default_9">[[ (o.partner_shipping_id and o.partner_shipping_id.street) or '' ]]</para>
+ <para style="terp_default_9">[[ (o.partner_shipping_id and o.partner_shipping_id.street2) or removeParentNode('para') ]]</para>
+ <para style="terp_default_9">[[ (o.partner_shipping_id and o.partner_shipping_id.zip) or '' ]] [[ (o.partner_shipping_id and o.partner_shipping_id.city) or '' ]]</para>
+ <para style="terp_default_9">[[ (o.partner_shipping_id and o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name) or removeParentNode('para') ]] </para>
+ <para style="terp_default_9">[[ (o.partner_shipping_id and o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name) or '' ]]</para>
<para style="terp_default_9">
<font color="white"> </font>
</para>
<para style="terp_default_Bold_9">Invoice address :</para>
- <para style="terp_default_9">[[ o.partner_invoice_id.partner_id.name or '' ]]</para>
- <para style="terp_default_9">[[ o.partner_invoice_id.street ]]</para>
- <para style="terp_default_9">[[ o.partner_invoice_id.street2 or removeParentNode('para') ]]</para>
- <para style="terp_default_9">[[ o.partner_invoice_id.zip or '' ]] [[ o.partner_invoice_id.city or '' ]]</para>
- <para style="terp_default_9">[[ (o.partner_invoice_id.state_id and o.partner_invoice_id.state_id.name) or removeParentNode('para') ]]</para>
- <para style="terp_default_9">[[ o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '']]</para>
+ <para style="terp_default_9">[[ (o.partner_invoice_id and o.partner_invoice_id.title and o.partner_invoice_id.title.name) or '' ]] [[ (o.partner_invoice_id and o.partner_invoice_id.name) or '' ]]</para>
+ <para style="terp_default_9">[[ (o.partner_invoice_id and o.partner_invoice_id.street) or '' ]] </para>
+ <para style="terp_default_9">[[ (o.partner_invoice_id and o.partner_invoice_id.street2) or removeParentNode('para') ]]</para>
+ <para style="terp_default_9">[[ (o.partner_invoice_id and o.partner_invoice_id.zip) or '' ]] [[ (o.partner_invoice_id and o.partner_invoice_id.city) or '' ]]</para>
+ <para style="terp_default_9">[[ (o.partner_invoice_id and o.partner_invoice_id.state_id and o.partner_invoice_id.state_id.name) or removeParentNode('para') ]]</para>
+ <para style="terp_default_9">[[ (o.partner_invoice_id and o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name) or '' ]]</para>
</td>
<td>
<para style="P17">
@@ -214,19 +214,18 @@
</para>
</td>
<td>
- <para style="terp_default_9">[[ o.partner_id.title.name or '' ]] [[ o.partner_id.name ]]</para>
- <para style="terp_default_9">[[ o.partner_order_id.street ]]</para>
- <para style="terp_default_9">[[ o.partner_order_id.street2 or removeParentNode('para') ]]</para>
- <para style="terp_default_9">[[ o.partner_order_id.zip or '' ]] [[ o.partner_order_id.city or '' ]]</para>
- <para style="terp_default_9">[[ (o.partner_order_id.state_id and o.partner_order_id.state_id.name) or removeParentNode('para') ]] </para>
- <para style="terp_default_9">[[ o.partner_order_id.country_id and o.partner_order_id.country_id.name or '' ]]</para>
+ <para style="terp_default_9">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
+ <para style="terp_default_9">[[ (o.partner_order_id and o.partner_order_id.street) or '' ]]</para>
+ <para style="terp_default_9">[[ (o.partner_order_id and o.partner_order_id.street2) or removeParentNode('para') ]]</para>
+ <para style="terp_default_9">[[ (o.partner_order_id and o.partner_order_id.zip) or '' ]] [[ (o.partner_order_id and o.partner_order_id.city) or '' ]]</para>
+ <para style="terp_default_9">[[ (o.partner_order_id and o.partner_order_id.state_id and o.partner_order_id.state_id.name) or removeParentNode('para')]] [[ (o.partner_order_id and o.partner_order_id.country_id and o.partner_order_id.country_id.name) or '' ]]</para>
<para style="terp_default_9">
<font color="white"> </font>
</para>
- <para style="terp_default_9">Tel. : [[ o.partner_order_id.phone or removeParentNode('para') ]]</para>
- <para style="terp_default_9">Fax : [[ o.partner_order_id.fax or removeParentNode('para') ]]</para>
- <para style="terp_default_9">TVA : [[ o.partner_id.vat or removeParentNode('para') ]]</para>
- <para style="P26">
+ <para style="terp_default_9">Tel. : [[ (o.partner_order_id and o.partner_order_id.phone) or removeParentNode('para') ]]</para>
+ <para style="terp_default_9">Fax : [[ (o.partner_order_id and o.partner_order_id.fax) or removeParentNode('para') ]]</para>
+ <para style="terp_default_9">TVA : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
+ <para style="terp_default_9">
<font color="white"> </font>
</para>
</td>
@@ -265,7 +264,7 @@
<para style="terp_default_Centre_8">[[ formatLang(o.date_order,date=True) ]]</para>
</td>
<td>
- <para style="terp_default_Centre_8">[[ o.user_id.name ]]</para>
+ <para style="terp_default_Centre_8">[[ (o.user_id and o.user_id.name) or '' ]]</para>
</td>
<td>
<para style="terp_default_Centre_8">[[ o.payment_term.name ]]</para>
@@ -425,7 +424,7 @@
</tr>
<tr>
<td>
- <para style="terp_default_9">[[ format((o.partner_id.property_payment_term and o.partner_id.property_payment_term.note) or '') ]]</para>
+ <para style="terp_default_9">[[ format((o.partner_id and o.partner_id.property_payment_term and o.partner_id.property_payment_term.note) or '') ]]</para>
</td>
</tr>
</blockTable>
diff --git a/addons/share/__init__.py b/addons/share/__init__.py
index eff88be137d992314ba57345bcae69fcbc480f4c..9c0c7bf7da24de0e0ee9f109274de080a4991020 100644
--- a/addons/share/__init__.py
+++ b/addons/share/__init__.py
@@ -18,5 +18,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
-import share
+
+import res_users
import wizard
diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py
index 9dc2a6658d82cf302e88cb3c25744f931647a552..4f2eafb4e52f1b1eab1c58e416a39e28293e7e6a 100644
--- a/addons/share/__openerp__.py
+++ b/addons/share/__openerp__.py
@@ -21,24 +21,34 @@
{
- "name" : "Share Management",
+ "name" : "Sharing Tools",
"version" : "1.1",
"depends" : ["base"],
"author" : "OpenERP SA",
"category": 'Generic Modules',
- "description": """The goal is to implement a generic sharing mechanism, where user of OpenERP
-can share data from OpenERP to their colleagues, customers, or friends.
-The system will work by creating new users and groups on the fly, and by
-combining the appropriate access rights and ir.rules to ensure that the /shared
-users/ will only have access to the correct data.
+ "description": """
+
+ This module adds generic sharing tools to your current OpenERP database,
+ and specifically a 'share' button that is available in the Web client to
+ share any kind of OpenERP data with colleagues, customers, friends, etc.
+
+ The system will work by creating new users and groups on the fly, and by
+ combining the appropriate access rights and ir.rules to ensure that the
+ shared users only have access to the data that has been shared with them.
+
+ This is extremely useful for collaborative work, knowledge sharing,
+ synchronization with other companies, etc.
+
""",
'website': 'http://www.openerp.com',
- 'init_xml': [],
- 'update_xml': [
+ 'data': [
+ 'security/share_security.xml',
+ 'security/ir.model.access.csv',
'share_view.xml',
+ 'res_users_view.xml',
'wizard/share_wizard_view.xml'
- ],
+ ],
'installable': True,
- 'active': False,
}
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/share/share.py b/addons/share/res_users.py
similarity index 74%
rename from addons/share/share.py
rename to addons/share/res_users.py
index 6e3c4932a1e0c49af51a6545e105b3556a0fc4ca..8168306622032541618fbb65dab6e9d1cfbade14 100644
--- a/addons/share/share.py
+++ b/addons/share/res_users.py
@@ -18,12 +18,14 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
-from osv import fields, osv, orm
+from osv import fields, osv
+
class res_groups(osv.osv):
_name = "res.groups"
_inherit = 'res.groups'
_columns = {
- 'share': fields.boolean('Share')
+ 'share': fields.boolean('Share Group', groups='share.group_share', readonly=True,
+ help="Group created to set access rights for sharing data with some users.")
}
res_groups()
@@ -31,6 +33,7 @@ class res_users(osv.osv):
_name = 'res.users'
_inherit = 'res.users'
_columns = {
- 'share': fields.boolean('Share')
+ 'share': fields.boolean('Share User', groups='share.group_share', readonly=True,
+ help="External user with limited access, created only for the purpose of sharing data.")
}
res_users()
diff --git a/addons/share/res_users_view.xml b/addons/share/res_users_view.xml
new file mode 100644
index 0000000000000000000000000000000000000000..09733e81a01f2e4562d62d006d04f12d3318ac65
--- /dev/null
+++ b/addons/share/res_users_view.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+ <data>
+ <record model="ir.ui.view" id="res_users_search_sharing">
+ <field name="name">res.users.search.share</field>
+ <field name="model">res.users</field>
+ <field name="type">search</field>
+ <field name="inherit_id" ref="base.view_users_search"/>
+ <field name="arch" type="xml">
+ <xpath expr="/search/field[@name='company_ids']" position="after">
+ <field name="share">
+ <filter name="no_share" string="Regular users only (no share user)" icon="terp-partner"
+ domain="[('share','=',False)]"/>
+ </field>
+ </xpath>
+ </field>
+ </record>
+
+ <record model="ir.actions.act_window" id="base.action_res_users">
+ <field name="context">{'search_default_no_share': 1}</field>
+ </record>
+
+ <record model="ir.ui.view" id="res_groups_search_sharing">
+ <field name="name">res.groups.search.share</field>
+ <field name="model">res.groups</field>
+ <field name="type">search</field>
+ <field name="priority" eval="8"/>
+ <field name="arch" type="xml">
+ <search string="Groups">
+ <field name="name"/>
+ <field name="share">
+ <filter name="no_share" string="Regular groups only (no share groups" icon="terp-partner"
+ domain="[('share','=',False)]"/>
+ </field>
+ </search>
+ </field>
+ </record>
+
+ <record model="ir.actions.act_window" id="base.action_res_groups">
+ <field name="context">{'search_default_no_share': 1}</field>
+ </record>
+
+ </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/share/security/ir.model.access.csv b/addons/share/security/ir.model.access.csv
new file mode 100644
index 0000000000000000000000000000000000000000..a8f37d300c69181db2dd18d44c894bbaf1c66c8f
--- /dev/null
+++ b/addons/share/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_share_wizard_user","access_share_wizard_user","model_share_wizard","share.group_share_user",1,1,1,1
\ No newline at end of file
diff --git a/addons/share/security/share_security.xml b/addons/share/security/share_security.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0b2e8c4c1fdbaf772bdaecbe4d62d874ee851bd7
--- /dev/null
+++ b/addons/share/security/share_security.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+ <data noupdate="1">
+ <record id="group_share_user" model="res.groups">
+ <field name="name">Sharing / User</field>
+ </record>
+ </data>
+</openerp>
diff --git a/addons/share/share_view.xml b/addons/share/share_view.xml
index 24736b3d53a30f4a300872b3ffdde49ae0cfcd4a..863da6ea747c21bad9ea0a89eb8482368a843cc9 100644
--- a/addons/share/share_view.xml
+++ b/addons/share/share_view.xml
@@ -6,7 +6,7 @@
<field name="model">res.groups</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_groups_form"/>
- <field name="arch" type="xml">
+ <field name="arch" type="xml">
<field name="name" position="after">
<field name="share"/>
</field>
@@ -17,7 +17,7 @@
<field name="model">res.users</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_users_form"/>
- <field name="arch" type="xml">
+ <field name="arch" type="xml">
<field name="password" position="after">
<field name="share"/>
</field>
diff --git a/addons/share/wizard/__init__.py b/addons/share/wizard/__init__.py
index b906abf5e56dd4fd99fad7d346d739bd7b8eefb2..2034dfe2fc6056bbc624441ef345bd03ef48bef6 100644
--- a/addons/share/wizard/__init__.py
+++ b/addons/share/wizard/__init__.py
@@ -20,3 +20,4 @@
##############################################################################
import share_wizard
+
diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index add9c4f9352c16c8bebd9310b233382c41ab5109..2d1fd252ecf3bda331e6467aa2e8070dddb06cb6 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -18,480 +18,448 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
+import logging
+import random
+import time
+
+import tools
from osv import osv, fields
+from osv.expression import expression
from tools.translate import _
-import tools
+from tools.safe_eval import safe_eval
+
+FULL_ACCESS = ('perm_read', 'perm_write', 'perm_create', 'perm_unlink')
+READ_ONLY_ACCESS = ('perm_read',)
+
+
+RANDOM_PASS_CHARACTERS = [chr(x) for x in range(48, 58) + range(97, 123) + range(65, 91)]
+RANDOM_PASS_CHARACTERS.remove('l') #lowercase l, easily mistaken as one or capital i
+RANDOM_PASS_CHARACTERS.remove('I') #uppercase i, easily mistaken as one or lowercase L
+RANDOM_PASS_CHARACTERS.remove('O') #uppercase o, mistaken with zero
+RANDOM_PASS_CHARACTERS.remove('o') #lowercase o, mistaken with zero
+RANDOM_PASS_CHARACTERS.remove('0') #zero, mistaken with o-letter
+RANDOM_PASS_CHARACTERS.remove('1') #one, mistaken with lowercase-L or capital i
+def generate_random_pass():
+ pass_chars = RANDOM_PASS_CHARACTERS[:]
+ random.shuffle(pass_chars)
+ return ''.join(pass_chars[0:10])
-def _generate_random_number():
- import random
- RANDOM_PASS_CHARACTERS = [chr(x) for x in range(48,58) + range(97,123) + range(65,91)]
- RANDOM_PASS_CHARACTERS.remove('l') #lowercase l, easily mistaken as one or capital i
- RANDOM_PASS_CHARACTERS.remove('I') #uppercase i, easily mistaken as one or lowercase l
- RANDOM_PASS_CHARACTERS.remove('O') #uppercase o, mistaken with zero
- RANDOM_PASS_CHARACTERS.remove('o') #lowercase o, mistaken with zero
- RANDOM_PASS_CHARACTERS.remove('0') #zero, mistaken with o-letter
- def generate_random_pass():
- pass_chars = RANDOM_PASS_CHARACTERS[:]
- random.shuffle(pass_chars)
- return ''.join(pass_chars[0:10])
- return generate_random_pass()
class share_create(osv.osv_memory):
- _name = 'share.create'
- _description = 'Create share'
-
- def _access(self, cr, uid, ids, field_name, arg, context=None):
- if context is None:
- context = {}
- res = {}
- action_id = context.get('action_id', False)
- access_obj = self.pool.get('ir.model.access')
- action_obj = self.pool.get('ir.actions.act_window')
- model_obj = self.pool.get('ir.model')
- user_obj = self.pool.get('res.users')
- current_user = user_obj.browse(cr, uid, uid)
- access_ids = []
- if action_id:
- action = action_obj.browse(cr, uid, action_id, context=context)
- active_model_ids = model_obj.search(cr, uid, [('model','=',action.res_model)])
- active_model_id = active_model_ids and active_model_ids[0] or False
- access_ids = access_obj.search(cr, uid, [
- ('group_id','in',map(lambda x:x.id, current_user.groups_id)),
- ('model_id','',active_model_id)])
- for rec_id in ids:
- write_access = False
- read_access = False
- for access in access_obj.browse(cr, uid, access_ids, context=context):
- if access.perm_write:
- write_access = True
- if access.perm_read:
- read_access = True
- res[rec_id]['write_access'] = write_access
- res[rec_id]['read_access'] = read_access
- return res
+ __logger = logging.getLogger('share.wizard')
+ _name = 'share.wizard'
+ _description = 'Share Wizard'
_columns = {
- 'action_id': fields.many2one('ir.actions.act_window', 'Action', required=True),
- 'domain': fields.char('Domain', size=64),
- 'user_type': fields.selection( [ ('existing','Existing'),('new','New')],'User Type'),
- 'user_ids': fields.many2many('res.users', 'share_user_rel', 'share_id','user_id', 'Share Users'),
- 'new_user': fields.text("New user"),
- 'access_mode': fields.selection([('readwrite','READ & WRITE'),('readonly','READ ONLY')],'Access Mode'),
- 'write_access': fields.function(_access, method=True, string='Write Access',type='boolean', multi='write_access'),
- 'read_access': fields.function(_access, method=True, string='Write Access',type='boolean', multi='read_access'),
+ 'action_id': fields.many2one('ir.actions.act_window', 'Action to share', required=True,
+ help="The action that opens the screen containing the data you wish to share."),
+ 'domain': fields.char('Domain', size=256, help="Optional domain for further data filtering"),
+ 'user_type': fields.selection([('existing','Existing external users'),('new','New users (emails required)')],'Users to share with',
+ help="Select the type of user(s) you would like to share data with."),
+ 'user_ids': fields.one2many('share.wizard.user', 'share_wizard_id', 'Users'),
+ 'new_users': fields.text("New users"),
+ 'access_mode': fields.selection([('readwrite','Read & Write'),('readonly','Read-only')],'Access Mode'),
+ 'result_line_ids': fields.one2many('share.wizard.result.line', 'share_wizard_id', 'Summary'),
+ 'share_root_url': fields.char('Generic Share Access URL', size=512, tooltip='Main access page for users that are granted shared access')
}
_defaults = {
- 'user_type' : 'existing',
- 'domain': '[]',
+ 'user_type' : lambda self, cr, uid, *a: 'existing' if self.pool.get('res.users').search(cr, uid, [('share', '=', True)]) else 'new',
+ 'domain': lambda self, cr, uid, context, *a: context.get('domain', '[]'),
+ 'share_root_url': lambda self, cr, uid, context, *a: context.get('share_root_url',
+ _('Please specify "share_root_url" in server configuration or in context')),
+ 'action_id': lambda self, cr, uid, context, *a: context.get('action_id'),
'access_mode': 'readonly'
-
}
- def default_get(self, cr, uid, fields, context=None):
- """
- To get default values for the object.
- """
-
- res = super(share_create, self).default_get(cr, uid, fields, context=context)
- if not context:
- context={}
- action_id = context.get('action_id', False)
- domain = context.get('domain', '[]')
-
-
- if 'action_id' in fields:
- res['action_id'] = action_id
- if 'domain' in fields:
- res['domain'] = domain
- return res
-
- def do_step_1(self, cr, uid, ids, context=None):
- """
- This action to excute step 1
-
- """
- if not context:
- context = {}
-
- data_obj = self.pool.get('ir.model.data')
-
- step1_form_view = data_obj._get_id(cr, uid, 'share', 'share_step1_form')
-
- if step1_form_view:
- step1_form_view_id = data_obj.browse(cr, uid, step1_form_view, context=context).res_id
-
- step1_id = False
- for this in self.browse(cr, uid, ids, context=context):
- vals ={
- 'domain': this.domain,
- 'action_id': this.action_id and this.action_id.id or False,
- }
- step1_id = this.id
-
- context.update(vals)
- value = {
- 'name': _('Step:2 Sharing Wizard'),
+ def go_step_1(self, cr, uid, ids, context=None):
+ dummy, step1_form_view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'share', 'share_step1_form')
+ return {
+ 'name': _('Sharing Wizard - Step 1'),
'view_type': 'form',
'view_mode': 'form',
- 'res_model': 'share.create',
+ 'res_model': 'share.wizard',
'view_id': False,
- 'res_id': step1_id,
+ 'res_id': ids[0],
'views': [(step1_form_view_id, 'form'), (False, 'tree'), (False, 'calendar'), (False, 'graph')],
'type': 'ir.actions.act_window',
- 'context': context,
- 'target': 'new'
- }
- return value
-
-
- def do_step_2(self, cr, uid, ids, context=None):
- """
- This action to excute step 2
-
- """
- if not context:
- context = {}
-
- data_obj = self.pool.get('ir.model.data')
-
- step2_form_view = data_obj._get_id(cr, uid, 'share', 'share_step2_form')
-
- if step2_form_view:
- step2_form_view_id = data_obj.browse(cr, uid, step2_form_view, context=context).res_id
-
- step1_id = False
- for this in self.browse(cr, uid, ids, context=context):
- vals = {
- 'user_type': this.user_type,
- 'existing_user_ids': map(lambda x:x.id, this.user_ids),
- 'new_user': this.new_user,
- }
-
- context.update(vals)
- value = {
- 'name': _('Step:3 Sharing Wizard'),
- 'view_type': 'form',
- 'view_mode': 'form',
- 'res_model': 'share.create',
- 'view_id': False,
- 'views': [(step2_form_view_id, 'form'), (False, 'tree'), (False, 'calendar'), (False, 'graph')],
- 'type': 'ir.actions.act_window',
- 'context': context,
'target': 'new'
}
- return value
-
-
- def do_step_3(self, cr, uid, ids, context=None):
- """
- This action to excute step 3
-
- """
- if not context:
- context = {}
-
- for this in self.browse(cr, uid, ids, context=context):
- vals = {
- 'access_mode': this.access_mode,
- }
-
- context.update(vals)
+ def _create_share_group(self, cr, uid, wizard_data, context=None):
group_obj = self.pool.get('res.groups')
- user_obj = self.pool.get('res.users')
- fields_obj = self.pool.get('ir.model.fields')
- model_access_obj = self.pool.get('ir.model.access')
- model_obj = self.pool.get('ir.model')
- rule_obj = self.pool.get('ir.rule')
- action_obj = self.pool.get('ir.actions.act_window')
-
- new_users = context.get('new_user', False)
- action_id = context.get('action_id', False)
- user_type = context.get('user_type', False)
- access_mode = context.get('access_mode', False)
- action = action_obj.browse(cr, uid, action_id, context=context)
- active_model = action.res_model
-
- active_id = False #TODO: Pass record id of res_model of action
- existing_user_ids = context.get('existing_user_ids', False)
- domain = eval(context.get('domain', '[]'))
-
- # Create Share Group
- share_group_name = '%s: %s' %('Sharing', active_model)
- group_ids = group_obj.search(cr, uid, [('name','=',share_group_name)])
- group_id = group_ids and group_ids[0] or False
- if not group_id:
- group_id = group_obj.create(cr, uid, {'name': share_group_name, 'share': True})
- else:
- group = group_obj.browse(cr, uid, group_id, context=context)
- if not group.share:
- raise osv.except_osv(_('Error'), _("Share Group is exits without sharing !"))
-
- # Create new user
+ share_group_name = '%s: %s (%d-%s)' %('Sharing', wizard_data.action_id.res_model, uid, time.time())
+ # create share group without putting admin in it
+ return group_obj.create(cr, 1, {'name': share_group_name, 'share': True}, {'noadmin': True})
+ def _create_new_share_users(self, cr, uid, wizard_data, group_id, context=None):
+ user_obj = self.pool.get('res.users')
current_user = user_obj.browse(cr, uid, uid)
user_ids = []
- if user_type == 'new' and new_users:
- for new_user in new_users.split('\n'):
- password = _generate_random_number()
- user_id = user_obj.create(cr, uid, {
+ if wizard_data.user_type == 'new':
+ for new_user in wizard_data.new_users.split('\n'):
+ # attempt to show more user-friendly msg than default constraint error
+ existing = user_obj.search(cr, 1, [('login', '=', new_user)])
+ if existing:
+ raise osv.except_osv(_('User already exists'),
+ _('This username (%s) already exists, perhaps data has already been shared with this person.\nYou may want to try selecting existing shared users instead.'))
+ user_id = user_obj.create(cr, 1, {
'login': new_user,
- 'password': password,
+ 'password': generate_random_pass(),
'name': new_user,
'user_email': new_user,
'groups_id': [(6,0,[group_id])],
- 'action_id': action_id,
'share': True,
'company_id': current_user.company_id and current_user.company_id.id
})
user_ids.append(user_id)
- context['new_user_ids'] = user_ids
-
- # Modify existing user
- if user_type == 'existing':
- user_obj.write(cr, uid, existing_user_ids , {
- 'groups_id': [(4,group_id)],
- 'action_id': action_id
- })
-
-
- #ACCESS RIGHTS / IR.RULES COMPUTATION
-
- active_model_ids = model_obj.search(cr, uid, [('model','=',active_model)])
- active_model_id = active_model_ids and active_model_ids[0] or False
-
- def _get_relation(model_id, ttypes, new_obj=[]):
- obj = []
- models = map(lambda x:x[1].model, new_obj)
- field_ids = fields_obj.search(cr, uid, [('model_id','=',model_id),('ttype','in', ttypes)])
- for field in fields_obj.browse(cr, uid, field_ids, context=context):
- if field.relation not in models:
- relation_model_ids = model_obj.search(cr, uid, [('model','=',field.relation)])
- relation_model_id = relation_model_ids and relation_model_ids[0] or False
- relation_model = model_obj.browse(cr, uid, relation_model_id, context=context)
- obj.append((field.relation_field, relation_model))
-
- if relation_model_id != model_id and field.ttype in ['one2many', 'many2many']:
- obj += _get_relation(relation_model_id, [field.ttype], obj)
-
- return obj
-
- active_model = model_obj.browse(cr, uid, active_model_id, context=context)
- obj0 = [(None, active_model)]
- obj1 = _get_relation(active_model_id, ['one2many'])
- obj2 = _get_relation(active_model_id, ['one2many', 'many2many'])
- obj3 = _get_relation(active_model_id, ['many2one'])
- for rel_field, model in obj1:
- obj3 += _get_relation(model.id, ['many2one'])
+ return user_ids
+ def _setup_action_and_shortcut(self, cr, uid, wizard_data, user_ids, new_users, context=None):
+ menu_obj = self.pool.get('ir.ui.menu')
+ user_obj = self.pool.get('res.users')
+ menu_action_id = user_obj._get_menu(cr, uid, context=context)
+ values = {
+ 'name': (_('%s (Shared)') % wizard_data.action_id.name)[:64],
+ 'domain': wizard_data.domain,
+ 'context': wizard_data.action_id.context,
+ 'res_model': wizard_data.action_id.res_model,
+ 'view_mode': wizard_data.action_id.view_mode,
+ 'view_type': wizard_data.action_id.view_type,
+ 'search_view_id': wizard_data.action_id.search_view_id.id,
+ }
+ for user_id in user_ids:
+ action_id = menu_obj.create_shortcut(cr, user_id, values)
+ if new_users:
+ user_obj.write(cr, 1, [user_id], {'action_id': action_id})
+ else:
+ user_obj.write(cr, 1, [user_id], {'action_id': menu_action_id})
+
+ def _get_recursive_relations(self, cr, uid, model, ttypes, relation_fields=None, suffix=None, context=None):
+ """Returns list of tuples representing recursive relationships of type ``ttypes`` starting from
+ model with ID ``model_id``.
+
+ @param model: browsable model to start loading relationships from
+ @param ttypes: list of relationship types to follow (e.g: ['one2many','many2many'])
+ @param relation_fields: list of previously followed relationship tuples - to avoid duplicates
+ during recursion
+ @param suffix: optional suffix to append to the field path to reach the main object
+ """
+ if relation_fields is None:
+ relation_fields = []
+ local_rel_fields = []
+ models = [x[1].model for x in relation_fields]
+ model_obj = self.pool.get('ir.model')
+ model_osv = self.pool.get(model.model)
+ for field in model_osv._columns.values() + [x[2] for x in model_osv._inherit_fields]:
+ if field._type in ttypes and field._obj not in models:
+ relation_model_id = model_obj.search(cr, uid, [('model','=',field._obj)])[0]
+ if field._type == 'one2many':
+ relation_field = '%s.%s'%(field._fields_id, suffix) if suffix else field._fields_id
+ else:
+ relation_field = None # TODO: add some filtering for m2m and m2o - not always possible...
+ model_browse = model_obj.browse(cr, uid, relation_model_id, context=context)
+ local_rel_fields.append((relation_field, model_browse))
+ if relation_model_id != model.id and field._type in ['one2many', 'many2many']:
+ local_rel_fields += self._get_recursive_relations(cr, uid, model_browse,
+ [field._type], local_rel_fields, suffix=relation_field, context=context)
+ return local_rel_fields
+
+ def _get_relationship_classes(self, cr, uid, model, context=None):
+ obj0 = [(None, model)]
+ obj1 = self._get_recursive_relations(cr, uid, model, ['one2many'], context=context)
+ obj2 = self._get_recursive_relations(cr, uid, model, ['one2many', 'many2many'],
+ context=context)
+ obj3 = self._get_recursive_relations(cr, uid, model, ['many2one'], context=context)
+ for dummy, model in obj1:
+ obj3 += self._get_recursive_relations(cr, uid, model, ['many2one'], context=context)
+ return obj0, obj1, obj2, obj3
+
+ def _get_access_map_for_groups_and_models(self, cr, uid, group_ids, model_ids, context=None):
+ model_access_obj = self.pool.get('ir.model.access')
+ user_right_ids = model_access_obj.search(cr, uid,
+ [('group_id', 'in', group_ids), ('model_id', 'in', model_ids)],
+ context=context)
+ user_access_matrix = {}
+ if user_right_ids:
+ for access_right in model_access_obj.browse(cr, uid, user_right_ids, context=context):
+ access_line = user_access_matrix.setdefault(access_right.model_id.model, set())
+ for perm in FULL_ACCESS:
+ if getattr(access_right, perm, 0):
+ access_line.add(perm)
+ return user_access_matrix
+
+ def _add_access_rights_for_share_group(self, cr, uid, group_id, mode,
+ fields_relations, context=None):
+ """Adds access rights to group_id on object models referenced in ``fields_relations``,
+ intersecting with access rights of current user to avoid granting too much rights
+ """
+ model_access_obj = self.pool.get('ir.model.access')
+ user_obj = self.pool.get('res.users')
+ target_model_ids = [x[1].id for x in fields_relations]
+ perms_to_add = (mode == 'readonly') and READ_ONLY_ACCESS or FULL_ACCESS
current_user = user_obj.browse(cr, uid, uid, context=context)
- if access_mode == 'readonly':
- res = []
- # intersect with read access rights of user running the
- # wizard, to avoid adding more access than current
- for group in current_user.groups_id:
- for access_control in group.model_access:
- if access_control.model_id.id in res:
- continue
- if access_control.perm_read:
- res.append(access_control.model_id.id)
- model_access_obj.create(cr, uid, {
- 'name': 'Read Access of group %s on %s model'%(share_group_name, access_control.model_id.name),
- 'model_id' : access_control.model_id.id,
- 'group_id' : group_id,
- 'perm_read' : True
- })
- res = []
- for rel_field, model in obj0+obj1+obj2+obj3:
- if model.id in res:
- continue
- res.append(model.id)
- model_access_obj.create(cr, uid, {
- 'name': 'Read Access of group %s on %s model'%(share_group_name, model.name),
- 'model_id' : model.id,
- 'group_id' : group_id,
- 'perm_read' : True
- })
- if access_mode == 'readwrite':
- res = []
- for rel_field, model in obj0+obj1:
- if model.id in res:
- continue
- res.append(model.id)
- model_access_obj.create(cr, uid, {
- 'name': 'Write Access of group %s on %s model'%(share_group_name, model.name),
- 'model_id' : model.id,
- 'group_id' : group_id,
- 'perm_read' : True,
- 'perm_write' : True,
- 'perm_unlink' : True,
- 'perm_create' : True,
- })
- # intersect with access rights of user
- # running the wizard, to avoid adding more access than current
-
- for group in current_user.groups_id:
- for access_control in group.model_access:
- if access_control.model_id.id in res:
- continue
- if access_control.perm_read:
- res.append(access_control.model_id.id)
- model_access_obj.create(cr, uid, {
- 'name': 'Read Access of group %s on %s model'%(share_group_name, access_control.model_id.name),
- 'model_id' : access_control.model_id.id,
- 'group_id' : group_id,
- 'perm_read' : True
- })
- for rel_field, model in obj2+obj3:
- if model.id in res:
- continue
- res.append(model.id)
- model_access_obj.create(cr, uid, {
- 'name': 'Read Access of group %s on %s model'%(share_group_name, model.name),
- 'model_id' : model.id,
- 'group_id' : group_id,
- 'perm_read' : True
- })
- #
- # And on OBJ0, OBJ1, OBJ2, OBJ3: add all rules from groups of the user
- # that is sharing in the many2many of the rules on the new group
- # (rule must be copied instead of adding it if it contains a reference to uid
- # or user.xxx so it can be replaced correctly)
+ current_user_access_map = self._get_access_map_for_groups_and_models(cr, uid,
+ [x.id for x in current_user.groups_id], target_model_ids, context=context)
+ group_access_map = self._get_access_map_for_groups_and_models(cr, uid,
+ [group_id], target_model_ids, context=context)
+ self.__logger.debug("Current user access matrix: %r", current_user_access_map)
+ self.__logger.debug("New group current access matrix: %r", group_access_map)
+
+ # Create required rights if allowed by current user rights and not
+ # already granted
+ for dummy, model in fields_relations:
+ values = {
+ 'name': _('Copied access for sharing'),
+ 'group_id': group_id,
+ 'model_id': model.id,
+ }
+ current_user_access_line = current_user_access_map.get(model.model,set())
+ existing_group_access_line = group_access_map.get(model.model,set())
+ need_creation = False
+ for perm in perms_to_add:
+ if perm in current_user_access_line \
+ and perm not in existing_group_access_line:
+ values.update({perm:True})
+ group_access_map.setdefault(model.model, set()).add(perm)
+ need_creation = True
+ if need_creation:
+ model_access_obj.create(cr, 1, values)
+ self.__logger.debug("Creating access right for model %s with values: %r", model.model, values)
+
+ def _link_or_copy_current_user_rules(self, cr, uid, group_id, fields_relations, context=None):
+ user_obj = self.pool.get('res.users')
+ rule_obj = self.pool.get('ir.rule')
+ current_user = user_obj.browse(cr, uid, uid, context=context)
+ completed_models = set()
for group in current_user.groups_id:
- res = []
- for rel_field, model in obj0+obj1+obj2+obj3:
- if model.id in res:
+ for dummy, model in fields_relations:
+ if model.id in completed_models:
continue
- res.append(model.id)
+ completed_models.add(model.id)
for rule in group.rule_groups:
if rule.model_id == model.id:
- rule_obj.copy(cr, uid, rule.id, default={
- 'name': '%s-%s'%(share_group_name, model.model),
- 'groups': [(6,0,[group_id])]
- }, context=context)
-
- rule_obj.create(cr, uid, {
- 'name': '%s-%s'%(share_group_name, active_model.model),
- 'model_id': active_model.id,
- 'domain_force': domain,
- 'groups': [(6,0,[group_id])]
- })
- for rel_field, model in obj1:
- obj1_domain = []
- for opr1, opt, opr2 in domain:
- new_opr1 = '%s.%s'%(rel_field, opr1)
- obj1_domain.append((new_opr1, opt, opr2))
-
- rule_obj.create(cr, uid, {
- 'name': '%s-%s'%(share_group_name, model.model),
- 'model_id': model.id,
- 'domain_force': obj1_domain,
- 'groups': [(6,0,[group_id])]
- })
- context['share_model'] = active_model.model
- context['share_rec_id'] = active_id
-
-
- data_obj = self.pool.get('ir.model.data')
-
- form_view = data_obj._get_id(cr, uid, 'share', 'share_result_form')
- form_view_id = False
- if form_view:
- form_view_id = data_obj.browse(cr, uid, form_view, context=context).res_id
+ if 'user.' in rule.domain_force:
+ # Above pattern means there is likely a condition
+ # specific to current user, so we must copy the rule using
+ # the evaluated version of the domain.
+ # And it's better to copy one time too much than too few
+ rule_obj.copy(cr, 1, rule.id, default={
+ 'name': '%s (%s)' %(rule.name, _('(Copy for sharing)')),
+ 'groups': [(6,0,[group_id])],
+ 'domain_force': rule.domain, # evaluated version!
+ })
+ self.__logger.debug("Copying rule %s (%s) on model %s with domain: %s", rule.name, rule.id, model.model, rule.domain_force)
+ else:
+ # otherwise we can simply link the rule to keep it dynamic
+ rule_obj.write(cr, 1, [rule.id], {
+ 'groups': [(4,group_id)]
+ })
+ self.__logger.debug("Linking rule %s (%s) on model %s with domain: %s", rule.name, rule.id, model.model, rule.domain_force)
+
+ def _create_indirect_sharing_rules(self, cr, uid, wizard_data, group_id, fields_relations, context=None):
+ user_obj = self.pool.get('res.users')
+ current_user = user_obj.browse(cr, uid, uid, context=context)
+ rule_obj = self.pool.get('ir.rule')
+ try:
+ domain = safe_eval(wizard_data.domain)
+ if domain:
+ domain_expr = expression(domain)
+ for rel_field, model in fields_relations:
+ related_domain = []
+ for element in domain:
+ if domain_expr._is_leaf(element):
+ left, operator, right = element
+ left = '%s.%s'%(rel_field, left)
+ element = left, operator, right
+ related_domain.append(element)
+ rule_obj.create(cr, 1, {
+ 'name': _('Indirect sharing filter created by user %s (%s) for group %s') % \
+ (current_user.name, current_user.login, group_id),
+ 'model_id': model.id,
+ 'domain_force': str(related_domain),
+ 'groups': [(4,group_id)]
+ })
+ self.__logger.debug("Created indirect rule on model %s with domain: %s", model.model, repr(related_domain))
+ except Exception:
+ self.__logger.exception('Failed to create share access')
+ raise osv.except_osv(_('Sharing access could not be setup'),
+ _('Sorry, the current screen and filter you are trying to share are not supported at the moment.\nYou may want to try a simpler filter.'))
+
+ def _create_result_lines(self, cr, uid, wizard_data, context=None):
+ user_obj = self.pool.get('res.users')
+ result_obj = self.pool.get('share.wizard.result.line')
+ share_root_url = wizard_data.share_root_url
+ format_url = '%(login)' in share_root_url and '%(password)' in share_root_url
+ existing_passwd_str = _('*usual password*')
+ if wizard_data.user_type == 'new':
+ for email in wizard_data.new_users.split('\n'):
+ user_id = user_obj.search(cr, 1, [('login', '=', email)], context=context)
+ password = user_obj.read(cr, 1, user_id[0], ['password'])['password']
+ share_url = share_root_url % \
+ {'login': email,
+ 'password': password} if format_url else share_root_url
+ result_obj.create(cr, uid, {
+ 'share_wizard_id': wizard_data.id,
+ 'login': email,
+ 'password': password,
+ 'share_url': share_url,
+ }, context=context)
+ else:
+ # existing users
+ for user in wizard_data.user_ids:
+ share_url = share_root_url % \
+ {'login': email,
+ 'password': ''} if format_url else share_root_url
+ result_obj.create(cr, uid, {
+ 'share_wizard_id': wizard_data.id,
+ 'login': user.user_id.login,
+ 'password': existing_passwd_str,
+ 'share_url': share_url,
+ 'newly_created': False,
+ }, context=context)
+
+ def go_step_2(self, cr, uid, ids, context=None):
+ wizard_data = self.browse(cr, uid, ids and ids[0], context=context)
+ assert wizard_data.action_id and wizard_data.access_mode and \
+ ((wizard_data.user_type == 'new' and wizard_data.new_users) or \
+ (wizard_data.user_type == 'existing' and wizard_data.user_ids))
+
+ # Create shared group and users
+ group_id = self._create_share_group(cr, uid, wizard_data, context=context)
+ user_obj = self.pool.get('res.users')
+ current_user = user_obj.browse(cr, uid, uid, context=context)
+ if wizard_data.user_type == 'new':
+ user_ids = self._create_new_share_users(cr, uid, wizard_data, group_id, context=context)
+ else:
+ user_ids = [x.user_id.id for x in wizard_data.user_ids]
+ # reset home action to regular menu as user needs access to multiple items
+ user_obj.write(cr, 1, user_ids, {
+ 'groups_id': [(4,group_id)],
+ })
+ self._setup_action_and_shortcut(cr, uid, wizard_data, user_ids,
+ (wizard_data.user_type == 'new'), context=context)
- value = {
- 'name': _('Step:4 Share Users Detail'),
+ model_obj = self.pool.get('ir.model')
+ model_id = model_obj.search(cr, uid, [('model','=', wizard_data.action_id.res_model)])[0]
+ model = model_obj.browse(cr, uid, model_id, context=context)
+
+ # ACCESS RIGHTS
+ # We have several classes of objects that should receive different access rights:
+ # Let:
+ # - [obj0] be the target model itself
+ # - [obj1] be the target model and all other models recursively accessible from
+ # obj0 via one2many relationships
+ # - [obj2] be the target model and all other models recursively accessible from
+ # obj0 via one2many and many2many relationships
+ # - [obj3] be all models recursively accessible from obj1 via many2one relationships
+ obj0, obj1, obj2, obj3 = self._get_relationship_classes(cr, uid, model, context=context)
+ mode = wizard_data.access_mode
+
+ # Add access to [obj0] and [obj1] according to chosen mode
+ self._add_access_rights_for_share_group(cr, uid, group_id, mode, obj0, context=context)
+ self._add_access_rights_for_share_group(cr, uid, group_id, mode, obj1, context=context)
+
+ # Add read-only access (always) to [obj2] and [obj3]
+ self._add_access_rights_for_share_group(cr, uid, group_id, 'readonly', obj2, context=context)
+ self._add_access_rights_for_share_group(cr, uid, group_id, 'readonly', obj3, context=context)
+
+
+ # IR.RULES
+ # A. On [obj0]: 1 rule with domain of shared action
+ # B. For each model in [obj1]: 1 rule in the form:
+ # many2one_rel.domain_of_obj0
+ # where many2one_rel is the many2one used in the definition of the
+ # one2many, and domain_of_obj0 is the sharing domain
+ # For example if [obj0] is project.project with a domain of
+ # ['id', 'in', [1,2]]
+ # then we will have project.task in [obj1] and we need to create this
+ # ir.rule on project.task:
+ # ['project_id.id', 'in', [1,2]]
+ # C. And on [obj0], [obj1], [obj2], [obj3]: add all rules from all groups of
+ # the user that is sharing
+ # (Warning: rules must be copied instead of linked if they contain a reference
+ # to uid, and it must be replaced correctly)
+ rule_obj = self.pool.get('ir.rule')
+ # A.
+ rule_obj.create(cr, 1, {
+ 'name': _('Sharing filter created by user %s (%s) for group %s') % \
+ (current_user.name, current_user.login, group_id),
+ 'model_id': model.id,
+ 'domain_force': wizard_data.domain,
+ 'groups': [(4,group_id)]
+ })
+ # B.
+ self._create_indirect_sharing_rules(cr, uid, wizard_data, group_id, obj1, context=context)
+ # C.
+ all_relations = obj0 + obj1 + obj2 + obj3
+ self._link_or_copy_current_user_rules(cr, uid, group_id, all_relations, context=context)
+
+ # so far, so good -> populate summary results and return them
+ self._create_result_lines(cr, uid, wizard_data, context=context)
+
+ dummy, step2_form_view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'share', 'share_step2_form')
+ return {
+ 'name': _('Sharing Wizard - Step 2'),
'view_type': 'form',
'view_mode': 'form',
- 'res_model': 'share.result',
+ 'res_model': 'share.wizard',
'view_id': False,
- 'views': [(form_view_id, 'form'), (False, 'tree'), (False, 'calendar'), (False, 'graph')],
+ 'res_id': ids[0],
+ 'views': [(step2_form_view_id, 'form'), (False, 'tree'), (False, 'calendar'), (False, 'graph')],
'type': 'ir.actions.act_window',
- 'context': context,
'target': 'new'
}
- return value
-share_create()
+ def send_emails(self, cr, uid, ids, context=None):
+ user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+ if not user.user_email:
+ raise osv.except_osv(_('Email required'), _('The current user must have an email address configured in User Preferences to be able to send outgoing emails.'))
+ for wizard_data in self.browse(cr, uid, ids, context=context):
+ for result_line in wizard_data.result_line_ids:
+ email_to = result_line.login
+ subject = _('%s has shared OpenERP %s information with you') % (user.name, wizard_data.action_id.name)
+ body = _("Dear,\n\n") + subject + "\n\n"
+ body += _("To access it, you can go to the following URL:\n %s") % wizard_data.share_root_url
+ body += "\n\n"
+ if result_line.newly_created:
+ body += _("You may use the following login and password to get access to this protected area:") + "\n"
+ body += "%s: %s" % (_("Username"), result_line.login) + "\n"
+ body += "%s: %s" % (_("Password"), result_line.password) + "\n"
+ else:
+ body += _("This additional data has been automatically added to your current access.\n")
+ body += _("You may use your existing login and password to view it. As a reminder, your login is %s.\n") % result_line.login
+
+ if not tools.email_send(
+ user.user_email,
+ email_to,
+ subject,
+ body):
+ self.__logger.warning('Failed to send sharing email from %s to %s', user.user_email, email_to)
+ return {'type': 'ir.actions.act_window_close'}
+share_create()
-class share_result(osv.osv_memory):
- _name = "share.result"
+class share_user_ref(osv.osv_memory):
+ _name = 'share.wizard.user'
+ _rec_name = 'user_id'
_columns = {
- 'users': fields.text("Users", readonly=True),
- }
-
-
-
- def do_send_email(self, cr, uid, ids, context=None):
- user_obj = self.pool.get('res.users')
- if not context:
- context={}
- existing_user_ids = context.get('existing_user_ids', [])
- new_user_ids = context.get('new_user_ids', [])
- share_url = tools.config.get('share_root_url', False)
- user = user_obj.browse(cr, uid, uid, context=context)
- for share_user in user_obj.browse(cr, uid, new_user_ids+existing_user_ids, context=context):
- email_to = share_user.user_email
- subject = '%s wants to share private data with you' %(user.name)
- body = """
- Dear,
-
- %s wants to share private data from OpenERP with you!
- """%(user.name)
- if share_url:
- body += """
- To view it, you can access the following URL:
- %s
- """%(user.name, share_url)
- if share_user.id in new_user_ids:
- body += """
- You may use the following login and password to get access to this
- protected area:
- login: %s
- password: %s
- """%(user.login, user.password)
- elif share_user.id in existing_user_ids:
- body += """
- You may use your existing login and password to get access to this
- additional data. As a reminder, your login is %s.
- """%(user.name)
-
- flag = tools.email_send(
- user.user_email,
- email_to,
- subject,
- body
- )
- return flag
-
-
- def default_get(self, cr, uid, fields, context=None):
- """
- To get default values for the object.
- """
+ 'user_id': fields.many2one('res.users', 'Users', required=True, domain=[('share', '=', True)]),
+ 'share_wizard_id': fields.many2one('share.wizard', 'Share Wizard', required=True),
+ }
+share_user_ref()
- res = super(share_result, self).default_get(cr, uid, fields, context=context)
- user_obj = self.pool.get('res.users')
- if not context:
- context={}
- existing_user_ids = context.get('existing_user_ids', [])
- new_user_ids = context.get('new_user_ids', [])
- share_url = tools.config.get('share_root_url', False)
- if 'users' in fields:
- users = []
- for user in user_obj.browse(cr, uid, new_user_ids):
- txt = 'Login: %s Password: %s' %(user.login, user.password)
- if share_url:
- txt += ' Share URL: %s' %(share_url)
- users.append(txt)
- for user in user_obj.browse(cr, uid, existing_user_ids):
- txt = 'Login: %s' %(user.login)
- if share_url:
- txt += ' Share URL: %s' %(share_url)
- users.append(txt)
- res['users'] = '\n'.join(users)
- return res
-
-share_result()
+class share_result_line(osv.osv_memory):
+ _name = 'share.wizard.result.line'
+ _rec_name = 'login'
+ _columns = {
+ 'login': fields.char('Username', size=64, required=True, readonly=True),
+ 'password': fields.char('Password', size=64, readonly=True),
+ 'share_url': fields.char('Share URL', size=512, required=True),
+ 'share_wizard_id': fields.many2one('share.wizard', 'Share Wizard', required=True),
+ 'newly_created': fields.boolean('Newly created', readonly=True),
+ }
+ _defaults = {
+ 'newly_created': True,
+ }
+share_result_line()
diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index 159583eecbb853afe5c4cf456a46bbd45116f82e..e6cade91c841e8bb6999df45c9ae0377f58e1a6e 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -1,106 +1,125 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
- <data>
+ <data>
- <record id="share_step0_form" model="ir.ui.view">
+ <record id="share_step0_form" model="ir.ui.view">
<field name="name">share.step0.form</field>
- <field name="model">share.create</field>
+ <field name="model">share.wizard</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Share">
- <separator colspan="4" string="Step 1: Chose the action and the additional domain"/>
- <field name="action_id"/>
- <field name="domain"/>
- <separator colspan="4"/>
- <group col="2" colspan="4">
- <button special="cancel" string="Cancel" icon='gtk-cancel'/>
- <button name="do_step_1" string="Next" colspan="1" type="object" icon="gtk-go-forward"/>
- </group>
- </form>
+ <form string="Share wizard: step 0">
+ <separator colspan="4"
+ string="Please select the action that opens the screen containing the data you want to share."/>
+ <field name="action_id" colspan="4"/>
+ <separator colspan="4"
+ string="Optionally, you may specify an additional domain restriction that will be applied to the shared data."/>
+ <field name="domain"/>
+ <separator colspan="4"/>
+ <group colspan="4">
+ <button special="cancel" string="Cancel" icon='gtk-cancel'/>
+ <button name="go_step_1" string="Next" colspan="1" type="object" icon="gtk-go-forward"/>
+ </group>
+ </form>
</field>
</record>
<record id="share_step1_form" model="ir.ui.view">
<field name="name">share.step1.form</field>
- <field name="model">share.create</field>
+ <field name="model">share.wizard</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Share">
- <separator colspan="4" string="Step 2: Chose the User type"/>
- <field name="user_type"/>
- <newline/>
- <group colspan="4" attrs="{'invisible':[('user_type','!=','existing')]}">
- <separator colspan="4" string="Exising Users"/>
- <field colspan="4" nolabel="1" name="user_ids" domain="[('share_user','=',True)]"/>
- </group>
- <group colspan="4" attrs="{'invisible':[('user_type','!=','new')]}">
- <separator colspan="4" string="New Users"/>
- <field colspan="4" nolabel="1" name="new_user"/>
- </group>
- <separator colspan="4"/>
- <group col="3" colspan="4">
- <button special="cancel" string="Cancel" icon='gtk-cancel'/>
- <button name="do_step_2" string="Next" colspan="1" type="object" icon="gtk-go-forward"/>
- </group>
- </form>
+ <form string="Share wizard: step 1">
+ <separator colspan="4" string="Who would you want to share this data with?"/>
+ <field name="user_type"/>
+ <group colspan="4" attrs="{'invisible':[('user_type','!=','existing')]}">
+ <separator colspan="4" string="Existing External Users"/>
+ <field colspan="4" nolabel="1" name="user_ids" mode="tree">
+ <tree editable="bottom" string="">
+ <field name="user_id"/>
+ </tree>
+ </field>
+ </group>
+ <group colspan="4" attrs="{'invisible':[('user_type','!=','new')]}">
+ <separator colspan="4" string="New Users (please provide one e-mail address per line below)"/>
+ <field colspan="4" nolabel="1" name="new_users"/>
+ </group>
+ <separator colspan="4" string="Select the desired shared access mode:"/>
+ <group colspan="4">
+ <field name="access_mode"/>
+ </group>
+ <separator colspan="4"/>
+ <group colspan="4">
+ <button special="cancel" string="Cancel" icon='gtk-cancel'/>
+ <button name="go_step_2" string="Finish" colspan="1" type="object" icon="gtk-go-forward"/>
+ </group>
+ </form>
</field>
</record>
<record id="share_step2_form" model="ir.ui.view">
<field name="name">share.step2.form</field>
- <field name="model">share.create</field>
+ <field name="model">share.wizard</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Share">
- <separator colspan="4" string="Step 3: Chose Access Mode"/>
- <group colspan="4">
- <field name="access_mode"/>
- </group>
- <separator colspan="4"/>
- <group col="3" colspan="4">
- <button special="cancel" string="Cancel" icon='gtk-cancel'/>
- <button name="do_step_3" string="Next" colspan="1" type="object" icon="gtk-go-forward"/>
- </group>
- </form>
+ <form string="Share wizard: step 2">
+ <separator colspan="4" string="Congratulations, you have successfully setup a new shared access!"/>
+ <label colspan="4" string="Here is a summary of the access points you have just created:"/>
+ <field name="result_line_ids" nolabel="1" colspan="4" mode="tree">
+ <tree string="Summary">
+ <field name="login"/>
+ <field name="password"/>
+ <field name="share_url"/>
+ </tree>
+ <form string="Access info">
+ <field name="login"/>
+ <field name="password"/>
+ <field name="share_url" colspan="4"/>
+ </form>
+ </field>
+ <field colspan="4" name="share_root_url"/>
+ <separator colspan="4"/>
+ <group colspan="4">
+ <button special="cancel" string="Close" icon='gtk-ok'/>
+ <button name="send_emails" string="Send Email Notification(s)" colspan="1" type="object" icon="gtk-go-forward"/>
+ </group>
+ </form>
</field>
</record>
-
-
- <record id="action_share_wizard" model="ir.actions.act_window">
- <field name="name">Share Access Rules</field>
+ <!-- action for manual launch from menuitem. context may contain:
+ - 'action_id' (id of action)
+ - 'domain' (string expression for full domain to apply as sent to server,
+ with dynamic data like 'uid' replaced by actual value (i.e. after eval)!)
+ - 'share_root_url' : URL for direct access to share page (may include %(login) and %(password) placeholders)
+ -->
+ <record id="action_share_wizard" model="ir.actions.act_window">
+ <field name="name">Share Wizard</field>
<field name="type">ir.actions.act_window</field>
- <field name="res_model">share.create</field>
+ <field name="res_model">share.wizard</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
- <field name="view_id" ref="share_step0_form"/>
+ <field name="view_id" ref="share_step0_form"/>
<field name="target">new</field>
- </record>
-
- <menuitem action="action_share_wizard" id="menu_action_share_wizard" parent="base.menu_security"/>
-
-
- <record id="share_result_form" model="ir.ui.view">
- <field name="name">share.result.form</field>
- <field name="model">share.result</field>
- <field name="type">form</field>
- <field name="arch" type="xml">
- <form string="Share">
- <separator colspan="4" string="Step 4: Share Users Detail"/>
- <field name="users" colspan="4" nolabel="1"/>
- <separator colspan="4"/>
- <group col="2" colspan="4">
- <button special="cancel" string="Cancel" icon='gtk-cancel'/>
- <button name="do_send_email" string="Send Email" type="object" icon="gtk-apply"/>
- </group>
- </form>
- </field>
</record>
-
-
+ <!-- action for direct launch from client widget with context providing:
+ - 'action_id' (id of action)
+ - 'domain' (string expression for full domain to apply as sent to server,
+ with dynamic data like 'uid' replaced by actual value (i.e. after eval)!)
+ - 'share_root_url' : URL for direct access to share page (may include %(login) and %(password) placeholders)
+ -->
+ <record id="action_share_wizard_step1" model="ir.actions.act_window">
+ <field name="name">Share Wizard</field>
+ <field name="type">ir.actions.act_window</field>
+ <field name="res_model">share.wizard</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">form</field>
+ <field name="view_id" ref="share_step1_form"/>
+ <field name="target">new</field>
+ </record>
-
+ <!-- temporarily under Low-Level-Actions -->
+ <menuitem action="action_share_wizard" id="menu_action_share_wizard" parent="base.next_id_4" groups="group_share_user" icon="terp-rating-rated"/>
- </data>
+ </data>
</openerp>
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index 79d6c860e65ba70040ae987b066a4cfa958e813b..0b85511050dc10a39a6c93db5f9a78ce291e25b1 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -58,7 +58,6 @@ Thanks to the double entry management, the inventory controlling is powerful and
"wizard/stock_splitinto_view.xml",
"wizard/stock_inventory_line_split_view.xml",
"wizard/stock_change_standard_price_view.xml",
- 'wizard/stock_picking_make_view.xml',
'wizard/stock_return_picking_view.xml',
"stock_workflow.xml",
"stock_incoterms.xml",
diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 84a24f3d0b2bfc89390f0a9607d38171369e4ce7..fd68f0a2eb58101c2a38fc88920dc327b1e0542f 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -5,42 +5,44 @@
<field name="name">Warehouse</field>
</record>
-
- <record id="action_incoming_product_board" model="ir.actions.act_window">
+
+ <record id="action_incoming_product_board" model="ir.actions.act_window">
<field name="name">Incoming Product</field>
<field name="res_model">stock.move</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
- <field name="domain">['|','&',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','in')]</field>
- <field name="view_id" ref="stock.view_move_tree_reception_picking_board"/>
+ <field name="domain">['|','&',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','in')]</field>
+ <field name="view_id" ref="stock.view_move_tree_reception_picking_board"/>
</record>
-
- <record id="action_outgoing_product_board" model="ir.actions.act_window">
+
+ <record id="action_outgoing_product_board" model="ir.actions.act_window">
<field name="name">Outgoing Product</field>
<field name="res_model">stock.move</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
- <field name="domain">['|','&',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','out')]</field>
- <field name="view_id" ref="stock.view_move_tree_reception_picking_board"/>
+ <field name="domain">['|','&',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','out')]</field>
+ <field name="view_id" ref="stock.view_move_tree_reception_picking_board"/>
</record>
-
- <record model="ir.actions.act_window" id="action_stock_incoming_product_delay">
- <field name="res_model">report.stock.move</field>
- <field name="view_type">form</field>
- <field name="view_mode">graph,tree</field>
- <field name="view_id" ref="stock.view_stock_graph_board"></field>
- <field name="context">{'search_default_month-1':1,'search_default_in':1,'group_by':['day'], 'group_by_no_leaf':1}</field>
+
+ <record model="ir.actions.act_window" id="action_stock_incoming_product_delay">
+ <field name="res_model">report.stock.move</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">graph,tree</field>
+ <field name="domain">[('type','=','in')]</field>
+ <field name="view_id" ref="stock.view_stock_graph_board"></field>
+ <field name="context">{'search_default_month-1':1,'search_default_in':1,'group_by':['day'], 'group_by_no_leaf':1}</field>
+ </record>
+ <record model="ir.actions.act_window" id="action_stock_outgoing_product_delay">
+ <field name="res_model">report.stock.move</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">graph,tree</field>
+ <field name="domain">[('type','=','out')]</field>
+ <field name="view_id" ref="stock.view_stock_graph_board"></field>
+ <field name="context">{'search_default_month-1':1,'search_default_out':1,'group_by':['day'], 'group_by_no_leaf':1}</field>
</record>
- <record model="ir.actions.act_window" id="action_stock_outgoing_product_delay">
- <field name="res_model">report.stock.move</field>
- <field name="view_type">form</field>
- <field name="view_mode">graph,tree</field>
- <field name="view_id" ref="stock.view_stock_graph_board"></field>
- <field name="context">{'search_default_month-1':1,'search_default_out':1,'group_by':['day'], 'group_by_no_leaf':1}</field>
- </record>
- <record id="board_warehouse_form" model="ir.ui.view">
+ <record id="board_warehouse_form" model="ir.ui.view">
<field name="name">board.warehouse.form</field>
<field name="model">board.board</field>
<field name="type">form</field>
@@ -48,13 +50,13 @@
<form string="Warehouse board">
<hpaned position="200">
<child1>
- <action colspan="4" name="%(action_incoming_product_board)d" string="Incoming Product" />
- <action colspan="4" name="%(action_outgoing_product_board)d" string="Outgoing Product" />
+ <action colspan="4" name="%(action_incoming_product_board)d" string="Incoming Product" />
+ <action colspan="4" name="%(action_outgoing_product_board)d" string="Outgoing Product" />
</child1>
<child2>
- <action colspan="4" name="%(action_stock_incoming_product_delay)d" string="Incoming Products Delay" width="510"/>
- <action colspan="4" name="%(action_stock_outgoing_product_delay)d" string="Outgoing Products delay" width="510"/>
+ <action colspan="4" name="%(action_stock_incoming_product_delay)d" string="Incoming Products Delay" width="510"/>
+ <action colspan="4" name="%(action_stock_outgoing_product_delay)d" string="Outgoing Products delay" width="510"/>
</child2>
</hpaned>
</form>
@@ -69,9 +71,9 @@
<field name="view_id" ref="board_warehouse_form"/>
</record>
- <menuitem id="menu_dashboard_stock" name="Dashboard" sequence="0" parent="stock.next_id_61"/>
+ <menuitem id="menu_dashboard_stock" name="Dashboard" sequence="0" parent="stock.next_id_61"/>
<menuitem action="open_board_warehouse" icon="terp-graph" groups="group_stock_manager" id="menu_board_warehouse" parent="menu_dashboard_stock" sequence="1"/>
- <menuitem icon="terp-stock" id="stock.menu_stock_root" name="Warehouse" sequence="5" groups="group_stock_manager" action="open_board_warehouse"/>
+ <menuitem icon="terp-stock" id="stock.menu_stock_root" name="Warehouse" sequence="5" groups="group_stock_manager" action="open_board_warehouse"/>
</data>
</openerp>
diff --git a/addons/stock/i18n/mn.po b/addons/stock/i18n/mn.po
index 31f82d2b8aeb206f986e6ea4813678ad4d039b6c..33e60ea3573ab413b91a50475336ea5ff6230f3b 100644
--- a/addons/stock/i18n/mn.po
+++ b/addons/stock/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-14 03:06+0000\n"
-"Last-Translator: sugi <Unknown>\n"
+"PO-Revision-Date: 2010-10-15 08:16+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Mongolian <mn@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-10-14 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock
@@ -40,7 +40,7 @@ msgstr "ДÑд бүтÑÑгдÑхүүн"
#. module: stock
#: selection:stock.location,icon:0
msgid "terp-account"
-msgstr ""
+msgstr "terp-account"
#. module: stock
#: constraint:ir.actions.act_window:0
@@ -51,12 +51,12 @@ msgstr "Моделийн нÑÑ€ алдаатай."
#: model:ir.module.module,shortdesc:stock.module_meta_information
#: model:ir.ui.menu,name:stock.menu_stock_root
msgid "Inventory Management"
-msgstr "Ðөөцийн менежмент"
+msgstr "БүртгÑлийн менежмент"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_SORT_ASCENDING"
-msgstr ""
+msgstr "STOCK_SORT_ASCENDING"
#. module: stock
#: field:stock.production.lot.revision,indice:0
@@ -66,7 +66,7 @@ msgstr "Ð¥Ñналт"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_MEDIA_FORWARD"
-msgstr ""
+msgstr "STOCK_MEDIA_FORWARD"
#. module: stock
#: rml:lot.location:0
@@ -76,7 +76,7 @@ msgstr "Ðийт:"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_ZOOM_100"
-msgstr ""
+msgstr "STOCK_ZOOM_100"
#. module: stock
#: rml:lot.stock.overview:0
@@ -127,12 +127,12 @@ msgstr "БүтÑÑгдÑхүүнүүдийн орлого"
#: field:stock.picking,name:0
#: field:stock.tracking,serial:0
msgid "Reference"
-msgstr "ИшлÑл"
+msgstr "Дугаар"
#. module: stock
#: wizard_field:stock.invoice_onshipping,init,group:0
msgid "Group by partner"
-msgstr "ТүншлÑлийн групп"
+msgstr "Харилцагчийн групп"
#. module: stock
#: field:stock.picking,address_id:0
@@ -160,12 +160,12 @@ msgstr "ҮйлдвÑрлÑлийн цуврал"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_NEW"
-msgstr ""
+msgstr "STOCK_NEW"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_CANCEL"
-msgstr ""
+msgstr "STOCK_CANCEL"
#. module: stock
#: selection:stock.location,usage:0
@@ -175,7 +175,7 @@ msgstr "Дотоод байршил"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_PRINT"
-msgstr ""
+msgstr "STOCK_PRINT"
#. module: stock
#: rml:stock.picking.list:0
@@ -207,12 +207,12 @@ msgstr "Баглаа хийх"
#. module: stock
#: wizard_view:stock.partial_picking,end2:0
msgid "Packing result"
-msgstr ""
+msgstr "Савлагааны үр дүн"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_QUIT"
-msgstr ""
+msgstr "STOCK_QUIT"
#. module: stock
#: field:stock.warehouse,lot_output_id:0
@@ -222,17 +222,17 @@ msgstr "Гаралтын байршил"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_GOTO_TOP"
-msgstr ""
+msgstr "STOCK_GOTO_TOP"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_ABOUT"
-msgstr ""
+msgstr "STOCK_ABOUT"
#. module: stock
#: selection:stock.location,icon:0
msgid "terp-hr"
-msgstr ""
+msgstr "terp-hr"
#. module: stock
#: field:stock.location,usage:0
@@ -242,12 +242,12 @@ msgstr "Төрөл"
#. module: stock
#: selection:stock.location,icon:0
msgid "terp-purchase"
-msgstr ""
+msgstr "terp-purchase"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_DND"
-msgstr ""
+msgstr "STOCK_DND"
#. module: stock
#: rml:stock.picking.list:0
@@ -262,7 +262,7 @@ msgstr "ИлгÑÑÑÑн бүтÑÑгдÑхүүнүүд"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_GOTO_FIRST"
-msgstr ""
+msgstr "STOCK_GOTO_FIRST"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_tree6
@@ -273,7 +273,7 @@ msgstr "Дотооддоо шилжих"
#. module: stock
#: field:stock.move,product_packaging:0
msgid "Packaging"
-msgstr ""
+msgstr "Савлагаа"
#. module: stock
#: rml:stock.picking.list:0
@@ -285,7 +285,7 @@ msgstr "Захиалга(ÐÑ… Ñурвалж)"
#: rml:lot.stock.overview:0
#: rml:lot.stock.overview_all:0
msgid "Grand Total:"
-msgstr ""
+msgstr "Ðийт:"
#. module: stock
#: view:stock.location:0
@@ -301,12 +301,12 @@ msgstr "Харилцагч буцааж төлөх"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_FLOPPY"
-msgstr ""
+msgstr "STOCK_FLOPPY"
#. module: stock
#: view:stock.production.lot.revision:0
msgid "Production Lot Revisions"
-msgstr ""
+msgstr "Барааны Ñерийн Ñ…Ñналт"
#. module: stock
#: view:stock.location:0
@@ -322,7 +322,7 @@ msgstr "ÐÑÑ€"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_UNINDENT"
-msgstr ""
+msgstr "STOCK_UNINDENT"
#. module: stock
#: view:stock.move:0
@@ -350,7 +350,7 @@ msgstr "Харилцагчид"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_UNDERLINE"
-msgstr ""
+msgstr "STOCK_UNDERLINE"
#. module: stock
#: view:stock.picking.move.wizard:0
@@ -366,7 +366,7 @@ msgstr ""
#: code:addons/stock/stock.py:0
#, python-format
msgid "Bad Lot Assignation !"
-msgstr ""
+msgstr "Хүчингүй Ñери олгоÑон байна!"
#. module: stock
#: code:addons/stock/stock.py:0
@@ -383,17 +383,17 @@ msgstr "ÐийлүүлÑлтийг байрлал"
#: model:ir.actions.act_window,name:stock.action_production_lot_form
#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
msgid "Production Lots"
-msgstr ""
+msgstr "Барааны Ñерүүд"
#. module: stock
#: rml:stock.picking.list:0
msgid "Recipient"
-msgstr ""
+msgstr "ХүлÑÑн авагч"
#. module: stock
#: model:ir.actions.wizard,name:stock.track_line
msgid "Track line"
-msgstr ""
+msgstr "ТÑÑвÑрлÑлтийн мөр"
#. module: stock
#: field:stock.location,child_ids:0
@@ -403,17 +403,17 @@ msgstr "Ðгуулагч"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_BOLD"
-msgstr ""
+msgstr "STOCK_BOLD"
#. module: stock
#: selection:stock.location,icon:0
msgid "terp-graph"
-msgstr ""
+msgstr "terp-graph"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_PREFERENCES"
-msgstr ""
+msgstr "STOCK_PREFERENCES"
#. module: stock
#: rml:lot.location:0
@@ -447,7 +447,7 @@ msgstr "Барааны түвшин-1"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_MEDIA_REWIND"
-msgstr ""
+msgstr "STOCK_MEDIA_REWIND"
#. module: stock
#: field:stock.warehouse,lot_input_id:0
@@ -462,7 +462,7 @@ msgstr "Барааны шинж чанар"
#. module: stock
#: wizard_button:stock.partial_picking,init,split:0
msgid "Make Picking"
-msgstr ""
+msgstr "Ðгуулахын баримт хийх"
#. module: stock
#: model:stock.location,name:stock.location_procurement
@@ -508,7 +508,7 @@ msgstr ""
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_CUT"
-msgstr ""
+msgstr "STOCK_CUT"
#. module: stock
#: help:product.template,property_stock_inventory:0
@@ -521,29 +521,31 @@ msgstr ""
#. module: stock
#: help:product.category,property_stock_account_output_categ:0
msgid "This account will be used to value the output stock"
-msgstr ""
+msgstr "ÐÐ½Ñ Ð´Ð°Ð½Ñ Ðгуулахын гаралтыг дүгнÑÑ…Ñд ашиглагдана"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_ZOOM_FIT"
-msgstr ""
+msgstr "STOCK_ZOOM_FIT"
#. module: stock
#: help:product.category,property_stock_journal:0
msgid ""
"This journal will be used for the accounting move generated by stock move"
msgstr ""
+"ÐÐ½Ñ Ð¶ÑƒÑ€Ð½Ð°Ð» нь Ðгуулахын шилжилтÑÑÑ€ боловÑруулагдÑан Ñанхүүгийн шилжилтÑнд "
+"ашиглагдана"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_calendar_delivery
#: model:ir.ui.menu,name:stock.menu_picking_calendar_delivery
msgid "Calendar of Deliveries"
-msgstr ""
+msgstr "ХүргÑлтийн календар"
#. module: stock
#: field:product.product,track_incoming:0
msgid "Track Incomming Lots"
-msgstr ""
+msgstr "ИрÑÑ… Ñ‚ÑÑвÑрлÑлтийн Ñери"
#. module: stock
#: model:ir.actions.act_window,name:stock.act_stock_product_location_open
@@ -553,17 +555,17 @@ msgstr "Барааны байрлал"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_SAVE_AS"
-msgstr ""
+msgstr "STOCK_SAVE_AS"
#. module: stock
#: model:ir.model,name:stock.model_stock_report_prodlots
msgid "Stock report by production lots"
-msgstr ""
+msgstr "Барааны цувралаар хийгдÑÑн агуулахын тайлан"
#. module: stock
#: field:stock.location,stock_virtual:0
msgid "Virtual Stock"
-msgstr ""
+msgstr "Виртуаль агуулах"
#. module: stock
#: selection:stock.location,usage:0
@@ -573,7 +575,7 @@ msgstr "ДÑлгÑц"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_DIALOG_ERROR"
-msgstr ""
+msgstr "STOCK_DIALOG_ERROR"
#. module: stock
#: field:stock.location,parent_left:0
@@ -583,17 +585,17 @@ msgstr ""
#. module: stock
#: field:report.stock.lines.date,create_date:0
msgid "Latest Date of Inventory"
-msgstr ""
+msgstr "БүртгÑлийн Ñүүлийн огноо"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_INDEX"
-msgstr ""
+msgstr "STOCK_INDEX"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_GOTO_BOTTOM"
-msgstr ""
+msgstr "STOCK_GOTO_BOTTOM"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_form
@@ -622,12 +624,12 @@ msgstr "ҮйлдвÑрлÑлийн байрлал"
#. module: stock
#: field:stock.move,tracking_id:0
msgid "Tracking Lot"
-msgstr ""
+msgstr "ТÑÑвÑрлÑлтийн Ñери"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_GO_FORWARD"
-msgstr ""
+msgstr "STOCK_GO_FORWARD"
#. module: stock
#: field:stock.production.lot.revision,author_id:0
@@ -637,22 +639,22 @@ msgstr "Зохиогч"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_UNDELETE"
-msgstr ""
+msgstr "STOCK_UNDELETE"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_EXECUTE"
-msgstr ""
+msgstr "STOCK_EXECUTE"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_DIALOG_QUESTION"
-msgstr ""
+msgstr "STOCK_DIALOG_QUESTION"
#. module: stock
#: selection:stock.location,chained_auto_packing:0
msgid "Manual Operation"
-msgstr ""
+msgstr "Гараар удирдах"
#. module: stock
#: field:stock.picking,date_done:0
@@ -662,7 +664,7 @@ msgstr "БиелÑÑн огноо"
#. module: stock
#: rml:stock.picking.list:0
msgid "Expected Shipping Date"
-msgstr ""
+msgstr "ТÑÑвÑрлÑлтийг товлоÑон огноо"
#. module: stock
#: rml:stock.picking.list:0
@@ -672,17 +674,17 @@ msgstr "УÑан Ñ‚ÑÑврийн хаÑг"
#. module: stock
#: view:stock.tracking:0
msgid "Tracking/Serial"
-msgstr ""
+msgstr "ТÑÑвÑрлÑлт/Сериал"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_SELECT_FONT"
-msgstr ""
+msgstr "STOCK_SELECT_FONT"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_PASTE"
-msgstr ""
+msgstr "STOCK_PASTE"
#. module: stock
#: model:stock.location,name:stock.stock_location_locations_partner
@@ -693,12 +695,12 @@ msgstr "Харилцагчийн байршил"
#: help:stock.move,tracking_id:0
msgid ""
"Tracking lot is the code that will be put on the logistical unit/pallet"
-msgstr ""
+msgstr "цувралын замыг тодорхойлох нь хоёрдогч нÑгжид байрлах код юм"
#. module: stock
#: view:stock.tracking:0
msgid "Tracking Number"
-msgstr ""
+msgstr "ТÑÑвÑрлÑлтийн дугаар"
#. module: stock
#: model:stock.location,name:stock.stock_location_7
@@ -708,7 +710,7 @@ msgstr "Европын харилцагчиид"
#. module: stock
#: selection:stock.location,icon:0
msgid "terp-stock"
-msgstr ""
+msgstr "terp-stock"
#. module: stock
#: rml:stock.picking.list:0
@@ -718,7 +720,7 @@ msgstr "Савлагааны жагÑаалт"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_MEDIA_RECORD"
-msgstr ""
+msgstr "STOCK_MEDIA_RECORD"
#. module: stock
#: view:stock.picking:0
@@ -753,7 +755,7 @@ msgstr "Барааны Ñерийн дугаарын Ñ…Ñналт"
#. module: stock
#: view:stock.picking:0
msgid "Packing Done"
-msgstr ""
+msgstr "СавлаÑан"
#. module: stock
#: selection:stock.move,state:0
@@ -767,7 +769,7 @@ msgstr "ХүлÑÑлт"
#: model:ir.ui.menu,name:stock.menu_action_picking_tree7
#: model:ir.ui.menu,name:stock.menu_picking_waiting
msgid "Available Packing"
-msgstr ""
+msgstr "Боломжит Ñавлагаа"
#. module: stock
#: model:ir.model,name:stock.model_stock_warehouse
@@ -778,7 +780,7 @@ msgstr "Ðгуулах"
#. module: stock
#: selection:stock.location,icon:0
msgid "terp-report"
-msgstr ""
+msgstr "terp-report"
#. module: stock
#: wizard_field:stock.invoice_onshipping,init,type:0
@@ -793,27 +795,27 @@ msgstr "Ерөнхий IT нийлүүлÑгч"
#. module: stock
#: model:ir.actions.report.xml,name:stock.report_location_overview_all
msgid "Location Content (With children)"
-msgstr ""
+msgstr "Байршилын багтаамж"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_FILE"
-msgstr ""
+msgstr "STOCK_FILE"
#. module: stock
#: field:report.stock.lines.date,id:0
msgid "Inventory Line Id"
-msgstr ""
+msgstr "БүртгÑлийн мөрний дугаар"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_EDIT"
-msgstr ""
+msgstr "STOCK_EDIT"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_CONNECT"
-msgstr ""
+msgstr "STOCK_CONNECT"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_all
@@ -825,7 +827,7 @@ msgstr "Савлагаа"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_GO_DOWN"
-msgstr ""
+msgstr "STOCK_GO_DOWN"
#. module: stock
#: field:res.partner,property_stock_customer:0
@@ -836,13 +838,13 @@ msgstr "Харилцагчийн байрлал"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_OK"
-msgstr ""
+msgstr "STOCK_OK"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_tree9
#: model:ir.ui.menu,name:stock.menu_action_picking_tree9
msgid "New Internal Packing"
-msgstr ""
+msgstr "Дотоод ÑˆÐ¸Ð½Ñ Ð±Ð°Ð³Ñ†Ð»Ð°Ð»Ñ‚"
#. module: stock
#: view:stock.inventory:0
@@ -859,7 +861,7 @@ msgstr "ХооÑон"
#: model:ir.actions.wizard,name:stock.action2
#: model:ir.actions.wizard,name:stock.action_lot4
msgid "Downstream traceability"
-msgstr ""
+msgstr "Доод хөдөлгөөнийг Ñ…Ñнах"
#. module: stock
#: model:stock.location,name:stock.stock_location_14
@@ -900,7 +902,7 @@ msgstr "ÐийлүүлÑгчийн байрлал"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_HELP"
-msgstr ""
+msgstr "STOCK_HELP"
#. module: stock
#: selection:stock.move,priority:0
@@ -910,12 +912,12 @@ msgstr "Яаралтай"
#. module: stock
#: help:product.category,property_stock_account_input_categ:0
msgid "This account will be used to value the input stock"
-msgstr ""
+msgstr "ÐÐ½Ñ Ð´Ð°Ð½Ñ Ð½ÑŒ агуулахын оролтыг дүгнÑхийн тулд ашиглагдана"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_DIALOG_INFO"
-msgstr ""
+msgstr "STOCK_DIALOG_INFO"
#. module: stock
#: field:stock.move,date:0
@@ -926,12 +928,12 @@ msgstr "Ò®Ò¯ÑгÑÑÑн огноо"
#. module: stock
#: selection:stock.picking,type:0
msgid "Sending Goods"
-msgstr ""
+msgstr "ИлгÑÑлт амжилттай"
#. module: stock
#: view:stock.picking:0
msgid "Cancel Availability"
-msgstr ""
+msgstr "БÑлÑн байдлыг цуцлах"
#. module: stock
#: field:stock.inventory,move_ids:0
@@ -941,7 +943,7 @@ msgstr "Шилжилт Ò¯Ò¯ÑÑÑн"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_GO_BACK"
-msgstr ""
+msgstr "STOCK_GO_BACK"
#. module: stock
#: selection:stock.picking,invoice_state:0
@@ -952,12 +954,12 @@ msgstr "ИрÑÑдүйн нÑÑ…ÑмжлÑл"
#: view:product.product:0
#: view:product.template:0
msgid "Counter-Part Locations Properties"
-msgstr ""
+msgstr "Тооцоолох Ñ…ÑÑгийн байршилын шинж чанар"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_JUSTIFY_FILL"
-msgstr ""
+msgstr "STOCK_JUSTIFY_FILL"
#. module: stock
#: view:stock.move:0
@@ -978,7 +980,7 @@ msgstr "Хуваарилалтын арга"
#. module: stock
#: selection:stock.location,icon:0
msgid "terp-administration"
-msgstr ""
+msgstr "terp-administration"
#. module: stock
#: field:stock.warehouse,lot_stock_id:0
@@ -988,18 +990,18 @@ msgstr "Хадгалах байршил"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_APPLY"
-msgstr ""
+msgstr "STOCK_APPLY"
#. module: stock
#: wizard_view:stock.partial_picking,end2:0
msgid "The packing has been successfully made !"
-msgstr ""
+msgstr "Багцлалт амжилттай хийгдлÑÑ"
#. module: stock
#: field:stock.move,address_id:0
#: field:stock.picking.move.wizard,address_id:0
msgid "Dest. Address"
-msgstr ""
+msgstr "ДÑÑÑ‚ ХаÑг"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_inventory_form
@@ -1010,12 +1012,12 @@ msgstr "Тогтмол нөөц"
#. module: stock
#: selection:stock.location,icon:0
msgid "terp-crm"
-msgstr ""
+msgstr "terp-crm"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_STRIKETHROUGH"
-msgstr ""
+msgstr "STOCK_STRIKETHROUGH"
#. module: stock
#: rml:lot.stock.overview_all:0
@@ -1026,7 +1028,7 @@ msgstr "Код"
#. module: stock
#: selection:stock.location,icon:0
msgid "terp-partner"
-msgstr ""
+msgstr "terp-partner"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
@@ -1073,17 +1075,17 @@ msgstr "ÐœÑдÑÑлÑл"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_MISSING_IMAGE"
-msgstr ""
+msgstr "STOCK_MISSING_IMAGE"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_SPELL_CHECK"
-msgstr ""
+msgstr "STOCK_SPELL_CHECK"
#. module: stock
#: model:ir.model,name:stock.model_stock_tracking
msgid "Stock Tracking Lots"
-msgstr ""
+msgstr "Ðгуулахын Ñ‚ÑÑвÑрлÑлтийн Ñери"
#. module: stock
#: rml:lot.stock.overview:0
@@ -1103,6 +1105,8 @@ msgid ""
"This stock location will be used, instead of the default one, as the source "
"location for goods you receive from the current partner"
msgstr ""
+"ЗаÑамалынх нь оронд ÑÐ½Ñ Ð°Ð³ÑƒÑƒÐ»Ð°Ñ…Ñ‹Ð½ байршилыг тухайн Ñ…Ð°Ñ€Ð¸Ð»Ñ†Ð°Ð³Ñ‡Ð°Ð°Ñ Ñ…Ò¯Ð»ÑÑж авч "
+"байгаа барааны анхдагч байршил болгож ашиглана"
#. module: stock
#: field:stock.warehouse,partner_address_id:0
@@ -1123,17 +1127,17 @@ msgstr "ÐÑ… Ñурвалжийн лавлагаа"
#: model:ir.actions.act_window,name:stock.action_move_form4
#: model:ir.ui.menu,name:stock.menu_action_move_form4
msgid "Available Moves"
-msgstr ""
+msgstr "Шилжих боломжтой"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_HARDDISK"
-msgstr ""
+msgstr "STOCK_HARDDISK"
#. module: stock
#: model:ir.actions.act_window,name:stock.act_relate_picking
msgid "Related Picking"
-msgstr "Холбоотой Ñавлагаа"
+msgstr "Холбоотой агуулахын баримт"
#. module: stock
#: field:stock.incoterms,name:0
@@ -1146,7 +1150,7 @@ msgstr "ÐÑÑ€"
#. module: stock
#: view:stock.inventory.line:0
msgid "Stock Inventory Lines"
-msgstr "Барааны нөөцийн шугам"
+msgstr "Ðгуулахын бүртгÑлийн мөр"
#. module: stock
#: wizard_button:stock.location.products,init,open:0
@@ -1172,7 +1176,7 @@ msgstr "Савалгааны жагÑаалт"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_COPY"
-msgstr ""
+msgstr "STOCK_COPY"
#. module: stock
#: selection:stock.invoice_onshipping,init,type:0
@@ -1188,12 +1192,12 @@ msgstr "Бараа шилжих"
#: field:product.category,property_stock_account_output_categ:0
#: field:product.template,property_stock_account_output:0
msgid "Stock Output Account"
-msgstr ""
+msgstr "Ðгуулахын зарлагын данÑ"
#. module: stock
#: selection:stock.location,chained_auto_packing:0
msgid "Automatic No Step Added"
-msgstr ""
+msgstr "Ðвтомаатаар алхам нÑмÑгдÑÑгүй"
#. module: stock
#: wizard_view:stock.location.products,init:0
@@ -1203,7 +1207,7 @@ msgstr "Байршлын шинжилгÑÑ"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_CDROM"
-msgstr ""
+msgstr "STOCK_CDROM"
#. module: stock
#: selection:stock.picking,invoice_state:0
@@ -1218,7 +1222,7 @@ msgstr "Холбоотой байршлууд"
#. module: stock
#: model:stock.location,name:stock.location_inventory
msgid "Inventory loss"
-msgstr "Ðөөцийн алдагдал"
+msgstr "БүртгÑлийн алдаа"
#. module: stock
#: field:stock.production.lot,ref:0
@@ -1228,22 +1232,22 @@ msgstr "Дотоод реф"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_REFRESH"
-msgstr ""
+msgstr "STOCK_REFRESH"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_STOP"
-msgstr ""
+msgstr "STOCK_STOP"
#. module: stock
#: wizard_view:stock.move.track,init:0
msgid "Tracking a move"
-msgstr ""
+msgstr "ТÑÑвÑрлÑлтийн хөдөлгөөн"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_FIND_AND_REPLACE"
-msgstr ""
+msgstr "STOCK_FIND_AND_REPLACE"
#. module: stock
#: view:stock.picking:0
@@ -1253,17 +1257,17 @@ msgstr "Батлах"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_DIALOG_WARNING"
-msgstr ""
+msgstr "STOCK_DIALOG_WARNING"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_ZOOM_IN"
-msgstr ""
+msgstr "STOCK_ZOOM_IN"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_CONVERT"
-msgstr ""
+msgstr "STOCK_CONVERT"
#. module: stock
#: field:stock.move,note:0
@@ -1307,33 +1311,33 @@ msgstr "Дутуу Ñавлагаа"
#. module: stock
#: selection:stock.location,icon:0
msgid "terp-calendar"
-msgstr ""
+msgstr "terp-calendar"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_ITALIC"
-msgstr ""
+msgstr "STOCK_ITALIC"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_YES"
-msgstr ""
+msgstr "STOCK_YES"
#. module: stock
#: model:ir.actions.act_window,name:stock.act_stock_picking_move_wizard
msgid "Fill From Unreceived Products"
-msgstr ""
+msgstr "ИрÑÑгүй Ð±Ð°Ñ€Ð°Ð°Ð½ÑƒÑƒÐ´Ð°Ð°Ñ Ð±ÑлтгÑÑ…"
#. module: stock
#: field:stock.move,move_dest_id:0
msgid "Dest. Move"
-msgstr ""
+msgstr "ХүргÑÑ… хөдөлгөөн"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_inventory_form_new
#: model:ir.ui.menu,name:stock.menu_action_inventory_form_new
msgid "New Periodical Inventory"
-msgstr ""
+msgstr "ҮечилÑÑн бүртгÑл"
#. module: stock
#: field:stock.production.lot,revisions:0
@@ -1343,7 +1347,7 @@ msgstr "Ð¥Ñналт"
#. module: stock
#: selection:stock.location,allocation_method:0
msgid "FIFO"
-msgstr ""
+msgstr "ÐÑ…Ñнд орÑон нь ÑÑ…Ñнд гарна."
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_tree2_delivery
@@ -1383,12 +1387,12 @@ msgstr "Ð¥Ñмжих нÑгж"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_JUSTIFY_LEFT"
-msgstr ""
+msgstr "STOCK_JUSTIFY_LEFT"
#. module: stock
#: view:stock.inventory:0
msgid "Cancel Inventory"
-msgstr "Ðөөц цуцлах"
+msgstr "БүртгÑл цуцлах"
#. module: stock
#: model:ir.actions.report.xml,name:stock.report_product_history
@@ -1448,7 +1452,7 @@ msgstr "БүтÑÑгдÑхүүний зардал"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_COLOR_PICKER"
-msgstr ""
+msgstr "STOCK_COLOR_PICKER"
#. module: stock
#: model:ir.actions.report.xml,name:stock.report_lot_location
@@ -1458,7 +1462,7 @@ msgstr "Цувралуудын байрлал"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_DELETE"
-msgstr ""
+msgstr "STOCK_DELETE"
#. module: stock
#: model:account.journal,name:stock.stock_journal
@@ -1468,7 +1472,7 @@ msgstr "Барааны журнал"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_CLEAR"
-msgstr "агуулахыг цÑвÑрлÑÑ…"
+msgstr "STOCK_CLEAR"
#. module: stock
#: field:stock.production.lot,date:0
@@ -1483,7 +1487,7 @@ msgstr "Татан авалт"
#. module: stock
#: model:stock.location,name:stock.stock_location_4
msgid "Maxtor Suppliers"
-msgstr ""
+msgstr "МакÑтор нийлүүлÑгчид"
#. module: stock
#: view:stock.picking:0
@@ -1498,7 +1502,7 @@ msgstr "Барааны агуулах харах"
#. module: stock
#: selection:stock.location,icon:0
msgid "terp-mrp"
-msgstr ""
+msgstr "terp-mrp"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_tree3_delivery
@@ -1509,18 +1513,18 @@ msgstr "ИрÑÑлүйн захиалга хүргÑлт"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_GO_UP"
-msgstr ""
+msgstr "STOCK_GO_UP"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_SORT_DESCENDING"
-msgstr ""
+msgstr "STOCK_SORT_DESCENDING"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_tracking_form
#: model:ir.ui.menu,name:stock.menu_action_tracking_form
msgid "Tracking Lots"
-msgstr "цувралын замыг тодорхойлох"
+msgstr "ТÑÑвÑрлÑлтийн Ñерүүд"
#. module: stock
#: wizard_button:inventory.merge,init,merge:0
@@ -1535,12 +1539,12 @@ msgstr "Ðөөц"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_HOME"
-msgstr ""
+msgstr "STOCK_HOME"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_PROPERTIES"
-msgstr "агуулахын дÑлгÑÑ€Ñнгүй мÑдÑÑлÑл"
+msgstr "STOCK_PROPERTIES"
#. module: stock
#: field:stock.location,stock_real:0
@@ -1552,7 +1556,7 @@ msgstr "ЖинхÑÐ½Ñ Ð±Ð°Ñ€Ð°Ð°"
#: wizard_view:stock.fill_inventory,init:0
#: wizard_button:stock.fill_inventory,init,fill_inventory:0
msgid "Fill Inventory"
-msgstr "Ðөөцийг дүүргÑÑ…"
+msgstr "БүртгÑлийг бөглөх"
#. module: stock
#: wizard_view:stock.invoice_onshipping,init:0
@@ -1588,7 +1592,7 @@ msgstr "Савлах үйл Ñвц"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_MEDIA_STOP"
-msgstr "агуулахын дамжуулгыг зогÑоох"
+msgstr "STOCK_MEDIA_STOP"
#. module: stock
#: view:stock.move:0
@@ -1609,12 +1613,12 @@ msgstr "ÐÑ… захиалга"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_DND_MULTIPLE"
-msgstr ""
+msgstr "STOCK_DND_MULTIPLE"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_REMOVE"
-msgstr "агуулахыг уÑтгах (Ð°Ð³ÑƒÑƒÐ»Ð°Ñ…Ð°Ð°Ñ ÑƒÑтгах)"
+msgstr "STOCK_REMOVE"
#. module: stock
#: field:stock.incoterms,active:0
@@ -1646,17 +1650,17 @@ msgstr "Ðийт:"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_DIALOG_AUTHENTICATION"
-msgstr ""
+msgstr "STOCK_DIALOG_AUTHENTICATION"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_ZOOM_OUT"
-msgstr ""
+msgstr "STOCK_ZOOM_OUT"
#. module: stock
#: wizard_field:stock.move.track,init,tracking_prefix:0
msgid "Tracking prefix"
-msgstr "урьдчилÑан нөхцлийг тодорхойлох"
+msgstr "ТÑÑвÑрлÑлтийн урьдчилÑан нөхцөл"
#. module: stock
#: selection:stock.location,allocation_method:0
@@ -1676,22 +1680,22 @@ msgstr "Ð¥Ñналтын нÑÑ€"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_SELECT_COLOR"
-msgstr "агуулахын өнгийг Ñонгох"
+msgstr "STOCK_SELECT_COLOR"
#. module: stock
#: view:stock.inventory:0
msgid "Confirm Inventory"
-msgstr "Ðөөц батлах"
+msgstr "БүртгÑл батлах"
#. module: stock
#: view:product.category:0
msgid "Accounting Stock Properties"
-msgstr "Барааны шинж чанарын бүртгÑл"
+msgstr "ДанÑны агуулахын мÑдÑÑлÑл"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_NO"
-msgstr ""
+msgstr "STOCK_NO"
#. module: stock
#: model:stock.location,name:stock.stock_location_workshop
@@ -1713,7 +1717,7 @@ msgstr "Виртуаль байршил"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_REDO"
-msgstr ""
+msgstr "STOCK_REDO"
#. module: stock
#: model:stock.location,name:stock.stock_location_company
@@ -1733,7 +1737,7 @@ msgstr "Яаралтай буÑ"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_CLOSE"
-msgstr "агуулахыг хаах"
+msgstr "STOCK_CLOSE"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -1818,12 +1822,12 @@ msgstr "ÐийлүүлÑгчид"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_JUMP_TO"
-msgstr ""
+msgstr "STOCK_JUMP_TO"
#. module: stock
#: selection:stock.location,icon:0
msgid "terp-tools"
-msgstr ""
+msgstr "terp-tools"
#. module: stock
#: model:ir.actions.report.xml,name:stock.report_location_overview
@@ -1838,7 +1842,7 @@ msgstr "БүтÑÑгдÑхүүний байрлал"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_UNDO"
-msgstr "агуулахын үйлдлийг буцаах"
+msgstr "STOCK_UNDO"
#. module: stock
#: model:ir.actions.wizard,name:stock.move_split
@@ -1848,7 +1852,7 @@ msgstr "Шилжих шугам хуваах"
#. module: stock
#: selection:stock.location,icon:0
msgid "terp-sale"
-msgstr ""
+msgstr "terp-sale"
#. module: stock
#: field:stock.production.lot,name:0
@@ -1858,7 +1862,7 @@ msgstr "Сериал"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_ADD"
-msgstr "агуулахад нÑмÑÑ…"
+msgstr "STOCK_ADD"
#. module: stock
#: field:stock.location,chained_delay:0
@@ -1878,7 +1882,7 @@ msgstr "ДанÑны бичилт"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_MEDIA_PAUSE"
-msgstr "агуулахын дамжуулгаг түр зогÑоох"
+msgstr "STOCK_MEDIA_PAUSE"
#. module: stock
#: view:product.product:0
@@ -1906,17 +1910,17 @@ msgstr "ÐөөцөлÑөн огноо"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_PRINT_PREVIEW"
-msgstr "агуулахыг урьдчилан харах"
+msgstr "STOCK_PRINT_PREVIEW"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_FIND"
-msgstr "агуулахыг олох"
+msgstr "STOCK_FIND"
#. module: stock
#: view:stock.inventory:0
msgid "Lot Inventory"
-msgstr "Цувралын дугаарын нөөц"
+msgstr "Серийн бүртгÑл"
#. module: stock
#: help:stock.location,chained_auto_packing:0
@@ -1941,7 +1945,7 @@ msgstr "Зураг"
#. module: stock
#: field:stock.tracking,name:0
msgid "Tracking"
-msgstr "Зам тодорхойлох"
+msgstr "ТÑÑвÑрлÑлт"
#. module: stock
#: wizard_button:stock.move.track,init,track:0
@@ -1954,7 +1958,7 @@ msgstr "Тийм"
msgid ""
"This account will be used, instead of the default one, to value input stock"
msgstr ""
-"агуулахын оролтыг дүгнÑхийн тулд заÑамалынх нь оронд ÑÐ½Ñ Ð³Ð¸ÑˆÒ¯Ò¯Ð½ Ñ…ÑÑ€ÑглÑгдÑнÑ"
+"Ðгуулахын оролтыг дүгнÑхийн тулд заÑамалынх нь оронд ÑÐ½Ñ Ð´Ð°Ð½Ñ Ñ…ÑÑ€ÑглÑгдÑнÑ"
#. module: stock
#: model:stock.location,name:stock.stock_location_8
@@ -1979,7 +1983,7 @@ msgstr "төлөвлөгдÑөн огнооны хамгийн дÑÑд Ñ…Ñзг
#. module: stock
#: view:stock.inventory:0
msgid "Posted Inventory"
-msgstr "ЗарлаÑан нөөц"
+msgstr "ИлгÑÑÑÑн бүртгÑл"
#. module: stock
#: selection:stock.picking,type:0
@@ -1994,7 +1998,7 @@ msgstr "Барааны байршил"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_MEDIA_PLAY"
-msgstr "Ðгуулахын дамжуулгыг Ñвуулах"
+msgstr "STOCK_MEDIA_PLAY"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_tree_delivery
@@ -2005,7 +2009,7 @@ msgstr "ХүргÑÑ… захиалгууд"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_OPEN"
-msgstr "Бараа_ÐÑÑÑ…"
+msgstr "STOCK_OPEN"
#. module: stock
#: help:res.partner,property_stock_customer:0
@@ -2025,7 +2029,7 @@ msgstr "БаталÑан"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_MEDIA_PREVIOUS"
-msgstr "агуулахын өмнөх дамжуулга"
+msgstr "STOCK_MEDIA_PREVIOUS"
#. module: stock
#: view:stock.move:0
@@ -2052,14 +2056,14 @@ msgstr "Бараа байрлах бүтÑц"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_DISCONNECT"
-msgstr "Бараа_туÑгаарлах"
+msgstr "STOCK_DISCONNECT"
#. module: stock
#: help:product.template,property_stock_account_output:0
msgid ""
"This account will be used, instead of the default one, to value output stock"
msgstr ""
-"Ðгуулахын гаралтыг дүгнÑхийн тулд заÑамалын оронд ÑÐ½Ñ Ð³Ð¸ÑˆÒ¯Ò¯Ð½ ашиглагдана"
+"Ðгуулахын гаралтыг дүгнÑхийн тулд заÑамалын оронд ÑÐ½Ñ Ð´Ð°Ð½Ñ Ð°ÑˆÐ¸Ð³Ð»Ð°Ð³Ð´Ð°Ð½Ð°"
#. module: stock
#: view:stock.picking:0
@@ -2085,7 +2089,7 @@ msgstr "ÐÑÑ…ÑмжлÑл Ò¯Ò¯ÑгÑÑ…"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_NETWORK"
-msgstr "Бараа_СүлжÑÑ"
+msgstr "STOCK_NETWORK"
#. module: stock
#: model:ir.ui.menu,name:stock.menu_stock_configuration
@@ -2095,7 +2099,7 @@ msgstr "Тохиргоо"
#. module: stock
#: selection:stock.location,icon:0
msgid "terp-project"
-msgstr ""
+msgstr "terp-project"
#. module: stock
#: model:ir.actions.act_window,name:stock.act_product_product_2_stock_report_prodlots
@@ -2131,7 +2135,7 @@ msgstr "ЦуцлагдÑан"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_GOTO_LAST"
-msgstr "Ðгуулах хооÑрох"
+msgstr "STOCK_GOTO_LAST"
#. module: stock
#: selection:stock.picking,invoice_state:0
@@ -2141,7 +2145,7 @@ msgstr "ÐÑÑ…ÑмжилÑÑн"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_DIRECTORY"
-msgstr "Бараа_Удирдлага"
+msgstr "STOCK_DIRECTORY"
#. module: stock
#: help:product.template,property_stock_production:0
@@ -2174,7 +2178,7 @@ msgstr "Ðоорог"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_JUSTIFY_CENTER"
-msgstr "агуулахыг төвд нь зÑÑ€ÑгцүүлÑÑ…"
+msgstr "STOCK_JUSTIFY_CENTER"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_tree3
@@ -2212,7 +2216,7 @@ msgstr "Шууд хүргÑлт"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_REVERT_TO_SAVED"
-msgstr "агуулах буцаж Ñ…ÑвÑндÑÑ Ð¾Ñ€Ð¾Ð½ хадгалагдах"
+msgstr "STOCK_REVERT_TO_SAVED"
#. module: stock
#: field:product.product,track_production:0
@@ -2243,7 +2247,7 @@ msgstr ""
#. module: stock
#: model:ir.model,name:stock.model_stock_picking_move_wizard
msgid "stock.picking.move.wizard"
-msgstr "агуулахын Ñонголтыг шилжүүлÑÑ… визард"
+msgstr "Ðгуулахын барааг шилжүүлÑÑ… визард"
#. module: stock
#: model:res.request.link,name:stock.req_link_tracking
@@ -2289,7 +2293,7 @@ msgstr "Ерөнхий мÑдÑÑлÑл"
#. module: stock
#: selection:stock.location,icon:0
msgid "terp-product"
-msgstr ""
+msgstr "terp-product"
#. module: stock
#: wizard_button:stock.partial_picking,end2,end:0
@@ -2320,7 +2324,7 @@ msgstr "Хуваах"
#. module: stock
#: field:stock.location,account_id:0
msgid "Inventory Account"
-msgstr "Ðөөцийн данÑ"
+msgstr "ДанÑны бүртгÑл"
#. module: stock
#: wizard_view:inventory.merge.stock.zero,init:0
@@ -2347,7 +2351,7 @@ msgstr "Тодорхойлолт"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_INDENT"
-msgstr "Ðгуулахын барааны захиалга"
+msgstr "STOCK_INDENT"
#. module: stock
#: selection:stock.picking,type:0
@@ -2359,7 +2363,7 @@ msgstr "ХүргÑлт"
#: model:ir.actions.wizard,name:stock.action4
#: model:ir.actions.wizard,name:stock.action_lot2
msgid "Upstream traceability"
-msgstr ""
+msgstr "ДÑÑд хөдөлгөөнийг Ñ…Ñнах"
#. module: stock
#: field:product.category,property_stock_account_input_categ:0
@@ -2375,7 +2379,7 @@ msgstr "Ð¥ÑлхÑÑ Ð±Ð°Ð¹Ñ€Ð»Ð°Ð»Ñ‹Ð½ төрөл"
#. module: stock
#: selection:stock.location,chained_location_type:0
msgid "Customer"
-msgstr "Ð¥ÑÑ€ÑглÑгч"
+msgstr "ҮйлчлүүлÑгч"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_location_tree_3
@@ -2391,12 +2395,12 @@ msgstr "Гаралт"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_JUSTIFY_RIGHT"
-msgstr "Ðгуулахыг баруун талд нь зÑÑ€ÑгцүүлÑÑ…"
+msgstr "STOCK_JUSTIFY_RIGHT"
#. module: stock
#: model:ir.model,name:stock.model_stock_inventory_line
msgid "Inventory line"
-msgstr "Ðөөцийн шугам"
+msgstr "БүртгÑлийн мөр"
#. module: stock
#: view:stock.picking:0
@@ -2406,7 +2410,7 @@ msgstr "БуÑад мÑдÑÑлÑл"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_MEDIA_NEXT"
-msgstr "Ðгуулахын дараагийн дамжуулга"
+msgstr "STOCK_MEDIA_NEXT"
#. module: stock
#: view:stock.move:0
diff --git a/addons/stock/i18n/ru.po b/addons/stock/i18n/ru.po
index 23ddf31636af1bd7677b292485432345fff3dc4b..d3060e8fcdf5b9dbd695536f1dee108732313d7c 100644
--- a/addons/stock/i18n/ru.po
+++ b/addons/stock/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 10:02+0000\n"
+"PO-Revision-Date: 2010-10-17 18:49+0000\n"
"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:38+0000\n"
+"X-Launchpad-Export-Date: 2010-10-18 04:55+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock
@@ -1150,7 +1150,7 @@ msgstr ""
#. module: stock
#: wizard_button:stock.location.products,init,open:0
msgid "Open Products"
-msgstr ""
+msgstr "Открыть товары"
#. module: stock
#: rml:stock.picking.list:0
@@ -1197,7 +1197,7 @@ msgstr ""
#. module: stock
#: wizard_view:stock.location.products,init:0
msgid "Stock Location Analysis"
-msgstr ""
+msgstr "Ðнализ меÑÑ‚Ð¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð·Ð°Ð¿Ð°Ñов"
#. module: stock
#: selection:stock.location,icon:0
@@ -1484,7 +1484,7 @@ msgstr "Сделать доÑтупным принудительно"
#. module: stock
#: wizard_view:stock.location.products,init:0
msgid "View Stock of Products"
-msgstr ""
+msgstr "ПроÑмотр товаров на Ñкладах"
#. module: stock
#: selection:stock.location,icon:0
@@ -1976,7 +1976,7 @@ msgstr "Получение товаров"
#. module: stock
#: view:stock.location:0
msgid "Stock Location"
-msgstr ""
+msgstr "МеÑтоположение запаÑов"
#. module: stock
#: selection:stock.location,icon:0
@@ -2032,7 +2032,7 @@ msgstr ""
#: model:ir.actions.act_window,name:stock.action_location_tree
#: model:ir.ui.menu,name:stock.menu_action_location_tree
msgid "Stock Locations Structure"
-msgstr ""
+msgstr "Структура меÑтоположений запаÑов"
#. module: stock
#: selection:stock.location,icon:0
diff --git a/addons/stock/product.py b/addons/stock/product.py
index e1d4c71b46c4b07f952a92807d16d982c777aa69..ddb582f4a3c91f9a7d97ae0b25aa510179391dab 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -188,6 +188,7 @@ class product_product(osv.osv):
if not ids:
return res
+ # TODO: write in more ORM way, less queries, more pg84 magic
if context.get('shop', False):
cr.execute('select warehouse_id from sale_shop where id=%s', (int(context['shop']),))
res2 = cr.fetchone()
@@ -246,6 +247,7 @@ class product_product(osv.osv):
date_values = [to_date]
+ # TODO: perhaps merge in one query.
if date_values:
where.append(tuple(date_values))
if 'in' in what:
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 60fab009d0e0a149e6ed82a3ffc6870f75c81745..35715a9e1fb16dbc3d7f7dc2f7eb5c54bcf6cbba 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -60,9 +60,11 @@
<field name="inherit_id" ref="product.product_normal_form_view"/>
<field name="arch" type="xml">
<field name="standard_price" position="replace">
- <group col="4" colspan="2">
- <field name="standard_price" readonly="1"/>
- <button name="%(action_view_change_standard_price)d" string="Change Price" type="action" icon="gtk-execute" attrs="{'readonly':[('cost_method','=','average')]}"/>
+ <label string="Cost Price:" align="1.0"/>
+ <group col="2" colspan="1">
+ <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}" nolabel="1"/>
+ <button name="%(action_view_change_standard_price)d" string="Update"
+ type="action" icon="gtk-execute" attrs="{'invisible':[('cost_method','<>','average')]}"/>
</group>
</field>
</field>
diff --git a/addons/stock/report/lot_overview.rml b/addons/stock/report/lot_overview.rml
index 14f2b25eb4e67cbda5216ca058363ce7170bff9d..4283bd2e9608e3677a6ca876d40a91a45f13ebb1 100644
--- a/addons/stock/report/lot_overview.rml
+++ b/addons/stock/report/lot_overview.rml
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
-<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Location Overview" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Location Overview.pdf">
+ <template pageSize="(595.0,842.0)" title="Location Overview" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
- <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+ <frame id="first" x1="33.0" y1="57.0" width="526" height="728"/>
</pageTemplate>
</template>
<stylesheet>
@@ -93,7 +93,7 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
- <blockTable colWidths="233.0,60.0,59.0,59.0,72.0" style="Table6">
+ <blockTable colWidths="248.0,91.0,62.0,59.0,67.0" style="Table6">
<tr>
<td>
<para style="terp_tblheader_Details">Location / Product</para>
@@ -113,10 +113,10 @@
</tr>
</blockTable>
<section>
- <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
+ <para style="terp_default_2">[[ repeatIn(objects,'o') ]]</para>
<section>
- <para style="terp_default_8">[[ repeatIn(process(o.id),'ob') ]]</para>
- <blockTable colWidths="152.0,82.0,59.0,59.0,58.0,72.0" style="Table7">
+ <para style="terp_default_2">[[ repeatIn(process(o.id),'ob') ]]</para>
+ <blockTable colWidths="339.0,62.0,59.0,66.0" style="Table7">
<tr>
<td>
<para style="terp_default_Bold_9">[[ (not ob['product']) and removeParentNode('blockTable') ]] [[ ob['location_name'] ]]</para>
@@ -136,21 +136,11 @@
<font color="white"> </font>
</para>
</td>
- <td>
- <para style="terp_default_Bold_9">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_default_Bold_9">
- <font color="white"> </font>
- </para>
- </td>
</tr>
</blockTable>
<section>
- <para style="terp_default_8">[[ repeatIn(ob['product'],'p') ]]</para>
- <blockTable colWidths="38.0,196.0,60.0,59.0,58.0,72.0" style="Table8">
+ <para style="terp_default_2">[[ repeatIn(ob['product'],'p') ]]</para>
+ <blockTable colWidths="32.0,216.0,91.0,62.0,60.0,65.0" style="Table8">
<tr>
<td>
<para style="terp_default_9">
@@ -167,15 +157,15 @@
<para style="terp_default_Right_9">[[formatLang( p['prod_qty']) ]] [[ p['uom'] ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(p['price'], digits=get_digits(dp='Account')) ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(p['price']) ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(p['price_value'], digits=get_digits(dp='Account')) ]] [[ o.company_id.currency_id.symbol]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(p['price_value']) ]] [[ o.company_id.currency_id.symbol]]</para>
</td>
</tr>
</blockTable>
</section>
- <blockTable colWidths="38.0,366.0,78.0" style="Table10">
+ <blockTable colWidths="32.0,421.0,74.0" style="Table10">
<tr>
<td>
<para style="terp_tblheader_Details">[[ (not ob['product']) and removeParentNode('blockTable') ]]</para>
@@ -184,13 +174,13 @@
<para style="terp_default_Bold_9">Total:</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(price_total(), digits=get_digits(dp='Account')) ]] [[ o.company_id.currency_id.symbol ]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(price_total()) ]] [[ o.company_id.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
</section>
</section>
- <blockTable colWidths="71.0,334.0,77.0" repeatRows="1" style="Table1">
+ <blockTable colWidths="78.0,365.0,84.0" repeatRows="1" style="Table1">
<tr>
<td>
<para style="terp_default_Bold_9">Grand Total:</para>
@@ -201,7 +191,7 @@
</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price(), digits=get_digits(dp='Account')) ]] [[ o.company_id.currency_id.symbol ]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price()) ]] [[ o.company_id.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
@@ -209,4 +199,4 @@
<font color="white"> </font>
</para>
</story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/stock/report/lot_overview_all.rml b/addons/stock/report/lot_overview_all.rml
index 7d2360068a8525762510aec6d71c2a2ab25a7e33..5104671fa112d22f5124a66d935a02e241765170 100644
--- a/addons/stock/report/lot_overview_all.rml
+++ b/addons/stock/report/lot_overview_all.rml
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
-<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Location Content" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Location Content.pdf">
+ <template pageSize="(595.0,842.0)" title="Location Content" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
- <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+ <frame id="first" x1="34.0" y1="27.0" width="523" height="782"/>
</pageTemplate>
</template>
<stylesheet>
@@ -23,7 +23,6 @@
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBELOW" colorName="#999999" start="0,-1" stop="0,-1"/>
- <lineStyle kind="LINEBELOW" colorName="#999999" start="1,-1" stop="1,-1"/>
</blockTableStyle>
<blockTableStyle id="Table8">
<blockAlignment value="LEFT"/>
@@ -93,7 +92,7 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
- <blockTable colWidths="233.0,60.0,59.0,59.0,72.0" style="Table6">
+ <blockTable colWidths="253.0,65.0,63.0,63.0,78.0" style="Table6">
<tr>
<td>
<para style="terp_tblheader_Details">Location / Product</para>
@@ -113,10 +112,10 @@
</tr>
</blockTable>
<section>
- <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
+ <para style="terp_default_2">[[ repeatIn(objects,'o') ]]</para>
<section>
- <para style="terp_default_8">[[ repeatIn(process(o.id),'ob') ]]</para>
- <blockTable colWidths="152.0,82.0,59.0,59.0,58.0,72.0" style="Table7">
+ <para style="terp_default_2">[[ repeatIn(process(o.id),'ob') ]]</para>
+ <blockTable colWidths="319.0,63.0,63.0,78.0" style="Table7">
<tr>
<td>
<para style="terp_default_Bold_9">[[ (not ob['product']) and removeParentNode('blockTable') ]][[ ob['location_name'] ]]</para>
@@ -136,21 +135,11 @@
<font color="white"> </font>
</para>
</td>
- <td>
- <para style="terp_default_Bold_9">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_default_Bold_9">
- <font color="white"> </font>
- </para>
- </td>
</tr>
</blockTable>
<section>
- <para style="terp_default_8">[[ repeatIn(ob['product'],'p') ]]</para>
- <blockTable colWidths="38.0,196.0,60.0,59.0,58.0,72.0" style="Table8">
+ <para style="terp_default_2">[[ repeatIn(ob['product'],'p') ]]</para>
+ <blockTable colWidths="29.0,225.0,65.0,63.0,63.0,78.0" style="Table8">
<tr>
<td>
<para style="terp_default_9">
@@ -167,15 +156,15 @@
<para style="terp_default_Right_9">[[formatLang( p['prod_qty']) ]] [[ p['uom'] ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(p['price'], digits=get_digits(dp='Account')) ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(p['price']) ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(p['price_value'], digits=get_digits(dp='Account')) ]] [[ o.company_id.currency_id.symbol]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(p['price_value']) ]] [[ o.company_id.currency_id.symbol]]</para>
</td>
</tr>
</blockTable>
</section>
- <blockTable colWidths="38.0,366.0,78.0" style="Table10">
+ <blockTable colWidths="29.0,409.0,84.0" style="Table10">
<tr>
<td>
<para style="terp_tblheader_Details">[[ (not ob['product']) and removeParentNode('blockTable') ]]</para>
@@ -184,13 +173,13 @@
<para style="terp_default_Bold_9">Total:</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(price_total(), digits=get_digits(dp='Account')) ]] [[ o.company_id.currency_id.symbol ]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(price_total()) ]] [[ o.company_id.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
</section>
</section>
- <blockTable colWidths="71.0,334.0,77.0" repeatRows="1" style="Table2">
+ <blockTable colWidths="77.0,362.0,84.0" repeatRows="1" style="Table2">
<tr>
<td>
<para style="terp_default_Bold_9">Grand Total:</para>
@@ -201,12 +190,9 @@
</para>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price(), digits=get_digits(dp='Account')) ]] [[ o.company_id.currency_id.symbol ]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price()) ]] [[ o.company_id.currency_id.symbol ]]</para>
</td>
</tr>
</blockTable>
- <para style="terp_default_8">
- <font color="white"> </font>
- </para>
</story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 34e6e53dbdfbd8f7f81d8385ff34013162240b5f..507f475a13eef0ed2252c68fc5e85a49a969b078 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -143,6 +143,7 @@
<field name="view_mode">tree,graph</field>
<field name="search_view_id" ref="view_stock_search"/>
<field name="context">{'full':'1','contact_display': 'partner','search_default_done':1, 'search_default_month':1, 'search_default_group_type':1, 'group_by': [], 'group_by_no_leaf':1,}</field>
+ <field name="help">Moves Analysis allows you to easily check and analyse your company stock moves. Use this report when you want to analyse the different routes taken by your products and inventory management performance.</field>
</record>
<menuitem action="action_stock_move_report" id="menu_action_stock_move_report" parent="next_id_61" sequence="3"/>
@@ -240,8 +241,9 @@
<field name="view_mode">tree,graph</field>
<field name="search_view_id" eval="False"/>
<field name="context">{'contact_display': 'partner', 'search_default_real':1, 'search_default_location_type_internal':1,'search_default_group_product':1,'group_by':[], 'group_by_no_leaf':1}</field>
+ <field name="help">Inventory Analysis allows you to easily check and analyse your company stock levels. Sort and group by selection criteria in order to better analyse and manage your company activities.</field>
</record>
- <menuitem action="action_stock_inventory_report" id="menu_action_stock_inventory_report" parent="next_id_61" sequence="4" groups="base.group_system,base.group_user"/>
+ <menuitem action="action_stock_inventory_report" id="menu_action_stock_inventory_report" parent="next_id_61" sequence="4" groups="base.group_user"/>
</data>
diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index cb690cea931fb198b4f5d83fb1eb2dcc9d1e38ff..0fc7f206c6b8bf3815aa9c97bc5fcfdf28f30d55 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -67,6 +67,7 @@
<field name="view_type">form</field>
<field name="context">{'search_default_stockable':1}</field>
<field name="view_mode">tree,form</field>
+ <field name="help">Display the last inventories done on your products and easily sort them with specific filtering criteria. If you do frequent and partial inventories, you need this report in order to ensure that the stock of each product is controlled at least once a year.</field>
</record>
<menuitem parent="next_id_61" action="action_stock_line_date" id="menu_report_stock_line_date" sequence="2"/>
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index e879a03e9e1831026c50167ea30ab0372d2b668c..4d9c44edd79abf59b7372efbedd74c821085e6de 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -9,40 +9,26 @@
"access_stock_journal_manager","stock.journal.manager","model_stock_journal","stock.group_stock_manager",1,1,1,1
"access_stock_tracking_user","stock.tracking user","model_stock_tracking","stock.group_stock_user",1,1,1,1
"access_stock_tracking_manager","stock.tracking manager","model_stock_tracking","stock.group_stock_manager",1,0,0,0
-"access_stock_tracking_system","stock.tracking systen","model_stock_tracking","base.group_system",1,0,0,0
"access_stock_picking_user","stock.picking user","model_stock_picking","stock.group_stock_user",1,1,1,1
"access_stock_picking_manager","stock.picking manager","model_stock_picking","stock.group_stock_manager",1,0,0,0
-"access_stock_picking_system","stock.picking system","model_stock_picking","base.group_system",1,0,0,0
"access_stock_production_lot_manager","stock.production.lot manager","model_stock_production_lot","stock.group_stock_manager",1,0,0,0
-"access_stock_production_lot_system","stock.production.lot system","model_stock_production_lot","base.group_system",1,0,0,0
"access_stock_production_lot_user","stock.production.lot user","model_stock_production_lot","stock.group_stock_user",1,1,1,1
"access_stock_production_lot_revision","stock.production.lot.revision","model_stock_production_lot_revision","stock.group_stock_user",1,1,1,1
"access_stock_move_manager","stock.move manager","model_stock_move","stock.group_stock_manager",1,0,0,0
"access_stock_move_user","stock.move user","model_stock_move","stock.group_stock_user",1,1,1,1
-"access_stock_move_system","stock.move system","model_stock_move","base.group_system",1,0,0,0
"access_stock_inventory_user","stock.inventory user","model_stock_inventory","stock.group_stock_user",1,1,1,1
-"access_stock_inventory_system","stock.inventory system","model_stock_inventory","base.group_system",1,0,0,0
"access_stock_inventory_manager","stock.inventory manager","model_stock_inventory","stock.group_stock_manager",1,0,0,0
"access_stock_inventory_line_user","stock.inventory.line user","model_stock_inventory_line","stock.group_stock_user",1,1,1,1
"access_stock_inventory_line_manager","stock.inventory.line manager","model_stock_inventory_line","stock.group_stock_manager",1,0,0,0
-"access_stock_inventory_line_system","stock.inventory.line system","model_stock_inventory_line","base.group_system",1,0,0,0
"access_stock_report_prodlots","stock.report.prodlots","model_stock_report_prodlots","stock.group_stock_manager",1,0,0,0
"access_stock_location_product_manager","stock.location product manager","model_stock_location","product.group_product_manager",1,0,0,0
"access_stock_lines_date_user","report.stock.lines.date user","model_report_stock_lines_date","stock.group_stock_user",1,0,0,0
"access_stock_lines_date_manager","report.stock.lines.date manager","model_report_stock_lines_date","stock.group_stock_manager",1,1,1,1
-"access_stock_lines_date_system","report.stock.lines.date system","model_report_stock_lines_date","base.group_system",1,0,0,0
"access_stock_report_tracklots","stock.report.tracklots","model_stock_report_tracklots","stock.group_stock_user",1,1,1,1
"access_report_stock_move_user","report.stock.move user","model_report_stock_move","stock.group_stock_user",1,0,0,0
-"access_report_stock_move_system","report.stock.move system","model_report_stock_move","base.group_system",1,0,0,0
"access_report_stock_move_manager","report.stock.move manager","model_report_stock_move","stock.group_stock_manager",1,1,1,1
"access_report_stock_inventory_user","report.stock.inventory user","model_report_stock_inventory","stock.group_stock_user",1,1,1,1
"access_report_stock_inventory_manager","report.stock.inventory manager","model_report_stock_inventory","stock.group_stock_manager",1,1,1,1
-"access_report_stock_inventory_system","report.stock.inventory system","model_report_stock_inventory","base.group_system",1,0,0,0
-"access_stock_warehouse_system","stock.warehouse.system","model_stock_warehouse","base.group_system",1,1,1,1
-"access_stock_location_system","stock.location.system","model_stock_location","base.group_system",1,1,1,1
-"access_stock_journal_system","stock.journal.system","model_stock_journal","base.group_system",1,1,1,1
-"access_product_product_stock","product_product_stock","product.model_product_product","base.group_system",1,0,0,0
-"access_product_template_stock_system","product.template stock system","product.model_product_template","base.group_system",1,0,0,0
"access_product_product_stock_user","product_product_stock_user","product.model_product_product","stock.group_stock_user",1,1,1,1
"access_product_template_stock_user","product.template stock user","product.model_product_template","stock.group_stock_user",1,1,1,1
"access_product_product_stock_manager","product_product_stock_manager","product.model_product_product","stock.group_stock_manager",1,0,0,0
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index 60be468d17efec918ccb9b5bf06ee419fd1cc5c2..717486413c6b2ba3526d305f0f51eb8d9a9c4305 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -9,10 +9,6 @@
<field name="name">Warehouse / User</field>
</record>
- <record model='ir.ui.menu' id='menu_stock_root'>
- <field name="groups_id" eval="[(6,0,[ref('group_stock_manager'),ref('group_stock_user'),ref('base.group_system')])]"/>
- </record>
-
<!-- multi -->
<record model="ir.rule" id="stock_picking_rule">
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 1c5ee23a0dc5fd70a8637f35564cd8eff8896407..831b1dafcb50e7c892ecf98dc341d299af93a0fb 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -632,7 +632,7 @@ class stock_picking(osv.osv):
'move_lines': fields.one2many('stock.move', 'picking_id', 'Internal Moves', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
'auto_picking': fields.boolean('Auto-Picking'),
'address_id': fields.many2one('res.partner.address', 'Address', help="Address of partner"),
- 'partner_id': fields.related('address_id','partner_id',type='many2one',relation='res.partner',string='Partner',store=True),
+ 'partner_id': fields.related('address_id','partner_id',type='many2one',relation='res.partner',string='Partner'),
'invoice_state': fields.selection([
("invoiced", "Invoiced"),
("2binvoiced", "To Be Invoiced"),
@@ -1247,23 +1247,25 @@ class stock_picking(osv.osv):
@param ids: List of Picking Ids
@param context: A standard dictionary for contextual values
"""
- msg=''
for pick in self.browse(cr, uid, ids, context=context):
+ msg=''
+ if pick.auto_picking:
+ continue
type_list = {
- 'out':'Picking List',
- 'in':'Reception',
- 'internal': 'Internal picking',
+ 'out':_("Delivery Order"),
+ 'in':_('Reception'),
+ 'internal': _('Internal picking'),
}
- message = type_list.get(pick.type, _('Document')) + " '" + (pick.name or 'n/a') + "' "
+ message = type_list.get(pick.type, _('Document')) + " '" + (pick.name or '?') + "' "
if pick.min_date:
- msg=datetime.strptime(pick.min_date, '%Y-%m-%d %H:%M:%S').strftime('%Y-%m-%d') + "'."
+ msg= _(' for the ')+ datetime.strptime(pick.min_date, '%Y-%m-%d %H:%M:%S').strftime('%m/%d/%Y')
state_list = {
- 'confirmed': "is scheduled for the '" + msg ,
- 'assigned': 'is ready to process.',
- 'cancel': 'is Cancelled.',
- 'done': 'is processed.',
- 'draft':'is draft.',
- }
+ 'confirmed': _("is scheduled") + msg +'.',
+ 'assigned': _('is ready to process.'),
+ 'cancel': _('is cancelled.'),
+ 'done': _('is done.'),
+ 'draft':_('is in draft state.'),
+ }
message += state_list[pick.state]
self.log(cr, uid, pick.id, message)
return True
@@ -1997,7 +1999,6 @@ class stock_move(osv.osv):
for pick_id in picking_ids:
wf_service.trg_write(uid, 'stock.picking', pick_id, cr)
- picking_obj.log_picking(cr, uid, picking_ids, context=context)
return True
def _create_account_move_line(self, cr, uid, move, src_account_id, dest_account_id, reference_amount, reference_currency_id, context=None):
@@ -2371,7 +2372,7 @@ class stock_inventory(osv.osv):
'state': 'draft',
'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.inventory', context=c)
}
-
+
def _inventory_line_hook(self, cr, uid, inventory_line, move_vals):
""" Creates a stock move from an inventory line
@param inventory_line:
@@ -2507,58 +2508,4 @@ class stock_warehouse(osv.osv):
stock_warehouse()
-
-# Move wizard :
-# get confirm or assign stock move lines of partner and put in current picking.
-class stock_picking_move_wizard(osv.osv_memory):
- _name = 'stock.picking.move.wizard'
-
- def _get_picking(self, cr, uid, ctx=None):
- if ctx is None:
- ctx = {}
- if ctx.get('active_id', False):
- return ctx['active_id']
- return False
-
- def _get_picking_address(self, cr, uid, context=None):
- picking_obj = self.pool.get('stock.picking')
- if context is None:
- context = {}
- if context.get('active_id', False):
- picking = picking_obj.browse(cr, uid, [context['active_id']])[0]
- return picking.address_id and picking.address_id.id or False
- return False
-
- _columns = {
- 'name': fields.char('Name', size=64, invisible=True),
- 'move_ids': fields.many2many('stock.move', 'picking_move_wizard_rel', 'picking_move_wizard_id', 'move_id', 'Entry lines', required=True),
- 'address_id': fields.many2one('res.partner.address', 'Dest. Address', invisible=True),
- 'picking_id': fields.many2one('stock.picking', 'Picking list', select=True, invisible=True),
- }
- _defaults = {
- 'picking_id': _get_picking,
- 'address_id': _get_picking_address,
- }
-
- def action_move(self, cr, uid, ids, context=None):
- move_obj = self.pool.get('stock.move')
- picking_obj = self.pool.get('stock.picking')
- account_move_obj = self.pool.get('account.move')
- for act in self.read(cr, uid, ids):
- move_lines = move_obj.browse(cr, uid, act['move_ids'])
- for line in move_lines:
- if line.picking_id:
- picking_obj.write(cr, uid, [line.picking_id.id], {'move_lines': [(1, line.id, {'picking_id': act['picking_id']})]})
- picking_obj.write(cr, uid, [act['picking_id']], {'move_lines': [(1, line.id, {'picking_id': act['picking_id']})]})
- old_picking = picking_obj.read(cr, uid, [line.picking_id.id])[0]
- if not len(old_picking['move_lines']):
- picking_obj.write(cr, uid, [old_picking['id']], {'state': 'done'})
- else:
- raise osv.except_osv(_('UserError'),
- _('You can not create new moves.'))
- return {'type': 'ir.actions.act_window_close'}
-
-stock_picking_move_wizard()
-
-
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index bce4de8b5939b2e21f1a581db462c74238db31d2..bdc11f208ca3f58ae91489c4403d55fbe052424d 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -244,7 +244,7 @@
</record>
<record id="stock_warehouse_shop1" model="stock.warehouse">
<field name="lot_output_id" ref="stock.stock_location_output"/>
- <field eval=""""Shop 2"""" name="name"/>
+ <field name="name">Shop 2</field>
<field name="lot_stock_id" ref="stock_location_shop1"/>
<field name="partner_address_id" ref="res_partner_address_eric0"/>
<field name="company_id" ref="res_company_tinyshop0"/>
@@ -262,9 +262,8 @@
<field name="type">out</field>
<field name="move_type">direct</field>
<field name="invoice_state">2binvoiced</field>
- <field name="address_id" ref="base.main_address"/>
+ <field name="address_id" ref="res_partner_address_fabien0"/>
<field name="company_id" ref="base.main_company"/>
- <field name="partner_id" ref="base.main_partner"/>
</record>
</data>
</openerp>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 08a00b200b2098c846b5d8b788f1c1ff2f2c91f2..9a53b6d01d2c7bb984866f2bf99718dd94490657 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -3,12 +3,12 @@
<data>
<menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse" groups="group_stock_manager,group_stock_user" sequence="5"/>
- <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1" groups="group_stock_manager,group_stock_user,base.group_extended"/>
+ <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1" groups="base.group_extended"/>
<menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="2"/>
<menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="6"/>
<menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
- <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="15" groups="group_stock_manager,base.group_system"/>
- <menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_configuration" sequence="1" groups="group_stock_manager,base.group_system"/>
+ <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="15" groups="group_stock_manager"/>
+ <menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_configuration" sequence="1" groups="group_stock_manager"/>
<menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="4"/>
<record id="stock_inventory_line_tree" model="ir.ui.view">
@@ -93,6 +93,7 @@
<page string="General Informations">
<field colspan="4" name="inventory_line_id" nolabel="1" widget="one2many_list">
<tree string="Products" editable="bottom">
+ <field colspan="4" domain="[('usage','=','internal')]" name="location_id"/>
<field context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" domain="[('type','<>','service')]"/>
<field name="product_qty"/>
<field name="product_uom"/>
@@ -100,21 +101,20 @@
<button name="%(stock.action_view_stock_inventory_line_split)d"
string="Split inventory lines" groups="base.group_extended"
type="action" icon="terp-stock_effects-object-colorize" states="draft"/>
- <field colspan="4" domain="[('usage','=','internal')]" name="location_id"/>
<field name="state" invisible="True"/>
</tree>
<form string="Products ">
+ <field domain="[('usage','=','internal')]" name="location_id"/>
+ <newline/>
<field colspan="4" context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" domain="[('type','<>','service')]"/>
<field name="product_qty"/>
<field name="product_uom"/>
- <field domain="[('usage','=','internal')]" name="location_id"/>
<group colspan="2" col="4">
<field name="prod_lot_id" groups="base.group_extended"/>
<button name="%(stock.action_view_stock_inventory_line_split)d"
string="Split inventory lines" groups="base.group_extended"
type="action" icon="terp-stock_effects-object-colorize"/>
</group>
-
</form>
</field>
</page><page string="Posted Inventory" groups="base.group_extended">
@@ -151,6 +151,7 @@
<field name="view_id" ref="view_inventory_tree"/>
<field name="context">{'full':'1'}</field>
<field name="search_view_id" ref="view_inventory_filter" />
+ <field name="help">The Periodical Inventories are used when you count your number of products available per location. You can use it, once a year, when you do the general inventory or, once you need it, to correct the current stock level of a product.</field>
</record>
<menuitem action="action_inventory_form" id="menu_action_inventory_form" parent="menu_stock_inventory_control" sequence="30"/>
@@ -209,6 +210,7 @@
<field name="res_model">stock.tracking</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_tracking_tree"/>
+ <field name="help">This is the list of all your packs. After having selected a Pack, you can get the up-stream or down-stream traceability of the products contained in the pack.</field>
</record>
<menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="3"/>
<menuitem action="action_tracking_form" id="menu_action_tracking_form"
@@ -368,6 +370,7 @@
<field name="view_id" ref="view_production_lot_tree"/>
<field name="search_view_id" ref="search_product_lot_filter" />
<field name="context">{'full':'1',"search_default_available":1}</field>
+ <field name="help">This is the list of all the production lots (serial numbers) you recorded. After having selected a lot, you can get the up-stream or down-stream traceability of the products contained in lot.</field>
</record>
<menuitem action="action_production_lot_form" id="menu_action_production_lot_form" parent="menu_traceability" groups="group_stock_user,group_stock_manager,base.group_extended"/>
@@ -507,8 +510,9 @@
<field name="view_id" ref="view_location_tree2"/>
<field name="search_view_id" ref="view_location_search"/>
<field name="context">{'full':1, 'search_default_in_location':1}</field>
+ <field name="help">Define your locations in order to reflect to your warehouse structure and organization. OpenERP is able to manage physical locations (warehouses, shelves, bin, etc), partners location (customers, suppliers) and virtual locations which are the counter-part of the stock operations like the manufacturing orders consummations, the inventories, etc. Every stock operation in OpenERP moves the products from one location to another one. For instance, if you receive products from a supplier, OpenERP will move products from the Supplier location into the Stock location. Each report can be performed on physicals, partners or virtual locations.</field>
</record>
- <menuitem action="action_location_form" id="menu_action_location_form" parent="menu_warehouse_config" groups="base.group_system,group_stock_manager"/>
+ <menuitem action="action_location_form" id="menu_action_location_form" parent="menu_warehouse_config" groups="group_stock_manager"/>
<record id="view_location_tree" model="ir.ui.view">
<field name="name">stock.location.tree</field>
@@ -528,6 +532,7 @@
<field name="domain">[('location_id','=',False)]</field>
<field name="view_type">tree</field>
<field name="view_id" ref="view_location_tree"/>
+ <field name="help">This is the structure of your company's warehouses and locations. You can click on a location in order to get the list of the products and their stock level in this particular location and all its children.</field>
</record>
<menuitem action="action_location_tree" id="menu_action_location_tree" parent="menu_stock_inventory_control" groups="base.group_extended,group_stock_manager" sequence="20"/>
@@ -567,35 +572,9 @@
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_warehouse_tree"/>
+ <field name="help">Create and manage your warehouses and assign them a location from here</field>
</record>
- <menuitem action="action_warehouse_form" id="menu_action_warehouse_form" parent="menu_warehouse_config" groups="group_stock_manager,base.group_system"/>
-
- <record id="stock_picking_move_wizard_form" model="ir.ui.view">
- <field name="name">stock.picking.move.wizard.form</field>
- <field name="model">stock.picking.move.wizard</field>
- <field name="type">form</field>
- <field name="arch" type="xml">
- <form string="Entry Lines">
- <group height="200" width="500">
- <field name="address_id" invisible="True" context="{'contact_display':'partner'}"/>
- <field name="picking_id" invisible="True"/>
- <field domain="[('picking_id','<>',picking_id),('state','in',['confirmed','assigned']),('picking_id.address_id','=',address_id)]" name="move_ids" nolabel="1" height="100" width="500"/><newline/>
- <group colspan="4">
- <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
- <button name="action_move" string="Add" type="object" icon="gtk-add"/>
- </group>
- </group>
- </form>
- </field>
- </record>
-
- <act_window name="Unreceived Products"
- res_model="stock.picking.move.wizard"
- src_model="stock.picking"
- view_mode="form"
- target="new"
- key2="client_action_multi"
- id="act_stock_picking_move_wizard"/>
+ <menuitem action="action_warehouse_form" id="menu_action_warehouse_form" parent="menu_warehouse_config" groups="group_stock_manager"/>
<record model="ir.ui.view" id="stock_picking_calendar">
<field name="name">stock.picking.calendar</field>
@@ -747,7 +726,9 @@
<button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
<button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
<button name="%(action_partial_picking)d" states="assigned" string="Process" type="action" icon="gtk-go-forward"/>
- <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
+ <group colspan="1" states="done">
+ <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
+ </group>
</group>
</page>
<page string="Additional info" groups="base.group_extended,base.group_multi_company">
@@ -775,6 +756,7 @@
<group col="10" colspan="4">
<filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Available Pickings"/>
<filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Pickings"/>
+ <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Pickings already processed"/>
<separator orientation="vertical"/>
<filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" groups="base.group_extended"/>
<separator orientation="vertical"/>
@@ -792,6 +774,10 @@
<separator orientation="vertical" />
<filter string="Journal" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'stock_journal_id'}" groups="base.group_extended"/>
</group>
+ <newline/>
+ <group expand="0" string="Extended Filters..." colspan="4" col="8">
+ <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Internal Pickings to invoice"/>
+ </group>
</search>
</field>
</record>
@@ -806,7 +792,7 @@
<field name="model">stock.picking</field>
<field name="type">tree</field>
<field name="arch" type="xml">
- <tree colors="blue:state in ('draft');grey:state in ('cancel');red:state not in ('cancel', 'done') and date < current_date" string="Picking list">
+ <tree colors="blue:state in ('draft');grey:state in ('cancel');red:state not in ('cancel', 'done') and date < current_date" string="Outgoing Deliveries">
<field name="name"/>
<field name="partner_id"/>
<field name="origin"/>
@@ -825,7 +811,7 @@
<field name="model">stock.picking</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Outgoing Picking list">
+ <form string="Outgoing Deliveries">
<group col="6" colspan="4">
<group colspan="4" col="4">
<field name="name" readonly="1"/>
@@ -934,10 +920,12 @@
<button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
<button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
<button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-yes"/>
- <button name="action_assign" states="confirmed" string="Check Availability" type="object" groups="base.group_extended" icon="gtk-apply"/>
+ <button name="action_assign" states="confirmed" string="Check Availability" type="object" groups="base.group_extended" icon="gtk-find"/>
<button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
<button name="%(action_partial_picking)d" states="assigned" string="Process" type="action" icon="gtk-go-forward"/>
- <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
+ <group colspan="1" states="done">
+ <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
+ </group>
</group>
</page>
<page string="Additional info" groups="base.group_extended,base.group_multi_company">
@@ -962,11 +950,14 @@
<field name="arch" type="xml">
<search string="Picking list">
<group col="8" colspan="4">
- <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Outgoing Orders"/>
- <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Outgoing Orders"/>
+ <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Outgoing Deliveries"/>
+ <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Outgoing Deliveries"/>
+ <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Outgoing Deliveries already processed"/>
<separator orientation="vertical"/>
<filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" groups="base.group_extended"/>
<separator orientation="vertical"/>
+ <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Outgoing Deliveries to invoice"/>
+ <separator orientation="vertical"/>
<field name="name"/>
<field name="partner_id" />
<field name="origin"/>
@@ -989,7 +980,7 @@
</record>
<record id="action_picking_tree" model="ir.actions.act_window">
- <field name="name">Outgoing Orders</field>
+ <field name="name">Outgoing Deliveries</field>
<field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
@@ -997,6 +988,7 @@
<field name="domain">[('type','=','out')]</field>
<field name="context">{'contact_display': 'partner_address', 'search_default_available': 1}</field>
<field name="search_view_id" ref="view_picking_out_search"/>
+ <field name="help">This is the list of all delivery orders that must be prepared, according to your different sales orders and your logistics rules.</field>
</record>
<record id="action_picking_tree_out_view1_waiting" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
@@ -1152,7 +1144,9 @@
<button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
<button name="force_assign" states="confirmed" string="Force Availability" type="object" groups="base.group_extended" icon="gtk-jump-to"/>
<button name="%(action_partial_picking)d" states="assigned" string="Process" type="action" icon="gtk-go-forward"/>
- <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
+ <group colspan="1" states="done">
+ <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
+ </group>
</group>
</page>
<page string="Additional Info" groups="base.group_extended,base.group_multi_company">
@@ -1172,9 +1166,10 @@
<field name="model">stock.picking</field>
<field name="type">search</field>
<field name="arch" type="xml">
- <search string="Input Picking List">
+ <search string="Incoming Shipments">
<group col="8" colspan="4">
- <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Incoming Orders" />
+ <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Incoming Shipments Available" />
+ <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Incoming Shipments already processed"/>
<separator orientation="vertical" />
<filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" groups="base.group_extended"/>
<separator orientation="vertical"/>
@@ -1195,6 +1190,9 @@
<separator orientation="vertical" />
<filter string="Journal" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'stock_journal_id'}" groups="base.group_extended"/>
</group>
+ <group expand="0" string="Extended Filters..." colspan="4" col="8">
+ <filter string="To invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]" />
+ </group>
</search>
</field>
</record>
@@ -1209,6 +1207,7 @@
<field name="domain">[('type','=','in')]</field>
<field name="context">{'contact_display': 'partner_address',"search_default_available":1}</field>
<field name="search_view_id" ref="view_picking_in_search"/>
+ <field name="help">The Incoming Shipments is the list of all orders you will receive from your supplier. An incoming shipment contains a list of products to be received according to the original purchase order. You can validate the shipment totally or partially.</field>
</record>
<record id="action_invoice_tree5_view1" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
@@ -1268,6 +1267,7 @@
<field name="domain">[('type','=','internal')]</field>
<field name="context">{'contact_display': 'partner_address',"search_default_available":1}</field>
<field name="search_view_id" ref="view_picking_internal_search"/>
+ <field name="help">The Internal Moves lists all inventory operations you have to perform in your warehouse. All operations can be categorized into stock journals, so that each worker has it's own list of operations to perform in his own journal. Most operations are prepared automatically by OpenERP according to your pre-configured logistics rules but you can also record manual stock operations.</field>
</record>
<record model="ir.actions.act_window.view" id="action_picking_tree6_tree_view">
@@ -1341,35 +1341,38 @@
<field eval="4" name="priority"/>
<field name="arch" type="xml">
<form string="Stock Moves">
- <group colspan="2" col="4">
- <separator colspan="4" string="Move Information"/>
- <field name="name" colspan="4"/>
- <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.address_id)" colspan="4"/>
- <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="3"/>
+ <group colspan="4" col="7">
+ <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
+ <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+ <field name="product_uom" string="Unit Of Measure" widget="selection"/>
<button name="%(stock.move_scrap)d" groups="base.group_extended"
string="Scrap" type="action"
icon="gtk-convert" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned" colspan="1"/>
- <field name="product_uom" string="Unit Of Measure" widget="selection" colspan="4"/>
+ <newline/>
+ <field name="location_id" context="{'full':True}"/>
+ <field name="location_dest_id" context="{'full':True}"/>
+ <field name="address_id" context="{'contact_display':'partner'}"/>
+
+ </group>
+ <group colspan="2" col="2">
+ <separator colspan="2" string="Move Information"/>
+ <field name="name" string="Reason"/>
<field name="product_uos_qty" groups="product.product_uos" colspan="4"/>
<field name="product_uos" groups="product.product_uos" colspan="4"/>
</group>
<group colspan="2" col="2">
- <separator string="Locations & Picking" colspan="2" />
- <field name="location_id" widget="selection"/>
- <field name="location_dest_id" widget="selection"/>
+ <separator string="Picking" colspan="2" />
<field name="picking_id"/>
- <field name="address_id" context="{'contact_display':'partner'}"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
<group colspan="2" col="2">
- <separator string="Dates & Priority" colspan="2" />
- <field name="create_date"/>
- <field name="date"/>
+ <separator string="Dates" colspan="2" />
+ <field name="create_date" groups="base.group_extended"/>
+ <field name="date" groups="base.group_extended"/>
<field name="date_expected"/>
- <field name="priority"/>
</group>
<group colspan="2" col="4" groups="base.group_extended">
@@ -1392,10 +1395,10 @@
<separator colspan="4"/>
<field name="state"/>
<group col="4" colspan="2">
- <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
- <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
+ <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
+ <button name="force_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
<button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
- <button name="action_done" states="assigned" string="Process" type="object" icon="gtk-jump-to"/>
+ <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object" icon="gtk-jump-to"/>
</group>
</form>
</field>
@@ -1455,6 +1458,7 @@
<field name="view_id" ref="view_move_tree"/>
<field name="search_view_id" ref="view_move_search"/>
<field name="context">{'search_default_Available':1}</field>
+ <field name="help">This menu gives you the full traceability of inventory operations made on a specific product. You can filter on the product to see all the past or future movements made on the product.</field>
</record>
<menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability" sequence="1"/>
@@ -1528,36 +1532,39 @@
<field name="type">form</field>
<field eval="6" name="priority"/>
<field name="arch" type="xml">
- <form string="Moves">
- <group colspan="2" col="4">
- <separator colspan="4" string="Move Information"/>
- <field name="name" colspan="4"/>
- <field name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id, address_id)" colspan="4"/>
- <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="3"/>
+ <form string="Receive Products">
+ <group colspan="4" col="7">
+ <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
+ <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+ <field name="product_uom" string="Unit Of Measure" widget="selection"/>
<button name="%(stock.move_scrap)d" groups="base.group_extended"
string="Scrap" type="action"
icon="gtk-convert" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned" colspan="1"/>
- <field name="product_uom" widget="selection" colspan="4"/>
+ <newline/>
+ <field name="location_id" context="{'full':True}"/>
+ <field name="location_dest_id" context="{'full':True}"/>
+ <field name="address_id" context="{'contact_display':'partner'}"/>
+
+ </group>
+ <group colspan="2" col="2">
+ <separator colspan="2" string="Move Information"/>
+ <field name="name" string="Reason"/>
<field name="product_uos_qty" groups="product.product_uos" colspan="4"/>
- <field name="product_uos" widget="selection" groups="product.product_uos" colspan="4"/>
+ <field name="product_uos" groups="product.product_uos" colspan="4"/>
</group>
<group colspan="2" col="2">
- <separator string="Locations & Picking" colspan="2" />
- <field name="location_id" widget="selection"/>
- <field name="location_dest_id" widget="selection"/>
+ <separator string="Picking" colspan="2" />
<field name="picking_id"/>
- <field name="address_id" context="{'contact_display':'partner'}"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
<group colspan="2" col="2">
- <separator string="Dates & Priority" colspan="2" />
- <field name="create_date"/>
- <field name="date"/>
+ <separator string="Dates" colspan="2" />
+ <field name="create_date" groups="base.group_extended"/>
+ <field name="date" groups="base.group_extended"/>
<field name="date_expected"/>
- <field name="priority"/>
</group>
<group colspan="2" col="4" groups="base.group_extended">
@@ -1566,7 +1573,7 @@
<button name="%(split_into)d" string="New pack" type="action"
groups="base.group_extended"
icon="terp-stock_effects-object-colorize"
- states="draft,assigned,confirmed,done"/>
+ states="draft,assigned,confirmed,done" colspan="1"/>
<field name="prodlot_id" groups="base.group_extended"
context="{'location_id':location_id, 'product_id':product_id}"
domain="[('product_id','=?',product_id)]"
@@ -1574,16 +1581,17 @@
<button name="%(track_line)d"
groups="base.group_extended"
states="draft,waiting,confirmed,assigned,done"
- string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1" />
+ string="Split" type="action" icon="terp-stock_effects-object-colorize" colspan="1"/>
</group>
+
<separator colspan="4"/>
<field name="state"/>
<group col="5" colspan="2">
- <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
- <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
<button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
- <button name="%(action_partial_move)d" states="assigned,confirmed" string="Partial" type="action" icon="gtk-justify-fill"/>
- <button name="action_done" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
+ <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
+ <button name="force_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
+ <button name="%(action_partial_move)d" states="assigned" string="Partial" type="action" icon="gtk-justify-fill"/>
+ <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object" icon="gtk-jump-to"/>
</group>
</form>
</field>
@@ -1661,15 +1669,16 @@
</record>
<record id="action_reception_picking_move" model="ir.actions.act_window">
- <field name="name">Incoming Products</field>
+ <field name="name">Receive Products</field>
<field name="res_model">stock.move</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">['|','&',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','in')]</field>
<field name="view_id" ref="view_move_tree_reception_picking"/>
- <field name="context">{"search_default_receive":1}</field>
+ <field name="context" eval="'{\'search_default_receive\':1, \'default_location_id\':%d, \'default_location_dest_id\':%d}' % (ref('stock_location_suppliers'),ref('stock_location_stock'))"/>
<field name="search_view_id" ref="view_move_search_reception_incoming_picking"/>
+ <field name="help">You will find here the list of all products you are waiting for, according to your preceding purchase orders. Once you receive an order, you can filter based on the name of the supplier or the purchase order reference. Then you can confirm all products received using the buttons on the right of each line.</field>
</record>
<record model="ir.actions.act_window.view" id="action_move_reception_picking_tree">
@@ -1795,15 +1804,16 @@
</record>
<record id="action_out_picking_move" model="ir.actions.act_window">
- <field name="name">Outgoing Products</field>
+ <field name="name">Deliver Products</field>
<field name="res_model">stock.move</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">['|','&',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','out')]</field>
<field name="view_id" ref="view_move_tree_reception_picking"/>
- <field name="context">{"search_default_receive":1}</field>
+ <field name="context" eval="'{\'search_default_receive\':1, \'default_location_id\':%d, \'default_location_dest_id\':%d}' % (ref('stock_location_stock'),ref('stock_location_customers'))"/>
<field name="search_view_id" ref="view_move_search_reception_outcoming_picking"/>
+ <field name="help">The 'Deliver Products' menu lists all products you have to deliver to your customers. You can process the deliveries directly from this list, line by or line or through the Delivery Orders menu.</field>
</record>
<record model="ir.actions.act_window.view" id="action_move_out_picking_tree">
@@ -1815,7 +1825,7 @@
<record model="ir.actions.act_window.view" id="action_move_out_picking_form">
<field name="sequence" eval="2"/>
<field name="view_mode">form</field>
- <field name="view_id" ref="view_move_form_reception_picking"/>
+ <field name="view_id" ref="view_move_form"/>
<field name="act_window_id" ref="action_out_picking_move"/>
</record>
@@ -1861,6 +1871,7 @@
<field name="res_model">stock.journal</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
+ <field name="help">The stock journals system allows you assign each stock operation into a specific journal according to the type of operation to perform or the worker/team that should perform the operation. Examples of stock journals may be: quality control, pick lists, packing, etc.</field>
</record>
<menuitem
action="action_stock_journal_form"
diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py
index f6021e0fbe2929a203d9fa7d72ddcc8a2bc5853d..5e35e0e729731f51c3acc7cb42dad99f36a8214d 100644
--- a/addons/stock/wizard/__init__.py
+++ b/addons/stock/wizard/__init__.py
@@ -32,8 +32,7 @@ import stock_inventory_line_split
import stock_invoice_onshipping
import stock_location_product
import stock_change_standard_price
-import stock_picking_make
import stock_return_picking
-import stock_picking_make
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/stock_fill_inventory_view.xml b/addons/stock/wizard/stock_fill_inventory_view.xml
index 3db42eb7be589def2772dc57797d076f31180f45..c97a662c84643c3ed05477d4d75e0502e8b9c29e 100644
--- a/addons/stock/wizard/stock_fill_inventory_view.xml
+++ b/addons/stock/wizard/stock_fill_inventory_view.xml
@@ -1,33 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
- <record id="view_stock_fill_inventory" model="ir.ui.view">
+ <record id="view_stock_fill_inventory" model="ir.ui.view">
<field name="name">Import Inventory</field>
<field name="model">stock.fill.inventory</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Import Inventory">
- <separator string="Import current product inventory from the following location" colspan="4" />
- <field name="location_id"/>
- <newline/>
- <field name="recursive"/>
- <newline/>
- <field name="set_stock_zero"/>
- <separator string="" colspan="4" />
- <button special="cancel" string="_Cancel" icon='gtk-cancel'/>
- <button name="fill_inventory" string="Fill Inventory" type="object" icon="gtk-ok"/>
+ <separator string="Import current product inventory from the following location" colspan="4" />
+ <field name="location_id"/>
+ <newline/>
+ <field name="recursive"/>
+ <newline/>
+ <field name="set_stock_zero"/>
+ <separator string="" colspan="4" />
+ <button special="cancel" string="_Cancel" icon='gtk-cancel'/>
+ <button name="fill_inventory" string="Fill Inventory" type="object" icon="gtk-ok"/>
</form>
</field>
- </record>
+ </record>
- <act_window name="Import Inventory"
- res_model="stock.fill.inventory"
- src_model="stock.inventory"
- view_mode="form"
- target="new"
- context="{'search_default_in_location':1}"
+ <act_window name="Import Inventory"
+ res_model="stock.fill.inventory"
+ src_model="stock.inventory"
+ view_mode="form"
+ target="new"
+ context="{'search_default_in_location':1}"
key2="client_action_multi"
- id="action_view_stock_fill_inventory"/>
+ id="action_view_stock_fill_inventory"/>
</data>
</openerp>
diff --git a/addons/stock/wizard/stock_inventory_merge_view.xml b/addons/stock/wizard/stock_inventory_merge_view.xml
index 62cac877179c0e4733fe433fdc0d3296c2ba8be1..7a4735bdf41589fd7be1ad02f5182c92e4ae9cbc 100644
--- a/addons/stock/wizard/stock_inventory_merge_view.xml
+++ b/addons/stock/wizard/stock_inventory_merge_view.xml
@@ -22,6 +22,7 @@
res_model="stock.inventory.merge"
src_model="stock.inventory"
view_mode="form"
+ multi="True"
target="new"
key2="client_action_multi"
id="action_view_stock_merge_inventories"/>
diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py
index 7e0693b904504a910f38285682a224d796433a16..d841c7cb37a4505dd76381cb0ff96659cf499156 100644
--- a/addons/stock/wizard/stock_invoice_onshipping.py
+++ b/addons/stock/wizard/stock_invoice_onshipping.py
@@ -29,95 +29,77 @@ class stock_invoice_onshipping(osv.osv_memory):
_columns = {
'journal_id': fields.many2one('account.journal', 'Destination Journal', required=True),
'group': fields.boolean("Group by partner"),
- 'type': fields.selection([('out_invoice', 'Customer Invoice'),
- ('in_invoice', 'Supplier Invoice'),
- ('out_refund', 'Customer Refund'),
- ('in_refund', 'Supplier Refund')] , 'Type', required=True),
'invoice_date': fields.date('Invoiced date'),
}
- def _get_type(self, cr, uid, context=None):
- """ To get invoice type.
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param ids: The ID or list of IDs if we want more than one
- @param context: A standard dictionary
- @return: Invoice type
- """
+ def view_init(self, cr, uid, fields_list, context=None):
if context is None:
context = {}
- picking_obj = self.pool.get('stock.picking')
- src_usage = dest_usage = None
- pick = picking_obj.browse(cr, uid, context['active_id'], context=context)
- if pick.invoice_state == 'invoiced':
- raise osv.except_osv(_('UserError'), _('Invoice is already created.'))
- if pick.invoice_state == 'none':
- raise osv.except_osv(_('UserError'), _('This picking does not require any invoicing.'))
- if pick.move_lines:
- src_usage = pick.move_lines[0].location_id.usage
- dest_usage = pick.move_lines[0].location_dest_id.usage
- if pick.type == 'out' and dest_usage == 'supplier':
- type = 'in_refund'
- elif pick.type == 'out' and dest_usage == 'customer':
- type = 'out_invoice'
- elif pick.type == 'in' and src_usage == 'supplier':
- type = 'in_invoice'
- elif pick.type == 'in' and src_usage == 'customer':
- type = 'out_refund'
- else:
- type = 'out_invoice'
- return type
+ res = super(stock_invoice_onshipping, self).view_init(cr, uid, fields_list, context=context)
+ pick_obj = self.pool.get('stock.picking')
+ count = 0
+ active_ids = context.get('active_ids',[])
+ for pick in pick_obj.browse(cr, uid, active_ids):
+ if pick.invoice_state != '2binvoiced':
+ count += 1
+ if len(active_ids) == 1 and count:
+ raise osv.except_osv(_('Warning !'), _('This picking list does not require invoicing.'))
+ if len(active_ids) == count:
+ raise osv.except_osv(_('Warning !'), _('None of these picking lists require invoicing.'))
+ return res
- _defaults = {
- 'type': _get_type,
- }
+ def _get_type(self, pick):
+ src_usage = dest_usage = None
+ pick_type = None
+ if pick.invoice_state=='2binvoiced':
+ if pick.move_lines:
+ src_usage = pick.move_lines[0].location_id.usage
+ dest_usage = pick.move_lines[0].location_dest_id.usage
+ if pick.type == 'out' and dest_usage == 'supplier':
+ pick_type = 'in_refund'
+ elif pick.type == 'out' and dest_usage == 'customer':
+ pick_type = 'out_invoice'
+ elif pick.type == 'in' and src_usage == 'supplier':
+ pick_type = 'in_invoice'
+ elif pick.type == 'in' and src_usage == 'customer':
+ pick_type = 'out_refund'
+ else:
+ pick_type = 'out_invoice'
+ return pick_type
- def create_invoice(self, cr, uid, ids, context):
- """ To create invoice
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param ids: the ID or list of IDs if we want more than one
- @param context: A standard dictionary
- @return: Invoice ids
- """
+ def create_invoice(self, cr, uid, ids, context=None):
+ if context is None:
+ context = {}
result = []
picking_obj = self.pool.get('stock.picking')
- mod_obj = self.pool.get('ir.model.data')
- act_obj = self.pool.get('ir.actions.act_window')
+ onshipdata_obj = self.read(cr, uid, ids[0], ['journal_id', 'group', 'invoice_date'])
+ if context.get('new_picking', False):
+ onshipdata_obj['id'] = onshipdata_obj.new_picking
+ onshipdata_obj[ids] = onshipdata_obj.new_picking
- for onshipdata_obj in self.read(cr, uid, ids, ['journal_id', 'group', 'type', 'invoice_date']):
- if context.get('new_picking', False):
- onshipdata_obj[id] = onshipdata_obj.new_picking
- onshipdata_obj[ids] = onshipdata_obj.new_picking
+ context['date_inv'] = onshipdata_obj['invoice_date']
+ invoice_ids = []
+ for picking in picking_obj.browse(cr, uid, context.get('active_ids', []), context=context):
+ if picking.invoice_state == '2binvoiced':
+ res = picking_obj.action_invoice_create(cr, uid, [picking.id],
+ journal_id = onshipdata_obj['journal_id'],
+ group=onshipdata_obj['group'],
+ type=self._get_type(picking),
+ context=context)
+ invoice_ids.extend(res.values())
- type = onshipdata_obj['type']
- context['date_inv'] = onshipdata_obj['invoice_date']
- res = picking_obj.action_invoice_create(cr, uid,context['active_ids'],
- journal_id = onshipdata_obj['journal_id'],
- group=onshipdata_obj['group'],
- type=type,
- context=context)
- invoice_ids = res.values()
- if not invoice_ids:
- raise osv.except_osv(_('Error'), _('Invoice is not created'))
-
- if type == 'out_invoice':
- xml_id = 'action_invoice_tree1'
- elif type == 'in_invoice':
- xml_id = 'action_invoice_tree2'
- elif type == 'out_refund':
- xml_id = 'action_invoice_tree3'
- else:
- xml_id = 'action_invoice_tree4'
+ if not invoice_ids:
+ raise osv.except_osv(_('Error'), _('No invoice were created'))
- result = mod_obj._get_id(cr, uid, 'account', xml_id)
- id = mod_obj.read(cr, uid, result, ['res_id'], context=context)
- result = act_obj.read(cr, uid, id['res_id'], context=context)
- result['res_id'] = invoice_ids
- result['context'] = context
- return result
+ return {
+ 'domain': "[('id','in', ["+','.join(map(str,invoice_ids))+"])]",
+ 'name' : _('New picking invoices'),
+ 'view_type': 'form',
+ 'view_mode': 'tree,form',
+ 'res_model': 'account.invoice',
+ 'context': context,
+ 'type': 'ir.actions.act_window',
+ }
stock_invoice_onshipping()
diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml
index 6284121553c809cf58cc1f104b19df0b0c978da0..6a4cfec5fcab31160174cda30758ac3b5f45de68 100644
--- a/addons/stock/wizard/stock_invoice_onshipping_view.xml
+++ b/addons/stock/wizard/stock_invoice_onshipping_view.xml
@@ -1,36 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
- <record id="view_stock_invoice_onshipping" model="ir.ui.view">
+ <record id="view_stock_invoice_onshipping" model="ir.ui.view">
<field name="name">Stock Invoice Onshipping</field>
<field name="model">stock.invoice.onshipping</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Create invoices">
- <separator colspan="4" string="Create invoices" />
- <field name="journal_id"/>
- <newline/>
- <field name="group"/>
- <newline/>
- <field name="type"/>
- <newline/>
- <field name="invoice_date" />
- <separator string="" colspan="4" />
- <button special="cancel" string="_Cancel" icon='gtk-cancel'/>
- <button name="create_invoice" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl"/>
+ <form string="Create invoice">
+ <separator colspan="4" string="Create invoice" />
+ <field name="journal_id"/>
+ <newline/>
+ <field name="group"/>
+ <newline/>
+ <field name="invoice_date" />
+ <separator string="" colspan="4" />
+ <button special="cancel" string="_Cancel" icon='gtk-cancel'/>
+ <button name="create_invoice" string="Create" type="object" icon="terp-gtk-go-back-rtl"/>
</form>
</field>
- </record>
+ </record>
- <record id="action_stock_invoice_onshipping" model="ir.actions.act_window">
- <field name="name">Create Invoice</field>
- <field name="res_model">stock.invoice.onshipping</field>
- <field name="type">ir.actions.act_window</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="view_id" ref="view_stock_invoice_onshipping"/>
- <field name="target">new</field>
- </record>
-
+
+ <act_window name="Create invoice"
+ res_model="stock.invoice.onshipping"
+ src_model="stock.picking"
+ key2="client_action_multi"
+ multi="True"
+ view_mode="form"
+ view_type="form"
+ target="new"
+ id="action_stock_invoice_onshipping"/>
</data>
</openerp>
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 1b746f230b5fc0bf9cbb7d42346b7bd195fb7e75..6f84e5ec12c3ab268db9dffcb9086b7dffaf3ef4 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -60,13 +60,10 @@ class stock_partial_picking(osv.osv_memory):
result = super(stock_partial_picking, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)
pick_obj = self.pool.get('stock.picking')
picking_ids = context.get('active_ids', False)
- _moves_arch_lst = """<form string="Deliver Products">
- <separator colspan="4" string="Delivery Information"/>
- <group colspan="4" col="4">
- <field name="date"/>
- </group>
- <separator colspan="4" string="Move Detail"/>
- """
+ _moves_arch_lst = """<form string="%s">
+ <field name="date" invisible="1"/>
+ <separator colspan="4" string="%s"/>
+ """ % (_('Process Document'), _('Products'))
_moves_fields = result['fields']
if picking_ids and view_type in ['form']:
for pick in pick_obj.browse(cr, uid, picking_ids, context):
@@ -101,13 +98,20 @@ class stock_partial_picking(osv.osv_memory):
}
})
+ invisible = "1"
+ if pick.type=='in' and m.product_id.track_incoming:
+ invisible=""
+ if pick.type=='out' and m.product_id.track_outgoing:
+ invisible=""
+
+
_moves_arch_lst += """
<group colspan="4" col="10">
<field name="move%s_product_id" nolabel="1"/>
- <field name="move%s_product_qty" string="Qty" />
+ <field name="move%s_product_qty"/>
<field name="move%s_product_uom" nolabel="1" />
- <field name="move%s_prodlot_id" domain="[('product_id','=',move%s_product_id)]" groups="base.group_extended" />
- """%(m.id, m.id, m.id, m.id,m.id)
+ <field name="move%s_prodlot_id" domain="[('product_id','=',move%s_product_id)]" invisible="%s" />
+ """%(m.id, m.id, m.id, m.id,m.id, invisible)
if (need_product_cost and m.product_id.cost_method == 'average'):
_moves_fields.update({
diff --git a/addons/stock/wizard/stock_picking_make.py b/addons/stock/wizard/stock_picking_make.py
deleted file mode 100644
index 9d26595f00e0e415e81716e5b57608c3dcf0cb94..0000000000000000000000000000000000000000
--- a/addons/stock/wizard/stock_picking_make.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields, osv
-import netsvc
-
-class stock_picking_make(osv.osv_memory):
- _name = 'stock.picking.make'
- _description = "Make Picking"
-
- _columns = {
- 'picking_ids': fields.many2many('stock.picking', 'stock_picking_ids', 'parent_id', 'child_id', 'Pickings'),
- }
-
- def default_get(self, cursor, user, fields, context):
- """
- To get default values for the object.
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param fields: List of fields for which we want default values
- @param context: A standard dictionary
- @return: A dictionary which of fields with values.
- """
- res = super(stock_picking_make, self).default_get(cursor, user, fields, context=context)
- record_ids = context and context.get('active_ids',False) or False
- if record_ids:
- picking_obj = self.pool.get('stock.picking')
- picking_ids = picking_obj.search(cursor, user, [
- ('id', 'in', record_ids),
- ('state', '<>', 'done'),
- ('state', '<>', 'cancel')], context=context)
- res['picking_ids'] = picking_ids
- return res
-
- def make_packing(self, cursor, user, ids, context):
- """
- Make Picking.
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param fields: List of fields for which we want default values
- @param context: A standard dictionary
- @return: A dictionary which of fields with values.
- """
- record_ids = context and context.get('active_ids',False) or False
- wkf_service = netsvc.LocalService('workflow')
- picking_obj = self.pool.get('stock.picking')
- data = self.read(cursor, user, ids[0])
- pick_ids = data['picking_ids']
- picking_obj.force_assign(cursor, user, pick_ids)
- picking_obj.action_move(cursor, user, pick_ids)
- for picking_id in ids:
- wkf_service.trg_validate(user, 'stock.picking', picking_id,
- 'button_done', cursor)
- return {}
-
-stock_picking_make()
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/stock/wizard/stock_picking_make_view.xml b/addons/stock/wizard/stock_picking_make_view.xml
deleted file mode 100644
index 4ecebed10315a20285281dbfba55ca2269f395ec..0000000000000000000000000000000000000000
--- a/addons/stock/wizard/stock_picking_make_view.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
- <data>
-
- <record id="view_stock_make_picking_wizard" model="ir.ui.view">
- <field name="name">Make Picking</field>
- <field name="model">stock.picking.make</field>
- <field name="type">form</field>
- <field name="arch" type="xml">
- <form string="Make Picking">
- <field name="picking_ids" nolabel="1" colspan="4"
- width="600" height="300"/>
- <separator string="" colspan="4" />
- <button icon='gtk-cancel' special="cancel"
- string="_Cancel" />
- <button name="make_packing" string="Ok"
- type="object" icon="gtk-apply" />
- </form>
- </field>
- </record>
-
- <record id="act_stock_make_picking_wizard" model="ir.actions.act_window">
- <field name="name">Make Picking</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">stock.picking.make</field>
- <field name="view_type">form</field>
- <field name="view_mode">form</field>
- <field name="target">new</field>
- </record>
- </data>
-</openerp>
diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index 4bddc9a7ee458c74c3acf62920cf8bb36fb3ca74..788522024401cd8f9c8ce31c3f017447a184a207 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -83,7 +83,7 @@ class stock_return_picking(osv.osv_memory):
if 'return%s'%(m.id) not in self._columns:
self._columns['return%s'%(m.id)] = fields.float(string=m.name, required=True)
if 'invoice_state' not in self._columns:
- self._columns['invoice_state'] = fields.selection([('2binvoiced', 'To be Invoiced'), ('none', 'None')], string='Invoice State', required=True)
+ self._columns['invoice_state'] = fields.selection([('2binvoiced', 'To be refunded/invoiced'), ('none', 'No invoicing')], string='Invoicing', required=True)
if not valid_lines:
raise osv.except_osv(_('Warning !'), _("There are no products to return (only lines in Done state and not fully returned yet can be returned)!"))
return res
@@ -119,7 +119,7 @@ class stock_return_picking(osv.osv_memory):
res['fields']['return%s' % m.id]={'string':m.name, 'type':'float', 'required':True}
res.setdefault('returns', []).append(m.id)
arch_lst.append('<field name="invoice_state"/>\n<newline/>')
- res['fields']['invoice_state']={'string':_('Invoice state'), 'type':'selection','required':True, 'selection':[('2binvoiced', _('To Be Invoiced')), ('none', _('None'))]}
+ res['fields']['invoice_state']={'string':_('Invoicing'), 'type':'selection','required':True, 'selection':[('2binvoiced', _('To be refunded/invoiced')), ('none', _('No invoicing'))]}
arch_lst.append('<group col="2" colspan="4">')
arch_lst.append('<button icon="gtk-cancel" special="cancel" string="Cancel" />')
arch_lst.append('<button name="create_returns" string="Return" colspan="1" type="object" icon="gtk-apply" />')
diff --git a/addons/stock_invoice_directly/test/stock_invoice_directly.yml b/addons/stock_invoice_directly/test/stock_invoice_directly.yml
index 6a7e99276b9a155d89e4748f411221016c194dc3..4a0708b84d97c3319aa8649d440dce2f7fa3d175 100644
--- a/addons/stock_invoice_directly/test/stock_invoice_directly.yml
+++ b/addons/stock_invoice_directly/test/stock_invoice_directly.yml
@@ -65,7 +65,6 @@
!record {model: stock.invoice.onshipping, id: stock_invoice_onshipping_0}:
invoice_date: '2010-08-04'
journal_id: account.bank_journal
- type: out_invoice
-
I create a Customer invoice for my outgoing picking order.
-
@@ -82,4 +81,4 @@
partner = picking[0].address_id.partner_id.id
inv_ids = self.search(cr, uid, [('type','=','out_invoice'),('partner_id','=',partner)])
assert inv_ids, 'No Invoice is generated!'
-
\ No newline at end of file
+
diff --git a/addons/stock_location/procurement_pull.py b/addons/stock_location/procurement_pull.py
index 8b780d7a7a67c92a4d38f2a45d38ab177c20ba3d..31316bf4eae669459d99ff0b12cc50269936bbb7 100644
--- a/addons/stock_location/procurement_pull.py
+++ b/addons/stock_location/procurement_pull.py
@@ -42,8 +42,6 @@ class procurement_order(osv.osv):
for procurement in self.browse(cr, uid, ids):
for line in procurement.product_id.flow_pull_ids:
if line.location_id==procurement.location_id:
- if not line.location_src_id:
- self.write(cr, uid, procurement.id, {'message': _('No source location defined to generate the picking !')})
return (line.type_proc=='move') and (line.location_src_id)
return False
diff --git a/addons/stock_location/stock_location_view.xml b/addons/stock_location/stock_location_view.xml
index eca4ade39fa5c9125003228ef8949e692b722be2..96d3fd8480930d97d1751ba0d840ff9dd57eb5d4 100644
--- a/addons/stock_location/stock_location_view.xml
+++ b/addons/stock_location/stock_location_view.xml
@@ -43,7 +43,7 @@
<page string="Logistic Flow">
<field name="flow_pull_ids" editable="bottom" colspan="4" nolabel="1">
<tree string="Pulled flows">
- <field name="location_id"/>
+ <field name="location_id" attrs="{'required': [('type_proc', '=', 'move')]}"/>
<field name="type_proc"/>
<field name="name"/>
<field name="company_id" groups="base.group_multi_company"/>
@@ -59,7 +59,7 @@
<field name="company_id" groups="base.group_multi_company"/>
<newline/>
<group col="4" colspan="4" attrs="{'invisible':[('type_proc','!=','move')]}">
- <field name="location_src_id"/>
+ <field name="location_src_id" attrs="{'required': [('type_proc', '=', 'move')]}"/>
<field name="picking_type"/>
<field name="partner_address_id"/>
<field name="procure_method"/>
diff --git a/addons/stock_no_autopicking/i18n/it.po b/addons/stock_no_autopicking/i18n/it.po
index bc0cc16eef2846fbae9612eeb1da84c941532ed7..0486af4d8db2dadf235f71c5a53526fd558d59e4 100644
--- a/addons/stock_no_autopicking/i18n/it.po
+++ b/addons/stock_no_autopicking/i18n/it.po
@@ -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: 2009-02-03 09:22+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-10-17 07:58+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-10-18 04:55+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock_no_autopicking
@@ -24,7 +24,7 @@ msgstr "XML non valido per Visualizzazione Architettura!"
#. module: stock_no_autopicking
#: field:product.product,auto_pick:0
msgid "Auto Picking"
-msgstr ""
+msgstr "Scelta Automatica"
#. module: stock_no_autopicking
#: help:product.product,auto_pick:0
diff --git a/addons/stock_planning/security/ir.model.access.csv b/addons/stock_planning/security/ir.model.access.csv
index d4d543e25c444da86afd7ce34573e97dc9dcf5b4..d83c6d2f4d8f4c41a12bcdf96a67e99fd613e57e 100644
--- a/addons/stock_planning/security/ir.model.access.csv
+++ b/addons/stock_planning/security/ir.model.access.csv
@@ -1,8 +1,5 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_stock_planning_system","stock.planning system","model_stock_planning","base.group_system",1,0,0,0
"access_stock_planning_manager","stock.planning manager","model_stock_planning","stock.group_stock_manager",1,0,0,0
"access_stock_planning_user","stock.planning user","model_stock_planning","stock.group_stock_user",1,1,1,1
-"access_stock_period_","stock.period","model_stock_period","base.group_system",1,1,1,1
"access_stock_sale_forecast_user","stock.sale.forecast user","model_stock_sale_forecast","base.group_sale_salesman",1,1,1,1
"access_stock_sale_forecast_manager","stock.sale.forecast manager","model_stock_sale_forecast","base.group_sale_manager",1,0,0,0
-"access_stock_sale_forecast_system","stock.sale.forecast system","model_stock_sale_forecast","base.group_system",1,0,0,0
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 704703cb13adb0f2c33fc390d70120a6708952d9..8d8c3cd37906c1d71be8a4ce794271e9f85cb9cc 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -3,7 +3,7 @@
<data>
<menuitem id="menu_stock_period_main"
name="Stock and Sales Periods"
- parent="base.menu_base_config" groups="base.group_system" sequence="20"/>
+ parent="base.menu_base_config" sequence="20"/>
<!-- Periods tree and form section -->
@@ -182,7 +182,7 @@
<!-- Forecast section -->
<menuitem id="menu_stock_sale_forecast" name="Sales Forecasts"
- parent="base.menu_base_partner" sequence="6" groups="base.group_extended,base.group_system"/>
+ parent="base.menu_base_partner" sequence="6" groups="base.group_extended"/>
<record id="view_stock_sale_forecast_filter" model="ir.ui.view">
<field name="name">stock.sale.forecast.list.select</field>
diff --git a/addons/survey/report/survey_browse_response.py b/addons/survey/report/survey_browse_response.py
index 2cdb98622a91629b624eb3d798690e12388f939a..a2ee95e417eb03fa48e5ff31041053ad9a0a2af9 100644
--- a/addons/survey/report/survey_browse_response.py
+++ b/addons/survey/report/survey_browse_response.py
@@ -204,6 +204,7 @@ class survey_browse_response(report_rml):
rml += """<blockTable colWidths='""" + colwidth + """' style="Table_heading">
<tr>
<td><para style="terp_tblheader_General_Centre">Answer Create Date:- </para></td>
+ # *-* formatting hard coded, breaks with utf8
<td><para style="terp_tblheader_General_Centre_simple">""" + to_xml(time.strftime('%d-%m-%Y %I:%M:%S %p', time.strptime(response.date_create.split('.')[0], '%Y-%m-%d %H:%M:%S'))) + """</para></td>
<td><para style="terp_tblheader_General_Centre"></para></td>
<td><para style="terp_tblheader_General_right">Answer By:- </para></td>
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 57a78e9ac5d8eb1d1fd24b771a6fb653be2c29aa..5343ef3c229ce91bb8a07f3fe379edc55173e16a 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -68,6 +68,7 @@ class survey(osv.osv):
'users': fields.many2many('res.users', 'survey_users_rel', 'sid', 'uid', 'Users'),
'send_response': fields.boolean('E-mail Notification on Answer'),
'type': fields.many2one('survey.type', 'Type'),
+ 'invited_user_ids': fields.many2many('res.users', 'survey_invited_user_rel', 'sid', 'uid', 'Invited User'),
}
_defaults = {
'state': lambda * a: "draft",
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 44bcb4475b5ec437b3c995247f6477a4ad62bfb5..713f3dbf7a4faee3a99abda43c5f1cff7bb10647 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -206,6 +206,9 @@
<separator colspan="4" string="Survey Details"/>
<field name="note" colspan="4" nolabel="1"/>
</page>
+ <page string="Invited User">
+ <field name="invited_user_ids" nolabel="1" readonly="1"/>
+ </page>
<page string="History">
<field name="date_open" select="1"/>
<field name="date_close"/>
diff --git a/addons/survey/wizard/survey_selection.py b/addons/survey/wizard/survey_selection.py
index 69cc8e1079697ecfb2f02dbf03706db847c114b7..0f7ca8628f0a52441f96abfeefe052b76a9fcd63 100644
--- a/addons/survey/wizard/survey_selection.py
+++ b/addons/survey/wizard/survey_selection.py
@@ -62,9 +62,20 @@ class survey_name_wiz(osv.osv_memory):
for sur in surv_obj.browse(cr, uid, [context.get('survey_id',False)]):
result.append((sur.id, sur.title))
return result
+ survey_user_group_id = self.pool.get('res.groups').search(cr, uid, [('name', '=', 'Survey / User')])
group_id = self.pool.get('res.groups').search(cr, uid, [('name', 'in', ('Tools / Manager','Tools / User','Survey / User'))])
user_obj = self.pool.get('res.users')
user_rec = user_obj.read(cr, uid, uid)
+ if survey_user_group_id:
+ if survey_user_group_id == user_rec['groups_id']:
+ for sur in surv_obj.browse(cr, uid, surv_obj.search(cr, uid, [])):
+ if sur.state == 'open':
+ u_list = []
+ for use in sur.invited_user_ids:
+ u_list.append(use.id)
+ if uid in u_list:
+ result.append((sur.id, sur.title))
+ return result
for sur in surv_obj.browse(cr, uid, surv_obj.search(cr, uid, [])):
if sur.state == 'open':
res = False
diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py
index b9740fba6baed1104b213fda4d5841d03349c003..92ba965d880727d52c92ee1b72e21ebea1ac8f0d 100644
--- a/addons/survey/wizard/survey_send_invitation.py
+++ b/addons/survey/wizard/survey_send_invitation.py
@@ -113,7 +113,13 @@ class survey_send_invitation(osv.osv_memory):
error = ""
res_user = ""
user_exists = False
+ new_user = []
attachments = []
+ current_sur = survey_ref.browse(cr, uid, context.get('active_id'), context=context)
+ exist_user = current_sur.invited_user_ids
+ if exist_user:
+ for use in exist_user:
+ new_user.append(use.id)
for id in survey_ref.browse(cr, uid, survey_ids):
report = self.create_report(cr, uid, [id.id], 'report.survey.form', id.title)
file = open(tools.config['addons_path'] + '/survey/report/' + id.title +".pdf")
@@ -134,6 +140,8 @@ class survey_send_invitation(osv.osv_memory):
continue
user = user_ref.search(cr, uid, [('login', "=", addr.email)])
if user:
+ if user[0] not in new_user:
+ new_user.append(user[0])
user = user_ref.browse(cr, uid, user[0])
user_ref.write(cr, uid, user.id, {'survey_id':[[6, 0, survey_ids]]})
mail = record['mail']%{'login':addr.email, 'passwd':user.password, \
@@ -172,11 +180,17 @@ class survey_send_invitation(osv.osv_memory):
'survey_id': [[6, 0, survey_ids]]
}
user = user_ref.create(cr, uid, res_data)
+ if user not in new_user:
+ new_user.append(user)
created+= "- %s (Login: %s, Password: %s)\n" % (addr.name or 'Unknown',\
addr.email, passwd)
else:
error+= "- %s (Login: %s, Password: %s)\n" % (addr.name or 'Unknown',\
addr.email, passwd)
+
+ new_vals = {}
+ new_vals.update({'invited_user_ids':[[6,0,new_user]]})
+ survey_ref.write(cr, uid, context.get('active_id'),new_vals)
note= ""
if created:
note += 'Created users:\n%s\n\n' % (created)
diff --git a/addons/warning/i18n/sr.po b/addons/warning/i18n/sr.po
index ec34d5dcb029dcf4c3bb6b477ba2824b1514c6fd..733a627ada9d595e941993c3c7910ab9b2ba7769 100644
--- a/addons/warning/i18n/sr.po
+++ b/addons/warning/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-18 14:41+0000\n"
-"Last-Translator: Dragan Životić <dragan_zivotic@yahoo.com>\n"
+"PO-Revision-Date: 2010-10-15 09:41+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Serbian <sr@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-09-29 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-10-16 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: warning
@@ -46,7 +46,7 @@ msgstr "Upozorenje kada Kupujete ovaj Proizvod"
#: view:product.product:0
#: view:res.partner:0
msgid "Warnings"
-msgstr "Opozorenja"
+msgstr "Upozorenja"
#. module: warning
#: selection:product.product,sale_line_warn:0
@@ -75,7 +75,7 @@ msgstr "Nema Poruke"
#. module: warning
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr "Neogovarajući XML za Arhitekturu Pogleda"
+msgstr "Nevažeći XML za pregled arhitekture"
#. module: warning
#: field:res.partner,invoice_warn:0
@@ -95,7 +95,7 @@ msgstr "Upozorenej pri Prodaji ovog Proizvoda"
#. module: warning
#: field:res.partner,sale_warn:0
msgid "Sale Order"
-msgstr "Narudžbenica"
+msgstr "Nalog za prodaju"
#. module: warning
#: field:res.partner,picking_warn:0
diff --git a/addons/wiki/web/widgets/wikimarkup/__init__.py b/addons/wiki/web/widgets/wikimarkup/__init__.py
index 91fec4bc4fdcbaf4ac5b540ca0e897db89c76b76..5eceea0e86d62e94b671dd1586fb9557bacd75eb 100644
--- a/addons/wiki/web/widgets/wikimarkup/__init__.py
+++ b/addons/wiki/web/widgets/wikimarkup/__init__.py
@@ -455,7 +455,6 @@ class BaseParser(object):
if hasattr(self, 'count'):
data = self.env[namespace]
test = key in data
- ls
self.count = True
return key in self.env[namespace]
@@ -1114,7 +1113,7 @@ class BaseParser(object):
trail = url[i:] + trail
url = url[0:i]
- url = cleanURL(url)
+ url = self.cleanURL(url)
sb.append(u'<a href="')
sb.append(url)
@@ -1978,7 +1977,9 @@ class Parser(BaseParser):
if toclevel < wgMaxTocLevel:
toc.append(u"</li>\n")
toc.append(u"</ul>\n</li>\n" * max(0, toclevel - 1))
- toc.insert(0, u'<div id="toc"><h2>' + _('Table of Contents') + '</h2>')
+ #TODO: use gettext
+ #toc.insert(0, u'<div id="toc"><h2>' + _('Table of Contents') + '</h2>')
+ toc.insert(0, u'<div id="toc"><h2>Table of Contents</h2>')
toc.append(u'</ul>\n</div>')
# split up and insert constructed headlines
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 9730031f630005861bb837687eafe598d56af28c..8afd0435a41229bf45d9990de8668f839ec69925 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -6,7 +6,7 @@
<menuitem name="Configuration"
id="knowledge.menu_document_configuration"
- parent="knowledge.menu_document" sequence="50" groups="base.group_system" />
+ parent="knowledge.menu_document" sequence="50"/>
<menuitem name="Wiki" id="menu_wiki_configuration"
parent="knowledge.menu_document_configuration" sequence="2" />
diff --git a/addons/wiki_sale_faq/wiki_sale_faq_view.xml b/addons/wiki_sale_faq/wiki_sale_faq_view.xml
index f65e542aed9c322afd745e01434e2d045c2f640d..d1432c74b029a8ae6d386898798f9715dc30024d 100644
--- a/addons/wiki_sale_faq/wiki_sale_faq_view.xml
+++ b/addons/wiki_sale_faq/wiki_sale_faq_view.xml
@@ -13,7 +13,7 @@
<field name="res_model">ir.attachment</field>
<field name="view_type">form</field>
<field name="domain" eval="[('parent_id','=',ref('dir_sale'))]"></field>
- <field name="help">Documents give your access to all attached documents; it's a repository of all attached documents (mails, documents attached to a project, etc.)</field>
+ <field name="help">Documents gives you an access to all attached files to any record. It is a repository of all documents such as emails, project related attachments or any other documents. From this view, you can search on the content of the documents. OpenERP automatically assign meta-data based on the record like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW and .PDF documents.</field>
</record>
<record model="ir.actions.act_window" id="action_wiki_test">
@@ -23,7 +23,7 @@
<field name="view_mode">tree,form</field>
<field name="domain" eval="[('group_id','=',ref('wiki_groups_sale_faq'))]"/>
<field name="search_view_id" ref="wiki.view_wiki_filter"/>
- <field name="help">FAQ is a wiki page used to share frequently ask questions.</field>
+ <field name="help">Wiki pages allow you to share ideas and questions with co-workers. You can create a new document that can be linked to one or several applications (specifications of a project, a FAQ for sales teams, etc.). Keywords can be used to easily tag wiki pages. You should use this application with the OpenERP web client interface.</field>
</record>
<menuitem