pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] merged openerp-dev-addons1 branch

Browse Source 
bzr revid: hmo@tinyerp.com-20101027055155-eu05206phmwa9ulw
This commit is contained in:
Harry (OpenERP)
2010-10-27 11:21:55 +05:30
parent 15e29993ba cbc52ce458
commit 3d4cec9024
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/auction/report/catalog2.xsl
+3 -3
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:date="http://exslt.org/dates-and-times"extension-element-prefixes="date">
<?xml version="1.0" encoding="iso-8859-1"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:date="http://exslt.org/dates-and-times" extension-element-prefixes="date">
<xsl:template match="report">
@@ -30,7 +30,7 @@
<pageGraphics>
<!-- <image x="1.0cm" y="27.3cm" file="/home/tiny/terp/4.2/server/bin/addons/auction/report/images/flagey_head.png"/>-->
- <image x="1.0cm" y="26.1cm" file="flagey_logo.jpg"/>
<drawRightString x="19.0cm" y="26.6cm"> Vente antiquitée le <xsl:value-of select="date:day-name(catalog/AuctionDate1)"/> &#160;<xsl:value-of select="date:day-in-month(catalog/AuctionDate1)"/>&#160;<xsl:value-of select="date:month-name(catalog/AuctionDate1)"/> &#160;<xsl:value-of select="date:year(catalog/AuctionDate1)"/></drawRightString>
<drawRightString x="19.0cm" y="26.6cm"> Antiques on sale <xsl:value-of select="date:day-name(catalog/AuctionDate1)"/> <xsl:value-of select="date:day-in-month(catalog/AuctionDate1)"/><xsl:value-of select="date:month-name(catalog/AuctionDate1)"/> <xsl:value-of select="date:year(catalog/AuctionDate1)"/></drawRightString>
<lineMode width="1mm"/>
<setFont name="Helvetica" size="26"/>
<!-- <drawString x="10mm" y="27.8cm">Flagey.com</drawString>-->
addons/mrp/mrp.py
-2
View File
@@ -19,8 +19,6 @@
#
##############################################################################
from itertools import groupby
from operator import itemgetter
from datetime import datetime
from osv import osv, fields
from tools.translate import _
addons/mrp_repair/security/ir.model.access.csv
+6 -1
View File
@@ -21,4 +21,9 @@
"access_account_tax_manager","account.tax manager","account.model_account_tax","mrp.group_mrp_manager",1,0,0,0
"access_mrp_repair_fee_user_mrp","MRP Repair Fee user mrp","model_mrp_repair_fee","mrp.group_mrp_user",1,1,1,1
"access_mrp_repair_fee_mgr","MRP Repair Fee mgr","model_mrp_repair_fee","mrp.group_mrp_manager",1,0,0,0
"access_account_invoice_user","account.invoice","account.model_account_invoice","mrp.group_mrp_user",1,1,1,1
"access_account_invoice_manager","account.invoice manager","account.model_account_invoice","mrp.group_mrp_manager",1,0,0,0
"access_account_invoice_line_user","account.invoice.line","account.model_account_invoice_line","mrp.group_mrp_user",1,1,1,1
"access_account_invoice_line_manager","account.invoice.line manager","account.model_account_invoice_line","mrp.group_mrp_manager",1,0,0,0
"access_account_journal_user","account.journal","account.model_account_journal","mrp.group_mrp_user",1,1,1,1
"access_account_journal_manager","account.journal manager","account.model_account_journal","mrp.group_mrp_manager",1,0,0,0
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
21 access_account_tax_manager account.tax manager account.model_account_tax mrp.group_mrp_manager 1 0 0 0
22 access_mrp_repair_fee_user_mrp MRP Repair Fee user mrp model_mrp_repair_fee mrp.group_mrp_user 1 1 1 1
23 access_mrp_repair_fee_mgr MRP Repair Fee mgr model_mrp_repair_fee mrp.group_mrp_manager 1 0 0 0
24 access_account_invoice_user account.invoice account.model_account_invoice mrp.group_mrp_user 1 1 1 1
25 access_account_invoice_manager account.invoice manager account.model_account_invoice mrp.group_mrp_manager 1 0 0 0
26 access_account_invoice_line_user account.invoice.line account.model_account_invoice_line mrp.group_mrp_user 1 1 1 1
27 access_account_invoice_line_manager account.invoice.line manager account.model_account_invoice_line mrp.group_mrp_manager 1 0 0 0
28 access_account_journal_user account.journal account.model_account_journal mrp.group_mrp_user 1 1 1 1
29 access_account_journal_manager account.journal manager account.model_account_journal mrp.group_mrp_manager 1 0 0 0
addons/mrp_repair/test/test_mrp_repair.yml
+2 -2
View File
@@ -85,7 +85,7 @@
obj_lines = self.pool.get('account.invoice.line')
inv_obj = self.pool.get('account.invoice')
repair_id = self.browse(cr, uid, [ref('mrp_repair_rma0')], context=context)[0]
invoice_ids = inv_obj.search(cr, uid, [('partner_id', '=', repair_id.partner_invoice_id.id)])
invoice_ids = inv_obj.search(cr, uid, [('partner_id', '=', repair_id.partner_id.id)])
invoice_id = inv_obj.browse(cr, uid, invoice_ids)[0]
assert repair_id.partner_invoice_id.id == invoice_id.partner_id.id, "No invoice existing for the same partner"
assert repair_id.partner_id.id == invoice_id.partner_id.id, "No invoice existing for the same partner"
addons/stock/stock.py
-1
View File
@@ -2008,7 +2008,6 @@ class stock_move(osv.osv):
for id in ids:
wf_service.trg_trigger(uid, 'stock.move', id, cr)
picking_obj = self.pool.get('stock.picking')
wf_service = netsvc.LocalService("workflow")
for pick_id in picking_ids:
wf_service.trg_write(uid, 'stock.picking', pick_id, cr)