odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

merge 

bzr revid: fp@tinyerp.com-20090630114219-p9w6hfze2g8trc69
This commit is contained in:
Fabien Pinckaers 2009-06-30 13:42:19 +02:00
parent 2f6b7624d3 d607c67f60
commit 81b9288a07
9 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/account/account.py
View File

@ -2205,9 +2205,11 @@ class wizard_multi_charts_accounts(osv.osv_memory):
#create the account_account for this bank journal
tmp = self.pool.get('res.partner.bank').name_get(cr, uid, [line.acc_no.id])[0][1]
dig = obj_multi.code_digits
new_code = str(current_num)
if ref_acc_bank.code:
new_code = str(ref_acc_bank.code.ljust(dig,'0') + str(current_num))
try:
new_code = str(int(ref_acc_bank.code.ljust(dig,'0')) + current_num)
except Exception,e:
new_code = str(ref_acc_bank.code.ljust(dig-len(str(current_num)),'0')) + str(current_num)
vals = {
'name': line.acc_no.bank and line.acc_no.bank.name+' '+tmp or tmp,
'currency_id': line.currency_id and line.currency_id.id or False,

34
addons/account/account_invoice_view.xml
View File

@ -35,7 +35,7 @@
<field name="arch" type="xml">
<tree string="Invoice Line">
<field name="name"/>
<field name="account_id"/>
<field name="account_id" groups="base.group_user"/>
<field name="quantity"/>
<field name="uos_id"/>
<field name="price_unit"/>
@ -59,8 +59,8 @@
<field name="discount"/>
<field colspan="4" name="name" select="1"/>
<field colspan="4" name="origin" select="1"/>
<field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(parent.fiscal_position,account_id)"/>
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id"/>
<field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(parent.fiscal_position,account_id)" groups="base.group_user"/>
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id" groups="base.group_user"/>
<newline/>
<field name="price_subtotal"/>
<field colspan="4" name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]"/>
@ -81,7 +81,7 @@
<field name="sequence"/>
<field name="manual"/>
<field name="name"/>
<field name="account_id"/>
<field name="account_id" groups="base.group_user"/>
<field name="base"/>
<field name="amount"/>
</tree>
@ -95,7 +95,7 @@
<form string="Manual Invoice Taxes">
<field name="name" select="1"/>
<field name="sequence"/>
<field name="account_id" select="1"/>
<field name="account_id" select="1" groups="base.group_user"/>
<field name="manual" select="1"/>
<field name="amount" select="1"/>
<field name="base" readonly="0"/>
@ -117,7 +117,7 @@
<field name="name"/>
<field name="type"/>
<field name="number"/>
<field name="partner_id"/>
<field name="partner_id" groups="base.group_user"/>
<field name="amount_untaxed" sum="Untaxed amount"/>
<field name="amount_total" sum="Total amount"/>
<field name="currency_id"/>
@ -237,19 +237,21 @@
<field name="arch" type="xml">
<form string="Invoice">
<group colspan="4" col="6">
<field name="journal_id" select="2"/>
<field name="journal_id" select="2" groups="base.group_user"/>
<field name="type" readonly="1" select="2"/>
<field name="number" select="1"/>
<field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term)" select="1"/>
<field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term)" select="1" groups="base.group_user"/>
<field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
<field name="currency_id" on_change="onchange_currency_id(currency_id)" select="2"/>
<field name="date_invoice" select="1"/>
<field name="period_id"/>
<label align="0.0" colspan="2" string="(keep empty to use the current period)"/>
<field name="period_id" groups="base.group_user"/>
<group colspan="2" col="1" groups="base.group_user">
<label align="0.0" string="(keep empty to use the current period)"/>
</group>
</group>
<notebook colspan="4">
<page string="Invoice">
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id"/>
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id" groups="base.group_user"/>
<field name="name" select="2"/>
<field name="payment_term"/>
<field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list"/>
@ -265,7 +267,7 @@
</field>
</group>
<group col="4" colspan="2">
<button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object"/>
<button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" groups="base.group_user"/>
<field name="amount_untaxed"/>
<label string="" colspan="2"/>
<field name="amount_tax"/>
@ -273,7 +275,7 @@
<field name="amount_total"/>
<field name="state" select="2"/>
<field name="residual"/>
<group col="3" colspan="4">
<group col="3" colspan="4" groups="base.group_user">
<button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="gtk-print"/>
<button name="invoice_open" states="draft,proforma2" string="Create" icon="gtk-execute"/>
<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
@ -284,14 +286,14 @@
</page>
<page string="Other Info">
<field name="company_id"/>
<field name="fiscal_position" groups="base.group_extended"/>
<field name="fiscal_position" groups="base.group_extended,base.group_user"/>
<newline/>
<field name="date_due" select="1"/>
<newline/>
<field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank" select="2"/>
<field name="origin" select="2"/>
<field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id"/>
<field name="move_id"/>
<field name="move_id" groups="base.group_user"/>
<separator colspan="4" string="Additionnal Information"/>
<field colspan="4" name="comment" nolabel="1"/>
</page>
@ -301,7 +303,7 @@
<field name="date"/>
<field name="ref"/>
<field name="name"/>
<field name="journal_id"/>
<field name="journal_id" groups="base.group_user"/>
<field name="debit"/>
<field name="credit"/>
</tree>

10
addons/account/account_wizard.xml
View File

@ -2,9 +2,9 @@
<openerp>
<data>
<wizard id="wizard_invoice_refund" model="account.invoice" name="account.invoice.refund" string="Credit Note"/>
<wizard id="wizard_invoice_refund" model="account.invoice" name="account.invoice.refund" string="Credit Note" groups="base.group_user"/>
<wizard id="wizard_invoice_pay" model="account.invoice" name="account.invoice.pay" string="Pay invoice"/>
<wizard id="wizard_invoice_pay" model="account.invoice" name="account.invoice.pay" string="Pay invoice" groups="base.group_user"/>
<!-- close year, period, journal -->
<wizard id="wizard_fiscalyear_close" menu="False" model="account.fiscalyear" name="account.fiscalyear.close" string="Generate Fiscal Year Opening Entries"/>
@ -80,8 +80,8 @@
<wizard id="wizard_balance_report" keyword="client_print_multi" model="account.account" name="account.account.balance.report" string="Account Balance"/>
<wizard id="wizard_general_ledger_report" keyword="client_print_multi" model="account.account" name="account.general.ledger.report" string="General Ledger"/>
<wizard id="wizard_invoice_state_confirm" keyword="client_action_multi" model="account.invoice" multi="True" name="account.invoice.state.confirm" string="Confirm draft invoices"/>
<wizard id="wizard_invoice_state_cancel" keyword="client_action_multi" model="account.invoice" multi="True" name="account.invoice.state.cancel" string="Cancel selected invoices"/>
<wizard id="wizard_invoice_state_confirm" keyword="client_action_multi" model="account.invoice" multi="True" name="account.invoice.state.confirm" string="Confirm draft invoices" groups="base.group_user"/>
<wizard id="wizard_invoice_state_cancel" keyword="client_action_multi" model="account.invoice" multi="True" name="account.invoice.state.cancel" string="Cancel selected invoices" groups="base.group_user"/>
<!-- account.move validate -->
@ -97,7 +97,7 @@
<wizard string="Create Entries From Models" model="account.move.line" name="account_use_models" menu="True" id="wizard_line_account_use_model"/>
<!-- account.invoice -->
<wizard string="Open State" model="account.invoice" name="account.wizard_paid_open" menu="False" id="wizard_paid_open"/>
<wizard string="Open State" model="account.invoice" name="account.wizard_paid_open" menu="False" id="wizard_paid_open" groups="base.group_user"/>
<!-- generic report wizard -->
<wizard id="wizard_account_balance_report" menu="False" model="account.account" name="account.account.balance.report" string="Account Balance"/>

2
addons/account/invoice.py
View File

@ -862,6 +862,7 @@ class account_invoice(osv.osv):
'account_id': src_account_id,
'partner_id': invoice.partner_id.id,
'ref':invoice.number,
'date': date,
}
l2 = {
'debit': direction * pay_amount<0 and - direction * pay_amount,
@ -869,6 +870,7 @@ class account_invoice(osv.osv):
'account_id': pay_account_id,
'partner_id': invoice.partner_id.id,
'ref':invoice.number,
'date': date,
}
if not name:

4
addons/point_of_sale/pos.py
View File

@ -944,14 +944,14 @@ class report_transaction_pos(osv.osv):
count(pp.id) as no_trans,
sum(amount) as amount,
pp.journal_id,
date_trunc('day',pp.create_date)::text as date_create,
to_char(pp.create_date, 'YYYY-MM-DD') as date_create,
ps.user_id,
ps.invoice_id
from
pos_payment pp, pos_order ps
WHERE ps.id = pp.order_id
group by
pp.journal_id, date_trunc('day',pp.create_date), ps.user_id, ps.invoice_id
pp.journal_id, date_create, ps.user_id, ps.invoice_id
)
""")
report_transaction_pos()

2
addons/point_of_sale/pos_view.xml
View File

@ -285,7 +285,7 @@
<field name="res_model">report.transaction.pos</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
<field name="domain">[('date_create','=',time.strftime('%Y-%m-%d'))]</field>
<field name="domain">[('date_create','like',time.strftime('%Y-%m-%d'))]</field>
</record>
<menuitem name="Reporting" parent="menu_point_root" id="menu_point_rep"/>
<menuitem name="Sales of the day" parent="menu_point_rep" action="action_trans_pos_tree_today" id="menu_trans_pos_tree_today"/>

2
addons/process/process_view.xml
View File

@ -32,7 +32,7 @@
<group colspan="4" string="Details">
<field name="name" select="1"/>
<field name="flow_start"/>
<field name="process_id" invisible="1" readonly="1" required="0"/> <!-- used by transition_out -->
<field name="process_id" readonly="1" required="0"/> <!-- used by transition_out -->
<newline/>
<field name="model_id" select="1"/>
<field name="menu_id" select="2"/>

6
addons/sale/product.py
View File

@ -41,8 +41,10 @@ class product_product(osv.osv):
result[product.id] = ""
for pricelist in pricelist_browse:
for version in pricelist.version_id:
for items in version.items_id:
qty = items.min_quantity
cr.execute("""select min_quantity from product_pricelist_item where price_version_id = %s""", [version.id])
items_lines = cr.fetchall()
for line in items_lines:
qty = line[0]
try:
prices = pricelist_obj.price_get(cr, uid, [pricelist.id], product.id, qty, partner=None, context=None)
price = prices.get(pricelist.id) or 0.0

9
addons/sale/sale.py
View File

@ -998,15 +998,6 @@ class sale_order_line(osv.osv):
sale_order_line()
_policy_form = '''<?xml version="1.0"?>
<form string="Select Bank Account">
<field name="picking_policy" colspan="4"/>
</form>'''
_policy_fields = {
'picking_policy': {'string': 'Packing Policy', 'type': 'selection','selection': [('direct','Direct Delivery'),('one','All at once')],'required': True,}
}
class sale_config_picking_policy(osv.osv_memory):
_name='sale.config.picking_policy'
_columns = {