openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #01743
[Merge] lp:~openerp-dev/openobject-addons/trunk-dev-addons1-atp into lp:~openerp-dev/openobject-addons/trunk-dev-addons1
atp(OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-dev-addons1-atp into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.
Requested reviews:
Sbh (Open ERP) (sbh-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-dev-addons1-atp/+merge/44895
1) Fixed buildbot warning.
2)ADD Gantt view in project module.
Thanks
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-dev-addons1-atp/+merge/44895
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-dev-addons1-atp.
=== modified file 'base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py'
--- base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py 2010-12-28 18:18:33 +0000
+++ base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py 2010-12-30 12:05:29 +0000
@@ -344,7 +344,6 @@
parser.error("incorrect number of arguments")
import sys
- import StringIO
fname = sys.argv[1]
f = fname
=== modified file 'l10n_gr/account_tax.xml'
--- l10n_gr/account_tax.xml 2010-12-21 10:04:23 +0000
+++ l10n_gr/account_tax.xml 2010-12-30 12:05:29 +0000
@@ -213,11 +213,11 @@
<field name="ref_tax_code_id" ref="vat_code_input_S"/> -->
</record>
- <!-- *-* revise the ΦΠÎ.. -->
+ <!-- revise the tax.. -->
<record id="ovat19" model="account.tax.template">
<field name="chart_template_id" ref="l10n_gr_chart_template"/>
- <field name="name">ÎκÏοÎÏ 19</field>
+ <field name="name">Outputs 19</field>
<field eval="0.19" name="amount"/>
<field name="type">percent</field>
<field name="type_tax_use">purchase</field>
=== modified file 'mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py'
--- mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py 2010-12-29 09:16:47 +0000
+++ mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py 2010-12-30 12:05:29 +0000
@@ -55,11 +55,10 @@
# pass message as bytes because we don't know its encoding until we parse its headers
# and hence can't convert it to utf-8 for transport
res_id = self.rpc('email.server.tools', 'process_email', self.model, xmlrpclib.Binary(message), custom_values)
- except Exception, e:
+ except Exception:
logger = logging.getLogger('mail-gateway')
logger.warning('Failed to process incoming email. Source of the failed mail is available at debug level.', exc_info=True)
logger.debug('Source of the mail that failed to parse:', message)
- res_id = False
if __name__ == '__main__':
parser = optparse.OptionParser(usage='usage: %prog [options]', version='%prog v1.0')
=== modified file 'project/project_view.xml'
--- project/project_view.xml 2010-12-30 05:03:17 +0000
+++ project/project_view.xml 2010-12-30 12:05:29 +0000
@@ -153,11 +153,25 @@
</field>
</record>
+ <record id="view_project_project_gantt" model="ir.ui.view">
+ <field name="name">project.project.gantt</field>
+ <field name="model">project.project</field>
+ <field name="type">gantt</field>
+ <field name="arch" type="xml">
+ <gantt color="user_id" date_delay="planned_hours" date_start="date_start" string="Projects">
+ <level object="project.project" link="id" domain="[]">
+ <field name="complete_name"/>
+ </level>
+ </gantt>
+ </field>
+ </record>
+
<record id="open_view_project_all" model="ir.actions.act_window">
<field name="name">Projects</field>
<field name="res_model">project.project</field>
<field name="view_type">form</field>
<field name="domain">[]</field>
+ <field name="view_mode">tree,form,gantt</field>
<field name="view_id" ref="view_project"/>
<field name="search_view_id" ref="view_project_project_filter"/>
<field name="context">{'search_default_Current':1}</field>
Follow ups