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

..

i18n

Launchpad automatic translations update.

2014-01-10 05:32:16 +00:00

process

…

report

[MERGE] Sync with trunk

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

security

[FIX] Remove unused menu item in the mrp_securify file

2013-10-28 15:05:45 +01:00

static

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

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

test

[FORWARD] Forward port of saas-2 branch until revision 8931 tde@openerp.com-20131003140458-ztnd9taih2rcq8ty

2013-10-04 10:19:15 +02:00

tests

[FIX] stock,mrp: move multicomp user to test instead of demo data

2013-08-28 10:50:19 +02:00

wizard

…

__init__.py

…

__openerp__.py

[MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8781 rev-id: dle@openerp.com-20130923165651-0jt823r5wy37enw6

2013-09-23 19:13:10 +02:00

board_manufacturing_view.xml

…

company_view.xml

…

company.py

…

mrp_data.xml

[IMP] improve MO Reference String

2013-07-11 15:51:02 +05:30

mrp_demo.xml

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

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

mrp_report.xml

…

mrp_view.xml

[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

mrp_workflow.xml

[REM] Removed the unwanted code.

2013-09-11 18:00:44 +05:30

mrp.py

[MERGE] Forward-port of latest 7.0 fixes up to rev 9618 rev-id: dle@openerp.com-20131120142131-s333lyva85cyn41o

2013-11-20 15:43:18 +01:00

procurement.py

[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9752 revid:dle@openerp.com-20140110173823-lfekux2jxrj5v9gn

2014-01-10 18:40:38 +01:00

product.py

…

res_config_view.xml

…

res_config.py

[IMP]align multi-line string

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

stock.py

[REM] Removed the unwanted code.

2013-09-11 18:00:44 +05:30