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

Merge remote-tracking branch 'odoo/master' into master-autocompletion-ged

This commit is contained in:
Géry Debongnie 2014-06-30 16:13:38 +02:00
parent 88bb66e784 63d8fc6e8c
commit 6a174c43f6
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/report/account_invoice_report_view.xml
View File

@ -21,7 +21,7 @@
<field name="arch" type="xml">
<search string="Invoices Analysis">
<field name="date"/>
<filter icon="terp-go-year" string="Year" name="year" domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]" help="year"/>
<filter icon="terp-go-year" string="Year" name="year" domain="['|',('date', '=', False),'&amp;',('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]" help="year"/>
<separator/>
<filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft Invoices"/>
<filter string="Pro-forma" icon="terp-gtk-media-pause" domain="['|', ('state','=','proforma'),('state','=','proforma2')]" help = "Pro-forma Invoices"/>

2
addons/google_drive/google_drive_data.xml
View File

@ -5,7 +5,7 @@
<record id="config_google_drive_client_id" model="ir.config_parameter">
<field name="key">google_drive_client_id</field>
<field name="value">598905559630.apps.googleusercontent.com</field>
<field name="group_ids" eval="[(4, ref('base.group_user'))]" />
<field name="group_ids" eval="[(4, ref('base.group_system'))]" />
</record>
<record id="config_google_drive_client_secret" model="ir.config_parameter">

2
odoo.py
View File

@ -68,7 +68,7 @@ def cmd_setup_git():
git_dir = os.getcwd()
if git_dir:
# push sane config for git < 2.0, and hooks
run('git','config','push.default','simple')
#run('git','config','push.default','simple')
# alias
run('git','config','alias.st','status')
# merge bzr style