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

[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3

Browse Source 
bzr revid: mtr@mtr-20110113115257-qbh0q93dfelwz836
This commit is contained in:
mtr
2011-01-13 17:22:57 +05:30
parent 0d842d2fa2 a3090b6841
commit d228c2e218
38 changed files with 71 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account_accountant/__openerp__.py
+1 -1
View File
@@ -37,6 +37,6 @@ items and the chart of accounts.
'test': [],
'installable': True,
'active': False,
'certificate': '',
'certificate': '00395091383933390541',
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/account_sequence/__openerp__.py
+2 -2
View File
@@ -38,7 +38,7 @@
'demo_xml': [],
'installable': True,
'active': False,
'certificate': '',
'certificate': '00475376442024623469',
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/account_voucher/account_voucher.py
+5
View File
@@ -45,6 +45,11 @@ class account_voucher(osv.osv):
def _get_journal(self, cr, uid, context=None):
if context is None: context = {}
journal_pool = self.pool.get('account.journal')
invoice_pool = self.pool.get('account.invoice')
if context.get('invoice_id', False):
currency_id = invoice_pool.browse(cr, uid, context['invoice_id'], context=context).currency_id.id
journal_id = journal_pool.search(cr, uid, [('currency', '=', currency_id)], limit=1)
return journal_id and journal_id[0] or False
if context.get('journal_id', False):
return context.get('journal_id')
if not context.get('journal_id', False) and context.get('search_default_journal_id', False):
addons/anonymization/ir.model.fields.anonymization.csv
+4
View File
@@ -22,6 +22,7 @@ anonymization_field_account_move_line_credit,account.move.line,credit
anonymization_field_account_move_line_tax_amount,account.move.line,tax_amount
anonymization_field_account_move_line_amount_currency,account.move.line,amount_currency
anonymization_field_account_move_line_amount_taxed,account.move.line,amount_taxed
anonymization_field_account_analytic_line_amount,account.analytic.line,amount
anonymization_field_sale_order_amount_tax,sale.order,amount_tax
anonymization_field_sale_order_amount_total,sale.order,amount_total
anonymization_field_sale_order_amount_untaxed,sale.order,amount_untaxed
@@ -33,3 +34,6 @@ anonymization_field_purchase_order_amount_untaxed,purchase.order,amount_untaxed
anonymization_field_purchase_order_line_price_unit,purchase.order.line,price_unit
anonymization_field_account_invoice_tax_amount,account.invoice.tax,amount
anonymization_field_account_invoice_tax_base,account.invoice.tax,base
anonymization_field_product_name,product.template,name
anonymization_field_res_users_name,res.users,name
anonymization_field_res_users_signature,res.users,signature
1 id model_name field_name
22 anonymization_field_account_move_line_tax_amount account.move.line tax_amount
23 anonymization_field_account_move_line_amount_currency account.move.line amount_currency
24 anonymization_field_account_move_line_amount_taxed account.move.line amount_taxed
25 anonymization_field_account_analytic_line_amount account.analytic.line amount
26 anonymization_field_sale_order_amount_tax sale.order amount_tax
27 anonymization_field_sale_order_amount_total sale.order amount_total
28 anonymization_field_sale_order_amount_untaxed sale.order amount_untaxed
34 anonymization_field_purchase_order_line_price_unit purchase.order.line price_unit
35 anonymization_field_account_invoice_tax_amount account.invoice.tax amount
36 anonymization_field_account_invoice_tax_base account.invoice.tax base
37 anonymization_field_product_name product.template name
38 anonymization_field_res_users_name res.users name
39 anonymization_field_res_users_signature res.users signature
addons/base_module_doc_rst/__openerp__.py
+1 -1
View File
@@ -36,6 +36,6 @@
'update_xml': ['base_module_doc_rst_view.xml', 'base_module_doc_rst_wizard.xml', 'module_report.xml'],
'demo_xml': [],
'installable': True,
'certificate': '',
'certificate': '001288481437217734509',
}
addons/crm_partner_assign/__openerp__.py
+1 -1
View File
@@ -39,5 +39,5 @@ based on geolocalization.
],
'installable': True,
'active': False,
'certificate': False,
'certificate': '00503409558942442061',
}
addons/document_ftp/__openerp__.py
+1 -1
View File
@@ -45,7 +45,7 @@
],
'installable': True,
'active': False,
'certificate': None,
'certificate': '00934787762705016005',
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/hr_payroll/hr_payroll.py
+3 -3
View File
@@ -661,8 +661,8 @@ class payment_category(osv.osv):
_name = 'hr.allounce.deduction.categoty'
_description = 'Allowance Deduction Heads'
_columns = {
'name':fields.char('Categoty Name', size=64, required=True, readonly=False),
'code':fields.char('Categoty Code', size=64, required=True, readonly=False),
'name':fields.char('Category Name', size=64, required=True, readonly=False),
'code':fields.char('Category Code', size=64, required=True, readonly=False),
'type':fields.selection([
('allowance','Allowance'),
('deduction','Deduction'),
@@ -769,7 +769,7 @@ class company_contribution_line(osv.osv):
"""
_name = 'company.contribution.line'
_description = 'Allowance Deduction Categoty'
_description = 'Allowance Deduction Category'
_order = 'sequence'
_columns = {
'contribution_id':fields.many2one('company.contribution', 'Contribution', required=False),
addons/hr_payroll/hr_payroll_data.xml
+3 -3
View File
@@ -4,14 +4,14 @@
<record id="HRA" model="hr.allounce.deduction.categoty">
<field name="code">HRA</field>
<field name="type">allowance</field>
<field name="name">House Rant Allowance</field>
<field name="name">House Rent Allowance</field>
<field name="sequence" eval="5"/>
</record>
<record id="CA" model="hr.allounce.deduction.categoty">
<field name="code">CA</field>
<field name="type">allowance</field>
<field name="name">Convance Allowance</field>
<field name="name">Conveyance Allowance</field>
<field name="sequence" eval="10"/>
</record>
addons/hr_payroll/hr_payroll_demo.xml
+2 -2
View File
@@ -17,7 +17,7 @@
<field name="type">allowance</field>
<field name="category_id" ref="hr_payroll.HRA"/>
<field name="function_id" ref="hr_payroll.structure_001"/>
<field name="name">House Rant Allowance</field>
<field name="name">House Rent Allowance</field>
</record>
<record id="hr_payslip_line_convanceallowance1" model="hr.payslip.line">
@@ -28,7 +28,7 @@
<field name="type">allowance</field>
<field name="category_id" ref="hr_payroll.CA"/>
<field name="function_id" ref="hr_payroll.structure_001"/>
<field name="name">Convance Allowance</field>
<field name="name">Conveyance Allowance</field>
</record>
<record id="hr_payslip_line_professionaltax1" model="hr.payslip.line">
addons/hr_payroll/i18n/de.po
+2 -2
View File
@@ -1032,7 +1032,7 @@ msgstr "Basisvergütung"
#. module: hr_payroll
#: field:hr.allounce.deduction.categoty,code:0
msgid "Categoty Code"
msgid "Category Code"
msgstr "Kategorie"
#. module: hr_payroll
@@ -1422,7 +1422,7 @@ msgstr "Die Nummer des Ausweis sollte eindeutig sein !"
#. module: hr_payroll
#: field:hr.allounce.deduction.categoty,name:0
msgid "Categoty Name"
msgid "Category Name"
msgstr "Kategorie Bez."
#. module: hr_payroll
addons/hr_payroll/i18n/es.po
+2 -2
View File
@@ -1028,7 +1028,7 @@ msgstr "Salario base"
#. module: hr_payroll
#: field:hr.allounce.deduction.categoty,code:0
msgid "Categoty Code"
msgid "Category Code"
msgstr "Código de categoría"
#. module: hr_payroll
@@ -1408,7 +1408,7 @@ msgstr "¡El número de pasaporte debe ser único!"
#. module: hr_payroll
#: field:hr.allounce.deduction.categoty,name:0
msgid "Categoty Name"
msgid "Category Name"
msgstr "Nombre categoría"
#. module: hr_payroll
addons/hr_payroll/i18n/et.po
+2 -2
View File
@@ -1014,7 +1014,7 @@ msgstr ""
#. module: hr_payroll
#: field:hr.allounce.deduction.categoty,code:0
msgid "Categoty Code"
msgid "Category Code"
msgstr ""
#. module: hr_payroll
@@ -1394,7 +1394,7 @@ msgstr ""
#. module: hr_payroll
#: field:hr.allounce.deduction.categoty,name:0
msgid "Categoty Name"
msgid "Category Name"
msgstr ""
#. module: hr_payroll
addons/hr_payroll/i18n/fr.po
+2 -2
View File
@@ -1035,7 +1035,7 @@ msgstr "Salaire de base"
#. module: hr_payroll
#: field:hr.allounce.deduction.categoty,code:0
msgid "Categoty Code"
msgid "Category Code"
msgstr "Code de catégorie"
#. module: hr_payroll
@@ -1422,7 +1422,7 @@ msgstr "Le numero de passport doit être unique !"
#. module: hr_payroll
#: field:hr.allounce.deduction.categoty,name:0
msgid "Categoty Name"
msgid "Category Name"
msgstr "Nom de la catégorie"
#. module: hr_payroll
addons/hr_payroll/i18n/hr.po
+2 -2
View File
@@ -1014,7 +1014,7 @@ msgstr ""
#. module: hr_payroll
#: field:hr.allounce.deduction.categoty,code:0
msgid "Categoty Code"
msgid "Category Code"
msgstr ""
#. module: hr_payroll
@@ -1394,7 +1394,7 @@ msgstr ""
#. module: hr_payroll
#: field:hr.allounce.deduction.categoty,name:0
msgid "Categoty Name"
msgid "Category Name"
msgstr ""
#. module: hr_payroll
addons/hr_payroll/i18n/hr_payroll.pot
+2 -2
View File
@@ -1009,7 +1009,7 @@ msgstr ""
#. module: hr_payroll
#: field:hr.allounce.deduction.categoty,code:0
msgid "Categoty Code"
msgid "Category Code"
msgstr ""
#. module: hr_payroll
@@ -1383,7 +1383,7 @@ msgstr ""
#. module: hr_payroll
#: field:hr.allounce.deduction.categoty,name:0
msgid "Categoty Name"
msgid "Category Name"
msgstr ""
#. module: hr_payroll
addons/hr_payroll/i18n/hu.po
+2 -2
View File
@@ -1014,7 +1014,7 @@ msgstr ""
#. module: hr_payroll
#: field:hr.allounce.deduction.categoty,code:0
msgid "Categoty Code"
msgid "Category Code"
msgstr ""
#. module: hr_payroll
@@ -1394,7 +1394,7 @@ msgstr ""
#. module: hr_payroll
#: field:hr.allounce.deduction.categoty,name:0
msgid "Categoty Name"
msgid "Category Name"
msgstr ""
#. module: hr_payroll
addons/hr_payroll/i18n/it.po
+2 -2
View File
@@ -1018,7 +1018,7 @@ msgstr ""
#. module: hr_payroll
#: field:hr.allounce.deduction.categoty,code:0
msgid "Categoty Code"
msgid "Category Code"
msgstr ""
#. module: hr_payroll
@@ -1398,7 +1398,7 @@ msgstr ""
#. module: hr_payroll
#: field:hr.allounce.deduction.categoty,name:0
msgid "Categoty Name"
msgid "Category Name"
msgstr ""
#. module: hr_payroll
addons/hr_payroll/i18n/mn.po
+2 -2
View File
@@ -1026,7 +1026,7 @@ msgstr "Суурь цалин"
#. module: hr_payroll
#: field:hr.allounce.deduction.categoty,code:0
msgid "Categoty Code"
msgid "Category Code"
msgstr "Ангиллын код"
#. module: hr_payroll
@@ -1412,7 +1412,7 @@ msgstr ""
#. module: hr_payroll
#: field:hr.allounce.deduction.categoty,name:0
msgid "Categoty Name"
msgid "Category Name"
msgstr "Ангиллын нэр"
#. module: hr_payroll
addons/hr_payroll/i18n/nl.po
+2 -2
View File
@@ -1014,7 +1014,7 @@ msgstr ""
#. module: hr_payroll
#: field:hr.allounce.deduction.categoty,code:0
msgid "Categoty Code"
msgid "Category Code"
msgstr ""
#. module: hr_payroll
@@ -1394,7 +1394,7 @@ msgstr ""
#. module: hr_payroll
#: field:hr.allounce.deduction.categoty,name:0
msgid "Categoty Name"
msgid "Category Name"
msgstr ""
#. module: hr_payroll
addons/hr_payroll/i18n/pl.po
+2 -2
View File
@@ -1014,7 +1014,7 @@ msgstr "Wynagrodzenie podstawowe"
#. module: hr_payroll
#: field:hr.allounce.deduction.categoty,code:0
msgid "Categoty Code"
msgid "Category Code"
msgstr "Kod kategorii"
#. module: hr_payroll
@@ -1394,7 +1394,7 @@ msgstr ""
#. module: hr_payroll
#: field:hr.allounce.deduction.categoty,name:0
msgid "Categoty Name"
msgid "Category Name"
msgstr "Nazwa kategorii"
#. module: hr_payroll
addons/hr_payroll/i18n/pt.po
+2 -2
View File
@@ -1015,7 +1015,7 @@ msgstr "Salário base"
#. module: hr_payroll
#: field:hr.allounce.deduction.categoty,code:0
msgid "Categoty Code"
msgid "Category Code"
msgstr "Código de categoria"
#. module: hr_payroll
@@ -1395,7 +1395,7 @@ msgstr "O número de passaporte deve ser único!"
#. module: hr_payroll
#: field:hr.allounce.deduction.categoty,name:0
msgid "Categoty Name"
msgid "Category Name"
msgstr "Nome da categoria"
#. module: hr_payroll
addons/hr_payroll/i18n/ru.po
+2 -2
View File
@@ -1014,7 +1014,7 @@ msgstr "Базовая зарплата"
#. module: hr_payroll
#: field:hr.allounce.deduction.categoty,code:0
msgid "Categoty Code"
msgid "Category Code"
msgstr "Код категории"
#. module: hr_payroll
@@ -1394,7 +1394,7 @@ msgstr ""
#. module: hr_payroll
#: field:hr.allounce.deduction.categoty,name:0
msgid "Categoty Name"
msgid "Category Name"
msgstr "Название категории"
#. module: hr_payroll
addons/hr_payroll/i18n/sr@latin.po
+2 -2
View File
@@ -1014,7 +1014,7 @@ msgstr ""
#. module: hr_payroll
#: field:hr.allounce.deduction.categoty,code:0
msgid "Categoty Code"
msgid "Category Code"
msgstr ""
#. module: hr_payroll
@@ -1394,7 +1394,7 @@ msgstr ""
#. module: hr_payroll
#: field:hr.allounce.deduction.categoty,name:0
msgid "Categoty Name"
msgid "Category Name"
msgstr ""
#. module: hr_payroll
addons/hr_payroll/i18n/sv.po
+2 -2
View File
@@ -1014,7 +1014,7 @@ msgstr ""
#. module: hr_payroll
#: field:hr.allounce.deduction.categoty,code:0
msgid "Categoty Code"
msgid "Category Code"
msgstr ""
#. module: hr_payroll
@@ -1394,7 +1394,7 @@ msgstr ""
#. module: hr_payroll
#: field:hr.allounce.deduction.categoty,name:0
msgid "Categoty Name"
msgid "Category Name"
msgstr ""
#. module: hr_payroll
addons/hr_payroll/i18n/zh_CN.po
+2 -2
View File
@@ -1014,7 +1014,7 @@ msgstr "基本薪酬"
#. module: hr_payroll
#: field:hr.allounce.deduction.categoty,code:0
msgid "Categoty Code"
msgid "Category Code"
msgstr "分类代码"
#. module: hr_payroll
@@ -1394,7 +1394,7 @@ msgstr ""
#. module: hr_payroll
#: field:hr.allounce.deduction.categoty,name:0
msgid "Categoty Name"
msgid "Category Name"
msgstr "分类名"
#. module: hr_payroll
addons/html_view/__openerp__.py
+1 -1
View File
@@ -12,6 +12,6 @@
'update_xml': ['security/ir.model.access.csv','html_view.xml',],
'installable': True,
'active': False,
'certificate': '',
'certificate': '001302129363003126557',
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/l10n_ca/__openerp__.py
+1 -1
View File
@@ -44,7 +44,7 @@
],
"demo_xml" : [],
"installable" : True,
"certificate" : ''
"certificate" : '00941680933773696173',
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/l10n_cn/__openerp__.py
+3 -3
View File
@@ -39,9 +39,9 @@
"l10n_chart_cn_wizard.xml",
],
"license": "GPL-3",
"certificate":"",
"active": False,
"installable": True
"active": False,
"installable": True,
"certificate": '00925445983542952285',
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/l10n_gr/__terp__.py
+2 -1
View File
@@ -31,7 +31,8 @@
"demo_xml" : [],
"update_xml" : ["account_types.xml","account_chart.xml", "account_full_chart.xml",
"account_tax.xml","l10n_gr_wizard.xml"],
"installable": True
"installable": True,
'certificate': '001146244418929008029',
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/l10n_gt/__openerp__.py
+1 -1
View File
@@ -49,6 +49,6 @@
],
'demo_xml': [],
'installable': True,
'certificate': '',
'certificate': '00815146661827601309',
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/l10n_nl/__openerp__.py
+1 -1
View File
@@ -120,7 +120,7 @@ Dit is een basismodule om een uitgebreid grootboek- en BTW schema voor Nederland
],
"installable": True,
'certificate': '',
'certificate': '00976041422960053277',
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/mail_gateway/__openerp__.py
+1 -1
View File
@@ -39,6 +39,6 @@
'demo_xml': [],
'installable': True,
'active': False,
'certificate': None,
'certificate': '001056784984222247309',
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/procurement/__openerp__.py
+1 -1
View File
@@ -48,6 +48,6 @@
'demo_xml': ['stock_orderpoint.xml'],
'installable': True,
'active': False,
'certificate': '',
'certificate': '00954248826881074509',
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/project_long_term/__openerp__.py
+1 -1
View File
@@ -60,7 +60,7 @@ Features.
],
'installable': True,
'active': False,
'certificate': None,
'certificate': '001227470751077315069',
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/project_mailgate/__openerp__.py
+1 -1
View File
@@ -40,7 +40,7 @@ Moreover, it keeps track of all further communications and task states.
],
'installable': True,
'active': False,
'certificate': '',
'certificate': '001075048780413258261',
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/resource/__openerp__.py
+2 -2
View File
@@ -45,7 +45,7 @@
],
'installable': True,
'active': False,
'certificate': None,
'certificate': '00746371192190459469',
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/sale_mrp/__openerp__.py
+1 -1
View File
@@ -43,6 +43,6 @@
'test':['test/sale_mrp.yml'],
'installable': True,
'active': False,
'certificate': '',
'certificate': '00395598976683092013',
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: