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

[Merge]with: lp:openobject-addons

Browse Source 
bzr revid: dbr@tinyerp.com-20120518084522-enysb9wuzo22g1bs
This commit is contained in:
DBR (OpenERP)
2012-05-18 14:15:22 +05:30
parent f33d8657dc bd0bc7d4c5
commit 17c776c2eb
169 changed files with 8310 additions and 2894 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/__openerp__.py
+1
View File
@@ -106,6 +106,7 @@ module named account_voucher.
'partner_view.xml',
'data/account_data.xml',
'data/data_account_type.xml',
'data/configurable_account_chart.xml',
'account_invoice_workflow.xml',
'project/project_view.xml',
'project/project_report.xml',
addons/account/account.py
+1 -1
View File
@@ -2905,7 +2905,7 @@ class account_fiscal_position_template(osv.osv):
obj_fiscal_position = self.pool.get('account.fiscal.position')
fp_ids = self.search(cr, uid, [('chart_template_id', '=', chart_temp_id)])
for position in self.browse(cr, uid, fp_ids, context=context):
new_fp = obj_fiscal_position.create(cr, uid, {'company_id': company_id, 'name': position.name})
new_fp = obj_fiscal_position.create(cr, uid, {'company_id': company_id, 'name': position.name, 'note': position.note})
for tax in position.tax_ids:
obj_tax_fp.create(cr, uid, {
'tax_src_id': tax_template_ref[tax.tax_src_id.id],
addons/account/account_analytic_line.py
+1 -1
View File
@@ -27,7 +27,7 @@ class account_analytic_line(osv.osv):
_inherit = 'account.analytic.line'
_description = 'Analytic Line'
_columns = {
'product_uom_id': fields.many2one('product.uom', 'UoM'),
'product_uom_id': fields.many2one('product.uom', 'Unit of Measure'),
'product_id': fields.many2one('product.product', 'Product'),
'general_account_id': fields.many2one('account.account', 'General Account', required=True, ondelete='restrict'),
'move_id': fields.many2one('account.move.line', 'Move Line', ondelete='cascade', select=True),
addons/account/account_move_line.py
+1 -1
View File
@@ -474,7 +474,7 @@ class account_move_line(osv.osv):
_columns = {
'name': fields.char('Name', size=64, required=True),
'quantity': fields.float('Quantity', digits=(16,2), help="The optional quantity expressed by this line, eg: number of product sold. The quantity is not a legal requirement but is very useful for some reports."),
'product_uom_id': fields.many2one('product.uom', 'UoM'),
'product_uom_id': fields.many2one('product.uom', 'Unit of Measure'),
'product_id': fields.many2one('product.product', 'Product'),
'debit': fields.float('Debit', digits_compute=dp.get_precision('Account')),
'credit': fields.float('Credit', digits_compute=dp.get_precision('Account')),
addons/account/configurable_account_chart.xml → addons/account/data/configurable_account_chart.xml
View File
addons/account/i18n/hu.po
+7 -8
View File
@@ -7,21 +7,20 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-05-10 18:07+0000\n"
"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
"<openerp@novotrade.hu>\n"
"PO-Revision-Date: 2012-05-17 13:09+0000\n"
"Last-Translator: Peter <herczegp@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: 2012-05-11 04:49+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-05-18 04:40+0000\n"
"X-Generator: Launchpad (build 15259)\n"
#. module: account
#: view:account.invoice.report:0
#: view:analytic.entries.report:0
msgid "last month"
msgstr ""
msgstr "előző hónap"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -3962,7 +3961,7 @@ msgstr "Gyűjtőkód karton"
#. module: account
#: model:account.financial.report,name:account.account_financial_report_assets0
msgid "Assets"
msgstr ""
msgstr "Eszközök"
#. module: account
#: view:account.invoice.confirm:0
@@ -6825,7 +6824,7 @@ msgstr ""
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "JRNL"
msgstr ""
msgstr "Napló"
#. module: account
#: view:account.partner.balance:0
addons/account/i18n/ja.po
+13 -13
View File
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-05-15 01:20+0000\n"
"PO-Revision-Date: 2012-05-15 06:17+0000\n"
"Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@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: 2012-05-15 04:51+0000\n"
"X-Generator: Launchpad (build 15238)\n"
"X-Launchpad-Export-Date: 2012-05-16 04:50+0000\n"
"X-Generator: Launchpad (build 15247)\n"
#. module: account
#: view:account.invoice.report:0
@@ -457,7 +457,7 @@ msgid ""
"it comes to 'Printed' state. When all transactions are done, it comes in "
"'Done' state."
msgstr ""
"仕訳帳期間が作成される場合、その状態はドラフトです。レポートが印刷された場合は、印刷済状態になります。全ての取引が終了すると終了状態となります。"
"仕訳帳期間が作成される場合、その状態はドラフトです。レポートが印刷された場合は、印刷済状態になります。全ての取引が完了すると完了状態となります。"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_tax_chart
@@ -1527,7 +1527,7 @@ msgstr "仕入先返金"
#: selection:account.fiscalyear,state:0
#: selection:account.period,state:0
msgid "Closed"
msgstr "閉鎖"
msgstr "閉じた"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
@@ -3387,7 +3387,7 @@ msgstr "ドラフト請求書"
msgid ""
"Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' "
"or 'Done' state!"
msgstr "選択した請求書は既にキャンセルあるいは終了状態であるためキャンセルできません。"
msgstr "選択した請求書は既にキャンセルあるいは完了状態であるためキャンセルできません。"
#. module: account
#: view:account.invoice.line:0
@@ -4218,7 +4218,7 @@ msgid ""
"* When all the payments are done it will be in 'Valid' state."
msgstr ""
"新しい移動行が作成された時はドラフト状態になります。\n"
"・ 全ての支払いが終了した時に、有効状態になります。"
"・ 全ての支払いが完了した時に、有効状態になります。"
#. module: account
#: field:account.journal,view_id:0
@@ -5961,7 +5961,7 @@ msgstr "（今期を使う場合は空のままとして下さい）"
msgid ""
"As soon as the reconciliation is done, the invoice's state turns to “done” "
"(i.e. paid) in the system."
msgstr "消し込みを終了するや否や、請求書の状態はシステム内で終了（すなわち支払済）となります。"
msgstr "消し込みを完了するや否や、請求書の状態はシステム内で完了（すなわち支払済）となります。"
#. module: account
#: view:account.chart.template:0
@@ -6931,7 +6931,7 @@ msgstr "仕訳帳カラム"
#: selection:account.subscription,state:0
#: selection:report.invoice.created,state:0
msgid "Done"
msgstr "終了"
msgstr "完了"
#. module: account
#: model:ir.actions.act_window,help:account.action_bank_tree
@@ -7957,7 +7957,7 @@ msgstr "このアカウントが仕訳帳項目の消し込みを許す場合は
msgid ""
"When monthly periods are created. The state is 'Draft'. At the end of "
"monthly period it is in 'Done' state."
msgstr "月次の期間が作成される時はその状態はドラフトです。月次の期間の終わりには状態は終了になります。"
msgstr "月次の期間が作成される時はその状態はドラフトです。月次の期間の終わりには状態は完了になります。"
#. module: account
#: report:account.analytic.account.inverted.balance:0
@@ -10045,7 +10045,7 @@ msgstr "償却の移動"
#. module: account
#: model:process.node,note:account.process_node_paidinvoice0
msgid "Invoice's state is Done"
msgstr "請求書は終了状態です。"
msgstr "請求書は完了状態です。"
#. module: account
#: model:ir.model,name:account.model_report_account_sales
@@ -10542,12 +10542,12 @@ msgstr "原価元帳（数量のみ）"
#. module: account
#: model:process.node,note:account.process_node_supplierpaidinvoice0
msgid "Invoice's state is Done."
msgstr "請求書は終了状態です。"
msgstr "請求書は完了状態です。"
#. module: account
#: model:process.transition,note:account.process_transition_reconcilepaid0
msgid "As soon as the reconciliation is done, the invoice can be paid."
msgstr "できるだけ早く消し込みを終えるために請求書の支払が可能です。"
msgstr "できるだけ早く消し込みを完了するために請求書の支払が可能です。"
#. module: account
#: view:account.account.template:0
addons/account/installer.py
-5
View File
@@ -123,11 +123,6 @@ class account_installer(osv.osv_memory):
context = {}
fy_obj = self.pool.get('account.fiscalyear')
for res in self.read(cr, uid, ids, context=context):
if 'charts' in res and res['charts'] == 'configurable':
#load generic chart of account
fp = tools.file_open(opj('account', 'configurable_account_chart.xml'))
tools.convert_xml_import(cr, 'account', fp, {}, 'init', True, None)
fp.close()
if 'date_start' in res and 'date_stop' in res:
f_ids = fy_obj.search(cr, uid, [('date_start', '<=', res['date_start']), ('date_stop', '>=', res['date_stop']), ('company_id', '=', res['company_id'][0])], context=context)
if not f_ids:
addons/account/report/account_analytic_entries_report.py
+1 -1
View File
@@ -43,7 +43,7 @@ class analytic_entries_report(osv.osv):
'journal_id': fields.many2one('account.analytic.journal', 'Journal', required=True),
'move_id': fields.many2one('account.move.line', 'Move', required=True),
'product_id': fields.many2one('product.product', 'Product', required=True),
'product_uom_id': fields.many2one('product.uom', 'Product UOM', required=True),
'product_uom_id': fields.many2one('product.uom', 'Product Unit of Measure', required=True),
'amount': fields.float('Amount', readonly=True),
'unit_amount': fields.float('Quantity', readonly=True),
'nbr': fields.integer('#Entries', readonly=True),
addons/account/report/account_analytic_entries_report_view.xml
+1 -1
View File
@@ -76,7 +76,7 @@
<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'}"/>
<filter string="Product UOM" icon="terp-mrp" context="{'group_by':'product_uom_id'}"/>
<filter string="Product Unit of Measure" icon="terp-mrp" context="{'group_by':'product_uom_id'}"/>
<separator orientation="vertical" groups="base.group_multi_company"/>
<filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<separator orientation="vertical"/>
addons/account/report/account_entries_report.py
+1 -1
View File
@@ -50,7 +50,7 @@ class account_entries_report(osv.osv):
'journal_id': fields.many2one('account.journal', 'Journal', readonly=True),
'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', readonly=True),
'product_id': fields.many2one('product.product', 'Product', readonly=True),
'product_uom_id': fields.many2one('product.uom', 'Product UOM', readonly=True),
'product_uom_id': fields.many2one('product.uom', 'Product Unit of Measure', readonly=True),
'move_state': fields.selection([('draft','Unposted'), ('posted','Posted')], 'State', readonly=True),
'move_line_state': fields.selection([('draft','Unbalanced'), ('valid','Valid')], 'State of Move Line', readonly=True),
'reconcile_id': fields.many2one('account.move.reconcile', readonly=True),
addons/account/report/account_invoice_report.py
+1 -1
View File
@@ -36,7 +36,7 @@ class account_invoice_report(osv.osv):
('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True),
'product_id': fields.many2one('product.product', 'Product', readonly=True),
'product_qty':fields.float('Qty', readonly=True),
'uom_name': fields.char('Reference UoM', size=128, readonly=True),
'uom_name': fields.char('Reference Unit of Measure', size=128, readonly=True),
'payment_term': fields.many2one('account.payment.term', 'Payment Term', readonly=True),
'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], readonly=True),
'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True),
addons/account/res_config.py
+26 -23
View File
@@ -36,11 +36,11 @@ class account_config_settings(osv.osv_memory):
_columns = {
'company_id': fields.many2one('res.company', 'Company', required=True),
'has_default_company': fields.boolean('Has default company', readonly=True),
'expects_chart_of_accounts': fields.related('company_id', 'expects_chart_of_accounts', type='boolean',
string='Chart of Accounts for this Company'),
string='Chart of Accounts for this Company',
help="""Check this box if this company is a legal entity."""),
'currency_id': fields.related('company_id', 'currency_id', type='many2one', relation='res.currency', required=True,
string='Main currency', help="Main currency of the company."),
string='Default Company Currency', help="Main currency of the company."),
'paypal_account': fields.related('company_id', 'paypal_account', type='char', size=128,
string='Paypal Account', help="Paypal account (email) for receiving online payments (credit card, etc.)"),
'company_footer': fields.related('company_id', 'rml_footer2', type='char', size=250, readonly=True,
@@ -65,31 +65,31 @@ class account_config_settings(osv.osv_memory):
'sale_sequence_prefix': fields.related('sale_journal_id', 'sequence_id', 'prefix', type='char', string='Invoice Sequence'),
'sale_sequence_next': fields.related('sale_journal_id', 'sequence_id', 'number_next', type='integer', string='Next Invoice Number'),
'sale_refund_journal_id': fields.many2one('account.journal', 'Sale Refund Journal'),
'sale_refund_sequence_prefix': fields.related('sale_refund_journal_id', 'sequence_id', 'prefix', type='char', string='Refund Sequence'),
'sale_refund_sequence_next': fields.related('sale_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Next Refund Number'),
'sale_refund_sequence_prefix': fields.related('sale_refund_journal_id', 'sequence_id', 'prefix', type='char', string='Credit Note Sequence'),
'sale_refund_sequence_next': fields.related('sale_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Next Credit Note Number'),
'purchase_journal_id': fields.many2one('account.journal', 'Purchase Journal'),
'purchase_sequence_prefix': fields.related('purchase_journal_id', 'sequence_id', 'prefix', type='char', string='Supplier Invoice Sequence'),
'purchase_sequence_next': fields.related('purchase_journal_id', 'sequence_id', 'number_next', type='integer', string='Next Supplier Invoice Number'),
'purchase_refund_journal_id': fields.many2one('account.journal', 'Purchase Refund Journal'),
'purchase_refund_sequence_prefix': fields.related('purchase_refund_journal_id', 'sequence_id', 'prefix', type='char', string='Supplier Refund Sequence'),
'purchase_refund_sequence_next': fields.related('purchase_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Next Supplier Refund Number'),
'purchase_refund_sequence_prefix': fields.related('purchase_refund_journal_id', 'sequence_id', 'prefix', type='char', string='Supplier Credit Note Sequence'),
'purchase_refund_sequence_next': fields.related('purchase_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Next Supplier Credit Note Number'),
'module_account_check_writing': fields.boolean('Support Check Writings',
'module_account_check_writing': fields.boolean('Check Writing',
help="""This allows you to check writing and printing.
This installs the module account_check_writing."""),
'module_account_accountant': fields.boolean('Accountant Features',
help="""This allows you to access all the accounting features, like the journal items and the chart of accounts.
This installs the module account_accountant."""),
help="""If you do not check this box, you will be able to do Invoicing & Payments, but not accounting (Journal Items, Chart of Accounts, ...)."""),
'module_account_asset': fields.boolean('Assets Management',
help="""This allows you to manage the assets owned by a company or a person.
It keeps track of the depreciation occurred on those assets, and creates account move for those depreciation lines.
This installs the module account_asset."""),
'module_account_budget': fields.boolean('Budgets Management',
This installs the module account_asset. If you do not check this box, you will be able to do invoicing & payments,
but not accounting (Journal Items, Chart of Accounts, ...) """),
'module_account_budget': fields.boolean('Budget Management',
help="""This allows accountants to manage analytic and crossovered budgets.
Once the master budgets and the budgets are defined,
the project managers can set the planned amount on each analytic account.
This installs the module account_budget."""),
'module_account_payment': fields.boolean('Supplier Payment Orders',
'module_account_payment': fields.boolean('Manage Payment Orders',
help="""This allows you to create and manage your payment orders, with purposes to
* serve as base for an easy plug-in of various automated payment mechanisms, and
* provide a more efficient way to manage invoice payments.
@@ -97,17 +97,10 @@ class account_config_settings(osv.osv_memory):
'module_account_voucher': fields.boolean('Manage Customer Payments',
help="""This includes all the basic requirements of voucher entries for bank, cash, sales, purchase, expense, contra, etc.
This installs the module account_voucher."""),
'module_account_followup': fields.boolean('Customer Follow-Ups',
'module_account_followup': fields.boolean('Manage Customer Payment Follow-Ups',
help="""This allows to automate letters for unpaid invoices, with multi-level recalls.
This installs the module account_followup."""),
'module_account_analytic_plans': fields.boolean('Support Multiple Analytic Plans',
help="""This allows to use several analytic plans, according to the general journal.
This installs the module account_analytic_plans."""),
'module_account_analytic_default': fields.boolean('Rules for Analytic Assignation',
help="""Set default values for your analytic accounts.
Allows to automatically select analytic accounts based on criteria like product, partner, user, company, date.
This installs the module account_analytic_default."""),
'module_account_invoice_layout': fields.boolean('Allow notes and subtotals',
'module_account_invoice_layout': fields.boolean('Allow Notes and Subtotals',
help="""This provides some features to improve the layout of invoices.
It gives you the possibility to:
* order all the lines of an invoice
@@ -118,9 +111,10 @@ class account_config_settings(osv.osv_memory):
'group_proforma_invoices': fields.boolean('Allow Pro-forma Invoices',
implied_group='account.group_proforma_invoices',
help="Allows you to put invoices in pro-forma state."),
'default_sale_tax': fields.many2one('account.tax', 'Default Sale Tax'),
'default_purchase_tax': fields.many2one('account.tax', 'Default Purchase Tax'),
'decimal_precision': fields.integer('Decimal Precision',
help="""Set the decimal precision for rounding results in accounting."""),
}
def _default_company(self, cr, uid, context=None):
@@ -279,4 +273,13 @@ class account_config_settings(osv.osv_memory):
elif config.period == '3months':
fiscalyear.create_period3(cr, uid, [fiscalyear_id])
def get_default_dp(self, cr, uid, fields, context=None):
dp = self.pool.get('ir.model.data').get_object(cr, uid, 'product','decimal_account')
return {'decimal_precision': dp.digits}
def set_default_dp(self, cr, uid, ids, context=None):
config = self.browse(cr, uid, ids[0], context)
dp = self.pool.get('ir.model.data').get_object(cr, uid, 'product','decimal_account')
dp.write({'digits': config.decimal_precision})
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/account/res_config_view.xml
+28 -13
View File
@@ -22,16 +22,17 @@
</div>
<sheet layout="auto">
<field name="has_default_company" invisible="1" />
<field name="has_chart_of_accounts" invisible="1"/>
<field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"
attrs="{'invisible': [('has_default_company', '=', True)]}"/>
<field name="expects_chart_of_accounts"/>
<field name="has_chart_of_accounts" invisible="1"/>
<group string="No Chart of Accounts exists for this Company" colspan="4" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}">
<label string="Please select a chart template to install a chart of accounts." colspan="4"/>
<field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
<button string="Install More Chart Templates" icon="gtk-go-forward"
name="%(open_account_charts_modules)d" type="action"/>
<newline/>
<field name ="code_digits" groups="account.group_account_user"/>
<field name ="seq_journal"/>
<newline/>
@@ -56,22 +57,31 @@
<field name ="complete_tax_set" invisible="1"/>
<newline/>
<group colspan="2" col="2">
<field name="default_sale_tax" domain="[('type_tax_use','=','sale'), ('company_id','=',company_id)]"/>
<field name="default_sale_tax" domain="[('type_tax_use','=','sale'), ('company_id','=',company_id)]" attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/>
<field name="module_account_accountant"/>
<field name="module_account_asset"/>
</group>
<group colspan="2" col="2">
<field name="default_purchase_tax" domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]"/>
<field name="default_purchase_tax" domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]" attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/>
<field name="currency_id" widget="selection"/>
<field name="module_account_budget"/>
<field name="decimal_precision"/>
</group>
</group>
<group colspan="2" col="2">
<separator string="Customer Invoices" colspan="2"/>
<field name="sale_journal_id" invisible="1"/>
<field name="sale_sequence_next" attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
<label string="Invoice Sequence" for="sale_sequence_prefix"/>
<group colspan="1" col="2">
<field name="sale_sequence_prefix" nolabel="1"/>
<field name="sale_sequence_next" nolabel="1" attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
</group>
<field name="sale_refund_journal_id" invisible="1"/>
<field name="sale_refund_sequence_next" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
<label string="Credit Note Sequence" for="sale_refund_sequence_prefix"/>
<group colspan="1" col="2">
<field name="sale_refund_sequence_prefix" nolabel="1"/>
<field name="sale_refund_sequence_next" nolabel="1" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
</group>
<field name="module_account_invoice_layout"/>
<field name="module_account_voucher"/>
<field name="module_account_followup"/>
@@ -80,9 +90,17 @@
<group colspan="2" col="2">
<separator string="Supplier Invoices" colspan="2"/>
<field name="purchase_journal_id" invisible="1"/>
<field name="purchase_sequence_next" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
<label string="Supplier Invoice Sequence" for="purchase_sequence_prefix"/>
<group colspan="1" col="2">
<field name="purchase_sequence_prefix" nolabel="1"/>
<field name="purchase_sequence_next" nolabel="1" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
</group>
<field name="purchase_refund_journal_id" invisible="1"/>
<field name="purchase_refund_sequence_next" attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}"/>
<label string="Supplier Credit Note Sequence" for="purchase_refund_sequence_prefix"/>
<group colspan="1" col="2">
<field name="purchase_refund_sequence_prefix" nolabel="1"/>
<field name="purchase_refund_sequence_next" nolabel="1" attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}"/>
</group>
<field name="module_account_payment"/>
</group>
<group colspan="2" col="2">
@@ -96,11 +114,8 @@
<field name="company_footer"/>
<field name="module_account_check_writing"/>
</group>
<group colspan="2" col="2">
<separator string="Analytic Accounting" colspan="2"/>
<group name="analytic_accounting" colspan="2"/>
<field name="module_account_analytic_plans"/>
<field name="module_account_analytic_default"/>
<group name="analytic_accounting" colspan="4" invisible="1">
<separator string="Analytic Accounting" colspan="4"/>
</group>
</sheet>
</form>
@@ -116,7 +131,7 @@
</record>
<menuitem id="menu_account_config" name="Accounting" parent="base.menu_config"
sequence="6" action="action_account_config"/>
sequence="14" action="action_account_config"/>
</data>
</openerp>
addons/account/wizard/account_invoice_refund.py
+3 -3
View File
@@ -32,11 +32,11 @@ class account_invoice_refund(osv.osv_memory):
_name = "account.invoice.refund"
_description = "Invoice Refund"
_columns = {
'date': fields.date('Operation date', help='This date will be used as the invoice date for Refund Invoice and Period will be chosen accordingly!'),
'date': fields.date('Operation Date', help='This date will be used as the invoice date for credit note and period will be chosen accordingly!'),
'period': fields.many2one('account.period', 'Force period'),
'journal_id': fields.many2one('account.journal', 'Refund Journal', help='You can select here the journal to use for the refund invoice that will be created. If you leave that field empty, it will use the same journal as the current invoice.'),
'journal_id': fields.many2one('account.journal', 'Refund Journal', help='You can select here the journal to use for the credit note that will be created. If you leave that field empty, it will use the same journal as the current invoice.'),
'description': fields.char('Description', size=128, required=True),
'filter_refund': fields.selection([('refund', 'Create a draft Refund'), ('cancel', 'Cancel: refund invoice and reconcile'),('modify', 'Modify: refund invoice, reconcile and create a new draft invoice')], "Refund Method", required=True, help='Refund invoice base on this type. You can not Modify and Cancel if the invoice is already reconciled'),
'filter_refund': fields.selection([('refund', 'Create a draft refund'), ('cancel', 'Cancel: create credit note and reconcile'),('modify', 'Modify: create credit note, reconcile and create a new draft invoice')], "Refund Method", required=True, help='Credit note base on this type. You can not Modify and Cancel if the invoice is already reconciled'),
}
def _get_journal(self, cr, uid, context=None):
addons/account/wizard/account_invoice_refund_view.xml
+4 -4
View File
@@ -7,8 +7,8 @@
<field name="model">account.invoice.refund</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Refund Invoice">
<separator string="Refund Invoice Options" colspan="4"/>
<form string="Credit Note">
<separator string="Credit Note Options" colspan="4"/>
<group colspan="4" >
<field name="description"/>
<field name="journal_id" widget='selection'/>
@@ -19,8 +19,8 @@
<separator colspan="4"/>
<group col="4" colspan="4" fill="1">
<label align="0.0" width="550" colspan="4" string="Modify Invoice: Cancels the current invoice and creates a new copy of it ready for editing."/>
<label align="0.0" width="300" string="Refund Invoice: Creates the refund invoice, ready for editing."/>
<label align="0.0" width="500" colspan="4" string="Cancel Invoice: Creates the refund invoice, validate and reconcile it to cancel the current invoice."/>
<label align="0.0" width="300" string="Credit Note: Creates the credit note, ready for editing."/>
<label align="0.0" width="500" colspan="4" string="Cancel Invoice: Creates the credit note, validate and reconcile it to cancel the current invoice."/>
</group>
<separator colspan="4"/>
<group colspan="4" col="6">
addons/account_accountant/__openerp__.py
+1 -1
View File
@@ -37,7 +37,7 @@ user rights to Demo user.
""",
'website': 'http://www.openerp.com',
'init_xml': [],
"depends" : ["account"],
"depends" : ["account_voucher"],
'update_xml': [
'security/account_security.xml',
'account_accountant_data.xml'
addons/account_asset/i18n/ja.po
+5 -5
View File
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2012-05-10 18:07+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
"PO-Revision-Date: 2012-05-16 19:05+0000\n"
"Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@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: 2012-05-11 05:14+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-05-17 04:37+0000\n"
"X-Generator: Launchpad (build 15259)\n"
#. module: account_asset
#: view:account.asset.asset:0
@@ -196,7 +196,7 @@ msgstr "会計エントリーにおいて貸方または借方の値が誤って
#. module: account_asset
#: view:asset.asset.report:0 field:asset.asset.report,nbr:0
msgid "# of Depreciation Lines"
msgstr "減価償却行の番号"
msgstr "減価償却行の数"
#. module: account_asset
#: view:asset.asset.report:0
addons/account_invoice_layout/i18n/th.po
+355
View File
@@ -0,0 +1,355 @@
# Thai translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-05-17 04:29+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Thai <th@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: 2012-05-18 04:40+0000\n"
"X-Generator: Launchpad (build 15259)\n"
#. module: account_invoice_layout
#: selection:account.invoice.line,state:0
msgid "Sub Total"
msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "Note:"
msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "Cancelled Invoice"
msgstr ""
#. module: account_invoice_layout
#: selection:account.invoice.line,state:0
#: field:notify.message,name:0
msgid "Title"
msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "Disc. (%)"
msgstr ""
#. module: account_invoice_layout
#: selection:account.invoice.line,state:0
msgid "Note"
msgstr ""
#. module: account_invoice_layout
#: view:account.invoice.special.msg:0
msgid "Print"
msgstr ""
#. module: account_invoice_layout
#: help:notify.message,msg:0
msgid ""
"This notification will appear at the bottom of the Invoices when printed."
msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "Unit Price"
msgstr ""
#. module: account_invoice_layout
#: model:ir.model,name:account_invoice_layout.model_notify_message
msgid "Notify By Messages"
msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "VAT :"
msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "Tel. :"
msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "PRO-FORMA"
msgstr ""
#. module: account_invoice_layout
#: field:account.invoice,abstract_line_ids:0
msgid "Invoice Lines"
msgstr ""
#. module: account_invoice_layout
#: view:account.invoice.line:0
msgid "Seq."
msgstr ""
#. module: account_invoice_layout
#: model:ir.ui.menu,name:account_invoice_layout.menu_finan_config_notify_message
msgid "Notification Message"
msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
msgid "Customer Code"
msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "Description"
msgstr ""
#. module: account_invoice_layout
#: help:account.invoice.line,sequence:0
msgid "Gives the sequence order when displaying a list of invoice lines."
msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "Price"
msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "Invoice Date"
msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
msgid "Taxes:"
msgstr ""
#. 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 ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "Base"
msgstr ""
#. module: account_invoice_layout
#: selection:account.invoice.line,state:0
msgid "Page Break"
msgstr ""
#. module: account_invoice_layout
#: view:notify.message:0
#: field:notify.message,msg:0
msgid "Special Message"
msgstr ""
#. module: account_invoice_layout
#: help:account.invoice.special.msg,message:0
msgid "Message to Print at the bottom of report"
msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "Quantity"
msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "Refund"
msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "Fax :"
msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
msgid "Total:"
msgstr ""
#. module: account_invoice_layout
#: view:account.invoice.special.msg:0
msgid "Select Message"
msgstr ""
#. module: account_invoice_layout
#: view:notify.message:0
msgid "Messages"
msgstr ""
#. module: account_invoice_layout
#: selection:account.invoice.line,state:0
msgid "Product"
msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "Description / Taxes"
msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "Amount"
msgstr ""
#. module: account_invoice_layout
#: model:notify.message,msg:account_invoice_layout.demo_message1
msgid "ERP & CRM Solutions..."
msgstr ""
#. module: account_invoice_layout
#: report:notify_account.invoice:0
msgid "Net Total :"
msgstr ""
#. module: account_invoice_layout
#: report:notify_account.invoice:0
msgid "Total :"
msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "Draft Invoice"
msgstr ""
#. module: account_invoice_layout
#: field:account.invoice.line,sequence:0
msgid "Sequence Number"
msgstr ""
#. module: account_invoice_layout
#: model:ir.model,name:account_invoice_layout.model_account_invoice_special_msg
msgid "Account Invoice Special Message"
msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "Origin"
msgstr ""
#. module: account_invoice_layout
#: sql_constraint:account.invoice:0
msgid "Invoice Number must be unique per Company!"
msgstr ""
#. module: account_invoice_layout
#: selection:account.invoice.line,state:0
msgid "Separator Line"
msgstr ""
#. module: account_invoice_layout
#: report:notify_account.invoice:0
msgid "Your Reference"
msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "Supplier Invoice"
msgstr ""
#. module: account_invoice_layout
#: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_1
msgid "Invoices"
msgstr ""
#. module: account_invoice_layout
#: constraint:account.invoice:0
msgid "Invalid BBA Structured Communication !"
msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "Tax"
msgstr ""
#. module: account_invoice_layout
#: model:ir.model,name:account_invoice_layout.model_account_invoice_line
msgid "Invoice Line"
msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
msgid "Net Total:"
msgstr ""
#. module: account_invoice_layout
#: model:ir.actions.act_window,name:account_invoice_layout.action_account_invoice_special_msg
#: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_layout_message
msgid "Invoices and Message"
msgstr ""
#. module: account_invoice_layout
#: field:account.invoice.line,state:0
msgid "Type"
msgstr ""
#. module: account_invoice_layout
#: view:notify.message:0
msgid "Write a notification or a wishful message."
msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: model:ir.model,name:account_invoice_layout.model_account_invoice
#: report:notify_account.invoice:0
msgid "Invoice"
msgstr ""
#. module: account_invoice_layout
#: view:account.invoice.special.msg:0
msgid "Cancel"
msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
msgid "Supplier Refund"
msgstr ""
#. module: account_invoice_layout
#: field:account.invoice.special.msg,message:0
msgid "Message"
msgstr ""
#. module: account_invoice_layout
#: report:notify_account.invoice:0
msgid "Taxes :"
msgstr ""
#. module: account_invoice_layout
#: model:ir.ui.menu,name:account_invoice_layout.menu_notify_mesage_tree_form
msgid "All Notification Messages"
msgstr ""
addons/account_payment/i18n/ja.po
+5 -5
View File
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-05-15 04:40+0000\n"
"PO-Revision-Date: 2012-05-15 06:19+0000\n"
"Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@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: 2012-05-15 04:51+0000\n"
"X-Generator: Launchpad (build 15238)\n"
"X-Launchpad-Export-Date: 2012-05-16 04:50+0000\n"
"X-Generator: Launchpad (build 15247)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
@@ -64,7 +64,7 @@ msgid ""
msgstr ""
"オーダーがなされた時に状態はドラフトになります。\n"
"　銀行により確認されると状態は確認済となります。\n"
"　そしてオーダーの支払がなされると状態は終了となります。"
"　そしてオーダーの支払がなされると状態は完了となります。"
#. module: account_payment
#: help:account.invoice,amount_to_pay:0
@@ -556,7 +556,7 @@ msgstr "一般情報"
#: view:payment.order:0
#: selection:payment.order,state:0
msgid "Done"
msgstr "終了"
msgstr "完了"
#. module: account_payment
#: model:ir.model,name:account_payment.model_account_invoice
addons/account_voucher/i18n/ja.po
+4 -4
View File
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2012-05-15 04:42+0000\n"
"PO-Revision-Date: 2012-05-16 19:07+0000\n"
"Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@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: 2012-05-15 04:51+0000\n"
"X-Generator: Launchpad (build 15238)\n"
"X-Launchpad-Export-Date: 2012-05-17 04:36+0000\n"
"X-Generator: Launchpad (build 15259)\n"
#. module: account_voucher
#: view:sale.receipt.report:0
@@ -364,7 +364,7 @@ msgstr "会社名は固有でなければいけません。"
#. module: account_voucher
#: view:sale.receipt.report:0 field:sale.receipt.report,nbr:0
msgid "# of Voucher Lines"
msgstr "バウチャー行の番号"
msgstr "バウチャー行の数"
#. module: account_voucher
#: view:sale.receipt.report:0 field:sale.receipt.report,type:0
addons/analytic/i18n/ja.po
+284
View File
@@ -0,0 +1,284 @@
# Japanese translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-05-15 06:05+0000\n"
"Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@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: 2012-05-16 04:50+0000\n"
"X-Generator: Launchpad (build 15247)\n"
#. module: analytic
#: field:account.analytic.account,child_ids:0
msgid "Child Accounts"
msgstr "子アカウント"
#. module: analytic
#: field:account.analytic.account,name:0
msgid "Account Name"
msgstr "アカウント名"
#. module: analytic
#: help:account.analytic.line,unit_amount:0
msgid "Specifies the amount of quantity to count."
msgstr "数えた数量の指定"
#. module: analytic
#: field:account.analytic.account,state:0
msgid "State"
msgstr "状態"
#. module: analytic
#: field:account.analytic.account,user_id:0
msgid "Account Manager"
msgstr "会計マネジャ"
#. module: analytic
#: selection:account.analytic.account,state:0
msgid "Closed"
msgstr "閉じた"
#. module: analytic
#: field:account.analytic.account,debit:0
msgid "Debit"
msgstr "借方"
#. 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 ""
"・ アカウントが作成されると、それはドラフト状態です。\n"
"・ 関連するパートナがいると、それは開く状態になります。\n"
"・ 保留中残高が存在すると、それは保留中状態になります。\n"
"・ 最終的に全ての取引が終了すると、それは閉じる状態になります。\n"
"・ プロジェクトの状態はテンプレートや実行中にもなります。\n"
"　テンプレートであれば、そこでテンプレートプロジェクトを元にしたプロジェクトを作成できます。それが実行中状態であれば、それは通常プロジェクトです。\n"
"　それがレビューされると、保留中状態になります。\n"
"　プロジェクトが完了した時に、完了状態にセットされます。"
#. module: analytic
#: selection:account.analytic.account,state:0
msgid "New"
msgstr "新規"
#. module: analytic
#: field:account.analytic.account,type:0
msgid "Account Type"
msgstr "アカウントタイプ"
#. module: analytic
#: selection:account.analytic.account,state:0
msgid "Pending"
msgstr "保留中"
#. module: analytic
#: model:ir.model,name:analytic.model_account_analytic_line
msgid "Analytic Line"
msgstr "分析行"
#. module: analytic
#: field:account.analytic.account,description:0
#: field:account.analytic.line,name:0
msgid "Description"
msgstr "詳細"
#. module: analytic
#: selection:account.analytic.account,type:0
msgid "Normal"
msgstr "通常"
#. module: analytic
#: field:account.analytic.account,company_id:0
#: field:account.analytic.line,company_id:0
msgid "Company"
msgstr "会社"
#. module: analytic
#: code:addons/analytic/analytic.py:138
#, python-format
msgid ""
"If you set a company, the currency selected has to be the same as it's "
"currency. \n"
"You can remove the company belonging, and thus change the currency, only on "
"analytic account of type 'view'. This can be really usefull for "
"consolidation purposes of several companies charts with different "
"currencies, for example."
msgstr ""
"会社を設定した場合、選択した通貨は会社の通貨と同じである必要があります。\n"
"タイプがビューである分析アカウント上でのみ、所属会社を削除して通貨を変更することができます。これは例えば、異なる通貨である複数の会社チャートを連結する目的"
"のために非常に役立ちます。"
#. module: analytic
#: field:account.analytic.line,user_id:0
msgid "User"
msgstr "ユーザ"
#. module: analytic
#: field:account.analytic.account,parent_id:0
msgid "Parent Analytic Account"
msgstr "パートナ分析アカウント"
#. module: analytic
#: field:account.analytic.line,date:0
msgid "Date"
msgstr "日付"
#. module: analytic
#: selection:account.analytic.account,state:0
msgid "Template"
msgstr "テンプレート"
#. module: analytic
#: field:account.analytic.account,quantity:0
#: field:account.analytic.line,unit_amount:0
msgid "Quantity"
msgstr "数量"
#. module: analytic
#: help:account.analytic.line,amount:0
msgid ""
"Calculated by multiplying the quantity and the price given in the Product's "
"cost price. Always expressed in the company main currency."
msgstr "数量と製品の原価価格を乗算して計算されます。いつも会社の主な通貨で表現されます。"
#. module: analytic
#: field:account.analytic.account,child_complete_ids:0
msgid "Account Hierarchy"
msgstr "アカウント階層"
#. module: analytic
#: help:account.analytic.account,quantity_max:0
msgid "Sets the higher limit of time to work on the contract."
msgstr "契約上の動作上限時間を設定して下さい。"
#. module: analytic
#: field:account.analytic.account,credit:0
msgid "Credit"
msgstr "貸方"
#. module: analytic
#: field:account.analytic.line,amount:0
msgid "Amount"
msgstr "金額"
#. module: analytic
#: field:account.analytic.account,contact_id:0
msgid "Contact"
msgstr "連絡先"
#. module: analytic
#: field:account.analytic.account,code:0
msgid "Code/Reference"
msgstr "コード / 参照"
#. module: analytic
#: selection:account.analytic.account,state:0
msgid "Cancelled"
msgstr "キャンセル済"
#. module: analytic
#: code:addons/analytic/analytic.py:138
#, python-format
msgid "Error !"
msgstr "エラー"
#. module: analytic
#: field:account.analytic.account,balance:0
msgid "Balance"
msgstr "残高"
#. module: analytic
#: constraint:account.analytic.account:0
msgid "Error! You can not create recursive analytic accounts."
msgstr "エラー。反復した分析アカウントを作ることはできません。"
#. module: analytic
#: help:account.analytic.account,type:0
msgid ""
"If you select the View Type, it means you won't allow to create journal "
"entries using that account."
msgstr "ビュータイプを選択した場合、このアカウントを使って仕訳帳エントリーは作ることができません。"
#. module: analytic
#: field:account.analytic.account,date:0
msgid "Date End"
msgstr "終了日"
#. module: analytic
#: field:account.analytic.account,quantity_max:0
msgid "Maximum Time"
msgstr "上限時間"
#. module: analytic
#: model:res.groups,name:analytic.group_analytic_accounting
msgid "Analytic Accounting"
msgstr "分析会計"
#. module: analytic
#: field:account.analytic.account,complete_name:0
msgid "Full Account Name"
msgstr "フルアカウント名"
#. module: analytic
#: field:account.analytic.line,account_id:0
#: model:ir.model,name:analytic.model_account_analytic_account
msgid "Analytic Account"
msgstr "分析アカウント"
#. module: analytic
#: field:account.analytic.account,currency_id:0
msgid "Currency"
msgstr "通貨"
#. module: analytic
#: constraint:account.analytic.line:0
msgid "You can not create analytic line on view account."
msgstr "ビューアカウントでは分析行を作ることはできません。"
#. module: analytic
#: selection:account.analytic.account,type:0
msgid "View"
msgstr "ビュー"
#. module: analytic
#: field:account.analytic.account,partner_id:0
msgid "Partner"
msgstr "パートナ"
#. module: analytic
#: field:account.analytic.account,date_start:0
msgid "Date Start"
msgstr "開始日"
#. module: analytic
#: selection:account.analytic.account,state:0
msgid "Open"
msgstr "開く"
#. module: analytic
#: field:account.analytic.account,line_ids:0
msgid "Analytic Entries"
msgstr "分析エントリー"
addons/analytic/security/analytic_security.xml
+1 -1
View File
@@ -17,6 +17,6 @@
<record id="group_analytic_accounting" model="res.groups">
<field name="name">Analytic Accounting</field>
<field name="category_id" ref="base.module_category_usability"/>
<field name="category_id" ref="base.module_category_hidden"/>
</record>
</data></openerp>
addons/anonymization/i18n/ja.po
+213
View File
@@ -0,0 +1,213 @@
# Japanese translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-05-16 02:18+0000\n"
"Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@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: 2012-05-17 04:36+0000\n"
"X-Generator: Launchpad (build 15259)\n"
#. module: anonymization
#: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
msgid "ir.model.fields.anonymize.wizard"
msgstr ""
#. module: anonymization
#: field:ir.model.fields.anonymization,field_name:0
msgid "Field Name"
msgstr "項目名"
#. module: anonymization
#: field:ir.model.fields.anonymization,field_id:0
msgid "Field"
msgstr "項目"
#. module: anonymization
#: field:ir.model.fields.anonymization.history,state:0
#: field:ir.model.fields.anonymize.wizard,state:0
msgid "State"
msgstr "状態"
#. module: anonymization
#: field:ir.model.fields.anonymize.wizard,file_import:0
msgid "Import"
msgstr "インポート"
#. module: anonymization
#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization
msgid "ir.model.fields.anonymization"
msgstr ""
#. module: anonymization
#: field:ir.model.fields.anonymization.history,direction:0
msgid "Direction"
msgstr "指示"
#. module: anonymization
#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_tree
#: view:ir.model.fields.anonymization:0
#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_fields
msgid "Anonymized Fields"
msgstr "匿名項目"
#. module: anonymization
#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization
msgid "Database anonymization"
msgstr "データベースの匿名化"
#. module: anonymization
#: selection:ir.model.fields.anonymization.history,direction:0
msgid "clear -> anonymized"
msgstr "クリア -> 匿名"
#. module: anonymization
#: selection:ir.model.fields.anonymization,state:0
#: selection:ir.model.fields.anonymize.wizard,state:0
msgid "Anonymized"
msgstr "匿名化"
#. module: anonymization
#: field:ir.model.fields.anonymization,state:0
msgid "unknown"
msgstr "不明"
#. module: anonymization
#: field:ir.model.fields.anonymization,model_id:0
msgid "Object"
msgstr "オブジェクト"
#. module: anonymization
#: field:ir.model.fields.anonymization.history,filepath:0
msgid "File path"
msgstr "ファイルパス"
#. module: anonymization
#: field:ir.model.fields.anonymization.history,date:0
msgid "Date"
msgstr "日付"
#. module: anonymization
#: field:ir.model.fields.anonymize.wizard,file_export:0
msgid "Export"
msgstr "エクスポート"
#. module: anonymization
#: view:ir.model.fields.anonymize.wizard:0
msgid "Reverse the Database Anonymization"
msgstr "逆データベース匿名化"
#. module: anonymization
#: view:ir.model.fields.anonymize.wizard:0
msgid "Database Anonymization"
msgstr "データベース匿名化"
#. module: anonymization
#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_wizard
msgid "Anonymize database"
msgstr "匿名化データベース"
#. module: anonymization
#: view:ir.model.fields.anonymization.history:0
#: field:ir.model.fields.anonymization.history,field_ids:0
msgid "Fields"
msgstr "項目"
#. module: anonymization
#: selection:ir.model.fields.anonymization,state:0
#: selection:ir.model.fields.anonymize.wizard,state:0
msgid "Clear"
msgstr "クリア"
#. module: anonymization
#: view:ir.model.fields.anonymize.wizard:0
#: field:ir.model.fields.anonymize.wizard,summary:0
msgid "Summary"
msgstr "要約"
#. module: anonymization
#: view:ir.model.fields.anonymization:0
msgid "Anonymized Field"
msgstr "匿名化項目"
#. module: anonymization
#: selection:ir.model.fields.anonymize.wizard,state:0
msgid "Unstable"
msgstr "不安定"
#. module: anonymization
#: selection:ir.model.fields.anonymization.history,state:0
msgid "Exception occured"
msgstr "例外発生"
#. module: anonymization
#: selection:ir.model.fields.anonymization,state:0
#: selection:ir.model.fields.anonymize.wizard,state:0
msgid "Not Existing"
msgstr "未存在"
#. module: anonymization
#: field:ir.model.fields.anonymization,model_name:0
msgid "Object Name"
msgstr "オブジェクト名"
#. module: anonymization
#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_history_tree
#: view:ir.model.fields.anonymization.history:0
#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_history
msgid "Anonymization History"
msgstr "匿名化履歴"
#. module: anonymization
#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_history
msgid "ir.model.fields.anonymization.history"
msgstr ""
#. module: anonymization
#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
#: view:ir.model.fields.anonymize.wizard:0
msgid "Anonymize Database"
msgstr "匿名化データベース"
#. module: anonymization
#: field:ir.model.fields.anonymize.wizard,name:0
msgid "File Name"
msgstr "ファイル名"
#. module: anonymization
#: selection:ir.model.fields.anonymization.history,direction:0
msgid "anonymized -> clear"
msgstr "匿名化 -> クリア"
#. module: anonymization
#: selection:ir.model.fields.anonymization.history,state:0
msgid "Started"
msgstr "開始済"
#. module: anonymization
#: selection:ir.model.fields.anonymization.history,state:0
msgid "Done"
msgstr "完了"
#. module: anonymization
#: view:ir.model.fields.anonymization.history:0
#: field:ir.model.fields.anonymization.history,msg:0
#: field:ir.model.fields.anonymize.wizard,msg:0
msgid "Message"
msgstr "メッセージ"
#. module: anonymization
#: code:addons/anonymization/anonymization.py:55
#: sql_constraint:ir.model.fields.anonymization:0
#, python-format
msgid "You cannot have two fields with the same name on the same object!"
msgstr "同じオブジェクトでは同じ名前の項目を複数持てません。"
addons/association/i18n/ja.po
+18 -17
View File
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2012-04-08 06:15+0000\n"
"Last-Translator: Masaki Yamaya <Unknown>\n"
"PO-Revision-Date: 2012-05-16 18:27+0000\n"
"Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@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: 2012-04-09 04:56+0000\n"
"X-Generator: Launchpad (build 15060)\n"
"X-Launchpad-Export-Date: 2012-05-17 04:36+0000\n"
"X-Generator: Launchpad (build 15259)\n"
#. module: association
#: field:profile.association.config.install_modules_wizard,wiki:0
@@ -35,7 +35,7 @@ msgstr "物事を完了"
#. module: association
#: model:ir.module.module,description:association.module_meta_information
msgid "This module is to create Profile for Associates"
msgstr ""
msgstr "このモジュールは協会のためのプロファイルを作成します。"
#. module: association
#: field:profile.association.config.install_modules_wizard,progress:0
@@ -47,7 +47,7 @@ msgstr "設定を進行中"
msgid ""
"Here are specific applications related to the Association Profile you "
"selected."
msgstr ""
msgstr "ここでは選択した協会のプロファイルに関連する特別なアプリケーションです。"
#. module: association
#: view:profile.association.config.install_modules_wizard:0
@@ -57,7 +57,7 @@ msgstr "タイトル"
#. module: association
#: help:profile.association.config.install_modules_wizard,event_project:0
msgid "Helps you to manage and organize your events."
msgstr ""
msgstr "イベントの管理と整理を助けます。"
#. module: association
#: field:profile.association.config.install_modules_wizard,config_logo:0
@@ -69,7 +69,7 @@ msgstr "画像"
msgid ""
"Tracks and manages employee expenses, and can automatically re-invoice "
"clients if the expenses are project-related."
msgstr ""
msgstr "従業員の費用を追跡管理します。費用がプロジェクト関連である場合、顧客に自動的に再度の請求書を送ります。"
#. module: association
#: help:profile.association.config.install_modules_wizard,project_gtd:0
@@ -77,41 +77,42 @@ msgid ""
"GTD is a methodology to efficiently organise yourself and your tasks. This "
"module fully integrates GTD principle with OpenERP's project management."
msgstr ""
"GTDは自分自身と自分のタスクを効果的に整理する方法です。このモジュールはOpenERPのプロジェクト管理とGDTの原理を完全に統合しています。"
#. module: association
#: view:profile.association.config.install_modules_wizard:0
msgid "Resources Management"
msgstr ""
msgstr "資源管理"
#. module: association
#: model:ir.module.module,shortdesc:association.module_meta_information
msgid "Association profile"
msgstr ""
msgstr "協会プロファイル"
#. module: association
#: field:profile.association.config.install_modules_wizard,hr_expense:0
msgid "Expenses Tracking"
msgstr ""
msgstr "費用追跡"
#. module: association
#: model:ir.actions.act_window,name:association.action_config_install_module
#: view:profile.association.config.install_modules_wizard:0
msgid "Association Application Configuration"
msgstr ""
msgstr "協会アプリケーション設定"
#. module: association
#: help:profile.association.config.install_modules_wizard,wiki:0
msgid ""
"Lets you create wiki pages and page groups in order to keep track of "
"business knowledge and share it with and between your employees."
msgstr ""
msgstr "ビジネス知識を記録し追跡して、それを従業員の間で共有するために、Wikiページとページグループの作成ができます。"
#. module: association
#: help:profile.association.config.install_modules_wizard,project:0
msgid ""
"Helps you manage your projects and tasks by tracking them, generating "
"plannings, etc..."
msgstr ""
msgstr "プロジェクトやタスクを追跡，計画生成などすることにより、あなたのプロジェクトとタスクの管理を補助します。"
#. module: association
#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
@@ -121,15 +122,15 @@ msgstr ""
#. module: association
#: field:profile.association.config.install_modules_wizard,event_project:0
msgid "Events"
msgstr ""
msgstr "イベント"
#. module: association
#: view:profile.association.config.install_modules_wizard:0
#: field:profile.association.config.install_modules_wizard,project:0
msgid "Project Management"
msgstr ""
msgstr "プロジェクト管理"
#. module: association
#: view:profile.association.config.install_modules_wizard:0
msgid "Configure"
msgstr ""
msgstr "設定"
addons/auction/i18n/ja.po
+2359
View File
File diff suppressed because it is too large Load Diff
addons/base_setup/__init__.py
+1
View File
@@ -20,5 +20,6 @@
##############################################################################
import base_setup
import res_config
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/base_setup/__openerp__.py
+1 -1
View File
@@ -36,7 +36,7 @@ Shows you a list of applications features to install from.
'website': 'http://www.openerp.com',
'depends': ['base'],
'init_xml': [],
'update_xml': ['security/ir.model.access.csv', 'base_setup_views.xml' ],
'update_xml': ['security/ir.model.access.csv', 'base_setup_views.xml', 'res_config_view.xml'],
'demo_xml': [],
'installable': True,
'auto_install': True,
addons/base_setup/base_setup.py
-55
View File
@@ -18,7 +18,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import pytz
import simplejson
import cgi
@@ -28,60 +27,6 @@ from osv import fields, osv
from tools.translate import _
from lxml import etree
# Define users preferences for new users (ir.values)
def _lang_get(self, cr, uid, context=None):
obj = self.pool.get('res.lang')
ids = obj.search(cr, uid, [('translatable','=',True)])
res = obj.read(cr, uid, ids, ['code', 'name'], context=context)
res = [(r['code'], r['name']) for r in res]
return res
def _tz_get(self,cr,uid, context=None):
return [(x, x) for x in pytz.all_timezones]
class user_preferences_config(osv.osv_memory):
_name = 'user.preferences.config'
_inherit = 'res.config'
_columns = {
'context_tz': fields.selection(_tz_get, 'Timezone', size=64,
help="Set default for new user's timezone, used to perform timezone conversions "
"between the server and the client."),
'context_lang': fields.selection(_lang_get, 'Language', required=True,
help="Sets default language for the all user interface, when UI "
"translations are available. If you want to Add new Language, you can add it from 'Load an Official Translation' wizard from 'Administration' menu."),
'view': fields.selection([('simple','Simplified'),
('extended','Extended')],
'Interface', required=True, help= "If you use OpenERP for the first time we strongly advise you to select the simplified interface, which has less features but is easier. You can always switch later from the user preferences." ),
'menu_tips': fields.boolean('Display Tips', help="Check out this box if you want to always display tips on each menu action"),
}
_defaults={
'view' : lambda self,cr,uid,*args: self.pool.get('res.users').browse(cr, uid, uid).view or 'simple',
'context_lang' : 'en_US',
'menu_tips' : True
}
def default_get(self, cr, uid, fields, context=None):
if context is None:
context = {}
res = super(user_preferences_config, self).default_get(cr, uid, fields, context=context)
res_default = self.pool.get('ir.values').get(cr, uid, 'default', False, ['res.users'])
for id, field, value in res_default:
res.update({field: value})
return res
def execute(self, cr, uid, ids, context=None):
user_obj = self.pool.get('res.users')
user_ids = user_obj.search(cr, uid, [], context=context)
for o in self.browse(cr, uid, ids, context=context):
user_obj.write(cr , uid, user_ids ,{'context_tz' : o.context_tz, 'context_lang' : o.context_lang, 'view' : o.view, 'menu_tips' : o.menu_tips}, context=context)
ir_values_obj = self.pool.get('ir.values')
ir_values_obj.set(cr, uid, 'default', False, 'context_tz', ['res.users'], o.context_tz)
ir_values_obj.set(cr, uid, 'default', False, 'context_lang', ['res.users'], o.context_lang)
ir_values_obj.set(cr, uid, 'default', False, 'view', ['res.users'], o.view)
ir_values_obj.set(cr, uid, 'default', False, 'menu_tips', ['res.users'], o.menu_tips)
return {}
# Specify Your Terminology will move to 'partner' module
class specify_partner_terminology(osv.osv_memory):
_name = 'base.setup.terminology'
addons/base_setup/base_setup_views.xml
+1 -63
View File
@@ -1,51 +1,5 @@
<openerp>
<data>
<!-- Define default users preferences-->
<record id="view_user_preferences_config_form" model="ir.ui.view">
<field name="name">Set default users preferences</field>
<field name="model">user.preferences.config</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.res_config_view_base"/>
<field name="arch" type="xml">
<data>
<form position="attributes">
<attribute name="string">Define Users's Preferences</attribute>
</form>
<xpath expr="//separator[@string=&quot;title&quot;]" position="attributes">
<attribute name="string">Define Users's Preferences</attribute>
</xpath>
<xpath expr="//label[@string='description']" position="attributes">
<attribute name="string">This will set the default preferences for new users and update all existing ones. Afterwards, users are free to change those values on their own user preference form.</attribute>
</xpath>
<xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
<attribute name="string"/>
<attribute name="rowspan">12</attribute>
</xpath>
<group string="res_config_contents" position="replace">
<group colspan="4">
<field colspan="4" name="view"/>
<field colspan="4" name="context_lang"/>
<field colspan="4" name="context_tz"/>
<field colspan="4" name="menu_tips"/>
</group>
</group>
</data>
</field>
</record>
<record id="action_user_preferences_config_form" model="ir.actions.act_window">
<field name="name">Define default users preferences</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">user.preferences.config</field>
<field name="view_type">form</field>
<field name="view_id" ref="view_user_preferences_config_form"/>
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
<record id="config_action_user_preferences_config_form" model="ir.actions.todo">
<field name="action_id" ref="action_user_preferences_config_form"/>
<field name="category_id" ref="base.category_administration_config"/>
<field name="type">once</field>
</record>
<!-- Specify Your Terminology Config Wiz-->
<record id="base_setup_terminology_form" model="ir.ui.view">
@@ -86,23 +40,6 @@
<field name="target">new</field>
</record>
<!-- Company config -->
<record id="action_base_setup_company" model="ir.actions.act_window">
<field name="name">Set Company Header and Footer</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">res.company</field>
<field name="view_id" ref="base.view_company_form"/>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="context">{'res_id': user.company_id.id}</field>
<field name="help">Fill in your company data (address, logo, bank accounts) so that it's printed on your reports. You can click on the button 'Preview Header' in order to check the header/footer of PDF documents.</field>
</record>
<record id="base_setup_company_todo" model="ir.actions.todo">
<field name="action_id" ref="action_base_setup_company"/>
<field name="category_id" ref="base.category_administration_config"/>
<field name="sequence">1</field>
</record>
<record id="base.view_sale_config_settings" model="ir.ui.view">
<field name="name">sale settings</field>
<field name="model">sale.config.settings</field>
@@ -116,6 +53,7 @@
<sheet layout="auto">
<group>
<group name="config_sale" colspan="4"/>
<!-- this part is necessary to allow the plugins to extend the view -->
<field name="module_crm" invisible="1"/>
<group name="config_fetchmail" colspan="4" attrs="{'invisible': [('module_crm','=',False)]}">
addons/base_setup/res_config.py
+40
View File
@@ -0,0 +1,40 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Business Applications
# Copyright (C) 2004-2012 OpenERP S.A. (<http://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/>.
#
##############################################################################
from osv import osv, fields
class base_config_settings(osv.osv_memory):
_name = 'base.config.settings'
_inherit = 'res.config.settings'
_columns = {
'module_multi_company': fields.boolean('Multi Company',
help="""Work in multi-company environments, with appropriate security access between companies.
This installs the module multi_company."""),
'module_portal': fields.boolean('Portal',
help="""Define a portal for your customers or suppliers. The portal is a group of
external users that has specific access rights and rules.
This installs the module portal."""),
'module_share': fields.boolean('Share',
help="""Share OpenERP documents (records) with external users.
This installs the module share."""),
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/base_setup/res_config_view.xml
+41
View File
@@ -0,0 +1,41 @@
<openerp>
<data>
<record id="view_general_configuration" model="ir.ui.view">
<field name="name">General Settings</field>
<field name="model">base.config.settings</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="General Settings" layout="manual">
<div class="oe_form_topbar">
<button string="Apply" type="object" name="execute"/>
<button string="Cancel" special="cancel"/>
</div>
<sheet layout="auto">
<separator string="Company Settings" colspan="4"/>
<field name="module_multi_company"/>
<separator string="Others" colspan="4"/>
<label string="Outgoing Mail Servers"/>
<button type="action" name="%(base.action_ir_mail_server_list)d"
string="Configure" icon="gtk-execute"/>
<newline/>
<field name="module_share"/>
<newline/>
<field name="module_portal"/>
</sheet>
</form>
</field>
</record>
<record id="action_general_configuration" model="ir.actions.act_window">
<field name="name">General Settings</field>
<field name="res_model">base.config.settings</field>
<field name="view_mode">form</field>
<field name="target">inline</field>
</record>
<menuitem id="menu_general_configuration" parent="base.menu_config"
sequence="100" action="action_general_configuration"/>
</data>
</openerp>
addons/base_synchro/base_synchro_view.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<menuitem id="synch_config" name="Synchronization" parent="base.menu_config" sequence="30"/>
<menuitem id="synch_config" name="Synchronization" parent="base.menu_config" sequence="60"/>
<record id="view_transfer_line_tree" model="ir.ui.view">
<field name="name">base.synchro.obj.line.tree</field>
<field name="model">base.synchro.obj.line</field>
addons/crm/crm_lead_view.xml
+12 -9
View File
@@ -401,7 +401,7 @@
<field name="priority">20</field>
<field name="arch" type="xml">
<form string="Opportunities" layout="manual">
<div class="oe_form_topbar">
<div class="oe_form_topbar oe_form_topbar_hifirst">
<button name="case_cancel" string="Cancel" states="draft" type="object" icon="gtk-cancel" />
<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" />
@@ -412,16 +412,19 @@
<div class="oe_right">
<field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
</div>
<div class="oe_clear"/>
</div>
<sheet layout="auto">
<group colspan="4" col="3">
<field name="name" required="1" nolabel="1" class="oe_form_title" width="80%%"/>
<button string="Schedule/Log Call"
name="%(opportunity2phonecall_act)d" icon="terp-call-start"
type="action"/>
<button string="Schedule Meeting" icon="gtk-redo"
name="action_makeMeeting"
type="object"/>
<group colspan="4" col="2" width="auto">
<field name="name" required="1" nolabel="1" class="oe_form_title"/>
<div class="oe_text_right">
<button string="Schedule/Log Call"
name="%(opportunity2phonecall_act)d" icon="terp-call-start"
type="action"/>
<button string="Schedule Meeting" icon="gtk-redo"
name="action_makeMeeting"
type="object"/>
</div>
</group>
<group colspan="4" col="4" class="oe_form_group_label_border" style="margin-top: 20px;">
<field name="user_id"/>
addons/crm/res_config.py
+3 -18
View File
@@ -26,23 +26,12 @@ class crm_configuration(osv.osv_memory):
_inherit = ['sale.config.settings', 'fetchmail.config.settings']
_columns = {
'fetchmail_lead': fields.boolean("Create Leads from Incoming Mails", readonly=True,
fetchmail_model='crm.lead', fetchmail_name='Incoming Leads',
help="""Allows you to configure your incoming mail server, and create leads from incoming emails."""),
'module_crm_caldav': fields.boolean("Caldav Synchronization",
help="""Use protocol caldav to synchronize meetings with other calendar applications (like Sunbird).
This installs the module crm_caldav."""),
'fetchmail_lead': fields.boolean("Create Leads from an E-mail Account",
fetchmail_model='crm.lead', fetchmail_name='Incoming leads',
help="""Allows you to configure your incoming mail server, and create leads from incoming emails."""),
'lead_server': fields.char('Server', size=256),
'lead_port': fields.integer('Port'),
'lead_type': fields.selection([
('pop', 'POP Server'),
('imap', 'IMAP Server'),
('local', 'Local Server'),
], 'Type'),
'lead_is_ssl': fields.boolean('SSL/TLS',
help="Connections are encrypted with SSL/TLS through a dedicated port (default: IMAPS=993, POP=995)"),
'lead_user': fields.char('Username', size=256),
'lead_password': fields.char('Password', size=1024),
'module_import_sugarcrm': fields.boolean("SugarCRM Import",
help="""Import SugarCRM leads, opportunities, users, accounts, contacts, employees, meetings, phonecalls, emails, project and project tasks data.
This installs the module import_sugarcrm."""),
@@ -57,8 +46,4 @@ class crm_configuration(osv.osv_memory):
This installs the module google_map."""),
}
_defaults = {
'lead_type': 'pop',
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/crm/res_config_view.xml
+3 -10
View File
@@ -10,15 +10,7 @@
<field name="arch" type="xml">
<group name="config_fetchmail" position="after">
<field name="fetchmail_lead"/>
<group colspan="2" attrs="{'invisible': [('fetchmail_lead','=',False)]}">
<field name="lead_server" attrs="{'required': [('fetchmail_lead','=',True)]}"/>
<field name="lead_type" on_change="onchange_fetchmail('lead', lead_type, lead_is_ssl)" attrs="{'required': [('fetchmail_lead','=',True)]}"/>
<field name="lead_port" attrs="{'required': [('fetchmail_lead','=',True)]}"/>
<field name="lead_is_ssl" on_change="onchange_fetchmail('lead', lead_type, lead_is_ssl)"/>
<field name="lead_user" attrs="{'required': [('fetchmail_lead','=',True)]}"/>
<field name="lead_password" password="True" attrs="{'required': [('fetchmail_lead','=',True)]}"/>
</group>
<newline/>
<button colspan="2" type="object" name="configure_fetchmail_lead" string="Configure" icon="gtk-execute"/>
</group>
<group name="config_crm" position="after">
@@ -36,7 +28,8 @@
</field>
</record>
<menuitem id="base.menu_sale_config" name="Sales" parent="base.menu_config" sequence="1" action="base.action_sale_config"/>
<menuitem id="base.menu_sale_config" name="Sales" parent="base.menu_config"
sequence="1" action="base.action_sale_config"/>
</data>
</openerp>
addons/crm_claim/res_config.py
+2 -16
View File
@@ -26,21 +26,7 @@ class crm_claim_settings(osv.osv_memory):
_inherit = ['sale.config.settings', 'fetchmail.config.settings']
_columns = {
'fetchmail_claim': fields.boolean("Create Claims from an E-mail Account",
fetchmail_model='crm.claim', fetchmail_name='Incoming claims',
'fetchmail_claim': fields.boolean("Create Claims from Incoming Mails", readonly=True,
fetchmail_model='crm.claim', fetchmail_name='Incoming Claims',
help="""Allows you to configure your incoming mail server, and create claims from incoming emails."""),
'claim_server' : fields.char('Server', size=256),
'claim_port' : fields.integer('Port'),
'claim_type': fields.selection([
('pop', 'POP Server'),
('imap', 'IMAP Server'),
('local', 'Local Server'),
], 'Type'),
'claim_is_ssl': fields.boolean('SSL/TLS', help="Connections are encrypted with SSL/TLS through a dedicated port (default: IMAPS=993, POP=995)"),
'claim_user' : fields.char('Username', size=256),
'claim_password' : fields.char('Password', size=1024),
}
_defaults = {
'claim_type': 'pop',
}
addons/crm_claim/res_config_view.xml
+1 -9
View File
@@ -11,15 +11,7 @@
<field name="arch" type="xml">
<group name="config_fetchmail" position="after">
<field name="fetchmail_claim"/>
<group colspan="2" attrs="{'invisible': [('fetchmail_claim','=',False)]}">
<field name="claim_server" attrs="{'required': [('fetchmail_claim','=',True)]}"/>
<field name="claim_type" on_change="onchange_fetchmail('claim', claim_type, claim_is_ssl)" attrs="{'required': [('fetchmail_claim','=',True)]}"/>
<field name="claim_port" attrs="{'required': [('fetchmail_claim','=',True)]}"/>
<field name="claim_is_ssl" on_change="onchange_fetchmail('claim', claim_type, claim_is_ssl)"/>
<field name="claim_user" attrs="{'required': [('fetchmail_claim','=',True)]}"/>
<field name="claim_password" password="True" attrs="{'required': [('fetchmail_claim','=',True)]}"/>
</group>
<newline/>
<button colspan="2" type="object" name="configure_fetchmail_claim" string="Configure" icon="gtk-execute"/>
</group>
</field>
</record>
addons/crm_todo/i18n/ro.po
+97
View File
@@ -0,0 +1,97 @@
# Romanian translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
"PO-Revision-Date: 2012-05-15 12:21+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Romanian <ro@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: 2012-05-16 04:51+0000\n"
"X-Generator: Launchpad (build 15247)\n"
#. module: crm_todo
#: model:ir.model,name:crm_todo.model_project_task
msgid "Task"
msgstr "Sarcina"
#. module: crm_todo
#: view:crm.lead:0
msgid "Timebox"
msgstr "Ceas"
#. module: crm_todo
#: view:crm.lead:0
msgid "For cancelling the task"
msgstr "Pentru anularea sarcinii"
#. module: crm_todo
#: constraint:project.task:0
msgid "Error ! Task end-date must be greater then task start-date"
msgstr ""
"Eroare ! Data de sfarsit a sarcinii trebuie sa fie mai mare decat data de "
"inceput"
#. module: crm_todo
#: model:ir.model,name:crm_todo.model_crm_lead
msgid "crm.lead"
msgstr "pista.crm"
#. module: crm_todo
#: view:crm.lead:0
msgid "Next"
msgstr "Urmatorul"
#. module: crm_todo
#: model:ir.actions.act_window,name:crm_todo.crm_todo_action
#: model:ir.ui.menu,name:crm_todo.menu_crm_todo
msgid "My Tasks"
msgstr "Sarcinile mele"
#. module: crm_todo
#: view:crm.lead:0
#: field:crm.lead,task_ids:0
msgid "Tasks"
msgstr "Sarcini"
#. module: crm_todo
#: view:crm.lead:0
msgid "Done"
msgstr "Efectuat"
#. module: crm_todo
#: constraint:project.task:0
msgid "Error ! You cannot create recursive tasks."
msgstr "Eroare ! Nu puteti crea sarcini recursive."
#. module: crm_todo
#: view:crm.lead:0
msgid "Cancel"
msgstr "Anuleaza"
#. module: crm_todo
#: view:crm.lead:0
msgid "Extra Info"
msgstr "Informatii suplimentare"
#. module: crm_todo
#: field:project.task,lead_id:0
msgid "Lead / Opportunity"
msgstr "Pista / Oportunitate"
#. module: crm_todo
#: view:crm.lead:0
msgid "For changing to done state"
msgstr "Pentru schimbarea in starea efectuat"
#. module: crm_todo
#: view:crm.lead:0
msgid "Previous"
msgstr "Precedent(a)"
addons/delivery/delivery_view.xml
+5 -46
View File
@@ -177,28 +177,13 @@
<record id="view_picking_withcarrier_out_form" model="ir.ui.view">
<field name="name">delivery.stock.picking_withcarrier.out.form.view</field>
<field name="type">form</field>
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.view_picking_out_form"/>
<field name="model">stock.picking.out</field>
<field name="inherit_id" ref="stock.view_picking_form"/>
<field name="arch" type="xml">
<field name="partner_id" position="after">
<field name="carrier_id"/>
<field name="carrier_tracking_ref"/>
<field name="number_of_packages"/>
<field name="weight"/>
<field name="weight_net"/>
</field>
</field>
</record>
<record id="view_picking_withweight_in_form" model="ir.ui.view">
<field name="name">stock.picking_withweight.in.form.view</field>
<field name="type">form</field>
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.view_picking_in_form"/>
<field name="arch" type="xml">
<field name="type" position="after">
<field name="weight"/>
<field name="weight_net"/>
</field>
</field>
</record>
@@ -218,7 +203,7 @@
<record id="action_picking_tree4" model="ir.actions.act_window">
<field name="name">Picking to be invoiced</field>
<field name="res_model">stock.picking</field>
<field name="res_model">stock.picking.out</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
@@ -228,39 +213,13 @@
<field name="search_view_id" ref="stock.view_picking_out_search"/>
</record>
<record id="view_picking_withcarrier_out_move_form" model="ir.ui.view">
<field name="name">delivery.stock.picking_withcarrier.out.move.form.view</field>
<field name="type">form</field>
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.view_picking_out_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
<field name="weight"/>
<field name="weight_net"/>
</xpath>
</field>
</record>
<record id="view_picking_withweight_in_move_form" model="ir.ui.view">
<field name="name">stock.picking_withweight.in.move.form.view</field>
<field name="type">form</field>
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.view_picking_in_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
<field name="weight"/>
<field name="weight_net"/>
</xpath>
</field>
</record>
<record id="view_picking_withweight_internal_move_form" model="ir.ui.view">
<field name="name">stock.picking_withweight.internal.move.form.view</field>
<field name="type">form</field>
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.view_picking_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
<xpath expr="/form/sheet/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
<field name="weight"/>
<field name="weight_net"/>
</xpath>
@@ -316,7 +275,7 @@
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.view_picking_out_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page[@string='Products']/group/button[@string='Create Invoice']" position="after">
<xpath expr="/form/div[@class='oe_form_topbar']/button[@string='Create Invoice']" position="after">
<button name="%(report_shipping)d" string="Delivery Order" states="done" type="action" icon="gtk-print"/>
</xpath>
</field>
addons/delivery/stock.py
+29
View File
@@ -173,5 +173,34 @@ class stock_move(osv.osv):
stock_move()
# Redefinition of the new fields in order to update the model stock.picking.out in the orm
# FIXME: this is a temporary workaround because of a framework bug (ref: lp996816). It should be removed as soon as
# the bug is fixed
class stock_picking_out(osv.osv):
_inherit = 'stock.picking.out'
def _cal_weight(self, cr, uid, ids, name, args, context=None):
return self.pool.get('stock.picking')._cal_weight(cr, uid, ids, name, args, context=context)
def _get_picking_line(self, cr, uid, ids, context=None):
return self.pool.get('stock.picking')._get_picking_line(cr, uid, ids, context=context)
_columns = {
'carrier_id':fields.many2one("delivery.carrier","Carrier"),
'volume': fields.float('Volume'),
'weight': fields.function(_cal_weight, type='float', string='Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_weight',
store={
'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['move_lines'], 20),
'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty'], 20),
}),
'weight_net': fields.function(_cal_weight, type='float', string='Net Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_weight',
store={
'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['move_lines'], 20),
'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty'], 20),
}),
'carrier_tracking_ref': fields.char('Carrier Tracking Ref', size=32),
'number_of_packages': fields.integer('Number of Packages'),
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/document_ftp/__init__.py
+2
View File
@@ -18,8 +18,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import ftpserver
import wizard
import res_config
post_load = ftpserver.start_server
addons/document_ftp/__openerp__.py
+2 -1
View File
@@ -40,7 +40,8 @@ FTP client.
'update_xml': [
'wizard/ftp_configuration_view.xml',
'wizard/ftp_browse_view.xml',
'security/ir.model.access.csv'
'security/ir.model.access.csv',
'res_config_view.xml',
],
'demo_xml': [],
'test': [
addons/document_ftp/res_config.py
+37
View File
@@ -0,0 +1,37 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Business Applications
# Copyright (C) 2004-2012 OpenERP S.A. (<http://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/>.
#
##############################################################################
from osv import fields, osv
from tools import config
class documnet_ftp_setting(osv.osv_memory):
_name = 'knowledge.config.settings'
_inherit = 'knowledge.config.settings'
_columns = {
'document_ftp_url': fields.char('Browse Documents', size=128,
help ="""Click the url to browse the documents""", readonly=True),
}
def get_default_ftp_config(self, cr, uid, fields, context=None):
action = self.pool.get('ir.model.data').get_object(cr, uid, 'document_ftp', 'action_document_browse')
return {'document_ftp_url': action.url}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/document_ftp/res_config_view.xml
+15
View File
@@ -0,0 +1,15 @@
<openerp>
<data>
<record id="view_document_ftp_configuration" model="ir.ui.view">
<field name="name">Knowledge Application</field>
<field name="model">knowledge.config.settings</field>
<field name="type">form</field>
<field name="inherit_id" ref="base_setup.view_knowledge_configuration"/>
<field name="arch" type="xml">
<field name="module_document_ftp" position="after">
<field name="document_ftp_url" widget="url"/>
</field>
</field>
</record>
</data>
</openerp>
addons/edi/i18n/ro.po
+416
View File
@@ -0,0 +1,416 @@
# Romanian translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2012-05-15 17:48+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Romanian <ro@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: 2012-05-16 04:51+0000\n"
"X-Generator: Launchpad (build 15247)\n"
#. module: edi
#: sql_constraint:res.currency:0
msgid "The currency code must be unique per company!"
msgstr "Codul monedei trebuie sa fie unic per companie!"
#. module: edi
#: model:ir.model,name:edi.model_res_partner_address
msgid "Partner Addresses"
msgstr "Adrese Partener"
#. module: edi
#: sql_constraint:res.company:0
msgid "The company name must be unique !"
msgstr "Numele companiei trebuie sa fie unic !"
#. module: edi
#: constraint:res.partner:0
msgid "Error ! You cannot create recursive associated members."
msgstr "Eroare ! Nu puteti crea membri asociati recursiv."
#. module: edi
#: field:edi.document,name:0
msgid "EDI token"
msgstr "Simbol EDI"
#. module: edi
#: help:edi.document,name:0
msgid "Unique identifier for retrieving an EDI document."
msgstr "Identificator unic pentru recuperarea unui document EDI."
#. module: edi
#: constraint:res.company:0
msgid "Error! You can not create recursive companies."
msgstr "Eroare! Nu puteti crea companii recursive."
#. module: edi
#: model:ir.model,name:edi.model_res_company
msgid "Companies"
msgstr "Companii"
#. module: edi
#: sql_constraint:edi.document:0
msgid "EDI Tokens must be unique!"
msgstr "Simbolurile EDI trebuie sa fie unice!"
#. module: edi
#: model:ir.model,name:edi.model_res_currency
msgid "Currency"
msgstr "Moneda"
#. module: edi
#: code:addons/edi/models/edi.py:153
#, python-format
msgid ""
"The document you are trying to import requires the OpenERP `%s` application. "
"You can install it by connecting as the administrator and opening the "
"configuration assistant."
msgstr ""
"Documentul pe care incercati sa il importati necesita aplicatia `%s` "
"OpenERP. O puteti instala conectandu-va ca administrator si deschizand "
"asistentul configurare."
#. module: edi
#: help:edi.document,document:0
msgid "EDI document content"
msgstr "Continut document EDI"
#. module: edi
#: model:ir.model,name:edi.model_edi_document
msgid "EDI Document"
msgstr "Document EDI"
#. module: edi
#: code:addons/edi/models/edi.py:48
#, python-format
msgid "'%s' is an invalid external ID"
msgstr "'%s' este un ID extern nevalid"
#. module: edi
#: model:ir.model,name:edi.model_res_partner
msgid "Partner"
msgstr "Partener"
#. module: edi
#: code:addons/edi/models/edi.py:152
#, python-format
msgid "Missing Application"
msgstr "Aplicatie Lipsa"
#. module: edi
#: field:edi.document,document:0
msgid "Document"
msgstr "Document"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:23
msgid "View/Print"
msgstr "Vizualizeaza/Printeaza"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:28
msgid "Import this document"
msgstr "Importa acest document"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:33
msgid "Import it into an existing OpenERP instance"
msgstr "Importati-l intr-un caz OpenERP existent"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:36
msgid "OpenERP instance address:"
msgstr "Adresa caz OpenERP"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:39
msgid "Import"
msgstr "Importa"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:44
msgid "Import it into a new OpenERP Online instance"
msgstr "Importati-l intr-o noua instanta OpenERP Online"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:47
msgid "Create my new OpenERP instance"
msgstr "Creeaza noul meu caz OpenERP"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:52
msgid "Import into another application"
msgstr "Importa intr-o alta aplicatie"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:54
msgid ""
"OpenERP's Electronic Data Interchange documents are based on a generic and "
"language\n"
" independent"
msgstr ""
"Documentele Schimb Electronic de Date OpenERP se bazeaza pe o serializare "
"generala si independenta\n"
" de limba"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:56
msgid "JSON"
msgstr "JSON"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:56
msgid ""
"serialization of the document's attribute.\n"
" It is usually very quick and straightforward to "
"create a small plug-in for your preferred\n"
" application that will be capable of importing "
"any OpenERP EDI document.\n"
" You can find out more details about how to do "
"this and what the content of OpenERP EDI documents\n"
" is like in the"
msgstr ""
"serializare a atributului documentului.\n"
" De obicei este foarte rapid si direct sa creezi "
"un plug-in mic pentru aplicatia dumneavoastra\n"
"\n"
" preferata care va putea sa importe orice "
"document EDI OpenERP.\n"
" Puteti afla mai multe detalii despre cum sa "
"faceti acest lucru si care este continutul documentelor EDI\n"
"OpenERP\n"
" in"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:60
msgid "OpenERP documentation"
msgstr "documentatia OpenERP"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:61
msgid "To get started immediately,"
msgstr "Pentru a incepe imediat,"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:62
msgid "see is all it takes to use this EDI document in Python"
msgstr ""
"sa vedeti este tot ceea este nevoie pentru a folosi acest document EDI in "
"Python"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:70
msgid "You can download the raw EDI document here:"
msgstr "Puteti descarca documentul EDI brut de aici:"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:73
msgid "Download"
msgstr "Descarca"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
msgid "Powered by"
msgstr "Oferit de"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
msgid "OpenERP"
msgstr "OpenERP"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:34
msgid "Invoice"
msgstr "Factureaza"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:37
msgid "Description"
msgstr "Descriere"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:38
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:41
msgid "Date"
msgstr "Data"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:39
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:40
msgid "Your Reference"
msgstr "Referinta dumneavoastra"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:50
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:57
msgid "Product Description"
msgstr "Descriere produs"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:51
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:58
msgid "Quantity"
msgstr "Cantitate"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:52
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:59
msgid "Unit Price"
msgstr "Pret unitar"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:53
msgid "Discount"
msgstr "Reducere"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:54
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:61
msgid "Price"
msgstr "Pret"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:72
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:81
msgid "Net Total:"
msgstr "Net Total:"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:83
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:92
msgid "Taxes:"
msgstr "Taxe:"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:94
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:103
msgid "Total:"
msgstr "Total:"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:106
msgid "Tax"
msgstr "Taxa"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:107
msgid "Base Amount"
msgstr "Suma de baza"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:108
msgid "Amount"
msgstr "Suma"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:121
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:113
msgid "Notes:"
msgstr "Note:"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:129
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:121
msgid "Pay Online"
msgstr "Plateste Online"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:133
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:125
msgid "Paypal"
msgstr "Paypal"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:135
msgid ""
"You may directly pay this invoice online via Paypal's secure payment gateway:"
msgstr ""
"Puteti plati aceasta factura direct online prin intermediul lui Paypal "
"gateway plata in siguranta:"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:145
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:137
msgid "Bank Wire Transfer"
msgstr "Transfer Bancar"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:147
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:139
msgid "Please transfer"
msgstr "Va rugam sa transferati"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:148
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:140
msgid "to"
msgstr "la"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:149
msgid ""
"(postal address on the invoice header)\n"
" using one of the following bank accounts. Be sure to "
"mention the invoice\n"
" reference"
msgstr ""
"(adresa postala de pe antetul facturii)\n"
" folosind unul dintre urmatoarele conturi bancare. "
"Asigurati-va ca mentionati referinta\n"
" facturii"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:151
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:143
msgid "on the transfer:"
msgstr "in transfer:"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:36
msgid "Order"
msgstr "Comanda"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:42
msgid "Salesman"
msgstr "Agent de vanzari"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:43
msgid "Payment terms"
msgstr "Termeni de plata"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:60
msgid "Discount(%)"
msgstr "Reducere(%)"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:127
msgid ""
"You may directly pay this order online via Paypal's secure payment gateway:"
msgstr ""
"Puteti plati aceasta comanda direct online prin Paypay gateway plata in "
"siguranta:"
#. openerp-web
#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:141
msgid ""
"(postal address on the order header)\n"
" using one of the following bank accounts. Be sure to "
"mention the document\n"
" reference"
msgstr ""
"(adresa postala de pe antetul facturii)\n"
" folosind unul dintre urmatoarele conturi bancare. "
"Asigurati-va ca mentionati referinta\n"
" documentului"
addons/fetchmail/res_config.py
+49 -76
View File
@@ -25,99 +25,72 @@ class fetchmail_config_settings(osv.osv_memory):
""" This wizard can be inherited in conjunction with 'res.config.settings', in order to
define fields that configure a fetchmail server.
It relies on the following convention on a set of fields::
It relies on the following convention on the object::
class my_config_wizard(osv.osv_memory):
class my_config_settings(osv.osv_memory):
_name = 'my.settings'
_inherits = ['res.config.settings', 'fetchmail.config.settings']
_inherit = ['res.config.settings', 'fetchmail.config.settings']
_columns = {
'fetchmail_X': fields.boolean(..., fetchmail_model='my.model', fetchmail_name='Blah'),
'X_server': fields.char('Server Name', size=256),
'X_port': fields.integer('Port'),
'X_type': fields.selection(
[('pop', 'POP Server'), ('imap', 'IMAP Server'), ('local', 'Local Server')],
'Server Type'),
'X_is_ssl': fields.boolean('SSL/TLS'),
'X_user': fields.char('Username', size=256),
'X_password': fields.char('Password', size=1024),
'fetchmail_stuff': fields.boolean(..., readonly=True,
fetchmail_model='my.stuff', fetchmail_name='Incoming Stuff'),
}
The method ``get_default_fetchmail_servers`` retrieves the current fetchmail configuration
for all fields that start with 'fetchmail_'. It looks up configurations that match the
given model name (``fetchmail_model``). The method ``set_fetchmail_servers`` updates the
fetchmail configurations by following the same conventions. Both methods are called
automatically by the methods of the model 'res.config.settings'.
def configure_fetchmail_stuff(self, cr, uid, ids, context=None):
return self.configure_fetchmail(cr, uid, 'fetchmail_stuff', context)
The onchange method ``onchange_fetchmail`` can be used to react on changes on the fields
'X_type' and 'X_is_ssl'. Its first parameter is the fields' prefix (here 'X').
and in the form view::
<field name="fetchmail_stuff"/>
<button type="object" name="configure_fetchmail_stuff"/>
The method ``get_default_fetchmail`` determines the value of all fields that start
with 'fetchmail_'. It looks up fetchmail server configurations that match the given
model name (``fetchmail_model``) and are active.
The button action ``configure_fetchmail_stuff`` is caught by the object, and calls
automatically the method ``configure_fetchmail``; it opens the fetchmail server
configuration form for the corresponding field.
"""
_name = 'fetchmail.config.settings'
def get_default_fetchmail_servers(self, cr, uid, fields, context=None):
def get_default_fetchmail(self, cr, uid, fields, context=None):
""" determine the value of all fields like 'fetchmail_XXX' """
ir_model = self.pool.get('ir.model')
fetchmail_server = self.pool.get('fetchmail.server')
fetchmail_fields = [f for f in self._columns if f.startswith('fetchmail_')]
fetchmail_fields = [f for f in fields if f.startswith('fetchmail_')]
res = {}
for field in fetchmail_fields:
model_name = self._columns[field].fetchmail_model
for f in fetchmail_fields:
model_name = self._columns[f].fetchmail_model
model_id = ir_model.search(cr, uid, [('model', '=', model_name)])[0]
server_ids = fetchmail_server.search(cr, uid, [('object_id', '=', model_id), ('state', '=', 'done')])
if server_ids:
server = fetchmail_server.browse(cr, uid, server_ids[0], context)
prefix = field[10:]
res.update({
field: True,
prefix + '_server': server.server,
prefix + '_port': server.port,
prefix + '_type': server.type,
prefix + '_is_ssl': server.is_ssl,
prefix + '_user': server.user,
prefix + '_password': server.password,
})
res[f] = bool(server_ids)
return res
def set_fetchmail_servers(self, cr, uid, ids, context):
ir_model = self.pool.get('ir.model')
fetchmail_server = self.pool.get('fetchmail.server')
fetchmail_fields = [f for f in self._columns if f.startswith('fetchmail_')]
config = self.browse(cr, uid, ids[0], context)
for field in fetchmail_fields:
model_name = self._columns[field].fetchmail_model
model_id = ir_model.search(cr, uid, [('model', '=', model_name)])[0]
server_ids = fetchmail_server.search(cr, uid, [('object_id', '=', model_id), ('state', '=', 'done')])
if config[field]:
prefix = field[10:]
values = {
'server': config[prefix + '_server'],
'port': config[prefix + '_port'],
'type': config[prefix + '_type'],
'is_ssl': config[prefix + '_is_ssl'],
'user': config[prefix + '_user'],
'password': config[prefix + '_password'],
}
if not server_ids:
values.update({
'name': getattr(self._columns[field], 'fetchmail_name', model_name),
'object_id': model_id,
})
server_ids = [fetchmail_server.create(cr, uid, values, context=context)]
else:
server_ids = fetchmail_server.search(cr, uid, [('object_id', '=', model_id)], context=context)
fetchmail_server.write(cr, uid, server_ids, values, context=context)
fetchmail_server.button_confirm_login(cr, uid, server_ids, context)
else:
fetchmail_server.set_draft(cr, uid, server_ids, context)
def onchange_fetchmail(self, cr, uid, ids, prefix, server_type, ssl, context=None):
values = {}
if server_type == 'pop':
values[prefix + '_port'] = ssl and 995 or 110
elif server_type == 'imap':
values[prefix + '_port'] = ssl and 993 or 143
def configure_fetchmail(self, cr, uid, field, context=None):
""" open the form view of the fetchmail.server to configure """
action = {
'type': 'ir.actions.act_window',
'res_model': 'fetchmail.server',
'view_mode': 'form',
}
model_name = self._columns[field].fetchmail_model
model_id = self.pool.get('ir.model').search(cr, uid, [('model', '=', model_name)])[0]
server_ids = self.pool.get('fetchmail.server').search(cr, uid, [('object_id', '=', model_id)])
if server_ids:
action['res_id'] = server_ids[0]
else:
values[prefix + '_server'] = False
values[prefix + '_port'] = 0
return {'value': values}
action['context'] = {
'default_name': self._columns[field].fetchmail_name,
'default_object_id': model_id,
}
return action
def __getattr__(self, name):
""" catch calls to 'configure_fetchmail_XXX' """
if name.startswith('configure_fetchmail_'):
return (lambda cr, uid, ids, context=None:
self.configure_fetchmail(cr, uid, name[10:], context))
return super(fetchmail_config_settings, self).__getattr__(name)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/google_base_account/i18n/pt.po
+122
View File
@@ -0,0 +1,122 @@
# Portuguese translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
"PO-Revision-Date: 2012-05-15 09:02+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Portuguese <pt@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: 2012-05-16 04:51+0000\n"
"X-Generator: Launchpad (build 15247)\n"
#. module: google_base_account
#: field:res.users,gmail_user:0
msgid "Username"
msgstr "Nome de utilizador"
#. module: google_base_account
#: model:ir.actions.act_window,name:google_base_account.act_google_login_form
msgid "Google Login"
msgstr "Login Google"
#. module: google_base_account
#: code:addons/google_base_account/wizard/google_login.py:29
#, python-format
msgid "Google Contacts Import Error!"
msgstr "Erro na importação dos contatos Google!"
#. module: google_base_account
#: view:res.users:0
msgid " Synchronization "
msgstr " Sincronização "
#. module: google_base_account
#: sql_constraint:res.users:0
msgid "You can not have two users with the same login !"
msgstr "Não pode ter dois utilizadores com o mesmo login!"
#. module: google_base_account
#: code:addons/google_base_account/wizard/google_login.py:75
#, python-format
msgid "Error"
msgstr "Erro"
#. module: google_base_account
#: view:google.login:0
msgid "Google login"
msgstr "Login Google"
#. module: google_base_account
#: model:ir.model,name:google_base_account.model_res_users
msgid "res.users"
msgstr "res.users"
#. module: google_base_account
#: field:google.login,password:0
msgid "Google Password"
msgstr "Password Google"
#. module: google_base_account
#: view:google.login:0
msgid "_Cancel"
msgstr "_Cancelar"
#. module: google_base_account
#: view:res.users:0
msgid "Google Account"
msgstr "Conta Google"
#. module: google_base_account
#: field:google.login,user:0
msgid "Google Username"
msgstr "Nome de Utilizador Google"
#. module: google_base_account
#: code:addons/google_base_account/wizard/google_login.py:29
#, python-format
msgid ""
"Please install gdata-python-client from http://code.google.com/p/gdata-"
"python-client/downloads/list"
msgstr ""
"Por Favor instale gdata-python-client de http://code.google.com/p/gdata-"
"python-client/downloads/list"
#. module: google_base_account
#: model:ir.model,name:google_base_account.model_google_login
msgid "Google Contact"
msgstr "Contato Google"
#. module: google_base_account
#: view:google.login:0
msgid "_Login"
msgstr "_Login"
#. module: google_base_account
#: constraint:res.users:0
msgid "The chosen company is not in the allowed companies for this user"
msgstr ""
"A empresa escolhida não está entre as permitidas para este utilizador"
#. module: google_base_account
#: field:res.users,gmail_password:0
msgid "Password"
msgstr "Password"
#. module: google_base_account
#: code:addons/google_base_account/wizard/google_login.py:75
#, python-format
msgid "Authentication fail check the user and password !"
msgstr "Falhou autentificação verifique o utilizador e a password !"
#. module: google_base_account
#: view:google.login:0
msgid "ex: user@gmail.com"
msgstr "ex: utilizador@gmail.com"
addons/hr/res_config.py
+12 -6
View File
@@ -26,18 +26,24 @@ class hr_config_settings(osv.osv_memory):
_inherit = 'res.config.settings'
_columns = {
'module_hr_timesheet_sheet': fields.boolean('Manage Timesheets and Attendances',
'module_hr_timesheet_sheet': fields.boolean('Timesheet Validation by Manager',
help ="""This installs the module hr_timesheet_sheet."""),
'module_hr_holidays': fields.boolean('Manage Holidays',
'module_hr_attendance': fields.boolean('Track Attendances',
help ="""This installs the module hr_attendance."""),
'module_hr_timesheet': fields.boolean('Manage Timesheets',
help ="""This installs the module hr_timesheet."""),
'module_hr_holidays': fields.boolean('Leaves & Holidays',
help ="""This installs the module hr_holidays."""),
'module_hr_expense': fields.boolean('Manage Employees Expenses',
'module_hr_expense': fields.boolean('Expenses',
help ="""This installs the module hr_expense."""),
'module_hr_recruitment': fields.boolean('Manage Recruitment Process',
'module_hr_recruitment': fields.boolean('Recruitment',
help ="""This installs the module hr_recruitment."""),
'module_hr_contract': fields.boolean('Manage Employees Contracts',
'module_hr_contract': fields.boolean('Employees Contracts',
help ="""This installs the module hr_contract."""),
'module_hr_evaluation': fields.boolean('Manage Appraisals Process',
'module_hr_evaluation': fields.boolean('Periodic Appraisals',
help ="""This installs the module hr_evaluation."""),
'module_hr_payroll': fields.boolean('Payroll',
help ="""This installs the module hr_payroll."""),
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/hr/res_config_view.xml
+15 -13
View File
@@ -1,11 +1,12 @@
<openerp>
<data>
<record id="open_payroll1_modules" model="ir.actions.act_window">
<record id="open_payroll_modules" model="ir.actions.act_window">
<field name="name">Payroll</field>
<field name="res_model">ir.module.module</field>
<field name="view_mode">kanban,tree,form</field>
<field name="domain">[('state','=','uninstalled'), ('name','ilike','payroll'), ('name','!=','hr_payroll_account')]</field>
<field name="context" eval="{'search_default_category_id': ref('base.module_category_localization'), 'search_default_name': 'payroll'}"/>
<field name="search_view_id" ref="base.view_module_filter"/>
</record>
<record id="view_human_resources_configuration" model="ir.ui.view">
@@ -19,22 +20,22 @@
<button string="Cancel" special="cancel"/>
</div>
<sheet layout="auto">
<separator string="Human Resources" colspan="4"/>
<field name="module_hr_timesheet_sheet"/>
<newline/>
<field name="module_hr_holidays"/>
<separator string="Additional Features" colspan="4"/>
<field name="module_hr_expense"/>
<newline/>
<field name="module_hr_recruitment"/>
<newline/>
<field name="module_hr_evaluation"/>
<newline/>
<field name="module_hr_contract"/>
<field name="module_hr_holidays"/>
<newline/>
<field name="module_hr_payroll"/>
<button colspan="2" name="%(open_payroll_modules)d" type="action"
string="Install Country-Specific Payroll" icon="gtk-go-forward"/>
<separator string="Timesheets" colspan="4"/>
<field name="module_hr_attendance"/>
<field name="module_hr_timesheet"/>
<field name="module_hr_timesheet_sheet"/>
<group name="config_timesheets" colspan="4"/>
<group name="config_payroll" colspan="4"/>
<group name="config_recruitment" colspan="4"/>
</sheet>
</form>
@@ -49,7 +50,8 @@
<field name="target">inline</field>
</record>
<menuitem id="menu_human_resources_configuration" name="Human Resources" parent="base.menu_config" sequence="8" action="action_human_resources_configuration"/>
<menuitem id="menu_human_resources_configuration" name="Human Resources" parent="base.menu_config"
sequence="15" action="action_human_resources_configuration"/>
</data>
</openerp>
addons/hr_expense/hr_expense.py
+1 -1
View File
@@ -260,7 +260,7 @@ class hr_expense_line(osv.osv):
'unit_amount': fields.float('Unit Price', digits_compute=dp.get_precision('Account')),
'unit_quantity': fields.float('Quantities' ),
'product_id': fields.many2one('product.product', 'Product', domain=[('hr_expense_ok','=',True)]),
'uom_id': fields.many2one('product.uom', 'UoM'),
'uom_id': fields.many2one('product.uom', 'Unit of Measure'),
'description': fields.text('Description'),
'analytic_account': fields.many2one('account.analytic.account','Analytic account'),
'ref': fields.char('Reference', size=32),
addons/hr_expense/hr_expense_installer_view.xml
+1 -1
View File
@@ -10,7 +10,7 @@
<field name="name"/>
<field name="standard_price"/>
<field name="list_price"/>
<field name="uom_id" string="UoM"/>
<field name="uom_id" string="Unit of Measure"/>
</tree>
</field>
</record>
addons/hr_holidays/hr_holidays_data.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<!-- Casual leave -->
<record model="hr.holidays.status" id="holiday_status_cl">
<field name="name">Legal Leaves</field>
<field name="name" eval="'Legal Leaves '+time.strftime('%Y')"/>
<field name="color_name">black</field>
</record>
addons/hr_payroll/res_config_view.xml
+2 -3
View File
@@ -7,10 +7,9 @@
<field name="type">form</field>
<field name="inherit_id" ref="hr.view_human_resources_configuration"/>
<field name="arch" type="xml">
<group name="config_payroll" position="after">
<separator string="Account Payroll" colspan="4"/>
<field name="module_hr_holidays" position="after">
<field name="module_hr_payroll_account"/>
</group>
</field>
</field>
</record>
</data>
addons/hr_recruitment/i18n/hu.po
+7 -8
View File
@@ -7,15 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2011-02-03 23:37+0000\n"
"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
"<openerp@novotrade.hu>\n"
"PO-Revision-Date: 2012-05-17 13:22+0000\n"
"Last-Translator: Peter <herczegp@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: 2012-02-09 06:59+0000\n"
"X-Generator: Launchpad (build 14763)\n"
"X-Launchpad-Export-Date: 2012-05-18 04:40+0000\n"
"X-Generator: Launchpad (build 15259)\n"
#. module: hr_recruitment
#: help:hr.applicant,active:0
@@ -54,7 +53,7 @@ msgstr "Csoportosítás..."
#. module: hr_recruitment
#: field:hr.applicant,user_email:0
msgid "User Email"
msgstr ""
msgstr "Felhasználó email címe"
#. module: hr_recruitment
#: view:hr.applicant:0
@@ -247,7 +246,7 @@ msgstr "Javasolt fizetés"
#. module: hr_recruitment
#: view:hr.applicant:0
msgid "Change Color"
msgstr ""
msgstr "Szín megváltoztatása"
#. module: hr_recruitment
#: view:hr.recruitment.report:0
@@ -1100,7 +1099,7 @@ msgstr ""
#. module: hr_recruitment
#: model:ir.ui.menu,name:hr_recruitment.menu_hr_job
msgid "Job Positions"
msgstr ""
msgstr "Álláspozíciók"
#. module: hr_recruitment
#: view:hr.recruitment.report:0
addons/hr_recruitment/res_config.py
+2 -17
View File
@@ -26,27 +26,12 @@ class hr_applicant_settings(osv.osv_memory):
_inherit = ['hr.config.settings', 'fetchmail.config.settings']
_columns = {
'module_document_ftp': fields.boolean('Index & Track Documents',
'module_document_ftp': fields.boolean('Automatic Indexation of Resumes',
help="""Manage your CV's and motivation letter related to all applicants.
This installs the module document_ftp."""),
'fetchmail_applicants': fields.boolean('Create Applicants from an Email Account',
'fetchmail_applicants': fields.boolean('Create Applicants from Incoming Mails', readonly=True,
fetchmail_model='hr.applicant', fetchmail_name='Incoming HR Applications',
help ="""Allow applicants to send their job application to an email address (jobs@mycompany.com),
and create automatically application documents in the system."""),
'applicants_server': fields.char('Server', size=256),
'applicants_port': fields.integer('Port'),
'applicants_type': fields.selection([
('pop', 'POP Server'),
('imap', 'IMAP Server'),
('local', 'Local Server'),
], 'Type'),
'applicants_is_ssl': fields.boolean('SSL/TLS',
help="Connections are encrypted with SSL/TLS through a dedicated port (default: IMAPS=993, POP=995)"),
'applicants_user': fields.char('Username', size=256),
'applicants_password': fields.char('Password', size=1024),
}
_defaults = {
'applicants_type': 'pop',
}
addons/hr_recruitment/res_config_view.xml
+1 -10
View File
@@ -12,16 +12,7 @@
<field name="module_document_ftp"/>
<newline/>
<field name="fetchmail_applicants"/>
<group colspan="2" attrs="{'invisible': [('fetchmail_applicants','=',False)]}">
<field name="applicants_server" attrs="{'required': [('fetchmail_applicants','=',True)]}"/>
<field name="applicants_type" attrs="{'required': [('fetchmail_applicants','=',True)]}"
on_change="onchange_fetchmail('applicants', applicants_type, applicants_is_ssl)"/>
<field name="applicants_port" attrs="{'required': [('fetchmail_applicants','=',True)]}"/>
<field name="applicants_is_ssl" attrs="{'required': [('fetchmail_applicants','=',True)]}"
on_change="onchange_fetchmail('applicants', applicants_type, applicants_is_ssl)"/>
<field name="applicants_user" attrs="{'required': [('fetchmail_applicants','=',True)]}"/>
<field name="applicants_password" password="True" attrs="{'required': [('fetchmail_applicants','=',True)]}"/>
</group>
<button colspan="2" type="object" name="configure_fetchmail_applicants" string="Configure" icon="gtk-execute"/>
</group>
</field>
</record>
addons/hr_timesheet/hr_timesheet.py
+1 -1
View File
@@ -31,7 +31,7 @@ class hr_employee(osv.osv):
_columns = {
'product_id': fields.many2one('product.product', 'Product', help="Specifies employee's designation as a product with type 'service'."),
'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal'),
'uom_id': fields.related('product_id', 'uom_id', type='many2one', relation='product.uom', string='UoM', store=True, readonly=True)
'uom_id': fields.related('product_id', 'uom_id', type='many2one', relation='product.uom', string='Unit of Measure', store=True, readonly=True)
}
def _getAnalyticJournal(self, cr, uid, context=None):
addons/hr_timesheet/i18n/ja.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-05-15 04:51+0000\n"
"X-Generator: Launchpad (build 15238)\n"
"X-Launchpad-Export-Date: 2012-05-16 04:50+0000\n"
"X-Generator: Launchpad (build 15247)\n"
#. module: hr_timesheet
#: code:addons/hr_timesheet/report/user_timesheet.py:43
addons/hr_timesheet_invoice/i18n/ja.po
+4 -4
View File
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
"PO-Revision-Date: 2012-05-15 03:16+0000\n"
"PO-Revision-Date: 2012-05-15 06:00+0000\n"
"Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@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: 2012-05-15 04:51+0000\n"
"X-Generator: Launchpad (build 15238)\n"
"X-Launchpad-Export-Date: 2012-05-16 04:50+0000\n"
"X-Generator: Launchpad (build 15247)\n"
#. module: hr_timesheet_invoice
#: view:report.timesheet.line:0
@@ -260,7 +260,7 @@ msgstr "パートナ"
#. module: hr_timesheet_invoice
#: constraint:account.analytic.account:0
msgid "Error! You can not create recursive analytic accounts."
msgstr "エラー：反復した分析アカウントを作ることはできません"
msgstr "エラー。反復した分析アカウントを作ることはできません。"
#. module: hr_timesheet_invoice
#: help:hr.timesheet.invoice.create,time:0
addons/hr_timesheet_invoice/report/report_analytic.py
+1 -1
View File
@@ -70,7 +70,7 @@ class report_account_analytic_line_to_invoice(osv.osv):
'name': fields.char('Year',size=64,required=False, readonly=True),
'product_id':fields.many2one('product.product', 'Product', readonly=True),
'account_id':fields.many2one('account.analytic.account', 'Analytic account', readonly=True),
'product_uom_id':fields.many2one('product.uom', 'UoM', readonly=True),
'product_uom_id':fields.many2one('product.uom', 'Unit of Measure', readonly=True),
'unit_amount': fields.float('Units', readonly=True),
'sale_price': fields.float('Sale price', readonly=True, digits_compute=dp.get_precision('Sale Price')),
'amount': fields.float('Amount', readonly=True, digits_compute=dp.get_precision('Account')),
addons/hr_timesheet_sheet/res_config.py
+1 -1
View File
@@ -26,7 +26,7 @@ class hr_timesheet_settings(osv.osv_memory):
_columns = {
'timesheet_range': fields.selection([('day','Day'),('week','Week'),('month','Month')],
'Timesheet Range', help="Periodicity on which you validate your timesheets."),
'Validate Timesheets Every', help="Periodicity on which you validate your timesheets."),
'timesheet_max_difference': fields.float('Timesheet Allowed Difference (Hours)',
help="""Allowed difference in hours between the sign in/out and the timesheet
computation for one sheet. Set this to 0 if you do not want any control."""),
addons/hr_timesheet_sheet/res_config_view.xml
+5 -5
View File
@@ -7,11 +7,11 @@
<field name="type">form</field>
<field name="inherit_id" ref="hr.view_human_resources_configuration"/>
<field name="arch" type="xml">
<group name="config_timesheets" position="after">
<separator string="Timesheets" colspan="4"/>
<field name="timesheet_range"/>
<field name="timesheet_max_difference"/>
</group>
<field name="module_hr_timesheet_sheet" position="after">
<newline/>
<field name="timesheet_range" attrs="{'invisible':[('module_hr_timesheet_sheet','=',False)],'required': [('module_hr_timesheet_sheet','=',True)]}"/>
<field name="timesheet_max_difference" attrs="{'invisible':[('module_hr_timesheet_sheet','=',False)],'required': [('module_hr_timesheet_sheet','=',True)]}"/>
</field>
</field>
</record>
</data>
addons/knowledge/__init__.py
+1
View File
@@ -19,5 +19,6 @@
#
##############################################################################
import res_config
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/knowledge/__openerp__.py
+1
View File
@@ -40,6 +40,7 @@ document and Wiki based Hidden.
'security/knowledge_security.xml',
'security/ir.model.access.csv',
'knowledge_view.xml',
'res_config_view.xml',
],
'demo_xml': ['knowledge_demo.xml'],
'installable': True,
addons/knowledge/res_config.py
+44
View File
@@ -0,0 +1,44 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Business Applications
# Copyright (C) 2004-2012 OpenERP S.A. (<http://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/>.
#
##############################################################################
from osv import osv, fields
class knowledge_config_settings(osv.osv_memory):
_name = 'knowledge.config.settings'
_inherit = 'res.config.settings'
_columns = {
'module_wiki_faq': fields.boolean('Internal FAQ as a Wiki',
help="""This installs the module wiki_faq."""),
'module_wiki_quality_manual': fields.boolean('Quality Manual as a Wiki',
help="""This installs the module wiki_quality_manual."""),
'module_document': fields.boolean('Document Management',
help="""This is a complete document management system, with: user authentication,
full document search (but pptx and docx are not supported), and a document dashboard.
This installs the module document."""),
'module_document_ftp': fields.boolean('Share repositories (FTP)',
help="""Access your documents in OpenERP through an FTP interface.
This installs the module document_ftp."""),
'module_document_webdav': fields.boolean('Share Repositories (WebDAV)',
help="""Access your documents in OpenERP through WebDAV.
This installs the module document_webdav."""),
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/knowledge/res_config_view.xml
+41
View File
@@ -0,0 +1,41 @@
<openerp>
<data>
<record id="view_knowledge_configuration" model="ir.ui.view">
<field name="name">Configure Knowledge</field>
<field name="model">knowledge.config.settings</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Configure Knowledge" layout="manual">
<div class="oe_form_topbar">
<button string="Apply" type="object" name="execute"/>
<button string="Cancel" special="cancel"/>
</div>
<sheet layout="auto">
<separator string="Wiki" colspan="4"/>
<field name="module_wiki_faq"/>
<newline/>
<field name="module_wiki_quality_manual"/>
<separator string="Documents" colspan="4"/>
<field name="module_document"/>
<newline/>
<field name="module_document_ftp"/>
<newline/>
<field name="module_document_webdav"/>
</sheet>
</form>
</field>
</record>
<record id="action_knowledge_configuration" model="ir.actions.act_window">
<field name="name">Configure Knowledge</field>
<field name="res_model">knowledge.config.settings</field>
<field name="view_mode">form</field>
<field name="target">inline</field>
</record>
<menuitem id="menu_knowledge_configuration" name="Knowledge" parent="base.menu_config"
sequence="19" action="action_knowledge_configuration"/>
</data>
</openerp>
addons/l10n_be_hr_payroll/static/src/img/icon.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 599 B

addons/l10n_fr/__openerp__.py
+14 -7
View File
@@ -27,7 +27,7 @@
##############################################################################
{
"name" : "France - Accounting",
"version" : "1.0",
"version" : "1.1",
"author" : "OpenERP SA",
"website": "http://www.openerp.com",
"category" : "Localization/Account Charts",
@@ -35,17 +35,24 @@
This is the module to manage the accounting chart for France in OpenERP.
========================================================================
Credits: Sistheo Zeekom CrysaLEAD
This module applies to companies based in France mainland. It doesn't apply to companies based in the DOM-TOMs (Guadeloupe, Martinique, Guyane, Réunion, Mayotte, etc...)
This localisation module creates the VAT taxes of type "tax included" for purchases (it is notably required when you use the module "hr_expense"). Beware that these "tax included" VAT taxes are not managed by the fiscal positions provided by this module (because it is complex to manage both "tax excluded" and "tax included" scenarios in fiscal positions).
This localisation module doesn't properly handle the scenario when a France-mainland company sells services to a company based in the DOMs. We could manage it in the fiscal positions, but it would require to differentiate between "product" VAT taxes and "service" VAT taxes. We consider that it is too "heavy" to have this by default in l10n_fr ; companies that sell services to DOM-based companies should update the configuration of their taxes and fiscal positions manually.
Credits: Sistheo, Zeekom, CrysaLEAD, Akretion and Camptocamp.
""",
"depends" : ['base_iban', 'account', 'account_chart', 'base_vat', 'l10n_fr_rib'],
"init_xml" : [],
"update_xml" : [
"fr_report_demo.xml",
"plan_comptable_general_demo.xml",
"fr_report.xml",
"plan_comptable_general.xml",
"l10n_fr_view.xml",
"l10n_fr_wizard.xml",
"fr_pcg_taxes_demo.xml",
"fr_tax_demo.xml",
"fr_fiscal_templates_demo.xml",
"fr_pcg_taxes.xml",
"fr_tax.xml",
"fr_fiscal_templates.xml",
"security/ir.model.access.csv",
"wizard/fr_report_bilan_view.xml",
"wizard/fr_report_compute_resultant_view.xml",
addons/l10n_fr/fr_fiscal_templates.xml
+184
View File
@@ -0,0 +1,184 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!-- = = = = = = = = = = = = = = = -->
<!-- Fiscal Position Templates -->
<!-- = = = = = = = = = = = = = = = -->
<!-- Position Géographique du partenaire -->
<record id="fiscal_position_template_intraeub2b" model="account.fiscal.position.template">
<field name="name">Intra-EU B2B</field>
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="note">French VAT exemption according to articles 262 ter I (for products) and/or 283-2 (for services) of "CGI"</field>
</record>
<record id="fiscal_position_template_import_export" model="account.fiscal.position.template">
<field name="name">Import/Export + DOM-TOM</field>
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="note">French VAT exemption according to articles 262 I of "CGI"</field>
</record>
<!-- = = = = = = = = = = = = = = = -->
<!-- Fiscal Position Tax Templates -->
<!-- = = = = = = = = = = = = = = = -->
<!-- Par défaut, les produits doivent être paramétrés pour utiliser les taxes, paramétrées pour des numéro de comptes (nationaux) -->
<!-- Zone Intracommunautaire B2B -->
<!-- ventes -->
<!-- 19,6% -->
<record id="fp_tax_template_intraeub2b_vt_normale" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_normale" />
<field name="tax_dest_id" ref="tva_intra_0" />
</record>
<!-- 8,5% -->
<record id="fp_tax_template_intraeub2b_vt_specifique" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_specifique" />
<field name="tax_dest_id" ref="tva_intra_0" />
</record>
<!-- 7% -->
<record id="fp_tax_template_intraeub2b_vt_specifique_1" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_specifique_1" />
<field name="tax_dest_id" ref="tva_intra_0" />
</record>
<!-- 5,5% -->
<record id="fp_tax_template_intraeub2b_vt_reduite" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_reduite" />
<field name="tax_dest_id" ref="tva_intra_0" />
</record>
<!-- 2,1% -->
<record id="fp_tax_template_intraeub2b_vt_super_reduite" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_super_reduite" />
<field name="tax_dest_id" ref="tva_intra_0" />
</record>
<!-- achats -->
<!-- 19,6% -->
<record id="fp_tax_template_intraeub2b_ha_normale_deduc" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_acq_normale" />
<field name="tax_dest_id" ref="tva_intra_normale" />
</record>
<record id="fp_tax_template_intraeub2b_ha_normale_acq" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_acq_normale" />
<field name="tax_dest_id" ref="tva_acq_intra_normale" />
</record>
<!-- 8,5% -->
<record id="fp_tax_template_intraeub2b_ha_specifique_deduc" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_acq_specifique" />
<field name="tax_dest_id" ref="tva_intra_specifique" />
</record>
<record id="fp_tax_template_intraeub2b_ha_specifique_acq" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_acq_specifique" />
<field name="tax_dest_id" ref="tva_acq_intra_specifique" />
</record>
<!-- 7% -->
<record id="fp_tax_template_intraeub2b_ha_specifique_1_deduc" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_acq_specifique_1" />
<field name="tax_dest_id" ref="tva_intra_specifique_1" />
</record>
<record id="fp_tax_template_intraeub2b_ha_specifique_1_acq" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_acq_specifique_1" />
<field name="tax_dest_id" ref="tva_acq_intra_specifique_1" />
</record>
<!-- 5,5% -->
<record id="fp_tax_template_intraeub2b_ha_reduite_deduc" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_acq_reduite" />
<field name="tax_dest_id" ref="tva_intra_reduite" />
</record>
<record id="fp_tax_template_intraeub2b_ha_reduite_acq" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_acq_reduite" />
<field name="tax_dest_id" ref="tva_acq_intra_reduite" />
</record>
<!-- 2,1% -->
<record id="fp_tax_template_intraeub2b_ha_super_reduite_deduc" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_acq_super_reduite" />
<field name="tax_dest_id" ref="tva_intra_super_reduite" />
</record>
<record id="fp_tax_template_intraeub2b_ha_super_reduite_acq" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_acq_super_reduite" />
<field name="tax_dest_id" ref="tva_acq_intra_super_reduite" />
</record>
<!-- Import/Export + DOM/TOM -->
<!-- ventes -->
<!-- 19,6% -->
<record id="fp_tax_template_impexp_vt_normale" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_normale" />
<field name="tax_dest_id" ref="tva_export_0" />
</record>
<!-- 8,5% -->
<record id="fp_tax_template_impexp_vt_specifique" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_specifique" />
<field name="tax_dest_id" ref="tva_export_0" />
</record>
<!-- 7% -->
<record id="fp_tax_template_impexp_vt_specifique_1" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_specifique_1" />
<field name="tax_dest_id" ref="tva_export_0" />
</record>
<!-- 5,5% -->
<record id="fp_tax_template_impexp_vt_reduite" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_reduite" />
<field name="tax_dest_id" ref="tva_export_0" />
</record>
<!-- 2,1% -->
<record id="fp_tax_template_impexp_vt_super_reduite" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_super_reduite" />
<field name="tax_dest_id" ref="tva_export_0" />
</record>
<!-- achats -->
<!-- 19,6% -->
<record id="fp_tax_template_impexp_ha_normale" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_acq_normale" />
<field name="tax_dest_id" ref="tva_import_0" />
</record>
<!-- 8,5% -->
<record id="fp_tax_template_impexp_ha_specifique" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_acq_specifique" />
<field name="tax_dest_id" ref="tva_import_0" />
</record>
<!-- 7% -->
<record id="fp_tax_template_impexp_ha_specifique_1" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_acq_specifique_1" />
<field name="tax_dest_id" ref="tva_import_0" />
</record>
<!-- 5,5% -->
<record id="fp_tax_template_impexp_ha_reduite" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_acq_reduite" />
<field name="tax_dest_id" ref="tva_import_0" />
</record>
<!-- 2,1% -->
<record id="fp_tax_template_impexp_ha_super_reduite" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_acq_super_reduite" />
<field name="tax_dest_id" ref="tva_import_0" />
</record>
</data>
</openerp>
addons/l10n_fr/fr_fiscal_templates_demo.xml
-183
View File
@@ -1,183 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!-- = = = = = = = = = = = = = = = -->
<!-- Fiscal Position Templates -->
<!-- = = = = = = = = = = = = = = = -->
<!-- Position Géographique du partenaire -->
<record id="fiscal_position_template_1" model="account.fiscal.position.template">
<field name="name">France</field>
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
</record>
<record id="fiscal_position_template_2" model="account.fiscal.position.template">
<field name="name">Zone Euro</field>
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
</record>
<record id="fiscal_position_template_3" model="account.fiscal.position.template">
<field name="name">DOM-TOM</field>
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
</record>
<record id="fiscal_position_template_4" model="account.fiscal.position.template">
<field name="name">Hors Euro</field>
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
</record>
<!-- Immobilisations (substitution de taxes) -->
<record id="fiscal_position_template_5" model="account.fiscal.position.template">
<field name="name">France</field>
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
</record>
<!-- TVA sur Débits ou Encaissements (substitution de comptes) -->
<record id="fiscal_position_template_6" model="account.fiscal.position.template">
<field name="name">TVA sur le débits</field>
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
</record>
<record id="fiscal_position_template_7" model="account.fiscal.position.template">
<field name="name">TVA sur les encaissements</field>
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
</record>
<!-- = = = = = = = = = = = = = = = -->
<!-- Fiscal Position Tax Templates -->
<!-- = = = = = = = = = = = = = = = -->
<!-- Par défaut, les produits doivent être paramétrés pour utiliser les taxes, paramétrées pour des numéro de comptes (nationaux) -->
<!-- Zone Euro == Intracomm -->
<!-- ventes -->
<!-- 19,6% -->
<record id="fiscal_position_tax_template_1" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_2" />
<field name="tax_src_id" ref="tva_normale" />
<field name="tax_dest_id" ref="tva_intra_normale" />
</record>
<!-- 8,5% - - >
<record id="fiscal_position_tax_template_2" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_2" />
<field name="tax_src_id" ref="tva_specifique" />
<field name="tax_dest_id" ref="tva_intra_specifique" />
</record>
<! - - 5,5% -->
<record id="fiscal_position_tax_template_3" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_2" />
<field name="tax_src_id" ref="tva_reduite" />
<field name="tax_dest_id" ref="tva_intra_reduite" />
</record>
<!-- 2,1% - - >
<record id="fiscal_position_tax_template_4" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_2" />
<field name="tax_src_id" ref="tva_super_reduite" />
<field name="tax_dest_id" ref="tva_intra_super_reduite" />
</record>
<! - - achats -->
<!-- 19,6% -->
<record id="fiscal_position_tax_template_5" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_2" />
<field name="tax_src_id" ref="tva_acq_normale" />
<field name="tax_dest_id" ref="tva_acq_intra_normale" />
</record>
<!-- 8,5% - - >
<record id="fiscal_position_tax_template_6" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_2" />
<field name="tax_src_id" ref="tva_acq_specifique" />
<field name="tax_dest_id" ref="tva_acq_intra_specifique" />
</record>
<! - - 5,5% -->
<record id="fiscal_position_tax_template_7" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_2" />
<field name="tax_src_id" ref="tva_acq_reduite" />
<field name="tax_dest_id" ref="tva_acq_intra_reduite" />
</record>
<!-- 2,1% - - >
<record id="fiscal_position_tax_template_8" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_2" />
<field name="tax_src_id" ref="tva_acq_super_reduite" />
<field name="tax_dest_id" ref="tva_acq_intra_super_reduite" />
</record>
<! - - Hors Euro -->
<!-- ventes -->
<!-- 19,6% -->
<record id="fiscal_position_tax_template_9" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_2" />
<field name="tax_src_id" ref="tva_normale" />
<field name="tax_dest_id" ref="tva_export_0" />
</record>
<!-- 8,5% - - >
<record id="fiscal_position_tax_template_10" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_2" />
<field name="tax_src_id" ref="tva_specifique" />
<field name="tax_dest_id" ref="tva_export_0" />
</record>
<! - - 5,5% -->
<record id="fiscal_position_tax_template_11" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_2" />
<field name="tax_src_id" ref="tva_reduite" />
<field name="tax_dest_id" ref="tva_export_0" />
</record>
<!-- 2,1% - - >
<record id="fiscal_position_tax_template_12" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_2" />
<field name="tax_src_id" ref="tva_super_reduite" />
<field name="tax_dest_id" ref="tva_export_0" />
</record>
-->
<!-- Immobilisations -->
<!-- achats -->
<!-- 19,6% -->
<record id="fiscal_position_tax_template_5" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_2" />
<field name="tax_src_id" ref="tva_acq_normale" />
<field name="tax_dest_id" ref="tva_imm_normale" />
</record>
<!-- 8,5% - - >
<record id="fiscal_position_tax_template_6" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_2" />
<field name="tax_src_id" ref="tva_acq_specifique" />
<field name="tax_dest_id" ref="tva_imm_specifique" />
</record>
<! - - 5,5% -->
<record id="fiscal_position_tax_template_7" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_2" />
<field name="tax_src_id" ref="tva_acq_reduite" />
<field name="tax_dest_id" ref="tva_imm_reduite" />
</record>
<!-- 2,1% - - >
<record id="fiscal_position_tax_template_8" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_2" />
<field name="tax_src_id" ref="tva_acq_super_reduite" />
<field name="tax_dest_id" ref="tva_imm_super_reduite" />
</record>
-->
<!-- = = = = = = = = = = = = = = = = = -->
<!-- Fiscal Position Account Templates -->
<!-- = = = = = = = = = = = = = = = = = -->
<!-- Substitution des comptes de produits -->
<!-- TVA sur Débits ou Encaissements Pr les 4 taux : 19,6% ; 8,5% ; 5,5% ; 2,1% - - >
<record id="fiscal_position_account_template_1" model="account.fiscal.position.account.template">
<field name="position_id" ref="fiscal_position_template_1" />
<field name="account_src_id" ref="a7000" />
<field name="account_dest_id" ref="a_sale" />
</record>
<record id="fiscal_position_account_template_6" model="account.fiscal.position.account.template">
<field name="position_id" ref="fiscal_position_template_2" />
<field name="account_src_id" ref="a7050" />
<field name="account_dest_id" ref="a7051" />
</record -->
</data>
</openerp>
addons/l10n_fr/fr_pcg_taxes.xml
+448
View File
@@ -0,0 +1,448 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!--
Définition des Tax Codes
Version du fichier : 07-05-2012
-->
<!--
Tax Code Configuration (version générique)
-->
<record id="vat_code_chart_root" model="account.tax.code.template">
<field name="name">Plan de Taxes France</field>
</record>
<record model="account.tax.code.template" id="tax_col_ht">
<field name="name">Base H.T. TVA collectée</field>
<field name="code">a)</field>
<field name="sign">1.00</field>
<field name="parent_id" ref="vat_code_chart_root"/>
</record>
<record model="account.tax.code.template" id="tax_col_196_ht">
<field name="name">Base H.T. 19.6%</field>
<field name="code">TVA collectée 19.6% (Base H.T.)</field>
<field name="parent_id" ref="tax_col_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_col_85_ht">
<field name="name">Base H.T. 8.5%</field>
<field name="code">TVA collectée 8.5% (Base H.T.)</field>
<field name="parent_id" ref="tax_col_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_col_70_ht">
<field name="name">Base H.T. 7.0%</field>
<field name="code">TVA collectée 7.0% (Base H.T.)</field>
<field name="parent_id" ref="tax_col_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_col_55_ht">
<field name="name">Base H.T. 5.5%</field>
<field name="code">TVA collectée 5.5% (Base H.T.)</field>
<field name="parent_id" ref="tax_col_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_col_21_ht">
<field name="name">Base H.T. 2.1%</field>
<field name="code">TVA collectée 2.1% (Base H.T.)</field>
<field name="parent_id" ref="tax_col_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_col">
<field name="name">TVA collectée</field>
<field name="code">b)</field>
<field name="sign">1.00</field>
<field name="parent_id" ref="vat_code_chart_root"/>
</record>
<record model="account.tax.code.template" id="tax_col_196">
<field name="name">TVA 19.6%</field>
<field name="code">TVA collectée 19.6%</field>
<field name="parent_id" ref="tax_col"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_col_85">
<field name="name">TVA 8.5%</field>
<field name="code">TVA collectée 8.5%</field>
<field name="parent_id" ref="tax_col"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_col_70">
<field name="name">TVA 7.0%</field>
<field name="code">TVA collectée 7.0%</field>
<field name="parent_id" ref="tax_col"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_col_55">
<field name="name">TVA 5.5%</field>
<field name="code">TVA collectée 5.5%</field>
<field name="parent_id" ref="tax_col"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_col_21">
<field name="name">TVA 2.1%</field>
<field name="code">TVA collectée 2.1%</field>
<field name="parent_id" ref="tax_col"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_acq_ht">
<field name="name">Base H.T. TVA acquittée</field>
<field name="code">c)</field>
<field name="sign">1.00</field>
<field name="parent_id" ref="vat_code_chart_root"/>
</record>
<record model="account.tax.code.template" id="tax_acq_196_ht">
<field name="name">Base H.T. 19.6%</field>
<field name="code">TVA acquittée 19.6% (Base H.T.)</field>
<field name="parent_id" ref="tax_acq_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_acq_85_ht">
<field name="name">Base H.T. 8.5%</field>
<field name="code">TVA acquittée 8.5% (Base H.T.)</field>
<field name="parent_id" ref="tax_acq_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_acq_70_ht">
<field name="name">Base H.T. 7.0%</field>
<field name="code">TVA acquittée 7.0% (Base H.T.)</field>
<field name="parent_id" ref="tax_acq_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_acq_55_ht">
<field name="name">Base H.T. 5.5%</field>
<field name="code">TVA acquittée 5.5% (Base H.T.)</field>
<field name="parent_id" ref="tax_acq_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_acq_21_ht">
<field name="name">Base H.T. 2.1%</field>
<field name="code">TVA acquittée 2.1% (Base H.T.)</field>
<field name="parent_id" ref="tax_acq_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_acq">
<field name="name">TVA acquittée</field>
<field name="code">d)</field>
<field name="sign">1.00</field>
<field name="parent_id" ref="vat_code_chart_root"/>
</record>
<record model="account.tax.code.template" id="tax_acq_196">
<field name="name">TVA 19.6%</field>
<field name="code">TVA acquittée 19.6%</field>
<field name="parent_id" ref="tax_acq"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_acq_85">
<field name="name">TVA 8.5%</field>
<field name="code">TVA acquittée 8.5%</field>
<field name="parent_id" ref="tax_acq"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_acq_70">
<field name="name">TVA 7.0%</field>
<field name="code">TVA acquittée 7.0%</field>
<field name="parent_id" ref="tax_acq"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_acq_55">
<field name="name">TVA 5.5%</field>
<field name="code">TVA acquittée 5.5%</field>
<field name="parent_id" ref="tax_acq"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_acq_21">
<field name="name">TVA 2.1%</field>
<field name="code">TVA acquittée 2.1%</field>
<field name="parent_id" ref="tax_acq"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_imm_ht">
<field name="name">Base H.T. TVA acquittée pour immobilisations</field>
<field name="code">e)</field>
<field name="sign">1.00</field>
<field name="parent_id" ref="vat_code_chart_root"/>
</record>
<record model="account.tax.code.template" id="tax_imm_196_ht">
<field name="name">Base H.T. 19.6%</field>
<field name="code">TVA acquittée sur immobilisations 19.6% (Base H.T.)</field>
<field name="parent_id" ref="tax_imm_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_imm_85_ht">
<field name="name">Base H.T. 8.5%</field>
<field name="code">TVA acquittée sur immobilisations 8.5% (Base H.T.)</field>
<field name="parent_id" ref="tax_imm_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_imm_70_ht">
<field name="name">Base H.T. 7.0%</field>
<field name="code">TVA acquittée sur immobilisations 7.0% (Base H.T.)</field>
<field name="parent_id" ref="tax_imm_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_imm_55_ht">
<field name="name">Base H.T. 5.5%</field>
<field name="code">TVA acquittée sur immobilisations 5.5% (Base H.T.)</field>
<field name="parent_id" ref="tax_imm_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_imm_21_ht">
<field name="name">Base H.T. 2.1%</field>
<field name="code">TVA acquittée sur immobilisations 2.1% (Base H.T.)</field>
<field name="parent_id" ref="tax_imm_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_imm">
<field name="name">TVA acquittée pour immobilisations</field>
<field name="code">f)</field>
<field name="sign">1.00</field>
<field name="parent_id" ref="vat_code_chart_root"/>
</record>
<record model="account.tax.code.template" id="tax_imm_196">
<field name="name">TVA 19.6%</field>
<field name="code">TVA acquittée sur immobilisations 19.6%</field>
<field name="parent_id" ref="tax_imm"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_imm_85">
<field name="name">TVA 8.5%</field>
<field name="code">TVA acquittée sur immobilisations 8.5%</field>
<field name="parent_id" ref="tax_imm"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_imm_70">
<field name="name">TVA 7.0%</field>
<field name="code">TVA acquittée sur immobilisations 7.0%</field>
<field name="parent_id" ref="tax_imm"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_imm_55">
<field name="name">TVA 5.5%</field>
<field name="code">TVA acquittée sur immobilisations 5.5%</field>
<field name="parent_id" ref="tax_imm"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_imm_21">
<field name="name">TVA 2.1%</field>
<field name="code">TVA acquittée sur immobilisations 2.1%</field>
<field name="parent_id" ref="tax_imm"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_ht">
<field name="name">Base H.T. TVA due intracommunautaire</field>
<field name="code">g)</field>
<field name="sign">1.00</field>
<field name="parent_id" ref="vat_code_chart_root"/>
</record>
<record model="account.tax.code.template" id="tax_intra_196_ht">
<field name="name">Base H.T. 19.6%</field>
<field name="code">TVA due intracommunautaire 19.6% (Base H.T.)</field>
<field name="parent_id" ref="tax_intra_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_85_ht">
<field name="name">Base H.T. 8.5%</field>
<field name="code">TVA due intracommunautaire 8.5% (Base H.T.)</field>
<field name="parent_id" ref="tax_intra_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_70_ht">
<field name="name">Base H.T. 7.0%</field>
<field name="code">TVA due intracommunautaire 7.0% (Base H.T.)</field>
<field name="parent_id" ref="tax_intra_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_55_ht">
<field name="name">Base H.T. 5.5%</field>
<field name="code">TVA due intracommunautaire 5.5% (Base H.T.)</field>
<field name="parent_id" ref="tax_intra_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_21_ht">
<field name="name">Base H.T. 2.1%</field>
<field name="code">TVA due intracommunautaire 2.1% (Base H.T.)</field>
<field name="parent_id" ref="tax_intra_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra">
<field name="name">TVA due intracommunautaire</field>
<field name="code">h)</field>
<field name="sign">1.00</field>
<field name="parent_id" ref="vat_code_chart_root"/>
</record>
<record model="account.tax.code.template" id="tax_intra_196">
<field name="name">TVA 19.6%</field>
<field name="code">TVA due intracommunautaire 19.6%</field>
<field name="parent_id" ref="tax_intra"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_85">
<field name="name">TVA 8.5%</field>
<field name="code">TVA due intracommunautaire 8.5%</field>
<field name="parent_id" ref="tax_intra"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_70">
<field name="name">TVA 7.0%</field>
<field name="code">TVA due intracommunautaire 7.0%</field>
<field name="parent_id" ref="tax_intra"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_55">
<field name="name">TVA 5.5%</field>
<field name="code">TVA due intracommunautaire 5.5%</field>
<field name="parent_id" ref="tax_intra"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_21">
<field name="name">TVA 2.1%</field>
<field name="code">TVA due intracommunautaire 2.1%</field>
<field name="parent_id" ref="tax_intra"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_acq_ht">
<field name="name">Base H.T. TVA déductible intracommunautaire</field>
<field name="code">i)</field>
<field name="sign">1.00</field>
<field name="parent_id" ref="vat_code_chart_root"/>
</record>
<record model="account.tax.code.template" id="tax_intra_acq_196_ht">
<field name="name">Base H.T. 19.6%</field>
<field name="code">TVA déductible intracommunautaire 19.6% (Base H.T.)</field>
<field name="parent_id" ref="tax_intra_acq_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_acq_85_ht">
<field name="name">Base H.T. 8.5%</field>
<field name="code">TVA déductible intracommunautaire 8.5% (Base H.T.)</field>
<field name="parent_id" ref="tax_intra_acq_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_acq_70_ht">
<field name="name">Base H.T. 7.0%</field>
<field name="code">TVA déductible intracommunautaire 7.0% (Base H.T.)</field>
<field name="parent_id" ref="tax_intra_acq_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_acq_55_ht">
<field name="name">Base H.T. 5.5%</field>
<field name="code">TVA déductible intracommunautaire 5.5% (Base H.T.)</field>
<field name="parent_id" ref="tax_intra_acq_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_acq_21_ht">
<field name="name">Base H.T. 2.1%</field>
<field name="code">TVA déductible intracommunautaire 2.1% (Base H.T.)</field>
<field name="parent_id" ref="tax_intra_acq_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_acq">
<field name="name">TVA déductible intracommunautaire</field>
<field name="code">j)</field>
<field name="sign">1.00</field>
<field name="parent_id" ref="vat_code_chart_root"/>
</record>
<record model="account.tax.code.template" id="tax_intra_acq_196">
<field name="name">TVA 19.6%</field>
<field name="code">TVA déductible intracommunautaire 19.6%</field>
<field name="parent_id" ref="tax_intra_acq"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_acq_85">
<field name="name">TVA 8.5%</field>
<field name="code">TVA déductible intracommunautaire 8.5%</field>
<field name="parent_id" ref="tax_intra_acq"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_acq_70">
<field name="name">TVA 7.0%</field>
<field name="code">TVA déductible intracommunautaire 7.0%</field>
<field name="parent_id" ref="tax_intra_acq"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_acq_55">
<field name="name">TVA 5.5%</field>
<field name="code">TVA déductible intracommunautaire 5.5%</field>
<field name="parent_id" ref="tax_intra_acq"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_acq_21">
<field name="name">TVA 2.1%</field>
<field name="code">TVA déductible intracommunautaire 2.1%</field>
<field name="parent_id" ref="tax_intra_acq"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_0_ht">
<field name="name">Base H.T. Opérations non imposables</field>
<field name="code">k)</field>
<field name="sign">1.00</field>
<field name="parent_id" ref="vat_code_chart_root"/>
</record>
<record model="account.tax.code.template" id="tax_export_0_ht">
<field name="name">Exportations hors U.E.</field>
<field name="code">Exportations hors U.E. TVA 0% (Base H.T.)</field>
<field name="parent_id" ref="tax_0_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_intra_0_ht">
<field name="name">Livraisons intracommunautaires</field>
<field name="code">Livraisons intracommunautaires TVA 0% (Base H.T.)</field>
<field name="parent_id" ref="tax_0_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="tax_misc_0_ht">
<field name="name">Autres opérations non imposables</field>
<field name="code">Autres opérations non imposables TVA 0% (Base H.T.)</field>
<field name="parent_id" ref="tax_0_ht"/>
<field name="sign">1.00</field>
</record>
<record model="account.tax.code.template" id="non_present_sur_ca3">
<field name="name">Base H.T. Non présent sur la CA3</field>
<field name="code">Absent CA3)</field>
<field name="sign">1.00</field>
<field name="parent_id" ref="vat_code_chart_root"/>
</record>
<record model="account.tax.code.template" id="tax_import_0_ht">
<field name="name">Achats import</field>
<field name="code">Achats import TVA 0% (Base H.T.)</field>
<field name="sign">1.00</field>
<field name="parent_id" ref="non_present_sur_ca3"/>
</record>
<!-- Chart template -->
<record id="l10n_fr_pcg_chart_template" model="account.chart.template">
<field name="name">Plan Comptable Général (France)</field>
<field name="account_root_id" ref="pcg_0"/>
<field name="tax_code_root_id" ref="vat_code_chart_root"/>
<field name="bank_account_view_id" ref="pcg_5121"/>
<field name="property_account_receivable" ref="fr_pcg_recv"/>
<field name="property_account_payable" ref="fr_pcg_pay"/>
<field name="property_account_expense_categ" ref="pcg_6071"/>
<field name="property_account_income_categ" ref="pcg_7071"/>
<field name="property_reserve_and_surplus_account" ref="pcg_120"/>
</record>
</data>
</openerp>
addons/l10n_fr/fr_pcg_taxes_demo.xml
-1308
View File
File diff suppressed because it is too large Load Diff
addons/l10n_fr/fr_report_demo.xml → addons/l10n_fr/fr_report.xml
View File
addons/l10n_fr/fr_tax_demo.xml → addons/l10n_fr/fr_tax.xml
+350 -107
View File
@@ -1,21 +1,23 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!--
TVA :
France métropolitaine : taux normal = 19,6% Réduit = 5,5%
Département Outre Mer : 8,5% 2,1%
-->
<!-- Note : I set a sequence of 10 on all VAT taxes, because it is then
easier to create an eco-tax with a lower sequence (VAT applies on the
amount of the eco-tax)
-->
<!-- VENTES -->
<!-- VENTES Tax excluded from price -->
<record model="account.tax.template" id="tva_normale">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA collectée (vente) 19,6%</field>
<field name="description">1</field> <!-- code -->
<field name="description">TVA-VT-19.6</field>
<field name="amount" eval="0.196"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_col_196_ht"/>
<field name="base_sign" eval="1"/>
<field name="tax_code_id" ref="tax_col_196"/>
<field name="tax_sign" eval="1"/>
<field name="account_collected_id" ref="pcg_445711"/>
<field name="account_paid_id" ref="pcg_445711"/>
@@ -24,496 +26,737 @@
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_code_id" ref="tax_col_196"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">sale</field>
</record>
<record model="account.tax.template" id="tva_specifique">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA collectée (vente) 8,5%</field>
<field name="description">2</field>
<field name="description">TVA-VT-8.5</field>
<field name="amount" eval="0.085"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_col_85_ht"/>
<field name="base_sign" eval="1"/>
<field name="tax_code_id" ref="tax_col_85"/>
<field name="tax_sign" eval="1"/>
<field name="account_collected_id" ref="pcg_445713"/>
<field name="account_paid_id" ref="pcg_44571"/>
<field name="account_paid_id" ref="pcg_445713"/>
<field name="ref_base_code_id" ref="tax_col_85_ht"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_code_id" ref="tax_col_85"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">sale</field>
</record>
<record model="account.tax.template" id="tva_specifique_1">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA collectée (vente) 7,0%</field>
<field name="description">24</field>
<field name="description">TVA-VT-7.0</field>
<field name="amount" eval="0.07"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_col_70_ht"/>
<field name="base_sign" eval="1"/>
<field name="tax_code_id" ref="tax_col_70"/>
<field name="tax_sign" eval="1"/>
<field name="account_collected_id" ref="pcg_445713"/>
<field name="account_paid_id" ref="pcg_44571"/>
<field name="account_paid_id" ref="pcg_445713"/>
<field name="ref_base_code_id" ref="tax_col_70_ht"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_code_id" ref="tax_col_70"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">sale</field>
</record>
<record model="account.tax.template" id="tva_reduite">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA collectée (vente) 5,5%</field>
<field name="description">3</field>
<field name="description">TVA-VT-5.5</field>
<field name="amount" eval="0.055"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_col_55_ht"/>
<field name="base_sign" eval="1"/>
<field name="tax_code_id" ref="tax_col_55"/>
<field name="tax_sign" eval="1"/>
<field name="account_collected_id" ref="pcg_445712"/>
<field name="account_paid_id" ref="pcg_44571"/>
<field name="account_paid_id" ref="pcg_445712"/>
<field name="ref_base_code_id" ref="tax_col_55_ht"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_code_id" ref="tax_col_55"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">sale</field>
</record>
<record model="account.tax.template" id="tva_super_reduite">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA collectée (vente) 2,1%</field>
<field name="description">4</field>
<field name="description">TVA-VT-2.1</field>
<field name="amount" eval="0.021"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_col_21_ht"/>
<field name="base_sign" eval="1"/>
<field name="tax_code_id" ref="tax_col_21"/>
<field name="tax_sign" eval="1"/>
<field name="account_collected_id" ref="pcg_445713"/>
<field name="account_paid_id" ref="pcg_44571"/>
<field name="account_paid_id" ref="pcg_445713"/>
<field name="ref_base_code_id" ref="tax_col_21_ht"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_code_id" ref="tax_col_21"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">sale</field>
</record>
<!-- ACHATS -->
<!-- ACHATS Tax excluded from price -->
<record model="account.tax.template" id="tva_acq_normale">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA acquittée (achat) 19,6%</field>
<field name="description">5</field>
<field name="description">TVA-HA-19.6</field>
<field name="amount" eval="0.196"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_acq_196_ht"/>
<field name="base_sign" eval="-1"/>
<field name="tax_code_id" ref="tax_acq_196"/>
<field name="tax_sign" eval="-1"/>
<field name="account_collected_id" ref="pcg_44566"/>
<field name="account_paid_id" ref="pcg_44566"/>
<field name="ref_base_code_id" ref="tax_acq_196_ht"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_acq_196"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_acq_specifique">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA acquittée (achat) 8,5%</field>
<field name="description">6</field>
<field name="description">TVA-HA-8.5</field>
<field name="amount" eval="0.085"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_acq_85_ht"/>
<field name="base_sign" eval="-1"/>
<field name="tax_code_id" ref="tax_acq_85"/>
<field name="tax_sign" eval="-1"/>
<field name="account_collected_id" ref="pcg_44566"/>
<field name="account_paid_id" ref="pcg_44566"/>
<field name="ref_base_code_id" ref="tax_acq_85_ht"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_acq_85"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_acq_specifique_1">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA acquittée (achat) 7,0%</field>
<field name="description">25</field>
<field name="description">TVA-HA-7.0</field>
<field name="amount" eval="0.07"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_acq_70_ht"/>
<field name="base_sign" eval="-1"/>
<field name="tax_code_id" ref="tax_acq_70"/>
<field name="tax_sign" eval="-1"/>
<field name="account_collected_id" ref="pcg_44566"/>
<field name="account_paid_id" ref="pcg_44566"/>
<field name="ref_base_code_id" ref="tax_acq_70_ht"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_acq_70"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_acq_reduite">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA acquittée (achat) 5,5%</field>
<field name="description">7</field>
<field name="description">TVA-HA-5.5</field>
<field name="amount" eval="0.055"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_acq_55_ht"/>
<field name="base_sign" eval="-1"/>
<field name="tax_code_id" ref="tax_acq_55"/>
<field name="tax_sign" eval="-1"/>
<field name="account_collected_id" ref="pcg_44566"/>
<field name="account_paid_id" ref="pcg_44566"/>
<field name="ref_base_code_id" ref="tax_acq_55_ht"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_acq_55"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_acq_super_reduite">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA acquittée (achat) 2,1%</field>
<field name="description">8</field>
<field name="description">TVA-HA-2.1</field>
<field name="amount" eval="0.021"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_acq_21_ht"/>
<field name="base_sign" eval="-1"/>
<field name="tax_code_id" ref="tax_acq_21"/>
<field name="tax_sign" eval="-1"/>
<field name="account_collected_id" ref="pcg_44566"/>
<field name="account_paid_id" ref="pcg_44566"/>
<field name="ref_base_code_id" ref="tax_acq_21_ht"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_acq_21"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
</record>
<!-- ACHATS Tax included in price -->
<record model="account.tax.template" id="tva_acq_normale_inclue">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA acquittée (achat) 19,6% inclue</field>
<field name="description">TVA-HA-19.6-inclue</field>
<field name="price_include" eval="1"/>
<field name="amount" eval="0.196"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_acq_196_ht"/>
<field name="base_sign" eval="-1"/>
<field name="tax_code_id" ref="tax_acq_196"/>
<field name="tax_sign" eval="-1"/>
<field name="account_collected_id" ref="pcg_44566"/>
<field name="account_paid_id" ref="pcg_44566"/>
<field name="ref_base_code_id" ref="tax_acq_196_ht"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_acq_196"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_acq_specifique_inclue">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA acquittée (achat) 8,5% inclue</field>
<field name="description">TVA-HA-8.5-inclue</field>
<field name="price_include" eval="1"/>
<field name="amount" eval="0.085"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_acq_85_ht"/>
<field name="base_sign" eval="-1"/>
<field name="tax_code_id" ref="tax_acq_85"/>
<field name="tax_sign" eval="-1"/>
<field name="account_collected_id" ref="pcg_44566"/>
<field name="account_paid_id" ref="pcg_44566"/>
<field name="ref_base_code_id" ref="tax_acq_85_ht"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_acq_85"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_acq_specifique_1_inclue">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA acquittée (achat) 7,0% inclue</field>
<field name="description">TVA-HA-7.0-inclue</field>
<field name="price_include" eval="1"/>
<field name="amount" eval="0.07"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_acq_70_ht"/>
<field name="base_sign" eval="-1"/>
<field name="tax_code_id" ref="tax_acq_70"/>
<field name="tax_sign" eval="-1"/>
<field name="account_collected_id" ref="pcg_44566"/>
<field name="account_paid_id" ref="pcg_44566"/>
<field name="ref_base_code_id" ref="tax_acq_70_ht"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_acq_70"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_acq_reduite_inclue">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA acquittée (achat) 5,5% inclue</field>
<field name="description">TVA-HA-5.5-inclue</field>
<field name="price_include" eval="1"/>
<field name="amount" eval="0.055"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_acq_55_ht"/>
<field name="base_sign" eval="-1"/>
<field name="tax_code_id" ref="tax_acq_55"/>
<field name="tax_sign" eval="-1"/>
<field name="account_collected_id" ref="pcg_44566"/>
<field name="account_paid_id" ref="pcg_44566"/>
<field name="ref_base_code_id" ref="tax_acq_55_ht"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_acq_55"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_acq_super_reduite_inclue">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA acquittée (achat) 2,1% inclue</field>
<field name="description">TVA-HA-2.1-inclue</field>
<field name="price_include" eval="1"/>
<field name="amount" eval="0.021"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_acq_21_ht"/>
<field name="base_sign" eval="-1"/>
<field name="tax_code_id" ref="tax_acq_21"/>
<field name="tax_sign" eval="-1"/>
<field name="account_collected_id" ref="pcg_44566"/>
<field name="account_paid_id" ref="pcg_44566"/>
<field name="ref_base_code_id" ref="tax_acq_21_ht"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_acq_21"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<!-- IMMOBILISATIONS (achats) -->
<record model="account.tax.template" id="tva_imm_normale">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA immobilisation (achat) 19,6%</field>
<field name="description">9</field>
<field name="description">TVA-immo-19.6</field>
<field name="amount" eval="0.196"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_imm_196_ht"/>
<field name="base_sign" eval="-1"/>
<field name="tax_code_id" ref="tax_imm_196"/>
<field name="tax_sign" eval="-1"/>
<field name="account_collected_id" ref="pcg_44562"/>
<field name="account_paid_id" ref="pcg_44562"/>
<field name="ref_base_code_id" ref="tax_imm_196_ht"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_imm_196"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_imm_specifique">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA immobilisation (achat) 8,5%</field>
<field name="description">10</field>
<field name="description">TVA-immo-8.5</field>
<field name="amount" eval="0.085"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_imm_85_ht"/>
<field name="base_sign" eval="-1"/>
<field name="tax_code_id" ref="tax_imm_85"/>
<field name="tax_sign" eval="-1"/>
<field name="account_collected_id" ref="pcg_44562"/>
<field name="account_paid_id" ref="pcg_44562"/>
<field name="ref_base_code_id" ref="tax_imm_85_ht"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_imm_85"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_imm_specifique_1">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA immobilisation (achat) 7,0%</field>
<field name="description">26</field>
<field name="description">TVA-immo-7.0</field>
<field name="amount" eval="0.07"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_imm_70_ht"/>
<field name="base_sign" eval="-1"/>
<field name="tax_code_id" ref="tax_imm_70"/>
<field name="tax_sign" eval="-1"/>
<field name="account_collected_id" ref="pcg_44562"/>
<field name="account_paid_id" ref="pcg_44562"/>
<field name="ref_base_code_id" ref="tax_imm_70_ht"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_imm_70"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_imm_reduite">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA immobilisation (achat) 5,5%</field>
<field name="description">11</field>
<field name="description">TVA-immo-5.5</field>
<field name="amount" eval="0.055"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_imm_55_ht"/>
<field name="base_sign" eval="-1"/>
<field name="tax_code_id" ref="tax_imm_55"/>
<field name="tax_sign" eval="-1"/>
<field name="account_collected_id" ref="pcg_44562"/>
<field name="account_paid_id" ref="pcg_44562"/>
<field name="ref_base_code_id" ref="tax_imm_55_ht"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_imm_55"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_imm_super_reduite">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA immobilisation (achat) 2,1%</field>
<field name="description">12</field>
<field name="description">TVA-immo-2.1</field>
<field name="amount" eval="0.021"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_imm_21_ht"/>
<field name="base_sign" eval="-1"/>
<field name="tax_code_id" ref="tax_imm_21"/>
<field name="tax_sign" eval="-1"/>
<field name="account_collected_id" ref="pcg_44562"/>
<field name="account_paid_id" ref="pcg_44562"/>
<field name="ref_base_code_id" ref="tax_imm_21_ht"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_imm_21"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<!-- VENTES INTRACOMMUNAUTAIRE -->
<record model="account.tax.template" id="tva_intra_normale">
<field name="name">TVA due intracommunautaire 19,6%</field> <!-- ventes -->
<field name="description">13</field>
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA due intracommunautaire (achat) 19,6%</field> <!-- ventes -->
<field name="description">TVA-HA_UE_due-19.6</field>
<field name="amount" eval="-0.196"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_intra_196_ht"/>
<field name="base_sign" eval="-1" />
<field name="tax_code_id" ref="tax_intra_196"/>
<field name="tax_sign" eval="-1" />
<field name="account_collected_id" ref="pcg_445201"/>
<field name="account_paid_id" ref="pcg_4452"/>
<field name="account_paid_id" ref="pcg_445201"/>
<field name="ref_base_code_id" ref="tax_intra_196_ht"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_intra_196"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="type_tax_use">sale</field>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_intra_specifique">
<field name="name">TVA due intracommunautaire 8,5%</field>
<field name="description">14</field>
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA due intracommunautaire (achat) 8,5%</field>
<field name="description">TVA-HA_UE_due-8.5</field>
<field name="amount" eval="-0.085"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_intra_85_ht"/>
<field name="base_sign" eval="-1" />
<field name="tax_code_id" ref="tax_intra_85"/>
<field name="tax_sign" eval="-1" />
<field name="account_collected_id" ref="pcg_445203"/>
<field name="account_paid_id" ref="pcg_4452"/>
<field name="account_paid_id" ref="pcg_445203"/>
<field name="ref_base_code_id" ref="tax_intra_85_ht"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_intra_85"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="type_tax_use">sale</field>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_intra_specifique_1">
<field name="name">TVA due intracommunautaire 7,0%</field>
<field name="description">27</field>
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA due intracommunautaire (achat) 7,0%</field>
<field name="description">TVA-HA_UE_due-7.0</field>
<field name="amount" eval="-0.07"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_intra_70_ht"/>
<field name="base_sign" eval="-1" />
<field name="tax_code_id" ref="tax_intra_70"/>
<field name="tax_sign" eval="-1" />
<field name="account_collected_id" ref="pcg_445203"/>
<field name="account_paid_id" ref="pcg_4452"/>
<field name="account_paid_id" ref="pcg_445203"/>
<field name="ref_base_code_id" ref="tax_intra_70_ht"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_intra_70"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="type_tax_use">sale</field>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_intra_reduite">
<field name="name">TVA due intracommunautaire 5,5%</field>
<field name="description">15</field>
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA due intracommunautaire (achat) 5,5%</field>
<field name="description">TVA-HA_UE_due-5.5</field>
<field name="amount" eval="-0.055"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_intra_55_ht"/>
<field name="base_sign" eval="-1" />
<field name="tax_code_id" ref="tax_intra_55"/>
<field name="tax_sign" eval="-1" />
<field name="account_collected_id" ref="pcg_445202"/>
<field name="account_paid_id" ref="pcg_4452"/>
<field name="account_paid_id" ref="pcg_445202"/>
<field name="ref_base_code_id" ref="tax_intra_55_ht"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_intra_55"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="type_tax_use">sale</field>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_intra_super_reduite">
<field name="name">TVA due intracommunautaire 2,1%</field>
<field name="description">16</field>
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA due intracommunautaire (achat) 2,1%</field>
<field name="description">TVA-HA_UE_due-2.1</field>
<field name="amount" eval="-0.021"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_intra_21_ht"/>
<field name="base_sign" eval="-1" />
<field name="tax_code_id" ref="tax_intra_21"/>
<field name="tax_sign" eval="-1" />
<field name="account_collected_id" ref="pcg_445203"/>
<field name="account_paid_id" ref="pcg_4452"/>
<field name="account_paid_id" ref="pcg_445203"/>
<field name="ref_base_code_id" ref="tax_intra_21_ht"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_intra_21"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="type_tax_use">sale</field>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<!-- ACHATS INTRACOMMUNAUTAIRE -->
<record model="account.tax.template" id="tva_acq_intra_normale">
<field name="name">TVA déductible intracommunautaire 19,6%</field>
<field name="description">17</field>
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA déductible intracommunautaire (achat) 19,6%</field>
<field name="description">TVA-HA_UE_déduc-19.6</field>
<field name="amount" eval="0.196"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_intra_acq_196_ht"/>
<field name="base_sign" eval="-1"/>
<field name="tax_code_id" ref="tax_intra_acq_196"/>
<field name="tax_sign" eval="-1"/>
<field name="account_collected_id" ref="pcg_445662"/>
<field name="account_paid_id" ref="pcg_445662"/>
<field name="ref_base_code_id" ref="tax_intra_acq_196_ht"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_intra_acq_196"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_acq_intra_specifique">
<field name="name">TVA déductible intracommunautaire 8,5%</field>
<field name="description">18</field>
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA déductible intracommunautaire (achat) 8,5%</field>
<field name="description">TVA-HA_UE_déduc-8.5</field>
<field name="amount" eval="0.085"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_intra_acq_85_ht"/>
<field name="base_sign" eval="-1"/>
<field name="tax_code_id" ref="tax_intra_acq_85"/>
<field name="tax_sign" eval="-1"/>
<field name="account_collected_id" ref="pcg_445662"/>
<field name="account_paid_id" ref="pcg_445662"/>
<field name="ref_base_code_id" ref="tax_intra_acq_85_ht"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_intra_acq_85"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_acq_intra_specifique_1">
<field name="name">TVA déductible intracommunautaire 7,0%</field>
<field name="description">28</field>
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA déductible intracommunautaire (achat) 7,0%</field>
<field name="description">TVA-HA_UE_déduc-7.0</field>
<field name="amount" eval="0.07"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_intra_acq_70_ht"/>
<field name="base_sign" eval="-1"/>
<field name="tax_code_id" ref="tax_intra_acq_70"/>
<field name="tax_sign" eval="-1"/>
<field name="account_collected_id" ref="pcg_445662"/>
<field name="account_paid_id" ref="pcg_445662"/>
<field name="ref_base_code_id" ref="tax_intra_acq_70_ht"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_intra_acq_70"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_acq_intra_reduite">
<field name="name">TVA déductible intracommunautaire 5,5%</field>
<field name="description">19</field>
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA déductible intracommunautaire (achat) 5,5%</field>
<field name="description">TVA-HA_UE_déduc-5.5</field>
<field name="amount" eval="0.055"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_intra_acq_55_ht"/>
<field name="base_sign" eval="-1"/>
<field name="tax_code_id" ref="tax_intra_acq_55"/>
<field name="tax_sign" eval="-1"/>
<field name="account_collected_id" ref="pcg_445662"/>
<field name="account_paid_id" ref="pcg_445662"/>
<field name="ref_base_code_id" ref="tax_intra_acq_55_ht"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_intra_acq_55"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<record model="account.tax.template" id="tva_acq_intra_super_reduite">
<field name="name">TVA déductible intracommunautaire 2,1%</field>
<field name="description">20</field>
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA déductible intracommunautaire (achat) 2,1%</field>
<field name="description">TVA-HA_UE_déduc-2.1</field>
<field name="amount" eval="0.021"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_intra_acq_21_ht"/>
<field name="base_sign" eval="-1"/>
<field name="tax_code_id" ref="tax_intra_acq_21"/>
<field name="tax_sign" eval="-1"/>
<field name="account_collected_id" ref="pcg_445662"/>
<field name="account_paid_id" ref="pcg_445662"/>
<field name="ref_base_code_id" ref="tax_intra_acq_21_ht"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_base_sign" eval="1"/>
<field name="ref_tax_code_id" ref="tax_intra_acq_21"/>
<field name="ref_tax_sign" eval="-1"/>
<field name="ref_tax_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<!-- AUTRE -->
<record model="account.tax.template" id="tva_0">
<field name="name">TVA 0%</field>
<field name="description">21</field>
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA 0% autres opérations non imposables (vente)</field>
<field name="description">TVA-VT-autre-0</field>
<field name="amount" eval="0.00"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_misc_0_ht"/>
<field name="base_sign" eval="1"/>
<field name="account_collected_id" ref="pcg_44571"/>
<field name="account_paid_id" ref="pcg_44571"/>
<field name="ref_base_code_id" ref="tax_misc_0_ht"/>
<field name="ref_base_sign" eval="-1"/>
<field name="type_tax_use">purchase</field>
<field name="sequence" eval="10"/>
<field name="type_tax_use">sale</field>
</record>
<record model="account.tax.template" id="tva_export_0">
<field name="name">TVA 0% exportation</field>
<field name="description">22</field>
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA 0% export (vente)</field>
<field name="description">TVA-export-0</field>
<field name="amount" eval="0.00"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_export_0_ht"/>
<field name="base_sign" eval="1"/>
<field name="account_collected_id" ref="pcg_44571"/>
<field name="account_paid_id" ref="pcg_44571"/>
<field name="ref_base_code_id" ref="tax_export_0_ht"/>
<field name="ref_base_sign" eval="-1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">sale</field>
</record>
<record model="account.tax.template" id="tva_intra_0">
<field name="name">TVA 0% livraisons intracommunautaires</field>
<field name="description">23</field>
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA 0% livraisons intracommunautaires (vente)</field>
<field name="description">TVA-VT-UE-0</field>
<field name="amount" eval="0.00"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_intra_0_ht"/>
<field name="base_sign" eval="1"/>
<field name="account_collected_id" ref="pcg_44571"/>
<field name="account_paid_id" ref="pcg_44571"/>
<field name="account_collected_id" ref="pcg_445201"/>
<field name="account_paid_id" ref="pcg_445201"/>
<field name="ref_base_code_id" ref="tax_intra_0_ht"/>
<field name="ref_base_sign" eval="-1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">sale</field>
</record>
<record model="account.tax.template" id="tva_import_0">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA 0% import (achat)</field>
<field name="description">TVA-import-0</field>
<field name="amount" eval="0.00"/>
<field name="type">percent</field>
<field name="base_code_id" ref="tax_import_0_ht"/>
<field name="base_sign" eval="-1"/>
<field name="account_collected_id" ref="pcg_44566"/>
<field name="account_paid_id" ref="pcg_44566"/>
<field name="ref_base_code_id" ref="tax_import_0_ht"/>
<field name="ref_base_sign" eval="1"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">purchase</field>
</record>
<!--
Comptes sur lesquels les taxes s'appliquent par défaut
addons/l10n_fr/l10n_fr.py
+14 -1
View File
@@ -51,4 +51,17 @@ class l10n_fr_line(osv.osv):
l10n_fr_line()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
class res_company(osv.osv):
_inherit = 'res.company'
_columns = {
'siret': fields.char('SIRET', size=64),
'ape': fields.char('APE', size=64),
}
res_company()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/l10n_fr/l10n_fr_view.xml
Executable
+22
View File
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="res_company_form_l10n_fr" model="ir.ui.view">
<field name="name">res.company.form.l10n.fr</field>
<field name="model">res.company</field>
<field name="type">form</field>
<field name="priority">20</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
<data>
<xpath expr="//field[@name='company_registry']" position="after">
<field name="siret"/>
<field name="ape"/>
</xpath>
</data>
</field>
</record>
</data>
</openerp>
addons/l10n_fr/l10n_fr_wizard.xml
+3 -1
View File
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!-- This ir.actions.todo triggers the screen "Generate your chart of account
from a chart template" in the install wizard of the l10n_fr module -->
<record id="config_call_account_template_fr" model="ir.actions.todo">
<field name="action_id" ref="account.action_wizard_multi_chart"/>
<field name="type">automatic</field>
addons/l10n_fr/plan_comptable_general_demo.xml → addons/l10n_fr/plan_comptable_general.xml
+2 -209
View File
@@ -4210,7 +4210,7 @@
<record id="pcg_44566" model="account.account.template">
<field name="name">TVA sur autres biens et services</field>
<field name="code">44566</field>
<field name="type">view</field>
<field name="type">other</field>
<field name="user_type" ref="account_type_tax"/>
<field name="parent_id" ref="pcg_4456"/>
@@ -4223,7 +4223,7 @@
<field name="type">other</field>
<field name="user_type" ref="account_type_tax"/>
<field name="parent_id" ref="pcg_44566"/>
<field name="parent_id" ref="pcg_4456"/>
<field name="reconcile" eval="True"/>
</record>
@@ -9042,212 +9042,5 @@
<field name="parent_id" ref="pcg_79"/>
</record>
<record id="pcg_Classe_8" model="account.account.template">
<field name="name">Comptes spéciaux</field>
<field name="code">Classes 8</field>
<field name="type">view</field>
<field name="user_type" ref="account_type_view"/>
<field name="parent_id" ref="pcg_0"/>
</record>
<record id="pcg_80" model="account.account.template">
<field name="name">Engagements</field>
<field name="code">80</field>
<field name="type">view</field>
<field name="user_type" ref="account_type_view"/>
<field name="parent_id" ref="pcg_Classe_8"/>
</record>
<record id="pcg_801" model="account.account.template">
<field name="name">Engagements donnés par l'entité</field>
<field name="code">801</field>
<field name="type">view</field>
<field name="user_type" ref="account_type_commitment"/>
<field name="parent_id" ref="pcg_80"/>
</record>
<record id="pcg_8011" model="account.account.template">
<field name="name">Avals, cautions, garanties</field>
<field name="code">8011</field>
<field name="type">other</field>
<field name="user_type" ref="account_type_commitment"/>
<field name="parent_id" ref="pcg_801"/>
</record>
<record id="pcg_8014" model="account.account.template">
<field name="name">Effets circulant sous l'endos de l'entité</field>
<field name="code">8014</field>
<field name="type">other</field>
<field name="user_type" ref="account_type_commitment"/>
<field name="parent_id" ref="pcg_801"/>
</record>
<record id="pcg_8016" model="account.account.template">
<field name="name">Redevances crédit-bail restant à courir</field>
<field name="code">8016</field>
<field name="type">view</field>
<field name="user_type" ref="account_type_commitment"/>
<field name="parent_id" ref="pcg_801"/>
</record>
<record id="pcg_80161" model="account.account.template">
<field name="name">Crédit-bail mobilier</field>
<field name="code">80161</field>
<field name="type">other</field>
<field name="user_type" ref="account_type_commitment"/>
<field name="parent_id" ref="pcg_8016"/>
</record>
<record id="pcg_80165" model="account.account.template">
<field name="name">Crédit-bail immobilier</field>
<field name="code">80165</field>
<field name="type">other</field>
<field name="user_type" ref="account_type_commitment"/>
<field name="parent_id" ref="pcg_8016"/>
</record>
<record id="pcg_8018" model="account.account.template">
<field name="name">Autres engagements donnés</field>
<field name="code">8018</field>
<field name="type">other</field>
<field name="user_type" ref="account_type_commitment"/>
<field name="parent_id" ref="pcg_801"/>
</record>
<record id="pcg_802" model="account.account.template">
<field name="name">Engagements reçus par l'entité</field>
<field name="code">802</field>
<field name="type">view</field>
<field name="user_type" ref="account_type_commitment"/>
<field name="parent_id" ref="pcg_80"/>
</record>
<record id="pcg_8021" model="account.account.template">
<field name="name">Avals, cautions, garanties</field>
<field name="code">8021</field>
<field name="type">other</field>
<field name="user_type" ref="account_type_commitment"/>
<field name="parent_id" ref="pcg_802"/>
</record>
<record id="pcg_8024" model="account.account.template">
<field name="name">Créances escomptées non échues</field>
<field name="code">8024</field>
<field name="type">other</field>
<field name="user_type" ref="account_type_commitment"/>
<field name="parent_id" ref="pcg_802"/>
</record>
<record id="pcg_8026" model="account.account.template">
<field name="name">Engagements reçus pour utilisation en crédit-bail</field>
<field name="code">8026</field>
<field name="type">view</field>
<field name="user_type" ref="account_type_commitment"/>
<field name="parent_id" ref="pcg_802"/>
</record>
<record id="pcg_80261" model="account.account.template">
<field name="name">Crédit-bail mobilier</field>
<field name="code">80261</field>
<field name="type">other</field>
<field name="user_type" ref="account_type_commitment"/>
<field name="parent_id" ref="pcg_8026"/>
</record>
<record id="pcg_80265" model="account.account.template">
<field name="name">Crédit-bail immobilier</field>
<field name="code">80265</field>
<field name="type">other</field>
<field name="user_type" ref="account_type_commitment"/>
<field name="parent_id" ref="pcg_8026"/>
</record>
<record id="pcg_8028" model="account.account.template">
<field name="name">Autres engagements reçus</field>
<field name="code">8028</field>
<field name="type">other</field>
<field name="user_type" ref="account_type_commitment"/>
<field name="parent_id" ref="pcg_802"/>
</record>
<record id="pcg_809" model="account.account.template">
<field name="name">Contrepartie des engagements</field>
<field name="code">809</field>
<field name="type">view</field>
<field name="user_type" ref="account_type_view"/>
<field name="parent_id" ref="pcg_80"/>
</record>
<record id="pcg_8091" model="account.account.template">
<field name="name">Contrepartie 801</field>
<field name="code">8091</field>
<field name="type">other</field>
<field name="user_type" ref="account_type_commitment"/>
<field name="parent_id" ref="pcg_809"/>
</record>
<record id="pcg_8092" model="account.account.template">
<field name="name">Contrepartie 802</field>
<field name="code">8092</field>
<field name="type">other</field>
<field name="user_type" ref="account_type_commitment"/>
<field name="parent_id" ref="pcg_809"/>
</record>
<record id="pcg_88" model="account.account.template">
<field name="name">Résultats en instance d'affectation</field>
<field name="code">88</field>
<field name="type">view</field>
<field name="user_type" ref="account_type_view"/>
<field name="parent_id" ref="pcg_Classe_8"/>
</record>
<record id="pcg_89" model="account.account.template">
<field name="name">Bilan</field>
<field name="code">89</field>
<field name="type">view</field>
<field name="user_type" ref="account_type_view"/>
<field name="parent_id" ref="pcg_Classe_8"/>
</record>
<record id="pcg_890" model="account.account.template">
<field name="name">Bilan d'ouverture</field>
<field name="code">890</field>
<field name="type">other</field>
<field name="user_type" ref="account_type_special"/>
<field name="parent_id" ref="pcg_89"/>
</record>
<record id="pcg_891" model="account.account.template">
<field name="name">Bilan de clôture</field>
<field name="code">891</field>
<field name="type">other</field>
<field name="user_type" ref="account_type_special"/>
<field name="parent_id" ref="pcg_89"/>
</record>
</data>
</openerp>
addons/l10n_fr_hr_payroll/__init__.py
Executable
+24
View File
@@ -0,0 +1,24 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2011 OpenERP SA (<http://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/>
#
##############################################################################
import l10n_fr_hr_payroll
import report
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/l10n_fr_hr_payroll/__openerp__.py
Executable
+51
View File
@@ -0,0 +1,51 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2011 OpenERP SA (<http://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/>.
#
##############################################################################
{
'name': 'French Payroll',
'category': 'Localization/Payroll',
'author': 'Yannick Buron (SYNERPGY)',
'depends': ['hr_payroll', 'l10n_fr'],
'version': '1.0',
'description': """
French Payroll Rules
=======================
-Configuration of hr_payroll for french localization
-All main contributions rules for french payslip, for 'cadre' and 'non-cadre'
-New payslip report
TODO :
-Integration with holidays module for deduction and allowance
-Integration with hr_payroll_account for the automatic account_move_line creation from the payslip
-Continue to integrate the contribution. Only the main contribution are currently implemented
-Remake the report under webkit
-The payslip.line with appears_in_payslip = False should appears in the payslip interface, but not in the payslip report
""",
'active': False,
'update_xml':[
'l10n_fr_hr_payroll_view.xml',
'l10n_fr_hr_payroll_data.xml',
],
'installable': True
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll.py
Executable
+57
View File
@@ -0,0 +1,57 @@
#-*- coding:utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2011 OpenERP SA (<http://openerp.com>). All Rights Reserved
#
# 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 res_company(osv.osv):
_inherit = 'res.company'
_columns = {
'plafond_secu': fields.float('Plafond de la Securite Sociale', digits_compute=dp.get_precision('Payroll')),
'nombre_employes': fields.integer('Nombre d\'employes'),
'cotisation_prevoyance': fields.float('Cotisation Patronale Prevoyance', digits_compute=dp.get_precision('Payroll')),
'org_ss': fields.char('Organisme de securite sociale', size=64),
'conv_coll': fields.char('Convention collective', size=64),
}
res_company()
class hr_contract(osv.osv):
_inherit = 'hr.contract'
_columns = {
'qualif': fields.char('Qualification', size=64),
'niveau': fields.char('Niveau', size=64),
'coef': fields.char('Coefficient', size=64),
}
hr_contract()
class hr_payslip(osv.osv):
_inherit = 'hr.payslip'
_columns = {
'payment_mode': fields.char('Mode de paiement', size=64),
}
hr_payslip()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_data.xml
Executable
+1264
View File
File diff suppressed because it is too large Load Diff
addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml
Executable
+70
View File
@@ -0,0 +1,70 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="res_company_form_l10n_fr_payroll" model="ir.ui.view">
<field name="name">res.company.form.l10n.fr.payroll</field>
<field name="model">res.company</field>
<field name="type">form</field>
<field name="priority">20</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
<data>
<xpath expr="//notebook" position="inside">
<page string="Paie">
<field name="plafond_secu"/>
<field name="nombre_employes"/>
<newline/>
<field name="org_ss"/>
<newline/>
<field name="conv_coll"/>
</page>
</xpath>
</data>
</field>
</record>
<record id="hr_contract_view_form_l10n_fr_payroll" model="ir.ui.view">
<field name="name">hr.contract.view.form.l10n.fr.payroll</field>
<field name="model">hr.contract</field>
<field name="type">form</field>
<field name="priority">20</field>
<field name="inherit_id" ref="hr_payroll.hr_contract_form_inherit"/>
<field name="arch" type="xml">
<field name="struct_id" position="after">
<field name="qualif"/>
<field name="niveau"/>
<field name="coef"/>
</field>
</field>
</record>
<record id="hr_payslip_form_l10n_fr_payroll" model="ir.ui.view">
<field name="name">hr.payslip.form.l10n.fr.payroll</field>
<field name="model">hr.payslip</field>
<field name="type">form</field>
<field name="priority">20</field>
<field name="inherit_id" ref="hr_payroll.view_hr_payslip_form"/>
<field name="arch" type="xml">
<data>
<xpath expr="//field[@name='paid']" position="after">
<field name="payment_mode"/>
</xpath>
</data>
</field>
</record>
<report
auto="False"
header="False"
id="fiche_paye"
model="hr.payslip"
name="fiche.paye"
rml="l10n_fr_hr_payroll/report/fiche_paye.rml"
string="Fiche de Paie" />
</data>
</openerp>
addons/l10n_fr_hr_payroll/report/__init__.py
+27
View File
@@ -0,0 +1,27 @@
#!/usr/bin/env python
#-*- coding:utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# d$
#
# 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 fiche_paye
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/l10n_fr_hr_payroll/report/fiche_paye.py
Executable
+76
View File
@@ -0,0 +1,76 @@
#!/usr/bin/env python
#-*- coding:utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
# d$
#
# 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 report import report_sxw
class fiche_paye_parser(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
super(fiche_paye_parser, self).__init__(cr, uid, name, context)
self.localcontext.update({
'get_payslip_lines': self.get_payslip_lines,
'get_total_by_rule_category': self.get_total_by_rule_category,
'get_employer_line': self.get_employer_line,
})
def get_payslip_lines(self, objs):
payslip_line = self.pool.get('hr.payslip.line')
res = []
ids = []
for item in objs:
if item.appears_on_payslip == True and not item.salary_rule_id.parent_rule_id :
ids.append(item.id)
if ids:
res = payslip_line.browse(self.cr, self.uid, ids)
return res
def get_total_by_rule_category(self, obj, code):
payslip_line = self.pool.get('hr.payslip.line')
rule_cate_obj = self.pool.get('hr.salary.rule.category')
cate_ids = rule_cate_obj.search(self.cr, self.uid, [('code', '=', code)])
category_total = 0
if cate_ids:
line_ids = payslip_line.search(self.cr, self.uid, [('slip_id', '=', obj.id),('category_id.id', '=', cate_ids[0] )])
for line in payslip_line.browse(self.cr, self.uid, line_ids):
category_total += line.total
return category_total
def get_employer_line(self, obj, parent_line):
payslip_line = self.pool.get('hr.payslip.line')
line_ids = payslip_line.search(self.cr, self.uid, [('slip_id', '=', obj.id), ('salary_rule_id.parent_rule_id.id', '=', parent_line.salary_rule_id.id )])
res = line_ids and payslip_line.browse(self.cr, self.uid, line_ids[0]) or False
return res
report_sxw.report_sxw('report.fiche.paye', 'hr.payslip', 'l10n_fr_hr_payroll/report/fiche_paye.rml', parser=fiche_paye_parser)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/l10n_fr_hr_payroll/report/fiche_paye.rml
+449
View File
@@ -0,0 +1,449 @@
<?xml version="1.0"?>
<document filename="test.pdf">
<template pageSize="(595.0,842.0)" title="Fiche de paye" author="Yannick Buron" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
</pageTemplate>
</template>
<stylesheet>
<blockTableStyle id="Standard_Outline">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Tableau1">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Tableau4">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEAFTER" colorName="#000000" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
</blockTableStyle>
<blockTableStyle id="Tableau5">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEAFTER" colorName="#000000" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
</blockTableStyle>
<blockTableStyle id="Tableau2">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEAFTER" colorName="#000000" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
</blockTableStyle>
<blockTableStyle id="Tableau3">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Tableau7">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="2,0" stop="2,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="3,0" stop="3,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="4,0" stop="4,-1"/>
<lineStyle kind="LINEAFTER" colorName="#000000" start="4,0" stop="4,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
</blockTableStyle>
<blockTableStyle id="Tableau8">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEAFTER" colorName="#000000" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="2,0" stop="2,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="3,0" stop="3,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="4,0" stop="4,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="5,0" stop="5,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="6,0" stop="6,-1"/>
<lineStyle kind="LINEAFTER" colorName="#000000" start="6,0" stop="6,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
</blockTableStyle>
<blockTableStyle id="Tableau11">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="2,0" stop="2,-1"/>
<lineStyle kind="LINEAFTER" colorName="#000000" start="2,0" stop="2,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="1,1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="2,1" stop="2,-1"/>
<lineStyle kind="LINEAFTER" colorName="#000000" start="2,1" stop="2,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
</blockTableStyle>
<blockTableStyle id="Tableau6">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="1,0" stop="1,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="2,0" stop="2,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="3,0" stop="3,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="4,0" stop="4,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="5,0" stop="5,-1"/>
<lineStyle kind="LINEAFTER" colorName="#000000" start="5,0" stop="5,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="0,1" stop="0,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="1,1" stop="1,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="2,1" stop="2,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="3,1" stop="3,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="4,1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="5,1" stop="5,-1"/>
<lineStyle kind="LINEAFTER" colorName="#000000" start="5,1" stop="5,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
</blockTableStyle>
<blockTableStyle id="Tableau9">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
<lineStyle kind="LINEAFTER" colorName="#000000" start="2,0" stop="2,-1"/>
<lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="0,1" stop="0,-1"/>
<lineStyle kind="LINEAFTER" colorName="#000000" start="2,1" stop="2,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="0,2" stop="0,-1"/>
<lineStyle kind="LINEAFTER" colorName="#000000" start="2,2" stop="2,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#000000" start="0,3" 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="LINEAFTER" colorName="#000000" start="2,3" stop="2,-1"/>
<lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
</blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P2" rightIndent="-56.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P3" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P4" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
<paraStyle name="P6" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P7" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P10" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P11" fontName="Helvetica"/>
<paraStyle name="P12" fontName="Helvetica" alignment="LEFT"/>
<paraStyle name="P13" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P14" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P15" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P18" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P19" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P20" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P21" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P22" fontName="Helvetica" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P23" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" 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" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<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="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_space" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_header_Centre" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Centre_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Bold_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Table Contents" fontName="Helvetica"/>
<paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" 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="Table Heading" fontName="Helvetica" alignment="CENTER"/>
<paraStyle name="payslip_adj" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_7" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<images/>
</stylesheet>
<story>
<para style="P2">[[repeatIn(objects,'o')]]</para>
<blockTable colWidths="239.0,38.0,262.0" style="Tableau1">
<tr>
<td>
<blockTable colWidths="233.0" style="Tableau4">
<tr>
<td>
<para style="P10">BULLETIN DE PAIE</para>
</td>
</tr>
</blockTable>
<para style="P13">PAIE DU [[ formatLang(o.date_from, date=True) or '']] AU [[ formatLang(o.date_to, date=True) or '' ]]</para>
<blockTable colWidths="56.0,178.0" style="Tableau5">
<tr>
<td>
<para style="terp_default_8">Matricule : </para>
<para style="terp_default_8">N° s.s :</para>
<para style="terp_default_8">Emploi :</para>
<para style="terp_default_8">Qualif :</para>
<para style="terp_default_8">Niveau : </para>
<para style="terp_default_8">Coef :</para>
<para style="P7">Entrée :</para>
</td>
<td>
<para style="P5">[[o.employee_id.sinid or '_']]</para>
<para style="terp_default_8">[[o.employee_id.ssnid or '_']]</para>
<para style="terp_default_8">[[o.contract_id.job_id.name or '_']]</para>
<para style="terp_default_8">[[o.contract_id.qualif or '_']]</para>
<para style="terp_default_8">[[o.contract_id.niveau or '_']]</para>
<para style="terp_default_8">[[o.contract_id.coef or '_']]</para>
<para style="P5">[[o.contract_id.date_start or '_']] Sortie : [[o.contract_id.date_end or '']] </para>
</td>
</tr>
<tr>
<td>
<para style="P7">ORG. S.S :</para>
</td>
<td>
<para style="P7">[[o.employee_id.company_id.org_ss or '_']] </para>
</td>
</tr>
</blockTable>
<para style="P14">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P5">
<font color="white"> </font>
</para>
</td>
<td>
<blockTable colWidths="257.0" style="Tableau2">
<tr>
<td>
<para style="terp_default_8">[[o.employee_id.company_id.partner_id.title.name or '']] [[o.employee_id.company_id.name or '_']]</para>
<para style="terp_default_8">[[o.employee_id.company_id.street or '_']]</para>
<para style="terp_default_8">[[o.employee_id.company_id.street2 or '']] </para>
<para style="terp_default_8">[[o.employee_id.company_id.zip or '_']] [[o.employee_id.company_id.city or '']]</para>
<para style="terp_default_8">SIRET : [[o.employee_id.company_id.siret or '_']] APE : [[o.employee_id.company_id.ape or '_']]</para>
</td>
</tr>
</blockTable>
<para style="P5">
<font color="white"> </font>
</para>
<para style="P5">
<font color="white"> </font>
</para>
<para style="P5">
<font color="white"> </font>
</para>
<blockTable colWidths="257.0" style="Tableau3">
<tr>
<td>
<para style="terp_default_Bold_8">[[o.employee_id.name or '_']]</para>
<para style="terp_default_Bold_8">[[o.employee_id.address_home_id.street or '_' ]]</para>
<para style="terp_default_Bold_8">[[o.employee_id.address_home_id.street2 or '' ]]</para>
<para style="terp_default_Bold_8">[[o.employee_id.address_home_id.zip or '_' ]] [[o.employee_id.address_home_id.city or '' ]]</para>
</td>
</tr>
</blockTable>
<para style="P5">
<font color="white"> </font>
</para>
</td>
</tr>
</blockTable>
<para style="P3">
<font color="white"> </font>
</para>
<para style="P11">
<font color="white"> </font>
</para>
<blockTable colWidths="255.0,56.0,56.0,58.0,113.0" style="Tableau7">
<tr>
<td>
<para style="P15">DESIGNATION</para>
</td>
<td>
<para style="P15">QUANTITE / BASE</para>
</td>
<td>
<para style="P15">TAUX</para>
</td>
<td>
<para style="P15">MONTANT</para>
</td>
<td>
<para style="P15">CHARGES PATRONALES</para>
</td>
</tr>
</blockTable>
<section>
<para style="terp_default_8">[[repeatIn(get_payslip_lines(o.line_ids),'p')]]</para>
<blockTable colWidths="45.0,210.0,56.0,57.0,58.0,57.0,56.0" style="Tableau8">
<tr>
<td>
<para style="terp_default_7">[[ p.code or '' ]]</para>
</td>
<td>
<para style="terp_default_7">[[ p.name or '' ]]</para>
</td>
<td>
<para style="terp_default_7">[[ ((p.amount_select== 'percentage') or removeParentNode('para')) and '' ]] [[ p.amount or '' ]]</para>
<para style="terp_default_7">[[ ((p.amount_select== 'fix') or removeParentNode('para')) and '' ]] [[ p.quantity or '' ]]</para>
<para style="terp_default_7">[[ ((p.amount_select&lt;&gt; 'fix' and p.amount_select&lt;&gt; 'percentage') or removeParentNode('para')) and '' ]]</para>
</td>
<td>
<para style="terp_default_7">[[ ((p.amount_select == 'percentage') or removeParentNode('para')) and '' ]] [[ p.rate or '' ]]</para>
<para style="terp_default_7">[[ ((p.amount_select &lt;&gt; 'percentage') or removeParentNode('para')) and '' ]]</para>
</td>
<td>
<para style="terp_default_7">[[ p.total or '' ]]</para>
</td>
<td>
<para style="terp_default_7">[[ get_employer_line(o, p).rate or '']] </para>
</td>
<td>
<para style="terp_default_7">[[ get_employer_line(o,p).total or '' ]]</para>
</td>
</tr>
</blockTable>
</section>
<para style="terp_default_8">
<font color="white"> </font>
</para>
<para style="terp_default_8">
<font color="white"> </font>
</para>
<blockTable colWidths="360.0,89.0,89.0" style="Tableau11">
<tr>
<td>
<para style="terp_default_Bold_8">Mode de reglement : [[ o.payment_mode or '' ]]</para>
<para style="P20">Paye le : [[ formatLang(o.move_id.date, date=True) or '']]</para>
</td>
<td>
<para style="P18">NET A PAYER</para>
</td>
<td>
<para style="P18">TOTAL CHARGES PATRONALES</para>
</td>
</tr>
<tr>
<td>
<para style="P19">Conv. Coll.: [[ o.employee_id.company_id.conv_coll or '' ]]</para>
</td>
<td>
<para style="P21">[[ get_total_by_rule_category(o, 'NET') ]]</para>
</td>
<td>
<para style="P8">[[ get_total_by_rule_category(o, 'COMP') ]]</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="90.0,90.0,90.0,91.0,89.0,89.0" style="Tableau6">
<tr>
<td>
<para style="P16">SALAIRE BRUT</para>
</td>
<td>
<para style="P18">TOTAL CHARGES SALARIALES</para>
</td>
<td>
<para style="P18">NET IMPOSABLE</para>
</td>
<td>
<para style="P18">PLAFOND S.S.</para>
</td>
<td>
<para style="P17">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P16">COUT GLOBAL SALARIE</para>
</td>
</tr>
<tr>
<td>
<para style="P8">[[ get_total_by_rule_category(o, 'BRUT') ]]</para>
</td>
<td>
<para style="P8">[[ get_total_by_rule_category(o, 'SALC') ]]</para>
</td>
<td>
<para style="P8">[[ get_total_by_rule_category(o, 'C_IMP') ]]</para>
</td>
<td>
<para style="P9">[[ o.employee_id.company_id.plafond_secu or '' ]]</para>
</td>
<td>
<para style="P17">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P8">[[ get_total_by_rule_category(o, 'TOTAL') ]]</para>
</td>
</tr>
</blockTable>
<para style="P22">
<font color="white"> </font>
</para>
<para style="P3">
<font color="white"> </font>
</para>
<para style="P6">DANS VOTRE INTERET ET POUR VOUS AIDER A FAIRE VALOIR VOS DROITS, CONSERVEZ CE BULLETIN DE PAIE SANS LIMITATION DE DUREE</para>
</story>
</document>
addons/marketing/__init__.py
+1 -1
View File
@@ -19,6 +19,6 @@
#
##############################################################################
import res_config
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/marketing/__openerp__.py
+2 -1
View File
@@ -38,7 +38,8 @@ Contains the installer for marketing-related modules.
'update_xml': [
'security/marketing_security.xml',
'security/ir.model.access.csv',
'marketing_view.xml'
'marketing_view.xml',
'res_config_view.xml',
],
'demo_xml': ['marketing_demo.xml'],
'installable': True,
addons/marketing/res_config.py
+40
View File
@@ -0,0 +1,40 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Business Applications
# Copyright (C) 2004-2012 OpenERP S.A. (<http://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/>.
#
##############################################################################
from osv import fields, osv
class marketing_config_settings(osv.osv_memory):
_name = 'marketing.config.settings'
_inherit = 'res.config.settings'
_columns = {
'module_marketing_campaign': fields.boolean('Marketing Campaigns',
help="""Provides leads automation through marketing campaigns.
Campaigns can in fact be defined on any resource, not just CRM leads.
This installs the module marketing_campaign."""),
'module_marketing_campaign_crm_demo': fields.boolean('Demo Data for Marketing Campaigns',
help="""Installs demo data like leads, campaigns and segments for Marketing Campaigns.
This installs the module marketing_campaign_crm_demo."""),
'module_crm_profiling': fields.boolean('Track Customer Profile to Focus your Campaigns',
help="""Allows users to perform segmentation within partners.
This installs the module crm_profiling."""),
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/marketing/res_config_view.xml
+36
View File
@@ -0,0 +1,36 @@
<openerp>
<data>
<record id="view_marketing_configuration" model="ir.ui.view">
<field name="name">Configure Marketing</field>
<field name="model">marketing.config.settings</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Configure Marketing" layout="manual">
<div class="oe_form_topbar">
<button string="Apply" type="object" name="execute"/>
<button string="Cancel" special="cancel"/>
</div>
<sheet layout="auto">
<separator string="Campaigns" colspan="4"/>
<field name="module_marketing_campaign"/>
<field name="module_marketing_campaign_crm_demo"/>
<newline/>
<field name="module_crm_profiling"/>
</sheet>
</form>
</field>
</record>
<record id="action_marketing_configuration" model="ir.actions.act_window">
<field name="name">Configure Marketing</field>
<field name="res_model">marketing.config.settings</field>
<field name="view_mode">form</field>
<field name="target">inline</field>
</record>
<menuitem id="menu_marketing_configuration" name="Marketing" parent="base.menu_config"
sequence="17" action="action_marketing_configuration"/>
</data>
</openerp>
addons/mrp/mrp.py
+6 -6
View File
@@ -206,8 +206,8 @@ class mrp_bom(osv.osv):
'product_id': fields.many2one('product.product', 'Product', required=True),
'product_uos_qty': fields.float('Product UOS Qty'),
'product_uos': fields.many2one('product.uom', 'Product UOS', help="Product UOS (Unit of Sale) is the unit of measurement for the invoicing and promotion of stock."),
'product_qty': fields.float('Product Qty', required=True, digits_compute=dp.get_precision('Product UoM')),
'product_uom': fields.many2one('product.uom', 'Product UOM', required=True, help="UoM (Unit of Measure) is the unit of measurement for the inventory control"),
'product_qty': fields.float('Product Qty', required=True, digits_compute=dp.get_precision('Product Unit of Measure')),
'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True, help="Unit of Measure (Unit of Measure) is the unit of measurement for the inventory control"),
'product_rounding': fields.float('Product Rounding', help="Rounding applied on the product quantity."),
'product_efficiency': fields.float('Manufacturing Efficiency', required=True, help="A factor of 0.9 means a loss of 10% within the production process."),
'bom_lines': fields.one2many('mrp.bom', 'bom_id', 'BoM Lines'),
@@ -454,8 +454,8 @@ class mrp_production(osv.osv):
'priority': fields.selection([('0','Not urgent'),('1','Normal'),('2','Urgent'),('3','Very Urgent')], 'Priority', select=True),
'product_id': fields.many2one('product.product', 'Product', required=True, readonly=True, states={'draft':[('readonly',False)]}),
'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product UoM'), required=True, states={'draft':[('readonly',False)]}, readonly=True),
'product_uom': fields.many2one('product.uom', 'Product UOM', required=True, states={'draft':[('readonly',False)]}, readonly=True),
'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product Unit of Measure'), required=True, states={'draft':[('readonly',False)]}, readonly=True),
'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True, states={'draft':[('readonly',False)]}, readonly=True),
'product_uos_qty': fields.float('Product UoS Qty', states={'draft':[('readonly',False)]}, readonly=True),
'product_uos': fields.many2one('product.uom', 'Product UoS', states={'draft':[('readonly',False)]}, readonly=True),
@@ -1112,8 +1112,8 @@ class mrp_production_product_line(osv.osv):
_columns = {
'name': fields.char('Name', size=64, required=True),
'product_id': fields.many2one('product.product', 'Product', required=True),
'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product UoM'), required=True),
'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product Unit of Measure'), required=True),
'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True),
'product_uos_qty': fields.float('Product UOS Qty'),
'product_uos': fields.many2one('product.uom', 'Product UOS'),
'production_id': fields.many2one('mrp.production', 'Production Order', select=True),
addons/mrp/mrp_view.xml
+7 -7
View File
@@ -432,7 +432,7 @@
<newline/>
<group expand="0" string="Group By...">
<filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
<filter string='Default UOM' icon="terp-mrp" domain="[]" context="{'group_by' : 'product_uom'}" />
<filter string='Default Unit of Measure' icon="terp-mrp" domain="[]" context="{'group_by' : 'product_uom'}" />
<separator orientation="vertical"/>
<filter string="Routing" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'routing_id'}"/>
<filter string='Type' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'type'}" />
@@ -663,7 +663,7 @@
<tree colors="blue:state == 'draft';black:state in ('picking_except','confirmed','ready','in_production');gray:state in ('cancel','done') " string="Products to Consume">
<field name="product_id" />
<field name="product_qty" string="Qty"/>
<field name="product_uom" string="UOM"/>
<field name="product_uom" string="Unit of Measure"/>
<field name="location_id" string="Source Loc."/>
<field name="state" invisible="1"/>
<button name="%(stock.move_consume)d"
@@ -672,7 +672,7 @@
states="draft,waiting,confirmed,assigned" />
<button
name="%(stock.track_line)d"
string="Split in production lots"
string="Split in Serial Numbers"
type="action" icon="gtk-justify-fill"
states="draft,waiting,confirmed,assigned" />
<button name="%(stock.move_scrap)d"
@@ -687,7 +687,7 @@
<tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state == 'cancel' " string="Consumed Products" editable="bottom">
<field name="product_id" readonly="1"/>
<field name="product_qty" readonly="1" string="Qty"/>
<field name="product_uom" readonly="1" string="UOM"/>
<field name="product_uom" readonly="1" string="Unit of Measure"/>
<field name="prodlot_id" context="{'product_id': product_id}"/>
<field name="state" invisible="1"/>
<field name="scrapped" invisible="1"/>
@@ -716,7 +716,7 @@
<tree string="Products to Finish">
<field name="product_id" />
<field name="product_qty" string="Qty"/>
<field name="product_uom" string="UOM"/>
<field name="product_uom" string="Unit of Measure"/>
<field name="state" invisible="1"/>
<button name="%(stock.action_partial_move_server)d"
string="Partial"
@@ -734,13 +734,13 @@
<tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products">
<field name="product_id" readonly="1"/>
<field name="product_qty" readonly="1" string="Qty"/>
<field name="product_uom" readonly="1" string="UOM"/>
<field name="product_uom" readonly="1" string="Unit of Measure"/>
<field name="location_dest_id" readonly="1" string="Destination Loc." widget="selection"/>
<field name="prodlot_id" context="{'product_id': product_id}"/>
<field name="scrapped" invisible="1"/>
<field name="state" invisible="1"/>
<button name="%(stock.track_line)d"
string="Split in production lots" type="action" icon="gtk-justify-fill" states="done,cancel"/>
string="Split in Serial Numbers" type="action" icon="gtk-justify-fill" states="done,cancel"/>
<button name="%(stock.move_scrap)d"
string="Scrap Products" type="action" icon="gtk-convert"
states="done,cancel" />
addons/mrp/report/price.py
+1 -1
View File
@@ -136,7 +136,7 @@ class report_custom(report_rml):
<col t='yes'>%s</col>
<col t='yes'>%s</col>
</row>
""" % (_('Components'), _('Components suppliers'), _('Quantity'),_('Cost Price per Uom'), _('Supplier Price per Uom'))
""" % (_('Components'), _('Components suppliers'), _('Quantity'),_('Cost Price per Unit of Measure'), _('Supplier Price per Unit of Measure'))
purchase_price_digits = rml_obj.get_digits(dp='Purchase Price')
addons/mrp/res_config.py
+12 -6
View File
@@ -28,7 +28,7 @@ class mrp_config_settings(osv.osv_memory):
_inherit = 'res.config.settings'
_columns = {
'module_stock_planning': fields.boolean('Master Production Schedule',
'module_stock_planning': fields.boolean('Master Manufacturing Order Schedule',
help ="""This allows to create a manual procurement plan apart of the normal MRP scheduling,
which works automatically based on minimum stock rules.
This installs the module stock_planning."""),
@@ -41,27 +41,33 @@ class mrp_config_settings(osv.osv_memory):
* Repair quotation report
* Notes for the technician and for the final customer.
This installs the module mrp_repair."""),
'module_mrp_operations': fields.boolean("Track Dates in Work Order Operations",
'module_mrp_operations': fields.boolean("Detailed Planning of Work Orders",
help="""This allows to add state, date_start,date_stop in production order operation lines (in the "Work Centers" tab).
This installs the module mrp_operations."""),
'module_mrp_subproduct': fields.boolean("Produce Different Products from one Production",
'module_mrp_subproduct': fields.boolean("Produce Several Products from One Manufacturing Order",
help="""You can configure sub-products in the bill of material.
Without this module: A + B + C -> D.
With this module: A + B + C -> D + E.
This installs the module mrp_subproduct."""),
'module_mrp_jit': fields.boolean("Just in Time Scheduling",
'module_mrp_jit': fields.boolean("Real-Time Scheduling",
help="""This allows Just In Time computation of procurement orders.
All procurement orders will be processed immediately, which could in some
cases entail a small performance impact.
This installs the module mrp_jit."""),
'module_stock_no_autopicking': fields.boolean("Manual Picking to Fulfill Manufacturing Orders",
help="""This module allows an intermediate picking process to provide raw materials to production orders.
For example to manage production made by your suppliers (sub-contracting).
To achieve this, set the assembled product which is sub-contracted to "No Auto-Picking"
and put the location of the supplier in the routing of the assembly operation.
This installs the module stock_no_autopicking."""),
'group_mrp_routings': fields.boolean("Manage Routings and Work Orders",
implied_group='mrp.group_mrp_routings',
help="""Routings allow 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."""),
'group_mrp_properties': fields.boolean("Manage Properties",
'group_mrp_properties': fields.boolean("Allow Several BoMs per Product",
implied_group='product.group_mrp_properties',
help="""Allows to define specific property that can be assigned to your bill of materials."""),
help="""The selection of the right Bill of Material to use will depend on the properties specified on the sale order and the Bill of Material."""),
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/mrp/res_config_view.xml
+2 -2
View File
@@ -20,7 +20,7 @@
<separator string="Logistics" colspan="4"/>
<field name="module_mrp_jit"/>
<field name="module_stock_no_autopicking"/>
<separator string="Bill Of Material" colspan="4"/>
<field name="group_mrp_routings"/>
<field name="group_mrp_properties"/>
@@ -38,7 +38,7 @@
</record>
<menuitem id="base.menu_mrp_config" name="Manufacturing" parent="base.menu_config"
sequence="4" action="action_mrp_configuration"/>
sequence="8" action="action_mrp_configuration"/>
</data>
</openerp>
addons/mrp/wizard/change_production_qty.py
+1 -1
View File
@@ -28,7 +28,7 @@ class change_production_qty(osv.osv_memory):
_description = 'Change Quantity of Products'
_columns = {
'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product UoM'), required=True),
'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product Unit of Measure'), required=True),
}
def default_get(self, cr, uid, fields, context=None):
addons/mrp/wizard/mrp_product_produce.py
+1 -1
View File
@@ -27,7 +27,7 @@ class mrp_product_produce(osv.osv_memory):
_description = "Product Produce"
_columns = {
'product_qty': fields.float('Select Quantity', digits_compute=dp.get_precision('Product UoM'), required=True),
'product_qty': fields.float('Select Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True),
'mode': fields.selection([('consume_produce', 'Consume & Produce'),
('consume', 'Consume Only')], 'Mode', required=True,
help="'Consume only' mode will only consume the products with the quantity selected.\n"
addons/mrp_operations/mrp_operations.py
+1 -1
View File
@@ -105,7 +105,7 @@ class mrp_production_workcenter_line(osv.osv):
'product':fields.related('production_id','product_id',type='many2one',relation='product.product',string='Product',
readonly=True),
'qty':fields.related('production_id','product_qty',type='float',string='Qty',readonly=True, store=True),
'uom':fields.related('production_id','product_uom',type='many2one',relation='product.uom',string='UOM',readonly=True),
'uom':fields.related('production_id','product_uom',type='many2one',relation='product.uom',string='Unit of Measure',readonly=True),
}
_defaults = {
addons/mrp_operations/report/mrp_workorder_analysis.py
+1 -1
View File
@@ -35,7 +35,7 @@ class mrp_workorder(osv.osv):
'nbr': fields.integer('# of Lines', readonly=True),
'date': fields.date('Date', readonly=True),
'product_id': fields.many2one('product.product', 'Product', readonly=True),
'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product UoM'), readonly=True),
'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product Unit of Measure'), readonly=True),
'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pause'),('cancel','Cancelled'),('done','Finished')],'State', readonly=True),
'total_hours': fields.float('Total Hours', readonly=True),
'total_cycles': fields.float('Total Cycles', readonly=True),

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