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

..

data

[FIX] account: move purchase journal from demo to data

2013-12-10 16:29:57 +01:00

demo

[FIX] account: demo opening period, add x in the name

2014-01-13 13:29:17 +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-13 05:59:13 +00:00

process

…

project

[FIX] account: move purchase journal from demo to data

2013-12-10 16:29:57 +01:00

report

[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9654 rev-id: dle@openerp.com-20131127151815-gzk9py9wtzmndziw

2013-11-27 16:21:36 +01:00

security

…

static

[MERGE] Merged lp:openobject-addons.

2013-10-21 11:26:21 +05:30

test

[MERGE] merge with addons/trunk revno 8956

2013-10-27 13:31:04 +01:00

tests

[FIX] account: correct name_search on account to be validated even at negation

2013-12-06 18:00:12 +01:00

wizard

[MERGE] forward port of branch saas-2 up to revid 9092 dle@openerp.com-20140115165506-yuux9km39gbv7k4n

2014-01-15 22:44:54 +01:00

__init__.py

…

__openerp__.py

[MERGE] Merged lp:openobject-addons.

2013-10-21 11:26:21 +05:30

account_analytic_line.py

…

account_assert_test.xml

…

account_bank_statement.py

[MERGE] account: cash register view improvements

2014-01-02 12:30:09 +01:00

account_bank_view.xml

…

account_bank.py

…

account_cash_statement.py

[MERGE] account: cash register view improvements

2014-01-02 12:30:09 +01:00

account_end_fy.xml

…

account_financial_report_data.xml

…

account_financial_report.py

…

account_installer.xml

[IMP] improved code to set default accounts in l10n_us,l10n_ma and added new currency_id field to set currency based on select coa, fixed installation time error of l10n_ve

2013-09-03 12:37:07 +05:30

account_invoice_view.xml

[MERGE] forward port of branch saas-1 up to revid 8791 chs@openerp.com-20131009175454-j06y1ngylfbqyrpj

2013-10-09 20:03:37 +02:00

account_invoice_workflow.xml

…

account_invoice.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

account_menuitem.xml

…

account_move_line.py

[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

account_pre_install.yml

…

account_report.xml

…

account_unit_test.xml

[IMP]For Supplier create supplier invoice instead of customer invoice, added address for partners.

2013-11-13 18:31:07 +05:30

account_view.xml

[MERGE] Sync with trunk

2014-01-06 14:57:00 +01:00

account.py

[MERGE] forward port of branch saas-2 up to revid 9092 dle@openerp.com-20140115165506-yuux9km39gbv7k4n

2014-01-15 22:44:54 +01:00

board_account_view.xml

…

company_view.xml

…

company.py

…

installer.py

…

ir_sequence_view.xml

…

ir_sequence.py

…

partner_view.xml

…

partner.py

[MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8797 rev-id: dle@openerp.com-20131028202715-uinjafcgpnw1nucx

2013-10-28 21:29:44 +01:00

product_view.xml

…

product.py

…

res_config_view.xml

…

res_config.py

[MERGE] forward port of branch 7.0 up to revid 9668 launchpad_translations_on_behalf_of_openerp-20131130053134-6u83vcd1133xs8yf

2013-11-30 14:00:14 +01:00

res_currency.py

…