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

[IMP] Sale: Code Improved 

bzr revid: mra@mra-laptop-20100818062259-8qi7bfpuk9wt7f4z
This commit is contained in:
MTR(OpenERP) 2010-08-18 11:52:59 +05:30 committed by Mustufa Rangwala
parent 2743ee0b97
commit 3a87abb72e
19 changed files with 83 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/sale/__init__.py
View File

@ -31,5 +31,4 @@ import wizard
import report
import company
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

3
addons/sale/__openerp__.py
View File

@ -19,7 +19,6 @@
#
##############################################################################
{
'name': 'Sales Management',
'version': '1.0',
@ -85,4 +84,4 @@
'active': False,
'certificate': '0058103601429',
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

2
addons/sale/board_sale_demo.xml
View File

@ -3,4 +3,4 @@
<data noupdate="1">
</data>
</openerp>
</openerp>

2
addons/sale/board_sale_view.xml
View File

@ -37,4 +37,4 @@
<menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="board.menu_dasboard" sequence="0"/>
<menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman,base.group_sale_manager,base.group_system,base.group_partner_manager" action="open_board_sales_manager"/>
</data>
</openerp>
</openerp>

6
addons/sale/company.py
View File

@ -29,9 +29,9 @@ class company(osv.osv):
"for security purpose"),
}
_defaults = {
'security_lead': lambda *a: 5.0,
'security_lead': 5.0,
}
company()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

2
addons/sale/company_view.xml
View File

@ -1,7 +1,6 @@
<?xml version="1.0" ?>
<openerp>
<data>
<record id="mrp_company" model="ir.ui.view">
<field name="name">res.company.mrp.config</field>
<field name="model">res.company</field>
@ -13,6 +12,5 @@
</page>
</field>
</record>
</data>
</openerp>

19
addons/sale/product.py
View File

@ -20,22 +20,20 @@
##############################################################################
from osv import fields, osv
from tools import config
class product_product(osv.osv):
_name = 'product.product'
_inherit = 'product.product'
def _pricelist_calculate(self, cr, uid, ids, name, arg, context=None):
result = {}
pricelist_obj=self.pool.get('product.pricelist')
if name=='pricelist_purchase':
pricelist_ids=pricelist_obj.search(cr,uid,[('type','=','purchase')])
pricelist_obj = self.pool.get('product.pricelist')
if context is None:
context = {}
if name == 'pricelist_purchase':
pricelist_ids = pricelist_obj.search(cr,uid,[('type','=','purchase')])
else:
pricelist_ids=pricelist_obj.search(cr,uid,[('type','=','sale')])
pricelist_browse=pricelist_obj.browse(cr,uid,pricelist_ids)
pricelist_ids = pricelist_obj.search(cr,uid,[('type','=','sale')])
pricelist_browse = pricelist_obj.browse(cr,uid,pricelist_ids)
for product in self.browse(cr, uid, ids, context):
result[product.id] = ""
for pricelist in pricelist_browse:
@ -70,4 +68,5 @@ class product_product(osv.osv):
}
product_product()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

7
addons/sale/sale.py
View File

@ -771,6 +771,7 @@ sale_order()
# - update it on change product and unit price
# - use it in report if there is a uos
class sale_order_line(osv.osv):
def _amount_line(self, cr, uid, ids, field_name, arg, context=None):
tax_obj = self.pool.get('account.tax')
cur_obj = self.pool.get('res.currency')
@ -1170,9 +1171,9 @@ class sale_config_picking_policy(osv.osv_memory):
"in one or two operations by the worker.")
}
_defaults = {
'picking_policy': lambda *a: 'direct',
'order_policy': lambda *a: 'manual',
'step': lambda *a: 'one'
'picking_policy': 'direct',
'order_policy': 'manual',
'step': 'one'
}
def execute(self, cr, uid, ids, context=None):

48
addons/sale/sale_demo.xml
View File

@ -2,9 +2,8 @@
<openerp>
<data noupdate="1">
<!--
Resource: res.company
-->
<!--Resource: res.company-->
<record id="res_company_shop_sale0" model="res.company">
<field eval="5.0" name="security_lead"/>
<field name="partner_id" ref="stock.res_partner_tinyshop0"/>
@ -12,10 +11,8 @@
<field eval="&quot;&quot;&quot;Shop 1&quot;&quot;&quot;" name="name"/>
</record>
<!--
Resource: sale.order
-->
<!--Resource: sale.order-->
<record id="order" model="sale.order">
<field name="shop_id" ref="shop"/>
<field model="product.pricelist" name="pricelist_id" search="[]"/>
@ -26,10 +23,8 @@
<field model="res.partner.address" name="partner_order_id" search="[]"/>
</record>
<!--
Resource: sale.order.line
-->
<!--Resource: sale.order.line-->
<record id="line" model="sale.order.line">
<field name="order_id" ref="order"/>
<field name="name">New server config + material</field>
@ -70,10 +65,8 @@
<field name="type">make_to_stock</field>
</record>
<!--
Resource: sale.order
-->
<!--Resource: sale.order-->
<record id="order2" model="sale.order">
<field name="shop_id" ref="shop"/>
<field model="product.pricelist" name="pricelist_id" search="[]"/>
@ -84,10 +77,8 @@
<field name="partner_order_id" ref="base.res_partner_address_9"/>
</record>
<!--
Resource: sale.order.line
-->
<!--Resource: sale.order.line-->
<record id="line3" model="sale.order.line">
<field name="order_id" ref="order2"/>
<field name="name">[PC2] Computer assembled on demand</field>
@ -107,9 +98,8 @@
<field name="type">make_to_order</field>
</record>
<!--
Resource: sale.order
-->
<!--Resource: sale.order-->
<record id="order3" model="sale.order">
<field name="shop_id" ref="shop"/>
<field model="product.pricelist" name="pricelist_id" search="[]"/>
@ -141,9 +131,8 @@
</record>
<workflow action="order_confirm" model="sale.order" ref="order3"/>
<!--
Resource: sale.order
-->
<!--Resource: sale.order-->
<record id="order4" model="sale.order">
<field name="shop_id" ref="shop"/>
<field model="product.pricelist" name="pricelist_id" search="[]"/>
@ -175,9 +164,8 @@
</record>
<workflow action="order_confirm" model="sale.order" ref="order4"/>
<!--
Resource: sale.order
-->
<!--Resource: sale.order-->
<record id="order5" model="sale.order">
<field name="shop_id" ref="shop"/>
<field model="product.pricelist" name="pricelist_id" search="[]"/>
@ -202,9 +190,9 @@
<!-- Run all schedulers -->
<function model="procurement.order" name="run_scheduler"/>
<!-- sale advance demo.. -->
<!-- Demo Data for Product -->
<record id="advance_product_0" model="product.product">
<field name="name">Advance Product</field>
<field name="categ_id" ref="product.cat1"/>
@ -216,4 +204,4 @@
</record>
</data>
</openerp>
</openerp>

4
addons/sale/sale_installer.py
View File

@ -18,6 +18,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
from osv import fields, osv
class sale_installer(osv.osv_memory):
@ -41,4 +42,7 @@ class sale_installer(osv.osv_memory):
'sale_order_dates': fields.boolean('Sale Order Dates',
help="Add commitment, requested and effective dates on the sale order."),
}
sale_installer()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

3
addons/sale/stock.py
View File

@ -29,6 +29,7 @@ class stock_move(osv.osv):
_defaults = {
'sale_line_id': False
}
stock_move()
class stock_picking(osv.osv):
@ -115,6 +116,8 @@ class stock_picking(osv.osv):
invoice_obj = self.pool.get('account.invoice')
picking_obj = self.pool.get('stock.picking')
invoice_line_obj = self.pool.get('account.invoice.line')
if context is None:
context = {}
result = super(stock_picking, self).action_invoice_create(cursor, user,
ids, journal_id=journal_id, group=group, type=type,

3
addons/sale/wizard/__init__.py
View File

@ -23,5 +23,4 @@ import sale_make_invoice
import sale_line_invoice
import sale_make_invoice_advance
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

3
addons/sale/wizard/sale_line_invoice.py
View File

@ -110,7 +110,6 @@ class sale_order_line_make_invoice(osv.osv_memory):
(order_id,invoice_id) values (%s,%s)', (order.id, res))
return {}
sale_order_line_make_invoice()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

3
addons/sale/wizard/sale_line_invoice.xml
View File

@ -22,6 +22,5 @@
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
</data>
</openerp>
</openerp>

10
addons/sale/wizard/sale_make_invoice.py
View File

@ -29,15 +29,19 @@ class sale_make_invoice(osv.osv_memory):
'grouped': fields.boolean('Group the invoices', help='Check the box to group the invoices for the same customers'),
'invoice_date':fields.date('Invoice Date'),
}
_default = {
'grouped' : lambda *a: False
_defaults = {
'grouped': False
}
def view_init(self, cr, uid, fields_list, context=None):
if context is None:
context = {}
record_id = context and context.get('active_id', False)
order = self.pool.get('sale.order').browse(cr, uid, record_id)
if order.state == 'draft':
raise osv.except_osv(_('Warning !'),'You can not create invoice when sale order is not confirmed.')
return False
def make_invoices(self, cr, uid, ids, context={}):
order_obj = self.pool.get('sale.order')
newinv = []
@ -68,5 +72,5 @@ class sale_make_invoice(osv.osv_memory):
}
sale_make_invoice()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

2
addons/sale/wizard/sale_make_invoice.xml
View File

@ -28,4 +28,4 @@
</record>
</data>
</openerp>
</openerp>

10
addons/sale/wizard/sale_make_invoice_advance.py
View File

@ -19,7 +19,6 @@
##############################################################################
from osv import fields, osv
from service import web_services
from tools.translate import _
import ir
@ -31,9 +30,10 @@ class sale_advance_payment_inv(osv.osv_memory):
'amount': fields.float('Unit Price', size=(16, 2), required=True),
'qtty': fields.float('Quantity', size=(16, 2), required=True),
}
_default = {
'qtty' : lambda *a: 1
_defaults = {
'qtty': 1.0
}
def create_invoices(self, cr, uid, ids, context={}):
"""
To create invoices.
@ -65,7 +65,7 @@ class sale_advance_payment_inv(osv.osv_memory):
that is defined as 'Automatic Invoice after delivery'."))
val = obj_lines.product_id_change(cr, uid, [], sale_adv_obj.product_id.id,
uom = False, partner_id = sale.partner_id.id, fposition_id = sale.fiscal_position.id)
line_id =obj_lines.create(cr, uid, {
line_id = obj_lines.create(cr, uid, {
'name': val['value']['name'],
'account_id': val['value']['account_id'],
'price_unit': sale_adv_obj.amount,
@ -181,4 +181,4 @@ class sale_open_invoice(osv.osv_memory):
sale_open_invoice()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

42
addons/sale/wizard/sale_make_invoice_advance.xml
View File

@ -6,17 +6,17 @@
<field name="model">sale.advance.payment.inv</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Partial Invoice">
<field name="product_id"/>
<newline />
<field name="qtty"/>
<field name="amount"/>
<newline />
<separator string="" colspan="4"/>
<label string="" colspan="2" />
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="create_invoices" string="Create Partial Invoice" type="object" icon="gtk-ok"/>
</form>
<form string="Partial Invoice">
<field name="product_id"/>
<newline />
<field name="qtty"/>
<field name="amount"/>
<newline />
<separator string="" colspan="4"/>
<label string="" colspan="2" />
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="create_invoices" string="Create Partial Invoice" type="object" icon="gtk-ok"/>
</form>
</field>
</record>
@ -34,15 +34,15 @@
<field name="model">sale.open.invoice</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Invoices">
<label string="You invoice has been successfully created!" />
<newline />
<separator string="" colspan="4"/>
<group colspan="4">
<button special="cancel" string="Close" icon="gtk-cancel"/>
<button name="open_invoice" string="Open Invoice" type="object" icon="gtk-open"/>
</group>
</form>
<form string="Invoices">
<label string="You invoice has been successfully created!" />
<newline />
<separator string="" colspan="4"/>
<group colspan="4">
<button special="cancel" string="Close" icon="gtk-cancel"/>
<button name="open_invoice" string="Open Invoice" type="object" icon="gtk-open"/>
</group>
</form>
</field>
</record>
@ -55,4 +55,4 @@
<field name="target">new</field>
</record>
</data>
</openerp>
</openerp>

2
addons/sale_crm/board_sale_crm_view.xml
View File

@ -102,4 +102,4 @@
</record>
</data>
</openerp>
</openerp>