openerp-community team mailing list archive
-
openerp-community team
-
Mailing list archive
-
Message #00172
lp:~openerp-community/openobject-addons/wiki_quality_manual_iso9001_v2008 into lp:openobject-addons
Maxime Chambreuil (http://www.savoirfairelinux.com) has proposed merging lp:~openerp-community/openobject-addons/wiki_quality_manual_iso9001_v2008 into lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
[IMP] Quality Manual updated to ISO9001:2008
--
https://code.launchpad.net/~openerp-community/openobject-addons/wiki_quality_manual_iso9001_v2008/+merge/43599
Your team OpenERP Community is subscribed to branch lp:~openerp-community/openobject-addons/wiki_quality_manual_iso9001_v2008.
=== modified file 'account/account.py'
--- account/account.py 2010-11-26 16:13:59 +0000
+++ account/account.py 2010-12-14 03:25:00 +0000
@@ -2678,7 +2678,8 @@
tax_template_ref[tax.id] = new_tax
#deactivate the parent_store functionnality on account_account for rapidity purpose
- self.pool._init = True
+ ctx = context and context.copy() or {}
+ ctx['defer_parent_store_computation'] = True
children_acc_template = obj_acc_template.search(cr, uid, [('parent_id','child_of',[obj_acc_root.id]),('nocreate','!=',True)])
children_acc_template.sort()
@@ -2706,17 +2707,16 @@
'tax_ids': [(6,0,tax_ids)],
'company_id': company_id,
}
- new_account = obj_acc.create(cr, uid, vals)
+ new_account = obj_acc.create(cr, uid, vals, context=ctx)
acc_template_ref[account_template.id] = new_account
#reactivate the parent_store functionnality on account_account
- self.pool._init = False
self.pool.get('account.account')._parent_store_compute(cr)
for key,value in todo_dict.items():
if value['account_collected_id'] or value['account_paid_id']:
obj_acc_tax.write(cr, uid, [key], {
- 'account_collected_id': acc_template_ref[value['account_collected_id']],
- 'account_paid_id': acc_template_ref[value['account_paid_id']],
+ 'account_collected_id': acc_template_ref.get(value['account_collected_id'], False),
+ 'account_paid_id': acc_template_ref.get(value['account_paid_id'], False),
})
# Creating Journals Sales and Purchase
@@ -2857,7 +2857,7 @@
'name': tmp,
'currency_id': line.currency_id and line.currency_id.id or False,
'code': new_code,
- 'type': 'other',
+ 'type': 'liquidity',
'user_type': account_template.user_type and account_template.user_type.id or False,
'reconcile': True,
'parent_id': acc_template_ref[ref_acc_bank.id] or False,
@@ -2879,7 +2879,7 @@
vals_journal['name']= vals['name']
vals_journal['code']= _('BNK') + str(current_num)
vals_journal['sequence_id'] = seq_id
- vals_journal['type'] = 'cash'
+ vals_journal['type'] = line.account_type == 'cash' and 'cash' or 'bank'
vals_journal['company_id'] = company_id
vals_journal['analytic_journal_id'] = analitical_journal_bank
=== modified file 'account/account_bank_statement.py'
--- account/account_bank_statement.py 2010-11-26 15:14:46 +0000
+++ account/account_bank_statement.py 2010-12-14 03:25:00 +0000
@@ -428,7 +428,7 @@
_columns = {
'name': fields.char('Communication', size=64, required=True),
'date': fields.date('Date', required=True),
- 'amount': fields.float('Amount'),
+ 'amount': fields.float('Amount', digits_compute=dp.get_precision('Account')),
'type': fields.selection([
('supplier','Supplier'),
('customer','Customer'),
=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml 2010-11-12 12:54:47 +0000
+++ account/account_invoice_view.xml 2010-12-14 03:25:00 +0000
@@ -302,7 +302,7 @@
<field name="amount_total"/>
<field name="state"/>
<field name="residual"/>
- <group col="7" colspan="4" groups="base.group_user">
+ <group col="8" colspan="4" groups="base.group_user">
<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
<button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
@@ -310,6 +310,7 @@
<button name='%(action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
<button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_account_user"/>
<button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
+ <button name="%(account_invoices)d" string="Invoices" type="action" icon="gtk-print"/>
</group>
</group>
</page>
@@ -465,7 +466,7 @@
<menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="menu_finance_payables"/>
<record id="action_invoice_tree3" model="ir.actions.act_window">
- <field name="name">Customer Refunds</field>
+ <field name="name">Credit Memo</field>
<field name="res_model">account.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
@@ -473,7 +474,7 @@
<field name="domain">[('type','=','out_refund')]</field>
<field name="context">{'type':'out_refund', 'journal_type': 'sale_refund'}</field>
<field name="search_view_id" ref="view_account_invoice_filter"/>
- <field name="help">Customer Refunds helps you manage the credit notes issued/to be issued for your customers. A refund invoice is a document that cancels an invoice or a part of it. You can easily generate refunds and reconcile them from the invoice form.</field>
+ <field name="help">Credit Memo helps you manage the credit notes issued/to be issued for your customers. A refund invoice is a document that cancels an invoice or a part of it. You can easily generate refunds and reconcile them from the invoice form.</field>
</record>
<record id="action_invoice_tree3_view1" model="ir.actions.act_window.view">
@@ -499,7 +500,7 @@
<field name="domain">[('type','=','in_refund')]</field>
<field name="context">{'type':'in_refund', 'journal_type': 'purchase_refund'}</field>
<field name="search_view_id" ref="view_account_invoice_filter"/>
- <field name="help">A vendor refund is a credit note from your supplier indicating that he refunds part or totality of the invoice sent to you.</field>
+ <field name="help">A supplier refund is a credit note from your supplier indicating that he refunds part or totality of the invoice sent to you.</field>
</record>
<menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="menu_finance_payables"/>
=== modified file 'account/account_menuitem.xml'
--- account/account_menuitem.xml 2010-11-26 16:13:59 +0000
+++ account/account_menuitem.xml 2010-12-14 03:25:00 +0000
@@ -6,22 +6,23 @@
groups="group_account_user,group_account_manager,group_account_invoice"
web_icon="images/accounting.png"
web_icon_hover="images/accounting-hover.png"/>
- <menuitem id="menu_finance_receivables" name="Customers" parent="menu_finance" sequence="1"/>
- <menuitem id="menu_finance_payables" name="Suppliers" parent="menu_finance" sequence="2"/>
- <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="3"
+ <menuitem id="menu_partners" name="Partners" parent="menu_finance" sequence="1"/>
+ <menuitem id="menu_finance_receivables" name="Customers" parent="menu_finance" sequence="2"/>
+ <menuitem id="menu_finance_payables" name="Suppliers" parent="menu_finance" sequence="3"/>
+ <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="4"
groups="group_account_user,group_account_manager"/>
- <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user,group_account_manager"/>
+ <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="9" groups="group_account_user,group_account_manager"/>
<!-- This menu is used in account_code module -->
<menuitem id="menu_account_pp_statements" name="Statements" parent="menu_finance_periodical_processing" sequence="12"/>
<menuitem id="periodical_processing_journal_entries_validation" name="Draft Entries" parent="menu_finance_periodical_processing"/>
<menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
<menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
- <menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" sequence="5"/>
- <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="12"/>
+ <menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" sequence="6"/>
+ <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="13"/>
<menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting" groups="group_account_user"/>
<menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reporting"/>
<menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
- <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="13" groups="group_account_manager"/>
+ <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="14" groups="group_account_manager"/>
<menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
<menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration" groups="analytic.group_analytic_accounting"/>
<menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts" groups="analytic.group_analytic_accounting"/>
@@ -29,7 +30,7 @@
<menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration" sequence="30" groups="group_account_manager"/>
<menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>
<menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" sequence="100"/>
- <menuitem id="menu_finance_entries" name="Journal Entries" parent="menu_finance" sequence="4" groups="group_account_user,group_account_manager"/>
+ <menuitem id="menu_finance_entries" name="Journal Entries" parent="menu_finance" sequence="5" groups="group_account_user,group_account_manager"/>
<menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries" parent="menu_finance_periodical_processing" sequence="15" groups="base.group_extended,group_account_manager,group_account_user"/>
<menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing" groups="group_account_manager,group_account_user" sequence="25"/>
=== modified file 'account/account_move_line.py'
--- account/account_move_line.py 2010-11-27 20:14:29 +0000
+++ account/account_move_line.py 2010-12-14 03:25:00 +0000
@@ -429,7 +429,7 @@
'period_id': fields.many2one('account.period', 'Period', required=True, select=2),
'journal_id': fields.many2one('account.journal', 'Journal', required=True, select=1),
'blocked': fields.boolean('Litigation', help="You can check this box to mark this journal item as a litigation with the associated partner"),
- 'partner_id': fields.many2one('res.partner', 'Partner', select=1),
+ 'partner_id': fields.many2one('res.partner', 'Partner', select=1, ondelete='restrict'),
'date_maturity': fields.date('Due date', help="This field is used for payable and receivable journal entries. You can put the limit date for the payment of this line."),
'date': fields.related('move_id','date', string='Effective date', type='date', required=True,
store = {
@@ -757,7 +757,7 @@
if 'comment' in context and context['comment']:
libelle = context['comment']
else:
- libelle = 'Write-Off'
+ libelle = _('Write-Off')
writeoff_lines = [
(0, 0, {
'name': libelle,
=== modified file 'account/account_report.xml'
--- account/account_report.xml 2010-11-18 11:56:06 +0000
+++ account/account_report.xml 2010-12-14 03:25:00 +0000
@@ -18,7 +18,8 @@
rml="account/report/account_print_invoice.rml"
string="Invoices"
attachment="(object.state in ('open','paid')) and ('INV'+(object.number or '').replace('/',''))"
- attachment_use="1"/>
+ attachment_use="1"
+ multi="True"/>
<report id="account_transfers" model="account.transfer" name="account.transfer" string="Transfers" xml="account/report/transfer.xml" xsl="account/report/transfer.xsl"/>
<report auto="False" id="account_intracom" menu="False" model="account.move.line" name="account.intracom" string="IntraCom"/>
=== modified file 'account/account_view.xml'
--- account/account_view.xml 2010-11-26 16:13:59 +0000
+++ account/account_view.xml 2010-12-14 03:25:00 +0000
@@ -946,7 +946,14 @@
<field groups="base.group_extended" name="child_depend"/>
<field groups="base.group_extended" name="sequence"/>
<field groups="base.group_extended" name="include_base_amount"/>
- <field groups="base.group_extended" colspan="4" name="child_ids"/>
+ <field groups="base.group_extended" colspan="4" name="child_ids">
+ <tree string="Account Tax">
+ <field name="sequence"/>
+ <field name="name"/>
+ <field name="price_include" groups="base.group_extended"/>
+ <field name="description"/>
+ </tree>
+ </field>
</group>
</page>
<page groups="base.group_extended" string="Special Computation">
@@ -1163,7 +1170,7 @@
<filter icon="terp-document-new" string="Unbalanced" domain="[('state','=','draft')]" help="Unbalanced Journal Items"/>
<separator orientation="vertical"/>
<filter icon="terp-document-new" string="Unposted" domain="[('move_id.state','=','draft')]" help="Unposted Journal Items"/>
- <filter icon="terp-camera_test" string="Posted" domain="[('move_id.state','=','posted')]" help="Posted Journal Items"/>
+ <filter name="posted" icon="terp-camera_test" string="Posted" domain="[('move_id.state','=','posted')]" help="Posted Journal Items"/>
<separator orientation="vertical"/>
<filter
icon="terp-dolar_ok!"
@@ -1209,6 +1216,7 @@
<field name="res_model">account.move.line</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
+ <field name="context">{'search_default_posted': 1}</field>
<field name="search_view_id" ref="view_account_move_line_filter"/>
<field name="help">This view is used by accountants in order to record entries massively in OpenERP. If you want to record a supplier invoice, start by recording the line of the expense account, OpenERP will propose to you automatically the Tax related to this account and the counter-part "Account Payable".</field>
</record>
@@ -2153,7 +2161,8 @@
<filter icon="terp-sale" string="Receivale Accounts" domain="[('type','=','receivable')]"/>
<filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
<separator orientation="vertical"/>
- <field name="code"/>
+ <field name="code"/>
+ <field name="name"/>
<field name="parent_id"/>
<field name="type"/>
<field name="user_type"/>
@@ -2194,13 +2203,13 @@
<field name="tax_template_ids" colspan="4" readonly="1" nolabel="1"/>
<separator string="Properties" colspan="4"/>
<group>
- <field name="property_account_receivable"/>
- <field name="property_account_payable"/>
- <field name="property_account_expense_categ" />
- <field name="property_account_income_categ"/>
- <field name="property_account_expense"/>
- <field name="property_account_income"/>
- <field name="property_reserve_and_surplus_account"/>
+ <field name="property_account_receivable" domain="[('id', 'child_of', [account_root_id])]"/>
+ <field name="property_account_payable" domain="[('id', 'child_of', [account_root_id])]"/>
+ <field name="property_account_expense_categ" domain="[('id', 'child_of', [account_root_id])]"/>
+ <field name="property_account_income_categ" domain="[('id', 'child_of', [account_root_id])]" />
+ <field name="property_account_expense" domain="[('id', 'child_of', [account_root_id])]"/>
+ <field name="property_account_income" domain="[('id', 'child_of', [account_root_id])]"/>
+ <field name="property_reserve_and_surplus_account" />
</group>
</form>
</field>
@@ -2437,7 +2446,7 @@
<attribute name='string'></attribute>
</xpath>
<group string="res_config_contents" position="replace">
- <field name="company_id" widget="selection"/>
+ <field name="company_id" widget="selection" groups="base.group_extended"/>
<field name ="code_digits" groups="base.group_extended"/>
<field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)"/>
<field name ="seq_journal" groups="base.group_extended"/>
@@ -2745,5 +2754,19 @@
<menuitem action="action_view_bank_statement_tree" id="journal_cash_move_lines" parent="menu_finance_bank_and_cash"
groups="group_account_user,group_account_manager"/>
+ <record id="action_partner_all" model="ir.actions.act_window">
+ <field name="name">Partners</field>
+ <field name="type">ir.actions.act_window</field>
+ <field name="res_model">res.partner</field>
+ <field name="view_type">form</field>
+ <field name="filter" eval="True"/>
+ </record>
+
+ <menuitem id="menu_partners_partners"
+ name="Partners"
+ parent="menu_partners"
+ action="action_partner_all"
+ sequence="1"/>
+
</data>
</openerp>
=== modified file 'account/board_account_view.xml'
--- account/board_account_view.xml 2010-11-15 12:37:32 +0000
+++ account/board_account_view.xml 2010-12-14 03:25:00 +0000
@@ -68,7 +68,7 @@
<menuitem id="menu_dashboard_acc" name="Dashboard" sequence="2" parent="account.menu_finance_reporting" groups="group_account_user,group_account_manager"/>
<menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="menu_dashboard_acc" sequence="1"/>
- <menuitem icon="terp-account" id="account.menu_finance" name="Accounting" sequence="13" action="open_board_account"/>
+ <menuitem icon="terp-account" id="account.menu_finance" name="Accounting" sequence="14" action="open_board_account"/>
</data>
=== modified file 'account/company.py'
--- account/company.py 2010-11-02 08:31:53 +0000
+++ account/company.py 2010-12-14 03:25:00 +0000
@@ -37,9 +37,10 @@
}
_defaults = {
- 'overdue_msg': 'Would your payment have been carried \
-out after this mail was sent, please consider the present one as \
-void. Do not hesitate to contact our accounting department'
+ 'overdue_msg': 'Please note that the following payments are now due. If your payment \
+ has been sent, kindly forward your payment details. If payment will be \
+ delayed further, please contact us to discuss. \
+ \nWould your payment have been carried out after this mail was sent, please consider the present one as void.'
}
res_company()
=== modified file 'account/i18n/account.pot'
--- account/i18n/account.pot 2010-12-10 17:40:27 +0000
+++ account/i18n/account.pot 2010-12-14 03:25:00 +0000
@@ -959,11 +959,6 @@
msgstr ""
#. module: account
-#: model:account.account.type,name:account.account_type_liability
-msgid "Bilanzkonten - Passiva - Kapitalkonten"
-msgstr ""
-
-#. module: account
#: view:board.board:0
msgid "Customer Invoices to Approve"
msgstr ""
@@ -1858,7 +1853,7 @@
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree4
-msgid "A vendor refund is a credit note from your supplier indicating that he refunds part or totality of the invoice sent to you."
+msgid "A supplier refund is a credit note from your supplier indicating that he refunds part or totality of the invoice sent to you."
msgstr ""
#. module: account
@@ -2538,11 +2533,6 @@
msgstr ""
#. module: account
-#: model:account.account.type,name:account.account_type_view
-msgid "Ansicht"
-msgstr ""
-
-#. module: account
#: field:wizard.multi.charts.accounts,sale_tax:0
msgid "Default Sale Tax"
msgstr ""
=== modified file 'account/i18n/da.po'
--- account/i18n/da.po 2010-12-11 05:08:50 +0000
+++ account/i18n/da.po 2010-12-14 03:25:00 +0000
@@ -1013,11 +1013,6 @@
msgstr ""
#. module: account
-#: model:account.account.type,name:account.account_type_liability
-msgid "Bilanzkonten - Passiva - Kapitalkonten"
-msgstr ""
-
-#. module: account
#: view:board.board:0
msgid "Customer Invoices to Approve"
msgstr ""
@@ -1942,7 +1937,7 @@
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree4
msgid ""
-"A vendor refund is a credit note from your supplier indicating that he "
+"A supplier refund is a credit note from your supplier indicating that he "
"refunds part or totality of the invoice sent to you."
msgstr ""
@@ -2666,11 +2661,6 @@
msgstr ""
#. module: account
-#: model:account.account.type,name:account.account_type_view
-msgid "Ansicht"
-msgstr ""
-
-#. module: account
#: field:wizard.multi.charts.accounts,sale_tax:0
msgid "Default Sale Tax"
msgstr ""
=== modified file 'account/i18n/de.po'
--- account/i18n/de.po 2010-12-11 05:08:50 +0000
+++ account/i18n/de.po 2010-12-14 03:25:00 +0000
@@ -1074,11 +1074,6 @@
msgstr "Ãœberblick"
#. module: account
-#: model:account.account.type,name:account.account_type_liability
-msgid "Bilanzkonten - Passiva - Kapitalkonten"
-msgstr ""
-
-#. module: account
#: view:board.board:0
msgid "Customer Invoices to Approve"
msgstr "Zu buchende Ausgangsrechnungen"
@@ -2036,7 +2031,7 @@
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree4
msgid ""
-"A vendor refund is a credit note from your supplier indicating that he "
+"A supplier refund is a credit note from your supplier indicating that he "
"refunds part or totality of the invoice sent to you."
msgstr ""
"Eine Gutschrift ist ein Beleg von Ihrem Lieferanten, der einen Teil oder "
@@ -2802,11 +2797,6 @@
msgstr "Steuergrundlage Betrag"
#. module: account
-#: model:account.account.type,name:account.account_type_view
-msgid "Ansicht"
-msgstr ""
-
-#. module: account
#: field:wizard.multi.charts.accounts,sale_tax:0
msgid "Default Sale Tax"
msgstr "Standard Steuer Verkauf"
=== modified file 'account/i18n/el.po'
--- account/i18n/el.po 2010-12-11 05:08:50 +0000
+++ account/i18n/el.po 2010-12-14 03:25:00 +0000
@@ -1033,11 +1033,6 @@
msgstr "Î Ïοβολή Τοπίου"
#. module: account
-#: model:account.account.type,name:account.account_type_liability
-msgid "Bilanzkonten - Passiva - Kapitalkonten"
-msgstr ""
-
-#. module: account
#: view:board.board:0
msgid "Customer Invoices to Approve"
msgstr "Τιμολόγια Πελάτη Ï€Ïος ΈγκÏιση"
@@ -1970,7 +1965,7 @@
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree4
msgid ""
-"A vendor refund is a credit note from your supplier indicating that he "
+"A supplier refund is a credit note from your supplier indicating that he "
"refunds part or totality of the invoice sent to you."
msgstr ""
@@ -2700,11 +2695,6 @@
msgstr "Ποσό Î’Î±ÏƒÎ¹ÎºÎ¿Ï ÎšÏŽÎ´Î¹ÎºÎ±"
#. module: account
-#: model:account.account.type,name:account.account_type_view
-msgid "Ansicht"
-msgstr ""
-
-#. module: account
#: field:wizard.multi.charts.accounts,sale_tax:0
msgid "Default Sale Tax"
msgstr ""
=== modified file 'account/i18n/es.po'
--- account/i18n/es.po 2010-12-11 05:08:50 +0000
+++ account/i18n/es.po 2010-12-14 03:25:00 +0000
@@ -1058,11 +1058,6 @@
msgstr "Modo horizontal"
#. module: account
-#: model:account.account.type,name:account.account_type_liability
-msgid "Bilanzkonten - Passiva - Kapitalkonten"
-msgstr ""
-
-#. module: account
#: view:board.board:0
msgid "Customer Invoices to Approve"
msgstr "Facturas de cliente para aprobar"
@@ -2016,7 +2011,7 @@
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree4
msgid ""
-"A vendor refund is a credit note from your supplier indicating that he "
+"A supplier refund is a credit note from your supplier indicating that he "
"refunds part or totality of the invoice sent to you."
msgstr ""
"Un abono de proveedor de es una factura rectificativa de su proveedor "
@@ -2767,11 +2762,6 @@
msgstr "Importe código base"
#. module: account
-#: model:account.account.type,name:account.account_type_view
-msgid "Ansicht"
-msgstr ""
-
-#. module: account
#: field:wizard.multi.charts.accounts,sale_tax:0
msgid "Default Sale Tax"
msgstr "Impuesto de venta por defecto"
=== modified file 'account/i18n/es_EC.po'
--- account/i18n/es_EC.po 2010-12-11 05:08:50 +0000
+++ account/i18n/es_EC.po 2010-12-14 03:25:00 +0000
@@ -1027,11 +1027,6 @@
msgstr "Modo horizontal"
#. module: account
-#: model:account.account.type,name:account.account_type_liability
-msgid "Bilanzkonten - Passiva - Kapitalkonten"
-msgstr ""
-
-#. module: account
#: view:board.board:0
msgid "Customer Invoices to Approve"
msgstr ""
@@ -1958,7 +1953,7 @@
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree4
msgid ""
-"A vendor refund is a credit note from your supplier indicating that he "
+"A supplier refund is a credit note from your supplier indicating that he "
"refunds part or totality of the invoice sent to you."
msgstr ""
@@ -2685,11 +2680,6 @@
msgstr "Importe código base"
#. module: account
-#: model:account.account.type,name:account.account_type_view
-msgid "Ansicht"
-msgstr ""
-
-#. module: account
#: field:wizard.multi.charts.accounts,sale_tax:0
msgid "Default Sale Tax"
msgstr ""
=== modified file 'account/i18n/fr.po'
--- account/i18n/fr.po 2010-12-12 04:45:47 +0000
+++ account/i18n/fr.po 2010-12-14 03:25:00 +0000
@@ -1126,11 +1126,6 @@
msgstr "Mode paysage"
#. module: account
-#: model:account.account.type,name:account.account_type_liability
-msgid "Bilanzkonten - Passiva - Kapitalkonten"
-msgstr "Compte de bilan - passif - compte de capital"
-
-#. module: account
#: view:board.board:0
msgid "Customer Invoices to Approve"
msgstr "Factures client à approuver"
@@ -2077,7 +2072,7 @@
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree4
msgid ""
-"A vendor refund is a credit note from your supplier indicating that he "
+"A supplier refund is a credit note from your supplier indicating that he "
"refunds part or totality of the invoice sent to you."
msgstr ""
@@ -2801,11 +2796,6 @@
msgstr "Montant Hors Taxe"
#. module: account
-#: model:account.account.type,name:account.account_type_view
-msgid "Ansicht"
-msgstr "Vue"
-
-#. module: account
#: field:wizard.multi.charts.accounts,sale_tax:0
msgid "Default Sale Tax"
msgstr "Taxe de vente par défaut"
=== modified file 'account/i18n/hi.po'
--- account/i18n/hi.po 2010-12-11 05:08:50 +0000
+++ account/i18n/hi.po 2010-12-14 03:25:00 +0000
@@ -1011,11 +1011,6 @@
msgstr ""
#. module: account
-#: model:account.account.type,name:account.account_type_liability
-msgid "Bilanzkonten - Passiva - Kapitalkonten"
-msgstr ""
-
-#. module: account
#: view:board.board:0
msgid "Customer Invoices to Approve"
msgstr ""
@@ -1940,7 +1935,7 @@
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree4
msgid ""
-"A vendor refund is a credit note from your supplier indicating that he "
+"A supplier refund is a credit note from your supplier indicating that he "
"refunds part or totality of the invoice sent to you."
msgstr ""
@@ -2658,11 +2653,6 @@
msgstr ""
#. module: account
-#: model:account.account.type,name:account.account_type_view
-msgid "Ansicht"
-msgstr ""
-
-#. module: account
#: field:wizard.multi.charts.accounts,sale_tax:0
msgid "Default Sale Tax"
msgstr ""
=== modified file 'account/i18n/hu.po'
--- account/i18n/hu.po 2010-12-11 05:08:50 +0000
+++ account/i18n/hu.po 2010-12-14 03:25:00 +0000
@@ -1010,11 +1010,6 @@
msgstr "Fekvő mód"
#. module: account
-#: model:account.account.type,name:account.account_type_liability
-msgid "Bilanzkonten - Passiva - Kapitalkonten"
-msgstr ""
-
-#. module: account
#: view:board.board:0
msgid "Customer Invoices to Approve"
msgstr ""
@@ -1939,7 +1934,7 @@
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree4
msgid ""
-"A vendor refund is a credit note from your supplier indicating that he "
+"A supplier refund is a credit note from your supplier indicating that he "
"refunds part or totality of the invoice sent to you."
msgstr ""
@@ -2657,11 +2652,6 @@
msgstr ""
#. module: account
-#: model:account.account.type,name:account.account_type_view
-msgid "Ansicht"
-msgstr ""
-
-#. module: account
#: field:wizard.multi.charts.accounts,sale_tax:0
msgid "Default Sale Tax"
msgstr ""
=== modified file 'account/i18n/it.po'
--- account/i18n/it.po 2010-12-11 05:08:50 +0000
+++ account/i18n/it.po 2010-12-14 03:25:00 +0000
@@ -1063,11 +1063,6 @@
msgstr "Modalità Orizzontale"
#. module: account
-#: model:account.account.type,name:account.account_type_liability
-msgid "Bilanzkonten - Passiva - Kapitalkonten"
-msgstr ""
-
-#. module: account
#: view:board.board:0
msgid "Customer Invoices to Approve"
msgstr "Fatture dei clienti da approvare"
@@ -2017,7 +2012,7 @@
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree4
msgid ""
-"A vendor refund is a credit note from your supplier indicating that he "
+"A supplier refund is a credit note from your supplier indicating that he "
"refunds part or totality of the invoice sent to you."
msgstr ""
"Il rimborso da un fornitore consiste in una nota di credito che indica che "
@@ -2765,11 +2760,6 @@
msgstr "Importo codice base"
#. module: account
-#: model:account.account.type,name:account.account_type_view
-msgid "Ansicht"
-msgstr ""
-
-#. module: account
#: field:wizard.multi.charts.accounts,sale_tax:0
msgid "Default Sale Tax"
msgstr "Imposta di default per le vendite"
=== modified file 'account/i18n/nl.po'
--- account/i18n/nl.po 2010-12-11 05:08:50 +0000
+++ account/i18n/nl.po 2010-12-14 03:25:00 +0000
@@ -1044,11 +1044,6 @@
msgstr "Landschap modus"
#. module: account
-#: model:account.account.type,name:account.account_type_liability
-msgid "Bilanzkonten - Passiva - Kapitalkonten"
-msgstr ""
-
-#. module: account
#: view:board.board:0
msgid "Customer Invoices to Approve"
msgstr ""
@@ -1993,7 +1988,7 @@
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree4
msgid ""
-"A vendor refund is a credit note from your supplier indicating that he "
+"A supplier refund is a credit note from your supplier indicating that he "
"refunds part or totality of the invoice sent to you."
msgstr ""
@@ -2726,11 +2721,6 @@
msgstr "Basiscode bedrag"
#. module: account
-#: model:account.account.type,name:account.account_type_view
-msgid "Ansicht"
-msgstr "Weergave"
-
-#. module: account
#: field:wizard.multi.charts.accounts,sale_tax:0
msgid "Default Sale Tax"
msgstr ""
=== modified file 'account/i18n/pl.po'
--- account/i18n/pl.po 2010-12-11 05:08:50 +0000
+++ account/i18n/pl.po 2010-12-14 03:25:00 +0000
@@ -1057,11 +1057,6 @@
msgstr "Poziomo"
#. module: account
-#: model:account.account.type,name:account.account_type_liability
-msgid "Bilanzkonten - Passiva - Kapitalkonten"
-msgstr ""
-
-#. module: account
#: view:board.board:0
msgid "Customer Invoices to Approve"
msgstr "Faktury dla klienta do aprobowania"
@@ -1989,7 +1984,7 @@
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree4
msgid ""
-"A vendor refund is a credit note from your supplier indicating that he "
+"A supplier refund is a credit note from your supplier indicating that he "
"refunds part or totality of the invoice sent to you."
msgstr ""
@@ -2716,11 +2711,6 @@
msgstr "Kwota do rejestru podstawy"
#. module: account
-#: model:account.account.type,name:account.account_type_view
-msgid "Ansicht"
-msgstr ""
-
-#. module: account
#: field:wizard.multi.charts.accounts,sale_tax:0
msgid "Default Sale Tax"
msgstr "Domyślny podatek sprzedaży"
=== modified file 'account/i18n/pt.po'
--- account/i18n/pt.po 2010-12-12 04:45:47 +0000
+++ account/i18n/pt.po 2010-12-14 03:25:00 +0000
@@ -1049,11 +1049,6 @@
msgstr "Modo \"Landescape\""
#. module: account
-#: model:account.account.type,name:account.account_type_liability
-msgid "Bilanzkonten - Passiva - Kapitalkonten"
-msgstr ""
-
-#. module: account
#: view:board.board:0
msgid "Customer Invoices to Approve"
msgstr "Faturas de cliente, para aprovar"
@@ -1994,7 +1989,7 @@
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree4
msgid ""
-"A vendor refund is a credit note from your supplier indicating that he "
+"A supplier refund is a credit note from your supplier indicating that he "
"refunds part or totality of the invoice sent to you."
msgstr ""
@@ -2724,11 +2719,6 @@
msgstr "Montante de código base"
#. module: account
-#: model:account.account.type,name:account.account_type_view
-msgid "Ansicht"
-msgstr ""
-
-#. module: account
#: field:wizard.multi.charts.accounts,sale_tax:0
msgid "Default Sale Tax"
msgstr "Taxa pré-definida para vendas"
=== modified file 'account/i18n/pt_BR.po'
--- account/i18n/pt_BR.po 2010-12-11 05:08:50 +0000
+++ account/i18n/pt_BR.po 2010-12-14 03:25:00 +0000
@@ -1043,11 +1043,6 @@
msgstr "Modo paisagem"
#. module: account
-#: model:account.account.type,name:account.account_type_liability
-msgid "Bilanzkonten - Passiva - Kapitalkonten"
-msgstr ""
-
-#. module: account
#: view:board.board:0
msgid "Customer Invoices to Approve"
msgstr ""
@@ -1975,7 +1970,7 @@
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree4
msgid ""
-"A vendor refund is a credit note from your supplier indicating that he "
+"A supplier refund is a credit note from your supplier indicating that he "
"refunds part or totality of the invoice sent to you."
msgstr ""
@@ -2701,11 +2696,6 @@
msgstr "Valor do código básico"
#. module: account
-#: model:account.account.type,name:account.account_type_view
-msgid "Ansicht"
-msgstr ""
-
-#. module: account
#: field:wizard.multi.charts.accounts,sale_tax:0
msgid "Default Sale Tax"
msgstr ""
=== modified file 'account/i18n/ro.po'
--- account/i18n/ro.po 2010-12-11 05:08:50 +0000
+++ account/i18n/ro.po 2010-12-14 03:25:00 +0000
@@ -1023,11 +1023,6 @@
msgstr "Mod vedere"
#. module: account
-#: model:account.account.type,name:account.account_type_liability
-msgid "Bilanzkonten - Passiva - Kapitalkonten"
-msgstr ""
-
-#. module: account
#: view:board.board:0
msgid "Customer Invoices to Approve"
msgstr ""
@@ -1955,7 +1950,7 @@
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree4
msgid ""
-"A vendor refund is a credit note from your supplier indicating that he "
+"A supplier refund is a credit note from your supplier indicating that he "
"refunds part or totality of the invoice sent to you."
msgstr ""
@@ -2682,11 +2677,6 @@
msgstr "Suma cod bază"
#. module: account
-#: model:account.account.type,name:account.account_type_view
-msgid "Ansicht"
-msgstr ""
-
-#. module: account
#: field:wizard.multi.charts.accounts,sale_tax:0
msgid "Default Sale Tax"
msgstr ""
=== modified file 'account/i18n/ru.po'
--- account/i18n/ru.po 2010-12-11 05:08:50 +0000
+++ account/i18n/ru.po 2010-12-14 03:25:00 +0000
@@ -1017,11 +1017,6 @@
msgstr "Режим: пейзаж"
#. module: account
-#: model:account.account.type,name:account.account_type_liability
-msgid "Bilanzkonten - Passiva - Kapitalkonten"
-msgstr ""
-
-#. module: account
#: view:board.board:0
msgid "Customer Invoices to Approve"
msgstr "Счета заказчиков Ð´Ð»Ñ ÑƒÑ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ"
@@ -1946,7 +1941,7 @@
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree4
msgid ""
-"A vendor refund is a credit note from your supplier indicating that he "
+"A supplier refund is a credit note from your supplier indicating that he "
"refunds part or totality of the invoice sent to you."
msgstr ""
@@ -2670,11 +2665,6 @@
msgstr ""
#. module: account
-#: model:account.account.type,name:account.account_type_view
-msgid "Ansicht"
-msgstr ""
-
-#. module: account
#: field:wizard.multi.charts.accounts,sale_tax:0
msgid "Default Sale Tax"
msgstr ""
=== modified file 'account/i18n/sk.po'
--- account/i18n/sk.po 2010-12-11 05:08:50 +0000
+++ account/i18n/sk.po 2010-12-14 03:25:00 +0000
@@ -1011,11 +1011,6 @@
msgstr ""
#. module: account
-#: model:account.account.type,name:account.account_type_liability
-msgid "Bilanzkonten - Passiva - Kapitalkonten"
-msgstr ""
-
-#. module: account
#: view:board.board:0
msgid "Customer Invoices to Approve"
msgstr "ZákaznÃcke faktúry na schválenie"
@@ -1940,7 +1935,7 @@
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree4
msgid ""
-"A vendor refund is a credit note from your supplier indicating that he "
+"A supplier refund is a credit note from your supplier indicating that he "
"refunds part or totality of the invoice sent to you."
msgstr ""
@@ -2658,11 +2653,6 @@
msgstr ""
#. module: account
-#: model:account.account.type,name:account.account_type_view
-msgid "Ansicht"
-msgstr ""
-
-#. module: account
#: field:wizard.multi.charts.accounts,sale_tax:0
msgid "Default Sale Tax"
msgstr ""
=== modified file 'account/i18n/sv.po'
--- account/i18n/sv.po 2010-12-12 04:45:47 +0000
+++ account/i18n/sv.po 2010-12-14 03:25:00 +0000
@@ -1026,11 +1026,6 @@
msgstr "Landscape Mode"
#. module: account
-#: model:account.account.type,name:account.account_type_liability
-msgid "Bilanzkonten - Passiva - Kapitalkonten"
-msgstr ""
-
-#. module: account
#: view:board.board:0
msgid "Customer Invoices to Approve"
msgstr "Kundfaktura att godkänna"
@@ -1962,7 +1957,7 @@
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree4
msgid ""
-"A vendor refund is a credit note from your supplier indicating that he "
+"A supplier refund is a credit note from your supplier indicating that he "
"refunds part or totality of the invoice sent to you."
msgstr ""
@@ -2691,11 +2686,6 @@
msgstr "Baskodsbelopp"
#. module: account
-#: model:account.account.type,name:account.account_type_view
-msgid "Ansicht"
-msgstr "Visa"
-
-#. module: account
#: field:wizard.multi.charts.accounts,sale_tax:0
msgid "Default Sale Tax"
msgstr "Standard moms"
=== modified file 'account/i18n/tr.po'
--- account/i18n/tr.po 2010-12-11 05:08:50 +0000
+++ account/i18n/tr.po 2010-12-14 03:25:00 +0000
@@ -1046,11 +1046,6 @@
msgstr "Landscape Mode"
#. module: account
-#: model:account.account.type,name:account.account_type_liability
-msgid "Bilanzkonten - Passiva - Kapitalkonten"
-msgstr ""
-
-#. module: account
#: view:board.board:0
msgid "Customer Invoices to Approve"
msgstr ""
@@ -1994,7 +1989,7 @@
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree4
msgid ""
-"A vendor refund is a credit note from your supplier indicating that he "
+"A supplier refund is a credit note from your supplier indicating that he "
"refunds part or totality of the invoice sent to you."
msgstr ""
@@ -2734,11 +2729,6 @@
msgstr "Base Code Amount"
#. module: account
-#: model:account.account.type,name:account.account_type_view
-msgid "Ansicht"
-msgstr ""
-
-#. module: account
#: field:wizard.multi.charts.accounts,sale_tax:0
msgid "Default Sale Tax"
msgstr ""
=== modified file 'account/i18n/vi.po'
--- account/i18n/vi.po 2010-12-11 05:08:50 +0000
+++ account/i18n/vi.po 2010-12-14 03:25:00 +0000
@@ -1060,11 +1060,6 @@
msgstr "Landscape Mode"
#. module: account
-#: model:account.account.type,name:account.account_type_liability
-msgid "Bilanzkonten - Passiva - Kapitalkonten"
-msgstr ""
-
-#. module: account
#: view:board.board:0
msgid "Customer Invoices to Approve"
msgstr "Customer Invoices to Approve"
@@ -2014,10 +2009,10 @@
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree4
msgid ""
-"A vendor refund is a credit note from your supplier indicating that he "
+"A supplier refund is a credit note from your supplier indicating that he "
"refunds part or totality of the invoice sent to you."
msgstr ""
-"A vendor refund is a credit note from your supplier indicating that he "
+"A supplier refund is a credit note from your supplier indicating that he "
"refunds part or totality of the invoice sent to you."
#. module: account
@@ -2765,11 +2760,6 @@
msgstr "Base Code Amount"
#. module: account
-#: model:account.account.type,name:account.account_type_view
-msgid "Ansicht"
-msgstr ""
-
-#. module: account
#: field:wizard.multi.charts.accounts,sale_tax:0
msgid "Default Sale Tax"
msgstr "Default Sale Tax"
=== modified file 'account/i18n/zh_CN.po'
--- account/i18n/zh_CN.po 2010-12-11 05:08:50 +0000
+++ account/i18n/zh_CN.po 2010-12-14 03:25:00 +0000
@@ -1010,11 +1010,6 @@
msgstr "横å‘模å¼"
#. module: account
-#: model:account.account.type,name:account.account_type_liability
-msgid "Bilanzkonten - Passiva - Kapitalkonten"
-msgstr ""
-
-#. module: account
#: view:board.board:0
msgid "Customer Invoices to Approve"
msgstr ""
@@ -1939,7 +1934,7 @@
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree4
msgid ""
-"A vendor refund is a credit note from your supplier indicating that he "
+"A supplier refund is a credit note from your supplier indicating that he "
"refunds part or totality of the invoice sent to you."
msgstr ""
@@ -2659,11 +2654,6 @@
msgstr "基础税事务代ç 的金é¢"
#. module: account
-#: model:account.account.type,name:account.account_type_view
-msgid "Ansicht"
-msgstr ""
-
-#. module: account
#: field:wizard.multi.charts.accounts,sale_tax:0
msgid "Default Sale Tax"
msgstr ""
=== modified file 'account/installer.py'
--- account/installer.py 2010-11-16 08:00:18 +0000
+++ account/installer.py 2010-12-14 03:25:00 +0000
@@ -95,6 +95,25 @@
'bank_accounts_id': _get_default_accounts,
'charts': _get_default_charts
}
+
+ def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+ res = super(account_installer, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
+ configured_cmp = []
+ unconfigured_cmp = []
+ cmp_select = []
+ company_ids = self.pool.get('res.company').search(cr, uid, [], context=context)
+ cr.execute("SELECT company_id FROM account_account WHERE account_account.parent_id IS NULL")
+ for r in cr.fetchall():
+ configured_cmp.append(r[0])
+ unconfigured_cmp = list(set(company_ids)-set(configured_cmp))
+ if unconfigured_cmp:
+ for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp):
+ cmp_select.append((line.id,line.name))
+ for field in res['fields']:
+ if field == 'company_id':
+ res['fields'][field]['domain'] = unconfigured_cmp
+ res['fields'][field]['selection'] = cmp_select
+ return res
def on_change_tax(self, cr, uid, id, tax):
return {'value': {'purchase_tax': tax}}
@@ -200,7 +219,8 @@
tax_template_ref[tax.id] = new_tax
#deactivate the parent_store functionnality on account_account for rapidity purpose
- self.pool._init = True
+ ctx = context and context.copy() or {}
+ ctx['defer_parent_store_computation'] = True
children_acc_template = obj_acc_template.search(cr, uid, [('parent_id', 'child_of', [obj_acc_root.id]), ('nocreate', '!=', True)], context=context)
children_acc_template.sort()
@@ -229,7 +249,7 @@
'tax_ids': [(6, 0, tax_ids)],
'company_id': company_id.id,
}
- new_account = obj_acc.create(cr, uid, vals, context=context)
+ new_account = obj_acc.create(cr, uid, vals, context=ctx)
acc_template_ref[account_template.id] = new_account
if account_template.name == 'Bank Current Account':
b_vals = {
@@ -243,8 +263,7 @@
'tax_ids': [(6,0,tax_ids)],
'company_id': company_id.id,
}
- bank_account = obj_acc.create(cr, uid, b_vals, context=context)
-
+ bank_account = obj_acc.create(cr, uid, b_vals, context=ctx)
view_id_cash = obj_acc_journal_view.search(cr, uid, [('name', '=', 'Bank/Cash Journal View')], context=context)[0] #why fixed name here?
view_id_cur = obj_acc_journal_view.search(cr, uid, [('name', '=', 'Bank/Cash Journal (Multi-Currency) View')], context=context)[0] #Why Fixed name here?
@@ -314,7 +333,7 @@
'parent_id': bank_account,
'company_id': company_id.id
}
- child_bnk_acc = obj_acc.create(cr, uid, vals_bnk, context=context)
+ child_bnk_acc = obj_acc.create(cr, uid, vals_bnk, context=ctx)
vals_seq_child = {
'name': _(vals_bnk['name'] + ' ' + 'Journal'),
'code': 'account.journal',
@@ -348,7 +367,6 @@
code_cnt += 1
#reactivate the parent_store functionality on account_account
- self.pool._init = False
obj_acc._parent_store_compute(cr)
for key, value in todo_dict.items():
=== modified file 'account/invoice.py'
--- account/invoice.py 2010-11-27 20:16:05 +0000
+++ account/invoice.py 2010-12-14 03:25:00 +0000
@@ -1312,6 +1312,7 @@
if context is None:
context = {}
company_id = context.get('company_id',False)
+ tax_obj = self.pool.get('account.tax')
if not partner_id:
raise osv.except_osv(_('No Partner Defined !'),_("You must first select a partner !") )
if not product:
@@ -1400,17 +1401,24 @@
if a:
result['account_id'] = a
+ tax_ids = tax_obj.search(cr, uid, [('company_id', '=', company_id)])
if type in ('out_invoice', 'out_refund'):
- taxes = res.taxes_id and res.taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a).tax_ids or False)
- tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
+ sale_taxes_def = map(lambda x: x.id, res.taxes_id)
+ sale_tax_ids = [tax for tax in tax_ids if tax in sale_taxes_def]
+ sale_taxes = tax_obj.browse(cr, uid, sale_tax_ids)
+ sale_taxes_all = sale_taxes and sale_taxes or (a and self.pool.get('account.account').browse(cr, uid, a).tax_ids or False)
+ tax_id = fpos_obj.map_tax(cr, uid, fpos, sale_taxes_all)
else:
- taxes = res.supplier_taxes_id and res.supplier_taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a).tax_ids or False)
- tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
+ pur_taxes_def = map(lambda x: x.id, res.supplier_taxes_id)
+ pur_tax_ids = [tax for tax in tax_ids if tax in pur_taxes_def]
+ pur_taxes = tax_obj.browse(cr, uid, pur_tax_ids)
+ pur_taxes_all = pur_taxes and pur_taxes or (a and self.pool.get('account.account').browse(cr, uid, a).tax_ids or False)
+ tax_id = fpos_obj.map_tax(cr, uid, fpos, pur_taxes_all)
+
if type in ('in_invoice', 'in_refund'):
result.update( {'price_unit': price_unit or res.standard_price,'invoice_line_tax_id': tax_id} )
else:
result.update({'price_unit': res.list_price, 'invoice_line_tax_id': tax_id})
-
# if not name:
result['name'] = res.partner_ref
=== modified file 'account/report/account_balance.py'
--- account/report/account_balance.py 2010-10-26 09:35:41 +0000
+++ account/report/account_balance.py 2010-12-14 03:25:00 +0000
@@ -84,11 +84,12 @@
}
self.sum_debit += account_rec['debit']
self.sum_credit += account_rec['credit']
+ acc_digit = self.pool.get('decimal.precision').precision_get(self.cr, 1, 'Account')
if disp_acc == 'bal_movement':
- if res['credit'] > 0 or res['debit'] > 0 or res['balance'] > 0:
+ if round(res['credit'], acc_digit) > 0 or round(res['debit'], acc_digit) > 0 or round(res['balance'], acc_digit) != 0:
self.result_acc.append(res)
elif disp_acc == 'bal_solde':
- if res['balance'] != 0:
+ if round(res['balance'], acc_digit) != 0:
self.result_acc.append(res)
else:
self.result_acc.append(res)
=== modified file 'account/report/account_balance_sheet.py'
--- account/report/account_balance_sheet.py 2010-12-10 00:35:57 +0000
+++ account/report/account_balance_sheet.py 2010-12-14 03:25:00 +0000
@@ -136,15 +136,16 @@
'level': account.level,
'balance':account.balance,
}
+ acc_digit = self.pool.get('decimal.precision').precision_get(self.cr, 1, 'Account')
if typ == 'liability' and account.type <> 'view' and (account.debit <> account.credit):
self.result_sum_dr += account.balance
if typ == 'asset' and account.type <> 'view' and (account.debit <> account.credit):
self.result_sum_cr += account.balance
if data['form']['display_account'] == 'bal_movement':
- if account.credit > 0 or account.debit > 0 or account.balance > 0:
+ if round(account.credit, acc_digit) > 0 or round(account.debit, acc_digit) > 0 or round(account.balance, acc_digit) != 0:
accounts_temp.append(account_dict)
elif data['form']['display_account'] == 'bal_solde':
- if account.balance != 0:
+ if round(account.balance, acc_digit) != 0:
accounts_temp.append(account_dict)
else:
accounts_temp.append(account_dict)
=== modified file 'account/report/account_entries_report.py'
--- account/report/account_entries_report.py 2010-10-18 07:09:26 +0000
+++ account/report/account_entries_report.py 2010-12-14 03:25:00 +0000
@@ -94,7 +94,7 @@
return super(account_entries_report, self).search(cr, uid, args=args, offset=offset, limit=limit, order=order,
context=context, count=count)
- def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None):
+ def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None, orderby=False):
todel=[]
fiscalyear_obj = self.pool.get('account.fiscalyear')
period_obj = self.pool.get('account.period')
@@ -112,7 +112,7 @@
for a in [['period_id','in','current_year'], ['period_id','in','current_period']]:
if a in domain:
domain.remove(a)
- return super(account_entries_report, self).read_group(cr, uid, domain, fields, groupby, offset, limit, context)
+ return super(account_entries_report, self).read_group(cr, uid, domain, fields, groupby, offset, limit, context, orderby)
def init(self, cr):
tools.drop_view_if_exists(cr, 'account_entries_report')
=== modified file 'account/report/account_invoice_report_view.xml'
--- account/report/account_invoice_report_view.xml 2010-11-18 14:32:20 +0000
+++ account/report/account_invoice_report_view.xml 2010-12-14 03:25:00 +0000
@@ -78,7 +78,7 @@
domain="['|', ('type','=','out_invoice'),('type','=','out_refund')]"
help="Customer Invoices And Refunds"/>
<filter icon="terp-personal"
- string="supplier"
+ string="Supplier"
separator="1"
domain="['|', ('type','=','in_invoice'),('type','=','in_refund')]"
help="Supplier Invoices And Refunds"/>
=== modified file 'account/report/account_print_overdue.rml'
--- account/report/account_print_overdue.rml 2010-11-16 05:50:35 +0000
+++ account/report/account_print_overdue.rml 2010-12-14 03:25:00 +0000
@@ -157,7 +157,6 @@
<para style="terp_default_9">
<font color="white"> </font>
</para>
- <para style="terp_default_9">Exception made of a mistake of our side, it seems that the following bills stay unpaid. Please, take appropriate measures in order to carry out this payment in the next 8 days.</para>
<para style="terp_default_9">
<font color="white"> </font>
</para>
=== modified file 'account/report/account_print_overdue.sxw'
Binary files account/report/account_print_overdue.sxw 2010-10-12 09:26:17 +0000 and account/report/account_print_overdue.sxw 2010-12-14 03:25:00 +0000 differ
=== modified file 'account/report/account_profit_loss.py'
--- account/report/account_profit_loss.py 2010-12-10 00:35:57 +0000
+++ account/report/account_profit_loss.py 2010-12-14 03:25:00 +0000
@@ -106,15 +106,16 @@
accounts_temp = []
for account in accounts:
if (account.user_type.report_type) and (account.user_type.report_type == typ):
+ acc_digit = self.pool.get('decimal.precision').precision_get(self.cr, 1, 'Account')
if typ == 'expense' and account.type <> 'view' and (account.debit <> account.credit):
self.result_sum_dr += abs(account.debit - account.credit)
if typ == 'income' and account.type <> 'view' and (account.debit <> account.credit):
self.result_sum_cr += abs(account.debit - account.credit)
if data['form']['display_account'] == 'bal_movement':
- if account.credit > 0 or account.debit > 0 or account.balance > 0:
+ if round(account.credit, acc_digit) > 0 or round(account.debit, acc_digit) > 0 or round(account.balance, acc_digit) != 0:
accounts_temp.append(account)
elif data['form']['display_account'] == 'bal_solde':
- if account.balance != 0:
+ if round(account.balance, acc_digit) != 0:
accounts_temp.append(account)
else:
accounts_temp.append(account)
=== modified file 'account/security/ir.model.access.csv'
--- account/security/ir.model.access.csv 2010-10-20 04:57:25 +0000
+++ account/security/ir.model.access.csv 2010-12-14 03:25:00 +0000
@@ -115,3 +115,5 @@
"access_report_account_receivable_invoice","report.account.receivable.invoice","model_report_account_receivable","account.group_account_invoice",1,1,1,1
"access_report_account_receivable_user","report.account.receivable.user","model_report_account_receivable","account.group_account_user",1,1,1,1
"access_account_sequence_fiscal_year_invoice","account.sequence.fiscalyear invoice","model_account_sequence_fiscalyear","account.group_account_invoice",1,1,1,1
+"access_account_sequence_fiscal_year_sale_user","account.sequence.fiscalyear.sale.user","model_account_sequence_fiscalyear","base.group_sale_salesman",1,1,1,0
+"access_account_sequence_fiscal_year_sale_manager","account.sequence.fiscalyear.sale.manager","model_account_sequence_fiscalyear","base.group_sale_manager",1,1,1,1
=== modified file 'account/wizard/account_chart.py'
--- account/wizard/account_chart.py 2010-10-28 08:35:00 +0000
+++ account/wizard/account_chart.py 2010-12-14 03:25:00 +0000
@@ -33,8 +33,9 @@
help = 'Keep empty for all open fiscal years'),
'period_from': fields.many2one('account.period', 'Start period'),
'period_to': fields.many2one('account.period', 'End period'),
- 'target_move': fields.selection([('all', 'All Entries'),
- ('posted', 'All Posted Entries')], 'Target Moves', required = True),
+ 'target_move': fields.selection([('posted', 'All Posted Entries'),
+ ('all', 'All Entries'),
+ ], 'Target Moves', required = True),
}
def onchange_fiscalyear(self, cr, uid, ids, fiscalyear_id=False, context=None):
@@ -92,7 +93,7 @@
return result
_defaults = {
- 'target_move': 'all'
+ 'target_move': 'posted'
}
account_chart()
=== modified file 'account/wizard/account_move_journal.py'
--- account/wizard/account_move_journal.py 2010-11-15 18:46:17 +0000
+++ account/wizard/account_move_journal.py 2010-12-14 03:25:00 +0000
@@ -21,7 +21,7 @@
from lxml import etree
-from osv import osv
+from osv import osv, fields
from tools.translate import _
import tools
@@ -29,6 +29,15 @@
_name = "account.move.journal"
_description = "Move journal"
+ _columns = {
+ 'target_move': fields.selection([('posted', 'All Posted Entries'),
+ ('all', 'All Entries'),
+ ], 'Target Moves', required=True),
+ }
+
+ _defaults = {
+ 'target_move': 'posted'
+ }
def _get_period(self, cr, uid, context={}):
"""
Return default account period value
@@ -93,6 +102,8 @@
view = """<?xml version="1.0" encoding="utf-8"?>
<form string="Standard entries">
<separator string="Open Journal Items !" colspan="4"/>
+ <field name="target_move" />
+ <newline/>
<group colspan="4" >
<label width="300" string="Journal: %s"/>
<newline/>
@@ -132,6 +143,7 @@
journal_id = self._get_journal(cr, uid, context)
period_id = self._get_period(cr, uid, context)
+ target_move = self.read(cr, uid, ids, [])[0]['target_move']
name = _("Journal Items")
if journal_id:
@@ -156,23 +168,26 @@
}
period_pool.create(cr, uid, res,context=context)
- ids = period_pool.search(cr, uid, [('journal_id', '=', journal_id), ('period_id', '=', period_id)],context=context)
+ ids = period_pool.search(cr, uid, [('journal_id', '=', journal_id), ('period_id', '=', period_id)], context=context)
period = period_pool.browse(cr, uid, ids[0], context=context)
name = (period.journal_id.code or '') + ':' + (period.period_id.code or '')
result = data_pool.get_object_reference(cr, uid, 'account', 'view_account_move_line_filter')
res_id = result and result[1] or False
+ move = 0
+ if target_move == 'posted':
+ move = 1
return {
'name': name,
'view_type': 'form',
'view_mode': 'tree,graph,form',
'res_model': 'account.move.line',
'view_id': False,
- 'context': "{'visible_id':%s, 'search_default_journal_id':%d, 'search_default_period_id':%d}" % (journal_id, journal_id, period_id),
+ 'context': "{'search_default_posted': %d, 'visible_id':%s, 'search_default_journal_id':%d, 'search_default_period_id':%d}" % (move, journal_id, journal_id, period_id),
'type': 'ir.actions.act_window',
'search_view_id': res_id
}
account_move_journal()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
=== modified file 'account/wizard/account_report_common.py'
--- account/wizard/account_report_common.py 2010-10-15 06:33:48 +0000
+++ account/wizard/account_report_common.py 2010-12-14 03:25:00 +0000
@@ -38,8 +38,9 @@
'journal_ids': fields.many2many('account.journal', 'account_common_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
'date_from': fields.date("Start Date"),
'date_to': fields.date("End Date"),
- 'target_move': fields.selection([('all', 'All Entries'),
- ('posted', 'All Posted Entries')], 'Target Moves', required=True),
+ 'target_move': fields.selection([('posted', 'All Posted Entries'),
+ ('all', 'All Entries'),
+ ], 'Target Moves', required=True),
}
@@ -101,7 +102,7 @@
'journal_ids': _get_all_journal,
'filter': 'filter_no',
'chart_account_id': _get_account,
- 'target_move': 'all',
+ 'target_move': 'posted',
}
def _build_contexts(self, cr, uid, ids, data, context=None):
=== modified file 'account/wizard/account_tax_chart.py'
--- account/wizard/account_tax_chart.py 2010-10-28 08:35:00 +0000
+++ account/wizard/account_tax_chart.py 2010-12-14 03:25:00 +0000
@@ -31,8 +31,9 @@
'period_id': fields.many2one('account.period', \
'Period', \
),
- 'target_move': fields.selection([('all', 'All Entries'),
- ('posted', 'All Posted Entries')], 'Target Moves', required=True),
+ 'target_move': fields.selection([('posted', 'All Posted Entries'),
+ ('all', 'All Entries'),
+ ], 'Target Moves', required=True),
}
def _get_period(self, cr, uid, context=None):
@@ -72,7 +73,7 @@
_defaults = {
'period_id': _get_period,
- 'target_move': 'all'
+ 'target_move': 'posted'
}
account_tax_chart()
=== modified file 'account_analytic_plans/__openerp__.py'
--- account_analytic_plans/__openerp__.py 2010-09-17 09:30:07 +0000
+++ account_analytic_plans/__openerp__.py 2010-12-14 03:25:00 +0000
@@ -59,6 +59,7 @@
'depends' : ['account', 'account_analytic_default'],
'init_xml' : [],
'update_xml': [
+ 'security/account_analytic_plan_security.xml',
'security/ir.model.access.csv',
'account_analytic_plans_view.xml',
'account_analytic_plans_report.xml',
=== modified file 'account_analytic_plans/account_analytic_plans.py'
--- account_analytic_plans/account_analytic_plans.py 2010-10-12 10:52:58 +0000
+++ account_analytic_plans/account_analytic_plans.py 2010-12-14 03:25:00 +0000
@@ -240,7 +240,7 @@
_description = "Analytic Instance Line"
_columns = {
'plan_id': fields.many2one('account.analytic.plan.instance', 'Plan Id'),
- 'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True),
+ 'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, domain=[('type','<>','view')]),
'rate': fields.float('Rate (%)', required=True),
}
_defaults = {
=== modified file 'account_analytic_plans/report/crossovered_analytic.py'
--- account_analytic_plans/report/crossovered_analytic.py 2010-10-11 11:25:50 +0000
+++ account_analytic_plans/report/crossovered_analytic.py 2010-12-14 03:25:00 +0000
@@ -97,19 +97,21 @@
self.final_list = children_list
selected_ids = line_pool.search(self.cr, self.uid, [('account_id', 'in' ,self.final_list)])
+
+ res['ref_qty'] = 0.0
+ res['ref_amt'] = 0.0
+ self.base_amount = 0.0
+
if selected_ids:
query = "SELECT SUM(aal.amount) AS amt, SUM(aal.unit_amount) AS qty FROM account_analytic_line AS aal, account_analytic_account AS aaa \
WHERE aal.account_id = aaa.id AND aal.id IN ("+','.join(map(str,selected_ids))+") AND (aal.journal_id " + journal +") AND aal.date>='"+ str(form['date1']) +"'"" AND aal.date<='" + str(form['date2']) + "'"
self.cr.execute(query)
info=self.cr.dictfetchall()
-
res['ref_qty'] = info[0]['qty']
res['ref_amt'] = info[0]['amt']
self.base_amount = info[0]['amt']
- res['ref_qty'] = 0.0
- res['ref_amt'] = 0.0
- self.base_amount = 0.0
+
result.append(res)
return result
=== added file 'account_analytic_plans/security/account_analytic_plan_security.xml'
--- account_analytic_plans/security/account_analytic_plan_security.xml 1970-01-01 00:00:00 +0000
+++ account_analytic_plans/security/account_analytic_plan_security.xml 2010-12-14 03:25:00 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+ <data>
+
+ <record id="base.user_root" model="res.users">
+ <field name="groups_id" eval="[(4, ref('analytic.group_analytic_accounting'))]"/>
+ </record>
+
+ </data>
+</openerp>
=== modified file 'account_analytic_plans/wizard/account_crossovered_analytic.py'
--- account_analytic_plans/wizard/account_crossovered_analytic.py 2010-11-04 12:42:42 +0000
+++ account_analytic_plans/wizard/account_crossovered_analytic.py 2010-12-14 03:25:00 +0000
@@ -31,7 +31,7 @@
'date1': fields.date('Start Date', required=True),
'date2': fields.date('End Date', required=True),
'journal_ids': fields.many2many('account.analytic.journal', 'crossovered_journal_rel', 'crossover_id', 'journal_id', 'Analytic Journal'),
- 'ref': fields.many2one('account.analytic.account', 'Analytic Account Reference', required=False),
+ 'ref': fields.many2one('account.analytic.account', 'Analytic Account Reference', required=True),
'empty_line': fields.boolean('Dont show empty lines'),
}
_defaults = {
=== modified file 'account_budget/account_budget.py'
--- account_budget/account_budget.py 2010-10-20 13:54:21 +0000
+++ account_budget/account_budget.py 2010-12-14 03:25:00 +0000
@@ -177,7 +177,7 @@
res = {}
for line in self.browse(cr, uid, ids):
if line.theoritical_amount <> 0.00:
- res[line.id] = float(line.practical_amount or 0.0 / line.theoritical_amount) * 100
+ res[line.id] = float((line.practical_amount or 0.0) / line.theoritical_amount) * 100
else:
res[line.id] = 0.00
return res
=== modified file 'account_budget/account_budget_view.xml'
--- account_budget/account_budget_view.xml 2010-12-08 10:23:05 +0000
+++ account_budget/account_budget_view.xml 2010-12-14 03:25:00 +0000
@@ -45,7 +45,7 @@
<field name="view_id" ref="view_budget_post_tree"/>
<field name="search_view_id" ref="view_budget_post_search"/>
</record>
- <menuitem id="next_id_31" name="Budgets" parent="account.menu_finance" sequence="5"/>
+ <menuitem id="next_id_31" name="Budgets" parent="account.menu_finance" sequence="6"/>
<menuitem id="next_id_pos" name="Budgets" parent="account.menu_finance_configuration" sequence="20"/>
<menuitem action="open_budget_post_form" id="menu_budget_post_form" parent="next_id_pos" sequence="20"/>
@@ -131,7 +131,6 @@
<field name="date_to"/>
<field name="paid_date" select="1"/>
<field name="planned_amount" select="1"/>
- <field name="analytic_account_id"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</form>
</field>
=== modified file 'account_payment/account_payment_view.xml'
--- account_payment/account_payment_view.xml 2010-11-02 07:04:55 +0000
+++ account_payment/account_payment_view.xml 2010-12-14 03:25:00 +0000
@@ -39,7 +39,7 @@
</field>
</record>
- <menuitem id="menu_main_payment" name="Payment" parent="account.menu_finance" sequence="6"/>
+ <menuitem id="menu_main_payment" name="Payment" parent="account.menu_finance" sequence="7"/>
<record id="view_payment_mode_search" model="ir.ui.view">
<field name="name">payment.mode.search</field>
=== modified file 'account_payment/wizard/account_payment_populate_statement.py'
--- account_payment/wizard/account_payment_populate_statement.py 2010-10-21 05:39:17 +0000
+++ account_payment/wizard/account_payment_populate_statement.py 2010-12-14 03:25:00 +0000
@@ -37,10 +37,12 @@
res = super(account_payment_populate_statement, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
line_ids = line_obj.search(cr, uid, [
('move_line_id.reconcile_id', '=', False),
- ('bank_statement_line_id', '=', False),])
+ ('bank_statement_line_id', '=', False),
+ ('move_line_id.state','=','valid')])
line_ids.extend(line_obj.search(cr, uid, [
('move_line_id.reconcile_id', '=', False),
- ('order_id.mode', '=', False)]))
+ ('order_id.mode', '=', False),
+ ('move_line_id.state','=','valid')]))
domain = '[("id", "in", '+ str(line_ids)+')]'
doc = etree.XML(res['arch'])
nodes = doc.xpath("//field[@name='lines']")
=== modified file 'account_voucher/account_voucher.py'
--- account_voucher/account_voucher.py 2010-11-24 12:13:47 +0000
+++ account_voucher/account_voucher.py 2010-12-14 03:25:00 +0000
@@ -23,10 +23,11 @@
from lxml import etree
import netsvc
-from osv import fields
-from osv import osv
+from osv import osv, fields
+import decimal_precision as dp
from tools.translate import _
+
class account_move_line(osv.osv):
_inherit = 'account.move.line'
@@ -109,6 +110,11 @@
def _get_narration(self, cr, uid, context={}):
return context.get('narration', False)
+ def _get_amount(self, cr, uid, context=None):
+ if context is None:
+ context= {}
+ return context.get('amount', 0.0)
+
def name_get(self, cr, uid, ids, context=None):
if not ids:
return []
@@ -140,18 +146,29 @@
res['arch'] = etree.tostring(doc)
return res
+ def _compute_writeoff_amount(self, cr, uid, line_dr_ids, line_cr_ids, amount):
+ debit = credit = 0.0
+ for l in line_dr_ids:
+ debit += l['amount']
+ for l in line_cr_ids:
+ credit += l['amount']
+ return abs(amount - abs(credit - debit))
+
+ def onchange_line_ids(self, cr, uid, ids, line_dr_ids, line_cr_ids, amount):
+ line_dr_ids = [x[2] for x in line_dr_ids]
+ line_cr_ids = [x[2] for x in line_cr_ids]
+ return {'value': {'writeoff_amount': self._compute_writeoff_amount(cr, uid, line_dr_ids, line_cr_ids, amount)}}
+
def _get_writeoff_amount(self, cr, uid, ids, name, args, context=None):
if not ids: return {}
res = {}
+ debit = credit = 0.0
for voucher in self.browse(cr, uid, ids, context=context):
- debit= credit = 0.0
- if voucher.line_dr_ids:
- for line in voucher.line_dr_ids:
- debit += line.amount_unreconciled
- if voucher.line_cr_ids:
- for line in voucher.line_cr_ids:
- credit += line.amount_unreconciled
- res[voucher.id] = abs(voucher.amount - abs(credit - debit))
+ for l in voucher.line_dr_ids:
+ debit += l.amount
+ for l in voucher.line_cr_ids:
+ credit += l.amount
+ res[voucher.id] = abs(voucher.amount - abs(credit - debit))
return res
_name = 'account.voucher'
@@ -189,8 +206,8 @@
\n* The \'Pro-forma\' when voucher is in Pro-forma state,voucher does not have an voucher number. \
\n* The \'Posted\' state is used when user create voucher,a voucher number is generated and voucher entries are created in account \
\n* The \'Cancelled\' state is used when user cancel voucher.'),
- 'amount': fields.float('Total', digits=(16, 2), required=True, readonly=True, states={'draft':[('readonly',False)]}),
- 'tax_amount':fields.float('Tax Amount', digits=(14,2), readonly=True, states={'draft':[('readonly',False)]}),
+ 'amount': fields.float('Total', digits_compute=dp.get_precision('Account'), required=True, readonly=True, states={'draft':[('readonly',False)]}),
+ 'tax_amount':fields.float('Tax Amount', digits_compute=dp.get_precision('Account'), readonly=True, states={'draft':[('readonly',False)]}),
'reference': fields.char('Ref #', size=64, readonly=True, states={'draft':[('readonly',False)]}, help="Transaction reference number."),
'number': fields.char('Number', size=32, readonly=True,),
'move_id':fields.many2one('account.move', 'Account Entry'),
@@ -205,14 +222,13 @@
'pre_line':fields.boolean('Previous Payments ?', required=False),
'date_due': fields.date('Due Date', readonly=True, states={'draft':[('readonly',False)]}),
'payment_option':fields.selection([
- ('without_writeoff', 'Without Write-off'),
- ('with_writeoff', 'With Write-off'),
- ], 'Payment Option', required=True, readonly=True, states={'draft': [('readonly', False)]}),
+ ('without_writeoff', 'Keep Open'),
+ ('with_writeoff', 'Reconcile with Write-Off'),
+ ], 'Payment Difference', required=True, readonly=True, states={'draft': [('readonly', False)]}),
'writeoff_acc_id': fields.many2one('account.account', 'Write-Off account', readonly=True, states={'draft': [('readonly', False)]}),
- 'writeoff_journal_id': fields.many2one('account.journal', 'Write-Off journal', readonly=True, states={'draft': [('readonly', False)]}),
- 'comment': fields.char('Comment', size=64, readonly=True, states={'draft': [('readonly', False)]}),
- 'analytic_id': fields.many2one('account.analytic.account','Analytic Account', readonly=True, states={'draft': [('readonly', False)]}),
- 'writeoff_amount': fields.function(_get_writeoff_amount, method=True, string='Writeoff Amount', type='float', readonly=True),
+ 'comment': fields.char('Write-Off Comment', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}),
+ 'analytic_id': fields.many2one('account.analytic.account','Write-Off Analytic Account', readonly=True, states={'draft': [('readonly', False)]}),
+ 'writeoff_amount': fields.function(_get_writeoff_amount, method=True, string='Write-Off Amount', type='float', readonly=True),
}
_defaults = {
'period_id': _get_period,
@@ -221,6 +237,7 @@
'currency_id': _get_currency,
'reference': _get_reference,
'narration':_get_narration,
+ 'amount': _get_amount,
'type':_get_type,
'state': 'draft',
'pay_now': 'pay_later',
@@ -229,7 +246,7 @@
'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.voucher',context=c),
'tax_id': _get_tax,
'payment_option': 'without_writeoff',
- 'comment': 'Write-Off',
+ 'comment': _('Write-Off'),
}
def compute_tax(self, cr, uid, ids, context={}):
@@ -384,13 +401,17 @@
@return: Returns a dict which contains new values, and context
"""
+ if context is None:
+ context = {}
if not journal_id:
return {}
- if context is None:
- context = {}
- currency_pool = self.pool.get('res.currency')
line_pool = self.pool.get('account.voucher.line')
+ line_ids = ids and line_pool.search(cr, uid, [('voucher_id', '=', ids[0])]) or False
+ if line_ids:
+ line_pool.unlink(cr, uid, line_ids)
+
+ currency_pool = self.pool.get('res.currency')
move_line_pool = self.pool.get('account.move.line')
partner_pool = self.pool.get('res.partner')
journal_pool = self.pool.get('account.journal')
@@ -404,13 +425,6 @@
if not partner_id:
return default
-
- if not partner_id and ids:
- line_ids = line_pool.search(cr, uid, [('voucher_id', '=', ids[0])])
- if line_ids:
- line_pool.unlink(cr, uid, line_ids)
- return default
-
journal = journal_pool.browse(cr, uid, journal_id)
partner = partner_pool.browse(cr, uid, partner_id)
account_id = False
@@ -463,13 +477,13 @@
if line.debit and line.reconcile_partial_id and ttype == 'payment':
continue
- orignal_amount = line.credit or line.debit or 0.0
+ original_amount = line.credit or line.debit or 0.0
rs = {
'name':line.move_id.name,
'type': line.credit and 'dr' or 'cr',
'move_line_id':line.id,
'account_id':line.account_id.id,
- 'amount_original':currency_pool.compute(cr, uid, company_currency, currency_id, orignal_amount),
+ 'amount_original':currency_pool.compute(cr, uid, company_currency, currency_id, original_amount),
'date_original':line.date,
'date_due':line.date_maturity,
'amount_unreconciled':currency_pool.compute(cr, uid, company_currency, currency_id, line.amount_unreconciled)
@@ -493,6 +507,7 @@
default['value']['pre_line'] = 1
elif ttype == 'receipt' and len(default['value']['line_dr_ids']) > 0:
default['value']['pre_line'] = 1
+ default['value']['writeoff_amount'] = self._compute_writeoff_amount(cr, uid, default['value']['line_dr_ids'], default['value']['line_cr_ids'], price)
return default
@@ -719,16 +734,20 @@
if line.move_line_id.id:
rec_ids = [master_line, line.move_line_id.id]
rec_list_ids.append(rec_ids)
- writeoff_account_id = False
- writeoff_journal_id = False
- writeoff_period_id = inv.period_id.id,
- comment = False
if not currency_pool.is_zero(cr, uid, inv.currency_id, line_total):
diff = line_total
+ account_id = False
+ if inv.payment_option == 'with_writeoff':
+ account_id = inv.writeoff_acc_id.id
+ elif inv.type in ('sale', 'receipt'):
+# if inv.journal_id.type in ('sale','sale_refund', 'cash', 'bank'):
+ account_id = inv.partner_id.property_account_receivable.id
+ else:
+ account_id = inv.partner_id.property_account_payable.id
move_line = {
'name': name,
- 'account_id': False,
+ 'account_id': account_id,
'move_id': move_id,
'partner_id': inv.partner_id.id,
'date': inv.date,
@@ -737,24 +756,8 @@
'amount_currency': company_currency <> current_currency and currency_pool.compute(cr, uid, company_currency, current_currency, diff * -1) or 0.0,
'currency_id': company_currency <> current_currency and current_currency or False,
}
- account_id = False
- if inv.type in ('sale', 'receipt'):
-# if inv.journal_id.type in ('sale','sale_refund', 'cash', 'bank'):
- account_id = inv.partner_id.property_account_receivable.id
- else:
- account_id = inv.partner_id.property_account_payable.id
- move_line['account_id'] = account_id
move_line_pool.create(cr, uid, move_line)
- for rec_ids in rec_list_ids:
- if len(rec_ids) >= 2:
- if inv.payment_option == 'with_writeoff':
- writeoff_account_id = inv.writeoff_acc_id.id
- writeoff_journal_id = inv.writeoff_journal_id.id
- comment = inv.comment
- move_line_pool.reconcile(cr, uid, rec_ids, 'manual', writeoff_account_id, writeoff_period_id, writeoff_journal_id, context)
- else:
- move_line_pool.reconcile_partial(cr, uid, rec_ids)
self.write(cr, uid, [inv.id], {
'move_id': move_id,
@@ -762,6 +765,9 @@
'number': name,
})
move_pool.post(cr, uid, [move_id], context={})
+ for rec_ids in rec_list_ids:
+ if len(rec_ids) >= 2:
+ move_line_pool.reconcile_partial(cr, uid, rec_ids)
return True
def copy(self, cr, uid, id, default={}, context=None):
@@ -813,7 +819,7 @@
'account_id':fields.many2one('account.account','Account', required=True),
'partner_id':fields.related('voucher_id', 'partner_id', type='many2one', relation='res.partner', string='Partner'),
'untax_amount':fields.float('Untax Amount'),
- 'amount':fields.float('Amount', digits=(14,2)),
+ 'amount':fields.float('Amount', digits_compute=dp.get_precision('Account')),
'type':fields.selection([('dr','Debit'),('cr','Credit')], 'Cr/Dr'),
'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account'),
'move_line_id': fields.many2one('account.move.line', 'Journal Item'),
@@ -826,7 +832,6 @@
_defaults = {
'name': ''
}
-
def onchange_move_line_id(self, cr, user, ids, move_line_id, context={}):
"""
Returns a dict that contains new values and context
@@ -949,6 +954,17 @@
res[line.id] = 0.0
return res
+ def _check_amount(self, cr, uid, ids, context=None):
+ for obj in self.browse(cr, uid, ids, context=context):
+ if obj.voucher_id:
+ if not (obj.amount == obj.voucher_id.amount):
+ return False
+ return True
+
+ _constraints = [
+ (_check_amount, 'The amount of the voucher must be the same amount as the one on the statement line', ['amount']),
+ ]
+
_columns = {
'amount_reconciled': fields.function(_amount_reconciled,
string='Amount reconciled', method=True, type='float'),
=== modified file 'account_voucher/account_voucher_report.xml'
--- account_voucher/account_voucher_report.xml 2010-10-15 06:01:40 +0000
+++ account_voucher/account_voucher_report.xml 2010-12-14 03:25:00 +0000
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<openerp>
<data>
- <report id="report_account_voucher"
+ <!-- <report id="report_account_voucher"
string="Voucher"
model="account.voucher"
name="voucher.cash_receipt.drcr"
@@ -9,7 +9,7 @@
groups="base.group_extended"
auto="False"
header = "False"
- menu="True"/>
+ menu="True"/> -->
<report id="report_account_voucher_print"
string="Voucher Print"
=== modified file 'account_voucher/account_voucher_view.xml'
--- account_voucher/account_voucher_view.xml 2010-11-11 05:48:20 +0000
+++ account_voucher/account_voucher_view.xml 2010-12-14 03:25:00 +0000
@@ -70,8 +70,21 @@
<field name="period_id"/>
<field name="audit"/>
</group>
- <separator string="Journal Items" colspan="4"/>
- <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
+ <field name="move_ids" colspan="4" nolabel="1" readonly="1">
+ <tree string="Journal Items">
+ <field name="move_id"/>
+ <field name="ref"/>
+ <field name="date"/>
+ <field name="statement_id"/>
+ <field name="partner_id"/>
+ <field name="account_id"/>
+ <field name="name"/>
+ <field name="debit"/>
+ <field name="credit"/>
+ <field name="state"/>
+ <field name="reconcile_id"/>
+ </tree>
+ </field>
</page>
</notebook>
<group col="10" colspan="4">
=== modified file 'account_voucher/i18n/account_voucher.pot'
--- account_voucher/i18n/account_voucher.pot 2010-12-10 17:40:27 +0000
+++ account_voucher/i18n/account_voucher.pot 2010-12-14 03:25:00 +0000
@@ -416,7 +416,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "supplier Payment"
msgstr ""
#. module: account_voucher
@@ -530,7 +530,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
+msgid "supplier"
msgstr ""
#. module: account_voucher
@@ -662,7 +662,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open supplier Journal Entries"
msgstr ""
#. module: account_voucher
@@ -755,7 +755,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor Invoices and Outstanding transactions"
+msgid "supplier Invoices and Outstanding transactions"
msgstr ""
#. module: account_voucher
=== modified file 'account_voucher/i18n/ar.po'
--- account_voucher/i18n/ar.po 2010-12-11 05:08:50 +0000
+++ account_voucher/i18n/ar.po 2010-12-14 03:25:00 +0000
@@ -430,7 +430,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "supplier Payment"
msgstr ""
#. module: account_voucher
@@ -548,7 +548,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
+msgid "supplier"
msgstr ""
#. module: account_voucher
@@ -680,7 +680,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open supplier Journal Entries"
msgstr ""
#. module: account_voucher
=== modified file 'account_voucher/i18n/bg.po'
--- account_voucher/i18n/bg.po 2010-12-11 05:08:50 +0000
+++ account_voucher/i18n/bg.po 2010-12-14 03:25:00 +0000
@@ -430,7 +430,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "supplier Payment"
msgstr ""
#. module: account_voucher
@@ -548,7 +548,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
+msgid "supplier"
msgstr ""
#. module: account_voucher
@@ -680,7 +680,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open supplier Journal Entries"
msgstr ""
#. module: account_voucher
=== modified file 'account_voucher/i18n/bs.po'
--- account_voucher/i18n/bs.po 2010-12-11 05:08:50 +0000
+++ account_voucher/i18n/bs.po 2010-12-14 03:25:00 +0000
@@ -430,7 +430,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "supplier Payment"
msgstr ""
#. module: account_voucher
@@ -548,7 +548,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
+msgid "supplier"
msgstr ""
#. module: account_voucher
@@ -680,7 +680,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open supplier Journal Entries"
msgstr ""
#. module: account_voucher
=== modified file 'account_voucher/i18n/ca.po'
--- account_voucher/i18n/ca.po 2010-12-11 05:08:50 +0000
+++ account_voucher/i18n/ca.po 2010-12-14 03:25:00 +0000
@@ -430,7 +430,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "supplier Payment"
msgstr ""
#. module: account_voucher
@@ -548,7 +548,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
+msgid "supplier"
msgstr ""
#. module: account_voucher
@@ -680,7 +680,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open supplier Journal Entries"
msgstr ""
#. module: account_voucher
=== modified file 'account_voucher/i18n/cs.po'
--- account_voucher/i18n/cs.po 2010-12-11 05:08:50 +0000
+++ account_voucher/i18n/cs.po 2010-12-14 03:25:00 +0000
@@ -430,7 +430,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "supplier Payment"
msgstr ""
#. module: account_voucher
@@ -548,7 +548,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
+msgid "supplier"
msgstr ""
#. module: account_voucher
@@ -680,7 +680,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open supplier Journal Entries"
msgstr ""
#. module: account_voucher
=== modified file 'account_voucher/i18n/de.po'
--- account_voucher/i18n/de.po 2010-12-11 05:08:50 +0000
+++ account_voucher/i18n/de.po 2010-12-14 03:25:00 +0000
@@ -450,7 +450,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "supplier Payment"
msgstr "Buchen von Auszahlungen"
#. module: account_voucher
@@ -573,7 +573,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
+msgid "supplier"
msgstr "Lieferant"
#. module: account_voucher
@@ -705,7 +705,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open supplier Journal Entries"
msgstr "Offene Posten Lieferanten"
#. module: account_voucher
@@ -798,7 +798,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor Invoices and Outstanding transactions"
+msgid "supplier Invoices and Outstanding transactions"
msgstr "Eingangsrechnungen und andere offene Posten"
#. module: account_voucher
=== modified file 'account_voucher/i18n/el.po'
--- account_voucher/i18n/el.po 2010-12-11 05:08:50 +0000
+++ account_voucher/i18n/el.po 2010-12-14 03:25:00 +0000
@@ -431,7 +431,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "supplier Payment"
msgstr "ΠληÏωμή Πωλητή"
#. module: account_voucher
@@ -549,8 +549,8 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
-msgstr "Πωλητής"
+msgid "Supplier"
+msgstr "Ï€Ïομηθευτής"
#. module: account_voucher
#: view:account.voucher:0
@@ -681,7 +681,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
msgstr ""
#. module: account_voucher
=== modified file 'account_voucher/i18n/es.po'
--- account_voucher/i18n/es.po 2010-12-11 05:08:50 +0000
+++ account_voucher/i18n/es.po 2010-12-14 03:25:00 +0000
@@ -443,8 +443,8 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
-msgstr "Pago del vendedor"
+msgid "Supplier Payment"
+msgstr "Pago del Proveedor"
#. module: account_voucher
#: view:account.invoice:0
@@ -561,8 +561,8 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
-msgstr "Vendedor"
+msgid "Supplier"
+msgstr "Proveedor"
#. module: account_voucher
#: view:account.voucher:0
@@ -693,8 +693,8 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
-msgstr "Abrir entradas diario de vendedores"
+msgid "Open Supplier Journal Entries"
+msgstr "Abrir entradas diario de Proveedors"
#. module: account_voucher
#: field:account.voucher.line,voucher_id:0
@@ -786,8 +786,8 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor Invoices and Outstanding transactions"
-msgstr "Facturas de vendedor y transacciones de salida"
+msgid "Supplier Invoices and Outstanding transactions"
+msgstr "Facturas de Proveedor y transacciones de salida"
#. module: account_voucher
#: field:account.statement.from.invoice,journal_ids:0
=== modified file 'account_voucher/i18n/es_AR.po'
--- account_voucher/i18n/es_AR.po 2010-12-11 05:08:50 +0000
+++ account_voucher/i18n/es_AR.po 2010-12-14 03:25:00 +0000
@@ -430,7 +430,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
msgstr ""
#. module: account_voucher
@@ -548,7 +548,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
msgstr ""
#. module: account_voucher
@@ -680,7 +680,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
msgstr ""
#. module: account_voucher
=== modified file 'account_voucher/i18n/es_EC.po'
--- account_voucher/i18n/es_EC.po 2010-12-11 05:08:50 +0000
+++ account_voucher/i18n/es_EC.po 2010-12-14 03:25:00 +0000
@@ -449,7 +449,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
msgstr "Pago a Proveedor"
#. module: account_voucher
@@ -571,7 +571,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
msgstr "Proveedor"
#. module: account_voucher
@@ -703,7 +703,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
msgstr "Abrir asientos de diario de proveedor"
#. module: account_voucher
@@ -796,7 +796,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor Invoices and Outstanding transactions"
+msgid "Supplier Invoices and Outstanding transactions"
msgstr "Facturas de Proveedor y transacciones pendientes"
#. module: account_voucher
=== modified file 'account_voucher/i18n/et.po'
--- account_voucher/i18n/et.po 2010-12-11 05:08:50 +0000
+++ account_voucher/i18n/et.po 2010-12-14 03:25:00 +0000
@@ -445,7 +445,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
msgstr ""
#. module: account_voucher
@@ -563,7 +563,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
msgstr ""
#. module: account_voucher
@@ -695,7 +695,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
msgstr ""
#. module: account_voucher
=== modified file 'account_voucher/i18n/fr.po'
--- account_voucher/i18n/fr.po 2010-12-11 05:08:50 +0000
+++ account_voucher/i18n/fr.po 2010-12-14 03:25:00 +0000
@@ -431,7 +431,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
msgstr ""
#. module: account_voucher
@@ -549,7 +549,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
msgstr ""
#. module: account_voucher
@@ -681,7 +681,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
msgstr ""
#. module: account_voucher
@@ -774,7 +774,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor Invoices and Outstanding transactions"
+msgid "Supplier Invoices and Outstanding transactions"
msgstr ""
#. module: account_voucher
=== modified file 'account_voucher/i18n/hr.po'
--- account_voucher/i18n/hr.po 2010-12-11 05:08:50 +0000
+++ account_voucher/i18n/hr.po 2010-12-14 03:25:00 +0000
@@ -430,7 +430,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
msgstr ""
#. module: account_voucher
@@ -548,7 +548,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
msgstr ""
#. module: account_voucher
@@ -680,7 +680,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
msgstr ""
#. module: account_voucher
=== modified file 'account_voucher/i18n/hu.po'
--- account_voucher/i18n/hu.po 2010-12-11 05:08:50 +0000
+++ account_voucher/i18n/hu.po 2010-12-14 03:25:00 +0000
@@ -430,7 +430,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
msgstr ""
#. module: account_voucher
@@ -548,7 +548,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
msgstr ""
#. module: account_voucher
@@ -680,7 +680,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
msgstr ""
#. module: account_voucher
=== modified file 'account_voucher/i18n/id.po'
--- account_voucher/i18n/id.po 2010-12-11 05:08:50 +0000
+++ account_voucher/i18n/id.po 2010-12-14 03:25:00 +0000
@@ -430,7 +430,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
msgstr ""
#. module: account_voucher
@@ -548,7 +548,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
msgstr ""
#. module: account_voucher
@@ -680,7 +680,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
msgstr ""
#. module: account_voucher
=== modified file 'account_voucher/i18n/it.po'
--- account_voucher/i18n/it.po 2010-12-11 05:08:50 +0000
+++ account_voucher/i18n/it.po 2010-12-14 03:25:00 +0000
@@ -431,7 +431,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
msgstr "Pagamenti fornitori"
#. module: account_voucher
@@ -549,7 +549,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
msgstr ""
#. module: account_voucher
@@ -681,7 +681,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
msgstr ""
#. module: account_voucher
=== modified file 'account_voucher/i18n/ko.po'
--- account_voucher/i18n/ko.po 2010-12-11 05:08:50 +0000
+++ account_voucher/i18n/ko.po 2010-12-14 03:25:00 +0000
@@ -431,7 +431,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
msgstr ""
#. module: account_voucher
@@ -549,7 +549,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
msgstr ""
#. module: account_voucher
@@ -681,7 +681,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
msgstr ""
#. module: account_voucher
=== modified file 'account_voucher/i18n/lt.po'
--- account_voucher/i18n/lt.po 2010-12-12 04:45:47 +0000
+++ account_voucher/i18n/lt.po 2010-12-14 03:25:00 +0000
@@ -430,7 +430,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
msgstr ""
#. module: account_voucher
@@ -548,7 +548,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
msgstr ""
#. module: account_voucher
@@ -680,7 +680,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
msgstr ""
#. module: account_voucher
=== modified file 'account_voucher/i18n/nl.po'
--- account_voucher/i18n/nl.po 2010-12-11 05:08:50 +0000
+++ account_voucher/i18n/nl.po 2010-12-14 03:25:00 +0000
@@ -430,7 +430,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
msgstr ""
#. module: account_voucher
@@ -548,7 +548,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
msgstr ""
#. module: account_voucher
@@ -680,7 +680,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
msgstr ""
#. module: account_voucher
=== modified file 'account_voucher/i18n/nl_BE.po'
--- account_voucher/i18n/nl_BE.po 2010-12-11 05:08:50 +0000
+++ account_voucher/i18n/nl_BE.po 2010-12-14 03:25:00 +0000
@@ -430,7 +430,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
msgstr ""
#. module: account_voucher
@@ -548,7 +548,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
msgstr ""
#. module: account_voucher
@@ -680,7 +680,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
msgstr ""
#. module: account_voucher
=== modified file 'account_voucher/i18n/oc.po'
--- account_voucher/i18n/oc.po 2010-12-11 05:08:50 +0000
+++ account_voucher/i18n/oc.po 2010-12-14 03:25:00 +0000
@@ -431,7 +431,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
msgstr ""
#. module: account_voucher
@@ -549,7 +549,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
msgstr ""
#. module: account_voucher
@@ -681,7 +681,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
msgstr ""
#. module: account_voucher
=== modified file 'account_voucher/i18n/pl.po'
--- account_voucher/i18n/pl.po 2010-12-11 05:08:50 +0000
+++ account_voucher/i18n/pl.po 2010-12-14 03:25:00 +0000
@@ -430,7 +430,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
msgstr ""
#. module: account_voucher
@@ -548,7 +548,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
msgstr ""
#. module: account_voucher
@@ -680,7 +680,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
msgstr ""
#. module: account_voucher
=== modified file 'account_voucher/i18n/pt.po'
--- account_voucher/i18n/pt.po 2010-12-12 04:45:47 +0000
+++ account_voucher/i18n/pt.po 2010-12-14 03:25:00 +0000
@@ -430,7 +430,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
msgstr ""
#. module: account_voucher
@@ -548,8 +548,8 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
-msgstr "Vendedor"
+msgid "Supplier"
+msgstr ""
#. module: account_voucher
#: view:account.voucher:0
@@ -680,7 +680,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
msgstr ""
#. module: account_voucher
@@ -871,6 +871,11 @@
msgstr ""
#. module: account_voucher
+#: view:account.voucher:0
+msgid "Supplier Invoices and Outstanding transactions"
+msgstr ""
+
+#. module: account_voucher
#: field:account.voucher.line,untax_amount:0
msgid "Untax Amount"
msgstr ""
=== modified file 'account_voucher/i18n/pt_BR.po'
--- account_voucher/i18n/pt_BR.po 2010-12-11 05:08:50 +0000
+++ account_voucher/i18n/pt_BR.po 2010-12-14 03:25:00 +0000
@@ -430,7 +430,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
msgstr ""
#. module: account_voucher
@@ -548,7 +548,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
msgstr ""
#. module: account_voucher
@@ -680,7 +680,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
msgstr ""
#. module: account_voucher
=== modified file 'account_voucher/i18n/ro.po'
--- account_voucher/i18n/ro.po 2010-12-11 05:08:50 +0000
+++ account_voucher/i18n/ro.po 2010-12-14 03:25:00 +0000
@@ -430,7 +430,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
msgstr ""
#. module: account_voucher
@@ -548,7 +548,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
msgstr ""
#. module: account_voucher
@@ -680,7 +680,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
msgstr ""
#. module: account_voucher
=== modified file 'account_voucher/i18n/ru.po'
--- account_voucher/i18n/ru.po 2010-12-12 04:45:47 +0000
+++ account_voucher/i18n/ru.po 2010-12-14 03:25:00 +0000
@@ -430,7 +430,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
msgstr ""
#. module: account_voucher
@@ -548,7 +548,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
msgstr ""
#. module: account_voucher
@@ -680,7 +680,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
msgstr ""
#. module: account_voucher
@@ -773,7 +773,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor Invoices and Outstanding transactions"
+msgid "Supplier Invoices and Outstanding transactions"
msgstr ""
#. module: account_voucher
=== modified file 'account_voucher/i18n/sl.po'
--- account_voucher/i18n/sl.po 2010-12-11 05:08:50 +0000
+++ account_voucher/i18n/sl.po 2010-12-14 03:25:00 +0000
@@ -430,7 +430,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
msgstr ""
#. module: account_voucher
@@ -548,7 +548,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
msgstr ""
#. module: account_voucher
@@ -680,7 +680,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
msgstr ""
#. module: account_voucher
=== modified file 'account_voucher/i18n/sq.po'
--- account_voucher/i18n/sq.po 2010-12-11 05:08:50 +0000
+++ account_voucher/i18n/sq.po 2010-12-14 03:25:00 +0000
@@ -431,7 +431,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
msgstr ""
#. module: account_voucher
@@ -549,7 +549,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
msgstr ""
#. module: account_voucher
@@ -681,7 +681,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
msgstr ""
#. module: account_voucher
=== modified file 'account_voucher/i18n/sr.po'
--- account_voucher/i18n/sr.po 2010-12-11 05:08:50 +0000
+++ account_voucher/i18n/sr.po 2010-12-14 03:25:00 +0000
@@ -437,7 +437,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
msgstr "Placanja Proizvodjaca"
#. module: account_voucher
@@ -555,7 +555,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
msgstr "proizvoÄ‘aÄ"
#. module: account_voucher
@@ -687,7 +687,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
msgstr "Otvori Dnevnik Proizvodjaca"
#. module: account_voucher
=== modified file 'account_voucher/i18n/sr@xxxxxxxx'
--- account_voucher/i18n/sr@xxxxxxxx 2010-12-11 05:08:50 +0000
+++ account_voucher/i18n/sr@xxxxxxxx 2010-12-14 03:25:00 +0000
@@ -549,8 +549,8 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
-msgstr ""
+msgid "Supplier"
+msgstr "proizvoÄ‘aÄ"
#. module: account_voucher
#: view:account.voucher:0
@@ -681,8 +681,8 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
-msgstr ""
+msgid "Open Supplier Journal Entries"
+msgstr "Otvori Dnevnik Proizvodjaca"
#. module: account_voucher
#: field:account.voucher.line,voucher_id:0
=== modified file 'account_voucher/i18n/sv.po'
--- account_voucher/i18n/sv.po 2010-12-11 05:08:50 +0000
+++ account_voucher/i18n/sv.po 2010-12-14 03:25:00 +0000
@@ -430,7 +430,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
msgstr ""
#. module: account_voucher
@@ -548,7 +548,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
msgstr ""
#. module: account_voucher
@@ -680,7 +680,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
msgstr ""
#. module: account_voucher
@@ -773,7 +773,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor Invoices and Outstanding transactions"
+msgid "Supplier Invoices and Outstanding transactions"
msgstr ""
#. module: account_voucher
=== modified file 'account_voucher/i18n/tlh.po'
--- account_voucher/i18n/tlh.po 2010-12-11 05:08:50 +0000
+++ account_voucher/i18n/tlh.po 2010-12-14 03:25:00 +0000
@@ -430,7 +430,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
msgstr ""
#. module: account_voucher
@@ -548,7 +548,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
msgstr ""
#. module: account_voucher
@@ -680,7 +680,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
msgstr ""
#. module: account_voucher
=== modified file 'account_voucher/i18n/tr.po'
--- account_voucher/i18n/tr.po 2010-12-11 05:08:50 +0000
+++ account_voucher/i18n/tr.po 2010-12-14 03:25:00 +0000
@@ -430,7 +430,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
msgstr ""
#. module: account_voucher
@@ -548,7 +548,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
msgstr ""
#. module: account_voucher
@@ -680,7 +680,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
msgstr ""
#. module: account_voucher
=== modified file 'account_voucher/i18n/uk.po'
--- account_voucher/i18n/uk.po 2010-12-11 05:08:50 +0000
+++ account_voucher/i18n/uk.po 2010-12-14 03:25:00 +0000
@@ -430,7 +430,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
msgstr ""
#. module: account_voucher
@@ -548,7 +548,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
msgstr ""
#. module: account_voucher
@@ -680,7 +680,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
msgstr ""
#. module: account_voucher
=== modified file 'account_voucher/i18n/vi.po'
--- account_voucher/i18n/vi.po 2010-12-11 05:08:50 +0000
+++ account_voucher/i18n/vi.po 2010-12-14 03:25:00 +0000
@@ -431,7 +431,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
msgstr ""
#. module: account_voucher
@@ -549,7 +549,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
msgstr ""
#. module: account_voucher
@@ -681,7 +681,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
msgstr ""
#. module: account_voucher
=== modified file 'account_voucher/i18n/zh_CN.po'
--- account_voucher/i18n/zh_CN.po 2010-12-11 05:08:50 +0000
+++ account_voucher/i18n/zh_CN.po 2010-12-14 03:25:00 +0000
@@ -430,7 +430,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
msgstr ""
#. module: account_voucher
@@ -548,7 +548,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
msgstr ""
#. module: account_voucher
@@ -680,7 +680,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
msgstr ""
#. module: account_voucher
=== modified file 'account_voucher/i18n/zh_TW.po'
--- account_voucher/i18n/zh_TW.po 2010-12-11 05:08:50 +0000
+++ account_voucher/i18n/zh_TW.po 2010-12-14 03:25:00 +0000
@@ -430,7 +430,7 @@
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Vendor Payment"
+msgid "Supplier Payment"
msgstr ""
#. module: account_voucher
@@ -548,7 +548,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Vendor"
+msgid "Supplier"
msgstr ""
#. module: account_voucher
@@ -680,7 +680,7 @@
#. module: account_voucher
#: view:account.voucher:0
-msgid "Open Vendor Journal Entries"
+msgid "Open Supplier Journal Entries"
msgstr ""
#. module: account_voucher
=== modified file 'account_voucher/report/account_voucher_print.rml'
--- account_voucher/report/account_voucher_print.rml 2010-11-15 08:43:20 +0000
+++ account_voucher/report/account_voucher_print.rml 2010-12-14 03:25:00 +0000
@@ -327,56 +327,5 @@
</td>
</tr>
</blockTable>
- <para style="terp_default_1">
- <font color="white"> </font>
- </para>
- <blockTable colWidths="154.0,108.0,118.0,144.0" style="Table5">
- <tr>
- <td>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
- </td>
- </tr>
- <tr>
- <td>
- <para style="terp_default_9">Receiver's Signature</para>
- </td>
- <td>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_default_Right_9">Authorised Signatory</para>
- </td>
- </tr>
- </blockTable>
- <para style="P1">
- <font color="white"> </font>
- </para>
</story>
</document>
=== modified file 'account_voucher/report/account_voucher_print.sxw'
Binary files account_voucher/report/account_voucher_print.sxw 2010-10-15 13:02:29 +0000 and account_voucher/report/account_voucher_print.sxw 2010-12-14 03:25:00 +0000 differ
=== modified file 'account_voucher/voucher_payment_receipt_view.xml'
--- account_voucher/voucher_payment_receipt_view.xml 2010-11-24 10:18:29 +0000
+++ account_voucher/voucher_payment_receipt_view.xml 2010-12-14 03:25:00 +0000
@@ -88,7 +88,7 @@
<field name="arch" type="xml">
<form string="Bill Payment">
<group col="6" colspan="4">
- <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)" context="{'invoice_currency':currency_id}" string="Vendor"/>
+ <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)" context="{'invoice_currency':currency_id}" string="Supplier"/>
<field name="journal_id"
domain="[('type','in',['bank', 'cash'])]"
widget="selection" select="1"
@@ -105,8 +105,8 @@
</group>
<notebook colspan="4">
<page string="Payment Information">
- <field name="line_dr_ids" attrs="{'invisible': [('type', '=', 'receipt')]}" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140">
- <tree string="Open Vendor Journal Entries" editable="bottom">
+ <field name="line_dr_ids" attrs="{'invisible': [('type', '=', 'receipt')]}" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount)">
+ <tree string="Open Supplier Journal Entries" editable="bottom">
<field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
on_change="onchange_move_line_id(move_line_id)"
domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
@@ -119,7 +119,7 @@
<field name="amount" sum="Payment"/>
</tree>
</field>
- <field name="line_cr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('type', '=', 'payment')]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}">
+ <field name="line_cr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('type', '=', 'payment')]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount)">
<tree string="Open Customer Journal Entries" editable="bottom">
<field name="move_line_id"/>
<field name="account_id" groups="base.group_extended" domain="[('type','=','receivable')]"/>
@@ -151,7 +151,7 @@
<field name="arch" type="xml">
<form string="Bill Payment">
<group col="6" colspan="4">
- <field name="partner_id" domain="[('supplier','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)" context="{'invoice_currency':currency_id}" string="Vendor"/>
+ <field name="partner_id" domain="[('supplier','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)" context="{'invoice_currency':currency_id}" string="Supplier"/>
<field name="journal_id"
domain="[('type','in',['bank', 'cash'])]"
widget="selection" select="1"
@@ -169,7 +169,7 @@
<notebook colspan="4">
<page string="Payment Information">
<field name="line_dr_ids" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140">
- <tree string="Vendor Invoices and Outstanding transactions" editable="bottom">
+ <tree string="Supplier Invoices and Outstanding transactions" editable="bottom">
<field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
on_change="onchange_move_line_id(move_line_id)"
domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
@@ -198,22 +198,18 @@
<group col="2" colspan="1">
<group col="2" colspan="1">
<separator string="Payment Options" colspan="2"/>
+ <field name="writeoff_amount"
+ attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
<field name="payment_option" required="1"/>
- <field name="writeoff_amount"
- attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
<field name="writeoff_acc_id"
attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
- domain="[('type','=','liquidity')]"/>
- <!-- should select income accounts only. Or use the journal for this ? -->
- <field name="writeoff_journal_id"
- attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"/>
+ domain="[('type','=','other')]"/>
<field name="comment"
attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
<field name="analytic_id"
attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"
groups="analytic.group_analytic_accounting"/>
</group>
- <separator string="Other Information" colspan="2"/>
<group col="4" colspan="1">
<field name="date" select="1" on_change="onchange_date(date)"/>
<field name="currency_id" invisible="True"/>
@@ -227,8 +223,21 @@
<field name="period_id"/>
<field name="audit"/>
</group>
- <separator string="Journal Items" colspan="4"/>
- <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
+ <field name="move_ids" colspan="4" nolabel="1" readonly="1">
+ <tree string="Journal Items">
+ <field name="move_id"/>
+ <field name="ref"/>
+ <field name="date"/>
+ <field name="statement_id"/>
+ <field name="partner_id"/>
+ <field name="account_id"/>
+ <field name="name"/>
+ <field name="debit"/>
+ <field name="credit"/>
+ <field name="state"/>
+ <field name="reconcile_id"/>
+ </tree>
+ </field>
</page>
</notebook>
<group col="10" colspan="4">
@@ -243,7 +252,7 @@
</record>
<record id="action_vendor_payment" model="ir.actions.act_window">
- <field name="name">Vendor Payment</field>
+ <field name="name">Supplier Payment</field>
<field name="res_model">account.voucher</field>
<field name="view_type">form</field>
<field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','payment')]</field>
@@ -295,7 +304,7 @@
</group>
<notebook colspan="4">
<page string="Payment Information">
- <field name="line_cr_ids" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140">
+ <field name="line_cr_ids" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount)">
<tree string="Invoices and outstanding transactions" editable="bottom">
<field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
on_change="onchange_move_line_id(move_line_id)"
@@ -309,7 +318,7 @@
<field name="amount" sum="Payment"/>
</tree>
</field>
- <field name="line_dr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}">
+ <field name="line_dr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount)">
<tree string="Credits" editable="bottom">
<field name="move_line_id"/>
<field name="account_id" groups="base.group_extended" domain="[('type','=','receivable')]"/>
@@ -330,10 +339,7 @@
attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
<field name="writeoff_acc_id"
attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
- domain="[('type','=','liquidity')]"/>
- <!-- should select income accounts only. Or use the journal for this ? -->
- <field name="writeoff_journal_id"
- attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"/>
+ domain="[('type','=','other')]"/>
<field name="comment"
attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
<field name="analytic_id"
@@ -354,8 +360,21 @@
<field name="period_id"/>
<field name="audit"/>
</group>
- <separator string="Journal Items" colspan="4"/>
- <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
+ <field name="move_ids" colspan="4" nolabel="1" readonly="1">
+ <tree string="Journal Items">
+ <field name="move_id"/>
+ <field name="ref"/>
+ <field name="date"/>
+ <field name="statement_id"/>
+ <field name="partner_id"/>
+ <field name="account_id"/>
+ <field name="name"/>
+ <field name="debit"/>
+ <field name="credit"/>
+ <field name="state"/>
+ <field name="reconcile_id"/>
+ </tree>
+ </field>
</page>
</notebook>
<group col="10" colspan="4">
=== modified file 'account_voucher/voucher_sales_purchase_view.xml'
--- account_voucher/voucher_sales_purchase_view.xml 2010-10-27 11:08:06 +0000
+++ account_voucher/voucher_sales_purchase_view.xml 2010-12-14 03:25:00 +0000
@@ -86,7 +86,7 @@
<field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt'), ('partner_id','=',partner_id)]</field>
<field name="context">{'type':'receipt', 'partner_id': partner_id, 'default_reference':reference}</field>
<field name="view_id" ref="view_vendor_receipt_form"/>
- <field name="target">new</field>
+ <field name="target">current</field>
</record>
<record model="ir.ui.view" id="view_sale_receipt_form">
@@ -133,7 +133,7 @@
</group>
<group col="4" colspan="1">
<separator string="Total" colspan="4"/>
- <field name="tax_id" on_change="onchange_price(line_cr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('sale','all'))]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" groups="base.group_extended" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
+ <field name="tax_id" on_change="onchange_price(line_cr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" groups="base.group_extended" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
<label string="" colspan="1"/><field name="amount" string="Total"/>
</group>
</group>
@@ -144,8 +144,21 @@
<field name="period_id"/>
<field name="audit"/>
</group>
- <separator string="Journal Items" colspan="4"/>
- <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
+ <field name="move_ids" colspan="4" nolabel="1" readonly="1">
+ <tree string="Journal Items">
+ <field name="move_id"/>
+ <field name="ref"/>
+ <field name="date"/>
+ <field name="statement_id"/>
+ <field name="partner_id"/>
+ <field name="account_id"/>
+ <field name="name"/>
+ <field name="debit"/>
+ <field name="credit"/>
+ <field name="state"/>
+ <field name="reconcile_id"/>
+ </tree>
+ </field>
</page>
</notebook>
<group col="8" colspan="4">
@@ -154,7 +167,7 @@
<button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
<button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
<group attrs="{'invisible':[('state','!=','posted')]}">
- <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay" attrs="{'invisible':[('pay_now','!=','pay_now')]}"/>
+ <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':[('pay_now','!=','pay_now')]}"/>
</group>
<button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
</group>
@@ -200,7 +213,7 @@
<field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','payment'), ('partner_id','=',partner_id)]</field>
<field name="context">{'type':'payment', 'partner_id': partner_id, 'default_reference':reference}</field>
<field name="view_id" ref="view_vendor_payment_form"/>
- <field name="target">new</field>
+ <field name="target">current</field>
</record>
<record model="ir.ui.view" id="view_purchase_receipt_form">
<field name="name">account.voucher.purchase.form</field>
@@ -240,7 +253,7 @@
</group>
<group col="4" colspan="1">
<separator string="Total" colspan="4"/>
- <field name="tax_id" on_change="onchange_price(line_dr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('purchase','all'))]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" groups="base.group_extended" attrs="{'invisible': [('state','!=','draft')]}"/>
+ <field name="tax_id" on_change="onchange_price(line_dr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('purchase','all')), ('parent_id', '=', False)]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" groups="base.group_extended" attrs="{'invisible': [('state','!=','draft')]}"/>
<label string="" colspan="1"/><field name="amount" string="Total"/>
</group>
</group>
@@ -251,15 +264,30 @@
<field name="period_id"/>
<field name="audit"/>
</group>
- <separator string="Journal Items" colspan="4"/>
- <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
+ <field name="move_ids" colspan="4" nolabel="1" readonly="1">
+ <tree string="Journal Items">
+ <field name="move_id"/>
+ <field name="ref"/>
+ <field name="date"/>
+ <field name="statement_id"/>
+ <field name="partner_id"/>
+ <field name="account_id"/>
+ <field name="name"/>
+ <field name="debit"/>
+ <field name="credit"/>
+ <field name="state"/>
+ <field name="reconcile_id"/>
+ </tree>
+ </field>
</page>
</notebook>
<group col="10" colspan="4">
<field name="state"/>
<button name="cancel_voucher" string="Cancel" states="draft,proforma" icon="gtk-cancel"/>
<button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
- <button icon="terp-dolar_ok!" name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':[('pay_now','!=','pay_now'), ('state','!=','posted')]}"/>
+ <group attrs="{'invisible':[('state','!=','posted')]}">
+ <button icon="terp-dolar_ok!" name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':[('pay_now','!=','pay_now')]}"/>
+ </group>
<button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
<button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
</group>
=== modified file 'account_voucher/wizard/account_statement_from_invoice_view.xml'
--- account_voucher/wizard/account_statement_from_invoice_view.xml 2010-10-06 05:20:59 +0000
+++ account_voucher/wizard/account_statement_from_invoice_view.xml 2010-12-14 03:25:00 +0000
@@ -38,7 +38,7 @@
<form string="Import Entries">
<group colspan="4" expand="1">
<separator string="Payable and Receivables" colspan="4"/>
- <field height="300" width="700" name="line_ids" colspan="4" nolabel="1" domain="[('account_id.type','in',['receivable','payable']),('reconcile_id','=',False), ('reconcile_partial_id','=',False)]"/>
+ <field height="300" width="700" name="line_ids" colspan="4" nolabel="1" domain="[('account_id.type','in',['receivable','payable']),('reconcile_id','=',False), ('reconcile_partial_id','=',False), ('state', '=', 'valid')]"/>
</group>
<group colspan="4" col="6">
<label string ="" colspan="2"/>
=== modified file 'analytic/analytic.py'
--- analytic/analytic.py 2010-11-27 20:15:32 +0000
+++ analytic/analytic.py 2010-12-14 03:25:00 +0000
@@ -206,7 +206,7 @@
'date': fields.date('Date', required=True, select=1),
'amount': fields.float('Amount', required=True, help='Calculated by multiplying the quantity and the price given in the Product\'s cost price. Always expressed in the company main currency.', digits_compute=dp.get_precision('Account')),
'unit_amount': fields.float('Quantity', help='Specifies the amount of quantity to count.'),
- 'account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, ondelete='cascade', select=True),
+ 'account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, ondelete='cascade', select=True, domain=[('type','<>','view')]),
'user_id': fields.many2one('res.users', 'User'),
'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
=== modified file 'base_vat/base_vat.py'
--- base_vat/base_vat.py 2010-11-10 08:12:44 +0000
+++ base_vat/base_vat.py 2010-12-14 03:25:00 +0000
@@ -75,7 +75,7 @@
'vat_subjected': fields.boolean('VAT Legal Statement', help="Check this box if the partner is subjected to the VAT. It will be used for the VAT legal statement.")
}
- def _construct_constraint_msg(self, cr, uid, ids):
+ def _construct_constraint_msg(self, cr, uid, ids, context=None):
def default_vat_check(cn, vn):
# by default, a VAT number is valid if:
# it starts with 2 letters
@@ -1028,7 +1028,7 @@
if len(vat) not in(9, 10):
return False
- if int(vat[0:2]) == 0 and len(vat) == 10:
+ if int(vat[0:2]) in (0, 10, 20) and len(vat) == 10:
return True
if len(vat) == 10:
=== modified file 'crm/crm.py'
--- crm/crm.py 2010-12-13 09:39:59 +0000
+++ crm/crm.py 2010-12-14 03:25:00 +0000
@@ -532,7 +532,7 @@
'reply_to': fields.char('Reply-To', size=64, help="The email address put in the 'Reply-To' of all emails sent by OpenERP about cases in this sales team"),
'parent_id': fields.many2one('crm.case.section', 'Parent Team'),
'child_ids': fields.one2many('crm.case.section', 'parent_id', 'Child Teams'),
- 'resource_calendar_id': fields.many2one('resource.calendar', "Resource's Calendar"),
+ 'resource_calendar_id': fields.many2one('resource.calendar', "Working Time"),
'note': fields.text('Description'),
'working_hours': fields.float('Working Hours', digits=(16,2 )),
'stage_ids': fields.many2many('crm.case.stage', 'section_stage_rel', 'section_id', 'stage_id', 'Stages'),
=== modified file 'delivery/sale.py'
--- delivery/sale.py 2010-08-04 06:22:18 +0000
+++ delivery/sale.py 2010-12-14 03:25:00 +0000
@@ -26,7 +26,7 @@
class sale_order(osv.osv):
_inherit = 'sale.order'
_columns = {
- 'carrier_id':fields.many2one("delivery.carrier","Delivery method", help="Complete this field if you plan to invoice the shipping based on picking."),
+ 'carrier_id':fields.many2one("delivery.carrier", "Delivery Method", help="Complete this field if you plan to invoice the shipping based on picking."),
'id': fields.integer('ID', readonly=True,invisible=True),
}
=== modified file 'hr/hr.py'
--- hr/hr.py 2010-11-26 11:43:42 +0000
+++ hr/hr.py 2010-12-14 03:25:00 +0000
@@ -149,8 +149,8 @@
'address_home_id': fields.many2one('res.partner.address', 'Home Address'),
'partner_id': fields.related('address_home_id', 'partner_id', type='many2one', relation='res.partner', readonly=True, help="Partner that is related to the current employee. Accounting transaction will be written on this partner belongs to employee."),
'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account', domain="[('partner_id','=',partner_id)]", help="Employee bank salary account"),
- 'work_phone': fields.related('address_id', 'phone', type='char', size=32, string='Work Phone', readonly=True),
- 'work_email': fields.related('address_id', 'email', type='char', size=240, string='Work E-mail'),
+ 'work_phone': fields.char('Work Phone', size=32, readonly=False),
+ 'work_email': fields.char('Work E-mail', size=240),
'work_location': fields.char('Office Location', size=32),
'notes': fields.text('Notes'),
'parent_id': fields.related('department_id', 'manager_id', relation='hr.employee', string='Manager', type='many2one', store=True, select=True, readonly=True, help="It is linked with manager of Department"),
@@ -160,9 +160,15 @@
'coach_id': fields.many2one('hr.employee', 'Coach'),
'job_id': fields.many2one('hr.job', 'Job'),
'photo': fields.binary('Photo'),
- 'passport_id':fields.char('Passport', size=64)
+ 'passport_id':fields.char('Passport No', size=64)
}
+ def onchange_address_id(self, cr, uid, ids, address, context=None):
+ if address:
+ address = self.pool.get('res.partner.address').browse(cr, uid, address, context=context)
+ return {'value': {'work_email': address.email, 'work_phone': address.phone}}
+ return {'value': {}}
+
def onchange_company(self, cr, uid, ids, company, context=None):
address_id = False
if company:
=== modified file 'hr/hr_view.xml'
--- hr/hr_view.xml 2010-11-26 16:13:59 +0000
+++ hr/hr_view.xml 2010-12-14 03:25:00 +0000
@@ -56,7 +56,7 @@
<separator string="Contact Information" colspan="2"/>
<field name="address_home_id" colspan="2"/>
<field name="partner_id" invisible="1" />
- <field name="address_id" colspan="2" domain="[('partner_id', '=', partner_id)]"/>
+ <field name="address_id" colspan="2" on_change="onchange_address_id(address_id)" domain="[('partner_id', '=', partner_id)]"/>
<field name="work_phone"/>
<field name="work_email" widget="email" />
<field name="work_location"/>
@@ -340,7 +340,7 @@
<field name="requirements" colspan="4" nolabel="1"/>
</page>
<page string="Employee">
- <field name="employee_ids" colspan='4' nolabel="1" mode="tree,form"/>
+ <field name="employee_ids" colspan='4' nolabel="1" widget="many2many" mode="tree,form"/>
</page>
</notebook>
<group col="6" colspan="4">
=== modified file 'hr_evaluation/hr_evaluation.py'
--- hr_evaluation/hr_evaluation.py 2010-10-29 13:06:59 +0000
+++ hr_evaluation/hr_evaluation.py 2010-12-14 03:25:00 +0000
@@ -34,8 +34,8 @@
'name': fields.char("Evaluation Plan", size=64, required=True),
'company_id': fields.many2one('res.company', 'Company', required=True),
'phase_ids': fields.one2many('hr_evaluation.plan.phase', 'plan_id', 'Evaluation Phases'),
- 'month_first': fields.integer('Next Evaluation After'),
- 'month_next': fields.integer('After the Date of Start'),
+ 'month_first': fields.integer('First Evaluation in (months)', help="This number of months will be used to schedule the first evaluation date of the employee when selecting an evaluation plan. "),
+ 'month_next': fields.integer('Periodicity of Evaluations (months)', help="The number of month that depicts the delay between each evaluation of this plan (after the first one)."),
'active': fields.boolean('Active')
}
_defaults = {
@@ -101,7 +101,7 @@
_inherit="hr.employee"
_columns = {
'evaluation_plan_id': fields.many2one('hr_evaluation.plan', 'Evaluation Plan'),
- 'evaluation_date': fields.date('Next Evaluation', help="Date of the next evaluation"),
+ 'evaluation_date': fields.date('Next Evaluation Date', help="The date of the next evaluation is computed by the evaluation plan's dates (first evaluation + periodicity)."),
}
def run_employee_evaluation(self, cr, uid, automatic=False, use_new_cursor=False, context=None):
=== modified file 'hr_expense/hr_expense.py'
--- hr_expense/hr_expense.py 2010-11-04 12:42:42 +0000
+++ hr_expense/hr_expense.py 2010-12-14 03:25:00 +0000
@@ -158,23 +158,23 @@
'invoice_line_tax_id': tax_id and [(6, 0, tax_id)] or False,
'account_analytic_id': l.analytic_account.id,
}))
- if not exp.employee_id.address_id:
- raise osv.except_osv(_('Error !'), _('The employee must have a working address'))
- acc = exp.employee_id.address_id.partner_id.property_account_payable.id
- payment_term_id = exp.employee_id.address_id.partner_id.property_payment_term.id
+ if not exp.employee_id.address_home_id:
+ raise osv.except_osv(_('Error !'), _('The employee must have a Home address'))
+ acc = exp.employee_id.address_home_id.partner_id.property_account_payable.id
+ payment_term_id = exp.employee_id.address_home_id.partner_id.property_payment_term.id
inv = {
'name': exp.name,
'reference': sequence_obj.get(cr, uid, 'hr.expense.invoice'),
'account_id': acc,
'type': 'in_invoice',
- 'partner_id': exp.employee_id.address_id.partner_id.id,
- 'address_invoice_id': exp.employee_id.address_id.id,
- 'address_contact_id': exp.employee_id.address_id.id,
+ 'partner_id': exp.employee_id.address_home_id.partner_id.id,
+ 'address_invoice_id': exp.employee_id.address_home_id.id,
+ 'address_contact_id': exp.employee_id.address_home_id.id,
'origin': exp.name,
'invoice_line': lines,
'currency_id': exp.currency_id.id,
'payment_term': payment_term_id,
- 'fiscal_position': exp.employee_id.address_id.partner_id.property_account_position.id
+ 'fiscal_position': exp.employee_id.address_home_id.partner_id.property_account_position.id
}
if payment_term_id:
to_update = invoice_obj.onchange_payment_term_date_invoice(cr, uid, [], payment_term_id, None)
=== modified file 'hr_holidays/hr_holidays.py'
--- hr_holidays/hr_holidays.py 2010-11-19 12:20:03 +0000
+++ hr_holidays/hr_holidays.py 2010-12-14 03:25:00 +0000
@@ -163,7 +163,9 @@
'department_id':fields.related('employee_id', 'department_id', string='Department', type='many2one', relation='hr.department', readonly=True, store=True),
'category_id': fields.many2one('hr.employee.category', "Category", help='Category Of employee'),
'holiday_type': fields.selection([('employee','By Employee'),('category','By Employee Category')], 'Allocation Type', help='By Employee: Allocation/Request for individual Employee, By Employee Category: Allocation/Request for group of employees in category', required=True),
- 'manager_id2': fields.many2one('hr.employee', 'Second Approval', readonly=True, help='This area is automaticly filled by the user who validate the leave with second level (If Leave type need second validation)')
+ 'manager_id2': fields.many2one('hr.employee', 'Second Approval', readonly=True, help='This area is automaticly filled by the user who validate the leave with second level (If Leave type need second validation)'),
+ # Todo: Add below field in view?
+ 'category_holiday_id': fields.many2one('hr.holidays', 'Holiday', help='For allocation By Employee Category (Link between Employee Category holiday and related holidays for employees of that category)')
}
_defaults = {
@@ -175,6 +177,14 @@
'holiday_type': 'employee'
}
+ def _get_category_leave_ids(self, cr, uid, ids):
+ """Returns the leaves taken by the employees of the category if holiday type is 'category'."""
+ leave_ids = []
+ for record in self.browse(cr, uid, ids):
+ if record.holiday_type == 'category' and record.type == 'remove':
+ leave_ids += self.search(cr, uid, [('category_holiday_id', '=', record.id)])
+ return leave_ids
+
def _create_resource_leave(self, cr, uid, vals, context=None):
'''This method will create entry in resource calendar leave object at the time of holidays validated '''
if context is None:
@@ -263,6 +273,7 @@
if context is None:
context = {}
self._update_user_holidays(cr, uid, ids)
+ ids += self._get_category_leave_ids(cr, uid, ids)
self._remove_resouce_leave(cr, uid, ids, context=context)
return super(hr_holidays, self).unlink(cr, uid, ids, context)
@@ -307,17 +318,23 @@
return True
def holidays_validate2(self, cr, uid, ids, *args):
+ obj_emp = self.pool.get('hr.employee')
+ wf_service = netsvc.LocalService("workflow")
vals = {'state':'validate1'}
self.check_holidays(cr, uid, ids)
- ids2 = self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)])
+ ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
if ids2:
vals['manager_id'] = ids2[0]
else:
raise osv.except_osv(_('Warning !'),_('No user related to the selected employee.'))
+ # Second Time Validate all the leave requests of the category
+ for leave_id in self._get_category_leave_ids(cr, uid, ids):
+ wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'second_validate', cr)
return self.write(cr, uid, ids, vals)
def holidays_validate(self, cr, uid, ids, *args):
obj_emp = self.pool.get('hr.employee')
+ wf_service = netsvc.LocalService("workflow")
data_holiday = self.browse(cr, uid, ids)
self.check_holidays(cr, uid, ids)
vals = {'state':'validate'}
@@ -354,14 +371,20 @@
'resource_id': emp.resource_id.id,
'holiday_id':record.id
}
- self._create_resource_leave(cr, uid, vals)
+# self._create_resource_leave(cr, uid, vals)
+ # Validate all the leave requests of the category
+ for leave_id in self.search(cr, uid, [('category_holiday_id', '=', record.id)]):
+ wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'validate', cr)
return True
def holidays_confirm(self, cr, uid, ids, *args):
obj_hr_holiday_status = self.pool.get('hr.holidays.status')
+ obj_emp = self.pool.get('hr.employee')
+ wf_service = netsvc.LocalService("workflow")
for record in self.browse(cr, uid, ids):
user_id = False
leave_asked = record.number_of_days_temp
+ leave_ids = []
if record.holiday_type == 'employee' and record.type == 'remove':
if record.employee_id and not record.holiday_status_id.limit:
leaves_rest = obj_hr_holiday_status.get_days( cr, uid, [record.holiday_status_id.id], record.employee_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
@@ -374,30 +397,58 @@
if leaves_rest < leave_asked:
raise osv.except_osv(_('Warning!'),_('You cannot validate leaves for category %s while there are too few remaining leave days.') % (record.category_id.name))
nb = -(record.number_of_days_temp)
+ # Create leave request for employees in the category
+ emp_ids = obj_emp.search(cr, uid, [('category_ids', '=', record.category_id.id)])
+ for emp in obj_emp.browse(cr, uid, emp_ids):
+ vals = {
+ 'name': record.name,
+ 'holiday_status_id': record.holiday_status_id.id,
+ 'date_from': record.date_from,
+ 'date_to': record.date_to,
+ 'notes': record.notes,
+ 'number_of_days_temp': record.number_of_days_temp,
+ 'category_holiday_id': record.id,
+ 'employee_id': emp.id
+ }
+ leave_ids.append(self.create(cr, uid, vals, context=None))
+ # Confirm all the leave requests of the category
+ for leave_id in leave_ids:
+ wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'confirm', cr)
else:
nb = record.number_of_days_temp
if record.holiday_type == 'employee' and record.employee_id:
user_id = record.employee_id.user_id and record.employee_id.user_id.id or uid
- self.write(cr, uid, [record.id], {'state':'confirm', 'number_of_days': nb, 'user_id': user_id })
+ self.write(cr, uid, [record.id], {'state':'confirm', 'number_of_days': nb, 'user_id': user_id})
return True
def holidays_refuse(self, cr, uid, ids, *args):
+ obj_emp = self.pool.get('hr.employee')
+ wf_service = netsvc.LocalService("workflow")
vals = {'state': 'refuse'}
- ids2 = self.pool.get('hr.employee').search(cr, uid, [('user_id','=', uid)])
+ ids2 = obj_emp.search(cr, uid, [('user_id','=', uid)])
if ids2:
vals['manager_id'] = ids2[0]
+ # Refuse all the leave requests of the category
+ for leave_id in self._get_category_leave_ids(cr, uid, ids):
+ wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'refuse', cr)
self.write(cr, uid, ids, vals)
return True
def holidays_cancel(self, cr, uid, ids, *args):
self._update_user_holidays(cr, uid, ids)
+ self._remove_resouce_leave(cr, uid, ids)
self.write(cr, uid, ids, {'state': 'cancel'})
- self._remove_resouce_leave(cr, uid, ids)
+ leave_ids = self._get_category_leave_ids(cr, uid, ids)
+ if leave_ids:
+ self.unlink(cr, uid, leave_ids) # unlink all the leave requests of the category
return True
def holidays_draft(self, cr, uid, ids, *args):
+ wf_service = netsvc.LocalService("workflow")
+ for leave_id in self._get_category_leave_ids(cr, uid, ids):
+ wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'draft', cr)
return self.write(cr, uid, ids, {'state': 'draft'})
def check_holidays(self, cr, uid, ids):
=== modified file 'hr_payroll/__openerp__.py'
--- hr_payroll/__openerp__.py 2010-10-28 06:54:18 +0000
+++ hr_payroll/__openerp__.py 2010-12-14 03:25:00 +0000
@@ -38,7 +38,8 @@
'depends': [
'hr',
'hr_contract',
- 'hr_holidays'
+ 'hr_holidays',
+ 'decimal_precision',
],
'init_xml': [
],
=== modified file 'hr_payroll/hr_payroll.py'
--- hr_payroll/hr_payroll.py 2010-11-19 12:20:03 +0000
+++ hr_payroll/hr_payroll.py 2010-12-14 03:25:00 +0000
@@ -312,7 +312,7 @@
_description = 'Employee Contract'
_columns = {
'permit_no': fields.char('Work Permit No', size=256, required=False, readonly=False),
- 'passport_id': fields.many2one('hr.passport', 'Passport', required=False),
+ 'passport_id': fields.many2one('hr.passport', 'Passport No', required=False),
'visa_no': fields.char('Visa No', size=64, required=False, readonly=False),
'visa_expire': fields.date('Visa Expire Date'),
'struct_id': fields.many2one('hr.payroll.structure', 'Salary Structure'),
@@ -1472,7 +1472,7 @@
return vals
_columns = {
- 'passport_id':fields.many2one('hr.passport', 'Passport', required=False, domain="[('employee_id','=',active_id), ('address_id','=',address_home_id)]", help="Employee Passport Information"),
+ 'passport_id':fields.many2one('hr.passport', 'Passport No', required=False, domain="[('employee_id','=',active_id), ('address_id','=',address_home_id)]", help="Employee Passport Information"),
'line_ids':fields.one2many('hr.payslip.line', 'employee_id', 'Salary Structure', required=False),
'slip_ids':fields.one2many('hr.payslip', 'employee_id', 'Payslips', required=False, readonly=True),
'otherid': fields.char('Other Id', size=64),
=== modified file 'hr_payroll/hr_payroll_view.xml'
--- hr_payroll/hr_payroll_view.xml 2010-12-03 12:05:43 +0000
+++ hr_payroll/hr_payroll_view.xml 2010-12-14 03:25:00 +0000
@@ -94,11 +94,11 @@
<field name="inherit_id" ref="base.view_partner_bank_form"/>
<field name="arch" type="xml">
<field name="partner_id" position="replace">
- <field name="partner_id" invisible="context.get('display_partner', False)"/>
+ <field name="partner_id"/>
</field>
</field>
</record>
-
+
<record id="hr_contract.hr_hr_employee_view_form2" model="ir.ui.view">
<field name="name">hr.hr.employee.view.form2</field>
<field name="model">hr.employee</field>
@@ -251,9 +251,9 @@
</field>
</field>
</record>
-
+
<!-- End Employee View -->
-
+
<!-- Contract View -->
<record id="hr_contract.hr_contract_view_form" model="ir.ui.view">
<field name="name">hr.contract.view.form</field>
@@ -407,12 +407,12 @@
<separator string="Validation" colspan="2"/>
<newline/>
<field name="active" />
- <newline/>
+ <newline/>
<field name="double_validation"/>
<newline/>
<field name="limit"/>
</group>
- <group colspan="2">
+ <group colspan="2">
<separator colspan="2" string="Payroll Configurtion"/><newline/>
<field name="type"/><newline/>
<field name="head_id"/><newline/>
@@ -1088,7 +1088,7 @@
</form>
</field>
</record>
-
+
<!-- Shortcuts -->
<act_window name="Payslips"
domain="[('employee_id', '=', active_id)]"
=== modified file 'hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py'
--- hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py 2010-07-27 07:11:45 +0000
+++ hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py 2010-12-14 03:25:00 +0000
@@ -23,6 +23,7 @@
from osv import osv, fields
from tools.translate import _
+
#
# Create an final invoice based on selected timesheet lines
#
@@ -79,7 +80,7 @@
date_due = pterm_list[-1]
curr_invoice = {
- 'name': time.strftime('%D')+' - '+account.name,
+ 'name': time.strftime('%d/%m/%Y')+' - '+account.name,
'partner_id': account.partner_id.id,
'address_contact_id': res_partner_obj.address_get(cr, uid, [account.partner_id.id], adr_pref=['contact'])['contact'],
'address_invoice_id': res_partner_obj.address_get(cr, uid, [account.partner_id.id], adr_pref=['invoice'])['invoice'],
=== modified file 'hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py'
--- hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py 2010-10-27 12:49:59 +0000
+++ hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py 2010-12-14 03:25:00 +0000
@@ -92,7 +92,7 @@
date_due = pterm_list[-1]
curr_invoice = {
- 'name': time.strftime('%D')+' - '+account.name,
+ 'name': time.strftime('%d/%m/%Y')+' - '+account.name,
'partner_id': account.partner_id.id,
'address_contact_id': res_partner_obj.address_get(cr, uid,
[account.partner_id.id], adr_pref=['contact'])['contact'],
=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet.py'
--- hr_timesheet_sheet/hr_timesheet_sheet.py 2010-11-02 11:11:12 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet.py 2010-12-14 03:25:00 +0000
@@ -289,7 +289,7 @@
'draft': [('readonly', False)],
'new': [('readonly', False)]}
),
- 'attendances_ids' : one2many_mod2('hr.attendance', 'sheet_id', 'Attendances', readonly=True, states={'draft':[('readonly',False)],'new':[('readonly',False)]}),
+ 'attendances_ids' : one2many_mod2('hr.attendance', 'sheet_id', 'Attendances', readonly=True,),
'state' : fields.selection([
('new', 'New'),
('draft','Draft'),
=== modified file 'l10n_be/account_pcmn_belgium.xml'
--- l10n_be/account_pcmn_belgium.xml 2010-11-03 10:58:48 +0000
+++ l10n_be/account_pcmn_belgium.xml 2010-12-14 03:25:00 +0000
@@ -2913,17 +2913,25 @@
<field name="user_type" ref="user_type_view"/>
<field ref="a40" name="parent_id"/>
</record>
+ <record id="a_recv" model="account.account.template">
+ <field name="name">Clients</field>
+ <field name="code">4000</field>
+ <field name="type">receivable</field>
+ <field name="user_type" ref="user_type_tiers_receiv"/>
+ <field eval="True" name="reconcile"/>
+ <field ref="a400" name="parent_id"/>
+ </record>
<record id="a4007" model="account.account.template">
<field name="name">Rabais, remises, ristournes à accorder et autres notes de crédit à établir</field>
<field name="code">4007</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
<field ref="a400" name="parent_id"/>
</record>
<record id="a4008" model="account.account.template">
<field name="name">Créances résultant de livraisons de biens</field>
<field name="code">4008</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
<field ref="a400" name="parent_id"/>
</record>
@@ -2934,26 +2942,24 @@
<field name="user_type" ref="user_type_view"/>
<field ref="a40" name="parent_id"/>
</record>
- <record id="a_recv" model="account.account.template">
+ <record id="a4010" model="account.account.template">
<field name="name">Effets à recevoir</field>
<field name="code">4010</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
- <field eval="True" name="reconcile"/>
<field ref="a401" name="parent_id"/>
</record>
-
<record id="a4013" model="account.account.template">
<field name="name">Effets à l'encaissement</field>
<field name="code">4013</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
<field ref="a401" name="parent_id"/>
</record>
<record id="a4015" model="account.account.template">
<field name="name">Effets à l'escompte</field>
<field name="code">4015</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
<field ref="a401" name="parent_id"/>
</record>
@@ -2967,21 +2973,21 @@
<record id="a4020" model="account.account.template">
<field name="name">Entreprises liées</field>
<field name="code">4020</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
<field ref="a402" name="parent_id"/>
</record>
<record id="a4021" model="account.account.template">
<field name="name">Autres entreprises avec lesquelles il existe un lien de participation</field>
<field name="code">4021</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
<field ref="a402" name="parent_id"/>
</record>
<record id="a4022" model="account.account.template">
<field name="name">Administrateurs et gérants d'entreprise</field>
<field name="code">4022</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
<field ref="a402" name="parent_id"/>
</record>
@@ -2995,63 +3001,63 @@
<record id="a4030" model="account.account.template">
<field name="name">Entreprises liées</field>
<field name="code">4030</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
<field ref="a403" name="parent_id"/>
</record>
<record id="a4031" model="account.account.template">
<field name="name">Autres entreprises avec lesquelles il existe un lien de participation</field>
<field name="code">4031</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
<field ref="a403" name="parent_id"/>
</record>
<record id="a4032" model="account.account.template">
<field name="name">Administrateurs et gérants de l'entreprise</field>
<field name="code">4032</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
<field ref="a403" name="parent_id"/>
</record>
<record id="a404" model="account.account.template">
<field name="name">Produits à recevoir</field>
<field name="code">404</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
<field ref="a40" name="parent_id"/>
</record>
<record id="a405" model="account.account.template">
<field name="name">Clients : retenues sur garanties</field>
<field name="code">405</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
<field ref="a40" name="parent_id"/>
</record>
<record id="a406" model="account.account.template">
<field name="name">Acomptes versés</field>
<field name="code">406</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
<field ref="a40" name="parent_id"/>
</record>
<record id="a407" model="account.account.template">
<field name="name">Créances douteuses</field>
<field name="code">407</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
<field ref="a40" name="parent_id"/>
</record>
<record id="a408" model="account.account.template">
<field name="name">Compensation clients</field>
<field name="code">408</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
<field ref="a40" name="parent_id"/>
</record>
<record id="a409" model="account.account.template">
<field name="name">Réductions de valeur actées</field>
<field name="code">409</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
<field ref="a40" name="parent_id"/>
</record>
@@ -3072,14 +3078,14 @@
<record id="a4100" model="account.account.template">
<field name="name">Appels de fonds</field>
<field name="code">4100</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
<field ref="a410" name="parent_id"/>
</record>
<record id="a4101" model="account.account.template">
<field name="name">Actionnaires défaillants</field>
<field name="code">4101</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
<field ref="a410" name="parent_id"/>
</record>
@@ -3128,21 +3134,21 @@
<record id="a4111" model="account.account.template">
<field name="name">T.V.A. déductible</field>
<field name="code">4111</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tax"/>
<field ref="a411" name="parent_id"/>
</record>
<record id="a4112" model="account.account.template">
<field name="name">Compte courant administration T.V.A.</field>
<field name="code">4112</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tax"/>
<field ref="a411" name="parent_id"/>
</record>
<record id="a4118" model="account.account.template">
<field name="name">Taxe d'égalisation due</field>
<field name="code">4118</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tax"/>
<field ref="a411" name="parent_id"/>
</record>
@@ -3156,28 +3162,28 @@
<record id="a4120" model="account.account.template">
<field name="name">à 4124 Impôts belges sur le résultat</field>
<field name="code">4120</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
<field ref="a412" name="parent_id"/>
</record>
<record id="a4125" model="account.account.template">
<field name="name">à 4127 Autres impôts belges</field>
<field name="code">4125</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
<field ref="a412" name="parent_id"/>
</record>
<record id="a4128" model="account.account.template">
<field name="name">Impôts étrangers</field>
<field name="code">4128</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
<field ref="a412" name="parent_id"/>
</record>
<record id="a414" model="account.account.template">
<field name="name">Produits à recevoir</field>
<field name="code">414</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
<field ref="a41" name="parent_id"/>
</record>
@@ -3191,42 +3197,42 @@
<record id="a4160" model="account.account.template">
<field name="name">Associés</field>
<field name="code">4160</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
<field ref="a416" name="parent_id"/>
</record>
<record id="a4161" model="account.account.template">
<field name="name">Avances et prêts au personnel</field>
<field name="code">4161</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
<field ref="a416" name="parent_id"/>
</record>
<record id="a4162" model="account.account.template">
<field name="name">Compte courant des associés en S.P.R.L.</field>
<field name="code">4162</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
<field ref="a416" name="parent_id"/>
</record>
<record id="a4163" model="account.account.template">
<field name="name">Compte courant des administrateurs et gérants</field>
<field name="code">4163</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
<field ref="a416" name="parent_id"/>
</record>
<record id="a4164" model="account.account.template">
<field name="name">Créances sur sociétés apparentées</field>
<field name="code">4164</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
<field ref="a416" name="parent_id"/>
</record>
<record id="a4166" model="account.account.template">
<field name="name">Emballages et matériel à rendre</field>
<field name="code">4166</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
<field ref="a416" name="parent_id"/>
</record>
@@ -3240,42 +3246,42 @@
<record id="a41670" model="account.account.template">
<field name="name">Subsides à recevoir</field>
<field name="code">41670</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
<field ref="a4167" name="parent_id"/>
</record>
<record id="a41671" model="account.account.template">
<field name="name">Autres créances</field>
<field name="code">41671</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
<field ref="a4167" name="parent_id"/>
</record>
<record id="a4168" model="account.account.template">
<field name="name">Rabais, ristournes, remises à obtenir et autres avoirs non encore reçus</field>
<field name="code">4168</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
<field ref="a416" name="parent_id"/>
</record>
<record id="a417" model="account.account.template">
<field name="name">Créances douteuses</field>
<field name="code">417</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
<field ref="a41" name="parent_id"/>
</record>
<record id="a418" model="account.account.template">
<field name="name">Cautionnements versés en numéraires</field>
<field name="code">418</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
<field ref="a41" name="parent_id"/>
</record>
<record id="a419" model="account.account.template">
<field name="name">Réductions de valeur actées</field>
<field name="code">419</field>
- <field name="type">receivable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_receiv"/>
<field ref="a41" name="parent_id"/>
</record>
@@ -3296,14 +3302,14 @@
<record id="a4200" model="account.account.template">
<field name="name">Convertibles</field>
<field name="code">4200</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a420" name="parent_id"/>
</record>
<record id="a4201" model="account.account.template">
<field name="name">Non convertibles</field>
<field name="code">4201</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a420" name="parent_id"/>
</record>
@@ -3317,14 +3323,14 @@
<record id="a4210" model="account.account.template">
<field name="name">Convertibles</field>
<field name="code">4210</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a421" name="parent_id"/>
</record>
<record id="a4211" model="account.account.template">
<field name="name">Non convertibles</field>
<field name="code">4211</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a421" name="parent_id"/>
</record>
@@ -3338,14 +3344,14 @@
<record id="a4220" model="account.account.template">
<field name="name">Financement de biens immobiliers</field>
<field name="code">4220</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a422" name="parent_id"/>
</record>
<record id="a4221" model="account.account.template">
<field name="name">Financement de biens mobiliers</field>
<field name="code">4221</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a422" name="parent_id"/>
</record>
@@ -3359,28 +3365,28 @@
<record id="a4230" model="account.account.template">
<field name="name">Dettes en compte</field>
<field name="code">4230</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a423" name="parent_id"/>
</record>
<record id="a4231" model="account.account.template">
<field name="name">Promesses</field>
<field name="code">4231</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a423" name="parent_id"/>
</record>
<record id="a4232" model="account.account.template">
<field name="name">Crédits d'acceptation</field>
<field name="code">4232</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a423" name="parent_id"/>
</record>
<record id="a424" model="account.account.template">
<field name="name">Autres emprunts</field>
<field name="code">424</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a42" name="parent_id"/>
</record>
@@ -3394,21 +3400,21 @@
<record id="a4250" model="account.account.template">
<field name="name">Fournisseurs</field>
<field name="code">4250</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a425" name="parent_id"/>
</record>
<record id="a4251" model="account.account.template">
<field name="name">Effets à payer</field>
<field name="code">4251</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a425" name="parent_id"/>
</record>
<record id="a426" model="account.account.template">
<field name="name">Cautionnements reçus en numéraires</field>
<field name="code">426</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a42" name="parent_id"/>
</record>
@@ -3422,28 +3428,28 @@
<record id="a4290" model="account.account.template">
<field name="name">Entreprises liées</field>
<field name="code">4290</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a429" name="parent_id"/>
</record>
<record id="a4291" model="account.account.template">
<field name="name">Entreprises avec lesquelles il existe un lien de participation</field>
<field name="code">4291</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a429" name="parent_id"/>
</record>
<record id="a4292" model="account.account.template">
<field name="name">Administrateurs, gérants, associés</field>
<field name="code">4292</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a429" name="parent_id"/>
</record>
<record id="a4299" model="account.account.template">
<field name="name">Autres dettes</field>
<field name="code">4299</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a429" name="parent_id"/>
</record>
@@ -3457,35 +3463,35 @@
<record id="a430" model="account.account.template">
<field name="name">Etablissements de crédit. Emprunts en compte à terme fixe</field>
<field name="code">430</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a43" name="parent_id"/>
</record>
<record id="a431" model="account.account.template">
<field name="name">Etablissements de crédit. Promesses</field>
<field name="code">431</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a43" name="parent_id"/>
</record>
<record id="a432" model="account.account.template">
<field name="name">Etablissements de crédit. Crédits d'acceptation</field>
<field name="code">432</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a43" name="parent_id"/>
</record>
<record id="a433" model="account.account.template">
<field name="name">Etablissements de crédit. Dettes en compte courant</field>
<field name="code">433</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a43" name="parent_id"/>
</record>
<record id="a439" model="account.account.template">
<field name="name">Autres emprunts</field>
<field name="code">439</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a43" name="parent_id"/>
</record>
@@ -3521,7 +3527,7 @@
<record id="a44001" model="account.account.template">
<field name="name">Entreprises avec lesquelles il existe un lien de participation</field>
<field name="code">44001</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a4400" name="parent_id"/>
</record>
@@ -3535,35 +3541,35 @@
<record id="a44010" model="account.account.template">
<field name="name">Fournisseurs belges</field>
<field name="code">44010</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a4401" name="parent_id"/>
</record>
<record id="a44011" model="account.account.template">
<field name="name">Fournisseurs CEE</field>
<field name="code">44011</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a4401" name="parent_id"/>
</record>
<record id="a44012" model="account.account.template">
<field name="name">Fournisseurs importation</field>
<field name="code">44012</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a4401" name="parent_id"/>
</record>
<record id="a4402" model="account.account.template">
<field name="name">Dettes envers les coparticipants</field>
<field name="code">4402</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a440" name="parent_id"/>
</record>
<record id="a4403" model="account.account.template">
<field name="name">Fournisseurs - retenues de garanties</field>
<field name="code">4403</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a440" name="parent_id"/>
</record>
@@ -3584,14 +3590,14 @@
<record id="a44100" model="account.account.template">
<field name="name">Entreprises liées</field>
<field name="code">44100</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a4410" name="parent_id"/>
</record>
<record id="a44101" model="account.account.template">
<field name="name">Entreprises avec lesquelles il existe un lien de participation</field>
<field name="code">44101</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a4410" name="parent_id"/>
</record>
@@ -3605,42 +3611,42 @@
<record id="a44110" model="account.account.template">
<field name="name">Fournisseurs belges</field>
<field name="code">44110</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a4411" name="parent_id"/>
</record>
<record id="a44111" model="account.account.template">
<field name="name">Fournisseurs CEE</field>
<field name="code">44111</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a4411" name="parent_id"/>
</record>
<record id="a44112" model="account.account.template">
<field name="name">Fournisseurs importation</field>
<field name="code">44112</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a4411" name="parent_id"/>
</record>
<record id="a444" model="account.account.template">
<field name="name">Factures à recevoir</field>
<field name="code">444</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a44" name="parent_id"/>
</record>
<record id="a446" model="account.account.template">
<field name="name">Acomptes reçus</field>
<field name="code">446</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a44" name="parent_id"/>
</record>
<record id="a448" model="account.account.template">
<field name="name">Compensations fournisseurs</field>
<field name="code">448</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a44" name="parent_id"/>
</record>
@@ -3661,21 +3667,21 @@
<record id="a4501" model="account.account.template">
<field name="name">à 4504 Impôts sur le résultat</field>
<field name="code">4501</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a450" name="parent_id"/>
</record>
<record id="a4505" model="account.account.template">
<field name="name">à 4507 Autres impôts en Belgique</field>
<field name="code">4505</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a450" name="parent_id"/>
</record>
<record id="a4508" model="account.account.template">
<field name="name">Impôts à l'étranger</field>
<field name="code">4508</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a450" name="parent_id"/>
</record>
@@ -3724,21 +3730,21 @@
<record id="a4511" model="account.account.template">
<field name="name">T.V.A. déductible</field>
<field name="code">4511</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tax"/>
<field ref="a451" name="parent_id"/>
</record>
<record id="a4512" model="account.account.template">
<field name="name">Compte courant administration T.V.A.</field>
<field name="code">4512</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tax"/>
<field ref="a451" name="parent_id"/>
</record>
<record id="a4518" model="account.account.template">
<field name="name">Taxe d'égalisation due</field>
<field name="code">4518</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tax"/>
<field ref="a451" name="parent_id"/>
</record>
@@ -3752,7 +3758,7 @@
<record id="a4520" model="account.account.template">
<field name="name">Autres impôts sur le résultat</field>
<field name="code">4520</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a452" name="parent_id"/>
</record>
@@ -3766,35 +3772,35 @@
<record id="a45250" model="account.account.template">
<field name="name">Précompte immobilier</field>
<field name="code">45250</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a4525" name="parent_id"/>
</record>
<record id="a45251" model="account.account.template">
<field name="name">Impôts communaux à payer</field>
<field name="code">45251</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a4525" name="parent_id"/>
</record>
<record id="a45252" model="account.account.template">
<field name="name">Impôts provinciaux à payer</field>
<field name="code">45252</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a4525" name="parent_id"/>
</record>
<record id="a45253" model="account.account.template">
<field name="name">Autres impôts et taxes à payer</field>
<field name="code">45253</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a4525" name="parent_id"/>
</record>
<record id="a4528" model="account.account.template">
<field name="name">Impôts et taxes à l'étranger</field>
<field name="code">4528</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a452" name="parent_id"/>
</record>
@@ -3808,35 +3814,35 @@
<record id="a4530" model="account.account.template">
<field name="name">Précompte professionnel retenu sur rémunérations</field>
<field name="code">4530</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a453" name="parent_id"/>
</record>
<record id="a4531" model="account.account.template">
<field name="name">Précompte professionnel retenu sur tantièmes</field>
<field name="code">4531</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a453" name="parent_id"/>
</record>
<record id="a4532" model="account.account.template">
<field name="name">Précompte mobilier retenu sur dividendes attribués</field>
<field name="code">4532</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a453" name="parent_id"/>
</record>
<record id="a4533" model="account.account.template">
<field name="name">Précompte mobilier retenu sur intérêts payés</field>
<field name="code">4533</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a453" name="parent_id"/>
</record>
<record id="a4538" model="account.account.template">
<field name="name">Autres précomptes retenus</field>
<field name="code">4538</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a453" name="parent_id"/>
</record>
@@ -3850,35 +3856,35 @@
<record id="a4540" model="account.account.template">
<field name="name">Arriérés</field>
<field name="code">4540</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a454" name="parent_id"/>
</record>
<record id="a4541" model="account.account.template">
<field name="name">1er trimestre</field>
<field name="code">4541</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a454" name="parent_id"/>
</record>
<record id="a4542" model="account.account.template">
<field name="name">2ème trimestre</field>
<field name="code">4542</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a454" name="parent_id"/>
</record>
<record id="a4543" model="account.account.template">
<field name="name">3ème trimestre</field>
<field name="code">4543</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a454" name="parent_id"/>
</record>
<record id="a4544" model="account.account.template">
<field name="name">4ème trimestre</field>
<field name="code">4544</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a454" name="parent_id"/>
</record>
@@ -3892,28 +3898,28 @@
<record id="a4550" model="account.account.template">
<field name="name">Administrateurs, gérants et commissaires</field>
<field name="code">4550</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a455" name="parent_id"/>
</record>
<record id="a4551" model="account.account.template">
<field name="name">Direction</field>
<field name="code">4551</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a455" name="parent_id"/>
</record>
<record id="a4552" model="account.account.template">
<field name="name">Employés</field>
<field name="code">4552</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a455" name="parent_id"/>
</record>
<record id="a4553" model="account.account.template">
<field name="name">Ouvriers</field>
<field name="code">4553</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a455" name="parent_id"/>
</record>
@@ -3927,21 +3933,21 @@
<record id="a4560" model="account.account.template">
<field name="name">Direction</field>
<field name="code">4560</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a456" name="parent_id"/>
</record>
<record id="a4561" model="account.account.template">
<field name="name">Employés</field>
<field name="code">4561</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a456" name="parent_id"/>
</record>
<record id="a4562" model="account.account.template">
<field name="name">Ouvriers</field>
<field name="code">4562</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a456" name="parent_id"/>
</record>
@@ -3955,21 +3961,21 @@
<record id="a4590" model="account.account.template">
<field name="name">Provision pour gratifications de fin d'année</field>
<field name="code">4590</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a459" name="parent_id"/>
</record>
<record id="a4591" model="account.account.template">
<field name="name">Départs de personnel</field>
<field name="code">4591</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a459" name="parent_id"/>
</record>
<record id="a4592" model="account.account.template">
<field name="name">Oppositions sur rémunérations</field>
<field name="code">4592</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a459" name="parent_id"/>
</record>
@@ -3983,49 +3989,49 @@
<record id="a45930" model="account.account.template">
<field name="name">Assurance loi</field>
<field name="code">45930</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a4593" name="parent_id"/>
</record>
<record id="a45931" model="account.account.template">
<field name="name">Assurance salaire garanti </field>
<field name="code">45931</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a4593" name="parent_id"/>
</record>
<record id="a45932" model="account.account.template">
<field name="name">Assurance groupe </field>
<field name="code">45932</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a4593" name="parent_id"/>
</record>
<record id="a45933" model="account.account.template">
<field name="name">Assurances individuelles</field>
<field name="code">45933</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a4593" name="parent_id"/>
</record>
<record id="a4594" model="account.account.template">
<field name="name">Caisse d'assurances sociales pour travailleurs indépendants</field>
<field name="code">4594</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a459" name="parent_id"/>
</record>
<record id="a4597" model="account.account.template">
<field name="name">Dettes et provisions sociales diverses</field>
<field name="code">4597</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a459" name="parent_id"/>
</record>
<record id="a46" model="account.account.template">
<field name="name">ACOMPTES RECUS SUR COMMANDES</field>
<field name="code">46</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a4" name="parent_id"/>
</record>
@@ -4039,28 +4045,28 @@
<record id="a470" model="account.account.template">
<field name="name">Dividendes et tantièmes d'exercices antérieurs</field>
<field name="code">470</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a47" name="parent_id"/>
</record>
<record id="a471" model="account.account.template">
<field name="name">Dividendes de l'exercice</field>
<field name="code">471</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a47" name="parent_id"/>
</record>
<record id="a472" model="account.account.template">
<field name="name">Tantièmes de l'exercice</field>
<field name="code">472</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a47" name="parent_id"/>
</record>
<record id="a473" model="account.account.template">
<field name="name">Autres allocataires</field>
<field name="code">473</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a47" name="parent_id"/>
</record>
@@ -4074,49 +4080,49 @@
<record id="a480" model="account.account.template">
<field name="name">Obligations et coupons échus</field>
<field name="code">480</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a48" name="parent_id"/>
</record>
<record id="a481" model="account.account.template">
<field name="name">Actionnaires - capital à rembourser</field>
<field name="code">481</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a48" name="parent_id"/>
</record>
<record id="a482" model="account.account.template">
<field name="name">Participation du personnel à payer</field>
<field name="code">482</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a48" name="parent_id"/>
</record>
<record id="a483" model="account.account.template">
<field name="name">Acomptes reçus d'autres tiers à moins d'un an</field>
<field name="code">483</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a48" name="parent_id"/>
</record>
<record id="a486" model="account.account.template">
<field name="name">Emballages et matériel consignés</field>
<field name="code">486</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a48" name="parent_id"/>
</record>
<record id="a488" model="account.account.template">
<field name="name">Cautionnements reçus en numéraires</field>
<field name="code">488</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a48" name="parent_id"/>
</record>
<record id="a489" model="account.account.template">
<field name="name">Autres dettes diverses</field>
<field name="code">489</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a48" name="parent_id"/>
</record>
@@ -4130,7 +4136,7 @@
<record id="a490" model="account.account.template">
<field name="name">Charges à reporter</field>
<field name="code">490</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a49" name="parent_id"/>
</record>
@@ -4151,21 +4157,21 @@
<record id="a49100" model="account.account.template">
<field name="name">Ristournes, rabais à obtenir</field>
<field name="code">49100</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a4910" name="parent_id"/>
</record>
<record id="a49101" model="account.account.template">
<field name="name">Commissions à obtenir</field>
<field name="code">49101</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a4910" name="parent_id"/>
</record>
<record id="a49102" model="account.account.template">
<field name="name">Autres produits d'exploitation</field>
<field name="code">49102</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a4910" name="parent_id"/>
</record>
@@ -4179,21 +4185,21 @@
<record id="a49110" model="account.account.template">
<field name="name">Intérêts courus et non échus sur prêts et débits</field>
<field name="code">49110</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a4911" name="parent_id"/>
</record>
<record id="a49111" model="account.account.template">
<field name="name">Autres produits financiers</field>
<field name="code">49111</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a4911" name="parent_id"/>
</record>
<record id="a492" model="account.account.template">
<field name="name">Charges à imputer</field>
<field name="code">492</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a49" name="parent_id"/>
</record>
@@ -4207,14 +4213,14 @@
<record id="a4930" model="account.account.template">
<field name="name">Produits d'exploitation à reporter</field>
<field name="code">4930</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a493" name="parent_id"/>
</record>
<record id="a4931" model="account.account.template">
<field name="name">Produits financiers à reporter</field>
<field name="code">4931</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a493" name="parent_id"/>
</record>
@@ -4228,21 +4234,21 @@
<record id="a4990" model="account.account.template">
<field name="name">Compte d'attente</field>
<field name="code">4990</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a499" name="parent_id"/>
</record>
<record id="a4991" model="account.account.template">
<field name="name">Compte de répartition périodique des charges</field>
<field name="code">4991</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a499" name="parent_id"/>
</record>
<record id="a4999" model="account.account.template">
<field name="name">Transferts d'exercice</field>
<field name="code">4999</field>
- <field name="type">payable</field>
+ <field name="type">other</field>
<field name="user_type" ref="user_type_tiers_payable"/>
<field ref="a499" name="parent_id"/>
</record>
=== modified file 'point_of_sale/i18n/ar.po'
--- point_of_sale/i18n/ar.po 2010-10-30 05:55:00 +0000
+++ point_of_sale/i18n/ar.po 2010-12-14 03:25:00 +0000
@@ -300,7 +300,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/bg.po'
--- point_of_sale/i18n/bg.po 2010-10-30 05:55:00 +0000
+++ point_of_sale/i18n/bg.po 2010-12-14 03:25:00 +0000
@@ -300,7 +300,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/bs.po'
--- point_of_sale/i18n/bs.po 2010-10-30 05:55:00 +0000
+++ point_of_sale/i18n/bs.po 2010-12-14 03:25:00 +0000
@@ -300,7 +300,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/ca.po'
--- point_of_sale/i18n/ca.po 2010-10-31 05:05:24 +0000
+++ point_of_sale/i18n/ca.po 2010-12-14 03:25:00 +0000
@@ -300,7 +300,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/cs.po'
--- point_of_sale/i18n/cs.po 2010-10-30 05:55:00 +0000
+++ point_of_sale/i18n/cs.po 2010-12-14 03:25:00 +0000
@@ -300,7 +300,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/da.po'
--- point_of_sale/i18n/da.po 2010-10-30 05:55:00 +0000
+++ point_of_sale/i18n/da.po 2010-12-14 03:25:00 +0000
@@ -301,7 +301,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/de.po'
--- point_of_sale/i18n/de.po 2010-12-02 04:51:20 +0000
+++ point_of_sale/i18n/de.po 2010-12-14 03:25:00 +0000
@@ -1309,7 +1309,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr "Hauptkasse"
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/el.po'
--- point_of_sale/i18n/el.po 2010-10-30 05:55:00 +0000
+++ point_of_sale/i18n/el.po 2010-12-14 03:25:00 +0000
@@ -301,7 +301,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/es.po'
--- point_of_sale/i18n/es.po 2010-12-11 05:08:50 +0000
+++ point_of_sale/i18n/es.po 2010-12-14 03:25:00 +0000
@@ -1267,7 +1267,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr "Salidas de caja"
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/es_AR.po'
--- point_of_sale/i18n/es_AR.po 2010-10-30 05:55:00 +0000
+++ point_of_sale/i18n/es_AR.po 2010-12-14 03:25:00 +0000
@@ -300,7 +300,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/es_EC.po'
--- point_of_sale/i18n/es_EC.po 2010-11-07 04:49:34 +0000
+++ point_of_sale/i18n/es_EC.po 2010-12-14 03:25:00 +0000
@@ -302,7 +302,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr "Sortie de caisse"
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/et.po'
--- point_of_sale/i18n/et.po 2010-10-31 05:05:24 +0000
+++ point_of_sale/i18n/et.po 2010-12-14 03:25:00 +0000
@@ -318,7 +318,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/fi.po'
--- point_of_sale/i18n/fi.po 2010-10-31 05:05:24 +0000
+++ point_of_sale/i18n/fi.po 2010-12-14 03:25:00 +0000
@@ -301,7 +301,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/fr.po'
--- point_of_sale/i18n/fr.po 2010-12-01 05:03:27 +0000
+++ point_of_sale/i18n/fr.po 2010-12-14 03:25:00 +0000
@@ -1301,7 +1301,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/hi.po'
--- point_of_sale/i18n/hi.po 2010-10-30 05:55:00 +0000
+++ point_of_sale/i18n/hi.po 2010-12-14 03:25:00 +0000
@@ -301,7 +301,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/hr.po'
--- point_of_sale/i18n/hr.po 2010-10-30 05:55:00 +0000
+++ point_of_sale/i18n/hr.po 2010-12-14 03:25:00 +0000
@@ -300,7 +300,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/hu.po'
--- point_of_sale/i18n/hu.po 2010-10-30 05:55:00 +0000
+++ point_of_sale/i18n/hu.po 2010-12-14 03:25:00 +0000
@@ -300,7 +300,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/id.po'
--- point_of_sale/i18n/id.po 2010-10-30 05:55:00 +0000
+++ point_of_sale/i18n/id.po 2010-12-14 03:25:00 +0000
@@ -300,7 +300,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/it.po'
--- point_of_sale/i18n/it.po 2010-10-31 05:05:24 +0000
+++ point_of_sale/i18n/it.po 2010-12-14 03:25:00 +0000
@@ -300,7 +300,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/ko.po'
--- point_of_sale/i18n/ko.po 2010-10-30 05:55:00 +0000
+++ point_of_sale/i18n/ko.po 2010-12-14 03:25:00 +0000
@@ -301,7 +301,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/lt.po'
--- point_of_sale/i18n/lt.po 2010-10-30 05:55:00 +0000
+++ point_of_sale/i18n/lt.po 2010-12-14 03:25:00 +0000
@@ -300,7 +300,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/mn.po'
--- point_of_sale/i18n/mn.po 2010-10-30 05:55:00 +0000
+++ point_of_sale/i18n/mn.po 2010-12-14 03:25:00 +0000
@@ -301,7 +301,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/nl.po'
--- point_of_sale/i18n/nl.po 2010-10-31 05:05:24 +0000
+++ point_of_sale/i18n/nl.po 2010-12-14 03:25:00 +0000
@@ -300,7 +300,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/nl_BE.po'
--- point_of_sale/i18n/nl_BE.po 2010-10-30 05:55:00 +0000
+++ point_of_sale/i18n/nl_BE.po 2010-12-14 03:25:00 +0000
@@ -300,7 +300,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/pl.po'
--- point_of_sale/i18n/pl.po 2010-10-30 05:55:00 +0000
+++ point_of_sale/i18n/pl.po 2010-12-14 03:25:00 +0000
@@ -300,7 +300,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/point_of_sale.pot'
--- point_of_sale/i18n/point_of_sale.pot 2010-12-03 15:55:33 +0000
+++ point_of_sale/i18n/point_of_sale.pot 2010-12-14 03:25:00 +0000
@@ -1258,7 +1258,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/pt.po'
--- point_of_sale/i18n/pt.po 2010-10-31 05:05:24 +0000
+++ point_of_sale/i18n/pt.po 2010-12-14 03:25:00 +0000
@@ -300,7 +300,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/pt_BR.po'
--- point_of_sale/i18n/pt_BR.po 2010-10-31 05:05:24 +0000
+++ point_of_sale/i18n/pt_BR.po 2010-12-14 03:25:00 +0000
@@ -300,7 +300,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/ro.po'
--- point_of_sale/i18n/ro.po 2010-10-30 05:55:00 +0000
+++ point_of_sale/i18n/ro.po 2010-12-14 03:25:00 +0000
@@ -300,7 +300,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/ru.po'
--- point_of_sale/i18n/ru.po 2010-10-30 05:55:00 +0000
+++ point_of_sale/i18n/ru.po 2010-12-14 03:25:00 +0000
@@ -300,7 +300,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/sl.po'
--- point_of_sale/i18n/sl.po 2010-10-31 05:05:24 +0000
+++ point_of_sale/i18n/sl.po 2010-12-14 03:25:00 +0000
@@ -300,7 +300,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/sq.po'
--- point_of_sale/i18n/sq.po 2010-10-30 05:55:00 +0000
+++ point_of_sale/i18n/sq.po 2010-12-14 03:25:00 +0000
@@ -301,7 +301,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/sr.po'
--- point_of_sale/i18n/sr.po 2010-10-30 05:55:00 +0000
+++ point_of_sale/i18n/sr.po 2010-12-14 03:25:00 +0000
@@ -303,7 +303,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr "Gotovina Van"
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/sr@xxxxxxxx'
--- point_of_sale/i18n/sr@xxxxxxxx 2010-12-11 05:08:50 +0000
+++ point_of_sale/i18n/sr@xxxxxxxx 2010-12-14 03:25:00 +0000
@@ -1265,7 +1265,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/sv.po'
--- point_of_sale/i18n/sv.po 2010-12-04 05:16:45 +0000
+++ point_of_sale/i18n/sv.po 2010-12-14 03:25:00 +0000
@@ -1264,7 +1264,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/tlh.po'
--- point_of_sale/i18n/tlh.po 2010-10-30 05:55:00 +0000
+++ point_of_sale/i18n/tlh.po 2010-12-14 03:25:00 +0000
@@ -300,7 +300,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/tr.po'
--- point_of_sale/i18n/tr.po 2010-10-31 05:05:24 +0000
+++ point_of_sale/i18n/tr.po 2010-12-14 03:25:00 +0000
@@ -300,7 +300,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/uk.po'
--- point_of_sale/i18n/uk.po 2010-10-30 05:55:00 +0000
+++ point_of_sale/i18n/uk.po 2010-12-14 03:25:00 +0000
@@ -300,7 +300,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/vi.po'
--- point_of_sale/i18n/vi.po 2010-10-30 05:55:00 +0000
+++ point_of_sale/i18n/vi.po 2010-12-14 03:25:00 +0000
@@ -301,7 +301,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/zh_CN.po'
--- point_of_sale/i18n/zh_CN.po 2010-10-30 05:55:00 +0000
+++ point_of_sale/i18n/zh_CN.po 2010-12-14 03:25:00 +0000
@@ -300,7 +300,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/zh_HK.po'
--- point_of_sale/i18n/zh_HK.po 2010-10-30 05:55:00 +0000
+++ point_of_sale/i18n/zh_HK.po 2010-12-14 03:25:00 +0000
@@ -301,7 +301,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/i18n/zh_TW.po'
--- point_of_sale/i18n/zh_TW.po 2010-10-30 05:55:00 +0000
+++ point_of_sale/i18n/zh_TW.po 2010-12-14 03:25:00 +0000
@@ -300,7 +300,7 @@
#. module: point_of_sale
#: view:pos.box.out:0
-msgid "Sortie de caisse"
+msgid "Output Operation"
msgstr ""
#. module: point_of_sale
=== modified file 'point_of_sale/wizard/pos_box_out.xml'
--- point_of_sale/wizard/pos_box_out.xml 2010-09-20 07:10:38 +0000
+++ point_of_sale/wizard/pos_box_out.xml 2010-12-14 03:25:00 +0000
@@ -8,7 +8,7 @@
<field name="model">pos.box.out</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Sortie de caisse">
+ <form string="Output Operation>
<separator string="Please fill these fields for entries to the box:" colspan="4"/>
<field name="name"/>
<field name="journal_id"/>
=== modified file 'product/product_view.xml'
--- product/product_view.xml 2010-11-24 17:09:41 +0000
+++ product/product_view.xml 2010-12-14 03:25:00 +0000
@@ -92,13 +92,12 @@
</group>
<group colspan="2" col="2">
<separator string="Base Prices" colspan="2"/>
+ <field groups="base.group_extended" name="cost_method"/>
<field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
<field name="list_price"/>
<newline/>
<field name="price_margin" groups="product.group_product_variant"/>
<field name="price_extra" groups="product.group_product_variant"/>
- <newline/>
- <field groups="base.group_extended" name="cost_method"/>
</group>
<group colspan="2" col="2" groups="base.group_extended">
=== modified file 'purchase/purchase_view.xml'
--- purchase/purchase_view.xml 2010-11-26 16:13:59 +0000
+++ purchase/purchase_view.xml 2010-12-14 03:25:00 +0000
@@ -162,7 +162,7 @@
<group colspan="2" col="2">
<separator string="Invoice Control" colspan="2"/>
<field name="invoice_method"/>
- <field name="invoice_id" readonly="1" groups="base.group_extended"/>
+ <field name="invoice_id" groups="base.group_extended" context="{'journal_type':'purchase', 'type':'in_invoice'}"/>
<field name="fiscal_position" widget="selection"/>
</group>
<newline/>
@@ -312,12 +312,12 @@
<field name="product_id"/>
<field name="price_unit"/>
<field name="product_qty"/>
- <field name="product_uom"/>
+ <field name="product_uom"/>
<field name="price_subtotal"/>
<field name="date_planned" widget="date" width="135"/>
-
-
-
+
+
+
<field name="state" invisible="1"/>
<field name="invoiced" invisible="1"/>
</tree>
@@ -375,7 +375,7 @@
<field name="order_id"/>
<field name="product_id"/>
<field name="partner_id" string="Supplier"/>
- </group>
+ </group>
<newline/>
<group expand="0" string="Group By...">
<filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by' : 'partner_id'}" />
=== modified file 'sale/__openerp__.py'
--- sale/__openerp__.py 2010-10-27 12:59:05 +0000
+++ sale/__openerp__.py 2010-12-14 03:25:00 +0000
@@ -27,7 +27,7 @@
The base module to manage quotations and sales orders.
* Workflow with validation steps:
- - Quotation -> Sale order -> Invoice
+ - Quotation -> Sales order -> Invoice
* Invoicing methods:
- Invoice on order (before or after shipping)
- Invoice on delivery
=== modified file 'sale/i18n/ar.po'
--- sale/i18n/ar.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/ar.po 2010-12-14 03:25:00 +0000
@@ -1034,7 +1034,7 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
+"This is a list of picking that has been generated for this sale order"
msgstr ""
#. module: sale
=== modified file 'sale/i18n/bg.po'
--- sale/i18n/bg.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/bg.po 2010-12-14 03:25:00 +0000
@@ -1036,8 +1036,8 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
-msgstr "Това е Ñ‚Ð¾Ð²Ð°Ñ€Ð¸Ñ‚ÐµÐ»Ð½Ð¸Ñ ÑпиÑък който бе генериран за тази фактура"
+"This is a list of picking that has been generated for this sale order"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
=== modified file 'sale/i18n/bs.po'
--- sale/i18n/bs.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/bs.po 2010-12-14 03:25:00 +0000
@@ -1036,8 +1036,8 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
-msgstr "Ovo je spisak izbornih lista koji su generisani za ovu Fakturu"
+"This is a list of picking that has been generated for this sale order"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
=== modified file 'sale/i18n/ca.po'
--- sale/i18n/ca.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/ca.po 2010-12-14 03:25:00 +0000
@@ -1039,9 +1039,8 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
+"This is a list of picking that has been generated for this sale order"
msgstr ""
-"Aquesta és la llista d'albarans que s'han generat per aquesta factura"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
=== modified file 'sale/i18n/cs.po'
--- sale/i18n/cs.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/cs.po 2010-12-14 03:25:00 +0000
@@ -1034,7 +1034,7 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
+"This is a list of picking that has been generated for this sale order"
msgstr ""
#. module: sale
=== modified file 'sale/i18n/de.po'
--- sale/i18n/de.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/de.po 2010-12-14 03:25:00 +0000
@@ -1102,8 +1102,8 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
-msgstr "Diese Lieferaufträge wurden für diese Rechnung erstellt"
+"This is a list of picking that has been generated for this sale order"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
=== modified file 'sale/i18n/el.po'
--- sale/i18n/el.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/el.po 2010-12-14 03:25:00 +0000
@@ -1048,10 +1048,8 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
+"This is a list of picking that has been generated for this sale order"
msgstr ""
-"Αυτή είναι η λίστα της λίστας συλλογής που Îχει δημιουÏγηθεί για αυτό το "
-"τιμολόγιο"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
=== modified file 'sale/i18n/es.po'
--- sale/i18n/es.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/es.po 2010-12-14 03:25:00 +0000
@@ -1092,8 +1092,8 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
-msgstr "Ésta es la lista de albaranes que se han generado para esta factura"
+"This is a list of picking that has been generated for this sale order"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
=== modified file 'sale/i18n/es_AR.po'
--- sale/i18n/es_AR.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/es_AR.po 2010-12-14 03:25:00 +0000
@@ -1037,8 +1037,8 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
-msgstr "Ésta es la lista de empaque que se ha generado para esta factura"
+"This is a list of picking that has been generated for this sale order"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
=== modified file 'sale/i18n/es_EC.po'
--- sale/i18n/es_EC.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/es_EC.po 2010-12-14 03:25:00 +0000
@@ -1076,10 +1076,8 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
+"This is a list of picking that has been generated for this sale order"
msgstr ""
-"Ésta es la lista de paquete de productos que se han generado para esta "
-"factura"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
=== modified file 'sale/i18n/et.po'
--- sale/i18n/et.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/et.po 2010-12-14 03:25:00 +0000
@@ -1063,8 +1063,8 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
-msgstr "See on nimekiri noppelehtedest, mis on genereeritud sellele arvele."
+"This is a list of picking that has been generated for this sale order"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
=== modified file 'sale/i18n/fi.po'
--- sale/i18n/fi.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/fi.po 2010-12-14 03:25:00 +0000
@@ -1037,8 +1037,8 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
-msgstr "Tämä on keräilylista joka on luotu laskulle"
+"This is a list of picking that has been generated for this sale order"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
=== modified file 'sale/i18n/fr.po'
--- sale/i18n/fr.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/fr.po 2010-12-14 03:25:00 +0000
@@ -1082,8 +1082,8 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
-msgstr "C'est la liste des expéditions générées pour cette commande"
+"This is a list of picking that has been generated for this sale order"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
=== modified file 'sale/i18n/hr.po'
--- sale/i18n/hr.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/hr.po 2010-12-14 03:25:00 +0000
@@ -1037,8 +1037,8 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
-msgstr "Ovo je ispis liste odabira robe koja je generirana ovim raÄunom"
+"This is a list of picking that has been generated for this sale order"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
=== modified file 'sale/i18n/id.po'
--- sale/i18n/id.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/id.po 2010-12-14 03:25:00 +0000
@@ -1037,8 +1037,8 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
-msgstr "Ini adalah daftar pengepakan yang telah dibuat untuk invoice ini"
+"This is a list of picking that has been generated for this sale order"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
=== modified file 'sale/i18n/it.po'
--- sale/i18n/it.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/it.po 2010-12-14 03:25:00 +0000
@@ -1057,8 +1057,8 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
-msgstr "Questa è la lista di DDT generati per questa Fattura"
+"This is a list of picking that has been generated for this sale order"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
=== modified file 'sale/i18n/ko.po'
--- sale/i18n/ko.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/ko.po 2010-12-14 03:25:00 +0000
@@ -1035,8 +1035,8 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
-msgstr "ì´ ì¸ë³´ì´ìŠ¤ë¥¼ 위해 ìƒì„±ëœ 피킹 리스트"
+"This is a list of picking that has been generated for this sale order"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
=== modified file 'sale/i18n/lt.po'
--- sale/i18n/lt.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/lt.po 2010-12-14 03:25:00 +0000
@@ -1037,8 +1037,8 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
-msgstr "Tai yra sÄ…raÅ¡as važtaraÅ¡Äių, sugeneruotų Å¡iai sÄ…skaitai faktÅ«rai."
+"This is a list of picking that has been generated for this sale order"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
=== modified file 'sale/i18n/lv.po'
--- sale/i18n/lv.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/lv.po 2010-12-14 03:25:00 +0000
@@ -1035,7 +1035,7 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
+"This is a list of picking that has been generated for this sale order"
msgstr ""
#. module: sale
=== modified file 'sale/i18n/mn.po'
--- sale/i18n/mn.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/mn.po 2010-12-14 03:25:00 +0000
@@ -1079,10 +1079,8 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
+"This is a list of picking that has been generated for this sale order"
msgstr ""
-"ÐÐ½Ñ Ð´ÑлгÑц нь ÑонгоÑон нÑÑ…ÑмжлÑлийн ÑÑ… баримт бүхий агуулахын баримтын "
-"жагÑаалт юм"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
=== modified file 'sale/i18n/nl.po'
--- sale/i18n/nl.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/nl.po 2010-12-14 03:25:00 +0000
@@ -1036,8 +1036,8 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
-msgstr "Dit is de paklijst die is gegenereerd voor deze factuur"
+"This is a list of picking that has been generated for this sale order"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
=== modified file 'sale/i18n/nl_BE.po'
--- sale/i18n/nl_BE.po 2010-11-03 10:28:20 +0000
+++ sale/i18n/nl_BE.po 2010-12-14 03:25:00 +0000
@@ -101,7 +101,7 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
+"This is a list of picking that has been generated for this sale order"
msgstr ""
#. module: sale
=== modified file 'sale/i18n/pl.po'
--- sale/i18n/pl.po 2010-12-12 04:45:47 +0000
+++ sale/i18n/pl.po 2010-12-14 03:25:00 +0000
@@ -1075,8 +1075,8 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
-msgstr "To pobranie zostało utworzone dla tej faktury"
+"This is a list of picking that has been generated for this sale order"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
=== modified file 'sale/i18n/pt.po'
--- sale/i18n/pt.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/pt.po 2010-12-14 03:25:00 +0000
@@ -1036,8 +1036,8 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
-msgstr "Esta é a lista de recolha gerada para esta factura"
+"This is a list of picking that has been generated for this sale order"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
=== modified file 'sale/i18n/pt_BR.po'
--- sale/i18n/pt_BR.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/pt_BR.po 2010-12-14 03:25:00 +0000
@@ -1086,8 +1086,8 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
-msgstr "Esta é a lista de separação que foi gerada para esta fatura"
+"This is a list of picking that has been generated for this sale order"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
=== modified file 'sale/i18n/ro.po'
--- sale/i18n/ro.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/ro.po 2010-12-14 03:25:00 +0000
@@ -1034,9 +1034,8 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
+"This is a list of picking that has been generated for this sale order"
msgstr ""
-"Aceasta este lista cu articole de ridicat generată pentru această factură"
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
=== modified file 'sale/i18n/ru.po'
--- sale/i18n/ru.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/ru.po 2010-12-14 03:25:00 +0000
@@ -1073,8 +1073,8 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
-msgstr "Ðто ÑпиÑок отборочных лиÑтов, Ñозданных Ð´Ð»Ñ Ñтого Ñчета"
+"This is a list of picking that has been generated for this sale order"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
=== modified file 'sale/i18n/sale.pot'
--- sale/i18n/sale.pot 2010-12-10 17:40:27 +0000
+++ sale/i18n/sale.pot 2010-12-14 03:25:00 +0000
@@ -982,7 +982,7 @@
#. module: sale
#: help:sale.order,picking_ids:0
-msgid "This is the list of picking list that have been generated for this invoice"
+msgid "This is a list of picking that has been generated for this sale order"
msgstr ""
#. module: sale
=== modified file 'sale/i18n/sk.po'
--- sale/i18n/sk.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/sk.po 2010-12-14 03:25:00 +0000
@@ -1035,7 +1035,7 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
+"This is a list of picking that has been generated for this sale order"
msgstr ""
#. module: sale
=== modified file 'sale/i18n/sl.po'
--- sale/i18n/sl.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/sl.po 2010-12-14 03:25:00 +0000
@@ -1034,8 +1034,8 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
-msgstr "To je seznam prevzemnih listov, ki so bili narejeni za ta raÄun"
+"This is a list of picking that has been generated for this sale order"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
=== modified file 'sale/i18n/sq.po'
--- sale/i18n/sq.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/sq.po 2010-12-14 03:25:00 +0000
@@ -1035,7 +1035,7 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
+"This is a list of picking that has been generated for this sale order"
msgstr ""
#. module: sale
=== modified file 'sale/i18n/sr.po'
--- sale/i18n/sr.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/sr.po 2010-12-14 03:25:00 +0000
@@ -1074,8 +1074,8 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
-msgstr "Ovo je spisak izbornih lista koji su generisani za ovaj raÄun"
+"This is a list of picking that has been generated for this sale order"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
=== modified file 'sale/i18n/sr@xxxxxxxx'
--- sale/i18n/sr@xxxxxxxx 2010-12-06 09:32:08 +0000
+++ sale/i18n/sr@xxxxxxxx 2010-12-14 03:25:00 +0000
@@ -1098,8 +1098,8 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
-msgstr "Ovo je spisak izbornih lista koji su generisani za ovaj raÄun"
+"This is a list of picking that has been generated for this sale order"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
=== modified file 'sale/i18n/sv.po'
--- sale/i18n/sv.po 2010-12-12 04:45:47 +0000
+++ sale/i18n/sv.po 2010-12-14 03:25:00 +0000
@@ -1041,8 +1041,8 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
-msgstr "Detta är plocklistan som genererats för denna faktura"
+"This is a list of picking that has been generated for this sale order"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
=== modified file 'sale/i18n/tlh.po'
--- sale/i18n/tlh.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/tlh.po 2010-12-14 03:25:00 +0000
@@ -1034,7 +1034,7 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
+"This is a list of picking that has been generated for this sale order"
msgstr ""
#. module: sale
=== modified file 'sale/i18n/tr.po'
--- sale/i18n/tr.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/tr.po 2010-12-14 03:25:00 +0000
@@ -1036,7 +1036,7 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
+"This is a list of picking that has been generated for this sale order"
msgstr ""
#. module: sale
=== modified file 'sale/i18n/uk.po'
--- sale/i18n/uk.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/uk.po 2010-12-14 03:25:00 +0000
@@ -1034,8 +1034,8 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
-msgstr "СпиÑок відбірних лиÑтів, згенерованих Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ інвойÑа"
+"This is a list of picking that has been generated for this sale order"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
=== modified file 'sale/i18n/vi.po'
--- sale/i18n/vi.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/vi.po 2010-12-14 03:25:00 +0000
@@ -1054,8 +1054,8 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
-msgstr "Äây là danh sách các sản phẩm đã chá»n được tạo ra cho hóa Ä‘Æ¡n nà y"
+"This is a list of picking that has been generated for this sale order"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
=== modified file 'sale/i18n/zh_CN.po'
--- sale/i18n/zh_CN.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/zh_CN.po 2010-12-14 03:25:00 +0000
@@ -1034,8 +1034,8 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
-msgstr "这领料/æè´§å•å·²äº§ç”Ÿåœ¨æ¤å‘票上."
+"This is a list of picking that has been generated for this sale order"
+msgstr ""
#. module: sale
#: model:process.node,note:sale.process_node_packinglist0
=== modified file 'sale/i18n/zh_TW.po'
--- sale/i18n/zh_TW.po 2010-12-11 05:08:50 +0000
+++ sale/i18n/zh_TW.po 2010-12-14 03:25:00 +0000
@@ -1034,7 +1034,7 @@
#. module: sale
#: help:sale.order,picking_ids:0
msgid ""
-"This is the list of picking list that have been generated for this invoice"
+"This is a list of picking that has been generated for this sale order"
msgstr ""
#. module: sale
=== modified file 'sale/process/sale_process.xml'
--- sale/process/sale_process.xml 2010-11-08 13:04:35 +0000
+++ sale/process/sale_process.xml 2010-12-14 03:25:00 +0000
@@ -20,8 +20,8 @@
<field name="menu_id" ref="sale.menu_sale_order"/>
<field name="model_id" ref="sale.model_sale_order"/>
<field eval=""""subflow"""" name="kind"/>
- <field eval=""""Sale Order"""" name="name"/>
- <field eval=""""Confirmed sale order to invoice."""" name="note"/>
+ <field eval=""""Sales Order"""" name="name"/>
+ <field eval=""""Confirmed sales order to invoice."""" name="note"/>
<field name="process_id" ref="account.process_process_invoiceprocess0"/>
<field name="subflow_id" ref="process_process_salesprocess0"/>
<field eval=""""object.state=='draft'"""" name="model_states"/>
@@ -32,8 +32,8 @@
<field name="menu_id" ref="sale.menu_sale_order"/>
<field name="model_id" ref="sale.model_sale_order"/>
<field eval=""""subflow"""" name="kind"/>
- <field eval=""""Sale Order Requisition"""" name="name"/>
- <field eval=""""Drives procurement orders for every sale order line."""" name="note"/>
+ <field eval=""""Sales Order Requisition"""" name="name"/>
+ <field eval=""""Drives procurement orders for every sales order line."""" name="note"/>
<field name="subflow_id" ref="process_process_salesprocess0"/>
<field name="process_id" ref="procurement.process_process_procurementprocess0"/>
<field eval=""""object.state in ('draft', 'waiting_date', 'manual', 'progress', 'shipping_except', 'invoice_except', 'done', 'cancel')"""" name="model_states"/>
@@ -45,7 +45,7 @@
<field name="model_id" ref="sale.model_sale_order"/>
<field eval=""""state"""" name="kind"/>
<field eval=""""Quotation"""" name="name"/>
- <field eval=""""Draft state of sale order"""" name="note"/>
+ <field eval=""""Draft state of sales order"""" name="note"/>
<field name="process_id" ref="process_process_salesprocess0"/>
<field eval=""""object.state=='draft'"""" name="model_states"/>
<field eval="0" name="flow_start"/>
@@ -55,7 +55,7 @@
<field name="menu_id" ref="sale.menu_sale_order"/>
<field name="model_id" ref="sale.model_sale_order"/>
<field eval=""""state"""" name="kind"/>
- <field eval=""""Sale Order"""" name="name"/>
+ <field eval=""""Sales Order"""" name="name"/>
<field eval=""""Drives procurement and invoicing"""" name="note"/>
<field name="process_id" ref="process_process_salesprocess0"/>
<field eval=""""object.state=='manual'"""" name="model_states"/>
@@ -67,7 +67,7 @@
<field name="model_id" ref="procurement.model_procurement_order"/>
<field eval=""""subflow"""" name="kind"/>
<field eval=""""Procurement Order"""" name="name"/>
- <field eval=""""One Procurement order for each sale order line and for each of the components."""" name="note"/>
+ <field eval=""""One Procurement order for each sales order line and for each of the components."""" name="note"/>
<field name="subflow_id" ref="procurement.process_process_procurementprocess0"/>
<field name="process_id" ref="process_process_salesprocess0"/>
<field eval=""""object.state=='confirmed'"""" name="model_states"/>
@@ -136,7 +136,7 @@
<record id="process_transition_confirmquotation0" model="process.transition">
<field eval="[(6,0,[])]" name="transition_ids"/>
<field eval=""""Confirm Quotation"""" name="name"/>
- <field eval=""""The salesman confirms the quotation. The state of the sale order becomes 'In progress' or 'Manual in progress'."""" name="note"/>
+ <field eval=""""The salesman confirms the quotation. The state of the sales order becomes 'In progress' or 'Manual in progress'."""" name="note"/>
<field model="process.node" name="target_node_id" ref="process_node_saleorder0"/>
<field model="process.node" name="source_node_id" ref="process_node_quotation0"/>
<field eval="[(6,0,[ref('sale.trans_draft_router')])]" name="transition_ids"/>
@@ -145,7 +145,7 @@
<record id="process_transition_saleprocurement0" model="process.transition">
<field eval="[(6,0,[])]" name="transition_ids"/>
<field eval=""""Create Procurement Order"""" name="name"/>
- <field eval=""""A procurement order is automatically created as soon as a sale order is confirmed or as the invoice is paid. It drives the purchasing and the production of products regarding to the rules and to the sale order's parameters. """" name="note"/>
+ <field eval=""""A procurement order is automatically created as soon as a sales order is confirmed or as the invoice is paid. It drives the purchasing and the production of products regarding to the rules and to the sales order's parameters. """" name="note"/>
<field model="process.node" name="target_node_id" ref="process_node_saleprocurement0"/>
<field model="process.node" name="source_node_id" ref="process_node_saleorder0"/>
</record>
@@ -153,7 +153,7 @@
<record id="process_transition_packing0" model="process.transition">
<field eval="[(6,0,[])]" name="transition_ids"/>
<field eval=""""Create Pick List"""" name="name"/>
- <field eval=""""The Pick List form is created as soon as the sale order is confirmed, in the same time as the procurement order. It represents the assignment of parts to the sale order. There is 1 pick list by sale order line which evolves with the availability of parts."""" name="note"/>
+ <field eval=""""The Pick List form is created as soon as the sales order is confirmed, in the same time as the procurement order. It represents the assignment of parts to the sales order. There is 1 pick list by sales order line which evolves with the availability of parts."""" name="note"/>
<field model="process.node" name="target_node_id" ref="process_node_packinglist0"/>
<field model="process.node" name="source_node_id" ref="process_node_saleprocurement0"/>
</record>
@@ -186,15 +186,15 @@
<record id="process_transition_saleorderprocurement0" model="process.transition">
<field eval="[(6,0,[])]" name="transition_ids"/>
<field eval=""""Procurement of sold material"""" name="name"/>
- <field eval=""""For every sale order line, a procurement order is created to supply the sold product."""" name="note"/>
+ <field eval=""""For every sales order line, a procurement order is created to supply the sold product."""" name="note"/>
<field model="process.node" name="target_node_id" ref="procurement.process_node_procureproducts0"/>
<field model="process.node" name="source_node_id" ref="process_node_saleorderprocurement0"/>
</record>
<record id="process_transition_saleinvoice0" model="process.transition">
<field eval="[(6,0,[])]" name="transition_ids"/>
- <field eval=""""From a sale order"""" name="name"/>
- <field eval=""""Depending on the Invoicing control of the sale order, the invoice can be based on delivered or on ordered quantities. Thus, a sale order can generates an invoice or a delivery order as soon as it is confirmed by the salesman."""" name="note"/>
+ <field eval=""""From a sales order"""" name="name"/>
+ <field eval=""""Depending on the Invoicing control of the sales order, the invoice can be based on delivered or on ordered quantities. Thus, a sales order can generates an invoice or a delivery order as soon as it is confirmed by the salesman."""" name="note"/>
<field model="process.node" name="target_node_id" ref="account.process_node_draftinvoices0"/>
<field model="process.node" name="source_node_id" ref="process_node_order0"/>
</record>
=== modified file 'sale/sale.py'
--- sale/sale.py 2010-12-07 13:36:57 +0000
+++ sale/sale.py 2010-12-14 03:25:00 +0000
@@ -30,7 +30,7 @@
class sale_shop(osv.osv):
_name = "sale.shop"
- _description = "Sale Shop"
+ _description = "Sales Shop"
_columns = {
'name': fields.char('Shop Name', size=64, required=True),
'payment_default_id': fields.many2one('account.payment.term', 'Default Payment Term', required=True),
@@ -47,7 +47,7 @@
class sale_order(osv.osv):
_name = "sale.order"
- _description = "Sale Order"
+ _description = "Sales Order"
def copy(self, cr, uid, id, default=None, context=None):
if context is None:
@@ -206,7 +206,7 @@
'name': fields.char('Order Reference', size=64, required=True,
readonly=True, states={'draft': [('readonly', False)]}, select=True),
'shop_id': fields.many2one('sale.shop', 'Shop', required=True, readonly=True, states={'draft': [('readonly', False)]}),
- 'origin': fields.char('Source document', size=64, help="Reference of the document that generated this sale order request."),
+ 'origin': fields.char('Source Document', size=64, help="Reference of the document that generated this sales order request."),
'client_order_ref': fields.char('Customer Reference', size=64),
'state': fields.selection([
('draft', 'Quotation'),
@@ -217,41 +217,41 @@
('invoice_except', 'Invoice Exception'),
('done', 'Done'),
('cancel', 'Cancelled')
- ], 'Order State', readonly=True, help="Gives the state of the quotation or sale order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the date 'Ordered Date'.", select=True),
+ ], 'Order State', readonly=True, help="Gives the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the date 'Ordered Date'.", select=True),
'date_order': fields.date('Ordered Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
- 'create_date': fields.date('Creation Date', readonly=True, help="Date on which sale order is created"),
- 'date_confirm': fields.date('Confirmation Date', readonly=True, help="Date on which sale order is confirmed"),
+ 'create_date': fields.date('Creation Date', readonly=True, help="Date on which sales order is created."),
+ 'date_confirm': fields.date('Confirmation Date', readonly=True, help="Date on which sales order is confirmed."),
'user_id': fields.many2one('res.users', 'Salesman', states={'draft': [('readonly', False)]}, select=True),
'partner_id': fields.many2one('res.partner', 'Customer', readonly=True, states={'draft': [('readonly', False)]}, required=True, change_default=True, select=True),
- 'partner_invoice_id': fields.many2one('res.partner.address', 'Invoice Address', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Invoice address for current sale order"),
+ 'partner_invoice_id': fields.many2one('res.partner.address', 'Invoice Address', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Invoice address for current sales order."),
'partner_order_id': fields.many2one('res.partner.address', 'Ordering Contact', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="The name and address of the contact who requested the order or quotation."),
- 'partner_shipping_id': fields.many2one('res.partner.address', 'Shipping Address', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Shipping address for current sale order"),
+ 'partner_shipping_id': fields.many2one('res.partner.address', 'Shipping Address', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Shipping address for current sales order."),
- 'incoterm': fields.many2one('stock.incoterms', 'Incoterm', help="Incoterm which stands for 'International Commercial terms' implies its a series of sales terms which are used in the commercial transaction"),
+ 'incoterm': fields.many2one('stock.incoterms', 'Incoterm', help="Incoterm which stands for 'International Commercial terms' implies its a series of sales terms which are used in the commercial transaction."),
'picking_policy': fields.selection([('direct', 'Partial Delivery'), ('one', 'Complete Delivery')],
'Picking Policy', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="""If you don't have enough stock available to deliver all at once, do you accept partial shipments or not?"""),
'order_policy': fields.selection([
('prepaid', 'Payment Before Delivery'),
('manual', 'Shipping & Manual Invoice'),
- ('postpaid', 'Invoice on Order After Delivery'),
- ('picking', 'Invoice from Delivery'),
+ ('postpaid', 'Invoice On Order After Delivery'),
+ ('picking', 'Invoice From The Picking'),
], 'Shipping Policy', required=True, readonly=True, states={'draft': [('readonly', False)]},
help="""The Shipping Policy is used to synchronise invoice and delivery operations.
- - The 'Pay before delivery' choice will first generate the invoice and then generate the picking order after the payment of this invoice.
+ - The 'Pay Before delivery' choice will first generate the invoice and then generate the picking order after the payment of this invoice.
- The 'Shipping & Manual Invoice' will create the picking order directly and wait for the user to manually click on the 'Invoice' button to generate the draft invoice.
- - The 'Invoice on Order After Delivery' choice will generate the draft invoice based on sale order after all picking lists have been finished.
- - The 'Invoice from the picking' choice is used to create an invoice during the picking process."""),
- 'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="Pricelist version for current sale order"),
- 'project_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True, states={'draft': [('readonly', False)]}, help="The analytic account related to a sale order"),
+ - The 'Invoice On Order After Delivery' choice will generate the draft invoice based on sales order after all picking lists have been finished.
+ - The 'Invoice From The Picking' choice is used to create an invoice during the picking process."""),
+ 'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="Pricelist for current sales order."),
+ 'project_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True, states={'draft': [('readonly', False)]}, help="The analytic account related to a sales order."),
'order_line': fields.one2many('sale.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft': [('readonly', False)]}),
- 'invoice_ids': fields.many2many('account.invoice', 'sale_order_invoice_rel', 'order_id', 'invoice_id', 'Invoices', readonly=True, help="This is the list of invoices that have been generated for this sale order. The same sale order may have been invoiced in several times (by line for example)."),
- 'picking_ids': fields.one2many('stock.picking', 'sale_id', 'Related Picking', readonly=True, help="This is the list of picking list that have been generated for this invoice"),
- 'shipped': fields.boolean('Delivered', readonly=True, help="It indicates that the sale order has been delivered. This field is updated only after the scheduler have been launched !"),
+ 'invoice_ids': fields.many2many('account.invoice', 'sale_order_invoice_rel', 'order_id', 'invoice_id', 'Invoices', readonly=True, help="This is the list of invoices that have been generated for this sales order. The same sales order may have been invoiced in several times (by line for example)."),
+ 'picking_ids': fields.one2many('stock.picking', 'sale_id', 'Related Picking', readonly=True, help="This is a list of picking that has been generated for this sales order."),
+ 'shipped': fields.boolean('Delivered', readonly=True, help="It indicates that the sales order has been delivered. This field is updated only after the scheduler(s) have been launched."),
'picked_rate': fields.function(_picked_rate, method=True, string='Picked', type='float'),
'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float'),
'invoiced': fields.function(_invoiced, method=True, string='Paid',
- fnct_search=_invoiced_search, type='boolean', help="It indicates that an invoice has been paid"),
+ fnct_search=_invoiced_search, type='boolean', help="It indicates that an invoice has been paid."),
'note': fields.text('Notes'),
'amount_untaxed': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Sale Price'), string='Untaxed Amount',
@@ -259,21 +259,21 @@
'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
},
- multi='sums', help="The amount without tax"),
+ multi='sums', help="The amount without tax."),
'amount_tax': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Sale Price'), string='Taxes',
store = {
'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
},
- multi='sums', help="The tax amount"),
+ multi='sums', help="The tax amount."),
'amount_total': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Sale Price'), string='Total',
store = {
'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
},
- multi='sums', help="The total amount"),
+ multi='sums', help="The total amount."),
- 'invoice_quantity': fields.selection([('order', 'Ordered Quantities'), ('procurement', 'Shipped Quantities')], 'Invoice on', help="The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you want your invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks.", required=True),
+ 'invoice_quantity': fields.selection([('order', 'Ordered Quantities'), ('procurement', 'Shipped Quantities')], 'Invoice on', help="The sales order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you want your invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks.", required=True),
'payment_term': fields.many2one('account.payment.term', 'Payment Term'),
'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position'),
'company_id': fields.related('shop_id','company_id',type='many2one',relation='res.company',string='Company',store=True)
@@ -281,7 +281,7 @@
_defaults = {
'picking_policy': 'direct',
'date_order': lambda *a: time.strftime('%Y-%m-%d'),
- 'order_policy': 'manual',
+
'state': 'draft',
'user_id': lambda obj, cr, uid, context: uid,
'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'sale.order'),
@@ -302,7 +302,7 @@
if s['state'] in ['draft', 'cancel']:
unlink_ids.append(s['id'])
else:
- raise osv.except_osv(_('Invalid action !'), _('Cannot delete Sale Order(s) which are already confirmed !'))
+ raise osv.except_osv(_('Invalid action !'), _('Cannot delete Sales Order(s) which are already confirmed !'))
return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
def onchange_shop_id(self, cr, uid, ids, shop_id):
@@ -328,7 +328,7 @@
wf_service.trg_delete(uid, 'sale.order', inv_id, cr)
wf_service.trg_create(uid, 'sale.order', inv_id, cr)
for (id,name) in self.name_get(cr, uid, ids):
- message = _("The sale order '%s' has been set in draft state.") %(name,)
+ message = _("The sales order '%s' has been set in draft state.") %(name,)
self.log(cr, uid, id, message)
return True
@@ -393,7 +393,7 @@
#FIXME: the method should return the list of invoices created (invoice_ids)
# and not the id of the last invoice created (res). The problem is that we
- # cannot change it directly since the method is called by the sale order
+ # cannot change it directly since the method is called by the sales order
# workflow and I suppose it expects a single id...
def _inv_get(self, cr, uid, order, context=None):
if context is None:
@@ -410,7 +410,7 @@
journal_ids = journal_obj.search(cr, uid, [('type', '=', 'sale'), ('company_id', '=', order.company_id.id)], limit=1)
if not journal_ids:
raise osv.except_osv(_('Error !'),
- _('There is no sale journal defined for this company: "%s" (id:%d)') % (order.company_id.name, order.company_id.id))
+ _('There is no sales journal defined for this company: "%s" (id:%d)') % (order.company_id.name, order.company_id.id))
a = order.partner_id.property_account_receivable.id
pay_term = order.payment_term and order.payment_term.id or False
invoiced_sale_line_ids = self.pool.get('sale.order.line').search(cr, uid, [('order_id', '=', order.id), ('invoiced', '=', True)], context=context)
@@ -576,7 +576,7 @@
if vals:
self.pool.get('sale.order.line').write(cr, uid, [line.id], vals, context=context)
#
- # Update the sale order state.
+ # Update the sales order state.
#
if order.state == 'invoice_except':
self.write(cr, uid, [order.id], {'state': 'progress'}, context=context)
@@ -591,22 +591,22 @@
for pick in sale.picking_ids:
if pick.state not in ('draft', 'cancel'):
raise osv.except_osv(
- _('Could not cancel sale order !'),
- _('You must first cancel all picking attached to this sale order.'))
+ _('Could not cancel sales order !'),
+ _('You must first cancel all picking attached to this sales order.'))
for r in self.read(cr, uid, ids, ['picking_ids']):
for pick in r['picking_ids']:
wf_service.trg_validate(uid, 'stock.picking', pick, 'button_cancel', cr)
for inv in sale.invoice_ids:
if inv.state not in ('draft', 'cancel'):
raise osv.except_osv(
- _('Could not cancel this sale order !'),
- _('You must first cancel all invoices attached to this sale order.'))
+ _('Could not cancel this sales order !'),
+ _('You must first cancel all invoices attached to this sales order.'))
for r in self.read(cr, uid, ids, ['invoice_ids']):
for inv in r['invoice_ids']:
wf_service.trg_validate(uid, 'account.invoice', inv, 'invoice_cancel', cr)
sale_order_line_obj.write(cr, uid, [l.id for l in sale.order_line],
{'state': 'cancel'})
- message = _("The sale order '%s' has been cancelled.") % (sale.name,)
+ message = _("The sales order '%s' has been cancelled.") % (sale.name,)
self.log(cr, uid, sale.id, message)
self.write(cr, uid, ids, {'state': 'cancel'})
return True
@@ -618,7 +618,7 @@
else:
self.write(cr, uid, [o.id], {'state': 'progress', 'date_confirm': time.strftime('%Y-%m-%d')})
self.pool.get('sale.order.line').button_confirm(cr, uid, [x.id for x in o.order_line])
- message = _("The quotation '%s' has been converted to a sale order.") % (o.name,)
+ message = _("The quotation '%s' has been converted to a sales order.") % (o.name,)
self.log(cr, uid, o.id, message)
return True
@@ -671,6 +671,8 @@
def action_ship_create(self, cr, uid, ids, *args):
wf_service = netsvc.LocalService("workflow")
picking_id = False
+ move_obj = self.pool.get('stock.move')
+ proc_obj = self.pool.get('procurement.order')
company = self.pool.get('res.users').browse(cr, uid, uid).company_id
for order in self.browse(cr, uid, ids, context={}):
proc_ids = []
@@ -722,6 +724,7 @@
'note': line.notes,
'company_id': order.company_id.id,
})
+
if line.product_id:
proc_id = self.pool.get('procurement.order').create(cr, uid, {
'name': line.name,
@@ -743,6 +746,16 @@
proc_ids.append(proc_id)
self.pool.get('sale.order.line').write(cr, uid, [line.id], {'procurement_id': proc_id})
+ if order.state == 'shipping_except':
+ for pick in order.picking_ids:
+ for move in pick.move_lines:
+ if move.state == 'cancel':
+ mov_ids = move_obj.search(cr, uid, [('state', '=', 'cancel'),('sale_line_id', '=', line.id),('picking_id', '=', pick.id)])
+ if mov_ids:
+ for mov in move_obj.browse(cr, uid, mov_ids):
+ move_obj.write(cr, uid, [move_id], {'product_qty': mov.product_qty, 'product_uos_qty': mov.product_uos_qty})
+ proc_obj.write(cr, uid, [proc_id], {'product_qty': mov.product_qty, 'product_uos_qty': mov.product_uos_qty})
+
val = {}
for proc_id in proc_ids:
wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
@@ -752,6 +765,7 @@
if order.state == 'shipping_except':
val['state'] = 'progress'
+ val['shipped'] = False
if (order.order_policy == 'manual'):
for line in order.order_line:
@@ -843,11 +857,11 @@
return res
_name = 'sale.order.line'
- _description = 'Sale Order Line'
+ _description = 'Sales Order Line'
_columns = {
'order_id': fields.many2one('sale.order', 'Order Reference', required=True, ondelete='cascade', select=True, readonly=True, states={'draft':[('readonly',False)]}),
'name': fields.char('Description', size=256, required=True, select=True, readonly=True, states={'draft': [('readonly', False)]}),
- 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of sale order lines."),
+ 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of sales order lines."),
'delay': fields.float('Delivery Lead Time', required=True, help="Number of days between the order confirmation the shipping of the products to the customer", readonly=True, states={'draft': [('readonly', False)]}),
'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], change_default=True),
'invoice_lines': fields.many2many('account.invoice.line', 'sale_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
@@ -870,12 +884,12 @@
'notes': fields.text('Notes'),
'th_weight': fields.float('Weight', readonly=True, states={'draft': [('readonly', False)]}),
'state': fields.selection([('draft', 'Draft'),('confirmed', 'Confirmed'),('done', 'Done'),('cancel', 'Cancelled'),('exception', 'Exception')], 'State', required=True, readonly=True,
- help='* The \'Draft\' state is set when the related sale order in draft state. \
- \n* The \'Confirmed\' state is set when the related sale order is confirmed. \
- \n* The \'Exception\' state is set when the related sale order is set as exception. \
- \n* The \'Done\' state is set when the sale order line has been picked. \
- \n* The \'Cancelled\' state is set when a user cancel the sale order related.'),
- 'order_partner_id': fields.related('order_id', 'partner_id', type='many2one', relation='res.partner', string='Customer'),
+ help='* The \'Draft\' state is set when the related sales order in draft state. \
+ \n* The \'Confirmed\' state is set when the related sales order is confirmed. \
+ \n* The \'Exception\' state is set when the related sales order is set as exception. \
+ \n* The \'Done\' state is set when the sales order line has been picked. \
+ \n* The \'Cancelled\' state is set when a user cancel the sales order related.'),
+ 'order_partner_id': fields.related('order_id', 'partner_id', type='many2one', relation='res.partner', store=True, string='Customer'),
'salesman_id':fields.related('order_id', 'user_id', type='many2one', relation='res.users', store=True, string='Salesman'),
'company_id': fields.related('order_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True, states={'draft': [('readonly', False)]}),
}
@@ -971,12 +985,12 @@
context = {}
for line in self.browse(cr, uid, ids, context=context):
if line.invoiced:
- raise osv.except_osv(_('Invalid action !'), _('You cannot cancel a sale order line that has already been invoiced !'))
+ raise osv.except_osv(_('Invalid action !'), _('You cannot cancel a sales order line that has already been invoiced !'))
for move_line in line.move_ids:
if move_line.state != 'cancel':
raise osv.except_osv(
- _('Could not cancel sale order line!'),
- _('You must first cancel stock moves attached to this sale order line.'))
+ _('Could not cancel sales order line!'),
+ _('You must first cancel stock moves attached to this sales order line.'))
return self.write(cr, uid, ids, {'state': 'cancel'})
def button_confirm(self, cr, uid, ids, context=None):
@@ -1025,7 +1039,7 @@
uom=False, qty_uos=0, uos=False, name='', partner_id=False,
lang=False, update_tax=True, date_order=False, packaging=False, fiscal_position=False, flag=False):
if not partner_id:
- raise osv.except_osv(_('No Customer Defined !'), _('You have to select a customer in the sale form !\nPlease set one customer before choosing a product.'))
+ raise osv.except_osv(_('No Customer Defined !'), _('You have to select a customer in the sales form !\nPlease set one customer before choosing a product.'))
warning = {}
product_uom_obj = self.pool.get('product.uom')
partner_obj = self.pool.get('res.partner')
@@ -1137,7 +1151,7 @@
warning = {
'title': 'No Pricelist !',
'message':
- 'You have to select a pricelist or a customer in the sale form !\n'
+ 'You have to select a pricelist or a customer in the sales form !\n'
'Please set one before choosing a product.'
}
else:
@@ -1173,10 +1187,10 @@
def unlink(self, cr, uid, ids, context=None):
if context is None:
context = {}
- """Allows to delete sale order lines in draft,cancel states"""
+ """Allows to delete sales order lines in draft,cancel states"""
for rec in self.browse(cr, uid, ids, context=context):
if rec.state not in ['draft', 'cancel']:
- raise osv.except_osv(_('Invalid action !'), _('Cannot delete a sale order line which is %s !') %(rec.state,))
+ raise osv.except_osv(_('Invalid action !'), _('Cannot delete a sales order line which is %s !') %(rec.state,))
return super(sale_order_line, self).unlink(cr, uid, ids, context=context)
sale_order_line()
@@ -1199,7 +1213,7 @@
'step': fields.selection([
('one', 'Delivery Order Only'),
('two', 'Picking List & Delivery Order')
- ], 'Steps To Deliver a Sale Order', required=True,
+ ], 'Steps To Deliver a Sales Order', required=True,
help="By default, OpenERP is able to manage complex routing and paths "\
"of products in your warehouse and partner locations. This will configure "\
"the most common and simple methods to deliver products to the customer "\
=== modified file 'sale/sale_data.xml'
--- sale/sale_data.xml 2010-10-11 21:57:06 +0000
+++ sale/sale_data.xml 2010-12-14 03:25:00 +0000
@@ -5,10 +5,10 @@
Requests Links
-->
<record id="req_link_sale_order" model="res.request.link">
- <field name="name">Sale Order</field>
+ <field name="name">Sales Order</field>
<field name="object">sale.order</field>
</record>
-
+
<!--
Resource: sale.shop
-->
@@ -18,8 +18,8 @@
<field model="account.payment.term" name="payment_default_id" search="[]"/>
<field model="res.company" name="company_id" search="[]"/>
</record>
-
+
<function eval="('default',False,'shop_id', [('sale.order', False)], shop, True, False, False, False, True)" id="sale_default_set" model="ir.values" name="set"/>
-
+
</data>
</openerp>
=== modified file 'sale/sale_sequence.xml'
--- sale/sale_sequence.xml 2010-08-18 09:06:16 +0000
+++ sale/sale_sequence.xml 2010-12-14 03:25:00 +0000
@@ -4,12 +4,12 @@
<!-- Sequences for sale.order -->
<record id="seq_type_sale_order" model="ir.sequence.type">
- <field name="name">Sale Order</field>
+ <field name="name">Sales Order</field>
<field name="code">sale.order</field>
</record>
<record id="seq_sale_order" model="ir.sequence">
- <field name="name">Sale Order</field>
+ <field name="name">Sales Order</field>
<field name="code">sale.order</field>
<field name="prefix">SO</field>
<field name="padding">3</field>
=== modified file 'sale/sale_unit_test.xml'
--- sale/sale_unit_test.xml 2010-05-27 12:47:06 +0000
+++ sale/sale_unit_test.xml 2010-12-14 03:25:00 +0000
@@ -33,28 +33,28 @@
<field name="type">make_to_stock</field>
</record>
- <assert id="test_order_1" model="sale.order" severity="error" string="The amount of the sale order is correctly computed">
+ <assert id="test_order_1" model="sale.order" severity="error" string="The amount of the sales order is correctly computed">
<test expr="sum([l.price_subtotal for l in order_line]) == amount_untaxed"/>
</assert>
<workflow action="order_confirm" model="sale.order" ref="test_order_1"/>
- <assert id="test_order_1" model="sale.order" string="the sale order is now in 'Manual in progress' state">
+ <assert id="test_order_1" model="sale.order" string="the sales order is now in 'Manual in progress' state">
<test expr="state">manual</test>
</assert>
<workflow action="manual_invoice" model="sale.order" ref="test_order_1" uid="base.user_root"/>
- <assert id="test_order_1" model="sale.order" string="the sale order is now in progress">
+ <assert id="test_order_1" model="sale.order" string="the sales order is now in progress">
<test expr="state">progress</test>
</assert>
<!-- Treat generated invoice -->
- <assert id="test_order_1" model="sale.order" severity="fatal" string="the sale order has now a corresponding invoice">
+ <assert id="test_order_1" model="sale.order" severity="fatal" string="the sales order has now a corresponding invoice">
<test expr="len(invoice_ids) == 1"/>
</assert>
- <assert id="test_order_1" model="sale.order" severity="fatal" string="the sale order's has the same amount and is currently a draft">
+ <assert id="test_order_1" model="sale.order" severity="fatal" string="the sales order's has the same amount and is currently a draft">
<test expr="invoice_ids[0].amount_untaxed == amount_untaxed"/>
<test expr="invoice_ids[0].amount_total == amount_total"/>
<test expr="invoice_ids[0].state">draft</test>
@@ -75,16 +75,16 @@
<value eval="ref('account.bank_journal')"/>
</function>
- <assert id="test_order_1" model="sale.order" severity="fatal" string="the sale order's invoice is now paid">
+ <assert id="test_order_1" model="sale.order" severity="fatal" string="the sales order's invoice is now paid">
<test expr="invoice_ids[0].state">paid</test>
</assert>
<!-- Treat generated picking -->
- <assert id="test_order_1" model="sale.order" severity="fatal" string="the sale order has now a correspending picking">
+ <assert id="test_order_1" model="sale.order" severity="fatal" string="the sales order has now a correspending picking">
<test expr="len(picking_ids) == 1"/>
</assert>
- <assert id="test_order_1" model="sale.order" severity="error" string="the sale order's picking will be sent to the good address and is already confirmed">
+ <assert id="test_order_1" model="sale.order" severity="error" string="the sales order's picking will be sent to the good address and is already confirmed">
<test expr="picking_ids[0].address_id == partner_shipping_id"/>
<!-- test expr="picking_ids[0].state">confirmed</test # Desactivated because of MRP_JIT -->
</assert>
@@ -94,7 +94,7 @@
<value eval="[obj(ref('test_order_1')).picking_ids[0].id]" model="sale.order"/>
</function>
- <assert id="test_order_1" model="sale.order" severity="fatal" string="the sale order's picking is now assigned">
+ <assert id="test_order_1" model="sale.order" severity="fatal" string="the sales order's picking is now assigned">
<test expr="picking_ids[0].state">assigned</test>
</assert>
@@ -107,14 +107,14 @@
<value eval="obj(ref('test_order_1')).picking_ids[0].id" model="sale.order"/>
</workflow>
- <assert id="test_order_1" model="sale.order" string="the sale order's picking is now done">
+ <assert id="test_order_1" model="sale.order" string="the sales order's picking is now done">
<test expr="picking_ids[0].state">done</test>
</assert>
<!-- Run all schedulers -->
<function model="procurement.order" name="run_scheduler"/>
- <assert id="test_order_1" model="sale.order" string="the sale order is now done">
+ <assert id="test_order_1" model="sale.order" string="the sales order is now done">
<test expr="state">done</test>
</assert>
</data>
=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml 2010-11-25 05:32:05 +0000
+++ sale/sale_view.xml 2010-12-14 03:25:00 +0000
@@ -14,7 +14,7 @@
<field name="model">sale.shop</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Sale Shop">
+ <form string="Sales Shop">
<field name="name" select="1"/>
<field name="warehouse_id" required="1" select="1" widget="selection"/>
<field name="company_id" widget='selection' groups="base.group_multi_company"/>
@@ -30,7 +30,7 @@
<field name="model">sale.shop</field>
<field name="type">tree</field>
<field name="arch" type="xml">
- <tree string="Sale Shop">
+ <tree string="Sales Shop">
<field name="name"/>
<field name="warehouse_id"/>
<field name="pricelist_id"/>
@@ -122,7 +122,7 @@
groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]" />
<newline/>
<field colspan="4" mode="tree,form,graph" name="order_line" nolabel="1" widget="one2many_list">
- <form string="Sale Order Lines">
+ <form string="Sales Order Lines">
<notebook>
<page string="Order Line">
<field colspan="4"
@@ -245,8 +245,9 @@
<field colspan="4" name="note" nolabel="1"/>
</page>
<page string="History" groups="base.group_extended">
- <separator colspan="4" string="Related Invoices"/>
+ <separator colspan="4" string="Invoices"/>
<field colspan="4" name="invoice_ids" nolabel="1" context="{'form_view_ref':'account.invoice_form'}"/>
+ <separator colspan="4" string="Packings"/>
<field colspan="4" name="picking_ids" nolabel="1"/>
</page>
</notebook>
@@ -430,7 +431,7 @@
<field name="order_partner_id"/>
<field name="product_id"/>
<field name="salesman_id">
- <filter icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sale Order Lines related to a Sales Order of mine"/>
+ <filter icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sales Order Lines related to a Sales Order of mine"/>
</field>
<newline/>
<group expand="context.get('report',False)" string="Group By..." colspan="9" col="8">
@@ -474,7 +475,7 @@
<field name="order_partner_id"/>
<field name="product_id"/>
<field name="salesman_id">
- <filter icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sale Order Lines"/>
+ <filter icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sales Order Lines"/>
</field>
<newline />
<group expand="0" string="Group By..." colspan="9" col="8">
=== modified file 'sale/security/ir.model.access.csv'
--- sale/security/ir.model.access.csv 2010-11-02 05:57:27 +0000
+++ sale/security/ir.model.access.csv 2010-12-14 03:25:00 +0000
@@ -51,3 +51,5 @@
"access_product_supplierinfo_user","product.supplierinfo.user","product.model_product_supplierinfo","base.group_sale_salesman",1,0,0,0
"access_product_pricelist_sale_user","product.pricelist.sale.user","product.model_product_pricelist","base.group_sale_salesman",1,0,0,0
"access_account_account_salesman","account_account salesman","account.model_account_account","base.group_sale_salesman",1,0,0,0
+"access_sale_shop_sale_user","sale.shop.sale.user","model_sale_shop","base.group_sale_salesman",1,1,1,0
+"access_sale_shop_sale_manager","sale.shop.sale.manager","model_sale_shop","base.group_sale_manager",1,1,1,1
=== modified file 'sale/stock.py'
--- sale/stock.py 2010-11-27 20:16:16 +0000
+++ sale/stock.py 2010-12-14 03:25:00 +0000
@@ -24,7 +24,7 @@
class stock_move(osv.osv):
_inherit = 'stock.move'
_columns = {
- 'sale_line_id': fields.many2one('sale.order.line', 'Sale Order Line', ondelete='set null', select=True, readonly=True),
+ 'sale_line_id': fields.many2one('sale.order.line', 'Sales Order Line', ondelete='set null', select=True, readonly=True),
}
def _create_chained_picking(self, cr, uid, pick_name, picking, ptype, move, context=None):
@@ -37,7 +37,7 @@
class stock_picking(osv.osv):
_inherit = 'stock.picking'
_columns = {
- 'sale_id': fields.many2one('sale.order', 'Sale Order', ondelete='set null', select=True),
+ 'sale_id': fields.many2one('sale.order', 'Sales Order', ondelete='set null', select=True),
}
_defaults = {
'sale_id': False
@@ -97,7 +97,7 @@
def _invoice_line_hook(self, cursor, user, move_line, invoice_line_id):
sale_line_obj = self.pool.get('sale.order.line')
if move_line.sale_line_id:
- sale_line_obj.write(cursor, user, [move_line.sale_line_id.id],
+ sale_line_obj.write(cursor, user, [move_line.sale_line_id.id],
{
'invoiced': True,
'invoice_lines': [(4, invoice_line_id)],
=== modified file 'sale/stock_view.xml'
--- sale/stock_view.xml 2010-10-20 05:16:24 +0000
+++ sale/stock_view.xml 2010-12-14 03:25:00 +0000
@@ -12,7 +12,7 @@
</field>
</field>
</record>
-
+
<record id="stock_move_sale" model="ir.ui.view">
<field name="name">stock.move.form</field>
<field name="model">stock.move</field>
@@ -24,7 +24,7 @@
</xpath>
</field>
</record>
-
+
<!--
<act_window
domain="[('sale_id', '=', active_id)]"
@@ -33,14 +33,14 @@
res_model="stock.picking"
src_model="sale.order"
context="{'contact_display': 'partner'}" />
-
+
<record id="action_sale_picking_out_tree_view" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="stock.view_picking_out_tree"/>
<field name="act_window_id" ref="act_sale_order_2_stock_picking"/>
</record>
-
+
<record id="action_sale_picking_out_form_view" model="ir.actions.act_window.view">
<field eval="2" name="sequence"/>
<field name="view_mode">form</field>
@@ -48,9 +48,9 @@
<field name="act_window_id" ref="act_sale_order_2_stock_picking"/>
</record>
-->
-
- <!-- Adding Sale Order Reference to outgoing picking -->
-
+
+ <!-- Adding Sales Order Reference to outgoing picking -->
+
<record id="stock_picking_out_inherit_sale" model="ir.ui.view">
<field name="name">Outgoing picking Inherited</field>
<field name="model">stock.picking</field>
=== modified file 'sale/wizard/sale_line_invoice.py'
--- sale/wizard/sale_line_invoice.py 2010-10-25 12:54:08 +0000
+++ sale/wizard/sale_line_invoice.py 2010-12-14 03:25:00 +0000
@@ -25,7 +25,7 @@
class sale_order_line_make_invoice(osv.osv_memory):
_name = "sale.order.line.make.invoice"
- _description = "Sale OrderLine Make_invoice"
+ _description = "Sales OrderLine Make_invoice"
def make_invoices(self, cr, uid, ids, context):
"""
To make invoices.
@@ -108,7 +108,7 @@
sales_order_obj.write(cr, uid, [line.order_id.id], {'state': 'progress'})
if not invoices:
- raise osv.except_osv(_('Warning'), _('Invoice cannot be created for this Sale Order Line due to one of the following reasons:\n1.The state of this sale order line is either "draft" or "cancel"!\n2.The Sale Order Line is Invoiced!'))
+ raise osv.except_osv(_('Warning'), _('Invoice cannot be created for this Sales Order Line due to one of the following reasons:\n1.The state of this sales order line is either "draft" or "cancel"!\n2.The Sales Order Line is Invoiced!'))
return {}
=== modified file 'sale/wizard/sale_line_invoice.xml'
--- sale/wizard/sale_line_invoice.xml 2010-10-12 10:39:32 +0000
+++ sale/wizard/sale_line_invoice.xml 2010-12-14 03:25:00 +0000
@@ -2,7 +2,7 @@
<openerp>
<data>
<record id="view_sale_order_line_make_invoice" model="ir.ui.view">
- <field name="name">Sale OrderLine Make Invoice</field>
+ <field name="name">Sales OrderLine Make Invoice</field>
<field name="model">sale.order.line.make.invoice</field>
<field name="type">form</field>
<field name="arch" type="xml">
@@ -23,7 +23,7 @@
<field name="view_id" ref="view_sale_order_line_make_invoice"/>
<field name="target">new</field>
</record>
-
+
<record model="ir.values" id="sale_order_line_make_invoice">
<field name="model_id" ref="sale.model_sale_order_line" />
<field name="object" eval="1" />
=== modified file 'sale/wizard/sale_make_invoice.py'
--- sale/wizard/sale_make_invoice.py 2010-10-28 13:16:19 +0000
+++ sale/wizard/sale_make_invoice.py 2010-12-14 03:25:00 +0000
@@ -24,7 +24,7 @@
class sale_make_invoice(osv.osv_memory):
_name = "sale.make.invoice"
- _description = "Sale Make Invoice"
+ _description = "Sales Make Invoice"
_columns = {
'grouped': fields.boolean('Group the invoices', help='Check the box to group the invoices for the same customers'),
'invoice_date': fields.date('Invoice Date'),
@@ -32,16 +32,16 @@
_defaults = {
'grouped': False
}
-
+
def view_init(self, cr, uid, fields_list, context=None):
if context is None:
context = {}
- record_id = context and context.get('active_id', False)
+ record_id = context and context.get('active_id', False)
order = self.pool.get('sale.order').browse(cr, uid, record_id)
if order.state == 'draft':
- raise osv.except_osv(_('Warning !'),'You can not create invoice when sale order is not confirmed.')
+ raise osv.except_osv(_('Warning !'),'You can not create invoice when sales order is not confirmed.')
return False
-
+
def make_invoices(self, cr, uid, ids, context={}):
order_obj = self.pool.get('sale.order')
mod_obj = self.pool.get('ir.model.data')
@@ -51,11 +51,11 @@
wf_service = netsvc.LocalService("workflow")
for id in context.get(('active_ids'), []):
wf_service.trg_validate(uid, 'sale.order', id, 'manual_invoice', cr)
-
+
for o in order_obj.browse(cr, uid, context.get(('active_ids'), []), context):
for i in o.invoice_ids:
newinv.append(i.id)
-
+
res = mod_obj.get_object_reference(cr, uid, 'account', 'view_account_invoice_filter')
return {
@@ -67,9 +67,9 @@
'view_id': False,
'context': "{'type': 'out_refund'}",
'type': 'ir.actions.act_window',
- 'search_view_id': res and res[1] or False
+ 'search_view_id': res and res[1] or False
}
-sale_make_invoice()
+sale_make_invoice()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
=== modified file 'sale/wizard/sale_make_invoice_advance.py'
--- sale/wizard/sale_make_invoice_advance.py 2010-10-29 04:17:01 +0000
+++ sale/wizard/sale_make_invoice_advance.py 2010-12-14 03:25:00 +0000
@@ -23,7 +23,7 @@
class sale_advance_payment_inv(osv.osv_memory):
_name = "sale.advance.payment.inv"
- _description = "Sale Advance Payment Invoice"
+ _description = "Sales Advance Payment Invoice"
_columns = {
'product_id': fields.many2one('product.product', 'Advance Product', required=True,
help="Select a product of type service which is called 'Advance Product'. You may have to create it and set it as a default value on this field."),
@@ -59,7 +59,7 @@
if sale.order_policy == 'postpaid':
raise osv.except_osv(
_('Error'),
- _("You cannot make an advance on a sale order \
+ _("You cannot make an advance on a sales order \
that is defined as 'Automatic Invoice after delivery'."))
val = obj_lines.product_id_change(cr, uid, [], sale_adv_obj.product_id.id,
uom = False, partner_id = sale.partner_id.id, fposition_id = sale.fiscal_position.id)
@@ -134,7 +134,7 @@
class sale_open_invoice(osv.osv_memory):
_name = "sale.open.invoice"
- _description = "Sale Open Invoice"
+ _description = "Sales Open Invoice"
def open_invoice(self, cr, uid, ids, context=None):
=== modified file 'sale_crm/wizard/crm_make_sale.py'
--- sale_crm/wizard/crm_make_sale.py 2010-11-18 07:08:23 +0000
+++ sale_crm/wizard/crm_make_sale.py 2010-12-14 03:25:00 +0000
@@ -28,7 +28,7 @@
""" Make sale order for crm """
_name = "crm.make.sale"
- _description = "Make sale"
+ _description = "Make sales"
def _selectPartner(self, cr, uid, context=None):
"""
@@ -61,9 +61,9 @@
@param self: The object pointer
@param cr: the current row, from the database cursor,
@param uid: the current user’s ID for security checks,
- @param ids: List of crm make sale' ids
+ @param ids: List of crm make sales' ids
@param context: A standard dictionary for contextual values
- @return: Dictionary value of created sale order.
+ @return: Dictionary value of created sales order.
"""
if not context:
context = {}
@@ -75,7 +75,7 @@
for make in self.browse(cr, uid, ids, context=context):
partner = make.partner_id
- partner_addr = partner_obj.address_get(cr, uid, [partner.id],
+ partner_addr = partner_obj.address_get(cr, uid, [partner.id],
['default', 'invoice', 'delivery', 'contact'])
pricelist = partner.property_product_pricelist.id
fpos = partner.property_account_position and partner.property_account_position.id or False
@@ -84,23 +84,23 @@
if not partner and case.partner_id:
partner = case.partner_id
fpos = partner.property_account_position and partner.property_account_position.id or False
- partner_addr = partner_obj.address_get(cr, uid, [partner.id],
+ partner_addr = partner_obj.address_get(cr, uid, [partner.id],
['default', 'invoice', 'delivery', 'contact'])
pricelist = partner.property_product_pricelist.id
if False in partner_addr.values():
raise osv.except_osv(_('Data Insufficient!'), _('Customer has no addresses defined!'))
vals = {
- 'origin': _('Opportunity: %s') % str(case.id),
- 'section_id': case.section_id and case.section_id.id or False,
- 'shop_id': make.shop_id.id,
- 'partner_id': partner.id,
- 'pricelist_id': pricelist,
- 'partner_invoice_id': partner_addr['invoice'],
- 'partner_order_id': partner_addr['contact'],
- 'partner_shipping_id': partner_addr['delivery'],
- 'date_order': time.strftime('%Y-%m-%d'),
- 'fiscal_position': fpos,
+ 'origin': _('Opportunity: %s') % str(case.id),
+ 'section_id': case.section_id and case.section_id.id or False,
+ 'shop_id': make.shop_id.id,
+ 'partner_id': partner.id,
+ 'pricelist_id': pricelist,
+ 'partner_invoice_id': partner_addr['invoice'],
+ 'partner_order_id': partner_addr['contact'],
+ 'partner_shipping_id': partner_addr['delivery'],
+ 'date_order': time.strftime('%Y-%m-%d'),
+ 'fiscal_position': fpos,
}
if partner.id:
vals['user_id'] = partner.user_id and partner.user_id.id or uid
@@ -117,22 +117,22 @@
return {}
if len(new_ids)<=1:
value = {
- 'domain': str([('id', 'in', new_ids)]),
- 'view_type': 'form',
- 'view_mode': 'form',
- 'res_model': 'sale.order',
- 'view_id': False,
- 'type': 'ir.actions.act_window',
+ 'domain': str([('id', 'in', new_ids)]),
+ 'view_type': 'form',
+ 'view_mode': 'form',
+ 'res_model': 'sale.order',
+ 'view_id': False,
+ 'type': 'ir.actions.act_window',
'res_id': new_ids and new_ids[0]
}
else:
value = {
- 'domain': str([('id', 'in', new_ids)]),
- 'view_type': 'form',
- 'view_mode': 'tree,form',
- 'res_model': 'sale.order',
- 'view_id': False,
- 'type': 'ir.actions.act_window',
+ 'domain': str([('id', 'in', new_ids)]),
+ 'view_type': 'form',
+ 'view_mode': 'tree,form',
+ 'res_model': 'sale.order',
+ 'view_id': False,
+ 'type': 'ir.actions.act_window',
'res_id': new_ids
}
return value
@@ -145,14 +145,14 @@
return shop and shop[0] or False
_columns = {
- 'shop_id': fields.many2one('sale.shop', 'Shop', required=True),
- 'partner_id': fields.many2one('res.partner', 'Customer', required=True),
- 'close': fields.boolean('Close Opportunity', help='Check this to close the opportunity after having created the sale order.'),
+ 'shop_id': fields.many2one('sale.shop', 'Shop', required=True),
+ 'partner_id': fields.many2one('res.partner', 'Customer', required=True),
+ 'close': fields.boolean('Close Opportunity', help='Check this to close the opportunity after having created the sale order.'),
}
_defaults = {
- 'shop_id': _get_shop_id,
- 'close': True,
- 'partner_id': _selectPartner,
+ 'shop_id': _get_shop_id,
+ 'close': True,
+ 'partner_id': _selectPartner,
}
crm_make_sale()
=== modified file 'sale_journal/__openerp__.py'
--- sale_journal/__openerp__.py 2010-10-17 18:05:28 +0000
+++ sale_journal/__openerp__.py 2010-12-14 03:25:00 +0000
@@ -24,7 +24,7 @@
'version': '1.0',
'category': 'Generic Modules/Sales & Purchases',
'description': """
- The sale journal modules allows you to categorise your
+ The sales journal modules allows you to categorise your
sales and deliveries (picking lists) between different journals.
This module is very helpful for bigger companies that
works by departments.
=== modified file 'sale_layout/__openerp__.py'
--- sale_layout/__openerp__.py 2010-09-17 06:11:35 +0000
+++ sale_layout/__openerp__.py 2010-12-14 03:25:00 +0000
@@ -27,7 +27,7 @@
This module provides features to improve the layout of the Sales Order.
It gives you the possibility to
- * order all the lines of an sale order
+ * order all the lines of an sales order
* add titles, comment lines, sub total lines
* draw horizontal lines and put page breaks
=== modified file 'sale_layout/sale_layout.py'
--- sale_layout/sale_layout.py 2010-10-28 06:54:18 +0000
+++ sale_layout/sale_layout.py 2010-12-14 03:25:00 +0000
@@ -32,7 +32,7 @@
if line.layout_type == 'article':
return super(sale_order_line, self)._amount_line(cr, uid, ids, field_name, arg, context)
return res
-
+
def invoice_line_create(self, cr, uid, ids, context={}):
new_ids = []
list_seq = []
@@ -102,7 +102,7 @@
return super(sale_order_line, self).copy(cr, uid, id, default, context)
_order = "order_id, sequence asc"
- _description = "Sale Order line"
+ _description = "Sales Order line"
_inherit = "sale.order.line"
_columns = {
'layout_type': fields.selection([
@@ -113,7 +113,7 @@
('line', 'Separator Line'),
('break', 'Page Break'),]
,'Layout Type', select=True, required=True),
- 'sequence': fields.integer('Sequence Number'),
+ 'sequence': fields.integer('Layout Sequence'),
'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft': [('readonly', False)]}),
'product_uom_qty': fields.float('Quantity (UoM)', digits=(16,2)),
'product_uom': fields.many2one('product.uom', 'Product UoM'),
@@ -156,4 +156,4 @@
sale_order()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'sale_layout/sale_layout_view.xml'
--- sale_layout/sale_layout_view.xml 2010-10-19 07:35:03 +0000
+++ sale_layout/sale_layout_view.xml 2010-12-14 03:25:00 +0000
@@ -4,18 +4,6 @@
<record id="sale.action_order_line_tree2" model="ir.actions.act_window">
<field name="domain">[('layout_type','=', 'article')]</field>
</record>
- <record model="ir.ui.view" id="view_order_line_form2_inherit_1">
- <field name="name">sale.order.line.form2.inherit_1</field>
- <field name="model">sale.order.line</field>
- <field name="inherit_id" ref="sale.view_order_line_form2"/>
- <field name="type">form</field>
- <field name="arch" type="xml">
- <xpath expr="/form/group/field[@name='name']" position="before">
- <field name="layout_type" select="1" on_change="onchange_sale_order_line_view(layout_type)" />
- <field name="sequence"/>
- </xpath>
- </field>
- </record>
<record model="ir.ui.view" id="view_order_form_inherit_1">
<field name="name">sale.order.form.inherit_1</field>
=== modified file 'sale_margin/sale_margin.py'
--- sale_margin/sale_margin.py 2010-11-27 20:16:16 +0000
+++ sale_margin/sale_margin.py 2010-12-14 03:25:00 +0000
@@ -64,7 +64,7 @@
return result
_columns = {
- 'margin': fields.function(_product_margin, method=True, string='Margin', store=True, help="It gives profitability by calculating the difference between the Unit Price and Cost Price"),
+ 'margin': fields.function(_product_margin, method=True, string='Margin', store=True, help="It gives profitability by calculating the difference between the Unit Price and Cost Price."),
}
sale_order()
=== modified file 'sale_mrp/__openerp__.py'
--- sale_mrp/__openerp__.py 2010-10-28 07:15:48 +0000
+++ sale_mrp/__openerp__.py 2010-12-14 03:25:00 +0000
@@ -25,7 +25,7 @@
'version': '1.0',
'category': 'Generic Modules/Sales & MRP',
'description': """
- This module provides facility to the user to install mrp and sale modules
+ This module provides facility to the user to install mrp and sales modules
at a time. It is basically used when we want to keep track of production
orders generated from sales order.
It adds sales name and sales Reference on production order
@@ -35,7 +35,7 @@
'depends': ['mrp', 'sale'],
'init_xml': [],
'update_xml': [
- 'security/sale_mrp_security.xml',
+ 'security/sale_mrp_security.xml',
'security/ir.model.access.csv',
'sale_mrp_view.xml',
],
=== modified file 'sale_mrp/sale_mrp.py'
--- sale_mrp/sale_mrp.py 2010-10-28 06:54:18 +0000
+++ sale_mrp/sale_mrp.py 2010-12-14 03:25:00 +0000
@@ -26,7 +26,7 @@
_inherit = 'mrp.production'
def _ref_calc(self, cr, uid, ids, field_names=None, arg=False, context=None):
- """ Finds reference of sale order for production order.
+ """ Finds reference of sales order for production order.
@param field_names: Names of fields.
@param arg: User defined arguments
@return: Dictionary of values.
@@ -72,8 +72,8 @@
return res
_columns = {
- 'sale_name': fields.function(_ref_calc, method=True, multi='sale_name', type='char', string='Sale Name', help='Indicate the name of sale order.'),
- 'sale_ref': fields.function(_ref_calc, method=True, multi='sale_name', type='char', string='Sale Reference', help='Indicate the Customer Reference from sale order.'),
+ 'sale_name': fields.function(_ref_calc, method=True, multi='sale_name', type='char', string='Sales Name', help='Indicate the name of sales order.'),
+ 'sale_ref': fields.function(_ref_calc, method=True, multi='sale_name', type='char', string='Sales Reference', help='Indicate the Customer Reference from sales order.'),
}
mrp_production()
=== modified file 'sale_order_dates/__openerp__.py'
--- sale_order_dates/__openerp__.py 2010-09-09 05:25:01 +0000
+++ sale_order_dates/__openerp__.py 2010-12-14 03:25:00 +0000
@@ -21,7 +21,7 @@
{
- 'name': 'Sale Order Dates',
+ 'name': 'Sales Order Dates',
'version': '1.0',
'category': 'Generic Modules/CRM & SRM',
'description': """
=== modified file 'sale_order_dates/sale_order_dates.py'
--- sale_order_dates/sale_order_dates.py 2010-10-22 13:16:15 +0000
+++ sale_order_dates/sale_order_dates.py 2010-12-14 03:25:00 +0000
@@ -54,9 +54,9 @@
return res
_columns = {
- 'commitment_date': fields.function(_get_commitment_date, method=True, store=True, type='date', string='Commitment Date', help="Date on which delivery of products is to be made"),
- 'requested_date': fields.date('Requested Date', help="Date on which customer has requested for sales"),
- 'effective_date': fields.function(_get_effective_date, method=True, type='date', store=True, string='Effective Date',help="Date on which picking is created"),
+ 'commitment_date': fields.function(_get_commitment_date, method=True, store=True, type='date', string='Commitment Date', help="Date on which delivery of products is to be made."),
+ 'requested_date': fields.date('Requested Date', help="Date on which customer has requested for sales."),
+ 'effective_date': fields.function(_get_effective_date, method=True, type='date', store=True, string='Effective Date',help="Date on which picking is created."),
}
sale_order_dates()
=== modified file 'wiki_quality_manual/wiki_quality_manual.xml'
--- wiki_quality_manual/wiki_quality_manual.xml 2010-06-25 16:07:45 +0000
+++ wiki_quality_manual/wiki_quality_manual.xml 2010-12-14 03:25:00 +0000
@@ -10,81 +10,147 @@
<field name="section">2</field>
<field name="summary">Base template</field>
<field name="text_area">
-=General=
-
-==Index and revision status==
-
-==Purpose==
-
-=Background=
-
-==Activities==
-
-==History==
-
-=Definitions and Abbreviations=
-
-==Definitions and terminology==
-
-==Abbreviations==
-
-=Management Requirements=
-
-==Organization==
-
-==Management System==
-
-==Document Control==
-
-==Review of Contracts==
-
-==Subcontracting==
+=Application Domain=
+
+==General==
+
+==Application Perimeter==
+
+=Standard References=
+
+=Terms and Definitions=
+
+==Confidentiality==
+
+=Quality Management System=
+
+==General Requirements==
+
+===Quality Comitee===
+
+==Requirements related to Documentation==
+
+===General===
+
+===Quality Manual===
+
+===Document Control===
+
+===Record Control===
+
+=Management Responsibilities=
+
+==Management Involvement==
+
+==Customer Care==
+
+==Quality Policy==
+
+==Planning==
+
+===Quality Objectives===
+
+===Planning of the quality management system===
+
+==Responsibility, Authority and Communication==
+
+===Responsibility and Authority===
+
+===Management Representative===
+
+===Internal Communication===
+
+==Management Review==
+
+===General===
+
+===Input===
+
+===Output===
+
+=Resource Management=
+
+==Resources==
+
+==Human Resources==
+
+===General===
+
+===Skills, Training and Awareness===
+
+==Infrastructure==
+
+===Equipments===
+
+===Maintenance===
+
+==Work Environment==
+
+=Goods/Services Production=
+
+==Planning of the Goods/Services Production==
+
+==Processes related to the customer==
+
+==Conception and Development==
+
+===Conception and Development Planning===
+
+===Input of the Conception and Development===
+
+===Output of the Conception and Development===
+
+===Conception and Development Review===
+
+===Conception and Development Verification===
+
+===Conception and Development Validation===
+
+===Change Management of the Conception and Development===
==Purchasing==
-==Service to the customer==
-
-==Complaints==
-
-==Control of non-conforming work==
+==Goods/Services Preparation and Production==
+
+===Goods/Services Preparation and Production Management===
+
+===Goods/Services Preparation and Production Processes Validation===
+
+===Identification and Traceability===
+
+===Customer Properties===
+
+===Product Preservation===
+
+==Measuring and Monitoring Equipments Control==
+
+=Measurement, Analysis and Improvement=
+
+==General==
+
+==Monitoring and Measurement==
+
+===Customer Satisfaction===
+
+===Internal Audits===
+
+===Monitoring and Measurement of Process===
+
+===Monitoring and Measurement of Service===
+
+==Control of Nonconformities==
+
+==Analysis of Data==
+
+===Statistical Data===
==Improvement==
-==Corrective actions==
-
-==Preventive actions==
-
-==Control of quality records==
-
-==Internal audits==
-
-==Management Reviews==
-
-=Technical Requirements=
-
-==General==
-
-==Personnel==
-
-==Accomodation==
-
-==Test methods and validation==
-
-==Equipment==
-
-==Measurement traceability==
-
-==Sampling==
-
-==Test items==
-
-==Quality control==
-
-==Reports / calibration certificates==
-
-=References=
-
-=Acknowledgements=
+===Continual Improvement===
+
+===Corrective Action===
+
+===Preventive Action===
</field>
</record>
<record id="wiki_group_quality_manual" model="wiki.groups">
Follow ups
