@@ -156,7 +156,7 @@
[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]
- [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
+ [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
diff --git a/addons/account/report/general_ledger_landscape.py b/addons/account/report/general_ledger_landscape.py
deleted file mode 100644
index 472f0675519..00000000000
--- a/addons/account/report/general_ledger_landscape.py
+++ /dev/null
@@ -1,396 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# Copyright (c) 2005-2006 CamptoCamp
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-##############################################################################
-
-import time
-from report import report_sxw
-import xml
-import rml_parse
-import pooler
-
-class general_ledger_landscape(rml_parse.rml_parse):
- _name = 'report.account.general.ledger_landscape'
-
-
- def set_context(self, objects, data, ids, report_type = None):
- ##
- self.borne_date = self.get_min_date(data['form'])
- ##
- new_ids = []
- if (data['model'] == 'account.account'):
- new_ids = 'active_ids' in data['form']['context'] and data['form']['context']['active_ids'] or []
- else:
- new_ids.append(data['form']['Account_list'])
- objects = self.pool.get('account.account').browse(self.cr, self.uid, new_ids)
- super(general_ledger_landscape, self).set_context(objects, data, new_ids,report_type)
-
- def __init__(self, cr, uid, name, context):
- super(general_ledger_landscape, self).__init__(cr, uid, name, context=context)
- self.date_borne = {}
- self.query = ""
- self.child_ids = ""
- self.tot_currency = 0.0
- self.period_sql = ""
- self.sold_accounts = {}
- self.localcontext.update( {
- 'time': time,
- 'lines': self.lines,
- 'sum_debit_account': self._sum_debit_account,
- 'sum_credit_account': self._sum_credit_account,
- 'sum_solde_account': self._sum_solde_account,
- 'sum_debit': self._sum_debit,
- 'sum_credit': self._sum_credit,
- 'sum_solde': self._sum_solde,
- 'get_children_accounts': self.get_children_accounts,
- 'sum_currency_amount_account': self._sum_currency_amount_account
- })
- self.context = context
- def _calc_contrepartie(self,cr,uid,ids, context={}):
- result = {}
- #for id in ids:
- # result.setdefault(id, False)
-
- for account_line in self.pool.get('account.move.line').browse(cr, uid, ids, context):
- # For avoid long text in the field we will limit it to 5 lines
- #
- #
- #
- result[account_line.id] = ' '
- num_id_move = account_line.move_id.id
- num_id_line = account_line.id
- account_id = account_line.account_id.id
- # search the basic account
- # We have the account ID we will search all account move line from now until this time
- # We are in the case of we are on the top of the account move Line
- cr.execute('SELECT distinct(ac.code) as code_rest,ac.name as name_rest from account_account AS ac, account_move_line mv\
- where ac.id = mv.account_id and mv.move_id = %s and mv.account_id <> %s' , (num_id_move,account_id,))
- res_mv = cr.dictfetchall()
- # we need a result more than 2 line to make the test so we will made the the on 1 because we have exclude the current line
- if (len(res_mv) >=1):
- concat = ''
- rup_id = 0
- for move_rest in res_mv:
- concat = concat + move_rest['code_rest'] + '|'
- result[account_line.id] = concat
- if rup_id >5:
- # we need to stop the computing and to escape but before we will add "..."
- result[account_line.id] = concat + '...'
- break
- rup_id+=1
- return result
-
- def get_min_date(self,form):
-
- ## Get max born from account_fiscal year
- #
- sql = """ select min(fy.date_start) as start_date,max(fy.date_stop) as stop_date from account_fiscalyear
- As fy where fy.state <> 'close'
- """
- self.cr.execute(sql)
- res = self.cr.dictfetchall()
- borne_min = res[0]['start_date']
- borne_max = res[0]['stop_date']
- if form['state'] == 'byperiod':
- ## This function will return the most aged date
- periods = form['periods']
- if not periods:
- self.cr.execute("""
- Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id = %s""" ,(form['fiscalyear'],))
- else:
- self.cr.execute("""
- Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.id =ANY(%s)""",(periods,))
-
- res = self.cr.dictfetchall()
- borne_min = res[0]['start_date']
- borne_max = res[0]['stop_date']
- elif form['state'] == 'bydate':
- borne_min = form['date_from']
- borne_max = form['date_to']
- elif form['state'] == 'all':
- periods = form['periods']
- if not periods:
- if form['fiscalyear'] == False:
- fiscalyears = self.pool.get('account.fiscalyear').search(self.cr, self.uid, [('state', '=', 'draft')])
- else:
- fiscalyears = [form['fiscalyear']]
- self.cr.execute("select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.fiscalyear_id =ANY(%s)" ,(fiscalyears,))
- else:
- self.cr.execute("""
- Select min(p.date_start) as start_date,max(p.date_stop) as stop_date from account_period as p where p.id =ANY(%s)""",(periods,))
- res = self.cr.dictfetchall()
- period_min = res[0]['start_date']
- period_max = res[0]['stop_date']
- date_min = form['date_from']
- date_max = form['date_to']
- if period_min=',child_account.id)],
- context=ctx)) <> 0 :
- res.append(child_account)
- ##
- if not len(res):
-
- return [account]
- else:
- ## We will now compute solde initiaux
- for move in res:
- self.cr.execute("""SELECT sum(l.debit) AS sum_debit, sum(l.credit) AS sum_credit FROM account_move_line l \
- WHERE l.account_id = %s AND l.date < %s AND l.date > %s""",(move.id,self.borne_date['max_date'],self.borne_date['min_date']))
- resultat = self.cr.dictfetchall()
- if resultat[0] :
- if resultat[0]['sum_debit'] == None:
- sum_debit = 0
- else:
- sum_debit = resultat[0]['sum_debit']
- if resultat[0]['sum_credit'] == None:
- sum_credit = 0
- else:
- sum_credit = resultat[0]['sum_credit']
-
- move.init_credit = sum_credit
- move.init_debit = sum_debit
-
- else:
- move.init_credit = 0
- move.init_debit = 0
-
-
- return res
-
- def lines(self, account, form):
- inv_types = {
- 'out_invoice': 'CI: ',
- 'in_invoice': 'SI: ',
- 'out_refund': 'OR: ',
- 'in_refund': 'SR: ',
- }
-
- if form['sortbydate'] == 'sort_date':
- sorttag = 'l.date'
- else:
- sorttag = 'j.code'
- sql = """
- SELECT l.id, l.date, j.code,c.code AS currency_code,l.amount_currency,l.ref, l.name , COALESCE(l.debit,0) as debit, COALESCE(l.credit,0) as credit, l.period_id
- FROM account_move_line as l
- LEFT JOIN res_currency c on (l.currency_id=c.id)
- JOIN account_journal j on (l.journal_id=j.id)
- AND account_id = %%s
- AND %s
- WHERE l.date<=%%s
- AND l.date>=%%s
- ORDER by %s""" % (self.query, sorttag)
-
- self.cr.execute(sql, (account.id, self.date_borne['max_date'], self.date_borne['min_date'],))
-
- res = self.cr.dictfetchall()
- sum = 0.0
- account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')
- for l in res:
- line = self.pool.get('account.move.line').browse(self.cr, self.uid, l['id'])
- l['move'] = line.move_id.name
- self.cr.execute('Select id from account_invoice where move_id =%s',(line.move_id.id,))
- tmpres = self.cr.dictfetchall()
- if len(tmpres) > 0 :
- inv = self.pool.get('account.invoice').browse(self.cr, self.uid, tmpres[0]['id'])
- l['ref'] = inv_types[inv.type] + ': '+str(inv.number)
- if line.partner_id :
- l['partner'] = line.partner_id.name
- else :
- l['partner'] = ''
- sum = l['debit'] - l ['credit']
-# c = time.strptime(l['date'],"%Y-%m-%d")
-# l['date'] = time.strftime("%d-%m-%Y",c)
- l['progress'] = sum
- l['line_corresp'] = self._calc_contrepartie(self.cr,self.uid,[l['id']])[l['id']]
- # Modification du amount Currency
- if (l['credit'] > 0):
- if l['amount_currency'] != None:
- l['amount_currency'] = abs(l['amount_currency']) * -1
-
- #
- if l['amount_currency'] != None:
- self.tot_currency = self.tot_currency + l['amount_currency']
- return res
-
- def _sum_debit_account(self, account, form):
-
- self.cr.execute("SELECT sum(debit) "\
- "FROM account_move_line l "\
- "WHERE l.account_id = %s AND "+self.query,(account.id,))
- ## Add solde init to the result
- #
- sum_debit = self.cr.fetchone()[0] or 0.0
- if form['soldeinit']:
- sum_debit += account.init_debit
- #
- ##
- return sum_debit
-
- def _sum_credit_account(self, account, form):
-
- self.cr.execute("SELECT sum(credit) "\
- "FROM account_move_line l "\
- "WHERE l.account_id = %s AND "+self.query,(account.id,))
- ## Add solde init to the result
- #
- sum_credit = self.cr.fetchone()[0] or 0.0
- if form['soldeinit']:
- sum_credit += account.init_credit
- #
- ##
-
- return sum_credit
-
- def _sum_solde_account(self, account, form):
- self.cr.execute("SELECT (sum(debit) - sum(credit)) as tot_solde "\
- "FROM account_move_line l "\
- "WHERE l.account_id = %s AND "+self.query,(account.id,))
- sum_solde = self.cr.fetchone()[0] or 0.0
- if form.get('soldeinit',False):
- sum_solde += account.init_debit - account.init_credit
-
- return sum_solde
-
- def _sum_debit(self, form):
- if not self.ids:
- return 0.0
- self.cr.execute("SELECT sum(debit) "\
- "FROM account_move_line l "\
- "WHERE l.account_id =ANY(%s) AND "+self.query,(self.child_ids,))
- sum_debit = self.cr.fetchone()[0] or 0.0
- return sum_debit
-
- def _sum_credit(self, form):
- if not self.ids:
- return 0.0
- self.cr.execute("SELECT sum(credit) "\
- "FROM account_move_line l "\
- "WHERE l.account_id =ANY(%s) AND "+self.query,(self.child_ids,))
- ## Add solde init to the result
- #
- sum_credit = self.cr.fetchone()[0] or 0.0
- return sum_credit
-
- def _sum_solde(self, form):
- if not self.ids:
- return 0.0
- self.cr.execute("SELECT (sum(debit) - sum(credit)) as tot_solde "\
- "FROM account_move_line l "\
- "WHERE l.account_id =ANY(%s) AND "+self.query,(self.child_ids,))
- sum_solde = self.cr.fetchone()[0] or 0.0
- return sum_solde
-
- def _set_get_account_currency_code(self, account_id):
- self.cr.execute("SELECT c.code as code "\
- "FROM res_currency c,account_account as ac "\
- "WHERE ac.id = %s AND ac.currency_id = c.id",(account_id,))
- result = self.cr.fetchone()
- if result:
- self.account_currency = result[0]
- else:
- self.account_currency = False
-
- def _sum_currency_amount_account(self, account, form):
- self._set_get_account_currency_code(account.id)
- self.cr.execute("SELECT sum(aml.amount_currency) FROM account_move_line as aml,res_currency as rc WHERE aml.currency_id = rc.id AND aml.account_id= %s ", (account.id,))
- total = self.cr.fetchone()
-
- if self.account_currency:
- return_field = str(total[0]) + self.account_currency
- return return_field
- else:
- currency_total = self.tot_currency = 0.0
- return currency_total
-
-report_sxw.report_sxw('report.account.general.ledger_landscape', 'account.account', 'addons/account/report/general_ledger_landscape.rml', parser=general_ledger_landscape, header=False)
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/report/general_ledger_landscape.rml b/addons/account/report/general_ledger_landscape.rml
index 9e937a72baf..a707a47d0bd 100644
--- a/addons/account/report/general_ledger_landscape.rml
+++ b/addons/account/report/general_ledger_landscape.rml
@@ -104,7 +104,7 @@
[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]
- [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
+ [[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
@@ -165,7 +165,7 @@
[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]
- [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+ [[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
|
diff --git a/addons/account/report/third_party_ledger.py b/addons/account/report/third_party_ledger.py
index 1dca4dfb64a..c10fcb33313 100644
--- a/addons/account/report/third_party_ledger.py
+++ b/addons/account/report/third_party_ledger.py
@@ -167,9 +167,9 @@ class third_party_ledger(rml_parse.rml_parse):
#
#new_ids = [id for (id,) in self.cr.fetchall()]
if data['form']['result_selection'] == 'supplier':
- self.ACCOUNT_TYPE = ['receivable']
- elif data['form']['result_selection'] == 'customer':
self.ACCOUNT_TYPE = ['payable']
+ elif data['form']['result_selection'] == 'customer':
+ self.ACCOUNT_TYPE = ['receivable']
elif data['form']['result_selection'] == 'all':
self.ACCOUNT_TYPE = ['payable','receivable']
diff --git a/addons/account/test/account_customer_invoice.yml b/addons/account/test/account_customer_invoice.yml
new file mode 100644
index 00000000000..1700f08b470
--- /dev/null
+++ b/addons/account/test/account_customer_invoice.yml
@@ -0,0 +1,143 @@
+-
+ In order to test account invoice i create a new customer invoice
+-
+ Creating a account.invoice record
+-
+ !record {model: account.invoice, id: account_invoice_0}:
+ account_id: account.a_recv
+ address_contact_id: base.res_partner_address_zen
+ address_invoice_id: base.res_partner_address_zen
+ company_id: base.main_company
+ currency_id: base.EUR
+ date_invoice: '2010-05-26'
+ invoice_line:
+ - account_id: account.a_sale
+ name: '[PC3] Medium PC'
+ price_unit: 900.0
+ quantity: 10.0
+ product_id: product.product_product_pc3
+ uos_id: product.product_uom_unit
+ journal_id: account.sales_journal
+ partner_id: base.res_partner_3
+ reference_type: none
+-
+ I check that Initially customer invoice is in the draft state
+-
+ !assert {model: account.invoice, id: account_invoice_0}:
+ - state == 'draft'
+-
+ I change the state of invoice to proforma2 by clicking PRO-FORMA button
+-
+ Performing a workflow action invoice_proforma2 on module account.invoice
+-
+ !workflow {model: account.invoice, action: invoice_proforma2, ref: account_invoice_0}
+-
+ I check that the invoice state is now proforma2
+-
+ !assert {model: account.invoice, id: account_invoice_0}:
+ - state == 'proforma2'
+-
+ I create invoice by clicking on Create button
+-
+ Performing a workflow action invoice_open on module account.invoice
+-
+ !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_0}
+-
+ I check that the invoice state is now open
+-
+ !assert {model: account.invoice, id: account_invoice_0}:
+ - state == 'open'
+-
+ I make a partial payment of 1000 by clicking on Pay Invoice button
+-
+ Creating a account.invoice.pay record
+-
+ !record {model: account.invoice.pay, id: account_invoice_pay_first0}:
+ amount: 1000.0
+ date: '2010-05-26'
+ journal_id: account.sales_journal
+ name: First payment for [PC3] Medium PC to Distrib PC
+ period_id: account.period_5
+
+
+-
+ Performing an osv_memory action pay_and_reconcile on module account.invoice.pay
+-
+ !python {model: account.invoice.pay}: |
+ self.pay_and_reconcile(cr, uid, [ref("account_invoice_pay_first0")], {"lang":
+ 'en_US', "active_model": "account.invoice", "tz": False, "record_id": 3, "active_ids":
+ [ref("account_invoice_0")], "type": "out_invoice", "active_id": ref("account_invoice_0"),
+ })
+-
+ I check that the invoice state is still open
+-
+ !assert {model: account.invoice, id: account_invoice_0}:
+ - state == 'open'
+-
+ I make second partial payment of 6000 by clicking on Pay Invoice button
+-
+ Creating a account.invoice.pay record
+-
+ !record {model: account.invoice.pay, id: account_invoice_pay_second0}:
+ amount: 6000.0
+ date: '2010-05-28'
+ journal_id: account.sales_journal
+ name: Second payment for [PC3] Medium PC to Distrib PC
+ period_id: account.period_5
+
+-
+ Performing an osv_memory action pay_and_reconcile on module account.invoice.pay
+-
+ !python {model: account.invoice.pay}: |
+ self.pay_and_reconcile(cr, uid, [ref("account_invoice_pay_second0")], {"lang":
+ 'en_US', "active_model": "account.invoice", "tz": False, "record_id": 3, "active_ids":
+ [ref("account_invoice_0")], "type": "out_invoice", "active_id": ref("account_invoice_0"),
+ })
+-
+ I make final partial payment of 2000 by clicking on Pay Invoice button
+-
+ Creating a account.invoice.pay record
+-
+ !record {model: account.invoice.pay, id: account_invoice_pay_final0}:
+ amount: 2000.0
+ date: '2010-05-30'
+ journal_id: account.sales_journal
+ name: Final payment for [PC3] Medium PC to Distrib PC
+ period_id: account.period_5
+
+
+-
+ Performing an osv_memory action pay_and_reconcile on module account.invoice.pay
+-
+ !python {model: account.invoice.pay}: |
+ self.pay_and_reconcile(cr, uid, [ref("account_invoice_pay_final0")], {"lang":
+ 'en_US', "active_model": "account.invoice", "tz": False, "record_id": 3, "active_ids":
+ [ref("account_invoice_0")], "type": "out_invoice", "active_id": ref("account_invoice_0"),
+ })
+
+-
+ I check that the invoice state is now Done
+-
+ !assert {model: account.invoice, id: account_invoice_0}:
+ - state == 'paid'
+-
+ I check that an payment entry gets created in the account.move.line
+-
+ !python {model: account.invoice}: |
+ acc_id=self.browse(cr, uid, ref("account_invoice_0"))
+ assert(acc_id.move_id)
+#-
+# I refund the invoice
+#-
+# Creating a account.invoice.refund record
+#-
+# !record {model: account.invoice.refund, id: account_invoice_refund_0}:
+# description: Refund
+#
+#-
+# Performing an osv_memory action invoice_refund on module account.invoice.refund
+#-
+# !python {model: account.invoice.refund}: |
+# self.invoice_refund(cr, uid, [ref("account_invoice_refund_0")], {"lang": 'en_US', "tz": False, "active_model": "account.invoice", "active_ids": [ref("account.account_invoice_0")], "type": "out_invoice", "active_id": ref("account.account_invoice_0"), })
+# return self.compute_refund(cr, uid, [ref("account_invoice_refund_0")], "refund" {"lang": 'en_US',"tz": False, "active_model": "account.invoice", "active_ids": [ref("account.account_invoice_0")], "type": "out_invoice", "active_id": ref("account.account_invoice_0"), })
+
diff --git a/addons/account/test/account_supplier_invoice.yml b/addons/account/test/account_supplier_invoice.yml
new file mode 100644
index 00000000000..a577fa8330b
--- /dev/null
+++ b/addons/account/test/account_supplier_invoice.yml
@@ -0,0 +1,117 @@
+-
+ In order to test account invoice i create a new supplier invoice
+-
+ Creating a account.invoice record
+-
+ !record {model: account.invoice, id: account_invoice_1}:
+ account_id: account.a_pay
+ address_contact_id: base.res_partner_address_3000
+ address_invoice_id: base.res_partner_address_3000
+ check_total: 3000.0
+ company_id: base.main_company
+ currency_id: base.EUR
+ invoice_line:
+ - account_id: account.a_expense
+ name: '[PC1] Basic PC'
+ price_unit: 300.0
+ product_id: product.product_product_pc1
+ quantity: 10.0
+ uos_id: product.product_uom_unit
+ journal_id: account.expenses_journal
+ partner_id: base.res_partner_desertic_hispafuentes
+ reference_type: none
+ type: in_invoice
+-
+ I check that Initially supplier invoice is in the draft state
+-
+ !assert {model: account.invoice, id: account_invoice_1}:
+ - state == 'draft'
+-
+ I change the state of invoice to open by clicking Validate button
+-
+ Performing a workflow action invoice_open on module account.invoice
+-
+ !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_1}
+-
+ I check that the invoice state is now open
+-
+ !assert {model: account.invoice, id: account_invoice_1}:
+ - state == 'open'
+-
+ I make a partial payment of 2000 by clicking on Pay Invoice button
+-
+ Creating a account.invoice.pay record
+-
+ !record {model: account.invoice.pay, id: account_invoice_pay_firstpaymenttoaxelorforbasicpc0}:
+ amount: 2000.0
+ date: '2010-05-29'
+ journal_id: account.sales_journal
+ name: First Payment to Axelor for Basic PC
+ period_id: account.period_5
+
+-
+ Performing an osv_memory action pay_and_reconcile on module account.invoice.pay
+-
+ !python {model: account.invoice.pay}: |
+ self.pay_and_reconcile(cr, uid, [ref("account_invoice_pay_firstpaymenttoaxelorforbasicpc0")],
+ {"lang": 'en_US', "active_model": "account.invoice", "tz": False, "record_id":
+ 25, "active_ids": [ref("account_invoice_1")], "type": "in_invoice", "active_id":
+ ref("account_invoice_1"), })
+-
+ I check that the invoice state is still open
+-
+ !assert {model: account.invoice, id: account_invoice_1}:
+ - state == 'open'
+-
+ I make final partial payment of 1000 by clicking on Pay Invoice button
+-
+ Creating a account.invoice.pay record
+-
+ !record {model: account.invoice.pay, id: account_invoice_pay_finalpaymenttoaxelorforbasicpc0}:
+ amount: 1000.0
+ date: '2010-06-17'
+ journal_id: account.sales_journal
+ name: Final Payment to Axelor for Basic PC
+ period_id: account.period_5
+
+
+-
+ Performing an osv_memory action pay_and_reconcile on module account.invoice.pay
+-
+ !python {model: account.invoice.pay}: |
+ self.pay_and_reconcile(cr, uid, [ref("account_invoice_pay_finalpaymenttoaxelorforbasicpc0")],
+ {"lang": 'en_US', "active_model": "account.invoice", "tz": False, "record_id":
+ 25, "active_ids": [ref("account_invoice_1")], "type": "in_invoice", "active_id":
+ ref("account_invoice_1"), })
+
+-
+ I check that the invoice state is now Done
+-
+ !assert {model: account.invoice, id: account_invoice_1}:
+ - state == 'paid'
+-
+ I check that an payment entry gets created in the account.move.line
+-
+ !python {model: account.invoice}: |
+ acc_id=self.browse(cr, uid, ref("account_invoice_1"))
+ assert(acc_id.move_id)
+#-
+# I refund the invoice
+#-
+# Creating a account.invoice.refund record
+#-
+# !record {model: account.invoice.refund, id: account_invoice_refund_0}:
+# date: '2010-06-22'
+# description: 'Refund By Axelor '
+#
+#
+#-
+# Performing an osv_memory action invoice_refund on module account.invoice.refund
+#-
+# !python {model: account.invoice.refund}: |
+# self.invoice_refund(cr, uid, [ref("account_invoice_refund_0")], {"lang": 'en_US',
+# "tz": False, "active_model": "account.invoice", "active_ids": [ref("account_invoice_1")],
+# "type": "in_invoice", "active_id": ref("account_invoice_1"), })
+
+
+
diff --git a/addons/account_analytic_plans/i18n/id.po b/addons/account_analytic_plans/i18n/id.po
index 778d68ecd7d..bb4edb18b29 100644
--- a/addons/account_analytic_plans/i18n/id.po
+++ b/addons/account_analytic_plans/i18n/id.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 13:43+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-05-28 02:33+0000\n"
+"Last-Translator: Abdul Munif Hanafi \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-04-17 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
@@ -41,7 +41,7 @@ msgstr ""
#. module: account_analytic_plans
#: wizard_field:wizard.crossovered.analytic,init,date2:0
msgid "End Date"
-msgstr ""
+msgstr "Tanggal Akhir"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance.line,rate:0
@@ -70,7 +70,7 @@ msgstr ""
#. module: account_analytic_plans
#: wizard_button:wizard.crossovered.analytic,init,print:0
msgid "Print"
-msgstr ""
+msgstr "Cetak"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
@@ -90,7 +90,7 @@ msgstr ""
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
msgid "Account Name"
-msgstr ""
+msgstr "Nama Akun"
#. module: account_analytic_plans
#: view:account.analytic.plan.instance.line:0
@@ -100,7 +100,7 @@ msgstr ""
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,code:0
msgid "Distribution Code"
-msgstr ""
+msgstr "Kode Distribusi"
#. module: account_analytic_plans
#: constraint:ir.actions.act_window:0
@@ -115,17 +115,17 @@ msgstr ""
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
msgid "Printing date"
-msgstr ""
+msgstr "Tanggal mencetak"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
msgid "Percentage"
-msgstr ""
+msgstr "Persentase"
#. module: account_analytic_plans
#: wizard_field:wizard.crossovered.analytic,init,empty_line:0
msgid "Dont show empty lines"
-msgstr ""
+msgstr "Jangan tampilkan baris kosong"
#. module: account_analytic_plans
#: wizard_view:wizard.crossovered.analytic,init:0
@@ -141,12 +141,12 @@ msgstr ""
#: field:account.analytic.plan.instance,journal_id:0
#: wizard_field:wizard.crossovered.analytic,init,journal_ids:0
msgid "Analytic Journal"
-msgstr ""
+msgstr "Jurnal Analisis"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
msgid "100.00%"
-msgstr ""
+msgstr "100.00%"
#. module: account_analytic_plans
#: wizard_field:wizard.crossovered.analytic,init,ref:0
@@ -300,7 +300,7 @@ msgstr ""
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
msgid "Quantity"
-msgstr ""
+msgstr "Kwantitas"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account_ids:0
@@ -310,17 +310,17 @@ msgstr ""
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
msgid "Code"
-msgstr ""
+msgstr "Kode"
#. module: account_analytic_plans
#: wizard_button:create.model,info,end:0
msgid "OK"
-msgstr ""
+msgstr "Setuju"
#. module: account_analytic_plans
#: field:account.analytic.plan.line,root_analytic_id:0
msgid "Root Account"
-msgstr ""
+msgstr "Akun Induk"
#. module: account_analytic_plans
#: wizard_view:create.model,info:0
@@ -331,12 +331,12 @@ msgstr ""
#. module: account_analytic_plans
#: field:account.analytic.plan.line,sequence:0
msgid "Sequence"
-msgstr ""
+msgstr "Berurutan"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance.line,analytic_account_id:0
msgid "Analytic Account"
-msgstr ""
+msgstr "Akun Analisis"
#. module: account_analytic_plans
#: field:account.analytic.default,analytics_id:0
@@ -355,19 +355,19 @@ msgstr ""
#. module: account_analytic_plans
#: wizard_button:wizard.crossovered.analytic,init,end:0
msgid "Cancel"
-msgstr ""
+msgstr "Batal"
#. module: account_analytic_plans
#: wizard_field:wizard.crossovered.analytic,init,date1:0
msgid "Start Date"
-msgstr ""
+msgstr "Tanggal Mulai"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
msgid "at"
-msgstr ""
+msgstr "pada"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
msgid "From Date"
-msgstr ""
+msgstr "Dari Tanggal"
diff --git a/addons/account_anglo_saxon/i18n/id.po b/addons/account_anglo_saxon/i18n/id.po
new file mode 100644
index 00000000000..bf59eb13b73
--- /dev/null
+++ b/addons/account_anglo_saxon/i18n/id.po
@@ -0,0 +1,64 @@
+# Indonesian 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 , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2009-11-24 12:50+0000\n"
+"PO-Revision-Date: 2010-05-28 02:49+0000\n"
+"Last-Translator: Abdul Munif Hanafi \n"
+"Language-Team: Indonesian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
+msgid ""
+"This module will support the Anglo-Saxons accounting methodology by \n"
+" changing the accounting logic with stock transactions. The difference "
+"between the Anglo-Saxon accounting countries \n"
+" and the Rhine or also called Continental accounting countries is the "
+"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
+" Anglo-Saxons accounting does take the cost when sales invoice is "
+"created, Continental accounting will take the cost at he moment the goods "
+"are shipped.\n"
+" This module will add this functionality by using a interim account, to "
+"store the value of shipped goods and will contra book this interim account \n"
+" when the invoice is created to transfer this amount to the debtor or "
+"creditor account."
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
+msgid "Stock Account"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML tidak sah untuk Menampilkan Arsitektur!"
+
+#. module: account_anglo_saxon
+#: field:product.category,property_account_creditor_price_difference_categ:0
+#: field:product.template,property_account_creditor_price_difference:0
+msgid "Price Difference Account"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: help:product.category,property_account_creditor_price_difference_categ:0
+#: help:product.template,property_account_creditor_price_difference:0
+msgid ""
+"This account will be used to value price difference between purchase price "
+"and cost price."
+msgstr ""
diff --git a/addons/account_budget/i18n/id.po b/addons/account_budget/i18n/id.po
index 34ed713c9c3..2c3e8b90cca 100644
--- a/addons/account_budget/i18n/id.po
+++ b/addons/account_budget/i18n/id.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 13:43+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-05-28 02:58+0000\n"
+"Last-Translator: Abdul Munif Hanafi \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-04-17 04:19+0000\n"
+"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
@@ -24,7 +24,7 @@ msgstr ""
#. module: account_budget
#: rml:account.budget:0
msgid "% performance"
-msgstr ""
+msgstr "% performa"
#. module: account_budget
#: model:ir.actions.act_window,name:account_budget.open_budget_post_form
@@ -35,18 +35,18 @@ msgstr ""
#. module: account_budget
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nama model tidak sah di definsi aksi"
#. module: account_budget
#: rml:account.analytic.account.budget:0
#: rml:crossovered.budget.report:0
msgid "Printed at:"
-msgstr ""
+msgstr "Dicetak pada:"
#. module: account_budget
#: view:crossovered.budget:0
msgid "Confirm"
-msgstr ""
+msgstr "Konfirmasi"
#. module: account_budget
#: field:crossovered.budget,validating_user_id:0
@@ -62,12 +62,12 @@ msgstr ""
#. module: account_budget
#: selection:crossovered.budget,state:0
msgid "Confirmed"
-msgstr ""
+msgstr "Dikonfirmasi"
#. module: account_budget
#: field:account.budget.post.dotation,period_id:0
msgid "Period"
-msgstr ""
+msgstr "Periode"
#. module: account_budget
#: wizard_field:account.budget.report,init,date2:0
@@ -80,7 +80,7 @@ msgstr ""
#. module: account_budget
#: rml:account.budget:0
msgid "Printing date:"
-msgstr ""
+msgstr "Tanggal dicetak :"
#. module: account_budget
#: selection:crossovered.budget,state:0
@@ -92,7 +92,7 @@ msgstr ""
#: rml:account.budget:0
#: rml:crossovered.budget.report:0
msgid "at"
-msgstr ""
+msgstr "pada"
#. module: account_budget
#: view:account.budget.post:0
@@ -102,7 +102,7 @@ msgstr ""
#. module: account_budget
#: rml:account.budget:0
msgid "Performance"
-msgstr ""
+msgstr "Kinerja"
#. module: account_budget
#: rml:account.analytic.account.budget:0
@@ -114,22 +114,22 @@ msgstr ""
#. module: account_budget
#: rml:account.budget:0
msgid "From"
-msgstr ""
+msgstr "Dari"
#. module: account_budget
#: field:crossovered.budget.lines,percentage:0
msgid "Percentage"
-msgstr ""
+msgstr "Persentase"
#. module: account_budget
#: rml:account.budget:0
msgid "Results"
-msgstr ""
+msgstr "Hasil"
#. module: account_budget
#: field:crossovered.budget,state:0
msgid "Status"
-msgstr ""
+msgstr "Status"
#. module: account_budget
#: model:ir.module.module,description:account_budget.module_meta_information
@@ -171,7 +171,7 @@ msgstr ""
#: rml:account.analytic.account.budget:0
#: rml:crossovered.budget.report:0
msgid "Description"
-msgstr ""
+msgstr "Keterangan"
#. module: account_budget
#: rml:account.analytic.account.budget:0
@@ -184,7 +184,7 @@ msgstr ""
#: wizard_button:wizard.crossovered.budget,init,report:0
#: wizard_button:wizard.crossovered.budget.summary,init,report:0
msgid "Print"
-msgstr ""
+msgstr "Cetak"
#. module: account_budget
#: rml:account.budget:0
@@ -203,7 +203,7 @@ msgstr ""
#: rml:account.budget:0
#: rml:crossovered.budget.report:0
msgid "Total :"
-msgstr ""
+msgstr "Total :"
#. module: account_budget
#: rml:account.analytic.account.budget:0
@@ -232,7 +232,7 @@ msgstr ""
#: view:crossovered.budget:0
#: selection:crossovered.budget,state:0
msgid "Done"
-msgstr ""
+msgstr "Selesai"
#. module: account_budget
#: view:crossovered.budget:0
@@ -256,12 +256,12 @@ msgstr ""
#: field:crossovered.budget,date_to:0
#: field:crossovered.budget.lines,date_to:0
msgid "End Date"
-msgstr ""
+msgstr "Tanggal berakhir"
#. module: account_budget
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML tidak sah untuk Menampilkan Arsitektur!"
#. module: account_budget
#: field:crossovered.budget.lines,theoritical_amount:0
@@ -273,7 +273,7 @@ msgstr ""
#: field:account.budget.post.dotation,name:0
#: field:crossovered.budget,name:0
msgid "Name"
-msgstr ""
+msgstr "Nama"
#. module: account_budget
#: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu_1
@@ -300,12 +300,12 @@ msgstr ""
#: model:ir.model,name:account_budget.model_crossovered_budget
#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view
msgid "Budget"
-msgstr ""
+msgstr "Anggaran"
#. module: account_budget
#: field:account.budget.post.dotation,post_id:0
msgid "Item"
-msgstr ""
+msgstr "Item"
#. module: account_budget
#: field:account.budget.post.dotation,amount:0
@@ -316,19 +316,19 @@ msgstr ""
#. module: account_budget
#: field:crossovered.budget.lines,paid_date:0
msgid "Paid Date"
-msgstr ""
+msgstr "Tanggal Dibayar"
#. module: account_budget
#: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree
#: model:ir.ui.menu,name:account_budget.menu_action_account_budget_post_tree
#: model:ir.ui.menu,name:account_budget.next_id_31
msgid "Budgets"
-msgstr ""
+msgstr "Anggaran"
#. module: account_budget
#: selection:crossovered.budget,state:0
msgid "Cancelled"
-msgstr ""
+msgstr "Dibatalkan"
#. module: account_budget
#: view:account.budget.post.dotation:0
@@ -373,7 +373,7 @@ msgstr ""
#: field:account.budget.post,code:0
#: field:crossovered.budget,code:0
msgid "Code"
-msgstr ""
+msgstr "Kode"
#. module: account_budget
#: field:account.budget.post.dotation,tot_planned:0
@@ -404,12 +404,12 @@ msgstr ""
#. module: account_budget
#: field:crossovered.budget.lines,analytic_account_id:0
msgid "Analytic Account"
-msgstr ""
+msgstr "Akun Analisis"
#. module: account_budget
#: rml:crossovered.budget.report:0
msgid "Budget :"
-msgstr ""
+msgstr "Anggaran :"
#. module: account_budget
#: rml:account.budget:0
@@ -423,12 +423,12 @@ msgstr ""
#: view:account.budget.post:0
#: field:account.budget.post,account_ids:0
msgid "Accounts"
-msgstr ""
+msgstr "Akun"
#. module: account_budget
#: model:ir.actions.report.xml,name:account_budget.account_budget
msgid "Print Budget"
-msgstr ""
+msgstr "Cetak Anggaran"
#. module: account_budget
#: view:account.analytic.account:0
@@ -453,7 +453,7 @@ msgstr ""
#: wizard_button:wizard.crossovered.budget,init,end:0
#: wizard_button:wizard.crossovered.budget.summary,init,end:0
msgid "Cancel"
-msgstr ""
+msgstr "Batal"
#. module: account_budget
#: model:ir.module.module,shortdesc:account_budget.module_meta_information
@@ -464,7 +464,7 @@ msgstr ""
#: field:crossovered.budget,date_from:0
#: field:crossovered.budget.lines,date_from:0
msgid "Start Date"
-msgstr ""
+msgstr "Tanggal Mulai"
#. module: account_budget
#: rml:account.analytic.account.budget:0
@@ -480,4 +480,4 @@ msgstr ""
#. module: account_budget
#: wizard_view:account.budget.report,init:0
msgid "Select period"
-msgstr ""
+msgstr "Pilih periode"
diff --git a/addons/account_chart/i18n/id.po b/addons/account_chart/i18n/id.po
index ebc6cfb3d7b..058e3f8f5a2 100644
--- a/addons/account_chart/i18n/id.po
+++ b/addons/account_chart/i18n/id.po
@@ -7,16 +7,16 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 13:43+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-05-28 02:43+0000\n"
+"Last-Translator: Abdul Munif Hanafi \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-04-17 04:20+0000\n"
+"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
#: model:ir.module.module,description:account_chart.module_meta_information
msgid "Remove minimal account chart"
-msgstr ""
+msgstr "Buang grafik akun minimal"
diff --git a/addons/account_date_check/i18n/id.po b/addons/account_date_check/i18n/id.po
new file mode 100644
index 00000000000..79a166f2119
--- /dev/null
+++ b/addons/account_date_check/i18n/id.po
@@ -0,0 +1,32 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# * account_date_check
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-05-28 02:46+0000\n"
+"Last-Translator: Abdul Munif Hanafi \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-05-28 03:39+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_date_check
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML tidak sah untuk Menampilkan Arsitektur!"
+
+#. module: account_date_check
+#: field:account.journal,allow_date:0
+msgid "Allows date not in the period"
+msgstr ""
+
+#. module: account_date_check
+#: model:ir.module.module,shortdesc:account_date_check.module_meta_information
+msgid "Account Date check"
+msgstr "Tanggal periksa Akun"
diff --git a/addons/account_followup/i18n/pt.po b/addons/account_followup/i18n/pt.po
index 7246ad73a2e..11aa146ef83 100644
--- a/addons/account_followup/i18n/pt.po
+++ b/addons/account_followup/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-28 23:22+0000\n"
-"Last-Translator: Paulino \n"
+"PO-Revision-Date: 2010-05-28 02:17+0000\n"
+"Last-Translator: cmsa \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-04-17 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-05-28 03:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
@@ -35,7 +35,7 @@ msgstr "Ref. do Cliente:"
#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
#: model:ir.ui.menu,name:account_followup.menu_account_move_open_unreconcile_payable
msgid "All payable entries"
-msgstr "Todas os movimentos a pagar"
+msgstr "Todos os movimentos a pagar"
#. module: account_followup
#: constraint:ir.actions.act_window:0
@@ -50,7 +50,7 @@ msgstr "Mensagem impressa"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Amount In Currency"
-msgstr "Montante em Divisa"
+msgstr "Montante em Numerário"
#. module: account_followup
#: rml:account_followup.followup.print:0
@@ -71,13 +71,13 @@ msgstr "%(user_signature)s: Nome de utilizador"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
msgid "Select partners"
-msgstr "Seleccionar Terceiros"
+msgstr "Seleccionar Parceiros"
#. module: account_followup
#: view:account_followup.followup:0
#: field:account_followup.followup,followup_line:0
msgid "Follow-Up"
-msgstr "Continuação"
+msgstr "Dar Seguimento"
#. module: account_followup
#: field:account_followup.stat,debit:0
@@ -87,7 +87,7 @@ msgstr "Débito"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
msgid "Email Settings"
-msgstr ""
+msgstr "Parâmetros de Email"
#. module: account_followup
#: field:account_followup.stat,account_type:0
@@ -97,34 +97,34 @@ msgstr "Tipo de Conta"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Ref"
-msgstr "Referençia"
+msgstr "Ref"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
msgid "%(followup_amount)s: Total Amount Due"
-msgstr "% (montante_de_seguimentos)s: Quantidade total devido"
+msgstr "%(followup_amount)s: Quantidade total devido"
#. module: account_followup
#: view:account_followup.followup.line:0
#: wizard_view:account_followup.followup.print.all,next:0
msgid "%(date)s: Current Date"
-msgstr "%(data)s: Data actual"
+msgstr "%(date)s: Data actual"
#. module: account_followup
#: field:account.move.line,followup_date:0
msgid "Latest Follow-up"
-msgstr "Ultimos seguimentos"
+msgstr "Últimos seguimentos"
#. module: account_followup
#: field:account_followup.followup.line,followup_id:0
#: field:account_followup.stat,followup_id:0
msgid "Follow Ups"
-msgstr "Sguimentos"
+msgstr "Seguimentos"
#. module: account_followup
#: wizard_field:account_followup.followup.print.all,init,date:0
msgid "Follow-up Sending Date"
-msgstr ""
+msgstr "Seguimento da data de envio"
#. module: account_followup
#: view:account_followup.followup:0
@@ -151,7 +151,7 @@ msgstr "Empresa"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Invoice Date"
-msgstr ""
+msgstr "Data da Factura"
#. module: account_followup
#: wizard_field:account_followup.followup.print.all,next,email_subject:0
@@ -166,17 +166,17 @@ msgstr "Pago"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
msgid "%(line)s: Account Move lines"
-msgstr "%(linha)s: Linhas de movimento de contas"
+msgstr "%(line)s: Linhas de movimento de contas"
#. module: account_followup
#: field:account_followup.stat,date_followup:0
msgid "Latest followup"
-msgstr "Ultimos Seguimentos"
+msgstr "Últimos Seguimentos"
#. module: account_followup
#: view:account.move.line:0
msgid "Partner entries"
-msgstr "Entradas de terceiros"
+msgstr "Entradas de parceiros"
#. module: account_followup
#: model:ir.model,name:account_followup.model_account_followup_followup_line
@@ -186,7 +186,7 @@ msgstr "Critérios de seguimento"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
msgid "Partner Selection"
-msgstr ""
+msgstr "Selecção de Parceiros"
#. module: account_followup
#: constraint:ir.ui.view:0
@@ -201,12 +201,12 @@ msgstr "Tipo de termo"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,init:0
msgid "Follow-up and Date Selection"
-msgstr ""
+msgstr "Seguimento e Selecção da Data"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
msgid "Select partners to remind"
-msgstr "Seleccionar terceiros para lembrar"
+msgstr "Seleccionar parceiros para lembrar"
#. module: account_followup
#: rml:account_followup.followup.print:0
@@ -230,6 +230,19 @@ msgid ""
"Best Regards,\n"
"\t\t\t"
msgstr ""
+"\n"
+"Caro %(partner_name)s,\n"
+"\n"
+"À excepção feita se houver um erro nosso, parece que o seguinte montante "
+"ainda está por pagar. Por favor, tome as medidas adequadas a fim de efectuar "
+"esse pagamento nos próximos oito dias.\n"
+"\n"
+"Se o seu pagamento tiver sido realizado após este e-mail ter sido enviado, "
+"por favor, considere o presente como nulos. Não hesite em entrar em contato "
+"com nosso departamento de contabilidade (+32) .10.68.94.39.\n"
+"\n"
+"Atenciosamente,\n"
+"\t\t\t"
#. module: account_followup
#: constraint:ir.model:0
@@ -241,7 +254,7 @@ msgstr ""
#. module: account_followup
#: wizard_button:account_followup.followup.print.all,summary,end:0
msgid "Ok"
-msgstr ""
+msgstr "Ok"
#. module: account_followup
#: field:account_followup.followup,name:0
@@ -263,7 +276,7 @@ msgstr "Fim do mês"
#: view:account_followup.followup.line:0
#: wizard_view:account_followup.followup.print.all,next:0
msgid "%(company_name)s: User's Company name"
-msgstr ""
+msgstr "%(company_name)s: Nome da empresa do utilizador"
#. module: account_followup
#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all
@@ -305,23 +318,23 @@ msgstr "Continuar"
#. module: account_followup
#: model:ir.module.module,shortdesc:account_followup.module_meta_information
msgid "Accounting follow-ups management"
-msgstr ""
+msgstr "Gestão do seguimento da conta"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,summary:0
#: wizard_field:account_followup.followup.print.all,summary,summary:0
msgid "Summary"
-msgstr ""
+msgstr "Resumo"
#. module: account_followup
#: view:account_followup.followup.line:0
msgid "Follow-Up Lines"
-msgstr ""
+msgstr "Linhas de Seguimento"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Document : Customer account statement"
-msgstr ""
+msgstr "Documento: Declaração da conta do cliente"
#. module: account_followup
#: view:account_followup.stat:0
@@ -331,7 +344,7 @@ msgstr "Linhas de seguimento"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
msgid "%(company_currency)s: User's Company Currency"
-msgstr ""
+msgstr "%(company_currency)s: Divisa da Companhia do Utilizador"
#. module: account_followup
#: field:account_followup.stat,balance:0
@@ -343,6 +356,8 @@ msgstr "Saldo"
msgid ""
"This field allow you to select a forecast date to plan your follow-ups"
msgstr ""
+"Este campo permite-lhe a selecção de uma data para programar os seus "
+"seguimentos"
#. module: account_followup
#: view:account.move.line:0
@@ -373,6 +388,27 @@ msgid ""
"Best Regards,\n"
"\t\t\t"
msgstr ""
+"\n"
+"Caro %(partner_name)s,\n"
+"\n"
+"Estamos desapontados em ver que apesar de o envio de um lembrete de que sua "
+"conta está seriamente atrasada.\n"
+"\n"
+"É essencial que o pagamento seja feito, caso contrário, teremos que "
+"considerar um stop em sua conta o que significa que não seremos mais capazes "
+"de fornecer à sua empresa (produtos/serviços).\n"
+"Por favor, tome as medidas adequadas a fim de efectuar esse pagamento nos "
+"próximos 8 dias.\n"
+"\n"
+"Se houver um problema com o pagamento da factura que não temos conhecimento "
+"de, não hesite em entrar em contato com o nosso departamento de "
+"contabilidade (+32) .10.68.94.39. para que possamos resolver a questão "
+"rapidamente.\n"
+"\n"
+"Detalhes dos pagamentos devidos é impresso abaixo.\n"
+"\n"
+"Atenciosamente,\n"
+"\t\t\t"
#. module: account_followup
#: rml:account_followup.followup.print:0
@@ -382,7 +418,7 @@ msgstr "Sub-Total:"
#. module: account_followup
#: selection:account_followup.followup.line,start:0
msgid "Net Days"
-msgstr "Dias lÃquidos"
+msgstr "Dias LÃquidos"
#. module: account_followup
#: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
@@ -402,7 +438,7 @@ msgstr "Corpo do e-mail"
#. module: account_followup
#: field:account_followup.stat,date_move_last:0
msgid "Last move"
-msgstr "Ultimo movimento"
+msgstr "Último movimento"
#. module: account_followup
#: rml:account_followup.followup.print:0
@@ -434,11 +470,27 @@ msgid ""
"Best Regards,\n"
"\t\t\t"
msgstr ""
+"\n"
+"Caro %(partner_name)s,\n"
+"\n"
+"Apesar de várias insistências, a conta ainda não está resolvida.\n"
+"\n"
+"A não ser que o pagamento integral seja feita nos próximos oito dias, então "
+"a ação legal para a cobrança da dÃvida, será tomada sem aviso prévio.\n"
+"\n"
+"Espero que não seja necessário tomar essa medida, os detalhes de pagamentos "
+"estão impressos abaixo.\n"
+"\n"
+"Em caso de quaisquer dúvidas sobre esta questão, não hesite em entrar em "
+"contato com nosso departamento de contabilidade (+32) .10.68.94.39.\n"
+"\n"
+"Atenciosamente,\n"
+"\t\t\t"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Maturity Date"
-msgstr ""
+msgstr "Data de vencimento"
#. module: account_followup
#: view:account_followup.followup.line:0
@@ -454,13 +506,13 @@ msgstr "Sequência"
#. module: account_followup
#: wizard_view:account_followup.followup.print.all,next:0
msgid "%(heading)s: Move line header"
-msgstr "%(cabeçalho)s: Mover linha de cabeçalho"
+msgstr "%(heading)s: Mover linha de cabeçalho"
#. module: account_followup
#: view:account_followup.followup.line:0
#: wizard_view:account_followup.followup.print.all,next:0
msgid "%(partner_name)s: Partner name"
-msgstr "%(nome_de_terceiro)s: Nome do terceiro"
+msgstr "%(partner_name)s: Nome do terceiro"
#. module: account_followup
#: wizard_field:account_followup.followup.print.all,next,email_conf:0
@@ -470,12 +522,12 @@ msgstr "Enviar confirmação de e-mail"
#. module: account_followup
#: wizard_field:account_followup.followup.print.all,init,followup_id:0
msgid "Follow-up"
-msgstr ""
+msgstr "Seguimento"
#. module: account_followup
#: field:account_followup.stat,name:0
msgid "Partner"
-msgstr "Terceiro"
+msgstr "Parceiro"
#. module: account_followup
#: wizard_button:account_followup.followup.print.all,init,end:0
@@ -491,4 +543,4 @@ msgstr "Dias de atraso"
#. module: account_followup
#: wizard_button:account_followup.followup.print.all,next,print:0
msgid "Print Follow Ups & Send Mails"
-msgstr ""
+msgstr "Imprimir Segmentos e Enviar Mensagens"
diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index 7da226b3188..f7ff9ad9ef1 100644
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -21,7 +21,8 @@
import time
import netsvc
-from osv import fields, osv
+from osv import fields
+from osv import osv
import ir
import pooler
import mx.DateTime
@@ -30,13 +31,13 @@ from tools import config
type2journal = {
'rec_voucher': 'cash',
- 'bank_rec_voucher': 'cash',
+ 'bank_rec_voucher': 'bank',
'pay_voucher': 'cash',
- 'bank_pay_voucher': 'cash',
+ 'bank_pay_voucher': 'bank',
'cont_voucher': 'cash',
'journal_sale_vou': 'sale',
'journal_pur_voucher': 'purchase',
- 'journal_voucher':'expanse'
+ 'journal_voucher':'general'
}
class ir_sequence_type(osv.osv):
@@ -56,7 +57,10 @@ account_journal()
class account_voucher(osv.osv):
- def _get_period(self, cr, uid, context):
+ def _get_period(self, cr, uid, context={}):
+ if context.get('period_id', False):
+ return context.get('period_id')
+
periods = self.pool.get('account.period').find(cr, uid)
if periods:
return periods[0]
@@ -107,7 +111,7 @@ class account_voucher(osv.osv):
('journal_sale_vou','Journal Sale'),
('journal_pur_voucher','Journal Purchase'),
('journal_voucher','Journal Voucher'),
- ],'Type', readonly=True, select=True , size=128),
+ ],'Entry Type', select=True , size=128, readonly=True, states={'draft':[('readonly',False)]}),
'date':fields.date('Date', readonly=True, states={'draft':[('readonly',False)]}),
'journal_id':fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
'account_id':fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft':[('readonly',False)]}, domain=[('type','<>','view')]),
@@ -139,43 +143,60 @@ class account_voucher(osv.osv):
}
_defaults = {
- 'state': lambda *a: 'draft',
- 'date' : lambda *a: time.strftime('%Y-%m-%d'),
'period_id': _get_period,
'type': _get_type,
- 'reference_type': lambda *a: 'none',
'journal_id':_get_journal,
- 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.voucher', context=c),
'currency_id': _get_currency,
+
+ 'state': lambda *a: 'draft',
+ 'date' : lambda *a: time.strftime('%Y-%m-%d'),
+ 'reference_type': lambda *a: "none",
+ 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.voucher',context=c),
}
- def _get_analityc_lines(self, cr, uid, id):
- inv = self.browse(cr, uid, [id])[0]
- cur_obj = self.pool.get('res.currency')
+# def _get_analityc_lines(self, cr, uid, id):
+# inv = self.browse(cr, uid, [id])[0]
+# cur_obj = self.pool.get('res.currency')
def onchange_account(self, cr, uid, ids, account_id):
+
if not account_id:
- return {'value':{'amount':False}}
- account = self.pool.get('account.account').browse(cr,uid,account_id)
+ return {
+ 'value':{'amount':False}
+ }
+
+ account = self.pool.get('account.account').browse(cr, uid, account_id)
balance=account.balance
- return {'value':{'amount':balance}}
+ return {
+ 'value':{'amount':balance}
+ }
def onchange_journal(self, cr, uid, ids, journal_id, type):
if not journal_id:
- return {'value':{'account_id':False}}
+ return {
+ 'value':{'account_id':False}
+ }
+
journal = self.pool.get('account.journal')
+
if journal_id and (type in ('rec_voucher','bank_rec_voucher','journal_pur_voucher','journal_voucher')):
account_id = journal.browse(cr, uid, journal_id).default_debit_account_id
- return {'value':{'account_id':account_id.id}}
+ return {
+ 'value':{'account_id':account_id.id}
+ }
elif journal_id and (type in ('pay_voucher','bank_pay_voucher','journal_sale_vou')) :
account_id = journal.browse(cr, uid, journal_id).default_credit_account_id
- return {'value':{'account_id':account_id.id}}
+ return {
+ 'value':{'account_id':account_id.id}
+ }
else:
account_id = journal.browse(cr, uid, journal_id).default_credit_account_id
- return {'value':{'account_id':account_id.id}}
+ return {
+ 'value':{'account_id':account_id.id}
+ }
def open_voucher(self, cr, uid, ids, context={}):
- obj = self.pool.get('account.voucher').browse(cr,uid,ids)
+ obj = self.pool.get('account.voucher').browse(cr, uid, ids)
total = 0
for i in obj[0].payment_ids:
total += i.amount
@@ -208,8 +229,7 @@ class account_voucher(osv.osv):
unlink_ids.append(t['id'])
else:
raise osv.except_osv('Invalid action !', 'Cannot delete Voucher(s) which are already opened or paid !')
- osv.osv.unlink(self, cr, uid, unlink_ids)
- return True
+ return super(account_voucher, self).unlink(self, cr, uid, unlink_ids)
def _get_analytic_lines(self, cr, uid, id):
inv = self.browse(cr, uid, [id])[0]
@@ -242,9 +262,12 @@ class account_voucher(osv.osv):
return iml
def action_move_line_create(self, cr, uid, ids, *args):
+
for inv in self.browse(cr, uid, ids):
+
if inv.move_id:
continue
+
company_currency = inv.company_id.currency_id.id
line_ids = self.read(cr, uid, [inv.id], ['payment_ids'])[0]['payment_ids']
@@ -312,7 +335,8 @@ class account_voucher(osv.osv):
'name' : name,
'journal_id': journal_id,
'type' : inv.type,
- 'narration' : inv.narration
+ 'narration' : inv.narration,
+ 'date':inv.date
}
if inv.period_id:
move['period_id'] = inv.period_id.id
@@ -362,13 +386,14 @@ class account_voucher(osv.osv):
elif line.type == 'cr':
move_line['credit'] = line.amount or False
amount=line.amount * (-1)
-
+
+ move_line['analytic_account_id'] = line.account_analytic_id.id or False
ml_id=self.pool.get('account.move.line').create(cr, uid, move_line)
if inv.narration:
- line.name=inv.narration
+ line.name = inv.narration
else:
- line.name=line.name
+ line.name = line.name
if line.account_analytic_id:
an_line = {
@@ -393,7 +418,6 @@ class account_voucher(osv.osv):
def line_get_convert(self, cr, uid, x, date, context={}):
-
return {
'date':date,
'date_maturity': x.get('date_maturity', False),
@@ -409,6 +433,7 @@ class account_voucher(osv.osv):
'tax_amount': x.get('tax_amount', False),
'ref':x.get('ref',False)
}
+
def _convert_ref(self, cr, uid, ref):
return (ref or '').replace('/','')
@@ -547,7 +572,6 @@ class account_voucher_line(osv.osv):
if not amount:
return {'value' : {}}
if partner_id:
-
obj = self.pool.get('res.partner')
if type1 in ('rec_voucher', 'bank_rec_voucher', 'journal_voucher'):
if amount < 0 :
@@ -583,34 +607,23 @@ class account_voucher_line(osv.osv):
else:
if type1 in ('rec_voucher', 'bank_rec_voucher', 'journal_voucher'):
if amount < 0 :
-
type = 'dr'
else:
-
type = 'cr'
-
elif type1 in ('pay_voucher','bank_pay_voucher','cont_voucher') :
if amount < 0 :
-
type = 'cr'
else:
-
type = 'dr'
-
elif type1 in ('journal_sale_vou') :
if amount < 0 :
-
type = 'cr'
else:
-
type = 'dr'
-
elif type1 in ('journal_pur_voucher') :
if amount< 0 :
-
type = 'dr'
else:
-
type = 'cr'
return {
@@ -619,9 +632,7 @@ class account_voucher_line(osv.osv):
def onchange_type(self, cr, uid, ids,partner_id,amount,type,type1):
if partner_id:
-
obj = self.pool.get('res.partner')
-
if type1 in ('rec_voucher','bank_rec_voucher', 'journal_voucher'):
if type == 'dr' :
account_id = obj.browse(cr, uid, partner_id).property_account_payable
@@ -645,7 +656,6 @@ class account_voucher_line(osv.osv):
else:
account_id = obj.browse(cr, uid, partner_id).property_account_receivable
total=amount*(-1)
-
elif type1 in ('journal_pur_voucher') :
if type == 'dr' :
account_id = obj.browse(cr, uid, partner_id).property_account_receivable
@@ -656,34 +666,25 @@ class account_voucher_line(osv.osv):
else:
if type1 in ('rec_voucher','bank_rec_voucher', 'journal_voucher'):
if type == 'dr' :
-
total=amount*(-1)
else:
-
total=amount*(-1)
elif type1 in ('pay_voucher','bank_pay_voucher','cont_voucher') :
if type == 'cr' :
-
total=amount*(-1)
else:
-
total=amount*(-1)
elif type1 in ('journal_sale_vou') :
if type == 'cr' :
-
total=amount*(-1)
else:
-
total=amount*(-1)
-
elif type1 in ('journal_pur_voucher') :
if type == 'dr' :
-
total=amount*(-1)
else:
-
total=amount*(-1)
return {
@@ -702,9 +703,3 @@ class account_voucher_line(osv.osv):
}
account_voucher_line()
-
-
-
-
-
-
diff --git a/addons/account_voucher/voucher_sequence.xml b/addons/account_voucher/voucher_sequence.xml
index a8e56728542..c7f56051014 100644
--- a/addons/account_voucher/voucher_sequence.xml
+++ b/addons/account_voucher/voucher_sequence.xml
@@ -1,110 +1,90 @@
+
+
+ Voucher
+ account.voucher
+
+
+
+ Cash Receipt
+ rec_voucher
+
+
+
+ Cash Payment
+ pay_voucher
+
+
+ Bank Receipt
+ bank_rec_voucher
+
+
+ Bank Payment
+ bank_pay_voucher
+
+
+ Contra Entry
+ cont_voucher
+
+
+ Sales Entry
+ journal_sale_vou
+
+
+ Purchase Entry
+ journal_pur_vou
+
+
+
+
+ Cash Receipt
+ rec_voucher
+
+ %(year)s/
+
+
+
+ Cash Payment
+ pay_voucher
+
+ %(year)s/
+
+
+ Bank Receipt
+ bank_rec_voucher
+
+ %(year)s/
+
+
+ Bank Payment
+ bank_pay_voucher
+
+ %(year)s/
+
+
+ Contra Entry
+ cont_voucher
+
+ %(year)s/
+
+
+ Sales Entry
+ journal_sale_vou
+
+ %(year)s/
+
+
+ Purchase Entry
+ journal_pur_vou
+
+ %(year)s/
+
-
-
- Voucher
- account.voucher
-
-
-
-
- Account Cash Received Voucher
- rec_voucher
-
-
-
- Account Cash Payble Voucher
- pay_voucher
-
-
- Account Bank Received Voucher
- bank_rec_voucher
-
-
- Account Bank Payble Voucher
- bank_pay_voucher
-
-
- Account Contra Voucher
- cont_voucher
-
-
- Account Journal Voucher
- journal_sale_vou
-
-
- Account Journal Voucher
- journal_pur_vou
-
-
-
-
- Account Cash Received Voucher
- rec_voucher
-
- %(year)s/
-
-
-
- Account Cash Payble Voucher
- pay_voucher
-
- %(year)s/
-
-
- Account Bank Received Voucher
- bank_rec_voucher
-
- %(year)s/
-
-
- Account Bank Payble Voucher
- bank_pay_voucher
-
- %(year)s/
-
-
- Account Contra Voucher
- cont_voucher
-
- %(year)s/
-
-
- Account Journal Voucher
- journal_sale_vou
-
- %(year)s/
-
-
- Account Journal Voucher
- journal_pur_vou
-
- %(year)s/
-
-
-
-
+
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index 08262bb17df..6eb6988480d 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -28,12 +28,10 @@
diff --git a/addons/marketing/__init__.py b/addons/marketing/__init__.py
new file mode 100644
index 00000000000..c83787a6ef7
--- /dev/null
+++ b/addons/marketing/__init__.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+import marketing_wizard
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/marketing/__openerp__.py b/addons/marketing/__openerp__.py
new file mode 100644
index 00000000000..ee6abca5355
--- /dev/null
+++ b/addons/marketing/__openerp__.py
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+
+{
+ "name" : "Marketing",
+ "version" : "1.1",
+ "depends" : ["base"],
+ "author" : "Tiny",
+ "category": 'Generic Modules/Marketing',
+ "description": "Menu for Marketing",
+ 'website': 'http://www.openerp.com',
+ 'init_xml': [],
+ 'update_xml': ['marketing_view.xml'],
+ 'demo_xml': [],
+ 'installable': True,
+ 'active': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
new file mode 100644
index 00000000000..7a72f39c6eb
--- /dev/null
+++ b/addons/marketing/marketing_view.xml
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+ marketing.installer.view
+ marketing.installer
+ form
+
+
+
+
+
+
+ Configure Your Marketing System
+
+
+ You can enhance OpenERP's basic Marketing support with a few additional OpenERP applications
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Marketing Modules Installation
+ ir.actions.act_window
+ marketing.installer
+
+ form
+ form
+ new
+
+
+
+
+ 3
+
+
+
+
\ No newline at end of file
diff --git a/addons/marketing/marketing_wizard.py b/addons/marketing/marketing_wizard.py
new file mode 100644
index 00000000000..443fb09ed48
--- /dev/null
+++ b/addons/marketing/marketing_wizard.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+from osv import fields, osv
+
+class marketing_installer(osv.osv_memory):
+ _name = 'marketing.installer'
+ _inherit = 'res.config.installer'
+
+ _columns = {
+ # Generic modules
+ 'marketing_campaign':fields.boolean('Marketing Campaign',
+ help="Helps you to manage your marketing campaigns step by step."),
+ 'crm_profiling':fields.boolean('Crm Profile',
+ help="Helps you to perform segmentation within partners.")
+ }
+
+marketing_installer()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py
index 9a10fdbaa3d..aca6c2f6d28 100755
--- a/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@ -23,7 +23,8 @@
{
"name" : "",
"version" : "1.1",
- "depends" : ["crm",
+ "depends" : ["marketing",
+ "crm",
"document",
"poweremail" # need to get this module form the branch
# lp:poweremail
@@ -39,6 +40,7 @@
'marketing_campaign_data.xml',
'marketing_campaign_workflow.xml',
'report/campaign_analysis_view.xml',
+ 'marketing_campaign_demo.xml'
],
'demo_xml': [
'marketing_campaign_demo.xml',
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 9c9d4e96c14..fb88b6d283d 100755
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -1,8 +1,8 @@
-
-
-
+
@@ -201,9 +201,9 @@
diff --git a/addons/scrum/scrum.py b/addons/scrum/scrum.py
index e463ad2e4aa..bccc991565f 100644
--- a/addons/scrum/scrum.py
+++ b/addons/scrum/scrum.py
@@ -42,6 +42,7 @@ scrum_project()
class scrum_sprint(osv.osv):
_name = 'scrum.sprint'
_description = 'Scrum Sprint'
+
def _calc_progress(self, cr, uid, ids, name, args, context):
res = {}
for sprint in self.browse(cr, uid, ids):
@@ -54,6 +55,7 @@ class scrum_sprint(osv.osv):
if tot>0:
res[sprint.id] = round(prog/tot*100)
return res
+
def _calc_effective(self, cr, uid, ids, name, args, context):
res = {}
for sprint in self.browse(cr, uid, ids):
@@ -61,6 +63,7 @@ class scrum_sprint(osv.osv):
for bl in sprint.backlog_ids:
res[sprint.id] += bl.effective_hours
return res
+
def _calc_planned(self, cr, uid, ids, name, args, context):
res = {}
for sprint in self.browse(cr, uid, ids):
@@ -68,6 +71,7 @@ class scrum_sprint(osv.osv):
for bl in sprint.backlog_ids:
res[sprint.id] += bl.planned_hours
return res
+
def _calc_expected(self, cr, uid, ids, name, args, context):
res = {}
for sprint in self.browse(cr, uid, ids):
@@ -75,21 +79,27 @@ class scrum_sprint(osv.osv):
for bl in sprint.backlog_ids:
res[sprint.id] += bl.expected_hours
return res
+
def button_cancel(self, cr, uid, ids, context={}):
self.write(cr, uid, ids, {'state':'cancel'}, context=context)
return True
+
def button_draft(self, cr, uid, ids, context={}):
self.write(cr, uid, ids, {'state':'draft'}, context=context)
return True
+
def button_open(self, cr, uid, ids, context={}):
self.write(cr, uid, ids, {'state':'open'}, context=context)
return True
+
def button_close(self, cr, uid, ids, context={}):
self.write(cr, uid, ids, {'state':'done'}, context=context)
return True
+
def button_pending(self, cr, uid, ids, context={}):
self.write(cr, uid, ids, {'state':'pending'}, context=context)
return True
+
_columns = {
'name' : fields.char('Sprint Name', required=True, size=64),
'date_start': fields.date('Starting Date', required=True),
@@ -165,6 +175,7 @@ class scrum_product_backlog(osv.osv):
if tot>0:
res[bl.id] = round(prog/tot*100)
return res
+
def _calc_effective(self, cr, uid, ids, name, args, context):
res = {}
for bl in self.browse(cr, uid, ids):
@@ -172,6 +183,7 @@ class scrum_product_backlog(osv.osv):
for task in bl.tasks_id:
res[bl.id] += task.effective_hours
return res
+
def _calc_planned(self, cr, uid, ids, name, args, context):
res = {}
for bl in self.browse(cr, uid, ids):
@@ -185,17 +197,21 @@ class scrum_product_backlog(osv.osv):
for backlog in self.browse(cr, uid, ids, context=context):
self.pool.get('project.task').write(cr, uid, [i.id for i in backlog.tasks_id], {'state': 'cancelled'})
return True
+
def button_draft(self, cr, uid, ids, context={}):
self.write(cr, uid, ids, {'state':'draft'}, context=context)
return True
+
def button_open(self, cr, uid, ids, context={}):
self.write(cr, uid, ids, {'state':'open'}, context=context)
return True
+
def button_close(self, cr, uid, ids, context={}):
self.write(cr, uid, ids, {'state':'done'}, context=context)
for backlog in self.browse(cr, uid, ids, context=context):
self.pool.get('project.task').write(cr, uid, [i.id for i in backlog.tasks_id], {'state': 'done'})
return True
+
def button_pending(self, cr, uid, ids, context={}):
self.write(cr, uid, ids, {'state':'pending'}, context=context)
return True
@@ -214,7 +230,7 @@ class scrum_product_backlog(osv.osv):
'effective_hours': fields.function(_calc_effective, method=True, string='Effective hours', help="Computed using the sum of the task work done (Time spent on tasks)"),
'planned_hours': fields.function(_calc_planned, method=True, string='Planned Hours', help='Estimated time to do the task, usually set by the project manager when the task is in draft state.'),
'expected_hours': fields.float('Expected Hours', help='Estimated total time to do the Backlog'),
- 'date':fields.datetime("Created Date"),
+ 'create_date': fields.datetime("Creation Date", readonly=True),
}
_defaults = {
'state': 'draft',
@@ -227,6 +243,7 @@ scrum_product_backlog()
class scrum_task(osv.osv):
_name = 'project.task'
_inherit = 'project.task'
+
def _get_task(self, cr, uid, ids, context={}):
result = {}
for line in self.pool.get('scrum.product.backlog').browse(cr, uid, ids, context=context):
@@ -241,6 +258,7 @@ class scrum_task(osv.osv):
'scrum.product.backlog': (_get_task, ['sprint_id'], 10)
}),
}
+
def onchange_backlog_id(self, cr, uid, backlog_id):
if not backlog_id:
return {}
diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index 107fa97b13c..61a2c3b35ed 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -63,7 +63,7 @@
-
+
diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml
index c343b09931a..e570e2b55ea 100644
--- a/addons/stock/report/report_stock_picking_view.xml
+++ b/addons/stock/report/report_stock_picking_view.xml
@@ -54,10 +54,10 @@
-
-
| | | |