Khushboo Bhatt(openerp) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons11-sales-kbh into
lp:~openerp-dev/openobject-addons/trunk-addons11-sale-apa.
Requested reviews:
Amit Patel (OpenERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons11-sales-kbh/+merge/126166
hello,
I have solved the issues of addons11 pad for sales.
Thanks,
KBH
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons11-sales-kbh/+merge/126166
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons11-sale-apa.
=== modified file 'crm_claim/crm_claim_view.xml'
--- crm_claim/crm_claim_view.xml 2012-08-15 22:30:38 +0000
+++ crm_claim/crm_claim_view.xml 2012-09-25 06:24:22 +0000
@@ -241,7 +241,7 @@
<attribute name="invisible">False</attribute>
</xpath>
<xpath expr="//page[@name='page_history']" position="inside">
- <group name="grp_claim" string="Claim">
+ <group name="grp_claim" string="Claims">
<field name="claims_ids" colspan="4" nolabel="1">
<tree string="Partners Claim" editable="bottom">
<field name="name"/>
=== modified file 'event/res_partner_view.xml'
--- event/res_partner_view.xml 2012-08-08 12:48:39 +0000
+++ event/res_partner_view.xml 2012-09-25 06:24:22 +0000
@@ -16,7 +16,7 @@
<attribute name="invisible">False</attribute>
</xpath>
<xpath expr="//page[@name='page_history']" position="inside">
- <group name="grp_event" string="Event">
+ <group name="grp_event" string="Events">
<field name="event_ids" colspan="4" nolabel="1">
<tree string="Events">
<field name="name" string="Event"/>
=== modified file 'l10n_ch/account_wizard.py'
--- l10n_ch/account_wizard.py 2011-12-19 16:54:40 +0000
+++ l10n_ch/account_wizard.py 2012-09-25 06:24:22 +0000
@@ -36,8 +36,9 @@
def execute(self, cr, uid, ids, context=None):
"""Override of code in order to be able to link journal with account in XML"""
res = super(WizardMultiChartsAccounts, self).execute(cr, uid, ids, context)
- path = addons.get_module_resource(os.path.join('l10n_ch','sterchi_chart','account_journal_rel.xml'))
+ path = addons.get_module_resource('l10n_ch','sterchi_chart','account_journal_rel.xml')
tools.convert_xml_import(cr, 'l10n_ch', path, idref=None, mode='init', noupdate=True, report=None)
+ res.update({'type': 'ir.actions.act_window_close'})
return res
WizardMultiChartsAccounts()
=== modified file 'l10n_ch/bank_view.xml'
--- l10n_ch/bank_view.xml 2012-08-08 13:06:14 +0000
+++ l10n_ch/bank_view.xml 2012-09-25 06:24:22 +0000
@@ -92,8 +92,6 @@
<newline/>
</group>
</group>
- <newline/>
- <field name="bank" />
</field>
</field>
</record>
=== modified file 'marketing_campaign/res_partner_view.xml'
--- marketing_campaign/res_partner_view.xml 2012-08-08 13:06:14 +0000
+++ marketing_campaign/res_partner_view.xml 2012-09-25 06:24:22 +0000
@@ -12,7 +12,7 @@
<attribute name="invisible">False</attribute>
</xpath>
<xpath expr="//page[@name='page_history']" position="inside">
- <group name="grp_campaign" string="Campaign">
+ <group name="grp_campaign" string="Campaigns">
<field name="workitem_ids" colspan="4" nolabel="1"/>
</group>
</xpath>
=== modified file 'membership/membership.py'
--- membership/membership.py 2012-09-03 06:22:46 +0000
+++ membership/membership.py 2012-09-25 06:24:22 +0000
@@ -338,7 +338,7 @@
-Paid Member: A member who has paid the membership amount."""),
'membership_start': fields.function(
_membership_date, multi = 'membeship_start',
- string = 'Start Membership Date', type = 'date',
+ string = 'Membership Start Date', type = 'date',
store = {
'account.invoice': (_get_invoice_partner, ['state'], 10),
'membership.membership_line': (_get_partner_id, ['state'], 10, ),
@@ -346,7 +346,7 @@
}, help="Date from which membership becomes active."),
'membership_stop': fields.function(
_membership_date,
- string = 'Stop Membership Date', type='date', multi='membership_stop',
+ string = 'Membership End Date', type='date', multi='membership_stop',
store = {
'account.invoice': (_get_invoice_partner, ['state'], 10),
'membership.membership_line': (_get_partner_id, ['state'], 10),
=== modified file 'purchase/report/request_quotation.rml'
--- purchase/report/request_quotation.rml 2012-07-14 20:51:50 +0000
+++ purchase/report/request_quotation.rml 2012-09-25 06:24:22 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<document filename="Request for Quotation.pdf">
- <template title="Request for Quotation" author="OpenERP S.A.([email protected])" allowSplitting="20">
+<document filename="test.pdf">
+ <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="23.0" y1="43.0" width="530" height="799"/>
</pageTemplate>
@@ -10,7 +10,11 @@
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
- <blockTableStyle id="Table_Address_Detail">
+ <blockTableStyle id="Tableau1">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ </blockTableStyle>
+ <blockTableStyle id="Tableau2">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
@@ -30,9 +34,16 @@
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
</blockTableStyle>
+ <blockTableStyle id="Table_Outer_Notes">
+ <blockAlignment value="LEFT"/>
+ <blockValign value="TOP"/>
+ </blockTableStyle>
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
+ <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
+ <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+ <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Standard" fontName="Helvetica"/>
<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -69,49 +80,48 @@
<images/>
</stylesheet>
<story>
- <pto>
- <pto_header>
- <blockTable colWidths="371.0,98.0,61.0" repeatRows="1" style="Table_Product_Header_Title">
- <tr>
- <td>
- <para style="terp_tblheader_Details">Description</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Centre">Expected Date</para>
- </td>
- <td>
- <para style="terp_tblheader_Details_Centre">Qty</para>
- </td>
- </tr>
- </blockTable>
- </pto_header>
<para style="terp_default_9">[[repeatIn(objects,'order')]]</para>
<para style="terp_default_9">[[ setLang(order.partner_id.lang) ]]</para>
- <blockTable colWidths="250.0,59.0,221.0" style="Table_Address_Detail">
+ <para style="terp_default_9">
+ <font color="white"> </font>
+ </para>
+ <para style="terp_default_9">
+ <font color="white"> </font>
+ </para>
+ <blockTable colWidths="250.0,59.0,221.0" style="Tableau1">
<tr>
<td>
- <para style="terp_default_Bold_9">Expected Delivery address:</para>
- <para style="terp_default_9">[[ (order.dest_address_id and order.dest_address_id.name) or (order.warehouse_id and order.warehouse_id.name) or '']]</para>
- <para style="terp_default_9">[[ order.dest_address_id and display_address(order.dest_address_id) ]] </para>
- </td>
- <td>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="terp_default_9">[[ (order.partner_id.title and order.partner_id.title.name) or '' ]] [[ order.partner_id.name ]]</para>
- <para style="terp_default_9">[[ display_address(order.partner_id) ]] </para>
- <para style="terp_default_9">
- <font color="white"> </font>
- </para>
- <para style="terp_default_9">Tel.: [[ (order.partner_id.phone) or removeParentNode('para') ]]</para>
- <para style="terp_default_9">Fax: [[ (order.partner_id.fax) or removeParentNode('para') ]]</para>
- <para style="terp_default_9">TVA: [[ (order.partner_id.vat) or removeParentNode('para') ]]</para>
+ <blockTable colWidths="250.0" style="Tableau2">
+ <tr>
+ <td>
+ <para style="terp_default_Bold_9">Expected Delivery address:</para>
+ <para style="terp_default_9">[[ (order.dest_address_id and order.dest_address_id.name) or (order.warehouse_id and order.warehouse_id.name) or '']]</para>
+ <para style="P3">[[ order.dest_address_id and display_address(order.dest_address_id) ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <para style="terp_default_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_default_9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="terp_default_9">[[ (order .partner_id and order.partner_id.title and order.partner_id.title.name) or '' ]] [[ (order .partner_id and order.partner_id.name) or '' ]] </para>
+ <para style="terp_default_9">[[ order.partner_id and display_address(order .partner_id) ]] </para>
+ <para style="terp_default_9">
+ <font color="white"> </font>
+ </para>
+ <para style="terp_default_9">Tel.: [[ (order.partner_id and order.partner_id.phone) or removeParentNode('para') ]]</para>
+ <para style="terp_default_9">Fax: [[ (order.partner_id and order.partner_id.fax) or removeParentNode('para') ]]</para>
+ <para style="P3">TVA: [[ (order.partner_id and order.partner_id.vat) or removeParentNode('para') ]]</para>
</td>
</tr>
</blockTable>
- <para style="terp_default_8">
+ <para style="Standard">
<font color="white"> </font>
</para>
<para style="terp_header">Request for Quotation : [[order.name]]</para>
@@ -132,7 +142,7 @@
</tr>
</blockTable>
<section>
- <para style="terp_default_2">[[repeatIn(order.order_line,'order_line')]]</para>
+ <para style="terp_default_9">[[ repeatIn(order.order_line,'order_line') ]]</para>
<blockTable colWidths="370.0,100.0,39.0,20.0" style="Table_Product_Line">
<tr>
<td>
@@ -153,7 +163,13 @@
<para style="terp_default_9">
<font color="white"> </font>
</para>
- <para style="terp_default_9">[[ format(order.notes or '') ]]</para>
+ <blockTable colWidths="535.0" style="Table_Outer_Notes">
+ <tr>
+ <td>
+ <para style="terp_default_9">[[ format(order.notes or removeParentNode('blockTable')) ]]</para>
+ </td>
+ </tr>
+ </blockTable>
<para style="terp_default_9">
<font color="white"> </font>
</para>
@@ -165,6 +181,5 @@
<font color="white"> </font>
</para>
<para style="terp_default_9">[[ user.signature or '' ]]</para>
- </pto>
</story>
</document>
=== modified file 'purchase/report/request_quotation.sxw'
Binary files purchase/report/request_quotation.sxw 2012-03-23 06:29:20 +0000 and purchase/report/request_quotation.sxw 2012-09-25 06:24:22 +0000 differ
=== modified file 'purchase/security/ir.model.access.csv'
--- purchase/security/ir.model.access.csv 2012-09-20 07:38:24 +0000
+++ purchase/security/ir.model.access.csv 2012-09-25 06:24:22 +0000
@@ -65,3 +65,4 @@
access_stock_location_purchase_manager,stock.location purchase manager,stock.model_stock_location,purchase.group_purchase_manager,1,0,0,0
access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,purchase.group_purchase_manager,1,0,0,0
access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,group_purchase_user,1,0,0,0
+access_purchase_order,purchase.order,model_purchase_order,base.group_partner_manager,1,0,0,0
\ No newline at end of file
=== modified file 'sale/sale.py'
--- sale/sale.py 2012-09-21 09:35:20 +0000
+++ sale/sale.py 2012-09-25 06:24:22 +0000
@@ -699,7 +699,7 @@
'invoice_lines': fields.many2many('account.invoice.line', 'sale_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
'invoiced': fields.boolean('Invoiced', readonly=True),
'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Product Price'), readonly=True, states={'draft': [('readonly', False)]}),
- 'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Account')),
+ 'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Account'), store=True),
'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes', readonly=True, states={'draft': [('readonly', False)]}),
'address_allotment_id': fields.many2one('res.partner', 'Allotment Partner'),
'product_uom_qty': fields.float('Quantity', digits_compute= dp.get_precision('Product UoS'), required=True, readonly=True, states={'draft': [('readonly', False)]}),
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
