Thibault Delavallée 9cf78e93cc [MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files. ...

bzr revid: tde@openerp.com-20140116103910-qmm2y6kucmngplnk

2014-01-16 11:39:10 +01:00

..

edi

[MERGE] forward port of branch 7.0 up to revid 9636 mat@openerp.com-20131122165504-tmbg0ixhqed4kdkz

2013-11-22 20:31:22 +01:00

i18n

Launchpad automatic translations update.

2014-01-16 06:06:51 +00:00

process

…

report

[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9718 rev-id: dle@openerp.com-20131224103535-rhtje7dnq1ie7jtb

2013-12-24 12:24:07 +01:00

security

…

static/description

[IMP] */static/description/index.html: link to /start include app name

2013-07-15 18:25:04 +02:00

test

[MERGE] forward port of branch saas-2 up to revid 9017 chs@openerp.com-20131127110552-3u2nxwu01gxj9i7m

2013-11-27 12:12:08 +01:00

wizard

[MERGE] forward port of branch 7.0 up to revid 9302 chs@openerp.com-20130718111616-apacuhc2qhquobtc

2013-07-18 13:59:28 +02:00

__init__.py

…

__openerp__.py

…

board_purchase_view.xml

…

company_view.xml

…

company.py

…

partner_view.xml

…

partner.py

[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9459 rev-id: fva@openerp.com-20130918153347-fy4nuvbm82ngfb8x

2013-09-18 18:13:05 +02:00

purchase_data.xml

…

purchase_demo.xml

…

purchase_order_demo.yml

…

purchase_report.xml

…

purchase_sequence.xml

…

purchase_view.xml

[MERGE] sync with trunk

2013-12-02 16:09:25 +01:00

purchase_workflow.xml

[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9761 revid:dle@openerp.com-20140114164804-zhfy9lb308554kp1

2014-01-14 18:36:53 +01:00

purchase.py

[MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files.

2014-01-16 11:39:10 +01:00

res_config_view.xml

…

res_config.py

[IMP]align multi-line string

2013-09-17 18:38:14 +05:30

stock_view.xml

…

stock.py

[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9691 rev-id: dle@openerp.com-20131211134120-fco4rlqjh258ba36

2013-12-11 14:43:17 +01:00