diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py index c1c6e3f854b..1792525a7f6 100644 --- a/addons/account/account_analytic_line.py +++ b/addons/account/account_analytic_line.py @@ -20,7 +20,6 @@ ############################################################################## import time -import decimal_precision as dp from osv import fields from osv import osv @@ -94,11 +93,12 @@ class account_analytic_line(osv.osv): # Compute based on pricetype pricetype=self.pool.get('product.price.type').browse(cr, uid, company_obj.browse(cr,uid,company_id).property_valuation_price_type.id) # Take the company currency as the reference one - context['currency_id']=company_obj.browse(cr, uid, company_id).currency_id.id - amount_unit=prod.price_get(pricetype.field, context)[prod.id] + amount_unit = prod.price_get(pricetype.field, context)[prod.id] + amount = amount_unit*unit_amount or 1.0 + prec = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account') amount = amount_unit*unit_amount or 1.0 return {'value': { - 'amount': - round(amount, 2), + 'amount': - round(amount, prec), 'general_account_id': a, }} return {} diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml index f28e08c3191..d7a85753ab1 100644 --- a/addons/account/demo/account_minimal.xml +++ b/addons/account/demo/account_minimal.xml @@ -48,6 +48,7 @@ Equity equity + asset balance @@ -60,7 +61,7 @@ - + X0 Chart For Automated Tests @@ -78,7 +79,7 @@ view - + Assets - (test) X10 @@ -87,7 +88,7 @@ - + Liabilities - (test) X11 @@ -96,7 +97,7 @@ - + X100 Fixed Assets - (test) @@ -204,7 +205,7 @@ view - + Income - (test) X20 @@ -213,7 +214,7 @@ - + Foreign Exchange Gain - (test) X201 @@ -222,7 +223,7 @@ - + Expense - (test) X21 @@ -231,9 +232,9 @@ - + - X200 + X200 Revenue - (test) view @@ -279,7 +280,7 @@ other - + Foreign Exchange Loss - (test) X2111 @@ -288,7 +289,7 @@ - + property_account_receivable diff --git a/addons/account/i18n/sr.po b/addons/account/i18n/sr.po index fcdfacc0eba..298efaf2b2d 100644 --- a/addons/account/i18n/sr.po +++ b/addons/account/i18n/sr.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 20:19+0000\n" -"Last-Translator: Dragan Životić \n" +"PO-Revision-Date: 2010-08-04 13:59+0000\n" +"Last-Translator: Данило Шеган \n" "Language-Team: Serbian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-03 03:41+0000\n" +"X-Launchpad-Export-Date: 2010-08-05 03:35+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/report/account_aged_partner_balance.rml b/addons/account/report/account_aged_partner_balance.rml index 78c7af3b2af..bd52f9be4f5 100644 --- a/addons/account/report/account_aged_partner_balance.rml +++ b/addons/account/report/account_aged_partner_balance.rml @@ -107,7 +107,7 @@ - + @@ -121,7 +121,7 @@ - + Chart of Account diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml index e11a0d7b44c..d6c9ab114e5 100644 --- a/addons/account/report/account_balance.rml +++ b/addons/account/report/account_balance.rml @@ -179,7 +179,7 @@ - + @@ -209,7 +209,7 @@ - + [[ data['model']=='account.account' and 'Company'or removeParentNode('para') ]] [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]] diff --git a/addons/account/report/account_balance_landscape.rml b/addons/account/report/account_balance_landscape.rml index 13a00655d5e..d96227476a5 100644 --- a/addons/account/report/account_balance_landscape.rml +++ b/addons/account/report/account_balance_landscape.rml @@ -125,7 +125,7 @@ - + diff --git a/addons/account/report/account_balance_sheet.rml b/addons/account/report/account_balance_sheet.rml index 5ab769d6625..1a5abbdea23 100644 --- a/addons/account/report/account_balance_sheet.rml +++ b/addons/account/report/account_balance_sheet.rml @@ -80,7 +80,7 @@ - + @@ -168,9 +168,6 @@ - - - @@ -182,7 +179,7 @@ - + Chart of Account Fiscal Year diff --git a/addons/account/report/account_balance_sheet_horizontal.rml b/addons/account/report/account_balance_sheet_horizontal.rml index fbb32edc975..8cd7e8bab51 100644 --- a/addons/account/report/account_balance_sheet_horizontal.rml +++ b/addons/account/report/account_balance_sheet_horizontal.rml @@ -96,7 +96,7 @@ - + @@ -154,14 +154,14 @@ - + - + @@ -175,10 +175,19 @@ - + - Balance Sheet + + + + + + + + + + Balance Sheet @@ -190,7 +199,7 @@ [[ get_data(data) or removeParentNode('para') ]] - + Chart of Account Fiscal Year @@ -202,7 +211,7 @@ [[ get_account(data) or removeParentNode('para') ]] [[ get_fiscalyear(data) or '' ]] [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] - [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] + [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] Start Date End Date @@ -212,7 +221,7 @@ [[get_end_date(data) ]] - [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] + [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] Start Period End Period diff --git a/addons/account/report/account_central_journal.rml b/addons/account/report/account_central_journal.rml index f31ae1d50ab..03ae0ed3bc1 100644 --- a/addons/account/report/account_central_journal.rml +++ b/addons/account/report/account_central_journal.rml @@ -159,7 +159,7 @@ - + @@ -216,7 +216,7 @@ - + @@ -242,7 +242,7 @@ - + [[ data['model']=='account.journal.period' and 'Company' or removeParentNode('para') ]] [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]] diff --git a/addons/account/report/account_general_journal.rml b/addons/account/report/account_general_journal.rml index c8f23e7631f..244f9ac8291 100644 --- a/addons/account/report/account_general_journal.rml +++ b/addons/account/report/account_general_journal.rml @@ -86,7 +86,7 @@ - + @@ -190,7 +190,7 @@ - + @@ -264,7 +264,7 @@ - [[ display_currency(data)==False or removeParentNode('blockTable') ]] + [[ display_currency(data)==False or removeParentNode('blockTable') ]] Code Journal Name @@ -325,7 +325,7 @@ - [[ display_currency(data)==False or removeParentNode('blockTable') ]] + [[ display_currency(data)==False or removeParentNode('blockTable') ]] [[ o.name ]] : @@ -347,7 +347,7 @@
[[lines(o.id) and removeParentNode('para') or removeParentNode('section') ]] - [[ display_currency(data) == False or removeParentNode('blockTable') ]] + [[ display_currency(data) == False or removeParentNode('blockTable') ]] [[ repeatIn(lines(o.id),'line')]] [[ line['code'] ]] diff --git a/addons/account/report/account_general_ledger.rml b/addons/account/report/account_general_ledger.rml index 2a99b643bff..dd5ffa87bd9 100644 --- a/addons/account/report/account_general_ledger.rml +++ b/addons/account/report/account_general_ledger.rml @@ -102,7 +102,7 @@ - + diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml index fe090650d40..09781a7b346 100644 --- a/addons/account/report/account_general_ledger_landscape.rml +++ b/addons/account/report/account_general_ledger_landscape.rml @@ -101,7 +101,7 @@ - + @@ -200,11 +200,7 @@ - - - - - + [[ data['model']=='account.account' and 'Company' or removeParentNode('para') ]] [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]] diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml index 75d2fa2070b..400eed846f3 100644 --- a/addons/account/report/account_journal.rml +++ b/addons/account/report/account_journal.rml @@ -3,9 +3,6 @@ @@ -29,7 +26,7 @@ - + @@ -172,7 +169,7 @@ - + @@ -203,7 +200,7 @@ - + [[ data['model']=='account.journal.period'and 'Company' or removeParentNode('para') ]] [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]] diff --git a/addons/account/report/account_partner_balance.rml b/addons/account/report/account_partner_balance.rml index 7ee04a79e2b..df381493889 100644 --- a/addons/account/report/account_partner_balance.rml +++ b/addons/account/report/account_partner_balance.rml @@ -82,7 +82,7 @@ - + @@ -157,7 +157,7 @@ - + @@ -189,7 +189,7 @@ - + Chart of Account Fiscal Year diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml index b6e564d26d0..934591032e8 100644 --- a/addons/account/report/account_partner_ledger.rml +++ b/addons/account/report/account_partner_ledger.rml @@ -41,7 +41,7 @@ - + @@ -155,7 +155,7 @@ - + @@ -176,15 +176,43 @@ Third Party Ledger + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + [[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]] diff --git a/addons/account/report/account_partner_ledger_other.rml b/addons/account/report/account_partner_ledger_other.rml index f29b8937777..7396734fdc9 100644 --- a/addons/account/report/account_partner_ledger_other.rml +++ b/addons/account/report/account_partner_ledger_other.rml @@ -153,7 +153,7 @@ - + @@ -193,6 +193,10 @@ + + + + @@ -304,7 +308,7 @@ - + @@ -320,17 +324,33 @@ - + - + - Third Party Ledger - + + + + Third Party Ledger + + + + - + + + + + + + + + + + Chart of Account diff --git a/addons/account/report/account_profit_horizontal.rml b/addons/account/report/account_profit_horizontal.rml index 1497a31d486..28215f06075 100644 --- a/addons/account/report/account_profit_horizontal.rml +++ b/addons/account/report/account_profit_horizontal.rml @@ -115,7 +115,7 @@ - + @@ -205,11 +205,11 @@ [[ get_data(data) or removeParentNode('para')]] - + Chart of Account Fiscal Year - Filter By [[ get_filter(data)!='No Filter' and '' or removeParentNode('font') ]] + Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] Display Account Printing Date @@ -217,7 +217,7 @@ [[ get_account(data) or removeParentNode('para') ]] [[ get_fiscalyear(data) or '' ]] [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] - [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] + [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] Start Date End Date @@ -227,7 +227,7 @@ [[get_end_date(data) ]] - [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] + [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] Start Period End Period diff --git a/addons/account/report/account_profit_loss.rml b/addons/account/report/account_profit_loss.rml index 284ca7da035..0a5c03ad395 100644 --- a/addons/account/report/account_profit_loss.rml +++ b/addons/account/report/account_profit_loss.rml @@ -117,7 +117,7 @@ - + @@ -207,7 +207,7 @@ - + Chart of Account Fiscal Year diff --git a/addons/auction/__openerp__.py b/addons/auction/__openerp__.py index 7d96fe90aa1..7ad16bfeb03 100644 --- a/addons/auction/__openerp__.py +++ b/addons/auction/__openerp__.py @@ -40,34 +40,31 @@ """, 'author': 'OpenERP SA', 'depends': ['base', 'account', 'hr_attendance'], - 'init_xml': ['auction_sequence.xml'], + 'init_xml': ['auction_sequence.xml', 'auction_data.xml'], 'update_xml': [ 'security/ir.model.access.csv', -# 'wizard/auction_lots_cancel_view.xml', -# 'wizard/auction_transfer_unsold_object_view.xml', - 'wizard/auction_lots_able_view.xml', - 'wizard/auction_lots_enable_view.xml', + # 'wizard/auction_lots_able_view.xml', + # 'wizard/auction_lots_enable_view.xml', 'wizard/auction_lots_make_invoice_buyer_view.xml', 'wizard/auction_lots_make_invoice_view.xml', 'wizard/auction_taken_view.xml', 'wizard/auction_lots_auction_move_view.xml', 'wizard/auction_pay_buy_view.xml', - 'wizard/auction_payer_sel_view.xml', + #'wizard/auction_payer_sel_view.xml', 'wizard/auction_lots_sms_send_view.xml', 'wizard/auction_catalog_flagey_view.xml', -# 'wizard/auction_aie_send_view.xml', -# 'wizard/auction_aie_send_result_view.xml', 'wizard/auction_lots_buyer_map_view.xml', -# 'wizard/auction_lots_numerotate_view.xml', - 'auction_view.xml', 'auction_report.xml', + 'report/report_auction_view.xml', 'auction_wizard.xml', 'board_auction_view.xml', 'board_auction_manager_view.xml', ], 'demo_xml': ['auction_demo.xml','board_auction_demo.xml'], + 'test': ['test/auction.yml', 'test/auction_wizard.yml'], + 'installable': True, 'active': False, 'certificate': '0039333102717', diff --git a/addons/auction/auction.py b/addons/auction/auction.py index e55d999a1d1..41c75e0fe7b 100644 --- a/addons/auction/auction.py +++ b/addons/auction/auction.py @@ -18,24 +18,27 @@ # along with this program. If not, see . # ############################################################################## - -import time -import netsvc -from osv import fields, osv, orm -import ir from mx import DateTime +from osv import fields, osv, orm +from tools import config from tools.translate import _ +import ir +import netsvc +import os +import time +import tools #---------------------------------------------------------- # Auction Artists #---------------------------------------------------------- + class auction_artists(osv.osv): _name = "auction.artists" _columns = { - 'name': fields.char('Artist/Author Name', size=64, required=True), - 'pseudo': fields.char('Pseudo', size=64), - 'birth_death_dates':fields.char('Birth / Death dates', size=64), - 'biography': fields.text('Biography'), + 'name': fields.char('Artist/Author Name', size=64, required=True), + 'pseudo': fields.char('Pseudo', size=64), + 'birth_death_dates':fields.char('Birth / Death dates', size=64), + 'biography': fields.text('Biography'), } auction_artists() @@ -43,49 +46,55 @@ auction_artists() # Auction Dates #---------------------------------------------------------- class auction_dates(osv.osv): + """Auction Dates""" _name = "auction.dates" - + _description=__doc__ + def _adjudication_get(self, cr, uid, ids, prop, unknow_none, unknow_dict): - tmp={} - for id in ids: - tmp[id]=0.0 - cr.execute("select sum(obj_price) from auction_lots where auction_id=%s", (id,)) - sum = cr.fetchone() - if sum: - tmp[id]=sum[0] - return tmp + res={} + total = 0.0 + lots_obj = self.pool.get('auction.lots') + for auction in self.browse(cr, uid, ids): + lots_ids = lots_obj.search(cr, uid, [('auction_id', '=', auction.id)]) + for lots in lots_obj.browse(cr, uid, lots_ids): + total+=lots.obj_price or 0.0 + res[auction.id]=total + return res - def name_get(self, cr, uid, ids, context={}): - if not len(ids): + def name_get(self, cr, uid, ids, context=None): + if not context: + context={} + if not ids: return [] reads = self.read(cr, uid, ids, ['name', 'auction1'], context) - name = [(r['id'],'['+r['auction1']+'] '+ r['name']) for r in reads] + name = [(r['id'], '['+r['auction1']+'] '+ r['name']) for r in reads] return name _columns = { - 'name': fields.char('Auction Name', size=64, required=True), - 'expo1': fields.date('First Exposition Day', required=True), - 'expo2': fields.date('Last Exposition Day', required=True), - 'auction1': fields.date('First Auction Day', required=True), - 'auction2': fields.date('Last Auction Day', required=True), - 'journal_id': fields.many2one('account.journal', 'Buyer Journal', required=True), - 'journal_seller_id': fields.many2one('account.journal', 'Seller Journal', required=True), - 'buyer_costs': fields.many2many('account.tax', 'auction_buyer_taxes_rel', 'auction_id', 'tax_id', 'Buyer Costs'), - 'seller_costs': fields.many2many('account.tax', 'auction_seller_taxes_rel', 'auction_id', 'tax_id', 'Seller Costs'), - 'acc_income': fields.many2one('account.account', 'Income Account', required=True), - 'acc_expense': fields.many2one('account.account', 'Expense Account', required=True), - 'adj_total': fields.function(_adjudication_get, method=True, string='Total Adjudication',store=True), - 'state': fields.selection((('draft','Draft'),('closed','Closed')),'State',select=1, readonly=True, - help='When auction starts the state is \'Draft\'.\n At the end of auction, the state becomes \'Closed\'.'), - 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True), - + 'name': fields.char('Auction Name', size=64, required=True), + 'expo1': fields.date('First Exposition Day', required=True), + 'expo2': fields.date('Last Exposition Day', required=True), + 'auction1': fields.date('First Auction Day', required=True), + 'auction2': fields.date('Last Auction Day', required=True), + 'journal_id': fields.many2one('account.journal', 'Buyer Journal', required=True), + 'journal_seller_id': fields.many2one('account.journal', 'Seller Journal', required=True), + 'buyer_costs': fields.many2many('account.tax', 'auction_buyer_taxes_rel', 'auction_id', 'tax_id', 'Buyer Costs'), + 'seller_costs': fields.many2many('account.tax', 'auction_seller_taxes_rel', 'auction_id', 'tax_id', 'Seller Costs'), + 'acc_income': fields.many2one('account.account', 'Income Account', required=True), + 'acc_expense': fields.many2one('account.account', 'Expense Account', required=True), + 'adj_total': fields.function(_adjudication_get, method=True, string='Total Adjudication', store=True), + 'state': fields.selection((('draft', 'Draft'), ('closed', 'Closed')), 'State', select=1, readonly=True, + help='When auction starts the state is \'Draft\'.\n At the end of auction, the state becomes \'Closed\'.'), + 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True), } + _defaults = { - 'state': lambda *a: 'draft', + 'state': lambda *a: 'draft', } + _order = "auction1 desc" - def close(self, cr, uid, ids, *args): + def close(self, cr, uid, ids, context=None): """ Close an auction date. @@ -94,410 +103,322 @@ class auction_dates(osv.osv): RETURN: True """ - # objects vendus mais non factures - #TODO: convert this query to tiny API + if not context: + context={} lots_obj = self.pool.get('auction.lots') - cr.execute('select count(*) as c from auction_lots where auction_id IN %s and state=%s and obj_price>0', (tuple(ids),'draft',)) - cr.execute('SELECT COUNT(*) AS c ' - 'FROM auction_lots ' - 'WHERE auction_id IN %s ' - 'AND state=%s AND obj_price>0', (tuple(ids), 'draft')) - nbr = cr.fetchone()[0] - ach_uids = {} - cr.execute('SELECT id FROM auction_lots ' - 'WHERE auction_id IN %s ' - 'AND state=%s AND obj_price>0', (tuple(ids), 'draft')) - r = lots_obj.lots_invoice(cr, uid, [x[0] for x in cr.fetchall()],{},None) - cr.execute('select id from auction_lots where auction_id IN %s and obj_price>0',(tuple(ids),)) - ids2 = [x[0] for x in cr.fetchall()] - # for auction in auction_ids: - c = lots_obj.seller_trans_create(cr, uid, ids2, {}) - self.write(cr, uid, ids, {'state':'closed'}) #close the auction + lots_ids = lots_obj.search(cr, uid, [('auction_id', 'in', ids), ('state', '=', 'draft'), ('obj_price', '>', 0)]) + new_buyer_invoice = lots_obj.lots_invoice(cr, uid, lots_ids, {}, None) + lots_ids2 = lots_obj.search(cr, uid, [('auction_id', 'in', ids), ('obj_price', '>', 0)]) + new_seller_invoice = lots_obj.seller_trans_create(cr, uid, lots_ids2, {}) + self.write(cr, uid, ids, {'state': 'closed'}) #close the auction return True + auction_dates() - #---------------------------------------------------------- # Deposits #---------------------------------------------------------- -def _inv_uniq(cr, ids): - cr.execute('SELECT id FROM auction_lots ' - 'WHERE auction_id IN %s ' - 'AND obj_price>0', (tuple(ids),)) - for datas in cr.fetchall(): - cr.execute('select count(*) from auction_deposit where name=%s', (datas[0],)) - if cr.fetchone()[0]>1: - return False - return True - class auction_deposit(osv.osv): + """Auction Deposit Border""" + _name = "auction.deposit" - _description="Deposit Border" + _description=__doc__ _order = "id desc" _columns = { - 'transfer' : fields.boolean('Transfer'), - 'name': fields.char('Depositer Inventory', size=64, required=True), - 'partner_id': fields.many2one('res.partner', 'Seller', required=True, change_default=True), - 'date_dep': fields.date('Deposit date', required=True), - 'method': fields.selection((('keep','Keep until sold'),('decease','Decrease limit of 10%'),('contact','Contact the Seller')), 'Withdrawned method', required=True), - 'tax_id': fields.many2one('account.tax', 'Expenses'), - 'create_uid': fields.many2one('res.users', 'Created by', readonly=True), - 'info': fields.char('Description', size=64), - 'lot_id': fields.one2many('auction.lots', 'bord_vnd_id', 'Objects'), - 'specific_cost_ids': fields.one2many('auction.deposit.cost', 'deposit_id', 'Specific Costs'), - 'total_neg': fields.boolean('Allow Negative Amount'), + 'transfer' : fields.boolean('Transfer'), + 'name': fields.char('Depositer Inventory', size=64, required=True), + 'partner_id': fields.many2one('res.partner', 'Seller', required=True, change_default=True), + 'date_dep': fields.date('Deposit date', required=True), + 'method': fields.selection((('keep', 'Keep until sold'), ('decease', 'Decrease limit of 10%'), ('contact', 'Contact the Seller')), 'Withdrawned method', required=True), + 'tax_id': fields.many2one('account.tax', 'Expenses'), + 'create_uid': fields.many2one('res.users', 'Created by', readonly=True), + 'info': fields.char('Description', size=64), + 'lot_id': fields.one2many('auction.lots', 'bord_vnd_id', 'Objects'), + 'specific_cost_ids': fields.one2many('auction.deposit.cost', 'deposit_id', 'Specific Costs'), + 'total_neg': fields.boolean('Allow Negative Amount'), } _defaults = { -# 'date_dep': lambda *a: time.strftime('%Y-%m-%d'), - 'method': lambda *a: 'keep', - 'total_neg': lambda *a: False, - 'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'auction.deposit'), + 'method': lambda *a: 'keep', + 'total_neg': lambda *a: False, + 'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'auction.deposit'), } - _constraints = [ - ] - def partner_id_change(self, cr, uid, ids, part): - return {} + auction_deposit() #---------------------------------------------------------- # (Specific) Deposit Costs #---------------------------------------------------------- class auction_deposit_cost(osv.osv): + + """Auction Deposit Cost""" + _name = 'auction.deposit.cost' + _description=__doc__ _columns = { - 'name': fields.char('Cost Name', required=True, size=64), - 'amount': fields.float('Amount'), - 'account': fields.many2one('account.account', 'Destination Account', required=True), - 'deposit_id': fields.many2one('auction.deposit', 'Deposit'), + 'name': fields.char('Cost Name', required=True, size=64), + 'amount': fields.float('Amount'), + 'account': fields.many2one('account.account', 'Destination Account', required=True), + 'deposit_id': fields.many2one('auction.deposit', 'Deposit'), } auction_deposit_cost() #---------------------------------------------------------- # Lots Categories #---------------------------------------------------------- +class aie_category(osv.osv): + + _name="aie.category" + _order = "name" + _columns={ + 'name': fields.char('Name', size=64, required=True), + 'code':fields.char('Code', size=64), + 'parent_id': fields.many2one('aie.category', 'Parent aie Category', ondelete='cascade'), + 'child_ids': fields.one2many('aie.category', 'parent_id', help="Childs aie category") + } + + def name_get(self, cr, uid, ids, context=None): + if not context: + context = {} + res = [] + if not ids: + return res + reads = self.read(cr, uid, ids, ['name', 'parent_id'], context) + for record in reads: + name = record['name'] + if record['parent_id']: + name = record['parent_id'][1] + ' / ' + name + res.append((record['id'], name)) + return res + +aie_category() + class auction_lot_category(osv.osv): + """Auction Lots Category""" + _name = 'auction.lot.category' + _description=__doc__ _columns = { - 'name': fields.char('Category Name', required=True, size=64), - 'priority': fields.float('Priority'), - 'active' : fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the auction lot category without removing it."), - 'aie_categ' : fields.selection([('41',"Unclassifieds"), - ('2',"Antiques"), - ('42',"Antique/African Arts"), - ('59',"Antique/Argenterie"), - ('45',"Antique/Art from the Ivory Coast"), - ('46',"Antique/Art from the Ivory Coast/African Arts"), - ('12',"Antique/Books, manuscripts, eso."), - ('11',"Antique/Carpet and textilles"), - ('14',"Antique/Cartoons"), - ('26',"Antique/Clocks and watches"), - ('31',"Antique/Collectible & art objects"), - ('33',"Antique/Engravings"), - ('10',"Antique/Furnitures"), - ('50',"Antique/Graphic Arts"), - ('37',"Antique/Jewelry"), - ('9',"Antique/Lightings"), - ('52',"Antique/Metal Ware"), - ('51',"Antique/Miniatures / Collections"), - ('53',"Antique/Musical Instruments"), - ('19',"Antique/Old weapons and militaria"), - ('43',"Antique/Oriental Arts"), - ('47',"Antique/Oriental Arts/Chineese furnitures"), - ('24',"Antique/Others"), - ('8',"Antique/Painting"), - ('25',"Antique/Porcelain, Ceramics, Glassmaking, ..."), - ('13',"Antique/Posters"), - ('56',"Antique/Religiosa"), - ('54',"Antique/Scientific Instruments"), - ('18',"Antique/Sculpture, bronze, eso."), - ('55',"Antique/Tin / Copper wares"), - ('16',"Antique/Toys"), - ('57',"Antique/Verreries"), - ('17',"Antique/Wine"), - ('1',"Contemporary Art"), - ('58',"Cont. Art/Arts"), - ('27',"Cont. Art/Curiosa"), - ('15',"Cont. Art/Jewelry"), - ('30',"Cont. Art/Other Media"), - ('3',"Cont. Art/Photo"), - ('4',"Cont. Art/Painting"), - ('5',"Cont. Art/Sculpture"), - ('48',"Cont. Art/Shows")], - 'Aie Category'), + 'name': fields.char('Category Name', required=True, size=64), + 'priority': fields.float('Priority'), + 'active' : fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the auction lot category without removing it."), + 'aie_categ': fields.many2one('aie.category', 'Category', ondelete='cascade'), } _defaults = { - 'active' : lambda *a: 1, - 'aie_categ' : lambda *a:1, + 'active' : lambda *a: 1, } auction_lot_category() -def _type_get(self, cr, uid,ids): - cr.execute('select name, name from auction_lot_category order by name') - return cr.fetchall() - #---------------------------------------------------------- # Lots #---------------------------------------------------------- -def _inv_constraint(cr, ids): - cr.execute('SELECT id, bord_vnd_id, lot_num FROM auction_lots ' - 'WHERE id IN %s', - (tuple(ids),)) - for datas in cr.fetchall(): - cr.execute('select count(*) from auction_lots where bord_vnd_id=%s and lot_num=%s', (datas[1],datas[2])) - if cr.fetchone()[0]>1: - return False - return True +def _type_get(self, cr, uid, context=None): + if not context: + context = {} + obj = self.pool.get('auction.lot.category') + ids = obj.search(cr, uid, []) + res = obj.read(cr, uid, ids, ['name'], context) + res = [(r['name'], r['name']) for r in res] + return res class auction_lots(osv.osv): + + """Auction Object""" _name = "auction.lots" _order = "obj_num,lot_num,id" - _description="Object" + _description=__doc__ - def button_not_bought(self,cr,uid,ids,*a): - return self.write(cr,uid,ids, {'state':'unsold'}) - def button_taken_away(self,cr,uid,ids,*a): - return self.write(cr,uid,ids, {'state':'taken_away'}) + def button_not_bought(self, cr, uid, ids, context=None): + if not context: + context={} + return self.write(cr, uid, ids, {'state':'unsold'}) + + def button_taken_away(self, cr, uid, ids, context=None): + if not context: + context={} + return self.write(cr, uid, ids, {'state':'taken_away', 'ach_emp': True}) - def button_unpaid(self,cr,uid,ids,*a): - return self.write(cr,uid,ids, {'state':'draft'}) + def button_unpaid(self, cr, uid, ids, context=None): + if not context: + context={} + return self.write(cr, uid, ids, {'state':'draft'}) - def button_draft(self,cr,uid,ids,*a): - return self.write(cr,uid,ids, {'state':'draft'}) + def button_bought(self, cr, uid, ids, context=None): + if not context: + context={} + return self.write(cr, uid, ids, {'state':'sold'}) - def button_bought(self,cr,uid,ids,*a): - return self.write(cr,uid,ids, {'state':'sold'}) - - def _buyerprice(self, cr, uid, ids, name, args, context): - res={} - lots=self.pool.get('auction.lots').browse(cr,uid,ids) - pt_tax=self.pool.get('account.tax') + def _getprice(self, cr, uid, ids, fields, args, context=None): + """This Function compute amount total with tax for buyer and seller. + @param ids: List of auction lots's id + @param name: List of function fields. + @param context: A standard dictionary for contextual values + @return: Dictionary of function fields value. + """ + if not context: + context = {} + + res = {} + account_analytic_line_obj = self.pool.get('account.analytic.line') + lots = self.browse(cr, uid, ids, context) + pt_tax = self.pool.get('account.tax') for lot in lots: - amount_total=0.0 - # if ((lot.obj_price==0) and (lot.state=='draft')): - # montant=lot.lot_est1 - # else: - montant=lot.obj_price or 0.0 - taxes = [] - if lot.author_right: - taxes.append(lot.author_right) - if lot.auction_id: - taxes += lot.auction_id.buyer_costs - tax=pt_tax.compute(cr,uid,taxes,montant,1) - for t in tax: - amount_total+=t['amount'] - amount_total += montant - res[lot.id] = amount_total - return res - - - def _sellerprice(self, cr, uid, ids,*a): - res={} - lots=self.pool.get('auction.lots').browse(cr,uid,ids) - pt_tax=self.pool.get('account.tax') - for lot in lots: - amount_total=0.0 - # if ((lot.obj_price==0) and (lot.state=='draft')): - # montant=lot.lot_est1 - # else: - montant=lot.obj_price - taxes = [] - if lot.bord_vnd_id.tax_id: - taxes.append(lot.bord_vnd_id.tax_id) - elif lot.auction_id and lot.auction_id.seller_costs: - taxes += lot.auction_id.seller_costs - tax=pt_tax.compute(cr,uid,taxes,montant,1) - for t in tax: - amount_total+=t['amount'] - res[lot.id] = montant+amount_total - return res - - def _grossprice(self, cr, uid, ids, name, args, context): - """gross revenue""" - res={} - auction_lots_obj = self.read(cr,uid,ids,['seller_price','buyer_price','auction_id']) - for auction_data in auction_lots_obj: total_tax = 0.0 - if auction_data['auction_id']: - total_tax += auction_data['buyer_price']-auction_data['seller_price'] - res[auction_data['id']] = total_tax + taxes = [] + for name in fields: + res[lot.id] = {name: False} + amount = lot.obj_price or 0.0 + result = 0.0 + if name == "buyer_price": + if lot.author_right: + taxes.append(lot.author_right) + if lot.auction_id: + taxes += lot.auction_id.buyer_costs + tax = pt_tax.compute_all(cr, uid, taxes, amount, 1)['taxes'] + for t in tax: + result += t['amount'] + result += amount + elif name == "seller_price": + if lot.bord_vnd_id.tax_id: + taxes.append(lot.bord_vnd_id.tax_id) + elif lot.auction_id and lot.auction_id.seller_costs: + taxes += lot.auction_id.seller_costs + tax = pt_tax.compute_all(cr, uid, taxes, amount, 1)['taxes'] + for t in tax: + result += t['amount'] + result += amount + elif name == "gross_revenue": + if lot.auction_id: + result = lot.buyer_price - lot.seller_price + elif name == "net_revenue": + if lot.auction_id: + result = lot.buyer_price - lot.seller_price - lot.costs + + elif name == "net_margin": + if ((lot.obj_price==0) and (lot.state=='draft')): + amount = lot.lot_est1 + else: + amount = lot.obj_price + if amount > 0: + result = (lot.net_revenue * 100) / amount + elif name == "costs": + # costs: Total credit of analytic account + # objects sold during this auction (excluding analytic lines that are in the analytic journal of the auction date) + som = 0.0 + if lot.auction_id: + auct_id = lot.auction_id.id + lot_count = self.search(cr, uid, [('auction_id', '=', auct_id)], count=True) + line_ids = account_analytic_line_obj.search(cr, uid, [ + ('account_id', '=', lot.auction_id.account_analytic_id.id), + ('journal_id', '<>', lot.auction_id.journal_id.id), + ('journal_id', '<>', lot.auction_id.journal_seller_id.id)]) + indir_cost = lot.bord_vnd_id.specific_cost_ids + for r in lot.bord_vnd_id.specific_cost_ids: + som += r.amount + for line in account_analytic_line_obj.browse(cr, uid, line_ids, context=context): + if line.amount: + som -= line.amount + result = som/lot_count + + elif name=="paid_ach": + result = False + if lot.ach_inv_id and lot.ach_inv_id.state == 'paid': + result = True + + elif name=="paid_vnd": + result = False + if lot.sel_inv_id and lot.sel_inv_id.state == 'paid': + result = True + + res[lot.id][name] = result + + return res - - def _grossmargin(self, cr, uid, ids, name, args, context): - """ - gross Margin : Gross revenue * 100 / Adjudication - (state==unsold or obj_ret_price>0): adj_price = 0 (=> gross margin = 0, net margin is negative) - """ - res={} - for lot in self.browse(cr, uid, ids, context): - if ((lot.obj_price==0) and (lot.state=='draft')): - montant=lot.lot_est1 - else: - montant=lot.obj_price - if lot.obj_price>0: - total=(lot.gross_revenue*100.0) /lot.obj_price - else: - total = 0.0 - res[lot.id]=round(total,2) - return res - - def onchange_obj_ret(self, cr, uid, ids, obj_ret, *args): + def onchange_obj_ret(self, cr, uid, ids, obj_ret, context=None): + if not context: + context={} if obj_ret: return {'value': {'obj_price': 0}} return {} - def _costs(self,cr,uid,ids,context,*a): - """ - costs: Total credit of analytic account - / # objects sold during this auction - (excluding analytic lines that are in the analytic journal of the auction date). - """ - res={} - for lot in self.browse(cr,uid,ids): - som=0.0 - if not lot.auction_id: - res[lot.id] = 0.0 - continue - auct_id=lot.auction_id.id - cr.execute('select count(*) from auction_lots where auction_id=%s', (auct_id,)) - nb = cr.fetchone()[0] - account_analytic_line_obj = self.pool.get('account.analytic.line') - line_ids = account_analytic_line_obj.search(cr, uid, [('account_id', '=', lot.auction_id.account_analytic_id.id),('journal_id', '<>', lot.auction_id.journal_id.id),('journal_id', '<>', lot.auction_id.journal_seller_id.id)]) - #indir_cost=lot.bord_vnd_id.specific_cost_ids - #for r in lot.bord_vnd_id.specific_cost_ids: - # som+=r.amount - - for line in account_analytic_line_obj.browse(cr,uid,line_ids): - if line.amount: - som-=line.amount - res[lot.id]=som/nb - return res - - def _netprice(self, cr, uid, ids, name, args, context): - """This is the net revenue""" - res={} - auction_lots_obj = self.read(cr,uid,ids,['seller_price','buyer_price','auction_id','costs']) - for auction_data in auction_lots_obj: - total_tax = 0.0 - if auction_data['auction_id']: - total_tax += auction_data['buyer_price']-auction_data['seller_price']-auction_data['costs'] - res[auction_data['id']] = total_tax - return res - - def _netmargin(self, cr, uid, ids, name, args, context): - res={} - total_tax = 0.0 - total=0.0 - montant=0.0 - auction_lots_obj = self.read(cr,uid,ids,['net_revenue','auction_id','lot_est1','obj_price','state']) - for auction_data in auction_lots_obj: - if ((auction_data ['obj_price']==0) and (auction_data['state']=='draft')): - montant=auction_data['lot_est1'] - else: montant=auction_data ['obj_price'] - if montant>0: - total_tax += (auction_data['net_revenue']*100)/montant - else: - total_tax=0 - res[auction_data['id']] = total_tax - return res - - def _is_paid_vnd(self,cr,uid,ids,*a): - res = {} - lots=self.browse(cr,uid,ids) - for lot in lots: - res[lot.id] = False - if lot.sel_inv_id: - if lot.sel_inv_id.state == 'paid': - res[lot.id] = True - return res - def _is_paid_ach(self,cr,uid,ids,*a): - res = {} - lots=self.browse(cr,uid,ids) - for lot in lots: - res[lot.id] = False - if lot.ach_inv_id: - if lot.ach_inv_id.state == 'paid': - res[lot.id] = True - return res _columns = { - 'bid_lines':fields.one2many('auction.bid_line','lot_id', 'Bids'), - 'auction_id': fields.many2one('auction.dates', 'Auction Date', select=1), - 'bord_vnd_id': fields.many2one('auction.deposit', 'Depositer Inventory', required=True), - 'name': fields.char('Short Description',size=64, required=True), - 'name2': fields.char('Short Description (2)',size=64), - 'lot_type': fields.selection(_type_get, 'Object category', size=64), - 'author_right': fields.many2one('account.tax', 'Author rights'), - 'lot_est1': fields.float('Minimum Estimation'), - 'lot_est2': fields.float('Maximum Estimation'), - 'lot_num': fields.integer('List Number', required=True, select=1 ), - 'create_uid': fields.many2one('res.users', 'Created by', readonly=True), - 'history_ids':fields.one2many('auction.lot.history', 'lot_id', 'Auction history'), - 'lot_local':fields.char('Location',size=64), - 'artist_id':fields.many2one('auction.artists', 'Artist/Author'), - 'artist2_id':fields.many2one('auction.artists', 'Artist/Author 2'), - 'important':fields.boolean('To be Emphatized'), - 'product_id':fields.many2one('product.product', 'Product', required=True), - 'obj_desc': fields.text('Object Description'), - 'obj_num': fields.integer('Catalog Number'), - 'obj_ret': fields.float('Price retired'), - 'obj_comm': fields.boolean('Commission'), - 'obj_price': fields.float('Adjudication price'), - 'ach_avance': fields.float('Buyer Advance'), - 'ach_login': fields.char('Buyer Username',size=64), - 'ach_uid': fields.many2one('res.partner', 'Buyer'), - 'ach_emp': fields.boolean('Taken Away'), - 'is_ok': fields.boolean('Buyer\'s payment'), - 'ach_inv_id': fields.many2one('account.invoice','Buyer Invoice', readonly=True, states={'draft':[('readonly',False)]}), - 'sel_inv_id': fields.many2one('account.invoice','Seller Invoice', readonly=True, states={'draft':[('readonly',False)]}), - 'vnd_lim': fields.float('Seller limit'), - 'vnd_lim_net': fields.boolean('Net limit ?',readonly=True), - 'image': fields.binary('Image'), -# 'paid_vnd':fields.function(_is_paid_vnd,string='Seller Paid',method=True,type='boolean',store=True), - 'paid_vnd':fields.boolean('Seller Paid'), - 'paid_ach':fields.function(_is_paid_ach,string='Buyer invoice reconciled',method=True, type='boolean',store=True), + 'bid_lines':fields.one2many('auction.bid_line', 'lot_id', 'Bids'), + 'auction_id': fields.many2one('auction.dates', 'Auction Date', select=1), + 'bord_vnd_id': fields.many2one('auction.deposit', 'Depositer Inventory', required=True), + 'name': fields.char('Short Description', size=64, required=True), + 'name2': fields.char('Short Description (2)', size=64), + 'lot_type': fields.selection(_type_get, 'Object category', size=64), + 'author_right': fields.many2one('account.tax', 'Author rights'), + 'lot_est1': fields.float('Minimum Estimation'), + 'lot_est2': fields.float('Maximum Estimation'), + 'lot_num': fields.integer('List Number', required=True, select=1), + 'create_uid': fields.many2one('res.users', 'Created by', readonly=True), + 'history_ids':fields.one2many('auction.lot.history', 'lot_id', 'Auction history'), + 'lot_local':fields.char('Location', size=64), + 'artist_id':fields.many2one('auction.artists', 'Artist/Author'), + 'artist2_id':fields.many2one('auction.artists', 'Artist/Author 2'), + 'important':fields.boolean('To be Emphatized'), + 'product_id':fields.many2one('product.product', 'Product', required=True), + 'obj_desc': fields.text('Object Description'), + 'obj_num': fields.integer('Catalog Number'), + 'obj_ret': fields.float('Price retired'), + 'obj_comm': fields.boolean('Commission'), + 'obj_price': fields.float('Adjudication price'), + 'ach_avance': fields.float('Buyer Advance'), + 'ach_login': fields.char('Buyer Username', size=64), + 'ach_uid': fields.many2one('res.partner', 'Buyer'), + 'ach_emp': fields.boolean('Taken Away', readonly=True), + 'is_ok': fields.boolean('Buyer\'s payment'), + 'ach_inv_id': fields.many2one('account.invoice', 'Buyer Invoice', readonly=True, states={'draft':[('readonly', False)]}), + 'sel_inv_id': fields.many2one('account.invoice', 'Seller Invoice', readonly=True, states={'draft':[('readonly', False)]}), + 'vnd_lim': fields.float('Seller limit'), + 'vnd_lim_net': fields.boolean('Net limit ?', readonly=True), + 'image': fields.binary('Image'), + 'paid_vnd':fields.function(_getprice, string='Seller Paid', method=True, type='boolean', store=True, multi="paid_vnd"), + 'paid_ach':fields.function(_getprice, string='Buyer invoice reconciled', method=True, type='boolean', store=True, multi="paid_ach"), 'state': fields.selection(( - ('draft','Draft'), - ('unsold','Unsold'), - ('paid','Paid'), - ('sold','Sold'), - ('taken_away','Taken away')),'State', required=True, readonly=True, + ('draft', 'Draft'), + ('unsold', 'Unsold'), + ('paid', 'Paid'), + ('sold', 'Sold'), + ('taken_away', 'Taken away')), 'State', required=True, readonly=True, help=' * The \'Draft\' state is used when a object is encoding as a new object. \ \n* The \'Unsold\' state is used when object does not sold for long time, user can also set it as draft state after unsold. \ \n* The \'Paid\' state is used when user pay for the object \ - \n* The \'Sold\' state is used when user buy the object.'), - 'buyer_price': fields.function(_buyerprice, method=True, string='Buyer price',store=True), - 'seller_price': fields.function(_sellerprice, method=True, string='Seller price',store=True), - 'gross_revenue':fields.function(_grossprice, method=True, string='Gross revenue',store=True), - 'gross_margin':fields.function(_grossmargin, method=True, string='Gross Margin (%)',store=True), - 'costs':fields.function(_costs,method=True,string='Indirect costs',store=True), - 'statement_id': fields.many2many('account.bank.statement.line', 'auction_statement_line_rel','auction_id', 'statement','Payment'), - 'net_revenue':fields.function(_netprice, method=True, string='Net revenue',store=True), - 'net_margin':fields.function(_netmargin, method=True, string='Net Margin (%)',store=True), + \n* The \'Sold\' state is used when user buy the object.'), + 'buyer_price': fields.function(_getprice, method=True, string='Buyer price', store=True, multi="buyer_price"), + 'seller_price': fields.function(_getprice, method=True, string='Seller price', store=True, multi="seller_price"), + 'gross_revenue':fields.function(_getprice, method=True, string='Gross revenue', store=True, multi="gross_revenue"), + 'gross_margin':fields.function(_getprice, method=True, string='Gross Margin (%)', store=True, multi="gross_margin"), + 'costs':fields.function(_getprice, method=True, string='Indirect costs', store=True, multi="costs"), + 'statement_id': fields.many2many('account.bank.statement.line', 'auction_statement_line_rel', 'auction_id', 'statement', 'Payment'), + 'net_revenue':fields.function(_getprice, method=True, string='Net revenue', store=True, multi="net_revenue"), + 'net_margin':fields.function(_getprice, method=True, string='Net Margin (%)', store=True, multi="net_margin"), } _defaults = { - 'state':lambda *a: 'draft', - 'lot_num':lambda *a:1, - 'is_ok': lambda *a: False + 'state':lambda *a: 'draft', + 'lot_num':lambda *a:1, + 'is_ok': lambda *a: False, } - _constraints = [ -# (_inv_constraint, 'Twice the same inventory number !', ['lot_num','bord_vnd_id']) - ] - - - def name_get(self, cr, user, ids, context={}): - if not len(ids): + + def name_get(self, cr, user, ids, context=None): + if not context: + context={} + if not ids: return [] - result = [ (r['id'], str(r['obj_num'])+' - '+r['name']) for r in self.read(cr, user, ids, ['name','obj_num'])] + result = [ (r['id'], str(r['obj_num'])+' - '+r['name']) for r in self.read(cr, user, ids, ['name', 'obj_num'])] return result - def name_search(self, cr, user, name, args=None, operator='ilike', context={}): - if not len(args): + def name_search(self, cr, user, name, args=None, operator='ilike', context=None): + if not context: + context={} + if not args: args = [] ids = [] if name: - ids = self.search(cr, user, [('obj_num','=',int(name))] + args) + ids = self.search(cr, user, [('obj_num', '=', int(name))] + args) if not ids: - ids = self.search(cr, user, [('name',operator,name)] + args) + ids = self.search(cr, user, [('name', operator, name)] + args) return self.name_get(cr, user, ids) def _sum_taxes_by_type_and_id(self, taxes): @@ -518,7 +439,7 @@ class auction_lots(osv.osv): def compute_buyer_costs(self, cr, uid, ids): amount_total = {} lots = self.browse(cr, uid, ids) -##CHECKME: est-ce que ca vaudrait la peine de faire des groupes de lots qui ont les memes couts pour passer des listes de lots a compute? + ##CHECKME: Is that AC would be worthwhile to make groups of lots that have the same costs to spend a lot of lists compute? taxes = [] amount=0.0 pt_tax = self.pool.get('account.tax') @@ -528,39 +449,27 @@ class auction_lots(osv.osv): taxes.append(lot.author_right) elif lot.auction_id: taxes += lot.auction_id.buyer_costs - tax=pt_tax.compute(cr,uid,taxes,lot.obj_price,1) + tax=pt_tax.compute_all(cr, uid, taxes, lot.obj_price, 1)['taxes'] for t in tax: amount+=t['amount'] - #amount+=lot.obj_price*0.2 - #amount+=lot.obj_price amount_total['value']= amount amount_total['amount']= amount + return amount_total - -# for t in taxes_res: -# t.update({'type': 0}) -# return self._sum_taxes_by_type_and_id(taxes_res) - -# lots=self.browse(cr,uid,ids) -# amount=0.0 -# for lot in lots: -# taxes=lot.product_id.taxe_id - - def _compute_lot_seller_costs(self, cr, uid, lot, manual_only=False): costs = [] tax_cost_ids=[] -# tax_cost_ids = [i.id for i in lot.auction_id.seller_costs] - # if there is a specific deposit cost for this depositer, add it + border_id = lot.bord_vnd_id if border_id: if border_id.tax_id: tax_cost_ids.append(border_id.tax_id) elif lot.auction_id and lot.auction_id.seller_costs: tax_cost_ids += lot.auction_id.seller_costs - tax_costs = self.pool.get('account.tax').compute(cr, uid, tax_cost_ids, lot.obj_price, 1) + + tax_costs = self.pool.get('account.tax').compute_all(cr, uid, tax_cost_ids, lot.obj_price, 1)['taxes'] # delete useless keys from the costs computed by the tax object... this is useless but cleaner... for cost in tax_costs: del cost['account_paid_id'] @@ -572,16 +481,16 @@ class auction_lots(osv.osv): c.update({'type': 0}) ###### if lot.vnd_lim_net<0 and lot.obj_price>0: -#FIXME: la string 'remise lot' devrait passer par le systeme de traductions + #FIXME:the string passes have lot 'should go through the system translations. obj_price_wh_costs = reduce(lambda x, y: x + y['amount'], tax_costs, lot.obj_price) if obj_price_wh_costs < lot.vnd_lim: - costs.append({ 'type': 1, - 'id': lot.obj_num, - 'name': 'Remise lot '+ str(lot.obj_num), + costs.append({ 'type': 1, + 'id': lot.obj_num, + 'name': 'Remise lot '+ str(lot.obj_num), 'amount': lot.vnd_lim - obj_price_wh_costs} - #'account_id': lot.auction_id.acc_refund.id ) return costs + def compute_seller_costs(self, cr, uid, ids, manual_only=False): lots = self.browse(cr, uid, ids) costs = [] @@ -613,27 +522,30 @@ class auction_lots(osv.osv): total_cost += c['amount'] costs.extend(bord_costs) if (total_adj+total_cost)<0: -#FIXME: translate tax name + #FIXME: translate tax name new_id = bord and bord.id or 0 - c = {'type':3, 'id':new_id, 'amount':-total_cost-total_adj, 'name':'Ristourne'}#, 'account_id':lots[0].auction_id.acc_refund.id} + c = {'type':3, 'id':new_id, 'amount':-total_cost-total_adj, 'name':'Ristourne'} costs.append(c) return self._sum_taxes_by_type_and_id(costs) # sum remise limite net and ristourne def compute_seller_costs_summed(self, cr, uid, ids): #ach_pay_id + + """This Fuction sum Net remittance limit and refund""" + taxes = self.compute_seller_costs(cr, uid, ids) taxes_summed = {} for tax in taxes: if tax['type'] == 1: tax['id'] = 0 - #FIXME: translate tax names - tax['name'] = 'Remise limite nette' + #FIXME: translate tax names + tax['name'] = 'Discount sharp boundary' elif tax['type'] == 2: tax['id'] = 0 - tax['name'] = 'Frais divers' + tax['name'] = 'Miscellaneous expenditure' elif tax['type'] == 3: tax['id'] = 0 - tax['name'] = 'Rist.' + tax['name'] = 'Cross.' key = (tax['type'], tax['id']) if key in taxes_summed: taxes_summed[key]['amount'] += tax['amount'] @@ -641,14 +553,16 @@ class auction_lots(osv.osv): taxes_summed[key] = tax return taxes_summed.values() - def buyer_proforma(self,cr,uid,ids,context): + def buyer_proforma(self, cr, uid, ids, context=None): + + if not context: + context={} invoices = {} inv_ref = self.pool.get('account.invoice') - partner_r = self.pool.get('res.partner') + res_obj = self.pool.get('res.partner') inv_line_obj = self.pool.get('account.invoice.line') wf_service = netsvc.LocalService('workflow') -# acc_receiv=self.pool.get('account.account').search([cr,uid,[('code','=','4010')]]) - for lot in self.browse(cr,uid,ids,context): + for lot in self.browse(cr, uid, ids, context): if not lot.obj_price>0: continue if not lot.ach_uid.id: @@ -656,23 +570,23 @@ class auction_lots(osv.osv): else: partner_ref =lot.ach_uid.id lot_name = lot.obj_num - res = partner_r.address_get(cr, uid, [partner_ref], ['contact', 'invoice']) + res = res_obj.address_get(cr, uid, [partner_ref], ['contact', 'invoice']) contact_addr_id = res['contact'] invoice_addr_id = res['invoice'] if not invoice_addr_id: raise orm.except_orm(_('No Invoice Address'), _('The Buyer "%s" has no Invoice Address.') % (contact_addr_id,)) inv = { - 'name': 'Auction proforma:' +lot.name, - 'journal_id': lot.auction_id.journal_id.id, - 'partner_id': partner_ref, - 'type': 'out_invoice', + 'name': 'Auction proforma:' +lot.name, + 'journal_id': lot.auction_id.journal_id.id, + 'partner_id': partner_ref, + 'type': 'out_invoice', # 'state':'proforma', } - inv.update(inv_ref.onchange_partner_id(cr,uid, [], 'out_invoice', partner_ref)['value']) + inv.update(inv_ref.onchange_partner_id(cr, uid, [], 'out_invoice', partner_ref)['value']) inv['account_id'] = inv['account_id'] and inv['account_id'][0] inv_id = inv_ref.create(cr, uid, inv, context) invoices[partner_ref] = inv_id - self.write(cr,uid,[lot.id],{'ach_inv_id':inv_id,'state':'sold'}) + self.write(cr, uid, [lot.id], {'ach_inv_id':inv_id, 'state':'sold'}) #calcul des taxes taxes = map(lambda x: x.id, lot.product_id.taxes_id) @@ -681,37 +595,35 @@ class auction_lots(osv.osv): taxes.append(lot.author_right.id) inv_line= { - 'invoice_id': inv_id, - 'quantity': 1, - 'product_id': lot.product_id.id, - 'name': 'proforma'+'['+str(lot.obj_num)+'] '+ lot.name, - 'invoice_line_tax_id': [(6,0,taxes)], - 'account_analytic_id': lot.auction_id.account_analytic_id.id, - 'account_id': lot.auction_id.acc_income.id, - 'price_unit': lot.obj_price, + 'invoice_id': inv_id, + 'quantity': 1, + 'product_id': lot.product_id.id, + 'name': 'proforma'+'['+str(lot.obj_num)+'] '+ lot.name, + 'invoice_line_tax_id': [(6, 0, taxes)], + 'account_analytic_id': lot.auction_id.account_analytic_id.id, + 'account_id': lot.auction_id.acc_income.id, + 'price_unit': lot.obj_price, } - inv_line_obj.create(cr, uid, inv_line,context) - # inv_ref.button_compute(cr, uid, [inv_id]) - # wf_service = netsvc.LocalService('workflow') - # wf_service.trg_validate(uid, 'account.invoice', inv_id, 'invoice_open', cr) + inv_line_obj.create(cr, uid, inv_line, context) inv_ref.button_compute(cr, uid, invoice.values()) wf_service.trg_validate(uid, 'account.invoice', inv_id, 'invoice_proforma2', cr) return invoices.values() - # creates the transactions between the auction company and the seller # this is done by creating a new in_invoice for each - def seller_trans_create(self,cr, uid,ids,context): + def seller_trans_create(self, cr, uid, ids, context=None): """ Create a seller invoice for each bord_vnd_id, for selected ids. """ # use each list of object in turn invoices = {} + if not context: + context={} inv_ref=self.pool.get('account.invoice') partner_obj = self.pool.get('res.partner') inv_line_obj = self.pool.get('account.invoice.line') wf_service = netsvc.LocalService('workflow') - for lot in self.browse(cr,uid,ids,context): + for lot in self.browse(cr, uid, ids, context): partner_id = lot.bord_vnd_id.partner_id.id if not lot.auction_id.id: continue @@ -723,17 +635,16 @@ class auction_lots(osv.osv): contact_addr_id = res['contact'] invoice_addr_id = res['invoice'] inv = { - 'name': 'Auction:' +lot.name, - 'journal_id': lot.auction_id.journal_seller_id.id, - 'partner_id': lot.bord_vnd_id.partner_id.id, - 'type': 'in_invoice', + 'name': 'Auction:' +lot.name, + 'journal_id': lot.auction_id.journal_seller_id.id, + 'partner_id': lot.bord_vnd_id.partner_id.id, + 'type': 'in_invoice', } - inv.update(inv_ref.onchange_partner_id(cr,uid, [], 'in_invoice', lot.bord_vnd_id.partner_id.id)['value']) - # inv['account_id'] = inv['account_id'] and inv['account_id'][0] + inv.update(inv_ref.onchange_partner_id(cr, uid, [], 'in_invoice', lot.bord_vnd_id.partner_id.id)['value']) inv_id = inv_ref.create(cr, uid, inv, context) invoices[lot.bord_vnd_id.id] = inv_id - self.write(cr,uid,[lot.id],{'sel_inv_id':inv_id,'state':'sold'}) + self.write(cr, uid, [lot.id], {'sel_inv_id':inv_id, 'state':'sold'}) taxes = map(lambda x: x.id, lot.product_id.taxes_id) if lot.bord_vnd_id.tax_id: @@ -742,16 +653,16 @@ class auction_lots(osv.osv): taxes += map(lambda x: x.id, lot.auction_id.seller_costs) inv_line= { - 'invoice_id': inv_id, - 'quantity': 1, - 'product_id': lot.product_id.id, - 'name': '['+str(lot.obj_num)+'] '+lot.auction_id.name, - 'invoice_line_tax_id': [(6,0,taxes)], - 'account_analytic_id': lot.auction_id.account_analytic_id.id, - 'account_id': lot.auction_id.acc_expense.id, - 'price_unit': lot.obj_price, + 'invoice_id': inv_id, + 'quantity': 1, + 'product_id': lot.product_id.id, + 'name': '['+str(lot.obj_num)+'] '+lot.auction_id.name, + 'invoice_line_tax_id': [(6, 0, taxes)], + 'account_analytic_id': lot.auction_id.account_analytic_id.id, + 'account_id': lot.auction_id.acc_expense.id, + 'price_unit': lot.obj_price, } - inv_line_obj.create(cr, uid, inv_line,context) + inv_line_obj.create(cr, uid, inv_line, context) inv_ref.button_compute(cr, uid, invoices.values()) for inv in inv_ref.browse(cr, uid, invoices.values(), context): inv_ref.write(cr, uid, [inv.id], { @@ -760,7 +671,7 @@ class auction_lots(osv.osv): wf_service.trg_validate(uid, 'account.invoice', inv.id, 'invoice_open', cr) return invoices.values() - def lots_invoice(self, cr, uid, ids, context,invoice_number=False): + def lots_invoice(self, cr, uid, ids, context, invoice_number=False): """(buyer invoice Create an invoice for selected lots (IDS) to BUYER_ID. Set created invoice to the ACTION state. @@ -773,38 +684,36 @@ class auction_lots(osv.osv): """ dt = time.strftime('%Y-%m-%d') inv_ref = self.pool.get('account.invoice') - partner_r = self.pool.get('res.partner') + res_obj = self.pool.get('res.partner') inv_line_obj = self.pool.get('account.invoice.line') wf_service = netsvc.LocalService('workflow') invoices={} - for lot in self.browse(cr, uid, ids,context): - # partner_ref = lot.ach_uid.id + for lot in self.browse(cr, uid, ids, context): if not lot.auction_id.id: continue if not lot.ach_uid.id: raise orm.except_orm(_('Missed buyer !'), _('The object "%s" has no buyer assigned.') % (lot.name,)) - if (lot.auction_id.id,lot.ach_uid.id) in invoices: - inv_id = invoices[(lot.auction_id.id,lot.ach_uid.id)] + if (lot.auction_id.id, lot.ach_uid.id) in invoices: + inv_id = invoices[(lot.auction_id.id, lot.ach_uid.id)] else: - add = partner_r.read(cr, uid, [lot.ach_uid.id], ['address'])[0]['address'] + add = res_obj.read(cr, uid, [lot.ach_uid.id], ['address'])[0]['address'] if not len(add): raise orm.except_orm(_('Missed Address !'), _('The Buyer has no Invoice Address.')) price = lot.obj_price or 0.0 lot_name =lot.obj_num inv = { - 'name':lot.auction_id.name or '', - 'reference': lot.ach_login, - 'journal_id': lot.auction_id.journal_id.id, - 'partner_id': lot.ach_uid.id, - 'type': 'out_invoice', + 'name':lot.auction_id.name or '', + 'reference': lot.ach_login, + 'journal_id': lot.auction_id.journal_id.id, + 'partner_id': lot.ach_uid.id, + 'type': 'out_invoice', } if invoice_number: inv['number'] = invoice_number - inv.update(inv_ref.onchange_partner_id(cr,uid, [], 'out_invoice', lot.ach_uid.id)['value']) - #inv['account_id'] = inv['account_id'] and inv['account_id'][0] + inv.update(inv_ref.onchange_partner_id(cr, uid, [], 'out_invoice', lot.ach_uid.id)['value']) inv_id = inv_ref.create(cr, uid, inv, context) - invoices[(lot.auction_id.id,lot.ach_uid.id)] = inv_id - self.write(cr,uid,[lot.id],{'ach_inv_id':inv_id,'state':'sold'}) + invoices[(lot.auction_id.id, lot.ach_uid.id)] = inv_id + self.write(cr, uid, [lot.id], {'ach_inv_id':inv_id, 'state':'sold'}) #calcul des taxes taxes = map(lambda x: x.id, lot.product_id.taxes_id) taxes+=map(lambda x:x.id, lot.auction_id.buyer_costs) @@ -812,57 +721,43 @@ class auction_lots(osv.osv): taxes.append(lot.author_right.id) inv_line= { - 'invoice_id': inv_id, - 'quantity': 1, - 'product_id': lot.product_id.id, - 'name': '['+str(lot.obj_num)+'] '+ lot.name, - 'invoice_line_tax_id': [(6,0,taxes)], - 'account_analytic_id': lot.auction_id.account_analytic_id.id, - 'account_id': lot.auction_id.acc_income.id, - 'price_unit': lot.obj_price, + 'invoice_id': inv_id, + 'quantity': 1, + 'product_id': lot.product_id.id, + 'name': '['+str(lot.obj_num)+'] '+ lot.name, + 'invoice_line_tax_id': [(6, 0, taxes)], + 'account_analytic_id': lot.auction_id.account_analytic_id.id, + 'account_id': lot.auction_id.acc_income.id, + 'price_unit': lot.obj_price, } - inv_line_obj.create(cr, uid, inv_line,context) - # inv_ref.button_compute(cr, uid, [inpq tu dis cav_id]) - # inv_ref.button_compute(cr, uid, [inv_id]) + inv_line_obj.create(cr, uid, inv_line, context) inv_ref.button_compute(cr, uid, [inv_id]) for l in inv_ref.browse(cr, uid, invoices.values(), context): - # wf_service.trg_validate(uid, 'account.invoice',l.id, 'invoice_proforma', cr) - wf_service.trg_validate(uid, 'account.invoice',l.id, 'invoice_open', cr) + wf_service.trg_validate(uid, 'account.invoice', l.id, 'invoice_open', cr) return invoices.values() - - def numerotate(self, cr, uid, ids): - cr.execute('select auction_id from auction_lots where id=%s', (ids[0],)) - auc_id = cr.fetchone()[0] - cr.execute('select max(obj_num) from auction_lots where auction_id=%s', (auc_id,)) - try: - max = cr.fetchone()[0] - except: - max = 0 - for id in ids: - max+=1 - cr.execute('update auction_lots set obj_num=%s where id=%s', (max, id)) - return [] - auction_lots() #---------------------------------------------------------- # Auction Bids #---------------------------------------------------------- class auction_bid(osv.osv): + """Bid Auctions""" + _name = "auction.bid" - _description="Bid auctions" + _description=__doc__ _order = 'id desc' _columns = { - 'partner_id': fields.many2one('res.partner', 'Buyer Name', required=True), - 'contact_tel':fields.char('Contact',size=64), - 'name': fields.char('Bid ID', size=64,required=True), - 'auction_id': fields.many2one('auction.dates', 'Auction Date', required=True), - 'bid_lines': fields.one2many('auction.bid_line', 'bid_id', 'Bid'), + 'partner_id': fields.many2one('res.partner', 'Buyer Name', required=True), + 'contact_tel':fields.char('Contact', size=64), + 'name': fields.char('Bid ID', size=64, required=True), + 'auction_id': fields.many2one('auction.dates', 'Auction Date', required=True), + 'bid_lines': fields.one2many('auction.bid_line', 'bid_id', 'Bid'), } _defaults = { - 'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'auction.bid'), + 'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'auction.bid'), } + def onchange_contact(self, cr, uid, ids, partner_id): if not partner_id: return {'value': {'contact_tel':False}} @@ -876,13 +771,15 @@ class auction_bid(osv.osv): auction_bid() class auction_lot_history(osv.osv): + """Lot History""" + _name = "auction.lot.history" - _description="Lot history" + _description=__doc__ _columns = { - 'name': fields.date('Date',size=64), - 'lot_id': fields.many2one('auction.lots','Object', required=True, ondelete='cascade'), - 'auction_id': fields.many2one('auction.dates', 'Auction date', required=True, ondelete='cascade'), - 'price': fields.float('Withdrawn price', digits=(16,2)) + 'name': fields.date('Date', size=64), + 'lot_id': fields.many2one('auction.lots', 'Object', required=True, ondelete='cascade'), + 'auction_id': fields.many2one('auction.dates', 'Auction date', required=True, ondelete='cascade'), + 'price': fields.float('Withdrawn price', digits=(16, 2)) } _defaults = { 'name': lambda *args: time.strftime('%Y-%m-%d') @@ -893,18 +790,12 @@ class auction_bid_lines(osv.osv): _name = "auction.bid_line" _description="Bid" -# def get_nom(self,cr,uid,ids,*a): -# res = {} -# lots=self.browse(cr,uid,ids) -# for lot in lots: -# res[lot.id] = lot.lot_id.auction_id.name -# return res _columns = { - 'name': fields.char('Bid date',size=64), - 'bid_id': fields.many2one('auction.bid','Bid ID', required=True, ondelete='cascade'), - 'lot_id': fields.many2one('auction.lots','Object', required=True, ondelete='cascade'), - 'call': fields.boolean('To be Called'), - 'price': fields.float('Maximum Price'), + 'name': fields.char('Bid date', size=64), + 'bid_id': fields.many2one('auction.bid', 'Bid ID', required=True, ondelete='cascade'), + 'lot_id': fields.many2one('auction.lots', 'Object', required=True, ondelete='cascade'), + 'call': fields.boolean('To be Called'), + 'price': fields.float('Maximum Price'), 'auction': fields.char(string='Auction Name', size=64) } _defaults = { @@ -921,516 +812,4 @@ class auction_bid_lines(osv.osv): auction_bid_lines() -class report_buyer_auction(osv.osv): - _name = "report.buyer.auction" - _description = "Auction Reporting on buyer view" - _auto = False - _columns = { - 'buyer_login': fields.char('Buyer Login',size=64, readonly=True, select=1), - 'buyer':fields.many2one('res.partner', 'Buyer', readonly=True, select=2), - 'object':fields.integer('No of objects',readonly=True, select=1), - 'total_price':fields.float('Total Adj.', digits=(16,2), readonly=True, select=2), - 'avg_price':fields.float('Avg Adj.', digits=(16,2), readonly=True, select=2), - 'date': fields.date('Create Date', select=1), - 'auction': fields.many2one('auction.dates', 'Auction date',readonly=True, select=1), - - } - - def init(self, cr): - cr.execute(''' - create or replace view report_buyer_auction as ( - select - min(al.id) as id, - al.ach_login as "buyer_login", - to_char(al.create_date, 'YYYY-MM-01') as date, - al.ach_uid as "buyer", - ad.id as auction, - count(al.id) as "object", - sum(al.obj_price) as "total_price", - (sum(al.obj_price)/count(al.id)) as "avg_price" - from - auction_lots al, - auction_dates ad - where - ad.id=al.auction_id - group by - to_char(al.create_date, 'YYYY-MM-01'), - al.ach_uid, - ad.id, - al.ach_login - )''') -report_buyer_auction() - -class report_buyer_auction2(osv.osv): - _name = "report.buyer.auction2" - _description = "Auction Reporting on buyer view" - _auto = False - _columns = { - 'auction': fields.many2one('auction.dates', 'Auction date',readonly=True, select=1), - 'buyer_login': fields.char('Buyer Login',size=64, readonly=True, select=True), - 'buyer':fields.many2one('res.partner', 'Buyer', readonly=True, select=2), - 'sumadj':fields.float('Sum of adjustication',readonly=True), - 'gross_revenue':fields.float('Gross Revenue', readonly=True), - 'net_revenue':fields.float('Net Revenue', readonly=True), - 'net_margin':fields.float('Net Margin', readonly=True), - 'date': fields.date('Create Date', required=True) - } - def init(self, cr): - cr.execute(''' - create or replace view report_buyer_auction2 as ( - select - min(al.id) as id, - to_char(al.create_date, 'YYYY-MM-01') as date, - al.ach_login as "buyer_login", - al.ach_uid as "buyer", - sum(al.obj_price) as sumadj, - ad.id as auction, - sum(al.gross_revenue) as gross_revenue, - sum(al.net_revenue) as net_revenue, - avg(al.net_margin) as net_margin - from - auction_lots al, - auction_dates ad - where - al.auction_id=ad.id - group by - al.ach_uid, - al.ach_login, - ad.id, - to_char(al.create_date, 'YYYY-MM-01') - )''') -report_buyer_auction2() - - -class report_seller_auction(osv.osv): - _name = "report.seller.auction" - _description = "Auction Reporting on seller view" - _auto = False - _rec_name = 'date' - _columns = { - 'auction': fields.many2one('auction.dates', 'Auction date',readonly=True, select=1), - 'seller': fields.many2one('res.partner','Seller',readonly=True, select=1), - 'object_number':fields.integer('No of Objects',readonly=True), - 'total_price':fields.float('Total adjudication',readonly=True), - 'avg_price':fields.float('Avg adjudication',readonly=True), - 'avg_estimation':fields.float('Avg estimation',readonly=True), - 'date': fields.date('Create Date', required=True, select=1), - 'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('sold','Sold')),'State',readonly=True, select=1) - } - - def init(self, cr): - cr.execute(''' - create or replace view report_seller_auction as ( - select - adl.id as auction, - min(al.id) as id, - to_char(adl.auction1, 'YYYY-MM-DD') as date, - ad.partner_id as seller, - count(al.id) as "object_number", - SUM(al.obj_price) as "total_price", - (SUM(al.obj_price)/count(al.id)) as avg_price, - sum(al.lot_est1+al.lot_est2)/2 as avg_estimation, - al.state - from - auction_dates adl, - auction_lots al, - auction_deposit ad - where - al.auction_id=adl.id and ad.id=al.bord_vnd_id - group by - ad.partner_id, - al.state,adl.auction1,adl.id - )''') -report_seller_auction() - -class report_seller_auction2(osv.osv): - _name = "report.seller.auction2" - _description = "Auction Reporting on seller view2" - _auto = False - _rec_name = 'date' - _columns = { - 'seller': fields.many2one('res.partner','Seller',readonly=True, select=1), - 'auction': fields.many2one('auction.dates', 'Auction date',readonly=True, select=1), - 'sum_adj':fields.float('Sum Adjustication',readonly=True, select=2), - 'gross_revenue':fields.float('Gross revenue',readonly=True, select=2), - 'net_revenue':fields.float('Net revenue',readonly=True, select=2), - 'net_margin':fields.float('Net margin', readonly=True, select=2), - 'date': fields.date('Auction date', required=1), - } - - def init(self, cr): - cr.execute('''create or replace view report_seller_auction2 as - (select - min(al.id) as id, - to_char(adl.auction1, 'YYYY-MM-DD') as date, - adl.id as auction, - ad.partner_id as seller, - sum(al.obj_price) as "sum_adj", - sum(al.gross_revenue) as "gross_revenue", - sum(al.net_revenue) as "net_revenue", - avg(al.net_margin) as "net_margin" - from - auction_lots al,auction_dates adl,auction_deposit ad - where - adl.id=al.auction_id and ad.id=al.bord_vnd_id - group by - al.ach_uid,adl.auction1,adl.id,ad.partner_id) - ''') - -report_seller_auction2() - -class report_auction_view2(osv.osv): - _name = "report.auction.view2" - _description = "Auction Reporting on view2" - _auto = False - _rec_name = 'date' - _columns = { - 'auction': fields.many2one('auction.dates', 'Auction date',readonly=True, select=1), - 'sum_adj':fields.float('Sum of adjudication',readonly=True), - 'obj_number':fields.integer('# of Objects',readonly=True), - 'gross_revenue':fields.float('Gross revenue',readonly=True), - 'net_revenue':fields.float('Net revenue',readonly=True), - 'obj_margin':fields.float('Avg margin', readonly=True), - 'obj_margin_procent':fields.float('Net margin (%)', readonly=True), - 'date': fields.date('Auction date', required=True, select=1) - } - def init(self, cr): - cr.execute('''create or replace view report_auction_view2 as ( - select - ad.id as id, - to_char(ad.auction1, 'YYYY-MM-DD') as date, - ad.id as "auction", - count(al.id) as "obj_number", - SUM(al.obj_price) as "sum_adj", - SUM(al.gross_revenue) as "gross_revenue", - SUM(al.net_revenue) as "net_revenue", - avg(al.net_revenue) as "obj_margin", - SUM(al.net_revenue)*100/sum(al.obj_price) as "obj_margin_procent" - from - auction_dates ad - left join - auction_lots al on (al.auction_id = ad.id) - group by - ad.id, ad.auction1 - having - sum(al.obj_price) <> 0 - )''') -report_auction_view2() - -class report_auction_view(osv.osv): - _name = "report.auction.view" - _description = "Auction Reporting on view1" - _auto = False - _rec_name = 'auction_id' - _columns = { - 'auction_id': fields.many2one('auction.dates', 'Auction date',readonly=True, select=1), - 'nobjects':fields.float('No of objects',readonly=True), - 'nbuyer':fields.float('No of buyers',readonly=True), - 'nseller':fields.float('No of sellers',readonly=True), - 'min_est':fields.float('Minimum Estimation', readonly=True, select=2), - 'max_est':fields.float('Maximum Estimation', readonly=True, select=2), - 'adj_price':fields.float('Adjudication price', readonly=True, select=2), - 'obj_ret':fields.integer('# obj ret', readonly=True, select=2) - } - - def init(self, cr): - cr.execute('''create or replace view report_auction_view as - (select - min(al.id) as id, - al.auction_id as "auction_id", - count(al.id) as "nobjects", - count(al.ach_login) as "nbuyer", - count(al.bord_vnd_id) as "nseller", - sum(al.lot_est1) as "min_est", - sum(al.lot_est2) as "max_est", - (SELECT count(1) FROM auction_lots WHERE obj_ret>0) as obj_ret, - sum(al.obj_price) as "adj_price" - from - auction_lots al - group by - al.auction_id - )''') - -report_auction_view() - -class report_auction_object_date(osv.osv): - _name = "report.auction.object.date" - _description = "Objects per day" - _auto = False - _columns = { - 'obj_num': fields.integer('# of Objects'), - 'name': fields.date('Created date', select=2), - 'month': fields.date('Month', select=1), - 'user_id':fields.many2one('res.users', 'User',select=1), - } - #l.create_uid as user, - - def init(self, cr): - cr.execute("""create or replace view report_auction_object_date as - (select - min(l.id) as id, - to_char(l.create_date, 'YYYY-MM-DD') as name, - to_char(l.create_date, 'YYYY-MM-01') as month, - count(l.obj_num) as obj_num, - l.create_uid as user_id - from - auction_lots l - group by - to_char(l.create_date, 'YYYY-MM-DD'), - to_char(l.create_date, 'YYYY-MM-01'), - l.create_uid - ) - """) -report_auction_object_date() - -class report_auction_estimation_adj_category(osv.osv): - _name = "report.auction.estimation.adj.category" - _description = "comparaison estimate/adjudication " - _auto = False - _rec_name='date' - _columns = { - 'lot_est1': fields.float('Minimum Estimation',select=2), - 'lot_est2': fields.float('Maximum Estimation',select=2), -# 'obj_price': fields.float('Adjudication price'), - 'date': fields.date('Date', readonly=True,select=1), - 'lot_type': fields.selection(_type_get, 'Object Type', size=64), - 'adj_total': fields.float('Total Adjudication',select=2), - 'user_id':fields.many2one('res.users', 'User', select=1) - } - - def init(self, cr): - cr.execute(""" - create or replace view report_auction_estimation_adj_category as ( - select - min(l.id) as id, - to_char(l.create_date, 'YYYY-MM-01') as date, - l.lot_type as lot_type, - sum(l.lot_est1) as lot_est1, - sum(l.lot_est2) as lot_est2, - sum(l.obj_price) as adj_total, - l.create_uid as user_id - from - auction_lots l,auction_dates m - where - l.auction_id=m.id and l.obj_price >0 - group by - to_char(l.create_date, 'YYYY-MM-01'),lot_type,l.create_uid - ) - """) -report_auction_estimation_adj_category() - -class report_auction_adjudication(osv.osv): - _name = "report.auction.adjudication" - _description = "report_auction_adjudication" - _auto = False - _columns = { - 'name': fields.many2one('auction.dates','Auction date',readonly=True,select=1), - 'state': fields.selection((('draft','Draft'),('close','Closed')),'State', select=1), - 'adj_total': fields.float('Total Adjudication'), - 'date': fields.date('Date', readonly=True,select=1), - 'user_id':fields.many2one('res.users', 'User',select=1) - - } - - - def init(self, cr): - cr.execute(""" - create or replace view report_auction_adjudication as ( - select - l.id as id, - l.id as name, - sum(m.obj_price) as adj_total, - to_char(l.create_date, 'YYYY-MM-01') as date, - l.create_uid as user_id, - l.state - from - auction_dates l ,auction_lots m - where - m.auction_id=l.id - group by - l.id,l.state,l.name,l.create_uid,to_char(l.create_date, 'YYYY-MM-01') - - ) - """) -report_auction_adjudication() - -class report_attendance(osv.osv): - _name="report.attendance" - _description = "Report Sign In/Out" - _auto = False - #_rec_name='date' - _columns = { - 'name': fields.date('Date', readonly=True,select=1), - 'employee_id' : fields.many2one('hr.employee', "Employee's Name", select=1, readonly=True), - 'total_attendance': fields.float('Total', readonly=True), -} - def init(self, cr): - cr.execute("""CREATE OR REPLACE VIEW report_attendance AS - SELECT - id, - name, - employee_id, - CASE WHEN SUM(total_attendance) < 0 - THEN (SUM(total_attendance) + - CASE WHEN current_date <> name - THEN 1440 - ELSE (EXTRACT(hour FROM current_time) * 60) + EXTRACT(minute FROM current_time) - END - ) - ELSE SUM(total_attendance) - END /60 as total_attendance - FROM ( - SELECT - max(a.id) as id, - a.name::date as name, - a.employee_id, - SUM(((EXTRACT(hour FROM a.name) * 60) + EXTRACT(minute FROM a.name)) * (CASE WHEN a.action = 'sign_in' THEN -1 ELSE 1 END)) as total_attendance - FROM hr_attendance a - where name > current_date + interval '-1 day' - GROUP BY a.name::date, a.employee_id - ) AS fs - GROUP BY name,fs.id,employee_id - """) - -report_attendance() - - -class report_deposit_border(osv.osv): - _name="report.deposit.border" - _description = "Report deposit border" - _auto = False - _rec_name='bord' - _columns = { - 'bord': fields.char('Depositer Inventory', size=64, required=True), - 'seller': fields.many2one('res.partner','Seller',select=1), - 'moy_est' : fields.float('Avg. Est', select=1, readonly=True), - 'total_marge': fields.float('Total margin', readonly=True), - 'nb_obj':fields.float('# of objects', readonly=True), -} - def init(self, cr): - cr.execute("""CREATE OR REPLACE VIEW report_deposit_border AS - SELECT - min(al.id) as id, - ab.partner_id as seller, - ab.name as bord, - COUNT(al.id) as nb_obj, - SUM((al.lot_est1 + al.lot_est2)/2) as moy_est, - SUM(al.net_revenue)/(count(ad.id)) as total_marge - - FROM - auction_lots al,auction_deposit ab,auction_dates ad - WHERE - ad.id=al.auction_id - and al.bord_vnd_id=ab.id - GROUP BY - ab.name,ab.partner_id""") -report_deposit_border() - -class report_object_encoded(osv.osv): - _name = "report.object.encoded" - _description = "Object encoded" - _auto = False - _columns = { - 'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('paid','Paid'),('invoiced','Invoiced')),'State', required=True,select=1), - 'user_id':fields.many2one('res.users', 'User', select=1), - 'estimation': fields.float('Estimation',select=2), - 'date': fields.date('Create Date', required=True), -# 'gross_revenue':fields.float('Gross revenue',readonly=True, select=2), -# 'net_revenue':fields.float('Net revenue',readonly=True, select=2), -# 'obj_margin':fields.float('Net margin', readonly=True, select=2), - 'obj_ret':fields.integer('# obj ret', readonly=True, select=2), -# 'adj':fields.integer('Adj.', readonly=True, select=2), - 'obj_num':fields.integer('# of Encoded obj.', readonly=True, select=2), - } - def init(self, cr): - cr.execute('''create or replace view report_object_encoded as - (select min(al.id) as id, - to_char(al.create_date, 'YYYY-MM-DD') as date, - al.state as state, - al.create_uid as user_id, - (SELECT count(1) FROM auction_lots WHERE obj_ret>0) as obj_ret, - sum((100* al.lot_est1)/al.obj_price) as estimation, - COUNT(al.product_id) as obj_num - from auction_lots al - where al.obj_price>0 and state='draft' - group by to_char(al.create_date, 'YYYY-MM-DD'), al.state, al.create_uid) - ''') -report_object_encoded() - - -class report_object_encoded_manager(osv.osv): - _name = "report.object.encoded.manager" - _description = "Object encoded" - _auto = False - _columns = { - 'user_id':fields.many2one('res.users', 'User', select=True), - 'estimation': fields.float('Estimation',select=True), - 'date': fields.date('Create Date', required=True), - 'gross_revenue':fields.float('Gross revenue',readonly=True, select=True), - 'net_revenue':fields.float('Net revenue',readonly=True, select=True), - 'obj_margin':fields.float('Net margin', readonly=True, select=True), - 'obj_ret':fields.integer('# obj ret', readonly=True, select=True), - 'adj':fields.integer('Adj.', readonly=True, select=True), - 'obj_num':fields.integer('# of Encoded obj.', readonly=True, select=True), - } - def init(self, cr): - cr.execute('''create or replace view report_object_encoded_manager as - (select - min(al.id) as id, - to_char(al.create_date, 'YYYY-MM-DD') as date, - al.create_uid as user_id, - sum((100*lot_est1)/obj_price) as estimation, - (SELECT count(1) FROM auction_lots WHERE obj_ret>0) as obj_ret, - SUM(al.gross_revenue) as "gross_revenue", - SUM(al.net_revenue) as "net_revenue", - SUM(al.net_revenue)/count(al.id) as "obj_margin", - COUNT(al.product_id) as obj_num, - SUM(al.obj_price) as "adj" - from auction_lots al - where al.obj_price>0 - group by to_char(al.create_date, 'YYYY-MM-DD'), al.create_uid) - ''') -report_object_encoded_manager() - -class report_unclassified_objects(osv.osv): - _name = "report.unclassified.objects" - _description = "Unclassified objects " - _auto = False - _columns = { - 'name': fields.char('Short Description',size=64, required=True), - 'obj_num': fields.integer('Catalog Number'), - 'obj_price': fields.float('Adjudication price'), - 'lot_num': fields.integer('List Number', required=True, select=1 ), - 'state': fields.selection((('draft','Draft'),('unsold','Unsold'),('paid','Paid'),('sold','Sold')),'State', required=True, readonly=True), - 'obj_comm': fields.boolean('Commission'), - 'bord_vnd_id': fields.many2one('auction.deposit', 'Depositer Inventory', required=True), - 'ach_login': fields.char('Buyer Username',size=64), - 'lot_est1': fields.float('Minimum Estimation'), - 'lot_est2': fields.float('Maximum Estimation'), - 'lot_type': fields.selection(_type_get, 'Object category', size=64), - 'auction': fields.many2one('auction.dates', 'Auction date',readonly=True, select=1), - } - def init(self, cr): - cr.execute("""create or replace view report_unclassified_objects as - (select - min(al.id) as id, - al.name as name, - al.obj_price as obj_price, - al.obj_num as obj_num, - al.lot_num as lot_num, - al.state as state, - al.obj_comm as obj_comm, - al.bord_vnd_id as bord_vnd_id, - al.ach_login as ach_login, - al.lot_est1 as lot_est1, - al.lot_est2 as lot_est2, - al.lot_type as lot_type, - al.auction_id as auction - from auction_lots al,auction_lot_category ac - where (al.lot_type=ac.name) AND (ac.aie_categ='41') AND (al.auction_id is null) -group by al.obj_price,al.obj_num, al.lot_num, al.state, al.obj_comm,al.bord_vnd_id,al.ach_login,al.lot_est1,al.lot_est2,al.lot_type,al.auction_id,al.name) - """) -report_unclassified_objects() - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - diff --git a/addons/auction/auction_data.xml b/addons/auction/auction_data.xml index 7d742803722..d1f3f94a510 100644 --- a/addons/auction/auction_data.xml +++ b/addons/auction/auction_data.xml @@ -1,98 +1,272 @@ - - Auction Adjudications - 0 - view - - - - - + + + + + + Antiques + ANTI + + + + Painting + PAINT + + + + + Furnitures + FURN + + + + + Porcelain, Ceramics, Glassmaking, ... + PCG + + - - Auction Adjudication Expenses - 0 - view - - - - - + + Sculpture, bronze, eso + SBE + + + + + Clocks and watches + CLW + + + + + Collectible and art objects + COAO + + + + + Engravings + ENGR + + + + + Graphic Arts + GART + + + + + Lightings + LGT + + + + + Metal Ware + MW + + + + + Miniatures + MAT + + + + + Collections + CLT + + + + + Musical Instruments + MI + + + + + Old weapons and militaria + OWM + + + + + Oriental Arts + OART + + + + + Chineese furnitures + CHF + + + + + Others + OTR + + + + + Posters + PST + + + + + Religiosa + REL + + + + + Scientific Instruments + SIN + + + + + Tin + TIN + + + + + Copper wares + CWA + + + + + Toys + TY + + + + + Verreries + VRS + + + + + Wine + WNE + + + + - - Auction Adjudications - 7x* - income - - - - - Auction Adjudication Expenses - 6x* - expense - - - + + Contemporary Art + CONTEM + + + + Arts + ARTS + + + + + Curiosa + CRS + + + + + Other Media + OME + + + + + Photo + PHT + + + + + Painting + CPAINT + + + + + Sculpture + SCUL + + - - Auction Buyer Costs - 7x* - tax - - - - - Auction Seller Costs - 6x* - tax - - - + + Shows + CSHW + + + + + Jewelry + JWL + + + + - - Author rights (4%) - percent - code - 0.04 - sabam - - - result = (price_unit>=1250) - - - Buyer Costs (20%) - percent - 0.20 - auction - - - - - Seller Costs (12%) - percent - -0.12 - auction - - - + + Unclassifieds + UNCLASS + + + + African Arts + AFART + + + + + Argenterie + ARGENT + + + + + Art from the Ivory Coast + ARTFORM + + + + + African Arts + AFRART + + + + + Books, manuscripts, eso. + BME + + + + + Carpet and textilles + CARPTEX + + + + + Cartoons + CATOON + + + + - - - - account.seller.costs - - - - - - - - 770.0 - 700.0 - - + diff --git a/addons/auction/auction_demo.xml b/addons/auction/auction_demo.xml index 22a5cabb1cd..45b157e6545 100644 --- a/addons/auction/auction_demo.xml +++ b/addons/auction/auction_demo.xml @@ -2,6 +2,102 @@ + + + Tax + tax + unreconciled + + + + Auction Adjudications + 0 + view + + + + + + + + + Auction Adjudication Expenses + 1 + view + + + + + + + + + Auction Adjudications + 7x* + + receivable + + + + + + Auction Adjudication Expenses + 6x* + + payable + + + + + + Auction Buyer Costs + 8x* + payable + + + + + + Auction Seller Costs + 9x* + receivable + + + + + + + Author rights (4%) + percent + code + 0.04 + sabam + + + result = (price_unit>=1250) + + + Buyer Costs (20%) + percent + 0.20 + auction + + + + + Seller Costs (12%) + percent + -0.12 + auction + + + + + + 770.0 + 700.0 + + @@ -10,52 +106,52 @@ - Bruxelles1 - Benoit Mortie1r1 - 1030 - + Bruxelles1 + Benoit Mortie1r1 + 1030 + + info@opensides.be + (+32)2 211 34 83 + Rue des Palais 44, bte 33 + default + + - info@opensides.be - (+32)2 211 34 83 - Rue des Palais 44, bte 33 - default - - - - Avignon CEDEX 091 - Laurent Jacot1 - 84911 - - contact@tecsas.fr - (+33)4.32.74.10.57 - 85 rue du traite de Rome - default - - - - Louvain-la-Neuve - Thomas Passot - 1348 - - info@mediapole.net - (+32).10.45.17.73 - Rue de l'Angelique, 1 - - + + Avignon CEDEX 091 + Laurent Jacot1 + 84911 + + contact@tecsas.fr + (+33)4.32.74.10.57 + 85 rue du traite de Rome + default + + + + + Louvain-la-Neuve + Thomas Passot + 1348 + + info@mediapole.net + (+32).10.45.17.73 + Rue de l'Angelique, 1 + + + Philippe Lavilier 1345-1450 + POREAU OSWALD 1877-1955 - - - @@ -98,104 +194,102 @@ sabam - + - TVA - 0.12 - auction - - + TVA + 0.12 + auction + + - - TVA1 - 0.2 - auction - - - + TVA1 + 0.2 + auction + + + - Buyer Costs - 0.21 - auction - - - + Buyer Costs + 0.21 + auction + + + - Seller Costs1 - -0.10 - auction - - - + Seller Costs1 + -0.10 + auction + + + - Seller Costs - -0.10 - auction - - + Seller Costs + -0.10 + auction + + - + - Frais de vente - -0.15 - auction - - + Frais de vente + -0.15 + auction + + - - Frais de vente - 0 - auction - - + + Frais de vente + 0 + auction + + + Oeuvres a 21% - - - - painting + Painting 1 - 8 + + Furniture 2 - 10 - + - glass + Glass 2 - 25 + + - sculpture + Sculpture 10 - 18 + Jawellery 6 - 15 + @@ -203,20 +297,18 @@ - painting Exhibition - - - - - - - - - - - - - + painting Exhibition + + + + + + + + + + + @@ -225,53 +317,47 @@ - - - - - + - - - - - keep + + + keep - - - keep + + + keep - - - keep + + + keep - - - keep + + + keep - - - keep + + + keep @@ -434,7 +520,6 @@ - @@ -451,7 +536,6 @@ - @@ -468,11 +552,8 @@ - - - Hardware photos @@ -487,12 +568,10 @@ - - - + Home Appliance photos 12 @@ -505,10 +584,8 @@ - - mobile accesories photos @@ -527,7 +604,7 @@ - piques-cierges + pikes-candles 14 30 @@ -539,13 +616,11 @@ - - - Service à café + Coffee Service 15 10 @@ -557,16 +632,11 @@ - - - - - - - Pendule + + Pendulum 16 100 200 @@ -581,23 +651,22 @@ - Cassolettes en marbre + Cassolette marble 17 400 500 - marbre Saint Rémi + Marble Saint Remi 150 17 0 - - Tableau + Table 18 1600 2200 @@ -608,39 +677,26 @@ - - - - - - - - - - Vase + + Yourself 19 180 220 - Rouge + Red 0 19 190.00 - - - - - - - Appareil à photos + + Digital photo 20 160 340 @@ -651,22 +707,8 @@ - - - - - - - - - - - - - - bid1 @@ -701,183 +743,191 @@ - bid4 - - + bid4 + + - - + + - bid5 - - + bid5 + + - - + + - bid6 - - + bid6 + + - - + + - bid7 - - + bid7 + + - - + + - bid8 - - + bid8 + + - - + + - bid9 - - + bid9 + + - - + + - bid10 - - + bid10 + + - - + + - - - Demo + + Demo - + - + --> + + + + + sign_in + + + + + + sign_out + + + + + + sign_in + + + + + + sign_out + + + + + + sign_in + + + + + + sign_out + + + + + + sign_in + + + + + + sign_out + + - + + + + sign_in + + + + + + sign_out + + + + + + sign_in + + + + + + sign_out + + + + + + sign_in + + + + + + sign_out + + + + + + sign_in + + + + + + sign_out + + - - - sign_in - - - - - sign_out - - - - - sign_in - - - - - sign_out - - - - - sign_in - - - - - sign_out - - - - - sign_in - - - - - sign_out - - - - - - - - - - sign_in - - - - - sign_out - - - - - sign_in - - - - - - sign_out - - - - - sign_in - - - - - sign_out - - - - - sign_in - - - - - sign_out - - - - + diff --git a/addons/auction/auction_report.xml b/addons/auction/auction_report.xml index 17e7e07e968..4d594b6fe33 100644 --- a/addons/auction/auction_report.xml +++ b/addons/auction/auction_report.xml @@ -3,7 +3,7 @@ - - --> - - - - - - + model="auction.lots" + name="lots.list.inventory" + rml="auction/report/lots_list_inventory.rml" + multi="1"/> - - ---> - - --> - - - --> - --> - + - + + - - diff --git a/addons/auction/auction_sequence.xml b/addons/auction/auction_sequence.xml index 6cd27d256f3..2ae69235843 100644 --- a/addons/auction/auction_sequence.xml +++ b/addons/auction/auction_sequence.xml @@ -1,30 +1,33 @@ - - # - # Sequences for sale.order - # - + + + - Auction deposit - auction.deposit + Auction deposit + auction.deposit + - Auction deposit - auction.deposit - AD/ - 3 + Auction deposit + auction.deposit + AD/ + 3 + + + - Auction bid - auction.bid + Auction bid + auction.bid + - Auction bid - auction.bid - bid/ - 3 + Auction bid + auction.bid + bid/ + 3 diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml index dad4d39b776..46d49754d16 100644 --- a/addons/auction/auction_view.xml +++ b/addons/auction/auction_view.xml @@ -5,9 +5,9 @@ - ======================================================= - Auction Management/Configuration/artist - ======================================================= + + + auction.artists.tree auction.artists @@ -42,17 +42,17 @@ - ======================================================= - Auction Management/Configuration/objectcategories - ======================================================= + + + auction.lot.category.tree auction.lot.category tree - - - + + + @@ -60,37 +60,42 @@ auction.lot.category form -
- - - - - - - +
+ + + + + + +
+ auction.lot.category form + - ======================================================= - Auction Management/Auction Dates/New Auction Dates - ======================================================= + + + Auction dates auction.dates tree - - - + + + + +