Commit Graph

3276 Commits

Author SHA1 Message Date
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
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
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
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