Commit Graph

3487 Commits

Author SHA1 Message Date
Josse Colpaert 6f75507ce7 [WIP] Allow to produce more than the total qty of the production order in the last step 2014-09-03 19:19:18 +02:00
Josse Colpaert f6650f0da7 [IMP] Clean 2014-09-03 19:18:17 +02:00
Josse Colpaert 12d9333f48 [IMP] Clean 2014-09-03 19:18:17 +02:00
Josse Colpaert 9b34358196 [IMP] Adapt mrp workflow and moves + Differ between Bose speakers and Custom Computer 2014-09-03 19:18:17 +02:00
Josse Colpaert 655570fe23 [IMP] Domain on model instead of view + no production order without consume lines 2014-09-03 19:18:17 +02:00
Josse Colpaert 11828c69db [IMP] Phantom BoMs only out of services products should work 2014-09-03 19:18:16 +02:00
Josse Colpaert 28421e1e85 [IMP] Make sure normal products will still work 2014-09-03 19:18:16 +02:00
Josse Colpaert 6a071b049d [WIP] This should be enough to put sale order to delivered when all tasks have been done. Problem is that because of procurement_jit it is creating it twice 2014-09-03 19:18:16 +02:00
Josse Colpaert 1a9eb52341 [WIP] Add link with sale order by duplicating. That way sale order will be delivered when procurement is done 2014-09-03 19:18:16 +02:00
Josse Colpaert 86b8e73482 [IMP] Clean need_procurement and add partner on procurement for Phantom with service 2014-09-03 19:18:16 +02:00
Josse Colpaert 6553e22306 [WIP] Create procurement when Phantom 2014-09-03 19:18:16 +02:00
Denis Ledoux ff0f92acfa [MERGE] forward port of branch 7.0 up to 7307227 2014-09-03 18:26:53 +02:00
Denis Ledoux 73072272de [FIX] mrp: do not reset back stock moves to confirm
For instance, setting a BOM Phantom with:
Finished product: stockable, MTO Manufacture
Components: stockable, MTS, Buy. Inventory set to 1000
Stock moves of components are directly set to assigned once the procurement confirmed thanks to JIT
The stock moves should not be set back to confirmed after they have been assigned
2014-09-03 18:25:19 +02:00
Fabien Pinckaers 8aca457e34 [IMP] Updated website urls on modules and info page 2014-08-26 21:40:18 +02:00
Olivier Dony 50ef63881a [I18N] Update 8.0 translation with latest source code 2014-08-14 17:01:54 +02:00
Olivier Dony 96c36e895c [I18N] Update all 7.0 translation templates with latest terms and annotations
Total new terms: 168
Total deleted terms: 95
Total identical terms: 16329
(Some modules skipped, typically all l10n_* modules)
2014-08-14 02:24:24 +02:00
Josse Colpaert 242d25c9c2 [FIX] Don't change to product_uom_qty if not move 2014-08-12 13:37:27 +02:00
Josse Colpaert 5dea263e1b [FIX] Change two-one step wh, multi-comp wh, quantity field float, show product_uom_qty instead of product_qty in mrp production for moves 2014-08-12 13:37:27 +02:00
Josse Colpaert 4aa9ef8224 [IMP] Type manufacturing orders, remove double accounting entries, child_of, push rule global has no route 2014-08-12 13:37:26 +02:00
Josse Colpaert dd4bf0b7ed [IMP] Condition tag would not be upgraded when migrating 2014-08-12 13:37:26 +02:00
Fabien Pinckaers ef944dcd55 [IMP] Maifest for Github README.md on main apps 2014-08-12 11:33:15 +02:00
Denis Ledoux 625aa7e75d [MERGE] forward port of branch saas-5 up to 7d7f6fe 2014-08-05 16:04:58 +02:00
Florian Hatat c4f5caa511 [FIX] mrp: Fix spelling error on 'manufacturing'
Changing .po files to avoid to retranslate existing terms.
Fixes #1328
2014-08-05 11:11:49 +02:00
Martin Trigaux 4d8337fec8 [FIX] mrp: better selection of bom
When searching for a bom based on a product.product, the method used to return any bom linked to the template (so searching for bom for variant A could return bom for variant B if both share the same product.template).
This will allow to return bom not linked to a variant without returning the one of another variant (opw 609358)
2014-08-04 16:28:18 +02:00
Martin Trigaux 4152e99bbd [FIX] mrp: duplicated find bom buttons
The product_id field is not required on a mrp.bom (while product_tmpl_id is). When searching for BOMs linked to a product.product, we should display the one specific to this product and the ones linked to the template (but not linked to another variant).
2014-08-04 14:43:28 +02:00
Martin Trigaux eda2f064cf [FIX] stock: backport of rev 0a6d63b 2014-07-28 09:35:25 +02:00
Richard Mathot 6f1b820d33 [REF] OpenERP --> Odoo in various UI texts (2)
Some things missed by commit 8b67a7202d
2014-07-18 14:59:38 +02:00
rlu-odoo 8b67a7202d [REF] OpenERP --> Odoo in various UI texts
Rebranding has been done in:
- data/demo files
- html templates
- help notices
- comments
- logger messages
- and other various messages

(Commit taken from odoo-dev:8.0-improve-openerp-odoo-rlu at rev 7deaa08)

Closes #1260
2014-07-18 13:45:41 +02:00
Josse Colpaert 0aad6b0498 [IMP] Check other comments on pull request: xmlid, no split in context + continue improve receipts instead of receptions 2014-07-16 11:58:22 +02:00
Josse Colpaert db715f99f4 [IMP] Change reception to receipt 2014-07-16 10:23:57 +02:00
Josse Colpaert 32dd003d60 [MERGE] Resolve conflicts 8.0 2014-07-13 09:27:20 +02:00
Martin Trigaux 0a6d63b82c [FIX] product: unfuck templates and products in views
product.product reuses most of the product.template views however some parts need to be excluded or replaced.
Instead of adding template only parts in base view and removing it for product, split the views in 'common' (product_template_form_view), 'template only' (product_template_only_form_view) and 'product only' (product_normal_form_view) where the first is inherited by the other two. The attribute mode='primary' on both second views allows to make sure that future inheritance of product_template_form_view and product_template_only_form_view will work with the full rendered product_template_form_view view.
This allows us to have valid buttons in crm for bill of material (filters based on active_id).
Also cleaning the mess with circular dependencies.
2014-07-11 17:03:04 +02:00
Josse Colpaert beb12f71f1 Merge branch 'odoo/8.0' into master-wmsstaging4-jco 2014-07-07 23:34:42 +02:00
Josse Colpaert bdfdba0de4 [IMP] Update manufacturing 2014-07-07 23:33:47 +02:00
Josse Colpaert 2518767005 [IMP] Start of extra primary view on product template that is not inherited by product_product 2014-07-07 21:45:11 +02:00
Josse Colpaert af0e9b8aa6 [MERGE] Fix copy_data for merge 2014-07-07 14:33:01 +02:00
Josse Colpaert e905fdfa3a Merge branch 'masterwmsstaging4views-jco' into master-wmsstaging4-jco 2014-07-07 14:15:03 +02:00
Raphael Collet 630580df7f [FIX] signal_XXX -> signal_workflow: forgot quotes around signal name 2014-07-07 13:12:37 +02:00
Raphael Collet 33eb3dffb2 [REM] models: remove the magic methods signal_XXX() 2014-07-07 11:50:30 +02:00
Raphael Collet cbe2dbb672 [MERGE] new v8 api by rco
A squashed merge is required as the conversion of the apiculture branch from
bzr to git was not correctly done. The git history contains irrelevant blobs
and commits. This branch brings a lot of changes and fixes, too many to list
exhaustively.

- New orm api, objects are now used instead of ids
- Environements to encapsulates cr uid context while maintaining backward compatibility
- Field compute attribute is a new object oriented way to define function fields
- Shared browse record cache
- New onchange protocol
- Optional copy flag on fields
- Documentation update
- Dead code cleanup
- Lots of fixes
2014-07-06 17:05:41 +02:00
Josse Colpaert b414e05a41 [IMP] Adapt views of product template start 2014-06-30 09:26:49 +02:00
Josse Colpaert a3390b0f96 [IMP] Try to solve BoM expansion + check for context for splitting/copying moves 2014-06-27 15:33:07 +02:00
Josse Colpaert 82664ba614 [IMP] Put produce_delay and track_production on product_template 2014-06-26 18:12:10 +02:00
Josse Colpaert bdda11ab40 [IMP] Update views and production_delay and track_production should go to product_template 2014-06-26 17:52:37 +02:00
Josse Colpaert 2dfd5e70a8 Merge remote-tracking branch 'odoo/master' into master-wmsstaging4-jco 2014-06-26 11:28:11 +02:00
Josse Colpaert 89041fafce [FIX] Take into account that location_id of routing can be empty 2014-06-25 18:17:32 +02:00
Jaydeep Barot 026e38b48f [REM] Unnecessary `size` parameters on char fields 2014-06-25 17:13:43 +02:00
qdp-odoo 7b32559e22 Merge pull request #598 from odoo-dev/master-wmsstaging3-jco
ooookay
2014-06-20 16:55:29 +02:00
Josse Colpaert f1afeb680b [NOIMP] Create move before other move when routing location is different from production source location 2014-06-19 16:58:52 +02:00
Christophe Simonis eef6330c55 [MERGE] forward port of branch saas-5 up to adf07a9 2014-06-19 16:23:32 +02:00
Christophe Simonis adf07a9490 [MERGE] forward port of branch saas-4 up to 5087612 2014-06-19 16:13:35 +02:00
Christophe Simonis 5087612d1d [MERGE] forward port of branch saas-3 up to bf53aed 2014-06-19 15:44:07 +02:00
Christophe Simonis bf53aeda94 [MERGE] forward port of branch 7.0 up to e5533d0 2014-06-19 15:32:32 +02:00
Najlaâ El Khayat e7285c6e1d Production : Source location of the BOM
Use the source location defined on the current MO's routing not directly on the BOM
2014-06-19 14:51:32 +02:00
Josse Colpaert 6b63d40145 [MERGE] Merge from master and resolve conflict 2014-06-17 16:23:44 +02:00
Josse Colpaert f71addb14d [IMP] no label on consume lines in wizard 2014-06-17 11:47:53 +02:00
Christophe Matthieu 96f038a6ab [IMP] product: all left menu item became product.template's action 2014-06-16 17:16:50 +02:00
ged-odoo 74168c4e9d Merge pull request #272 from odoo-dev/master-inline-searchview-ged
[MERGP] Inline Searchview

This task split the searchview in two parts: SearchView and SearchViewDrawer. The drawer is displayed inside the main view and the searchview stays in place.  It also changes the scrolling behavior of the web client: the main view area can scroll without affecting the UI (so the various menus stays in place)

Because of this, other large changes have been made:

the drawer has been redesigned,
the Custom Filter widget has been split in two (Custom Report and SaveCurrentFilter),
the main view is now scrollable, so the UI stays in place and only the view can change
The text 'Group By...' has been changed into 'Group By' (most addons had to be modified)
bootstrap classes are used when it makes sense (for example, badge)
the left menu is also scrollable (separately from the main view)

It is likely that some stupid bugs have been introduced.  Please don't hurt me.
2014-06-12 16:27:11 +02:00
Fabien Meghazi faa09da325 Removed version="7.0" from form views 2014-06-12 09:09:59 +02:00
Géry Debongnie 8202561511 Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged 2014-06-10 11:43:17 +02:00
Josse Colpaert 1c04f4d3d1 Merge remote-tracking branch 'odoo/master' into master-wmsstaging3-jco 2014-06-10 10:32:36 +02:00
Christophe Matthieu fabbcf508f [FIX] mrp.bom: wrong check for bom_find. If the user defined a bom line type phantom to a product without bom the check is wrong to display the error message. 2014-06-04 18:44:02 +02:00
Josse Colpaert ac943b0307 [IMP] Change mrp lots to depend on lots and not on packing 2014-06-03 09:21:57 +02:00
Géry Debongnie 080b473d1d [FIX] fix wrong conflict resolution in merge
The merge #5142037 from odoo/master in local branch was wrong.
I basically overwrote the changes from master.  This commit resolves
the issue correctly.
2014-05-30 11:03:06 +02:00
Géry Debongnie 514203743d Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
Conflicts:
	addons/mrp/mrp_view.xml
2014-05-30 10:29:30 +02:00
Christophe Matthieu 435b5b9ca3 [IMP] product: rename fields variant_ids into attribute_line_ids on the template and attribute_value_ids on the product. 2014-05-28 19:42:15 +02:00
Christophe Matthieu 6958d56a66 [IMP] product: fixes for review 2014-05-28 18:30:03 +02:00
Christophe Matthieu be8e10097d [FIX] mrp: demo data is wrong don't produce ipad but pc 2014-05-28 12:26:57 +02:00
Christophe Matthieu 256a17d419 [IMP] product: rename field variants_ids to respect odoo typo; add demo data for mrp 2014-05-28 11:46:32 +02:00
Christophe Matthieu 43977deb71 [IMP] product: refactoring of product variant. The main view became the view of product template and the product product (or product variant) are created with the variant values combinaison. Bom is splitted into bom and bom line and can use the variant combinaison. 2014-05-27 09:42:52 +02:00
Olivier Dony 2af03e1b6e [MERGE] Forward-port latest 7.0 bugfixes, up to f8671cb 2014-05-22 16:44:33 +02:00
Olivier Dony 02035b27b8 [RESTORE] Restore *.sxw files, skipped during bzr-to-git conversion to discard older binary blobs 2014-05-22 14:07:15 +02:00
Géry Debongnie 555677f14d [IMP] replace all 'Group By...' by 'Group By'
in all searchview, the 'Group By...' looks weird, next to the Custom
Reports and Filters.  This change was requested by the upper management
2014-05-22 11:44:35 +02:00
Launchpad Translations on behalf of openerp f173d926c8 Launchpad automatic translations update. 2014-05-13 06:28:52 +00:00
Quentin (OpenERP) 168b8e1d5e [REM] removed old conflicting files badly merged (?)
bzr revid: qdp-launchpad@openerp.com-20140508143825-owheu6q219d8qbww
2014-05-08 16:38:25 +02:00
Quentin (OpenERP) 223096b9ae [FIX] mrp: removing product_qty from stock move creation
bzr revid: qdp-launchpad@openerp.com-20140508115917-oev3zxahuh16zfk0
2014-05-08 13:59:17 +02:00
Quentin (OpenERP) 70eb74a260 [MERGE] merged with trunk up to revision 9425. Needs to find another icon for Traceability on lot, though
bzr revid: qdp-launchpad@openerp.com-20140507182917-erjammra4okyei1c
2014-05-07 20:29:17 +02:00
Quentin (OpenERP) 5b93981087 [FIX] mrp: wrong field set when copying move
bzr revid: qdp-launchpad@openerp.com-20140507172446-pywoej0ryovue5y3
2014-05-07 19:24:46 +02:00
Quentin (OpenERP) 661c109189 [FIX] procurement.rule._get_action() needs to be translatable
bzr revid: qdp-launchpad@openerp.com-20140507171431-jtyz901xmej6elmp
2014-05-07 19:14:31 +02:00
Quentin (OpenERP) 0d96d46138 [REF] mrp: moving some data updating in .XML file instead of having a new .YML file for it
bzr revid: qdp-launchpad@openerp.com-20140507171205-eop6g5p59mdig49r
2014-05-07 19:12:05 +02:00
Olivier Dony 083108a624 [IMP] delivery,stock,mrp: minor cleanup/spellchecking/nit-picking while reviewing
bzr revid: odo@openerp.com-20140507165951-th4iqsrp6l67dvve
2014-05-07 18:59:51 +02:00
Gery Debongnie 5e5333a1e9 [FIX] code cleanup (addon mrp)
change the way bom_count, bom_strct and mo_count are computed, removes the try/except/pass statements, improves the logic.

Also, for some reason, bom_strct is the same as bom_count, but I don't really know what it is supposed to be, and the Bom Structure and Bill of materials buttons leads to views with the same number of items.

bzr revid: ged@openerp.com-20140507125248-ctv491ktx008v9ic
2014-05-07 14:52:48 +02:00
Launchpad Translations on behalf of openerp f426972e37 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140430070138-uuemdpfseyysxlvs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140502064550-9r0c2t3tr8dp1hwu
bzr revid: launchpad_translations_on_behalf_of_openerp-20140501063929-ta3t6lhed5dpdz9a
bzr revid: launchpad_translations_on_behalf_of_openerp-20140502064608-1zwt52snc5pg5kfi
bzr revid: launchpad_translations_on_behalf_of_openerp-20140504062721-dgb7m6o6ge2btumg
2014-05-04 06:27:21 +00:00
Gery Debongnie 5aa2fa150c [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
2014-05-02 15:07:53 +02:00
Josse Colpaert 8b84615de1 [MERGE] Merge from trunk test
bzr revid: jco@openerp.com-20140502130352-c3h1fk332eqyd78b
2014-05-02 15:03:52 +02:00
Antony Lesuisse 7e25b9ae55 [MERGE] saas-4 report_webkit missing dependency on report
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
2014-05-01 18:11:56 +02:00
Richard Mathot (OpenERP) d0e9ba289f [MERGE] from trunk
bzr revid: rim@openerp.com-20140429124452-5cvpmtpyz2daj8w2
2014-04-29 14:44:52 +02:00
Richard Mathot (OpenERP) f9b97239f6 [FIX] mrp: missing dependency to report
bzr revid: rim@openerp.com-20140429085836-7goilzvlolal79bp
2014-04-29 10:58:36 +02:00
Richard Mathot (OpenERP) 65f2db5c21 [MERGE] from trunk
bzr revid: rim@openerp.com-20140429081937-hhqcg84o7iha78fq
2014-04-29 10:19:37 +02:00
Richard Mathot (OpenERP) 2c3ec2c7e4 [REM] mrp/stock: remmove ACLs related to removed dashboards
bzr revid: rim@openerp.com-20140429081808-hytvlkp461zm2l4o
2014-04-29 10:18:08 +02:00
Quentin (OpenERP) cba2365d95 [MERGE] branch of jco fixing shipping exception in mrp + cancellation in chained moves
bzr revid: qdp-launchpad@openerp.com-20140425132449-s7e8duh884rirrqz
2014-04-25 15:24:49 +02:00
Quentin (OpenERP) f402240ade [MERGE] stock usability improvements
bzr revid: qdp-launchpad@openerp.com-20140424143838-a3so6ouc1q3la3ch
2014-04-24 16:38:38 +02:00
Christophe Simonis 7a7d7febf8 [MERGE] forward port of branch saas-3 up to revid 9429 chs@openerp.com-20140424123538-rxk9got9k2on1ki1
bzr revid: chs@openerp.com-20140424131824-4ksluvhnegp7kplb
bzr revid: chs@openerp.com-20140424134533-lhhcd32n3s0m9cqk
2014-04-24 15:45:33 +02:00
Quentin (OpenERP) c4ea48fd68 [FIX] mrp: produced lines weren't linked to the MO + used the quantities entered in wizard as real quantities to consume
bzr revid: qdp-launchpad@openerp.com-20140423150503-n14hk4cvgdxvlrjp
2014-04-23 17:05:03 +02:00
Josse Colpaert 7a8222631e [IMP] Make sure the propagation of moves cancels procurements where necessary + manufacture and purchase cancel is not propagated by default
bzr revid: jco@openerp.com-20140423141700-60gbuxb4atp1z6ek
2014-04-23 16:17:00 +02:00
Josse Colpaert 5807343602 [MERGE] Merge from trunk-wms
bzr revid: jco@openerp.com-20140423095528-h4dpd9gdmh8lmk6j
2014-04-23 11:55:28 +02:00
Josse Colpaert 8015980e33 [FIX] Add makeproductionproduceline
bzr revid: jco@openerp.com-20140423095258-vpy4dz57sus1l8vp
2014-04-23 11:52:58 +02:00
Josse Colpaert af0468c418 [WIP] Remove picking except state on mrp order
bzr revid: jco@openerp.com-20140423094807-za7855wkx2vlr0di
2014-04-23 11:48:07 +02:00
Josse Colpaert 40ddf95867 [IMP] Remove procurement creation when confirming production without produce line
bzr revid: jco@openerp.com-20140423094026-gfmghsgpxvk5vng9
2014-04-23 11:40:26 +02:00
Quentin (OpenERP) 44f1f7f73e [MERGE] merged the branch of jco with simplification of negative quants treatment, using a list of fallback domains and recomputing the state of move if we took some quants that were preeviously reserved for something else
bzr revid: qdp-launchpad@openerp.com-20140422145954-89jfnqw34u703h98
2014-04-22 16:59:54 +02:00
Josse Colpaert f119c72f5b [IMP] Help messages for warehouse settings
bzr revid: jco@openerp.com-20140422123326-1fuwmkja041j34yn
2014-04-22 14:33:26 +02:00
Quentin (OpenERP) 57cebaaac6 [MERGE] merged trunk up to revision 9365.
bzr revid: qdp-launchpad@openerp.com-20140422092815-f4tlfmo8zj1nogbl
2014-04-22 11:28:15 +02:00
Anael Closson e3ecf7f4d4 [FIX] en_US typos - opw 606919
bzr revid: acl@openerp.com-20140422085837-9flv9ksh54ymvv7i
2014-04-22 10:58:37 +02:00
Josse Colpaert a7d4e518ae [IMP] Action assign button on production order + quant_ids readonly on serial number
bzr revid: jco@openerp.com-20140422085831-yt7hdb3catb5w00q
2014-04-22 10:58:31 +02:00
Richard Mathot (OpenERP) a64ff2696c [MERGE] from trunk
bzr revid: rim@openerp.com-20140422075452-cr8vy4u45l3tcj1u
2014-04-22 09:54:52 +02:00
Launchpad Translations on behalf of openerp fa60b90c1f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
2014-04-22 07:52:47 +00:00
Josse Colpaert 24023677ef [IMP] Simplify negative quants reconciliation and add extra fallback domain to be able to still take from other moves
bzr revid: jco@openerp.com-20140417152432-s12qpgskqvwvyslp
2014-04-17 17:24:32 +02:00
Darshan Kalola (OpenERP) cccc7a3d0c [MERGE]sync with trunk.
bzr revid: dka@tinyerp.com-20140417132329-sd2skyprb3nt88uw
2014-04-17 18:53:29 +05:30
Josse Colpaert b1f3a496c6 [IMP] Correct for new way of stock valuation, add source
bzr revid: jco@openerp.com-20140416151825-et2m2syyt7duaffi
2014-04-16 17:18:25 +02:00
Gery Debongnie f57b767361 [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140415150146-5ovdjzta58t5dhd2
2014-04-15 17:01:46 +02:00
Bharat R. Devnani (OpenERP) aa0e0a9c6a [MERGE] merged with main addons
bzr revid: bde@tinyerp.com-20140415060953-lkos2db3ddxz1i4y
2014-04-15 11:39:53 +05:30
Randhir Mayatra rma-openerp c399e1daaf [MERGE] merge with latest trunk and resolve conflicts
bzr revid: rma@tinyerp.com-20140414110149-r3l00xr8l08ex7oc
2014-04-14 16:31:49 +05:30
Quentin (OpenERP) 398d96f273 [MERGE] merged trunk up to revision 9327
bzr revid: qdp-launchpad@openerp.com-20140414094743-hv0u7qhigv1to2uc
2014-04-14 11:47:43 +02:00
Launchpad Translations on behalf of openerp 001a034e58 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412094159-mhy3v2prb3ctx32k
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412094217-3u3f03f0wjhbzyo4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140413062047-z833pejjrtuhfygs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140414055948-intynzk8l823ukei
2014-04-14 05:59:48 +00:00
Launchpad Translations on behalf of openerp e82fbf7d91 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
2014-04-12 08:31:53 +00:00
Randhir Mayatra rma-openerp 85714eabb6 [MERGE] merge with latest trunk
bzr revid: rma@tinyerp.com-20140411062328-srzutp1ln9xe7sxq
2014-04-11 11:53:28 +05:30
Gery Debongnie 2e9ee9c76e [MERGE] merge from rma branch
bzr revid: ged@openerp.com-20140410145131-fj17mdpi13wa5a9m
2014-04-10 16:51:31 +02:00
Randhir Mayatra rma-openerp 9dbaa58694 [MERGE] merge with latest trunk
bzr revid: rma@tinyerp.com-20140407102440-ngtr58o2w2ypqrol
2014-04-07 15:54:40 +05:30
Christophe Simonis 4a701cb168 [MERGE] forward port of branch 7.0 up to revid 9956 odo@openerp.com-20140404135145-t8b0m2ijcq3y8sh6
bzr revid: chs@openerp.com-20140404161713-8w2c9y05l4dzzd9s
2014-04-04 18:17:13 +02:00
Lionel Sausin a386aea7d3 [FIX] revert to v7 report API
bzr revid: ls@numerigraphe.com-20140404124036-1vt0fkakfllj1qax
2014-04-04 14:40:36 +02:00
Simon Lejeune 4983f86d81 [MERGE] trunk
bzr revid: sle@openerp.com-20140407174534-pk6b5lozvik78fom
2014-04-07 19:45:34 +02:00
Christophe Simonis 0fad8159f3 [MERGE] forward port of branch saas-3 up to revid 9380 chs@openerp.com-20140407144439-10n8fs6zovodwwtx
bzr revid: chs@openerp.com-20140407163318-hh3jwfkj3o2c83lk
2014-04-07 18:33:18 +02:00
Martin Trigaux af64d6cc97 [FIX] changes made at merge time into the trunk - remove offending test
bzr revid: ls@numerigraphe.com-20140404123655-9ihrychuho6n6qt2
2014-04-04 14:36:55 +02:00
Foram Katharotiya (OpenERP) bae4c6ce40 [IMP] bring back the tests for MRP - backported from little after v7.0 in the trunk
lp bug: https://launchpad.net/bugs/1182515 fixed

bzr revid: ls@numerigraphe.com-20140404123003-cdt5zz1vmupbgd1j
2014-04-04 14:30:03 +02:00
Randhir Mayatra rma-openerp 4c0f7b1be8 [IMP] improve strings and project view
bzr revid: rma@tinyerp.com-20140404112926-716zimuh3p2ec80k
2014-04-04 16:59:26 +05:30
Josse Colpaert 7fd703f58d [MERGE] Merge from trunk-wms
bzr revid: jco@openerp.com-20140404143809-0qi14pmi5762iycp
2014-04-04 16:38:09 +02:00
Josse Colpaert 1f03b8a901 [IMP] Add use case + review gde + mrp
bzr revid: jco@openerp.com-20140404143655-b55777mcowm6vlwi
2014-04-04 16:36:55 +02:00
Quentin (OpenERP) b2e76edeb3 [MERGE] merged branch that speed up the MO confirmation by confirming all the stock move in a row. Courtesy of Holger Brunn (Therp).
bzr revid: qdp-launchpad@openerp.com-20140403092444-jv3l2ed8719vjek8
2014-04-03 11:24:44 +02:00
Simon Lejeune 33471e966f [FIX] missing dependancies of report module
bzr revid: sle@openerp.com-20140403091818-6evr0k4r2k4818j1
2014-04-03 11:18:18 +02:00
Quentin (OpenERP) ff4726ea7d [MERGE] merged trunk up to revision 9281
bzr revid: qdp-launchpad@openerp.com-20140403081427-7xpn57wdfv08v2al
2014-04-03 10:14:27 +02:00
Quentin (OpenERP) fe0e95d29b [IMP] procurement: removed the schedule_range field on res.company which was error prone and not really usefull + made the scheduler run in SUPERUSER to avoid intercompany and access rights issues + made the run of procurement as SUPERUSER too for the same reasons
bzr revid: qdp-launchpad@openerp.com-20140403071010-5mrox75rkufur2nw
2014-04-03 09:10:10 +02:00
Simon Lejeune 106d06ce5d [IMP] account* reports: removed unused class/report/commented code/test, added the abstract_report wrapper on all old style report classes + some fixes on views and wizards in order to use these classes to render the qweb reports
bzr revid: sle@openerp.com-20140402164053-gry12scy8zca68lv
2014-04-02 18:40:53 +02:00
Launchpad Translations on behalf of openerp 16ce262c33 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140329073038-m7q4sxpb8tprh00r
bzr revid: launchpad_translations_on_behalf_of_openerp-20140330061549-r3t0pecngy76c2rw
bzr revid: launchpad_translations_on_behalf_of_openerp-20140331064021-x3wjc8s4oa0ncq95
bzr revid: launchpad_translations_on_behalf_of_openerp-20140401065325-w3viflz7c33n4uis
bzr revid: launchpad_translations_on_behalf_of_openerp-20140402064459-d7e3d8nwo8famjh6
2014-04-02 06:44:59 +00:00
Quentin (OpenERP) 5b980f2b29 [IMP] mrp: in order to keep consistancy between former versions, the stock move created for raw materials of procuction orders are now checking if the product is configured as MTO or MTS
bzr revid: qdp-launchpad@openerp.com-20140401133240-3l0r95s1k5z3detr
2014-04-01 15:32:40 +02:00
Quentin (OpenERP) c5d92d9e1f [REF] mrp: some code cleaning since procure_method and supply_method doesn't exist on the product anymore
bzr revid: qdp-launchpad@openerp.com-20140401132233-2odtndrvudu5ka7q
2014-04-01 15:22:33 +02:00
Josse Colpaert 43eda68346 [IMP] Take procure method for raw materials from the fact if they have an MTO route
bzr revid: jco@openerp.com-20140401125104-tldaylxxk9gpu9wc
2014-04-01 14:51:04 +02:00
Quentin (OpenERP) ee59f57de9 [FIX] fixed references to old module mrp_jit now renamed into procurement_jit
bzr revid: qdp-launchpad@openerp.com-20140327213201-94z0g64ft8lfmpc4
2014-03-27 22:32:01 +01:00
Launchpad Translations on behalf of openerp 51aa261b44 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
2014-03-27 07:35:04 +00:00
Quentin (OpenERP) e0b27b4ee8 [MERGE] merged trunk up to revision 9251
bzr revid: qdp-launchpad@openerp.com-20140326152751-b6bo0fawrzmd71f0
2014-03-26 16:27:51 +01:00
Holger Brunn ab7926a4d8 [IMP] collect stock moves to confirm and do that in a batch
[IMP] avoid extra browse when creating stock move

lp bug: https://launchpad.net/bugs/1297353 fixed

bzr revid: hbrunn@therp.nl-20140325152152-l6elzlya0m5a5wmp
2014-03-25 16:21:52 +01:00
Randhir Mayatra rma-openerp c086291ddd [MERGE] merge with latest trunk
bzr revid: rma@tinyerp.com-20140325135635-rev8asknqwk08svy
2014-03-25 19:26:35 +05:30
Randhir Mayatra rma-openerp 96ea9392aa [IMP] convert button into stat button for products
bzr revid: rma@tinyerp.com-20140324135621-13t191kmnn6t22jk
2014-03-24 19:26:21 +05:30
Simon Lejeune 1128743932 [FIX] Added the decorator website on the get_file route, correctly pass the context on the mrp bom structure and allow to install report module without pypdf installed
bzr revid: sle@openerp.com-20140321122103-mzp465s8hxckq4ai
2014-03-21 13:21:03 +01:00
Simon Lejeune 57e6e8fd28 [FIX] Multiples fixes: correct context passing, changed osv.Model to osv.AbstractModel to avoid creating tables in database when the model use for the reports contains only method
bzr revid: sle@openerp.com-20140321105806-0bwo992995la91fe
2014-03-21 11:58:06 +01:00
Launchpad Translations on behalf of openerp 2fa6706037 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140321065150-vovy9a0q2y6vkwm4
2014-03-21 06:51:50 +00:00
Simon Lejeune d941bce076 [FIX] Adapted mrp bom structure (exit controller, added model)
bzr revid: sle@openerp.com-20140320142520-3qapc7039q46eg9k
2014-03-20 15:25:20 +01:00
Launchpad Translations on behalf of openerp 1f3c4f852f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140319063002-sd17jxb37ycogrrz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140320061944-bwpy0lt1bp5ee0y2
2014-03-20 06:19:44 +00:00
Jitendra Prajapati (OpenERP) 35e9dd0aa5 [MERGE]with main branch
bzr revid: jpr@tinyerp.com-20140319063549-7jjr6i5tdqitq2jy
2014-03-19 12:05:49 +05:30
Launchpad Translations on behalf of openerp 9965b2c434 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140315072920-dmiymtbhrgu87wm0
bzr revid: launchpad_translations_on_behalf_of_openerp-20140316060652-akf1fti2hc1a9vmm
bzr revid: launchpad_translations_on_behalf_of_openerp-20140317050959-2xx2aoylhn6a28fo
2014-03-17 05:09:59 +00:00
Christophe Simonis d504764eff [MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852-3ft0v1mc9ht1any6
bzr revid: chs@openerp.com-20140311145205-s56fj113fsrnisc3
2014-03-11 15:52:05 +01:00
Quentin (OpenERP) da210e4b5e [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20140311132813-0gmbof2u8nmgv9p3
2014-03-11 14:28:13 +01:00
Denis Ledoux 74af3ac0fe [MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9144 revid:dle@openerp.com-20140310133913-465x5t3n1bo7fu98
bzr revid: dle@openerp.com-20140310143600-kz7qjfe4p63s0a34
2014-03-10 15:36:00 +01:00
Denis Ledoux c2ba11e72e [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9885 revid:dle@openerp.com-20140310114026-r0ijm0m36su19wn7
bzr revid: dle@openerp.com-20140310122101-gicombyc5ii0yz6a
2014-03-10 13:21:01 +01:00
Launchpad Translations on behalf of openerp f166daf065 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140308065427-0he29w0cqe07xmc8
bzr revid: launchpad_translations_on_behalf_of_openerp-20140308065421-4udfyb7xcfq5h1zy
bzr revid: launchpad_translations_on_behalf_of_openerp-20140309060314-64jktl10pkq3inv4
2014-03-09 06:03:14 +00:00
Launchpad Translations on behalf of openerp fd98bf36aa Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140307072427-zkvqj45icrzupx0m
bzr revid: launchpad_translations_on_behalf_of_openerp-20140307072433-0lqpjt07j1s8k8cs
2014-03-07 07:24:33 +00:00
Martin Trigaux 5db649549c [IMP] mrp: use also the ceiling method from product
bzr revid: mat@openerp.com-20140306094504-37r691hxcemp0ual
2014-03-06 10:45:04 +01:00
Launchpad Translations on behalf of openerp b201dc79b7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140218054104-8egkh4jj7hiiwuih
bzr revid: launchpad_translations_on_behalf_of_openerp-20140219054048-688twg0fubtm2x2q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140220054214-237ri67t9rw3l4fu
bzr revid: launchpad_translations_on_behalf_of_openerp-20140221063855-wniw42r27gyg3h6y
bzr revid: launchpad_translations_on_behalf_of_openerp-20140222073328-xpn7nwqz407yzumq
bzr revid: launchpad_translations_on_behalf_of_openerp-20140223074516-0r09cpmma58ylqji
bzr revid: launchpad_translations_on_behalf_of_openerp-20140224060319-535oheaq2w9u2ye3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140225062420-zl7curej0e0warhz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140226073146-3vzhw4hddr81olbs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140227062959-24e2rn98rqb9afpr
bzr revid: launchpad_translations_on_behalf_of_openerp-20140228072152-f9gm4ud1wu19ge27
bzr revid: launchpad_translations_on_behalf_of_openerp-20140301055205-r0df0fqz9yf5z66i
bzr revid: launchpad_translations_on_behalf_of_openerp-20140302052638-bjf11oumy7w15oco
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304082704-k1z2te1tfud43zy3
2014-03-04 08:27:04 +00:00
Launchpad Translations on behalf of openerp 9863dbe5c8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
2014-03-04 07:52:38 +00:00
Sunil Sharma (OpenERP) 16c05082c8 [remove]:mrp dashboard file
bzr revid: sunilsharma.sharma07@gmail.com-20140304070810-282vhtpg3mduym0j
2014-03-04 12:38:10 +05:30
Sunil Sharma (OpenERP) dd4813e360 [mrg]:lp:openobject-addons
bzr revid: sunilsharma.sharma07@gmail.com-20140304063937-vyrt063gzfhsoy4k
2014-03-04 12:09:37 +05:30
Quentin (OpenERP) e36b32a661 [MERGE] merged with main trunk (revision 9186)
bzr revid: qdp-launchpad@openerp.com-20140228131516-ihigousbe5p1nt68
2014-02-28 14:15:16 +01:00
Simon Lejeune d64c4a3f17 [FIX] mrp: removed empty files and barcode controller value set to path in order to be able to receive URL
bzr revid: sle@openerp.com-20140224151944-dqi63kjvyejp6xja
2014-02-24 16:19:44 +01:00
Simon Lejeune 62538c61e3 [IMP] Converted mrp BOM Structure to QWeb
bzr revid: sle@openerp.com-20140224103453-0s60blgbk7e3ho5n
2014-02-24 11:34:53 +01:00
Simon Lejeune 35b64811e9 [MERGE] trunk
bzr revid: sle@openerp.com-20140221095425-9043pbzjy7rtbxd1
2014-02-21 10:54:25 +01:00
Christophe Simonis 4b72678bc7 [MERGE] forward port of branch saas-2 up to revid 9195 chs@openerp.com-20140220154517-6y531n1mqtnfnsmr
bzr revid: chs@openerp.com-20140220163815-69sza1kclnh5mavs
2014-02-20 17:38:15 +01:00
Josse Colpaert d5cdec9e16 [MERGE] Merge from trunk-wms
bzr revid: jco@openerp.com-20140219145719-snazgq9oe9q0idrs
2014-02-19 15:57:19 +01:00
Simon Lejeune fabc1cdd40 [FIX] renamed ir.actions.report.paperformat model to report.paperformat, renamed html_skeleton to html_container in report layouts and renamed paperformat.py file to report_paperformat.py
bzr revid: sle@openerp.com-20140218155347-tfxlndg9wgaw0bv1
2014-02-18 16:53:47 +01:00
openerp-sle 2445e9f0bc [MERGE] trunk
bzr revid: openerp-sle@openerp-sle.home-20140216103609-ihf3bz4nf4rds5ue
2014-02-16 11:36:09 +01:00
openerp-sle bccafbdae0 [IMP] Converted the mrp production production order to QWeb
bzr revid: openerp-sle@openerp-sle.home-20140214180052-pbluhvtg0ptl7m2c
2014-02-14 19:00:52 +01:00
Quentin (OpenERP) 4ad9811a90 [FIX] mrp: fixed phantom bom
lp bug: https://launchpad.net/bugs/1278891 fixed

bzr revid: qdp-launchpad@openerp.com-20140214150330-an2my0n8vjdf38vx
2014-02-14 16:03:30 +01:00
Quentin (OpenERP) 9550c32409 [MERGE] usability improvements among several modules/screens
bzr revid: qdp-launchpad@openerp.com-20140214145712-j8dmf06wy49x9l50
2014-02-14 15:57:12 +01:00
Xavier Morel 60adf28fb3 [REM] spurious print in test
bzr revid: xmo@openerp.com-20140214145308-xvcer7yyz582g9g9
2014-02-14 15:53:08 +01:00
Quentin (OpenERP) 1f817129b7 [FIX] stock: hpantom bom check now takes into account the eventual start/end dates of the bom
bzr revid: qdp-launchpad@openerp.com-20140214134457-yz7qcoqqgp4td7ls
2014-02-14 14:44:57 +01:00
Josse Colpaert 1277c16dd7 [MERGE] Merge from trunk
bzr revid: jco@openerp.com-20140214100157-1vbjgifkouh0h4ix
2014-02-14 11:01:57 +01:00
Quentin (OpenERP) 2f982e6bea [FIX] a lot of changes made during code review
bzr revid: qdp-launchpad@openerp.com-20140214084650-8vcy544475urij53
2014-02-14 09:46:50 +01:00
Launchpad Translations on behalf of openerp 19ba8c54c9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140214074449-flu4n6hfh9nua9t3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140214074835-2p2r1vb6ucynbspm
2014-02-14 07:48:35 +00:00
Cedric Snauwaert 73183be469 [FIX]when creating location for warehouse, use warehouse code as base name for location instead of warehouse name
bzr revid: csn@openerp.com-20140213094820-v76n4fuqd1omicvy
2014-02-13 10:48:20 +01:00
Launchpad Translations on behalf of openerp faf6d33bc0 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140213064742-xiotlx8wzfhexnhc
2014-02-13 06:47:42 +00:00
Launchpad Translations on behalf of openerp 3eceef7802 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140213054839-bknb7wozzfcl2b5p
bzr revid: launchpad_translations_on_behalf_of_openerp-20140213061121-vm9ot1x4ve6ekaoe
2014-02-13 06:11:21 +00:00
Olivier Dony bbd813e76e [MERGE] Forward-port of latest saas-2 (incl. 7.0) bugfixes, up to rev. 9127 odo@openerp.com-20140212122042-3m2tysmr31mtecnc
bzr revid: odo@openerp.com-20140212175141-i9yz8zlseglrk8sb
2014-02-12 18:51:41 +01:00
Launchpad Translations on behalf of openerp 9554c144ff Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140212062357-8n13ec90bnclm1ek
2014-02-12 06:23:57 +00:00
Launchpad Translations on behalf of openerp 0bbf709f5c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140212052933-2x7w3n6hxognlz1m
2014-02-12 05:29:33 +00:00
Thibault Delavallée d93fce56b6 [MERGE] mrp: small usability fixes
- updated groups on some fields of bom
- removed some icons in form view, to be coherent with other form views
- BOM form view: updated onchange_product_id that now takes product_qty into account to compute
uos and uos quantity.

bzr revid: tde@openerp.com-20140211152116-niwt0pak4r0n8jst
2014-02-11 16:21:16 +01:00
Thibault Delavallée 394b6389f0 [MERGE] Sync with upstream (trunk)
bzr revid: tde@openerp.com-20140211141925-p3sziwkon7jlsq5r
2014-02-11 15:19:25 +01:00
Launchpad Translations on behalf of openerp c00c424221 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140211064129-f1q7m95fq4tplc1s
2014-02-11 06:41:29 +00:00
Launchpad Translations on behalf of openerp 06c3efde04 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140211055037-i7s59zrp7mrzmlun
2014-02-11 05:50:37 +00:00
Cedric Snauwaert 3ba9e8715a [MERGE-FIX]merge with latest trunk-wms and fix a few mistakes while adapting action_confirm to return a list of ids
bzr revid: csn@openerp.com-20140210160346-zmpgs6rys3isz9cu
2014-02-10 17:03:46 +01:00
Cedric Snauwaert d1abe6a4cc [FIX]move: action_confirm now returns ids of move (needed for bom_explode)
bzr revid: csn@openerp.com-20140210145446-djwfreh3f0pdcfet
2014-02-10 15:54:46 +01:00
Darshan Kalola (OpenERP) b3c6e20e36 [MERGE]sync with trunk and resolve conflicts.
bzr revid: dka@tinyerp.com-20140210084803-rjkt9e4rhni8nhlt
2014-02-10 14:18:03 +05:30
Atul Patel (OpenERP) bdaccb7053 [MERGE]: Merged with addons
bzr revid: atp@tinyerp.com-20140210060020-2kfsig5t3ps14i4k
2014-02-10 11:30:20 +05:30
Launchpad Translations on behalf of openerp 8d85c23e4a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140209065003-9soyulgvssk8n5ci
bzr revid: launchpad_translations_on_behalf_of_openerp-20140208071621-b018rnkhyxmmm5jk
bzr revid: launchpad_translations_on_behalf_of_openerp-20140209065224-kih7tx56elds0zok
bzr revid: launchpad_translations_on_behalf_of_openerp-20140210055324-raxopm5ej680oc73
2014-02-10 05:53:24 +00:00
Cedric Snauwaert 31348b1e4a [FIX]sale_order with product using phantom bom
bzr revid: csn@openerp.com-20140207112606-k0cxzhpytlodjd1y
2014-02-07 12:26:06 +01:00
Launchpad Translations on behalf of openerp ffabcd257c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140206062321-j6cpns6xz3f81net
bzr revid: launchpad_translations_on_behalf_of_openerp-20140206062510-x502ahdwzezvea54
2014-02-06 06:25:10 +00:00
Quentin (OpenERP) ec0a1678ee [FIX] mrp: fixed action_produce errors added in the last refactoring
bzr revid: qdp-launchpad@openerp.com-20140205132521-ul3grdqryppig7o0
2014-02-05 14:25:21 +01:00
Quentin (OpenERP) 0afb7076d4 [REF] mrp, stock: refactoring made during code review
bzr revid: qdp-launchpad@openerp.com-20140205104324-5h5hu0fv71omhigf
2014-02-05 11:43:24 +01:00
Quentin (OpenERP) 2c101e9432 [REF] mrp: code refactoring + removal of a useless and confusing part of a yaml test
bzr revid: qdp-launchpad@openerp.com-20140205093411-2xqnn5l3gyw6hmw5
2014-02-05 10:34:11 +01:00
Quentin (OpenERP) 19501096f5 [MERGE] main trunk-wms branch
bzr revid: qdp-launchpad@openerp.com-20140204110840-iur4q0t9rz5v2y5i
2014-02-04 12:08:40 +01:00
Launchpad Translations on behalf of openerp 2bebb9cd4d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140201065304-8md3g4d14l1b51ii
bzr revid: launchpad_translations_on_behalf_of_openerp-20140202060105-bnt8nw1mcbg2c3m3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140203055609-uxdqgnistwilvo2v
bzr revid: launchpad_translations_on_behalf_of_openerp-20140204064835-qdcrcxldc5zsutio
2014-02-04 06:48:35 +00:00
Quentin (OpenERP) bbe5811e56 [FIX] fix needed after the previous merge with trunk: produce_delay field doesn't belong to product module anymore
bzr revid: qdp-launchpad@openerp.com-20140203184520-5p1j2y3sk1asu8hj
2014-02-03 19:45:20 +01:00
Quentin (OpenERP) 753f7541db [MERGE] main trunk
bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e
2014-02-03 18:30:00 +01:00