Pooja Zankhariya (OpenERP) 722aee5336 [MERGE]Merge with Parent ...

bzr revid: pza@tinyerp.com-20140117062056-yaw069hktnsk3iwj

2014-01-17 11:20:56 +05: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-15 06:22:05 +00:00

process

…

report

[MRG] merge with lp:openobject-addons

2013-11-26 10:59:24 +05:30

security

[ADD] added record rules for analysis report objects.

2013-11-15 16:19:09 +05:30

static

[IMP] Backport one feature from website: this feature allows to specify a file

2014-01-09 16:45:50 +01:00

test

[MERGE] sync with trunk

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

wizard

[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

__init__.py

…

__openerp__.py

…

board_sale_view.xml

…

res_config_view.xml

[MERGE]Merge with Parent

2014-01-15 17:30:52 +05:00

res_config.py

[MERGE]Merge with Parent

2014-01-15 17:30:52 +05:00

res_partner_view.xml

…

res_partner.py

…

sale_data.xml

…

sale_demo.xml

[IMP] Backport one feature from website: this feature allows to specify a file

2014-01-09 16:45:50 +01:00

sale_report.xml

…

sale_sequence.xml

…

sale_unit_test.xml

…

sale_view.xml

[MERGE] Forward-port of latest 7.0 fixes up to rev 9629 rev-id odo@openerp.com-20131121153230-keie85rmes2zh2o8

2013-11-21 16:42:05 +01:00

sale_workflow.xml

…

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