064b1a3a40
[IMP] Old hack where uom_id had to be empty in on_change
...
[IMP] Add purchase order origin on picking
[WIP] Picking type on move for location on routing
[IMP] Provide extra function for custom buttons on picking
[IMP] Action assign optim
[IMP] Push apply should take invoice_state into account. Propagation of cancel of stock moves should depend on procurement rule
2014-09-12 13:49:41 +02:00
114f66c277
Merge pull request #2027 from odoo-dev/8.0-wmsstaging7-jco
...
8.0 wmsstaging7 jco
2014-09-03 21:36:01 +02:00
b8a40a4e0f
[IMP] Clean
2014-09-03 19:19:18 +02:00
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
f6650f0da7
[IMP] Clean
2014-09-03 19:18:17 +02:00
12d9333f48
[IMP] Clean
2014-09-03 19:18:17 +02:00
9b34358196
[IMP] Adapt mrp workflow and moves + Differ between Bose speakers and Custom Computer
2014-09-03 19:18:17 +02:00
655570fe23
[IMP] Domain on model instead of view + no production order without consume lines
2014-09-03 19:18:17 +02:00
6553e22306
[WIP] Create procurement when Phantom
2014-09-03 19:18:16 +02:00
625aa7e75d
[MERGE] forward port of branch saas-5 up to 7d7f6fe
2014-08-05 16:04:58 +02:00
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
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
beb12f71f1
Merge branch 'odoo/8.0' into master-wmsstaging4-jco
2014-07-07 23:34:42 +02:00
af0e9b8aa6
[MERGE] Fix copy_data for merge
2014-07-07 14:33:01 +02:00
33eb3dffb2
[REM] models: remove the magic methods signal_XXX()
2014-07-07 11:50:30 +02:00
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
2dfd5e70a8
Merge remote-tracking branch 'odoo/master' into master-wmsstaging4-jco
2014-06-26 11:28:11 +02:00
89041fafce
[FIX] Take into account that location_id of routing can be empty
2014-06-25 18:17:32 +02:00
026e38b48f
[REM] Unnecessary `size` parameters on char fields
2014-06-25 17:13:43 +02:00
f1afeb680b
[NOIMP] Create move before other move when routing location is different from production source location
2014-06-19 16:58:52 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
96ea9392aa
[IMP] convert button into stat button for products
...
bzr revid: rma@tinyerp.com-20140324135621-13t191kmnn6t22jk
2014-03-24 19:26:21 +05:30
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
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
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
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
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
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
bdaccb7053
[MERGE]: Merged with addons
...
bzr revid: atp@tinyerp.com-20140210060020-2kfsig5t3ps14i4k
2014-02-10 11:30:20 +05:30
31348b1e4a
[FIX]sale_order with product using phantom bom
...
bzr revid: csn@openerp.com-20140207112606-k0cxzhpytlodjd1y
2014-02-07 12:26:06 +01: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
19501096f5
[MERGE] main trunk-wms branch
...
bzr revid: qdp-launchpad@openerp.com-20140204110840-iur4q0t9rz5v2y5i
2014-02-04 12:08:40 +01:00
753f7541db
[MERGE] main trunk
...
bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e
2014-02-03 18:30: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
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
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
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
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
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
b50247109c
[IMP] Basic version working with lots
...
bzr revid: jco@openerp.com-20140117164232-8gu0bb8qbbk67yrx
2014-01-17 17:42:32 +01:00
338013803d
[WIP] Extending wizard with consume lines
...
bzr revid: jco@openerp.com-20140116174800-kap083m5jvacsbh6
2014-01-16 18:48:00 +01: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
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
2ba32016dc
[MERGE]: Merged with addons
...
bzr revid: atp@tinyerp.com-20131029134329-mak074spts9zjscu
2013-10-29 19:13:29 +05:30
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
a3c28ede83
[MERGE] mergedf jke branch with removal of useless picking_id field on mrp.production + temporary commented crashing yaml test
...
bzr revid: qdp-launchpad@openerp.com-20131016073302-3hvpuikmacvbo00c
2013-10-16 09:33:02 +02:00
18a9318cfd
[FIX] mrp: removed picking_id field on mrp.production
...
bzr revid: jke@openerp.com-20131016071209-pryay03jucyezjje
2013-10-16 09:12:09 +02:00
65966940c8
[MERGE] merged with main trunk
...
bzr revid: qdp-launchpad@openerp.com-20131010133212-t058auv973pvvmjm
2013-10-10 15:32:12 +02:00
5cba82e2c9
[MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8788 dle@openerp.com-20131003094541-ro29hhkas03rdvw8
...
bzr revid: odo@openerp.com-20131003111222-upt1ytb92db50zay
2013-10-03 13:12:22 +02:00
a9158e5993
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9487 rev-id: dle@openerp.com-20130930141202-ghnujem348kydd2m
...
bzr revid: dle@openerp.com-20130930150804-b4j080uy06t4n7f1
2013-09-30 17:08:04 +02:00
1e944f8c03
[MERGE] merged the branch with mrp test rehab (includes mrp workflow fixes)
...
bzr revid: qdp-launchpad@openerp.com-20130925102034-fn2qdkx55ylai9rr
2013-09-25 12:20:34 +02:00
e503beb955
[FIX] mrp: workflow
...
bzr revid: qdp-launchpad@openerp.com-20130925083749-iafe0qoq2jqmvgk5
2013-09-25 10:37:49 +02:00
0e06471680
[MERGE] merge with main branch
...
bzr revid: qdp-launchpad@openerp.com-20130924090225-1is038pb3sngz9qe
2013-09-24 11:02:25 +02:00
e2e20bae4c
[FIX] mrp: improved fix, used DEFAULT_SERVER_DATETIME_FORMAT for date, removed extra AND and _order from search()
...
bzr revid: rha@tinyerp.com-20130924062648-qshruwnukmtn0b7w
2013-09-24 11:56:48 +05:30
db84e912bd
[MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8781 rev-id: dle@openerp.com-20130923165651-0jt823r5wy37enw6
...
bzr revid: dle@openerp.com-20130923171310-mav1riq3d2rebmv2
2013-09-23 19:13:10 +02:00
56757bc3b9
[IMP] Make sure consume lines create procurements
...
bzr revid: jco@openerp.com-20130919104336-dmu0pvb9f7780ueb
2013-09-19 12:43:36 +02:00
546a191f0a
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9459 rev-id: fva@openerp.com-20130918153347-fy4nuvbm82ngfb8x
...
bzr revid: mat@openerp.com-20130826135110-f9q4p65ds2aholcw
bzr revid: dle@openerp.com-20130828141129-ecxl2vlpb8vw0o9f
bzr revid: dle@openerp.com-20130828162659-n8a0ku9o3h01qaov
bzr revid: dle@openerp.com-20130830094205-q3itwd7x0246d9n6
bzr revid: dle@openerp.com-20130830133604-mfnfbscn5wdk4vi4
bzr revid: dle@openerp.com-20130902131244-v9uh0s8rg4889i7j
bzr revid: mat@openerp.com-20130903134105-68ziuaccreu6rs61
bzr revid: chs@openerp.com-20130906171851-jtfsf4au1k30wwlr
bzr revid: dle@openerp.com-20130909103120-k5oefxgebhyslac3
bzr revid: dle@openerp.com-20130909170047-pbzw4ernvcpivbhh
bzr revid: chs@openerp.com-20130910122113-171osvcukxffxcry
bzr revid: tde@openerp.com-20130912121059-k840pi4rwdzpez8g
bzr revid: dle@openerp.com-20130913085251-p906ci2divy82jur
bzr revid: tde@openerp.com-20130913092546-kzshg1a7sls566l8
bzr revid: mat@openerp.com-20130917122102-drf8fj9lrjj0fvju
bzr revid: mat@openerp.com-20130917161614-w8u2c1ayeb5kxm30
bzr revid: dle@openerp.com-20130918161305-7ep1642nxzyy3vhd
2013-09-18 18:13:05 +02:00
9494290cb1
[FIX] Try to fix mrp tests and mrp
...
bzr revid: jco@openerp.com-20130918135612-n8d1qqbxh0rbgtcw
2013-09-18 15:56:12 +02:00
461b5d8191
[MERGE] [FIX] mrp_subproduct: correctly take into account subproduct_factor when checking quantities on BoM
...
bzr revid: mat@openerp.com-20130916123442-cch34mghmwh1p18e
2013-09-16 14:34:42 +02:00
3029fc869e
[MERGE] [FIX] mrp: producing a BoM of type service is no longer blocked in ready state, correctly transmit project reference when create task from sale order
...
bzr revid: mat@openerp.com-20130916113323-8an09x0d7svv2j7d
2013-09-16 13:33:23 +02:00
503f69cba3
[IMP] project_mrp: cleaning and add condition for triggering signal
...
bzr revid: mat@openerp.com-20130916100120-kuuyofh3o8e3iv8c
2013-09-16 12:01:20 +02:00
7485ec46d7
[IMP] mrp: trigger workflow only if no move lines
...
bzr revid: mat@openerp.com-20130916094604-zonoyxeic948mjn2
2013-09-16 11:46:04 +02:00
8089d2c3a6
[REM]mrp: Remove tooltips from product_uos_qty
...
bzr revid: atp@tinyerp.com-20130913091810-xoblepy4nyo6i67m
2013-09-13 14:48:10 +05:30
2b65bbfa82
[IMP] Improved code to return product_lines.
...
bzr revid: psa@tinyerp.com-20130912135445-xf0rmbh117fznd5v
2013-09-12 19:24:45 +05:30
8825f2070b
[IMP] Improved method name and code accordingly.
...
bzr revid: psa@tinyerp.com-20130912131434-99xv1prw3o4dy9ge
2013-09-12 18:44:34 +05:30
387bffe50e
[IMP] Divided the action_compute method and improved code according to that.
...
bzr revid: psa@tinyerp.com-20130912115556-9c67dzpr6mao251w
2013-09-12 17:25:56 +05:30
000ca6103d
[IMP] Added another testcase for 2 service type product
...
And improved code for bom product with service type product used in SO doesnt link the project perfectly.
bzr revid: psa@tinyerp.com-20130912110454-x9tidij14xj09joz
2013-09-12 16:34:54 +05:30
Josse Colpaert
Denis Ledoux
Martin Trigaux
Raphael Collet
Jaydeep Barot
Christophe Simonis
Najlaâ El Khayat
Christophe Matthieu
Quentin (OpenERP)
Gery Debongnie
Josse Colpaert
Holger Brunn
Randhir Mayatra rma-openerp
Christophe Simonis
Denis Ledoux
Thibault Delavallée
Atul Patel (OpenERP)
Cedric Snauwaert
Olivier Dony
jke-openerp
Rifakat
Paramjit Singh Sahota