[MERGE] Merge with team1 branch
bzr revid: sbh@tinyerp.com-20101221043807-35831d1mytl0dx2o
This commit is contained in:
Sbh (OpenERP)
commit
82ab7cc65f
|
|
@ -287,20 +287,20 @@ class account_account(osv.osv):
|
|||
sums = {}
|
||||
while brs:
|
||||
current = brs[0]
|
||||
can_compute = True
|
||||
for child in current.child_id:
|
||||
if child.id not in sums:
|
||||
can_compute = False
|
||||
try:
|
||||
brs.insert(0, brs.pop(brs.index(child)))
|
||||
except ValueError:
|
||||
brs.insert(0, child)
|
||||
if can_compute:
|
||||
brs.pop(0)
|
||||
for fn in field_names:
|
||||
sums.setdefault(current.id, {})[fn] = accounts.get(current.id, {}).get(fn, 0.0)
|
||||
if current.child_id:
|
||||
sums[current.id][fn] += sum(sums[child.id][fn] for child in current.child_id)
|
||||
# can_compute = True
|
||||
# for child in current.child_id:
|
||||
# if child.id not in sums:
|
||||
# can_compute = False
|
||||
# try:
|
||||
# brs.insert(0, brs.pop(brs.index(child)))
|
||||
# except ValueError:
|
||||
# brs.insert(0, child)
|
||||
# if can_compute:
|
||||
brs.pop(0)
|
||||
for fn in field_names:
|
||||
sums.setdefault(current.id, {})[fn] = accounts.get(current.id, {}).get(fn, 0.0)
|
||||
if current.child_id:
|
||||
sums[current.id][fn] += sum(sums[child.id][fn] for child in current.child_id)
|
||||
res = {}
|
||||
null_result = dict((fn, 0.0) for fn in field_names)
|
||||
for id in ids:
|
||||
|
|
@ -627,10 +627,13 @@ class account_journal(osv.osv):
|
|||
return super(account_journal, self).copy(cr, uid, id, default, context=context)
|
||||
|
||||
def write(self, cr, uid, ids, vals, context=None):
|
||||
if 'company_id' in vals:
|
||||
move_lines = self.pool.get('account.move.line').search(cr, uid, [('journal_id', 'in', ids)])
|
||||
if move_lines:
|
||||
raise osv.except_osv(_('Warning !'), _('You cannot modify company of this journal as its related record exist in Entry Lines'))
|
||||
if context is None:
|
||||
context = {}
|
||||
for journal in self.browse(cr, uid, ids, context=context):
|
||||
if 'company_id' in vals and journal.company_id.id != vals['company_id']:
|
||||
move_lines = self.pool.get('account.move.line').search(cr, uid, [('journal_id', 'in', ids)])
|
||||
if move_lines:
|
||||
raise osv.except_osv(_('Warning !'), _('You cannot modify company of this journal as its related record exist in Entry Lines'))
|
||||
return super(account_journal, self).write(cr, uid, ids, vals, context=context)
|
||||
|
||||
def create_sequence(self, cr, uid, vals, context=None):
|
||||
|
|
@ -722,7 +725,7 @@ class account_journal(osv.osv):
|
|||
|
||||
res = {}
|
||||
|
||||
view_id = type_map.get(type, 'general')
|
||||
view_id = type_map.get(type, 'account_journal_view')
|
||||
|
||||
user = user_pool.browse(cr, uid, uid)
|
||||
if type in ('cash', 'bank') and currency and user.company_id.currency_id.id != currency:
|
||||
|
|
@ -2677,7 +2680,8 @@ class wizard_multi_charts_accounts(osv.osv_memory):
|
|||
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()
|
||||
|
|
@ -2705,17 +2709,16 @@ class wizard_multi_charts_accounts(osv.osv_memory):
|
|||
'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
|
||||
|
|
@ -2856,7 +2859,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
|
|||
'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,
|
||||
|
|
@ -2878,7 +2881,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
|
|||
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
|
||||
|
||||
|
|
|
|||
|
|
@ -31,9 +31,9 @@ class account_analytic_line(osv.osv):
|
|||
_columns = {
|
||||
'product_uom_id': fields.many2one('product.uom', 'UoM'),
|
||||
'product_id': fields.many2one('product.product', 'Product'),
|
||||
'general_account_id': fields.many2one('account.account', 'General Account', required=True, ondelete='cascade'),
|
||||
'move_id': fields.many2one('account.move.line', 'Move Line', ondelete='cascade', select=True),
|
||||
'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal', required=True, ondelete='cascade', select=True),
|
||||
'general_account_id': fields.many2one('account.account', 'General Account', required=True, ondelete='restrict'),
|
||||
'move_id': fields.many2one('account.move.line', 'Move Line', ondelete='restrict', select=True),
|
||||
'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal', required=True, ondelete='restrict', select=True),
|
||||
'code': fields.char('Code', size=8),
|
||||
'ref': fields.char('Ref.', size=64),
|
||||
'currency_id': fields.related('move_id', 'currency_id', type='many2one', relation='res.currency', string='Account currency', store=True, help="The related account currency if not equal to the company one.", readonly=True),
|
||||
|
|
|
|||
|
|
@ -432,7 +432,7 @@ class account_bank_statement_line(osv.osv):
|
|||
_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'),
|
||||
|
|
|
|||
|
|
@ -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="Print Invoice" type="action" icon="gtk-print"/>
|
||||
</group>
|
||||
</group>
|
||||
</page>
|
||||
|
|
@ -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">This menu 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"/>
|
||||
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -308,7 +308,7 @@ class account_move_line(osv.osv):
|
|||
FROM account_move_line l1, account_move_line l2
|
||||
WHERE l2.account_id = l1.account_id
|
||||
AND l1.id <= l2.id
|
||||
AND l2.id IN %%s AND """ + \
|
||||
AND l2.id IN %s AND """ + \
|
||||
self._query_get(cr, uid, obj='l1', context=c) + \
|
||||
" GROUP BY l2.id"
|
||||
|
||||
|
|
@ -433,7 +433,7 @@ class account_move_line(osv.osv):
|
|||
'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 = {
|
||||
|
|
@ -763,7 +763,7 @@ class account_move_line(osv.osv):
|
|||
if 'comment' in context and context['comment']:
|
||||
libelle = context['comment']
|
||||
else:
|
||||
libelle = 'Write-Off'
|
||||
libelle = _('Write-Off')
|
||||
writeoff_lines = [
|
||||
(0, 0, {
|
||||
'name': libelle,
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@
|
|||
<field name="name">Fiscal Years</field>
|
||||
<field name="res_model">account.fiscalyear</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form,search</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="help">Define your company's fiscal year depending on the period you have chosen to follow. A fiscal year is a 1 year period over which a company budgets its spending. It may run over any period of 12 months. The fiscal year is referred to by the date in which it ends. For example, if a company's fiscal year ends November 30, 2011, then everything between December 1, 2010 and November 30, 2011 would be referred to as FY 2011. Not using the actual calendar year gives many companies an advantage, allowing them to close their books at a time which is most convenient for them.</field>
|
||||
</record>
|
||||
<menuitem id="next_id_23" name="Periods" parent="account.menu_finance_accounting" sequence="8" />
|
||||
|
|
@ -143,7 +143,7 @@
|
|||
<field name="name">Periods</field>
|
||||
<field name="res_model">account.period</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form,search</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="context">{'search_default_draft': 1}</field>
|
||||
<field name="help">Here, you can define a period, an interval of time between successive closings of the books of your company. An accounting period typically is a month or a quarter, corresponding to the tax year used by the business. Create and manage them from here and decide whether a period should be left open or closed depending on your company's activities over a specific period.</field>
|
||||
</record>
|
||||
|
|
@ -698,7 +698,7 @@
|
|||
<field name="name">Draft statements</field>
|
||||
<field name="res_model">account.bank.statement</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form,search</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="domain">[('state','=','draft')]</field>
|
||||
<field name="filter" eval="True"/>
|
||||
</record>
|
||||
|
|
@ -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>
|
||||
|
|
@ -1729,7 +1737,7 @@
|
|||
<field name="name">Recurring Models</field>
|
||||
<field name="res_model">account.model</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form,search</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="search_view_id" ref="view_model_search"/>
|
||||
</record>
|
||||
<menuitem
|
||||
|
|
@ -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"/>
|
||||
|
|
@ -2171,7 +2180,7 @@
|
|||
<field name="name">Account Templates</field>
|
||||
<field name="res_model">account.account.template</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form,search</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="search_view_id" ref="view_account_template_search"/>
|
||||
</record>
|
||||
|
||||
|
|
@ -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>
|
||||
|
|
@ -2251,7 +2260,7 @@
|
|||
<field name="name">Chart of Accounts Templates</field>
|
||||
<field name="res_model">account.chart.template</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form,search</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
</record>
|
||||
|
||||
<menuitem action="action_account_chart_template_form" id="menu_action_account_chart_template_form" parent="account_template_accounts" sequence="1"/>
|
||||
|
|
@ -2406,7 +2415,7 @@
|
|||
<field name="name">Tax Code Templates</field>
|
||||
<field name="res_model">account.tax.code.template</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form,search</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="search_view_id" ref="view_tax_code_template_search"/>
|
||||
</record>
|
||||
<menuitem action="action_account_tax_code_template_form" id="menu_action_account_tax_code_template_form" parent="account_template_taxes" sequence="14"/>
|
||||
|
|
@ -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_multi_company"/>
|
||||
<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 @@ action = self.pool.get('res.config').next(cr, uid, [], context)
|
|||
<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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -37,9 +37,10 @@ class res_company(osv.osv):
|
|||
}
|
||||
|
||||
_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()
|
||||
|
|
|
|||
|
|
@ -964,11 +964,6 @@ msgstr ""
|
|||
msgid "Landscape Mode"
|
||||
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"
|
||||
|
|
@ -1859,7 +1854,7 @@ msgstr ""
|
|||
|
||||
#. 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
|
||||
|
|
@ -2543,11 +2538,6 @@ msgstr ""
|
|||
msgid "Base Code Amount"
|
||||
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"
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2010-12-15 15:04+0000\n"
|
||||
"PO-Revision-Date: 2010-11-23 02:15+0000\n"
|
||||
"PO-Revision-Date: 2010-12-20 03:27+0000\n"
|
||||
"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
|
||||
"Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-17 05:21+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-20 04:51+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
@ -4065,8 +4065,8 @@ msgid ""
|
|||
"This will automatically configure your chart of accounts, bank accounts, "
|
||||
"taxes and journals according to the selected template"
|
||||
msgstr ""
|
||||
"Esto configurara automaticamente su plan de cuentas, cuentas de banco "
|
||||
"impuestos y diarios deacuerdo con la plantilla seleccionada."
|
||||
"Esto configurará automaticamente tu plan de cuentas, cuentas de banco, "
|
||||
"impuestos y diarios deacuerdo con la plantilla seleccionada"
|
||||
|
||||
#. module: account
|
||||
#: field:account.tax,price_include:0
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-19 04:46+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-20 04:50+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -8,13 +8,13 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2010-12-15 15:04+0000\n"
|
||||
"PO-Revision-Date: 2010-12-16 16:13+0000\n"
|
||||
"Last-Translator: badralb <Unknown>\n"
|
||||
"PO-Revision-Date: 2010-12-19 10:00+0000\n"
|
||||
"Last-Translator: OpenERP Administrators <Unknown>\n"
|
||||
"Language-Team: Mongolian <mn@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-17 05:17+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-20 04:51+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2010-12-15 15:04+0000\n"
|
||||
"PO-Revision-Date: 2010-12-17 20:07+0000\n"
|
||||
"PO-Revision-Date: 2010-12-19 15:25+0000\n"
|
||||
"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-18 05:05+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-20 04:51+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
@ -2210,7 +2210,7 @@ msgstr "Фильтры"
|
|||
#: selection:account.period,state:0
|
||||
#: selection:report.invoice.created,state:0
|
||||
msgid "Open"
|
||||
msgstr "Открыть"
|
||||
msgstr "Открыт"
|
||||
|
||||
#. module: account
|
||||
#: model:process.node,note:account.process_node_draftinvoices0
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2010-12-15 15:04+0000\n"
|
||||
"PO-Revision-Date: 2010-12-19 00:16+0000\n"
|
||||
"Last-Translator: OpenERP Administrators <Unknown>\n"
|
||||
"PO-Revision-Date: 2010-12-19 19:15+0000\n"
|
||||
"Last-Translator: Phong Nguyen <Unknown>\n"
|
||||
"Language-Team: Vietnamese <vi@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-19 04:47+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-20 04:51+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account
|
||||
|
|
@ -376,7 +376,7 @@ msgstr ""
|
|||
#: view:account.installer:0
|
||||
#: view:account.installer.modules:0
|
||||
msgid "Configure"
|
||||
msgstr ""
|
||||
msgstr "Cấu hình"
|
||||
|
||||
#. module: account
|
||||
#: selection:account.entries.report,month:0
|
||||
|
|
|
|||
|
|
@ -95,6 +95,25 @@ class account_installer(osv.osv_memory):
|
|||
'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 @@ class account_installer(osv.osv_memory):
|
|||
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 @@ class account_installer(osv.osv_memory):
|
|||
'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 @@ class account_installer(osv.osv_memory):
|
|||
'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 @@ class account_installer(osv.osv_memory):
|
|||
'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 @@ class account_installer(osv.osv_memory):
|
|||
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():
|
||||
|
|
|
|||
|
|
@ -268,21 +268,21 @@ class account_invoice(osv.osv):
|
|||
store={
|
||||
'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20),
|
||||
'account.invoice.tax': (_get_invoice_tax, None, 20),
|
||||
'account.invoice.line': (_get_invoice_line, ['price_unit','invoice_line_tax_id','quantity','discount'], 20),
|
||||
'account.invoice.line': (_get_invoice_line, ['price_unit','invoice_line_tax_id','quantity','discount','invoice_id'], 20),
|
||||
},
|
||||
multi='all'),
|
||||
'amount_tax': fields.function(_amount_all, method=True, digits_compute=dp.get_precision('Account'), string='Tax',
|
||||
store={
|
||||
'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20),
|
||||
'account.invoice.tax': (_get_invoice_tax, None, 20),
|
||||
'account.invoice.line': (_get_invoice_line, ['price_unit','invoice_line_tax_id','quantity','discount'], 20),
|
||||
'account.invoice.line': (_get_invoice_line, ['price_unit','invoice_line_tax_id','quantity','discount','invoice_id'], 20),
|
||||
},
|
||||
multi='all'),
|
||||
'amount_total': fields.function(_amount_all, method=True, digits_compute=dp.get_precision('Account'), string='Total',
|
||||
store={
|
||||
'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20),
|
||||
'account.invoice.tax': (_get_invoice_tax, None, 20),
|
||||
'account.invoice.line': (_get_invoice_line, ['price_unit','invoice_line_tax_id','quantity','discount'], 20),
|
||||
'account.invoice.line': (_get_invoice_line, ['price_unit','invoice_line_tax_id','quantity','discount','invoice_id'], 20),
|
||||
},
|
||||
multi='all'),
|
||||
'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}),
|
||||
|
|
@ -302,7 +302,7 @@ class account_invoice(osv.osv):
|
|||
store={
|
||||
'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 50),
|
||||
'account.invoice.tax': (_get_invoice_tax, None, 50),
|
||||
'account.invoice.line': (_get_invoice_line, ['price_unit','invoice_line_tax_id','quantity','discount'], 50),
|
||||
'account.invoice.line': (_get_invoice_line, ['price_unit','invoice_line_tax_id','quantity','discount','invoice_id'], 50),
|
||||
'account.move.line': (_get_invoice_from_line, None, 50),
|
||||
'account.move.reconcile': (_get_invoice_from_reconcile, None, 50),
|
||||
},
|
||||
|
|
@ -1313,6 +1313,7 @@ class account_invoice_line(osv.osv):
|
|||
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:
|
||||
|
|
@ -1396,23 +1397,20 @@ class account_invoice_line(osv.osv):
|
|||
a = res.product_tmpl_id.property_account_expense.id
|
||||
if not a:
|
||||
a = res.categ_id.property_account_expense_categ.id
|
||||
|
||||
a = fpos_obj.map_account(cr, uid, fpos, a)
|
||||
if a:
|
||||
result['account_id'] = a
|
||||
|
||||
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)
|
||||
taxes = res.taxes_id and res.taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False)
|
||||
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)
|
||||
taxes = res.supplier_taxes_id and res.supplier_taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False)
|
||||
tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
|
||||
|
||||
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
|
||||
|
||||
domain = {}
|
||||
|
|
@ -1443,11 +1441,21 @@ class account_invoice_line(osv.osv):
|
|||
return res_final
|
||||
|
||||
def uos_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None):
|
||||
res = self.product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context)
|
||||
warning = {}
|
||||
res = self.product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context=context)
|
||||
if 'uos_id' in res['value']:
|
||||
del res['value']['uos_id']
|
||||
if not uom:
|
||||
res['value']['price_unit'] = 0.0
|
||||
if product and uom:
|
||||
prod = self.pool.get('product.product').browse(cr, uid, product, context=context)
|
||||
prod_uom = self.pool.get('product.uom').browse(cr, uid, uom, context=context)
|
||||
if prod.uom_id.category_id.id != prod_uom.category_id.id:
|
||||
warning = {
|
||||
'title': _('Warning!'),
|
||||
'message': _('You selected an Unit of Measure which is not compatible with the product.')
|
||||
}
|
||||
return {'value': res['value'], 'warning': warning}
|
||||
return res
|
||||
|
||||
def move_line_get(self, cr, uid, invoice_id, context=None):
|
||||
|
|
|
|||
|
|
@ -337,7 +337,7 @@
|
|||
<field name="name">Analytic Journals</field>
|
||||
<field name="res_model">account.analytic.journal</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form,search</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="search_view_id" ref="view_analytic_journal_search" />
|
||||
</record>
|
||||
<menuitem groups="analytic.group_analytic_accounting,group_account_manager" action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic_accounting" sequence="5"/>
|
||||
|
|
|
|||
|
|
@ -84,11 +84,12 @@ class account_balance(report_sxw.rml_parse, common_report_header):
|
|||
}
|
||||
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)
|
||||
|
|
|
|||
|
|
@ -136,15 +136,16 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header)
|
|||
'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)
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -106,15 +106,16 @@ class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header):
|
|||
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)
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@
|
|||
<field name="name">Tax multi-company</field>
|
||||
<field model="ir.model" name="model_id" ref="model_account_tax"/>
|
||||
<field eval="True" name="global"/>
|
||||
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
|
||||
<field name="domain_force">['|',('company_id','=',False),('company_id','=',user.company_id.id)]</field>
|
||||
</record>
|
||||
|
||||
<record id="tax_code_comp_rule" model="ir.rule">
|
||||
|
|
|
|||
|
|
@ -72,8 +72,8 @@
|
|||
"access_account_account_product_manager","account.account product manager","model_account_account","product.group_product_manager",1,0,0,0
|
||||
"access_account_journal_product_manager","account.journal product manager","model_account_journal","product.group_product_manager",1,0,0,0
|
||||
"access_account_fiscal_position_product_manager","account.fiscal.position account.manager","model_account_fiscal_position","account.group_account_manager",1,1,1,1
|
||||
"access_account_fiscal_position_tax_product_manager","account.fiscal.position.tax account.manager","model_account_fiscal_position_tax","account.group_account_manager",1,0,0,0
|
||||
"access_account_fiscal_position_account_product_manager","account.fiscal.position account.manager","model_account_fiscal_position_account","account.group_account_manager",1,0,0,0
|
||||
"access_account_fiscal_position_tax_product_manager","account.fiscal.position.tax account.manager","model_account_fiscal_position_tax","account.group_account_manager",1,1,1,1
|
||||
"access_account_fiscal_position_account_product_manager","account.fiscal.position account.manager","model_account_fiscal_position_account","account.group_account_manager",1,1,1,1
|
||||
"access_account_fiscal_position","account.fiscal.position all","model_account_fiscal_position","base.group_user",1,0,0,0
|
||||
"access_account_fiscal_position_tax","account.fiscal.position.tax all","model_account_fiscal_position_tax","base.group_user",1,0,0,0
|
||||
"access_account_fiscal_position_account","account.fiscal.position all","model_account_fiscal_position_account","base.group_user",1,0,0,0
|
||||
|
|
@ -116,3 +116,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
|
||||
|
|
|
|||
|
|
|
@ -33,8 +33,9 @@ class account_chart(osv.osv_memory):
|
|||
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 @@ class account_chart(osv.osv_memory):
|
|||
return result
|
||||
|
||||
_defaults = {
|
||||
'target_move': 'all'
|
||||
'target_move': 'posted'
|
||||
}
|
||||
|
||||
account_chart()
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
from lxml import etree
|
||||
|
||||
from osv import osv
|
||||
from osv import osv, fields
|
||||
from tools.translate import _
|
||||
import tools
|
||||
|
||||
|
|
@ -29,7 +29,16 @@ class account_move_journal(osv.osv_memory):
|
|||
_name = "account.move.journal"
|
||||
_description = "Move journal"
|
||||
|
||||
def _get_period(self, cr, uid, context=None):
|
||||
_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 @@ class account_move_journal(osv.osv_memory):
|
|||
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 @@ class account_move_journal(osv.osv_memory):
|
|||
|
||||
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 @@ class account_move_journal(osv.osv_memory):
|
|||
}
|
||||
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:
|
||||
|
|
@ -38,8 +38,9 @@ class account_common_report(osv.osv_memory):
|
|||
'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 @@ class account_common_report(osv.osv_memory):
|
|||
'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):
|
||||
|
|
|
|||
|
|
@ -31,8 +31,9 @@ class account_tax_chart(osv.osv_memory):
|
|||
'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 @@ class account_tax_chart(osv.osv_memory):
|
|||
|
||||
_defaults = {
|
||||
'period_id': _get_period,
|
||||
'target_move': 'all'
|
||||
'target_move': 'posted'
|
||||
}
|
||||
|
||||
account_tax_chart()
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
# Chinese (Simplified) translation for openobject-addons
|
||||
# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
|
||||
# This file is distributed under the same license as the openobject-addons package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2010-12-15 15:04+0000\n"
|
||||
"PO-Revision-Date: 2010-12-19 07:10+0000\n"
|
||||
"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
|
||||
"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-20 04:53+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account_accountant
|
||||
#: model:ir.module.module,shortdesc:account_accountant.module_meta_information
|
||||
msgid "Accountant"
|
||||
msgstr "会计人员管理"
|
||||
|
|
@ -7,13 +7,13 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2010-12-15 15:04+0000\n"
|
||||
"PO-Revision-Date: 2010-10-30 09:53+0000\n"
|
||||
"Last-Translator: OpenERP Administrators <Unknown>\n"
|
||||
"PO-Revision-Date: 2010-12-19 07:11+0000\n"
|
||||
"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-17 05:26+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
|
|
@ -37,7 +37,7 @@ msgstr "计算公式为:最大数量 - 小时合计"
|
|||
#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
|
||||
#, python-format
|
||||
msgid "AccessError"
|
||||
msgstr ""
|
||||
msgstr "访问错误"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,ca_theorical:0
|
||||
|
|
@ -145,7 +145,7 @@ msgstr "辅助核算项目报表"
|
|||
#. module: account_analytic_analysis
|
||||
#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
|
||||
msgid "Hours Summary by User"
|
||||
msgstr ""
|
||||
msgstr "按用户汇总时间"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: field:account.analytic.account,ca_invoiced:0
|
||||
|
|
@ -261,7 +261,7 @@ msgstr "总小时"
|
|||
#. module: account_analytic_analysis
|
||||
#: constraint:account.analytic.account:0
|
||||
msgid "Error! You can not create recursive analytic accounts."
|
||||
msgstr ""
|
||||
msgstr "错误! 您不能创建递归的辅助核算科目"
|
||||
|
||||
#. module: account_analytic_analysis
|
||||
#: help:account.analytic.account,total_cost:0
|
||||
|
|
|
|||
|
|
@ -59,6 +59,7 @@ of distribution models.
|
|||
'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',
|
||||
|
|
|
|||
|
|
@ -244,7 +244,7 @@ class account_analytic_plan_instance_line(osv.osv):
|
|||
_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 = {
|
||||
|
|
|
|||
|
|
@ -97,19 +97,21 @@ class crossovered_analytic(report_sxw.rml_parse):
|
|||
|
||||
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
|
||||
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
@ -31,7 +31,7 @@ class account_crossovered_analytic(osv.osv_memory):
|
|||
'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 = {
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@ class crossovered_budget_lines(osv.osv):
|
|||
res = {}
|
||||
for line in self.browse(cr, uid, ids, context=context):
|
||||
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
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2010-12-15 15:04+0000\n"
|
||||
"PO-Revision-Date: 2010-12-16 09:21+0000\n"
|
||||
"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
|
||||
"PO-Revision-Date: 2010-12-20 04:01+0000\n"
|
||||
"Last-Translator: OpenERP Administrators <Unknown>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-17 05:41+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account_budget
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ msgstr ""
|
|||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-19 04:47+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account_invoice_layout
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
@ -88,7 +88,7 @@
|
|||
<field name="name">Payment Mode</field>
|
||||
<field name="res_model">payment.mode</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form,search</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="search_view_id" ref="view_payment_mode_search"/>
|
||||
</record>
|
||||
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2010-12-15 15:04+0000\n"
|
||||
"PO-Revision-Date: 2010-11-23 09:42+0000\n"
|
||||
"PO-Revision-Date: 2010-12-19 13:35+0000\n"
|
||||
"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-17 05:27+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account_payment
|
||||
|
|
|
|||
|
|
@ -37,10 +37,12 @@ class account_payment_populate_statement(osv.osv_memory):
|
|||
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']")
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
|
||||
"PO-Revision-Date: 2010-12-17 15:57+0000\n"
|
||||
"PO-Revision-Date: 2010-12-19 19:22+0000\n"
|
||||
"Last-Translator: Phong Nguyen <Unknown>\n"
|
||||
"Language-Team: Vietnamese <vi@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-18 05:04+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-20 04:50+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account_tax_include
|
||||
|
|
@ -45,7 +45,7 @@ msgstr "Chưa bao gồm thuế"
|
|||
#. module: account_tax_include
|
||||
#: view:account.tax:0
|
||||
msgid "Compute Code for Taxes included prices"
|
||||
msgstr ""
|
||||
msgstr "Mã tính toán cho giá bao gồm thuế"
|
||||
|
||||
#. module: account_tax_include
|
||||
#: field:account.invoice.line,price_subtotal_incl:0
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@ import time
|
|||
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):
|
||||
|
|
@ -117,6 +117,11 @@ class account_voucher(osv.osv):
|
|||
if context is None: 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 []
|
||||
|
|
@ -150,18 +155,29 @@ class account_voucher(osv.osv):
|
|||
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'
|
||||
|
|
@ -199,8 +215,8 @@ class account_voucher(osv.osv):
|
|||
\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'),
|
||||
|
|
@ -215,14 +231,13 @@ class account_voucher(osv.osv):
|
|||
'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,
|
||||
|
|
@ -231,6 +246,7 @@ class account_voucher(osv.osv):
|
|||
'currency_id': _get_currency,
|
||||
'reference': _get_reference,
|
||||
'narration':_get_narration,
|
||||
'amount': _get_amount,
|
||||
'type':_get_type,
|
||||
'state': 'draft',
|
||||
'pay_now': 'pay_later',
|
||||
|
|
@ -239,7 +255,7 @@ class account_voucher(osv.osv):
|
|||
'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=None):
|
||||
|
|
@ -395,13 +411,17 @@ class account_voucher(osv.osv):
|
|||
|
||||
@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')
|
||||
|
|
@ -474,13 +494,13 @@ class account_voucher(osv.osv):
|
|||
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)
|
||||
|
|
@ -504,6 +524,7 @@ class account_voucher(osv.osv):
|
|||
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
|
||||
|
||||
|
|
@ -687,7 +708,7 @@ class account_voucher(osv.osv):
|
|||
for line in inv.line_ids:
|
||||
if not line.amount:
|
||||
continue
|
||||
amount = currency_pool.compute(cr, uid, current_currency, company_currency, line.amount)
|
||||
amount = currency_pool.compute(cr, uid, current_currency, company_currency, line.untax_amount or line.amount)
|
||||
move_line = {
|
||||
'journal_id': inv.journal_id.id,
|
||||
'period_id': inv.period_id.id,
|
||||
|
|
@ -730,16 +751,20 @@ class account_voucher(osv.osv):
|
|||
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,
|
||||
|
|
@ -748,24 +773,8 @@ class account_voucher(osv.osv):
|
|||
'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,
|
||||
|
|
@ -773,6 +782,9 @@ class account_voucher(osv.osv):
|
|||
'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):
|
||||
|
|
@ -824,7 +836,7 @@ class account_voucher_line(osv.osv):
|
|||
'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'),
|
||||
|
|
@ -832,7 +844,7 @@ class account_voucher_line(osv.osv):
|
|||
'date_due': fields.related('move_line_id','date_maturity', type='date', relation='account.move.line', string='Due Date', readonly=1),
|
||||
'amount_original': fields.function(_compute_balance, method=True, multi='dc', type='float', string='Originial Amount', store=True),
|
||||
'amount_unreconciled': fields.function(_compute_balance, method=True, multi='dc', type='float', string='Open Balance', store=True),
|
||||
'company_id': fields.related('voucher_id','company_id', relation='res.company', string='Company', store=True),
|
||||
'company_id': fields.related('voucher_id','company_id', relation='res.company', type='many2one', string='Company', store=True),
|
||||
}
|
||||
_defaults = {
|
||||
'name': ''
|
||||
|
|
@ -873,7 +885,7 @@ class account_voucher_line(osv.osv):
|
|||
|
||||
@return: Returns a dict that contains default values for fields
|
||||
"""
|
||||
if context is None:
|
||||
if context is None:
|
||||
context = {}
|
||||
journal_id = context.get('journal_id', False)
|
||||
partner_id = context.get('partner_id', False)
|
||||
|
|
@ -962,6 +974,17 @@ class account_bank_statement_line(osv.osv):
|
|||
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'),
|
||||
|
|
@ -981,4 +1004,4 @@ class account_bank_statement_line(osv.osv):
|
|||
|
||||
account_bank_statement_line()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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">
|
||||
|
|
|
|||
|
|
@ -406,7 +406,7 @@ msgstr ""
|
|||
#. 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
|
||||
|
|
@ -520,7 +520,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor"
|
||||
msgid "supplier"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
@ -657,7 +657,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Open Vendor Journal Entries"
|
||||
msgid "Open supplier Journal Entries"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
@ -750,7 +750,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor Invoices and Outstanding transactions"
|
||||
msgid "supplier Invoices and Outstanding transactions"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
|
|||
|
|
@ -421,7 +421,7 @@ msgstr ""
|
|||
#. 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
|
||||
|
|
@ -539,8 +539,8 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor"
|
||||
msgstr "Πωλητής"
|
||||
msgid "Supplier"
|
||||
msgstr "προμηθευτής"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
|
|
@ -676,7 +676,7 @@ msgstr "Πληροφορίες Πώλησης"
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Open Vendor Journal Entries"
|
||||
msgid "Open Supplier Journal Entries"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
|
|||
|
|
@ -433,8 +433,8 @@ msgstr "Romper conciliación"
|
|||
#. 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
|
||||
|
|
@ -551,8 +551,8 @@ msgstr "¿Auditoría completa?"
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor"
|
||||
msgstr "Vendedor"
|
||||
msgid "Supplier"
|
||||
msgstr "Proveedor"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
|
|
@ -688,8 +688,8 @@ msgstr "Información de ventas"
|
|||
|
||||
#. 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
|
||||
|
|
@ -781,8 +781,8 @@ msgstr "Cancelado"
|
|||
|
||||
#. 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
|
||||
|
|
|
|||
|
|
@ -420,7 +420,7 @@ msgstr ""
|
|||
#. 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
|
||||
|
|
@ -538,7 +538,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor"
|
||||
msgid "Supplier"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
@ -675,7 +675,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Open Vendor Journal Entries"
|
||||
msgid "Open Supplier Journal Entries"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
|
|||
|
|
@ -439,7 +439,7 @@ msgstr "Romper conciliación"
|
|||
#. 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
|
||||
|
|
@ -561,7 +561,7 @@ msgstr "Revisión Completa ?"
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor"
|
||||
msgid "Supplier"
|
||||
msgstr "Proveedor"
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
@ -698,7 +698,7 @@ msgstr "Información de Ventas"
|
|||
|
||||
#. 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
|
||||
|
|
@ -791,7 +791,7 @@ msgstr "Cancelado"
|
|||
|
||||
#. 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
|
||||
|
|
|
|||
|
|
@ -435,7 +435,7 @@ msgstr ""
|
|||
#. 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
|
||||
|
|
@ -553,7 +553,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor"
|
||||
msgid "Supplier"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
@ -690,7 +690,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Open Vendor Journal Entries"
|
||||
msgid "Open Supplier Journal Entries"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
|
|||
|
|
@ -421,7 +421,7 @@ msgstr ""
|
|||
#. 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
|
||||
|
|
@ -539,7 +539,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor"
|
||||
msgid "Supplier"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
@ -676,7 +676,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Open Vendor Journal Entries"
|
||||
msgid "Open Supplier Journal Entries"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
@ -769,7 +769,7 @@ msgstr "Annulé"
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor Invoices and Outstanding transactions"
|
||||
msgid "Supplier Invoices and Outstanding transactions"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
|
|||
|
|
@ -420,7 +420,7 @@ msgstr ""
|
|||
#. 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
|
||||
|
|
@ -538,7 +538,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor"
|
||||
msgid "Supplier"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
@ -675,7 +675,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Open Vendor Journal Entries"
|
||||
msgid "Open Supplier Journal Entries"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
|
|||
|
|
@ -420,7 +420,7 @@ msgstr ""
|
|||
#. 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
|
||||
|
|
@ -538,7 +538,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor"
|
||||
msgid "Supplier"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
@ -675,7 +675,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Open Vendor Journal Entries"
|
||||
msgid "Open Supplier Journal Entries"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
|
|||
|
|
@ -420,7 +420,7 @@ msgstr ""
|
|||
#. 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
|
||||
|
|
@ -538,7 +538,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor"
|
||||
msgid "Supplier"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
@ -675,7 +675,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Open Vendor Journal Entries"
|
||||
msgid "Open Supplier Journal Entries"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
|
|||
|
|
@ -421,7 +421,7 @@ msgstr ""
|
|||
#. 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
|
||||
|
|
@ -539,7 +539,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor"
|
||||
msgid "Supplier"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
@ -676,7 +676,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Open Vendor Journal Entries"
|
||||
msgid "Open Supplier Journal Entries"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
|
|||
|
|
@ -421,7 +421,7 @@ msgstr ""
|
|||
#. 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
|
||||
|
|
@ -539,7 +539,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor"
|
||||
msgid "Supplier"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
@ -676,7 +676,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Open Vendor Journal Entries"
|
||||
msgid "Open Supplier Journal Entries"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
|
|||
|
|
@ -420,7 +420,7 @@ msgstr ""
|
|||
#. 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
|
||||
|
|
@ -538,7 +538,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor"
|
||||
msgid "Supplier"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
@ -675,7 +675,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Open Vendor Journal Entries"
|
||||
msgid "Open Supplier Journal Entries"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
|
|||
|
|
@ -420,7 +420,7 @@ msgstr ""
|
|||
#. 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
|
||||
|
|
@ -538,7 +538,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor"
|
||||
msgid "Supplier"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
@ -675,7 +675,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Open Vendor Journal Entries"
|
||||
msgid "Open Supplier Journal Entries"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
|
|||
|
|
@ -420,7 +420,7 @@ msgstr ""
|
|||
#. 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
|
||||
|
|
@ -538,7 +538,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor"
|
||||
msgid "Supplier"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
@ -675,7 +675,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Open Vendor Journal Entries"
|
||||
msgid "Open Supplier Journal Entries"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
|
|||
|
|
@ -421,7 +421,7 @@ msgstr ""
|
|||
#. 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
|
||||
|
|
@ -539,7 +539,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor"
|
||||
msgid "Supplier"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
@ -676,7 +676,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Open Vendor Journal Entries"
|
||||
msgid "Open Supplier Journal Entries"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
|
|||
|
|
@ -420,7 +420,7 @@ msgstr ""
|
|||
#. 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
|
||||
|
|
@ -538,7 +538,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor"
|
||||
msgid "Supplier"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
@ -675,7 +675,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Open Vendor Journal Entries"
|
||||
msgid "Open Supplier Journal Entries"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
|
|||
|
|
@ -420,7 +420,7 @@ msgstr ""
|
|||
#. 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
|
||||
|
|
@ -538,8 +538,8 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor"
|
||||
msgstr "Vendedor"
|
||||
msgid "Supplier"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
|
|
@ -675,7 +675,7 @@ msgstr "Informação de vendas"
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Open Vendor Journal Entries"
|
||||
msgid "Open Supplier Journal Entries"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
@ -865,6 +865,11 @@ msgid ""
|
|||
"that are linked to those transactions because they will not be disable"
|
||||
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"
|
||||
|
|
|
|||
|
|
@ -420,7 +420,7 @@ msgstr ""
|
|||
#. 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
|
||||
|
|
@ -538,7 +538,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor"
|
||||
msgid "Supplier"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
@ -675,7 +675,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Open Vendor Journal Entries"
|
||||
msgid "Open Supplier Journal Entries"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
|
|||
|
|
@ -420,7 +420,7 @@ msgstr ""
|
|||
#. 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
|
||||
|
|
@ -538,7 +538,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor"
|
||||
msgid "Supplier"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
@ -675,7 +675,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Open Vendor Journal Entries"
|
||||
msgid "Open Supplier Journal Entries"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
|
|||
|
|
@ -420,7 +420,7 @@ msgstr "Отмена сверки"
|
|||
#. 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
|
||||
|
|
@ -538,7 +538,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor"
|
||||
msgid "Supplier"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
@ -675,7 +675,7 @@ msgstr "Информация о продажах"
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Open Vendor Journal Entries"
|
||||
msgid "Open Supplier Journal Entries"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
@ -768,7 +768,11 @@ msgstr "Отменено"
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
<<<<<<< TREE
|
||||
msgid "Supplier Invoices and Outstanding transactions"
|
||||
=======
|
||||
msgid "Vendor Invoices and Outstanding transactions"
|
||||
>>>>>>> MERGE-SOURCE
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
|
|||
|
|
@ -420,7 +420,7 @@ msgstr ""
|
|||
#. 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
|
||||
|
|
@ -538,7 +538,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor"
|
||||
msgid "Supplier"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
@ -675,7 +675,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Open Vendor Journal Entries"
|
||||
msgid "Open Supplier Journal Entries"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
|
|||
|
|
@ -421,7 +421,7 @@ msgstr ""
|
|||
#. 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
|
||||
|
|
@ -539,7 +539,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor"
|
||||
msgid "Supplier"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
@ -676,7 +676,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Open Vendor Journal Entries"
|
||||
msgid "Open Supplier Journal Entries"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
|
|||
|
|
@ -427,7 +427,7 @@ msgstr "Poništavanje zatvaranja"
|
|||
#. 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
|
||||
|
|
@ -545,7 +545,7 @@ msgstr "Pregled KOmpletan?"
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor"
|
||||
msgid "Supplier"
|
||||
msgstr "proizvođač"
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
@ -682,7 +682,7 @@ msgstr "Informacije Prodaje"
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Open Vendor Journal Entries"
|
||||
msgid "Open Supplier Journal Entries"
|
||||
msgstr "Otvori Dnevnik Proizvodjaca"
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
|
|||
|
|
@ -539,8 +539,8 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor"
|
||||
msgstr ""
|
||||
msgid "Supplier"
|
||||
msgstr "proizvođač"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
|
|
@ -676,8 +676,8 @@ msgstr ""
|
|||
|
||||
#. 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
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 5.0.14\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2010-12-15 15:04+0000\n"
|
||||
"PO-Revision-Date: 2010-12-16 17:15+0000\n"
|
||||
"Last-Translator: OpenERP Administrators <Unknown>\n"
|
||||
"PO-Revision-Date: 2010-12-19 18:41+0000\n"
|
||||
"Last-Translator: Anders Eriksson, Aspirix AB <ae@mobilasystem.se>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-17 05:39+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
@ -35,7 +35,7 @@ msgstr "Öppna kundjournal transaktioner"
|
|||
#: report:voucher.cash_receipt.drcr:0
|
||||
#: report:voucher.print:0
|
||||
msgid "Particulars"
|
||||
msgstr ""
|
||||
msgstr "Uppgifter"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
|
|
@ -107,6 +107,9 @@ msgid ""
|
|||
"automatically and you can record the customer payment related to this sales "
|
||||
"receipt."
|
||||
msgstr ""
|
||||
"När du säljer en produkt till en kund, ger du honom ett kvitto eller en "
|
||||
"faktura. När fakturan är godkänd skapas journaltransaktioner automatiskt och "
|
||||
"du kan registrera betalningar mot denna faktura."
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
|
|
@ -132,7 +135,7 @@ msgstr "Ej avstämda transaktioner"
|
|||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Voucher Statistics"
|
||||
msgstr ""
|
||||
msgstr "Verifikatstatistik"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
|
|
@ -142,7 +145,7 @@ msgstr "Validera"
|
|||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Search Vouchers"
|
||||
msgstr ""
|
||||
msgstr "Sök verifikat"
|
||||
|
||||
#. module: account_voucher
|
||||
#: selection:account.voucher,type:0
|
||||
|
|
@ -190,6 +193,9 @@ msgid ""
|
|||
"to you automatically the reconciliation of this payment with the open "
|
||||
"invoices or sales receipts."
|
||||
msgstr ""
|
||||
"KKundfakturabetalningar gör det möjligt att registrera de betalningar som du "
|
||||
"tagit emor från kunderna. För kunna registrera betalningen krävs kunden, "
|
||||
"betalningsmetod och belopp. OpenERP kommer att föreslå öppna fakturor."
|
||||
|
||||
#. module: account_voucher
|
||||
#: selection:account.voucher,type:0
|
||||
|
|
@ -199,12 +205,12 @@ msgstr "Försäljning"
|
|||
#. module: account_voucher
|
||||
#: field:account.voucher.line,move_line_id:0
|
||||
msgid "Journal Item"
|
||||
msgstr ""
|
||||
msgstr "Journalpost"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,reference:0
|
||||
msgid "Ref #"
|
||||
msgstr ""
|
||||
msgstr "Ref #"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher.line,amount:0
|
||||
|
|
@ -220,22 +226,22 @@ msgstr "Betalningsalternativ"
|
|||
#. module: account_voucher
|
||||
#: sql_constraint:account.move.line:0
|
||||
msgid "Wrong credit or debit value in accounting entry !"
|
||||
msgstr ""
|
||||
msgstr "Fel kredit- eller debitvärde i bokföringstransaktionerna."
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Bill Information"
|
||||
msgstr ""
|
||||
msgstr "Räkningsinformation"
|
||||
|
||||
#. module: account_voucher
|
||||
#: selection:account.voucher,state:0
|
||||
msgid "Cancelled"
|
||||
msgstr ""
|
||||
msgstr "Avbruten"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.statement.from.invoice,date:0
|
||||
msgid "Date payment"
|
||||
msgstr ""
|
||||
msgstr "Betalningsdag"
|
||||
|
||||
#. module: account_voucher
|
||||
#: report:voucher.cash_receipt.drcr:0
|
||||
|
|
@ -246,13 +252,13 @@ msgstr "Mottagarens signatur"
|
|||
#. module: account_voucher
|
||||
#: model:ir.model,name:account_voucher.model_account_bank_statement_line
|
||||
msgid "Bank Statement Line"
|
||||
msgstr ""
|
||||
msgstr "Kontoutdragsrad"
|
||||
|
||||
#. module: account_voucher
|
||||
#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
|
||||
#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
|
||||
msgid "Supplier Vouchers"
|
||||
msgstr ""
|
||||
msgstr "Leverantörsverifikat"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
|
|
@ -263,12 +269,12 @@ msgstr ""
|
|||
#. module: account_voucher
|
||||
#: field:account.voucher,tax_id:0
|
||||
msgid "Tax"
|
||||
msgstr ""
|
||||
msgstr "Skatt"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,writeoff_journal_id:0
|
||||
msgid "Write-Off journal"
|
||||
msgstr ""
|
||||
msgstr "Avskrivningsjournal"
|
||||
|
||||
#. module: account_voucher
|
||||
#: report:voucher.cash_receipt.drcr:0
|
||||
|
|
@ -280,28 +286,29 @@ msgstr "Belopp (verbalt):"
|
|||
#: field:account.voucher,analytic_id:0
|
||||
#: field:account.voucher.line,account_analytic_id:0
|
||||
msgid "Analytic Account"
|
||||
msgstr ""
|
||||
msgstr "Analys konto"
|
||||
|
||||
#. module: account_voucher
|
||||
#: report:voucher.cash_receipt.drcr:0
|
||||
msgid "Journal:"
|
||||
msgstr ""
|
||||
msgstr "Journal:"
|
||||
|
||||
#. module: account_voucher
|
||||
#: constraint:account.move.line:0
|
||||
msgid ""
|
||||
"You can not create move line on receivable/payable account without partner"
|
||||
msgstr ""
|
||||
"Du kan inte skapa en transaktion på en ett konto utan en kund/leverantör"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Payment Information"
|
||||
msgstr ""
|
||||
msgstr "Betalningsinformation"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.statement.from.invoice:0
|
||||
msgid "Go"
|
||||
msgstr ""
|
||||
msgstr "Kör"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
|
|
@ -313,24 +320,24 @@ msgstr "Företag"
|
|||
#. module: account_voucher
|
||||
#: view:account.bank.statement:0
|
||||
msgid "Import Invoices"
|
||||
msgstr ""
|
||||
msgstr "Importera fakturor"
|
||||
|
||||
#. module: account_voucher
|
||||
#: code:addons/account_voucher/account_voucher.py:0
|
||||
#, python-format
|
||||
msgid ""
|
||||
"You have to configure account base code and account tax code on the '%s' tax!"
|
||||
msgstr ""
|
||||
msgstr "Du ska konfigurera kontokod och kontoskattekod för '%s' skatten!"
|
||||
|
||||
#. module: account_voucher
|
||||
#: report:voucher.print:0
|
||||
msgid "Account :"
|
||||
msgstr ""
|
||||
msgstr "Konto:"
|
||||
|
||||
#. module: account_voucher
|
||||
#: selection:account.voucher,type:0
|
||||
msgid "Receipt"
|
||||
msgstr ""
|
||||
msgstr "Kvitto"
|
||||
|
||||
#. module: account_voucher
|
||||
#: report:voucher.cash_receipt.drcr:0
|
||||
|
|
@ -341,25 +348,25 @@ msgstr ""
|
|||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Sales Lines"
|
||||
msgstr ""
|
||||
msgstr "Försäljningstransaktion"
|
||||
|
||||
#. module: account_voucher
|
||||
#: report:voucher.cash_receipt.drcr:0
|
||||
#: report:voucher.print:0
|
||||
msgid "Date:"
|
||||
msgstr ""
|
||||
msgstr "Datum:"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
#: field:account.voucher,period_id:0
|
||||
msgid "Period"
|
||||
msgstr ""
|
||||
msgstr "Period"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
#: field:account.voucher,state:0
|
||||
msgid "State"
|
||||
msgstr ""
|
||||
msgstr "Status"
|
||||
|
||||
#. module: account_voucher
|
||||
#: model:ir.module.module,shortdesc:account_voucher.module_meta_information
|
||||
|
|
@ -370,23 +377,23 @@ msgstr "Accounting Voucher Entries"
|
|||
#: view:account.voucher:0
|
||||
#: model:ir.actions.act_window,name:account_voucher.act_journal_voucher_open
|
||||
msgid "Voucher Entries"
|
||||
msgstr ""
|
||||
msgstr "Verifikattransaktioner"
|
||||
|
||||
#. module: account_voucher
|
||||
#: code:addons/account_voucher/account_voucher.py:0
|
||||
#, python-format
|
||||
msgid "Error !"
|
||||
msgstr ""
|
||||
msgstr "Fel !"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Supplier Voucher"
|
||||
msgstr ""
|
||||
msgstr "Leverantörsverifikat"
|
||||
|
||||
#. module: account_voucher
|
||||
#: model:ir.actions.act_window,name:account_voucher.action_review_voucher_list
|
||||
msgid "Vouchers Entries"
|
||||
msgstr ""
|
||||
msgstr "Verfikatstransaktioner"
|
||||
|
||||
#. module: account_voucher
|
||||
#: report:voucher.cash_receipt.drcr:0
|
||||
|
|
@ -399,18 +406,18 @@ msgstr ""
|
|||
#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
|
||||
#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
|
||||
msgid "Sales Receipt"
|
||||
msgstr ""
|
||||
msgstr "Försäljningskvitto"
|
||||
|
||||
#. module: account_voucher
|
||||
#: code:addons/account_voucher/account_voucher.py:0
|
||||
#, python-format
|
||||
msgid "Invalid action !"
|
||||
msgstr ""
|
||||
msgstr "Felaktig åtgärd!"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Other Information"
|
||||
msgstr ""
|
||||
msgstr "Övrig information"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher.unreconcile:0
|
||||
|
|
@ -421,57 +428,57 @@ msgstr ""
|
|||
#: 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 ""
|
||||
msgstr "Leverantörsbetalning"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.invoice:0
|
||||
#: code:addons/account_voucher/invoice.py:0
|
||||
#, python-format
|
||||
msgid "Pay Invoice"
|
||||
msgstr ""
|
||||
msgstr "Betala faktura"
|
||||
|
||||
#. module: account_voucher
|
||||
#: code:addons/account_voucher/account_voucher.py:0
|
||||
#, python-format
|
||||
msgid "No Account Base Code and Account Tax Code!"
|
||||
msgstr ""
|
||||
msgstr "Ingen kontokod och skattekod"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,tax_amount:0
|
||||
msgid "Tax Amount"
|
||||
msgstr ""
|
||||
msgstr "Skattebelopp"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Voucher Entry"
|
||||
msgstr ""
|
||||
msgstr "Verifikatstransaktion"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Paid Amount"
|
||||
msgstr ""
|
||||
msgstr "Betalt belopp"
|
||||
|
||||
#. module: account_voucher
|
||||
#: selection:account.voucher,pay_now:0
|
||||
msgid "Pay Directly"
|
||||
msgstr ""
|
||||
msgstr "Betala direkt"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.statement.from.invoice,line_ids:0
|
||||
#: field:account.statement.from.invoice.lines,line_ids:0
|
||||
msgid "Invoices"
|
||||
msgstr ""
|
||||
msgstr "Fakturor"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher.unreconcile,remove:0
|
||||
msgid "Want to remove accounting entries too ?"
|
||||
msgstr ""
|
||||
msgstr "Vill du ta bort redovisningstransaktionerna också?"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,line_ids:0
|
||||
#: model:ir.model,name:account_voucher.model_account_voucher_line
|
||||
msgid "Voucher Lines"
|
||||
msgstr ""
|
||||
msgstr "Verifikatstransaktioner"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,currency_id:0
|
||||
|
|
@ -481,12 +488,12 @@ msgstr "Valuta"
|
|||
#. module: account_voucher
|
||||
#: view:account.statement.from.invoice.lines:0
|
||||
msgid "Payable and Receivables"
|
||||
msgstr ""
|
||||
msgstr "Leveranöts och kundfakturor"
|
||||
|
||||
#. module: account_voucher
|
||||
#: selection:account.voucher,pay_now:0
|
||||
msgid "Pay Later or Group Funds"
|
||||
msgstr ""
|
||||
msgstr "Betal senare eller gruppera belopp"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
|
|
@ -494,23 +501,23 @@ msgstr ""
|
|||
#: report:voucher.cash_receipt.drcr:0
|
||||
#: report:voucher.print:0
|
||||
msgid "Draft"
|
||||
msgstr ""
|
||||
msgstr "Preliminär"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,writeoff_acc_id:0
|
||||
msgid "Write-Off account"
|
||||
msgstr ""
|
||||
msgstr "Konto för avskrivning"
|
||||
|
||||
#. module: account_voucher
|
||||
#: report:voucher.print:0
|
||||
msgid "Currency:"
|
||||
msgstr ""
|
||||
msgstr "Valuta:"
|
||||
|
||||
#. module: account_voucher
|
||||
#: report:voucher.cash_receipt.drcr:0
|
||||
#: report:voucher.print:0
|
||||
msgid "PRO-FORMA"
|
||||
msgstr ""
|
||||
msgstr "PRO-FORMA"
|
||||
|
||||
#. module: account_voucher
|
||||
#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
|
||||
|
|
@ -524,7 +531,7 @@ msgstr ""
|
|||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Total Amount"
|
||||
msgstr ""
|
||||
msgstr "Totalt belopp"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher.line,type:0
|
||||
|
|
@ -539,12 +546,12 @@ msgstr ""
|
|||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor"
|
||||
msgstr ""
|
||||
msgstr "Leverantör"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Payment Terms"
|
||||
msgstr ""
|
||||
msgstr "Betalningsvillkor"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
|
|
@ -560,48 +567,48 @@ msgstr "Datum"
|
|||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Post"
|
||||
msgstr ""
|
||||
msgstr "Bokför"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Extended Filters..."
|
||||
msgstr ""
|
||||
msgstr "Utökade filter..."
|
||||
|
||||
#. module: account_voucher
|
||||
#: constraint:account.move.line:0
|
||||
msgid "Company must be same for its related account and period."
|
||||
msgstr ""
|
||||
msgstr "Företaget måste vara samma för relaterat konto och period."
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.bank.statement.line,amount_reconciled:0
|
||||
msgid "Amount reconciled"
|
||||
msgstr ""
|
||||
msgstr "Avstämt belopp"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Expense Lines"
|
||||
msgstr ""
|
||||
msgstr "Utläggstransaktioner"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,pre_line:0
|
||||
msgid "Previous Payments ?"
|
||||
msgstr ""
|
||||
msgstr "Tidigare betalningar ?"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,comment:0
|
||||
msgid "Comment"
|
||||
msgstr ""
|
||||
msgstr "Kommentar"
|
||||
|
||||
#. module: account_voucher
|
||||
#: model:ir.actions.act_window,name:account_voucher.action_voucher_list
|
||||
#: model:ir.ui.menu,name:account_voucher.menu_encode_entries_by_voucher
|
||||
msgid "Journal Vouchers"
|
||||
msgstr ""
|
||||
msgstr "Journal verifikat"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Compute Tax"
|
||||
msgstr ""
|
||||
msgstr "Beräkna skatt"
|
||||
|
||||
#. module: account_voucher
|
||||
#: selection:account.voucher.line,type:0
|
||||
|
|
@ -613,45 +620,45 @@ msgstr "Kredit"
|
|||
#: code:addons/account_voucher/account_voucher.py:0
|
||||
#, python-format
|
||||
msgid "Please define a sequence on the journal !"
|
||||
msgstr ""
|
||||
msgstr "Definiera en sekvens för denna journal !"
|
||||
|
||||
#. module: account_voucher
|
||||
#: report:voucher.cash_receipt.drcr:0
|
||||
#: report:voucher.print:0
|
||||
msgid "Through :"
|
||||
msgstr ""
|
||||
msgstr "Genom :"
|
||||
|
||||
#. module: account_voucher
|
||||
#: selection:account.voucher,payment_option:0
|
||||
msgid "Without Write-off"
|
||||
msgstr ""
|
||||
msgstr "Utan avskrivning"
|
||||
|
||||
#. module: account_voucher
|
||||
#: help:account.voucher,reference:0
|
||||
msgid "Transaction reference number."
|
||||
msgstr ""
|
||||
msgstr "Transaktion referensnummer"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Invoices and outstanding transactions"
|
||||
msgstr ""
|
||||
msgstr "Fakturor och öppna transaktioner"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Bill Date"
|
||||
msgstr ""
|
||||
msgstr "Fakturadatum"
|
||||
|
||||
#. module: account_voucher
|
||||
#: report:voucher.cash_receipt.drcr:0
|
||||
#: report:voucher.print:0
|
||||
msgid "Number:"
|
||||
msgstr ""
|
||||
msgstr "Nummer:"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
#: model:ir.model,name:account_voucher.model_account_voucher
|
||||
msgid "Accounting Voucher"
|
||||
msgstr ""
|
||||
msgstr "Redovisningsverifikat"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,number:0
|
||||
|
|
@ -661,39 +668,39 @@ msgstr "Nummer"
|
|||
#. module: account_voucher
|
||||
#: model:ir.model,name:account_voucher.model_account_bank_statement
|
||||
msgid "Bank Statement"
|
||||
msgstr ""
|
||||
msgstr "Bankkontoutdrag"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "To Review"
|
||||
msgstr ""
|
||||
msgstr "Att godkänna"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Sales Information"
|
||||
msgstr ""
|
||||
msgstr "Försäljningsinformation"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Open Vendor Journal Entries"
|
||||
msgstr ""
|
||||
msgstr "Öppna leverantörjournalstransaktioner"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher.line,voucher_id:0
|
||||
#: model:ir.actions.report.xml,name:account_voucher.report_account_voucher
|
||||
#: model:res.request.link,name:account_voucher.req_link_voucher
|
||||
msgid "Voucher"
|
||||
msgstr ""
|
||||
msgstr "Verifikat"
|
||||
|
||||
#. module: account_voucher
|
||||
#: model:ir.model,name:account_voucher.model_account_invoice
|
||||
msgid "Invoice"
|
||||
msgstr ""
|
||||
msgstr "Faktura"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Voucher Items"
|
||||
msgstr ""
|
||||
msgstr "Verikattransaktioner"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.statement.from.invoice:0
|
||||
|
|
@ -706,14 +713,14 @@ msgstr "ångra"
|
|||
#. module: account_voucher
|
||||
#: selection:account.voucher,state:0
|
||||
msgid "Pro-forma"
|
||||
msgstr ""
|
||||
msgstr "Pro-forma"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
#: field:account.voucher,move_ids:0
|
||||
#: model:ir.model,name:account_voucher.model_account_move_line
|
||||
msgid "Journal Items"
|
||||
msgstr ""
|
||||
msgstr "Journalrader"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
|
|
@ -721,7 +728,7 @@ msgstr ""
|
|||
#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
|
||||
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
|
||||
msgid "Customer Payment"
|
||||
msgstr ""
|
||||
msgstr "Kundbetalning"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.move.line,amount_unreconciled:0
|
||||
|
|
@ -737,23 +744,23 @@ msgstr ""
|
|||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Pay"
|
||||
msgstr ""
|
||||
msgstr "Betala"
|
||||
|
||||
#. module: account_voucher
|
||||
#: selection:account.voucher.line,type:0
|
||||
#: report:voucher.cash_receipt.drcr:0
|
||||
msgid "Debit"
|
||||
msgstr ""
|
||||
msgstr "Debet"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Are you sure to confirm this record ?"
|
||||
msgstr ""
|
||||
msgstr "Är du säker på att du vill godkänna denna post?"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Payment Method"
|
||||
msgstr ""
|
||||
msgstr "Betalningsmetod"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher.line,name:0
|
||||
|
|
@ -769,7 +776,7 @@ msgstr "Avbruten"
|
|||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor Invoices and Outstanding transactions"
|
||||
msgstr ""
|
||||
msgstr "Leverantörsfakturor och utestående transaktioner"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.statement.from.invoice,journal_ids:0
|
||||
|
|
@ -781,7 +788,7 @@ msgstr "Journal"
|
|||
#. module: account_voucher
|
||||
#: field:account.voucher,payment_option:0
|
||||
msgid "Payment Option"
|
||||
msgstr ""
|
||||
msgstr "Betalningsalternativ"
|
||||
|
||||
#. module: account_voucher
|
||||
#: report:voucher.cash_receipt.drcr:0
|
||||
|
|
@ -791,24 +798,24 @@ msgstr "-"
|
|||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Internal Notes"
|
||||
msgstr ""
|
||||
msgstr "Interna anteckningar"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
#: field:account.voucher,line_cr_ids:0
|
||||
msgid "Credits"
|
||||
msgstr ""
|
||||
msgstr "Krediteringar"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,writeoff_amount:0
|
||||
msgid "Writeoff Amount"
|
||||
msgstr ""
|
||||
msgstr "Avskrivningsbelopp"
|
||||
|
||||
#. module: account_voucher
|
||||
#: report:voucher.cash_receipt.drcr:0
|
||||
#: report:voucher.print:0
|
||||
msgid "State:"
|
||||
msgstr ""
|
||||
msgstr "Status:"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.bank.statement.line,voucher_id:0
|
||||
|
|
@ -817,7 +824,7 @@ msgstr ""
|
|||
#: field:account.voucher,pay_now:0
|
||||
#: selection:account.voucher,type:0
|
||||
msgid "Payment"
|
||||
msgstr ""
|
||||
msgstr "Betalning"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
|
|
@ -825,38 +832,38 @@ msgstr ""
|
|||
#: report:voucher.cash_receipt.drcr:0
|
||||
#: report:voucher.print:0
|
||||
msgid "Posted"
|
||||
msgstr ""
|
||||
msgstr "Bokförd"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Customer"
|
||||
msgstr ""
|
||||
msgstr "Kund"
|
||||
|
||||
#. module: account_voucher
|
||||
#: selection:account.voucher,payment_option:0
|
||||
msgid "With Write-off"
|
||||
msgstr ""
|
||||
msgstr "Med avskrivning"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,type:0
|
||||
msgid "Default Type"
|
||||
msgstr ""
|
||||
msgstr "Standardtyp"
|
||||
|
||||
#. module: account_voucher
|
||||
#: model:ir.model,name:account_voucher.model_account_statement_from_invoice
|
||||
#: model:ir.model,name:account_voucher.model_account_statement_from_invoice_lines
|
||||
msgid "Entries by Statement from Invoices"
|
||||
msgstr ""
|
||||
msgstr "Transkationer per kontoutdrag från fakturor"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,move_id:0
|
||||
msgid "Account Entry"
|
||||
msgstr ""
|
||||
msgstr "Kontotransaktion"
|
||||
|
||||
#. module: account_voucher
|
||||
#: help:account.voucher,date:0
|
||||
msgid "Effective date for accounting entries"
|
||||
msgstr ""
|
||||
msgstr "Bokföringsdatum för konteringstransaktioner"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher.unreconcile:0
|
||||
|
|
@ -874,23 +881,23 @@ msgstr ""
|
|||
#: view:account.voucher:0
|
||||
#: field:account.voucher.line,amount_unreconciled:0
|
||||
msgid "Open Balance"
|
||||
msgstr ""
|
||||
msgstr "Ingående balans"
|
||||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
#: field:account.voucher,amount:0
|
||||
msgid "Total"
|
||||
msgstr ""
|
||||
msgstr "Total"
|
||||
|
||||
#. module: account_voucher
|
||||
#: field:account.voucher,name:0
|
||||
msgid "Memo"
|
||||
msgstr ""
|
||||
msgstr "Anteckning"
|
||||
|
||||
#. module: account_voucher
|
||||
#: constraint:account.move.line:0
|
||||
msgid "You can not create move line on view account."
|
||||
msgstr ""
|
||||
msgstr "Du kan inte skapa en transaktion för ett vykonto"
|
||||
|
||||
#~ msgid ""
|
||||
#~ "The Object name must start with x_ and not contain any special character !"
|
||||
|
|
|
|||
|
|
@ -420,7 +420,7 @@ msgstr ""
|
|||
#. 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
|
||||
|
|
@ -538,7 +538,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor"
|
||||
msgid "Supplier"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
@ -675,7 +675,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Open Vendor Journal Entries"
|
||||
msgid "Open Supplier Journal Entries"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
|
|||
|
|
@ -420,7 +420,7 @@ msgstr ""
|
|||
#. 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
|
||||
|
|
@ -538,7 +538,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor"
|
||||
msgid "Supplier"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
@ -675,7 +675,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Open Vendor Journal Entries"
|
||||
msgid "Open Supplier Journal Entries"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
|
|||
|
|
@ -420,7 +420,7 @@ msgstr ""
|
|||
#. 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
|
||||
|
|
@ -538,7 +538,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor"
|
||||
msgid "Supplier"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
@ -675,7 +675,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Open Vendor Journal Entries"
|
||||
msgid "Open Supplier Journal Entries"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
|
|||
|
|
@ -421,7 +421,7 @@ msgstr ""
|
|||
#. 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
|
||||
|
|
@ -539,7 +539,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor"
|
||||
msgid "Supplier"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
@ -676,7 +676,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Open Vendor Journal Entries"
|
||||
msgid "Open Supplier Journal Entries"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
|
|||
|
|
@ -420,7 +420,7 @@ msgstr ""
|
|||
#. 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
|
||||
|
|
@ -538,7 +538,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor"
|
||||
msgid "Supplier"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
@ -675,7 +675,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Open Vendor Journal Entries"
|
||||
msgid "Open Supplier Journal Entries"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
|
|||
|
|
@ -420,7 +420,7 @@ msgstr ""
|
|||
#. 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
|
||||
|
|
@ -538,7 +538,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Vendor"
|
||||
msgid "Supplier"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
@ -675,7 +675,7 @@ msgstr ""
|
|||
|
||||
#. module: account_voucher
|
||||
#: view:account.voucher:0
|
||||
msgid "Open Vendor Journal Entries"
|
||||
msgid "Open Supplier Journal Entries"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_voucher
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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="payment_option" required="1"/>
|
||||
<field name="writeoff_amount"
|
||||
attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
|
||||
<field name="payment_option" required="1"/>
|
||||
<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">
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -206,7 +206,7 @@ class account_analytic_line(osv.osv):
|
|||
'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),
|
||||
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2010-12-15 15:04+0000\n"
|
||||
"PO-Revision-Date: 2010-12-16 17:20+0000\n"
|
||||
"PO-Revision-Date: 2010-12-19 23:31+0000\n"
|
||||
"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
|
||||
"Language-Team: Greek <el@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-17 05:31+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: auction
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2010-12-15 15:04+0000\n"
|
||||
"PO-Revision-Date: 2010-12-18 19:46+0000\n"
|
||||
"PO-Revision-Date: 2010-12-20 04:21+0000\n"
|
||||
"Last-Translator: lolivier <olivier.lenoir@free.fr>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-19 04:47+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: auction
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2010-12-15 15:04+0000\n"
|
||||
"PO-Revision-Date: 2010-12-16 17:39+0000\n"
|
||||
"PO-Revision-Date: 2010-12-20 00:23+0000\n"
|
||||
"Last-Translator: OpenERP Administrators <Unknown>\n"
|
||||
"Language-Team: Vietnamese <vi@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-17 05:32+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: auction
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2010-12-15 15:05+0000\n"
|
||||
"PO-Revision-Date: 2010-12-18 10:01+0000\n"
|
||||
"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
|
||||
"PO-Revision-Date: 2010-12-19 23:41+0000\n"
|
||||
"Last-Translator: OpenERP Administrators <Unknown>\n"
|
||||
"Language-Team: Dutch <nl@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-19 04:48+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-20 04:53+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: base_action_rule
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2010-12-15 15:05+0000\n"
|
||||
"PO-Revision-Date: 2010-12-18 08:02+0000\n"
|
||||
"Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\n"
|
||||
"PO-Revision-Date: 2010-12-20 04:26+0000\n"
|
||||
"Last-Translator: OpenERP Administrators <Unknown>\n"
|
||||
"Language-Team: Swedish <sv@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-19 04:48+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-20 04:53+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: base_action_rule
|
||||
|
|
|
|||
|
|
@ -1130,7 +1130,7 @@ rule or repeating pattern of time to exclude from the recurring rule."),
|
|||
rule or repeating pattern for recurring events\n\
|
||||
e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
|
||||
FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU'),
|
||||
'rrule_type': fields.selection([('none', ''), ('daily', 'Daily'),('daily_working', 'Daily(Working day)'), \
|
||||
'rrule_type': fields.selection([('none', ''), ('daily', 'Daily'), \
|
||||
('weekly', 'Weekly'), ('monthly', 'Monthly'), \
|
||||
('yearly', 'Yearly'),],
|
||||
'Recurrency', states={'done': [('readonly', True)]},
|
||||
|
|
@ -1144,14 +1144,15 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
|
|||
'user_id': fields.many2one('res.users', 'Responsible', states={'done': [('readonly', True)]}),
|
||||
'organizer': fields.char("Organizer", size=256, states={'done': [('readonly', True)]}), # Map with Organizer Attribure of VEvent.
|
||||
'organizer_id': fields.many2one('res.users', 'Organizer', states={'done': [('readonly', True)]}),
|
||||
'freq': fields.selection([('None', 'No Repeat'), \
|
||||
('hourly', 'Hours'), \
|
||||
('daily', 'Days'), \
|
||||
('weekly', 'Weeks'), \
|
||||
('monthly', 'Months'), \
|
||||
'freq': fields.selection([('None', 'No Repeat'),
|
||||
('hourly', 'Hours'),
|
||||
('daily', 'Days'),
|
||||
('weekly', 'Weeks'),
|
||||
('monthly', 'Months'),
|
||||
('yearly', 'Years'), ], 'Frequency'),
|
||||
|
||||
'interval': fields.integer('Interval', help="Repeat every (Days/Week/Month/Year)"),
|
||||
'count': fields.integer('Count', help="Repeat max that times"),
|
||||
'count': fields.integer('Repeat', help="Repeat x times"),
|
||||
'mo': fields.boolean('Mon'),
|
||||
'tu': fields.boolean('Tue'),
|
||||
'we': fields.boolean('Wed'),
|
||||
|
|
@ -1159,7 +1160,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
|
|||
'fr': fields.boolean('Fri'),
|
||||
'sa': fields.boolean('Sat'),
|
||||
'su': fields.boolean('Sun'),
|
||||
'select1': fields.selection([('date', 'Date of month'), \
|
||||
'select1': fields.selection([('date', 'Date of month'),
|
||||
('day', 'Day of month')], 'Option'),
|
||||
'day': fields.integer('Date of month'),
|
||||
'week_list': fields.selection([('MO', 'Monday'), ('TU', 'Tuesday'), \
|
||||
|
|
@ -1176,7 +1177,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
|
|||
'allday': fields.boolean('All Day', states={'done': [('readonly', True)]}),
|
||||
'active': fields.boolean('Active', help="If the active field is set to \
|
||||
true, it will allow you to hide the event alarm information without removing it."),
|
||||
'recurrency': fields.boolean('Recurrency', help="Recurrent Meeting"),
|
||||
'recurrency': fields.boolean('Recurrent', help="Recurrent Meeting"),
|
||||
'edit_all': fields.boolean('Edit All', help="Edit all Occurrences of recurrent Meeting."),
|
||||
}
|
||||
def default_organizer(self, cr, uid, context=None):
|
||||
|
|
@ -1337,13 +1338,10 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
|
|||
weekstring = ''
|
||||
monthstring = ''
|
||||
yearstring = ''
|
||||
freq=''
|
||||
if freq == 'None':
|
||||
freq=datas.get('rrule_type')
|
||||
if freq == 'none':
|
||||
return ''
|
||||
if datas.get('rrule_type')=='daily_working':
|
||||
freq ='weekly'
|
||||
else:
|
||||
freq=datas.get('rrule_type')
|
||||
|
||||
interval_srting = datas.get('interval') and (';INTERVAL=' + str(datas.get('interval'))) or ''
|
||||
|
||||
if freq == 'weekly':
|
||||
|
|
@ -1359,16 +1357,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
|
|||
elif datas.get('select1')=='date':
|
||||
monthstring = ';BYMONTHDAY=' + str(datas.get('day'))
|
||||
|
||||
elif freq == 'yearly':
|
||||
if datas.get('select1')=='date' and (datas.get('day') < 1 or datas.get('day') > 31):
|
||||
raise osv.except_osv(_('Error!'), ("Please select proper Day of month"))
|
||||
bymonth = ';BYMONTH=' + str(datas.get('month_list'))
|
||||
if datas.get('select1')=='day':
|
||||
bystring = ';BYDAY=' + datas.get('byday') + datas.get('week_list')
|
||||
elif datas.get('select1')=='date':
|
||||
bystring = ';BYMONTHDAY=' + str(datas.get('day'))
|
||||
yearstring = bymonth + bystring
|
||||
|
||||
|
||||
if datas.get('end_date'):
|
||||
datas['end_date'] = ''.join((re.compile('\d')).findall(datas.get('end_date'))) + 'T235959Z'
|
||||
enddate = (datas.get('count') and (';COUNT=' + str(datas.get('count'))) or '') +\
|
||||
|
|
|
|||
|
|
@ -345,56 +345,56 @@
|
|||
</field>
|
||||
</page>
|
||||
<page string="Recurrency Option" attrs="{'invisible':[('recurrency','=',False)]}">
|
||||
<group col="4" colspan="4" name="rrule">
|
||||
<group col="2" colspan="2">
|
||||
<field name="rrule_type" string="Recurrency"
|
||||
attrs="{'readonly':[('recurrent_uid','!=',False)]}" colspan="2"/>
|
||||
<label string="" colspan="2"/>
|
||||
</group>
|
||||
<separator string="Recurrency Rule" colspan="8"/>
|
||||
<group col="6" colspan="4">
|
||||
<field name="interval" string="Repeat Times" attrs="{'readonly': [('end_date','!=',False)]}"/>
|
||||
<field name="count" attrs="{'readonly': [('end_date','!=',False)]}"/>
|
||||
<field name="end_date" attrs="{'readonly': [('interval','!=',False)]}"/>
|
||||
</group>
|
||||
<group col="14" colspan="4" name="Select weekdays"
|
||||
attrs="{'invisible' :[('rrule_type','not in', ['weekly','daily_working'])]}">
|
||||
<field name="mo" colspan="1" />
|
||||
<field name="tu" colspan="1" />
|
||||
<field name="we" colspan="1" />
|
||||
<field name="th" colspan="1" />
|
||||
<newline/>
|
||||
<field name="fr" colspan="1" />
|
||||
<field name="sa" colspan="1" attrs="{'invisible': [('rrule_type','=','daily_working')]}"/>
|
||||
<field name="su" colspan="1" attrs="{'invisible': [('rrule_type','=','daily_working')]}"/>
|
||||
<newline />
|
||||
</group>
|
||||
<group col="10" colspan="4"
|
||||
attrs="{'invisible' : [('rrule_type','!=','monthly'), ('rrule_type','!=','yearly')]}">
|
||||
<group col="2" colspan="1">
|
||||
<field name="select1" />
|
||||
</group>
|
||||
<group col="2" colspan="1"
|
||||
attrs="{'invisible' : [('select1','=','day')]}">
|
||||
<field name="day"
|
||||
attrs="{'required' : [('select1','=','date')]}" />
|
||||
</group>
|
||||
<group col="3" colspan="1"
|
||||
attrs="{'invisible' : [('select1','=','date')]}">
|
||||
<field name="byday" string="The"
|
||||
attrs="{'required' : [('select1','=','day')]}" />
|
||||
<field name="week_list" nolabel="1"
|
||||
attrs="{'required' : [('select1','=','day')]}" />
|
||||
</group>
|
||||
<group col="1" colspan="1"
|
||||
attrs="{'invisible' : [('rrule_type','!=','yearly')]}">
|
||||
<field name="month_list" string="of"
|
||||
colspan="1"
|
||||
attrs="{'required' : [('rrule_type','=','yearly')]}" />
|
||||
</group>
|
||||
</group>
|
||||
</group>
|
||||
</page>
|
||||
<group col="4" colspan="4" name="rrule">
|
||||
<group col="4" colspan="4">
|
||||
<field name="rrule_type" string="Recurrency period"
|
||||
attrs="{'readonly':[('recurrent_uid','!=',False)]}" />
|
||||
<label string="" colspan="2"/>
|
||||
|
||||
<separator string="End of recurrency" colspan="4"/>
|
||||
<field name="count" attrs="{'readonly': [('end_date','!=',False)]}"/>
|
||||
<label string=" " colspan="2" />
|
||||
<newline />
|
||||
<field name="end_date" attrs="{'readonly': [('count','!=',False)]}"/>
|
||||
<newline />
|
||||
|
||||
<separator string="Repeat interval" colspan="4"/>
|
||||
<field name="interval" /> <label string="" colspan="2"/>
|
||||
</group>
|
||||
<group col="8" colspan="4" name="Select weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}">
|
||||
<separator string="Choose day where repeat the meeting" colspan="8"/>
|
||||
<field name="mo" colspan="1" />
|
||||
<field name="tu" colspan="1" />
|
||||
<field name="we" colspan="1" />
|
||||
<field name="th" colspan="1" />
|
||||
<newline/>
|
||||
<field name="fr" colspan="1" />
|
||||
<field name="sa" colspan="1" />
|
||||
<field name="su" colspan="1" />
|
||||
<newline />
|
||||
</group>
|
||||
<group col="10" colspan="4"
|
||||
attrs="{'invisible' : [('rrule_type','!=','monthly')]}">
|
||||
<separator string="Choose day in the month where repeat the meeting" colspan="12"/>
|
||||
<group col="2" colspan="1">
|
||||
<field name="select1" />
|
||||
</group>
|
||||
<group col="2" colspan="1"
|
||||
attrs="{'invisible' : [('select1','=','day')]}">
|
||||
<field name="day"
|
||||
attrs="{'required' : [('select1','=','date'), ('rrule_type','=','monthly')]}" />
|
||||
</group>
|
||||
<group col="3" colspan="1"
|
||||
attrs="{'invisible' : [('select1','=','date'), ('rrule_type','=','monthly')]}">
|
||||
<field name="byday" string="The"
|
||||
attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')]}" />
|
||||
<field name="week_list" nolabel="1"
|
||||
attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')]}" />
|
||||
</group>
|
||||
</group>
|
||||
</group>
|
||||
|
||||
</page>
|
||||
</notebook>
|
||||
</form>
|
||||
</field>
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2010-12-15 15:05+0000\n"
|
||||
"PO-Revision-Date: 2010-12-17 19:48+0000\n"
|
||||
"Last-Translator: Santi (Pexego) <santiago@pexego.es>\n"
|
||||
"PO-Revision-Date: 2010-12-19 13:07+0000\n"
|
||||
"Last-Translator: Carlos @ smile.fr <Unknown>\n"
|
||||
"Language-Team: Spanish <es@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-18 05:06+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: base_calendar
|
||||
|
|
@ -241,7 +241,7 @@ msgstr ""
|
|||
#. module: base_calendar
|
||||
#: help:calendar.attendee,state:0
|
||||
msgid "Status of the attendee's participation"
|
||||
msgstr ""
|
||||
msgstr "Estado de la participación de los asistentes"
|
||||
|
||||
#. module: base_calendar
|
||||
#: selection:calendar.attendee,cutype:0
|
||||
|
|
@ -496,7 +496,7 @@ msgstr ""
|
|||
#. module: base_calendar
|
||||
#: view:calendar.attendee:0
|
||||
msgid "Event Detail"
|
||||
msgstr ""
|
||||
msgstr "Detalles del evento"
|
||||
|
||||
#. module: base_calendar
|
||||
#: selection:calendar.alarm,state:0
|
||||
|
|
@ -506,7 +506,7 @@ msgstr ""
|
|||
#. module: base_calendar
|
||||
#: model:ir.model,name:base_calendar.model_calendar_alarm
|
||||
msgid "Event alarm information"
|
||||
msgstr ""
|
||||
msgstr "Información del aviso del evento"
|
||||
|
||||
#. module: base_calendar
|
||||
#: selection:calendar.event,class:0
|
||||
|
|
@ -577,12 +577,12 @@ msgstr ""
|
|||
#. module: base_calendar
|
||||
#: view:calendar.attendee:0
|
||||
msgid "Required Reply"
|
||||
msgstr ""
|
||||
msgstr "Respuesta requerida"
|
||||
|
||||
#. module: base_calendar
|
||||
#: selection:calendar.attendee,role:0
|
||||
msgid "Participation required"
|
||||
msgstr ""
|
||||
msgstr "Participación requerida"
|
||||
|
||||
#. module: base_calendar
|
||||
#: field:calendar.event,create_date:0
|
||||
|
|
@ -593,7 +593,7 @@ msgstr ""
|
|||
#. module: base_calendar
|
||||
#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
|
||||
msgid "Set Exclude range"
|
||||
msgstr ""
|
||||
msgstr "Fijar el rango de exclusión"
|
||||
|
||||
#. module: base_calendar
|
||||
#: selection:calendar.event,class:0
|
||||
|
|
@ -612,7 +612,7 @@ msgstr ""
|
|||
#: code:addons/base_calendar/base_calendar.py:0
|
||||
#, python-format
|
||||
msgid "Can not Duplicate"
|
||||
msgstr ""
|
||||
msgstr "No se puede duplicar"
|
||||
|
||||
#. module: base_calendar
|
||||
#: field:calendar.event,class:0
|
||||
|
|
@ -696,7 +696,7 @@ msgstr ""
|
|||
#. module: base_calendar
|
||||
#: help:base_calendar.invite.attendee,send_mail:0
|
||||
msgid "Check this if you want to send an Email to Invited Person"
|
||||
msgstr ""
|
||||
msgstr "Marque aquí si quiere enviar un correo a la persona invitada"
|
||||
|
||||
#. module: base_calendar
|
||||
#: view:calendar.event:0
|
||||
|
|
@ -780,7 +780,7 @@ msgstr ""
|
|||
#. module: base_calendar
|
||||
#: model:ir.model,name:base_calendar.model_res_alarm
|
||||
msgid "Basic Alarm Information"
|
||||
msgstr ""
|
||||
msgstr "Información sobre la alarma básica"
|
||||
|
||||
#. module: base_calendar
|
||||
#: field:base.calendar.set.exrule,fr:0
|
||||
|
|
@ -793,7 +793,7 @@ msgstr ""
|
|||
#: code:addons/base_calendar/base_calendar.py:0
|
||||
#, python-format
|
||||
msgid "Count can not be Negative"
|
||||
msgstr ""
|
||||
msgstr "La cuenta no puede ser negativa"
|
||||
|
||||
#. module: base_calendar
|
||||
#: field:calendar.attendee,member:0
|
||||
|
|
@ -825,7 +825,7 @@ msgstr ""
|
|||
#. module: base_calendar
|
||||
#: view:calendar.attendee:0
|
||||
msgid "Invitation From"
|
||||
msgstr ""
|
||||
msgstr "Invitación desde"
|
||||
|
||||
#. module: base_calendar
|
||||
#: view:calendar.event:0
|
||||
|
|
@ -850,12 +850,12 @@ msgstr ""
|
|||
#: model:ir.actions.act_window,name:base_calendar.action_view_calendar_invite_attendee_wizard
|
||||
#: model:ir.model,name:base_calendar.model_base_calendar_invite_attendee
|
||||
msgid "Invite Attendees"
|
||||
msgstr ""
|
||||
msgstr "Invitar asistentes"
|
||||
|
||||
#. module: base_calendar
|
||||
#: help:calendar.attendee,email:0
|
||||
msgid "Email of Invited Person"
|
||||
msgstr ""
|
||||
msgstr "Email del invitado"
|
||||
|
||||
#. module: base_calendar
|
||||
#: field:calendar.alarm,repeat:0
|
||||
|
|
@ -940,7 +940,7 @@ msgstr ""
|
|||
#. module: base_calendar
|
||||
#: help:calendar.attendee,member:0
|
||||
msgid "Indicate the groups that the attendee belongs to"
|
||||
msgstr ""
|
||||
msgstr "Indicar los grupos a los que pertenece el asistente"
|
||||
|
||||
#. module: base_calendar
|
||||
#: view:base_calendar.invite.attendee:0
|
||||
|
|
@ -1025,7 +1025,7 @@ msgstr ""
|
|||
#: code:addons/base_calendar/base_calendar.py:0
|
||||
#, python-format
|
||||
msgid "Interval can not be Negative"
|
||||
msgstr ""
|
||||
msgstr "El intervalo no puede ser negativo"
|
||||
|
||||
#. module: base_calendar
|
||||
#: field:calendar.alarm,name:0
|
||||
|
|
@ -1052,7 +1052,7 @@ msgstr ""
|
|||
#. module: base_calendar
|
||||
#: help:base_calendar.invite.attendee,type:0
|
||||
msgid "Select whom you want to Invite"
|
||||
msgstr ""
|
||||
msgstr "Seleccione a quien quiere invitar"
|
||||
|
||||
#. module: base_calendar
|
||||
#: help:calendar.alarm,duration:0
|
||||
|
|
@ -1065,7 +1065,7 @@ msgstr ""
|
|||
#. module: base_calendar
|
||||
#: model:ir.model,name:base_calendar.model_calendar_event_edit_all
|
||||
msgid "Calendar Edit all event"
|
||||
msgstr ""
|
||||
msgstr "Editar todos los eventos del calendario"
|
||||
|
||||
#. module: base_calendar
|
||||
#: help:calendar.attendee,role:0
|
||||
|
|
@ -1075,12 +1075,12 @@ msgstr ""
|
|||
#. module: base_calendar
|
||||
#: field:calendar.attendee,ref:0
|
||||
msgid "Event Ref"
|
||||
msgstr ""
|
||||
msgstr "Ref. evento"
|
||||
|
||||
#. module: base_calendar
|
||||
#: help:calendar.alarm,action:0
|
||||
msgid "Defines the action to be invoked when an alarm is triggered"
|
||||
msgstr ""
|
||||
msgstr "Define la acción a invocar cuando salte la alarma"
|
||||
|
||||
#. module: base_calendar
|
||||
#: view:calendar.event:0
|
||||
|
|
@ -1128,7 +1128,7 @@ msgstr ""
|
|||
#. module: base_calendar
|
||||
#: view:res.alarm:0
|
||||
msgid "Reminder Details"
|
||||
msgstr ""
|
||||
msgstr "Detalles del recordatorio"
|
||||
|
||||
#. module: base_calendar
|
||||
#: view:calendar.attendee:0
|
||||
|
|
@ -1285,7 +1285,7 @@ msgstr ""
|
|||
#. module: base_calendar
|
||||
#: selection:base_calendar.invite.attendee,type:0
|
||||
msgid "External Email"
|
||||
msgstr ""
|
||||
msgstr "Email externo"
|
||||
|
||||
#. module: base_calendar
|
||||
#: help:calendar.event,rrule:0
|
||||
|
|
@ -1327,7 +1327,7 @@ msgstr ""
|
|||
#. module: base_calendar
|
||||
#: view:calendar.attendee:0
|
||||
msgid "Search Invitations"
|
||||
msgstr ""
|
||||
msgstr "Buscar invitaciones"
|
||||
|
||||
#. module: base_calendar
|
||||
#: selection:calendar.alarm,trigger_occurs:0
|
||||
|
|
@ -1444,11 +1444,12 @@ msgstr ""
|
|||
#, python-format
|
||||
msgid "Please Apply Recurrency before applying Exception Rule."
|
||||
msgstr ""
|
||||
"Por favor, aplique la repetición antes de aplicar la excepción de la regla"
|
||||
|
||||
#. module: base_calendar
|
||||
#: field:calendar.attendee,sent_by_uid:0
|
||||
msgid "Sent By User"
|
||||
msgstr ""
|
||||
msgstr "Enviado por usuario"
|
||||
|
||||
#. module: base_calendar
|
||||
#: selection:base.calendar.set.exrule,month_list:0
|
||||
|
|
@ -1495,7 +1496,7 @@ msgstr ""
|
|||
#. module: base_calendar
|
||||
#: view:base_calendar.invite.attendee:0
|
||||
msgid "Invite"
|
||||
msgstr ""
|
||||
msgstr "Invitar"
|
||||
|
||||
#. module: base_calendar
|
||||
#: model:ir.model,name:base_calendar.model_calendar_attendee
|
||||
|
|
@ -1515,7 +1516,7 @@ msgstr ""
|
|||
#. module: base_calendar
|
||||
#: field:calendar.attendee,sent_by:0
|
||||
msgid "Sent By"
|
||||
msgstr ""
|
||||
msgstr "Enviado por"
|
||||
|
||||
#. module: base_calendar
|
||||
#: field:calendar.event,sequence:0
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2010-12-15 15:05+0000\n"
|
||||
"PO-Revision-Date: 2010-12-18 10:00+0000\n"
|
||||
"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
|
||||
"PO-Revision-Date: 2010-12-20 04:24+0000\n"
|
||||
"Last-Translator: OpenERP Administrators <Unknown>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-19 04:46+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-20 04:50+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: base_contact
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2010-12-15 15:05+0000\n"
|
||||
"PO-Revision-Date: 2010-12-16 16:06+0000\n"
|
||||
"Last-Translator: Phong Nguyen <Unknown>\n"
|
||||
"PO-Revision-Date: 2010-12-19 23:57+0000\n"
|
||||
"Last-Translator: OpenERP Administrators <Unknown>\n"
|
||||
"Language-Team: Vietnamese <vi@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-17 05:10+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-20 04:50+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: base_contact
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 6.0dev\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2010-12-15 15:05+0000\n"
|
||||
"PO-Revision-Date: 2010-09-09 07:07+0000\n"
|
||||
"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
|
||||
"PO-Revision-Date: 2010-12-19 07:17+0000\n"
|
||||
"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-17 05:10+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-20 04:50+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: base_contact
|
||||
|
|
@ -39,34 +39,34 @@ msgstr ""
|
|||
#. module: base_contact
|
||||
#: help:res.partner.job,date_start:0
|
||||
msgid "Start date of job(Joining Date)"
|
||||
msgstr ""
|
||||
msgstr "开始工作的日期（入职日期）"
|
||||
|
||||
#. module: base_contact
|
||||
#: view:base.contact.installer:0
|
||||
msgid "Select the Option for Addresses Migration"
|
||||
msgstr ""
|
||||
msgstr "选择地址迁移的选项"
|
||||
|
||||
#. module: base_contact
|
||||
#: help:res.partner.job,function:0
|
||||
msgid "Function of this contact with this partner"
|
||||
msgstr ""
|
||||
msgstr "该业务伙伴联系人的职能"
|
||||
|
||||
#. module: base_contact
|
||||
#: help:res.partner.job,state:0
|
||||
msgid "Status of Address"
|
||||
msgstr ""
|
||||
msgstr "地址状态"
|
||||
|
||||
#. module: base_contact
|
||||
#: help:res.partner.job,name:0
|
||||
msgid ""
|
||||
"You may enter Address first,Partner will be linked "
|
||||
"automatically if any."
|
||||
msgstr ""
|
||||
msgstr "您应该先输入地址，业务伙伴信息如果存在的话会自动链接过来。"
|
||||
|
||||
#. module: base_contact
|
||||
#: help:res.partner.job,fax:0
|
||||
msgid "Job FAX no."
|
||||
msgstr ""
|
||||
msgstr "工作传真号码"
|
||||
|
||||
#. module: base_contact
|
||||
#: field:res.partner.contact,mobile:0
|
||||
|
|
@ -77,7 +77,7 @@ msgstr "手机"
|
|||
#: view:res.partner.contact:0
|
||||
#: field:res.partner.contact,comment:0
|
||||
msgid "Notes"
|
||||
msgstr ""
|
||||
msgstr "备注"
|
||||
|
||||
#. module: base_contact
|
||||
#: model:process.node,note:base_contact.process_node_contacts0
|
||||
|
|
@ -98,7 +98,7 @@ msgstr ""
|
|||
#: view:base.contact.installer:0
|
||||
#: field:base.contact.installer,migrate:0
|
||||
msgid "Migrate"
|
||||
msgstr ""
|
||||
msgstr "迁移"
|
||||
|
||||
#. module: base_contact
|
||||
#: view:res.partner.contact:0
|
||||
|
|
@ -169,7 +169,7 @@ msgstr "内部或外部扩充电话号码"
|
|||
#. module: base_contact
|
||||
#: help:res.partner.job,phone:0
|
||||
msgid "Job Phone no."
|
||||
msgstr ""
|
||||
msgstr "工作电话号码"
|
||||
|
||||
#. module: base_contact
|
||||
#: view:res.partner.contact:0
|
||||
|
|
@ -186,7 +186,7 @@ msgstr "联系人"
|
|||
#. module: base_contact
|
||||
#: help:res.partner.job,email:0
|
||||
msgid "Job E-Mail"
|
||||
msgstr ""
|
||||
msgstr "工作电子邮件"
|
||||
|
||||
#. module: base_contact
|
||||
#: field:res.partner.job,sequence_partner:0
|
||||
|
|
@ -201,7 +201,7 @@ msgstr "职能到地址"
|
|||
#. module: base_contact
|
||||
#: field:base.contact.installer,progress:0
|
||||
msgid "Configuration Progress"
|
||||
msgstr ""
|
||||
msgstr "配置进度"
|
||||
|
||||
#. module: base_contact
|
||||
#: field:res.partner.contact,name:0
|
||||
|
|
@ -218,7 +218,7 @@ msgstr ""
|
|||
#: field:base.contact.installer,config_logo:0
|
||||
#: field:res.partner.contact,photo:0
|
||||
msgid "Image"
|
||||
msgstr ""
|
||||
msgstr "图像"
|
||||
|
||||
#. module: base_contact
|
||||
#: selection:res.partner.job,state:0
|
||||
|
|
@ -228,7 +228,7 @@ msgstr "过去"
|
|||
#. module: base_contact
|
||||
#: model:ir.model,name:base_contact.model_res_partner_address
|
||||
msgid "Partner Addresses"
|
||||
msgstr ""
|
||||
msgstr "业务伙伴地址列表"
|
||||
|
||||
#. module: base_contact
|
||||
#: view:base.contact.installer:0
|
||||
|
|
@ -243,7 +243,7 @@ msgstr "联系人序号"
|
|||
#. module: base_contact
|
||||
#: view:res.partner.address:0
|
||||
msgid "Search Contact"
|
||||
msgstr ""
|
||||
msgstr "搜索联系人"
|
||||
|
||||
#. module: base_contact
|
||||
#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
|
||||
|
|
@ -270,7 +270,7 @@ msgstr "工作和私人地址"
|
|||
#. module: base_contact
|
||||
#: help:res.partner.job,address_id:0
|
||||
msgid "Address which is linked to the Partner"
|
||||
msgstr ""
|
||||
msgstr "链接到该业务伙伴的地址"
|
||||
|
||||
#. module: base_contact
|
||||
#: field:res.partner.job,function:0
|
||||
|
|
@ -295,7 +295,7 @@ msgstr ""
|
|||
#. module: base_contact
|
||||
#: view:base.contact.installer:0
|
||||
msgid "Configure"
|
||||
msgstr ""
|
||||
msgstr "配置"
|
||||
|
||||
#. module: base_contact
|
||||
#: field:res.partner.contact,email:0
|
||||
|
|
@ -321,7 +321,7 @@ msgstr "电话"
|
|||
#. module: base_contact
|
||||
#: view:base.contact.installer:0
|
||||
msgid "Do you want to migrate your Address data in Contact Data?"
|
||||
msgstr ""
|
||||
msgstr "您是否想要把地址数据迁移到联系人数据中？"
|
||||
|
||||
#. module: base_contact
|
||||
#: field:res.partner.contact,active:0
|
||||
|
|
@ -371,7 +371,7 @@ msgstr "一般"
|
|||
#. module: base_contact
|
||||
#: view:res.partner.contact:0
|
||||
msgid "Photo"
|
||||
msgstr ""
|
||||
msgstr "相片"
|
||||
|
||||
#. module: base_contact
|
||||
#: field:res.partner.contact,birthdate:0
|
||||
|
|
@ -438,12 +438,12 @@ msgstr "国籍"
|
|||
#. module: base_contact
|
||||
#: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
|
||||
msgid "Open Jobs"
|
||||
msgstr ""
|
||||
msgstr "开放的职位"
|
||||
|
||||
#. module: base_contact
|
||||
#: field:base.contact.installer,name:0
|
||||
msgid "Name"
|
||||
msgstr ""
|
||||
msgstr "姓名"
|
||||
|
||||
#. module: base_contact
|
||||
#: view:base.contact.installer:0
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2010-12-15 15:05+0000\n"
|
||||
"PO-Revision-Date: 2010-12-18 18:39+0000\n"
|
||||
"Last-Translator: Vladimirs Kuzmins <Unknown>\n"
|
||||
"PO-Revision-Date: 2010-12-19 13:26+0000\n"
|
||||
"Last-Translator: OpenERP Administrators <Unknown>\n"
|
||||
"Language-Team: Latvian <lv@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-19 04:46+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-20 04:50+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: base_iban
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2010-12-15 15:05+0000\n"
|
||||
"PO-Revision-Date: 2010-12-18 20:34+0000\n"
|
||||
"PO-Revision-Date: 2010-12-20 00:57+0000\n"
|
||||
"Last-Translator: lolivier <olivier.lenoir@free.fr>\n"
|
||||
"Language-Team: French <fr@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-19 04:47+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: base_module_quality
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2010-12-15 15:05+0000\n"
|
||||
"PO-Revision-Date: 2010-12-18 10:10+0000\n"
|
||||
"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
|
||||
"PO-Revision-Date: 2010-12-20 00:18+0000\n"
|
||||
"Last-Translator: OpenERP Administrators <Unknown>\n"
|
||||
"Language-Team: Dutch <nl@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-19 04:47+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-12-20 04:52+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: base_module_quality
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue