adf07a9490
[MERGE] forward port of branch saas-4 up to 5087612
2014-06-19 16:13:35 +02:00
5087612d1d
[MERGE] forward port of branch saas-3 up to bf53aed
2014-06-19 15:44:07 +02:00
bf53aeda94
[MERGE] forward port of branch 7.0 up to e5533d0
2014-06-19 15:32:32 +02:00
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
6b63d40145
[MERGE] Merge from master and resolve conflict
2014-06-17 16:23:44 +02:00
f71addb14d
[IMP] no label on consume lines in wizard
2014-06-17 11:47:53 +02:00
96f038a6ab
[IMP] product: all left menu item became product.template's action
2014-06-16 17:16:50 +02:00
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
faa09da325
Removed version="7.0" from form views
2014-06-12 09:09:59 +02:00
8202561511
Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
2014-06-10 11:43:17 +02:00
1c04f4d3d1
Merge remote-tracking branch 'odoo/master' into master-wmsstaging3-jco
2014-06-10 10:32:36 +02:00
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
ac943b0307
[IMP] Change mrp lots to depend on lots and not on packing
2014-06-03 09:21:57 +02:00
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
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
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
6958d56a66
[IMP] product: fixes for review
2014-05-28 18:30:03 +02:00
be8e10097d
[FIX] mrp: demo data is wrong don't produce ipad but pc
2014-05-28 12:26:57 +02:00
256a17d419
[IMP] product: rename field variants_ids to respect odoo typo; add demo data for mrp
2014-05-28 11:46:32 +02:00
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
2af03e1b6e
[MERGE] Forward-port latest 7.0 bugfixes, up to f8671cb
2014-05-22 16:44:33 +02:00
02035b27b8
[RESTORE] Restore *.sxw files, skipped during bzr-to-git conversion to discard older binary blobs
2014-05-22 14:07:15 +02:00
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
f173d926c8
Launchpad automatic translations update.
2014-05-13 06:28:52 +00:00
168b8e1d5e
[REM] removed old conflicting files badly merged (?)
...
bzr revid: qdp-launchpad@openerp.com-20140508143825-owheu6q219d8qbww
2014-05-08 16:38:25 +02:00
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
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
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
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
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
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
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
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
5aa2fa150c
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
2014-05-02 15:07:53 +02:00
8b84615de1
[MERGE] Merge from trunk test
...
bzr revid: jco@openerp.com-20140502130352-c3h1fk332eqyd78b
2014-05-02 15:03:52 +02:00
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
d0e9ba289f
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140429124452-5cvpmtpyz2daj8w2
2014-04-29 14:44:52 +02:00
f9b97239f6
[FIX] mrp: missing dependency to report
...
bzr revid: rim@openerp.com-20140429085836-7goilzvlolal79bp
2014-04-29 10:58:36 +02:00
65f2db5c21
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140429081937-hhqcg84o7iha78fq
2014-04-29 10:19:37 +02:00
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
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
f402240ade
[MERGE] stock usability improvements
...
bzr revid: qdp-launchpad@openerp.com-20140424143838-a3so6ouc1q3la3ch
2014-04-24 16:38:38 +02:00
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
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
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
5807343602
[MERGE] Merge from trunk-wms
...
bzr revid: jco@openerp.com-20140423095528-h4dpd9gdmh8lmk6j
2014-04-23 11:55:28 +02:00
8015980e33
[FIX] Add makeproductionproduceline
...
bzr revid: jco@openerp.com-20140423095258-vpy4dz57sus1l8vp
2014-04-23 11:52:58 +02:00
af0468c418
[WIP] Remove picking except state on mrp order
...
bzr revid: jco@openerp.com-20140423094807-za7855wkx2vlr0di
2014-04-23 11:48:07 +02:00
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
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
f119c72f5b
[IMP] Help messages for warehouse settings
...
bzr revid: jco@openerp.com-20140422123326-1fuwmkja041j34yn
2014-04-22 14:33:26 +02:00
57cebaaac6
[MERGE] merged trunk up to revision 9365.
...
bzr revid: qdp-launchpad@openerp.com-20140422092815-f4tlfmo8zj1nogbl
2014-04-22 11:28:15 +02:00
e3ecf7f4d4
[FIX] en_US typos - opw 606919
...
bzr revid: acl@openerp.com-20140422085837-9flv9ksh54ymvv7i
2014-04-22 10:58:37 +02:00
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
a64ff2696c
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140422075452-cr8vy4u45l3tcj1u
2014-04-22 09:54:52 +02:00
fa60b90c1f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
2014-04-22 07:52:47 +00:00
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
cccc7a3d0c
[MERGE]sync with trunk.
...
bzr revid: dka@tinyerp.com-20140417132329-sd2skyprb3nt88uw
2014-04-17 18:53:29 +05:30
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
f57b767361
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140415150146-5ovdjzta58t5dhd2
2014-04-15 17:01:46 +02:00
aa0e0a9c6a
[MERGE] merged with main addons
...
bzr revid: bde@tinyerp.com-20140415060953-lkos2db3ddxz1i4y
2014-04-15 11:39:53 +05:30
c399e1daaf
[MERGE] merge with latest trunk and resolve conflicts
...
bzr revid: rma@tinyerp.com-20140414110149-r3l00xr8l08ex7oc
2014-04-14 16:31:49 +05:30
398d96f273
[MERGE] merged trunk up to revision 9327
...
bzr revid: qdp-launchpad@openerp.com-20140414094743-hv0u7qhigv1to2uc
2014-04-14 11:47:43 +02:00
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
e82fbf7d91
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
2014-04-12 08:31:53 +00:00
85714eabb6
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20140411062328-srzutp1ln9xe7sxq
2014-04-11 11:53:28 +05:30
2e9ee9c76e
[MERGE] merge from rma branch
...
bzr revid: ged@openerp.com-20140410145131-fj17mdpi13wa5a9m
2014-04-10 16:51:31 +02:00
9dbaa58694
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20140407102440-ngtr58o2w2ypqrol
2014-04-07 15:54:40 +05:30
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
a386aea7d3
[FIX] revert to v7 report API
...
bzr revid: ls@numerigraphe.com-20140404124036-1vt0fkakfllj1qax
2014-04-04 14:40:36 +02:00
4983f86d81
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140407174534-pk6b5lozvik78fom
2014-04-07 19:45:34 +02:00
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
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
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
4c0f7b1be8
[IMP] improve strings and project view
...
bzr revid: rma@tinyerp.com-20140404112926-716zimuh3p2ec80k
2014-04-04 16:59:26 +05:30
7fd703f58d
[MERGE] Merge from trunk-wms
...
bzr revid: jco@openerp.com-20140404143809-0qi14pmi5762iycp
2014-04-04 16:38:09 +02:00
1f03b8a901
[IMP] Add use case + review gde + mrp
...
bzr revid: jco@openerp.com-20140404143655-b55777mcowm6vlwi
2014-04-04 16:36:55 +02:00
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
33471e966f
[FIX] missing dependancies of report module
...
bzr revid: sle@openerp.com-20140403091818-6evr0k4r2k4818j1
2014-04-03 11:18:18 +02:00
ff4726ea7d
[MERGE] merged trunk up to revision 9281
...
bzr revid: qdp-launchpad@openerp.com-20140403081427-7xpn57wdfv08v2al
2014-04-03 10:14:27 +02:00
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
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
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
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
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
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
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
51aa261b44
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
2014-03-27 07:35:04 +00:00
e0b27b4ee8
[MERGE] merged trunk up to revision 9251
...
bzr revid: qdp-launchpad@openerp.com-20140326152751-b6bo0fawrzmd71f0
2014-03-26 16:27:51 +01:00
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
c086291ddd
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20140325135635-rev8asknqwk08svy
2014-03-25 19:26:35 +05:30
96ea9392aa
[IMP] convert button into stat button for products
...
bzr revid: rma@tinyerp.com-20140324135621-13t191kmnn6t22jk
2014-03-24 19:26:21 +05:30
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
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
2fa6706037
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140321065150-vovy9a0q2y6vkwm4
2014-03-21 06:51:50 +00:00
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
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
35e9dd0aa5
[MERGE]with main branch
...
bzr revid: jpr@tinyerp.com-20140319063549-7jjr6i5tdqitq2jy
2014-03-19 12:05:49 +05:30
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
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
da210e4b5e
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20140311132813-0gmbof2u8nmgv9p3
2014-03-11 14:28:13 +01:00
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
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
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
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
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
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
9863dbe5c8
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
2014-03-04 07:52:38 +00:00
16c05082c8
[remove]:mrp dashboard file
...
bzr revid: sunilsharma.sharma07@gmail.com-20140304070810-282vhtpg3mduym0j
2014-03-04 12:38:10 +05:30
dd4813e360
[mrg]:lp:openobject-addons
...
bzr revid: sunilsharma.sharma07@gmail.com-20140304063937-vyrt063gzfhsoy4k
2014-03-04 12:09:37 +05:30
e36b32a661
[MERGE] merged with main trunk (revision 9186)
...
bzr revid: qdp-launchpad@openerp.com-20140228131516-ihigousbe5p1nt68
2014-02-28 14:15:16 +01:00
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
62538c61e3
[IMP] Converted mrp BOM Structure to QWeb
...
bzr revid: sle@openerp.com-20140224103453-0s60blgbk7e3ho5n
2014-02-24 11:34:53 +01:00
35b64811e9
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140221095425-9043pbzjy7rtbxd1
2014-02-21 10:54:25 +01:00
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
d5cdec9e16
[MERGE] Merge from trunk-wms
...
bzr revid: jco@openerp.com-20140219145719-snazgq9oe9q0idrs
2014-02-19 15:57:19 +01:00
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
2445e9f0bc
[MERGE] trunk
...
bzr revid: openerp-sle@openerp-sle.home-20140216103609-ihf3bz4nf4rds5ue
2014-02-16 11:36:09 +01:00
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
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
9550c32409
[MERGE] usability improvements among several modules/screens
...
bzr revid: qdp-launchpad@openerp.com-20140214145712-j8dmf06wy49x9l50
2014-02-14 15:57:12 +01:00
60adf28fb3
[REM] spurious print in test
...
bzr revid: xmo@openerp.com-20140214145308-xvcer7yyz582g9g9
2014-02-14 15:53:08 +01:00
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
1277c16dd7
[MERGE] Merge from trunk
...
bzr revid: jco@openerp.com-20140214100157-1vbjgifkouh0h4ix
2014-02-14 11:01:57 +01:00
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
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
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
faf6d33bc0
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140213064742-xiotlx8wzfhexnhc
2014-02-13 06:47:42 +00:00
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
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
9554c144ff
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140212062357-8n13ec90bnclm1ek
2014-02-12 06:23:57 +00:00
0bbf709f5c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140212052933-2x7w3n6hxognlz1m
2014-02-12 05:29:33 +00:00
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
394b6389f0
[MERGE] Sync with upstream (trunk)
...
bzr revid: tde@openerp.com-20140211141925-p3sziwkon7jlsq5r
2014-02-11 15:19:25 +01:00
c00c424221
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140211064129-f1q7m95fq4tplc1s
2014-02-11 06:41:29 +00:00
06c3efde04
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140211055037-i7s59zrp7mrzmlun
2014-02-11 05:50:37 +00:00
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
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
b3c6e20e36
[MERGE]sync with trunk and resolve conflicts.
...
bzr revid: dka@tinyerp.com-20140210084803-rjkt9e4rhni8nhlt
2014-02-10 14:18:03 +05:30
bdaccb7053
[MERGE]: Merged with addons
...
bzr revid: atp@tinyerp.com-20140210060020-2kfsig5t3ps14i4k
2014-02-10 11:30:20 +05:30
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
31348b1e4a
[FIX]sale_order with product using phantom bom
...
bzr revid: csn@openerp.com-20140207112606-k0cxzhpytlodjd1y
2014-02-07 12:26:06 +01:00
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
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
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
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
19501096f5
[MERGE] main trunk-wms branch
...
bzr revid: qdp-launchpad@openerp.com-20140204110840-iur4q0t9rz5v2y5i
2014-02-04 12:08:40 +01:00
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
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
753f7541db
[MERGE] main trunk
...
bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e
2014-02-03 18:30:00 +01:00
3e4d932c58
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9801 revid:mat@openerp.com-20140131160304-22mokur2uuo1cw4r
...
bzr revid: dle@openerp.com-20140131162637-046v995ozpy22qjj
2014-01-31 17:26:37 +01:00
62d72aa238
[FIX] stock: when creating manufacturing order from procurement workflow, do not write location on state (already set previously). (opw 603600)
...
This avoids having an access rights error when trying to write on a move in done state (eg: in case of force availibility)
bzr revid: mat@openerp.com-20140131160304-22mokur2uuo1cw4r
2014-01-31 17:03:04 +01:00
d6975f7ae3
[MERGE]Sync with Trunk
...
bzr revid: pza@tinyerp.com-20140131065044-sn70e45ax46h97w3
2014-01-31 11:50:44 +05:00
10123ce0c5
[IMP] Revert commit 9498 to have split between tracking of packages and tracking of serial numbers / lots /...
...
bzr revid: jco@openerp.com-20140130174711-2sl1rvnkx2ju2tef
2014-01-30 18:47:11 +01:00
b944882755
[MERGE] main trunk-wms branch
...
bzr revid: qdp-launchpad@openerp.com-20140130104326-64ep633xtqar2ku3
2014-01-30 11:43:26 +01:00
b1c784d8c0
[MERGE] mrp: removal of a deprecated option (module stock_no_autopicking doesn't exist anymore)
...
lp bug: https://launchpad.net/bugs/1271466 fixed
bzr revid: qdp-launchpad@openerp.com-20140130095142-jueza81dhql1am14
2014-01-30 10:51:42 +01:00
d76083087d
[MERGE]Sync with Trunk
...
bzr revid: pza@tinyerp.com-20140130055452-dntwofrc41897k1f
2014-01-30 10:54:52 +05:00
b2ac002e1b
[MRG]:merge lp:openobject-addons
...
bzr revid: sunilsharma.sharma07@gmail.com-20140130044953-qfg8wbm6835hi9dz
2014-01-30 10:19:53 +05:30
30170062dd
[rem]:mrp:remove mrp dashboard
...
bzr revid: sunilsharma.sharma07@gmail.com-20140130044632-m0kw1a8ya466tlg3
2014-01-30 10:16:32 +05:30
c202dc1c52
merge upstream
...
bzr revid: chs@openerp.com-20140129190834-xfcat3ulfbg5omhn
2014-01-29 20:08:34 +01:00
731019154a
[MERGE] forward port of branch saas-2 up to revid 9109 dle@openerp.com-20140129171022-wf6244k90lpncmah
...
bzr revid: chs@openerp.com-20140129184703-ypd7iqnor5m5lr3d
2014-01-29 19:47:03 +01:00
5626d63634
[REMOVE] Remove split wizards
...
bzr revid: jco@openerp.com-20140129134424-c72zk1z2n3rixnwg
2014-01-29 14:44:24 +01:00
3590a5ff93
[MERGE] Merge from trunk
...
bzr revid: jco@openerp.com-20140129132300-qaiiqza23bgipjjd
2014-01-29 14:23:00 +01:00
4a7a79779d
[IMP] Consume only products when already assigned and
...
bzr revid: jco@openerp.com-20140129131046-r8yv3h8l679c3m3s
2014-01-29 14:10:46 +01:00
7848349e53
[ADD] Add files now needed in mrp instead of stock
...
bzr revid: jco@openerp.com-20140129085303-war5qlk5pqkf3gfg
2014-01-29 09:53:03 +01:00
033c38c304
[MERGE] trunk
...
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
2014-01-29 03:19:16 +01:00
68f0f8db8f
[FIX] Use correct wizard and solve infinite loop
...
bzr revid: jco@openerp.com-20140128164048-43ptahppk2w2tyn7
2014-01-28 17:40:48 +01:00
34b923a19e
[IMP] change split signature and take into account for action_consume
...
bzr revid: jco@openerp.com-20140128154125-3j1rpc4w6maywcmt
2014-01-28 16:41:25 +01:00
8ec0968f8d
[WIP] Reorganise action_consume wizard to start from mrp and clean op inventory wizards
...
bzr revid: jco@openerp.com-20140128151834-ni90kny7b2y6sr36
2014-01-28 16:18:34 +01:00
3ce5e01eca
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
2014-01-28 06:41:39 +00:00
aaabe58be6
[MERGE]Sync with Trunk
...
bzr revid: pza@tinyerp.com-20140128060634-bvqzr8yaqkxa2p1d
2014-01-28 11:06:34 +05:00
5585a38ecc
[MERGE] from trunk, need point_of_sale updates
...
bzr revid: fva@openerp.com-20140127160946-yeswyv4o7t2tfbqt
2014-01-27 17:09:46 +01:00
7acaac732c
[MERGE] stock: fixed error of production lot propagation in action_consume and action_scrap
...
lp bug: https://launchpad.net/bugs/1268994 fixed
bzr revid: qdp-launchpad@openerp.com-20140124154953-lr0m6v1ok6q0futo
2014-01-24 16:49:53 +01:00
1fb1a6f2af
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9789 revid:dle@openerp.com-20140124120102-we2yxio553ws2yz4
...
bzr revid: dle@openerp.com-20140120174449-tui0a24zgn9bien2
bzr revid: dle@openerp.com-20140121125538-ke7i6kaz486hwgl8
bzr revid: dle@openerp.com-20140122134115-0ogjemlqe327xoac
bzr revid: dle@openerp.com-20140123103655-mf2zslfbgue97ed2
bzr revid: dle@openerp.com-20140124121027-uk9zy4dx9tqlsblr
2014-01-24 13:10:27 +01:00
83677ed6e6
[REVERT] 9401 dle@openerp.com-20130830125155-1vedifnupu2xvth7
...
This had as side-effect to not allow splitting BOMs
(a manufacturing order for 1 unit of a BOM producing 10 units consumed the lines like it was 10 units, not 1)
This fix was to avoid having a fraction of a unit (for instance, 0.5 unit).
But, finally, it is preferable to allow splitting units:
1. Most users do not use several uoms, and in this case, the unit is the default uom (hidden).
2. At the moment, it is allowed to ask a manufacturing order splitting up the unit uom
(It is allowed to ask the production of 0.5 USB Adapter, for instance)
Thus, we should allow the splitting up of the unit uom in the lines too.
bzr revid: dle@openerp.com-20140124120102-we2yxio553ws2yz4
2014-01-24 13:01:02 +01:00
47d04a43e1
[MERGE] Merge from trunk-wms
...
bzr revid: jco@openerp.com-20140124105300-vaz4srntbhr9nyk4
2014-01-24 11:53:00 +01:00
f7d2d9e918
[FIX]remove setting for stock_no_autopicking that has been removed
...
lp bug: https://launchpad.net/bugs/1271466 fixed
bzr revid: csn@openerp.com-20140122141123-wbxk3exizay9cgf9
2014-01-22 15:11:23 +01:00
d69ecb8d8f
[FIX] mrp, stock: avoid float rounding errors using float_compare
...
bzr revid: dle@openerp.com-20140122133822-fkt5gqanpptlx9jx
2014-01-22 14:38:22 +01:00
ec2c2d4e86
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140122123237-5rc5fdyau0422fj2
2014-01-22 13:32:37 +01:00
da22ca89bb
[FIX] Make sure the tests for mrp.product.produce do the onchange for consume_lines
...
bzr revid: jco@openerp.com-20140122092921-rjgehregzpqfreyg
2014-01-22 10:29:21 +01:00
d5bc07f898
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140122061335-z6h1dn3yd94l8850
2014-01-22 06:13:35 +00:00
72b0c03b96
[IMP] Change the action_produce to be able to take into account wizard or not
...
bzr revid: jco@openerp.com-20140121133909-0xzgqmzhs4mhgqtp
2014-01-21 14:39:09 +01:00
056bfc00a9
[IMP] Make sure the wizard does not take negative quants and refactor a little bit not to have duplicate code
...
bzr revid: jco@openerp.com-20140121104051-87ihs7fnz72i0b9z
2014-01-21 11:40:51 +01:00
96120dcdbd
[IMP] Make sure consumed_for is set before doing action_done
...
bzr revid: jco@openerp.com-20140121093027-2h6xlgouhg49sr76
2014-01-21 10:30:27 +01:00
e32b5bb6ae
[FIX] sale_mrp; fixed error in yaml test. It seems we forgot the property_ids field on sale.order.line -_- . Also removed a unused method (_prepare_order_line_procurement on procurement order => this must be/is already defined in sale.order object)
...
bzr revid: qdp-launchpad@openerp.com-20140121084946-8aws5axdkgr8ng9r
2014-01-21 09:49:46 +01:00
698e2de138
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140121062040-gq8r12g3ypksxa4t
2014-01-21 06:20:40 +00:00
24f6ed8973
[WIP] Give warnings when not possible to do traceability and needed, group by quants
...
bzr revid: jco@openerp.com-20140120162828-6xgxshtkc44tlesi
2014-01-20 17:28:28 +01:00
fc93025818
[MERGE] merged trunk
...
bzr revid: qdp-launchpad@openerp.com-20140120144243-5kw535p28t1x7yeg
2014-01-20 15:42:43 +01:00
28d79433c3
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070457-rn2tgdxis2fi3nqo
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119055822-ajy043mntc4jr407
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055854-z7wtyb24c5t8kcmj
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070538-2xm86ece1aate8u9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119055932-sa6vrp2g8ua3u88e
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055948-lwcyqcfutgamwac1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070546-d89xqw56zou7e9p9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055955-6wrdxqy1018mo7jq
2014-01-20 05:59:55 +00:00
b50247109c
[IMP] Basic version working with lots
...
bzr revid: jco@openerp.com-20140117164232-8gu0bb8qbbk67yrx
2014-01-17 17:42:32 +01:00
d1cc6afe5f
[MERGE]Merge with Parent
...
bzr revid: pza@tinyerp.com-20140117140458-obuxulf1sfamoi4w
2014-01-17 19:04:58 +05:00
16109f37cd
[MERGE] mrp: in work orders duration is displayed in decimal numbers instead of time
...
bzr revid: dle@openerp.com-20140116180459-6psj1f0uq4ihxzc2
2014-01-16 19:04:59 +01:00
338013803d
[WIP] Extending wizard with consume lines
...
bzr revid: jco@openerp.com-20140116174800-kap083m5jvacsbh6
2014-01-16 18:48:00 +01:00
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
91aaaec0a5
[MERGE] forward port of branch saas-2 up to revid 9092 dle@openerp.com-20140115165506-yuux9km39gbv7k4n
...
bzr revid: chs@openerp.com-20140115214454-dhl8xzr429co0j5d
2014-01-15 22:44:54 +01:00
d2605491ff
[IMP] Add dependence on partner
...
bzr revid: jco@openerp.com-20140115141659-3ek1usz8ugllsn9e
2014-01-15 15:16:59 +01:00
6b1ec21cb6
[IMP] Make sure the quant has lot when we restrict lot in pickingless move
...
bzr revid: jco@openerp.com-20140115133719-ivn71uatgd7gtin6
2014-01-15 14:37:19 +01:00
557a052cb3
[IMP] When consuming in mrp, take into account lot
...
bzr revid: jco@openerp.com-20140114173101-5999401bm7q64q1f
2014-01-14 18:31:01 +01:00
74e0fbae83
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9752 revid:dle@openerp.com-20140110173823-lfekux2jxrj5v9gn
...
bzr revid: dle@openerp.com-20140110160158-ypr2pp63ld6j5g4l
bzr revid: dle@openerp.com-20140110174038-3yogwf6hwk7kpa8w
2014-01-10 18:40:38 +01:00
fd9d8b9ff3
[FIX] mrp: move _prepare_order_line_procurement to module sale_mrp as mrp module does not depends from sale
...
bzr revid: mat@openerp.com-20140110153133-qozwrixyrwxjr44n
2014-01-10 16:31:33 +01:00
5139c760d2
[FIX] mrp: added security rule to enable mrp users to compute production orders
...
bzr revid: tde@openerp.com-20140110142722-3x0zk98aajh0bgxy
2014-01-10 15:27:22 +01:00
0dfa248326
[MERGE]Mergw with Trunk
...
bzr revid: pza@tinyerp.com-20131226055518-pl2wp3medwd55d14
bzr revid: pza@tinyerp.com-20131230052417-iqe74dvbj3ozhtp1
bzr revid: pza@tinyerp.com-20140110054631-564ljohag0nsgfv2
2014-01-10 10:46:31 +05:00
3ed5b49e7a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140110053216-23qk0vpm4hr5g1ig
2014-01-10 05:32:16 +00:00
bea411bb98
[IMP] Backport one feature from website: this feature allows to specify a file
...
path on the field tag fetching the right file instead of using the base64
encoded file in the field.
<field name="image" type="base64" file="base/static/img/main_partner-image.png" />
bzr revid: stw@openerp.com-20140109154550-a04qybctzaaqtrlr
2014-01-09 16:45:50 +01:00
05aab83eb1
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9743 revid:qdp-launchpad@openerp.com-20140108160719-9i8xhrat49cn9l5e
...
bzr revid: chs@openerp.com-20140107141524-xzz39a2ym66swr0t
bzr revid: chs@openerp.com-20140107172248-zic9mqg0rigy2czb
bzr revid: chs@openerp.com-20140108160418-ph17jgy5hlejj9hr
bzr revid: dle@openerp.com-20140108171400-8r0fwv3wi36w2im0
2014-01-08 18:14:00 +01:00
0b7ecf8a21
[FIX] mrp: move _prepare_order_line_procurement to model sale.order instead of procurement.oder. This will add the lost property_ids that was removed at rev 9622.
...
bzr revid: mat@openerp.com-20140108114639-jc40rfbrbi1s37e3
2014-01-08 12:46:39 +01:00
05da75b823
[REF] stock: reduced the number of options to track or not serial numbers to 1
...
bzr revid: qdp-launchpad@openerp.com-20140107152358-uwwfufkg3y1eob8l
2014-01-07 16:23:58 +01:00
6da122d071
[FIX] mrp installation (wrong xml reference)
...
bzr revid: qdp-launchpad@openerp.com-20140107125143-yhlxkos76s0u57ih
2014-01-07 13:51:43 +01:00
a0558ad4fd
[IMP] stock: rehabilited the constraint check on traceability of lots. Improved it by allowing to track all operations (included the internal -> internal ones). Refactored in order to move the track_production field in mrp, where it's meaningful. Removed also a unused/deprecated wizard to change qty on a move
...
bzr revid: qdp-launchpad@openerp.com-20140107103915-bx9spjoclrlhalbr
2014-01-07 11:39:15 +01:00
49c0b7a820
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140106135700-rt0g44w5xmpbtxiu
2014-01-06 14:57:00 +01:00
e0951d6e18
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131227053952-0hms21l5679mfv9d
bzr revid: launchpad_translations_on_behalf_of_openerp-20131228053802-9q255pplfsr06jvf
bzr revid: launchpad_translations_on_behalf_of_openerp-20131230050715-gywiu51n8ejcvnkp
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231052701-yjrbqgyv2os2z8gt
bzr revid: launchpad_translations_on_behalf_of_openerp-20140101054400-7tz7obdh31v8log8
bzr revid: launchpad_translations_on_behalf_of_openerp-20140102054530-gtwf0yp277zkqm0i
2014-01-02 05:45:30 +00:00
f5718efa6e
[MERGE] merged with trunk
...
bzr revid: qdp-launchpad@openerp.com-20131230102802-y1ux8470wxnj4yfr
2013-12-30 11:28:02 +01:00
3972c0948c
[IMP] mrp, project_mrp, stock: usbility of product form view
...
bzr revid: qdp-launchpad@openerp.com-20131220103333-3sftj95kg56637rz
2013-12-20 11:33:33 +01:00
ee9aa9ffd4
[IMP] mrp, product, stock, project_mrp: usability of product form view
...
bzr revid: qdp-launchpad@openerp.com-20131220095806-16siwncivyuokrym
2013-12-20 10:58:06 +01:00
e6a46a855d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131220053413-o3xa4nlpu9snoiq6
2013-12-20 05:34:13 +00:00
54be818a3b
[MERGE] forward port of latest saas-2 until rev 9051 dle@openerp.com-20131217142126-1lbim47d2m2x4bb0
...
bzr revid: mat@openerp.com-20131218155715-khb909yy99cbmna8
2013-12-18 16:57:15 +01:00
d9343e2d27
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20131213094016-ylqkilyo4190g81w
2013-12-13 10:40:16 +01:00
7130496dcb
[FIX] stock: removed unecessary demo data for company2 (Brimingham), stock locations + fixed location used in stock move
...
bzr revid: qdp-launchpad@openerp.com-20131212095512-4af332hwtht0865e
2013-12-12 10:55:12 +01:00
7f00274384
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9691 rev-id: dle@openerp.com-20131211134120-fco4rlqjh258ba36
...
bzr revid: dle@openerp.com-20131210184409-cd9wy856v5bg0f17
bzr revid: dle@openerp.com-20131211134317-f0ev1vbinhrkgjf4
2013-12-11 14:43:17 +01:00
89a9dbee75
[FIX] mrp: cost structure report, do not display twice main supplier
...
bzr revid: dle@openerp.com-20131211134120-fco4rlqjh258ba36
2013-12-11 14:41:20 +01:00
a5cc6d6aed
[MERGE] merged with main trunk
...
bzr revid: qdp-launchpad@openerp.com-20131211100354-hwlt65vk8p3xih9u
2013-12-11 11:03:54 +01:00
6652856445
[FIX] website_sale: link; product: clean code and use product.template for supplierinfo
...
bzr revid: chm@openerp.com-20131209163254-k9dwxw48rcgz1hbs
2013-12-09 17:32:54 +01:00
cca8bb4d64
[FIX] font: revert previous (use name and not familly in reportlab), fix reports using spaces
...
bzr revid: mat@openerp.com-20131209133431-6gjhq1zmrb2ro6eo
2013-12-09 14:34:31 +01:00
3abf050afc
[IMP]Improved colors for components
...
bzr revid: pza@tinyerp.com-20131209094948-4zne4efiijzm2ly6
2013-12-09 14:49:48 +05:00
a092227c6e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131207063209-2xi8ba5wu6l6ze00
bzr revid: launchpad_translations_on_behalf_of_openerp-20131208054536-mg4w4d6ljq8ji1nj
bzr revid: launchpad_translations_on_behalf_of_openerp-20131207063232-l64v1fhf1qcpxm2l
bzr revid: launchpad_translations_on_behalf_of_openerp-20131208054646-zixed7abpuze4qt1
bzr revid: launchpad_translations_on_behalf_of_openerp-20131123062625-f7inv72rtg2kel8g
bzr revid: launchpad_translations_on_behalf_of_openerp-20131124054801-1ukcpelfukkvwn60
bzr revid: launchpad_translations_on_behalf_of_openerp-20131125060120-nm8tkfbftg8c88v1
bzr revid: launchpad_translations_on_behalf_of_openerp-20131126060753-jnx5ran2accmo0lh
bzr revid: launchpad_translations_on_behalf_of_openerp-20131127054000-wtg675pf33f3bkar
bzr revid: launchpad_translations_on_behalf_of_openerp-20131129053028-abszdj4y76smnacb
bzr revid: launchpad_translations_on_behalf_of_openerp-20131201054555-3u1m1sy1f2og78nn
bzr revid: launchpad_translations_on_behalf_of_openerp-20131202055227-mm70khzdfnp4qcj9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131207063237-vza5vb51xmd2ipl6
bzr revid: launchpad_translations_on_behalf_of_openerp-20131208054653-f4zth8j3iczlzcqz
2013-12-08 05:46:53 +00:00
4fd98907ce
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131130053134-6u83vcd1133xs8yf
bzr revid: launchpad_translations_on_behalf_of_openerp-20131201054550-w0k8alfqs2bigurx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131202055222-2u7o99e48254dceu
bzr revid: launchpad_translations_on_behalf_of_openerp-20131203061621-hyqqh11jt7g0ilqh
2013-12-03 06:16:21 +00:00
229c057f3b
[IMP] Add colors in tree view of components..
...
bzr revid: jir@tinyerp.com-20131202055331-jk00a7cgpu55vnwf
2013-12-02 11:23:31 +05:30
df2d5e148e
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20131129165644-fx0m3ok07l41o507
2013-11-29 17:56:44 +01:00
6204218a43
[FIX] mrp: fixed traceback when no BoM defined for a mrp product. Fixed also messages on procurement. Set the BoM on creation of mrp.production also instead of waiting the computation
...
bzr revid: qdp-launchpad@openerp.com-20131129144327-f7vdb0ozpm02fe4u
2013-11-29 15:43:27 +01:00
1fedbc18f5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131126060718-7io3n16co82qp5pu
bzr revid: launchpad_translations_on_behalf_of_openerp-20131127053913-ypnlpggd4wt58pzx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131128060603-kk12b8iu0uhhtist
bzr revid: launchpad_translations_on_behalf_of_openerp-20131129052938-u0wq863etr3sl1cm
bzr revid: launchpad_translations_on_behalf_of_openerp-20131129053023-zlbrprsiq9e7vs39
2013-11-29 05:30:23 +00:00
bb1e256f5b
[MERGE] forward port of branch saas-2 up to revid 9010 dle@openerp.com-20131125143003-vjtzj1c5051pdnk3
...
bzr revid: chs@openerp.com-20131125150054-b135qshkx6icakgk
2013-11-25 16:00:54 +01:00
271ed43e7b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121054848-007arsnnoa8fs65e
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121063838-blqn6j0yfmrlw5vp
2013-11-21 06:38:38 +00:00
44664076da
[MERGE] Forward-port of latest 7.0 fixes up to rev 9618 rev-id: dle@openerp.com-20131120142131-s333lyva85cyn41o
...
bzr revid: odo@openerp.com-20131120144059-yyh7emvgdarff09b
bzr revid: odo@openerp.com-20131120144318-11nmn1zj00zmi10z
2013-11-20 15:43:18 +01:00
eaa917bef9
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131120054418-15be15rhz84vk0et
2013-11-20 05:44:18 +00:00
a8f47d3747
[MERGE] [FIX] mrp: correctly handle internal type for stock.picking on manufacturing order
...
lp bug: https://launchpad.net/bugs/1117229 fixed
bzr revid: mat@openerp.com-20131119162522-x4fw8hluvfzt27ha
2013-11-19 17:25:22 +01:00
108ccbf108
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114062958-ies8xa3pft7n59ms
bzr revid: launchpad_translations_on_behalf_of_openerp-20131106055135-r0xt2vr04710jh1t
bzr revid: launchpad_translations_on_behalf_of_openerp-20131107055120-r8z445ergt50erlx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131108062620-bvfofx1jl1wb1csh
bzr revid: launchpad_translations_on_behalf_of_openerp-20131110064525-ioceogsmu0nmx2qj
bzr revid: launchpad_translations_on_behalf_of_openerp-20131111053908-gbrp09ast5fhr6iw
bzr revid: launchpad_translations_on_behalf_of_openerp-20131112062316-5uf2bvbzdhkq1b7k
bzr revid: launchpad_translations_on_behalf_of_openerp-20131113060841-bkjcuz4e9rtzn6f9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114063058-rrm2q5lxkyawuvpz
2013-11-14 06:30:58 +00:00
588507c071
[FIX] stock: reconfiguration of warehouse was buggy when the default resupply warehouse was removed from both the m2o and the m2m, the rules were also wrongly created (not in MTO) and the code was not clean. The renaming of a warehouse is also fixed and the buy/manufacture pull rules are now treated as well
...
bzr revid: qdp-launchpad@openerp.com-20131105154923-sl8ei71aa123t108
2013-11-05 16:49:23 +01:00
473d530b3e
[MERGE] merged the branch of jke with new tests on procurement cancelation
...
bzr revid: qdp-launchpad@openerp.com-20131030145105-15lzttxq19fpjtdd
2013-10-30 15:51:05 +01:00
40c309024c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131026062529-74ir3upguunr9mw3
bzr revid: launchpad_translations_on_behalf_of_openerp-20131027061317-d9s440jzv1juvswi
bzr revid: launchpad_translations_on_behalf_of_openerp-20131028054233-15znliqv2eh2jq0i
bzr revid: launchpad_translations_on_behalf_of_openerp-20131029051429-rcytejyrg2s4t9db
bzr revid: launchpad_translations_on_behalf_of_openerp-20131030055438-gp0hyend0jooi941
2013-10-30 05:54:38 +00:00
960924195e
[MERGE]merged with main addons
...
bzr revid: dka@tinyerp.com-20131030052926-i9c25mf6wpseioh3
2013-10-30 10:59:26 +05:30
3ba6a4dac4
[MERGE] Merge with trunk-wms branche
...
bzr revid: jke@openerp.com-20131029192931-63zc0kd0qyr4e8m1
2013-10-29 20:29:31 +01:00
2ba32016dc
[MERGE]: Merged with addons
...
bzr revid: atp@tinyerp.com-20131029134329-mak074spts9zjscu
2013-10-29 19:13:29 +05:30
2c65def713
[FIX] According to [wms] APR's Review from 20131022 - Move lead_time in mrp module, trace back on split delivery
...
bzr revid: jke@openerp.com-20131029074815-mws7cuvqgxr6q2d4
2013-10-29 08:48:15 +01:00
a7ff75f94a
[FIX] Remove unused menu item in the mrp_securify file
...
bzr revid: stw@openerp.com-20131028140545-xr3mav7cb3gk45qn
2013-10-28 15:05:45 +01:00
57e794c2a9
[FIX] Split demo_pre.yml in stock_data.xml for ir_model_data
...
bzr revid: jke@openerp.com-20131028103906-izdlfpzknc3j73kp
2013-10-28 11:39:06 +01:00
3e023b667b
[REM] mrp: removed deprecated and unused code
...
bzr revid: qdp-launchpad@openerp.com-20131028090054-39qvajzoto3xb9dz
2013-10-28 10:00:54 +01:00
171c086414
[MERGE] jke branch with fixes, improvement of warehouse config...
...
bzr revid: qdp-launchpad@openerp.com-20131028084702-j0e5c8i4df84zsfy
2013-10-28 09:47:02 +01:00
34862f4b43
[FIX] purchase, mrp: create buy/manufacture rules that belong to the warehouse
...
bzr revid: qdp-launchpad@openerp.com-20131023151912-adi1oa85rulzefkk
2013-10-23 17:19:12 +02:00
45c990e833
[REF] some refactoring
...
bzr revid: qdp-launchpad@openerp.com-20131023134021-jf2n0l1coh7uuc0c
2013-10-23 15:40:21 +02:00
f2b9d8f05f
[MERGE] merged with main branch
...
bzr revid: qdp-launchpad@openerp.com-20131023122842-d4yxulpthx4qa9q5
2013-10-23 14:28:42 +02:00
Christophe Simonis
Najlaâ El Khayat
Josse Colpaert
Christophe Matthieu
ged-odoo
Fabien Meghazi
Olivier Dony
Launchpad Translations on behalf of openerp
Quentin (OpenERP)
Gery Debongnie
Josse Colpaert
Antony Lesuisse
Richard Mathot (OpenERP)
Christophe Simonis
Anael Closson
Darshan Kalola (OpenERP)
Bharat R. Devnani (OpenERP)
Randhir Mayatra rma-openerp
Lionel Sausin
Simon Lejeune
Martin Trigaux
Foram Katharotiya (OpenERP)
Holger Brunn
Jitendra Prajapati (OpenERP)
Denis Ledoux
Sunil Sharma (OpenERP)
openerp-sle
Xavier Morel
Cedric Snauwaert
Thibault Delavallée
Atul Patel (OpenERP)
Pooja Zankhariya (OpenERP)
Frédéric van der Essen
Stephane Wirtel
Christophe Matthieu
Jignesh Rathod (OpenERP)
jke-openerp