753f7541db
[MERGE] main trunk
...
bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e
2014-02-03 18:30:00 +01:00
72f4cdc3b1
[MERG€] purchase: stock move created by a PO hadn't any reference to the PO as origin
...
lp bug: https://launchpad.net/bugs/1269353 fixed
bzr revid: qdp-launchpad@openerp.com-20140130103722-q919n0j0otu0jczs
2014-01-30 11:37:22 +01:00
c202dc1c52
merge upstream
...
bzr revid: chs@openerp.com-20140129190834-xfcat3ulfbg5omhn
2014-01-29 20:08:34 +01:00
6cc096aebc
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9798 revid:dle@openerp.com-20140129163238-1s1t9oc814z4z7f3
...
bzr revid: dle@openerp.com-20140129171022-wf6244k90lpncmah
2014-01-29 18:10:22 +01:00
08dfda9ec6
[FIX] purchase: on po confirm, avoid to write location_id on the chained stock move if the move is done
...
On purchase order confirmation, if the order_line comes from a procurement order created by a sale order,
it tried to write on the location_id, whatever the move state was, even done.
Or, sometimes, the stock move associated to the procurement order (from the so) was already done, for example because we forced the availability of the stock move.
It makes sense to not write the location_id if the move is already done, because the location_id is already good.
bzr revid: dle@openerp.com-20140129163238-1s1t9oc814z4z7f3
2014-01-29 17:32:38 +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
4f3a4dce3b
[FIX] purchase: on unlink purchase order line, cancel procurements associated to the move of the purchase order line
...
bzr revid: dle@openerp.com-20140120170729-57fm8tluz5p4zdk5
2014-01-20 18:07:29 +01:00
fc93025818
[MERGE] merged trunk
...
bzr revid: qdp-launchpad@openerp.com-20140120144243-5kw535p28t1x7yeg
2014-01-20 15:42:43 +01:00
49104e9108
[FIX]add PO name to origin field when generating picking from PO
...
lp bug: https://launchpad.net/bugs/1269353 fixed
bzr revid: csn@openerp.com-20140120103048-ebb2ow8rutn2gs21
2014-01-20 11:30:48 +01:00
5649e0bbf2
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9770 revid:chs@openerp.com-20140116154645-sy4zhdgqc48xaqbx
...
bzr revid: dle@openerp.com-20131224112612-5gjit5uu1aaaqstx
bzr revid: dle@openerp.com-20140103094532-mbczi9ssr3gc90o1
bzr revid: dle@openerp.com-20140108105833-gblxqdw3if1gt35k
bzr revid: dle@openerp.com-20140115121441-bskbyxxbc09ubavh
bzr revid: dle@openerp.com-20140115165506-yuux9km39gbv7k4n
bzr revid: dle@openerp.com-20140116161415-0y9m0kgavcytzj9z
2014-01-16 17:14:15 +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
2aa8a38447
[IMP] sale,purchase order: order the field based on date_order instead of name
...
This avoids getting irrelevent order based on sequences without padding (eg: SO10 between SO1 and SO2)
bzr revid: mat@openerp.com-20140115140527-pztwh3kl6y9y7jbe
2014-01-15 15:05:27 +01:00
899166ecac
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9761 revid:dle@openerp.com-20140114164804-zhfy9lb308554kp1
...
bzr revid: dle@openerp.com-20140114173653-xhh85ubx27uu1306
2014-01-14 18:36:53 +01:00
8a729c10fa
[FIX] purchase: fix workflow for orders based on incoming shipments
...
Purchase orders Based on incoming shipments never ended in done stage
bzr revid: dle@openerp.com-20140114164804-zhfy9lb308554kp1
2014-01-14 17:48:04 +01:00
53f2e9ff7b
[FIX] purchase: if the order line has a bigger quantity than the procurement it was for (manually changed or minimal quantity), then split the future stock move in two because the route followed may be different.
...
bzr revid: qdp-launchpad@openerp.com-20131218155647-kp78jdqel91iyroq
2013-12-18 16:56:47 +01:00
d9343e2d27
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20131213094016-ylqkilyo4190g81w
2013-12-13 10:40:16 +01:00
a5cc6d6aed
[MERGE] merged with main trunk
...
bzr revid: qdp-launchpad@openerp.com-20131211100354-hwlt65vk8p3xih9u
2013-12-11 11:03:54 +01:00
9aa559a3a1
[IMP] purchase: usability improvements + linked the stock move to the procurement that created the PO line, in order to be able to propagate any information on it
...
bzr revid: qdp-launchpad@openerp.com-20131210151326-rrlfgnx27114gbq0
2013-12-10 16:13:26 +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
dc458033d5
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9678 rev-id: dle@openerp.com-20131206121552-xre6jj34cpfuldoa
...
bzr revid: dle@openerp.com-20131206121908-oomajjxqtsp8cipc
2013-12-06 13:19:08 +01:00
847ca65a23
[FIX] purchase: warning uom category different only if the changed field is product_uom itself.
...
Changing product_id with a different unit category does not trigger the uom category change warning
bzr revid: dle@openerp.com-20131206121552-xre6jj34cpfuldoa
2013-12-06 13:15:52 +01:00
0ac4a8f696
[MERGE] forward port of branch 7.0 up to revid 9668 launchpad_translations_on_behalf_of_openerp-20131130053134-6u83vcd1133xs8yf
...
bzr revid: chs@openerp.com-20131130130014-hi5h5a00kjx0dbvp
2013-11-30 14:00:14 +01:00
df2d5e148e
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20131129165644-fx0m3ok07l41o507
2013-11-29 17:56:44 +01:00
556c7f03f0
[FIX] purchase: revert revision 7677 to set a default unit of measure to 'Unit'
...
This allows to field a purchase.order without showing the units of measure if not product is selected
Revision 7677 was integrated to fix lp:958897 (no change of uom when selecting a product whose uom is in the category 'Units'). This fix did not solve it properly (only for initial value) and introduced another problem. A better fix will be done on the onchange product.
bzr revid: mat@openerp.com-20131129143522-i85e4hvf0p4h3ynn
2013-11-29 15:35:22 +01:00
361406fab8
[FIX]purchase: on invoice payment confirmation (during a reconciliation for example), 'invoice paid' is written on the purchase order of the invoice. Traceback when there was several purchase orders associated to the invoices confirmed
...
bzr revid: dle@openerp.com-20131128110937-gs6ko4djss3ffl3o
2013-11-28 12:09:37 +01:00
6b05beecc1
[MERGE] forward port of branch 7.0 up to revid 9651 chs@openerp.com-20131127104459-jb77x7quwcvtifm7
...
bzr revid: dle@openerp.com-20131126171210-jovr7e7efehuq3s2
bzr revid: chs@openerp.com-20131127110046-4ow36dkuuyzgf1pl
2013-11-27 12:00:46 +01:00
370b4df6f3
[MERGE] {purchase,purchase_requisition}: choose the right warehouse when creating purchase orders from purchase order/requisition
...
bzr revid: chs@openerp.com-20131127104459-jb77x7quwcvtifm7
2013-11-27 11:44:59 +01:00
7c0c95b1a4
[FIX] sale, purchase: don't copy the customer/supplier reference when copying a SO/PO
...
bzr revid: qdp-launchpad@openerp.com-20131127084625-dqgoloz4q47zlpti
2013-11-27 09:46:25 +01:00
49fa5cab61
[FIX] purchase_requisition: copy method _get_warehouse from purchase module to avoid crash if purchase_requisition is updated but not purchase
...
bzr revid: chs@openerp.com-20131126180726-ng0gue9pedmuykj9
2013-11-26 19:07:26 +01:00
34832b4694
[FIX] purchase: at the validation of the PO, force the company in the context as the company on the PO in order to read property fields correctly. This patch is necessary to allow a user to confirm a PO belonging to another company (if he has the rights to do so).
...
bzr revid: qdp-launchpad@openerp.com-20131126170505-ttzuiaujpl1k24rg
2013-11-26 18:05:05 +01:00
b81c3897ee
[FIX] purchase: choose the right warehouse when creating purchase orders from procurement orders
...
bzr revid: chs@openerp.com-20131126135026-echb4fq37229g637
2013-11-26 14:50:26 +01:00
d2d0184587
[IMP] pocurement, stock, purchase, sale_stock, stock_account: misc changes in usabilty, code refactoring and new option on procurement group propagation.
...
1) form view of procurement.order and procurement.rule reviewed
2) added buttons on procurement.order to jump on other procurements or pickings of same procurement.group
3) tracked some fields on procurement.order
4) used the short name of warehouse for the rule names
5) added a new choice for the procurement.group propagation in order to allow having only one reception picking for several po lines grouped in the same PO but belonging to different procurement.group at first
6) some code refactored for easiness, modularity, clarity and other obvious reasons
bzr revid: qdp-launchpad@openerp.com-20131107112053-knracfslqkfitg8b
2013-11-07 12:20:53 +01:00
b5645d2386
[FIX] stock_account, purchase: the standard price of a product may not be compatible with the decimal precision 'Account' or the coinage of the main currency, so we need to take care of that when creating the stock valuation entries
...
bzr revid: qdp-launchpad@openerp.com-20131104164939-jupkxy1zrqqq3lpq
2013-11-04 17:49:39 +01:00
0cf57bdee2
[MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8800 rev-id: dle@openerp.com-20131031162241-goga1hsvwgyqigzd
...
bzr revid: chs@openerp.com-20131031142325-vo84hk5co2e2phg0
bzr revid: dle@openerp.com-20131031143133-wfus2hag57e73by2
bzr revid: dle@openerp.com-20131031162928-8gpom1ralccy07uc
2013-10-31 17:29:28 +01:00
7f9b84150f
[FIX] purchase: apply same fix to invoice paid
...
bzr revid: mat@openerp.com-20131029093404-hw95lpcjsnok2wxa
2013-10-29 10:34:04 +01:00
44d117398a
[FIX] purchase: post message on purchase order as admin if have no read access (would block validating invoice, opw #596294 )
...
bzr revid: mat@openerp.com-20131029092353-yg0wxl42352yu2rb
2013-10-29 10:23:53 +01:00
2a982d199e
[MERGE] merged with trunk
...
bzr revid: qdp-launchpad@openerp.com-20131028093247-8eegjl3zle5aoqae
2013-10-28 10:32:47 +01:00
177abaeccf
[IMP] purchase: removed debug statement
...
bzr revid: qdp-launchpad@openerp.com-20131023100005-30p2uo874zsdaum6
2013-10-23 12:00:05 +02:00
4d8a5750de
[IMP] purchase: cancellation of a procurement related to a PO + some usability changes
...
bzr revid: qdp-launchpad@openerp.com-20131022085856-i9m00f1hh0qkrkk9
2013-10-22 10:58:56 +02:00
e0b7ff8de6
[IMP] stock, procurement, purchase, mrp: cancelation of a procurement now propagate the cancellation upstream if the rule says so
...
bzr revid: qdp-launchpad@openerp.com-20131021151235-y0kjr9vy06a3curr
2013-10-21 17:12:35 +02:00
0f0d6cad63
[FIX] purchase: purhcase_id field on stock.picking doesn't exist anymore
...
bzr revid: qdp-launchpad@openerp.com-20131021112518-2gwjvmoehlzxherf
2013-10-21 13:25:18 +02:00
9f2d0cc781
[MERGE] misc things: replacement of picking_ids on purchase.order by a fields.function; adding of a button on stock.warehouse to see all the routes related; usability improvement in stock.warehouse form view; bugfix in creation of picking/stock moves from purchase.order confirmation; view all picking-related from button on purchase.order instead of just the incoming shipment
...
bzr revid: qdp-launchpad@openerp.com-20131017160725-fjphdok34is6q4bc
2013-10-17 18:07:25 +02:00
eddd2f3575
[MERGE] merged with main feature branch
...
bzr revid: qdp-launchpad@openerp.com-20131017121349-xyip1fn6j0itiz56
2013-10-17 14:13:49 +02:00
66b0500f3c
Task misc -Step 2
...
bzr revid: jke@openerp.com-20131014142540-udu9mn3lu99alir2
2013-10-14 16:25:40 +02:00
7dde2be791
task : misc - part 1
...
bzr revid: jke@openerp.com-20131011160423-arlw8cb809us4c9f
2013-10-11 18:04:23 +02:00
8ac110c4dd
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 5098 rev-id: odo@openerp.com-20131011123914-7zuvd9mch21yxgj8
...
bzr revid: dle@openerp.com-20131009131902-a93nsbou4w8y0vlx
bzr revid: chs@openerp.com-20131009175454-j06y1ngylfbqyrpj
bzr revid: dle@openerp.com-20130918160049-fo88fl7uyhfoofkv
bzr revid: dle@openerp.com-20130924130544-kmkyr0d73cusvdav
bzr revid: odo@openerp.com-20131011134433-nyfjipvlql4xu127
2013-10-11 15:44:33 +02:00
65966940c8
[MERGE] merged with main trunk
...
bzr revid: qdp-launchpad@openerp.com-20131010133212-t058auv973pvvmjm
2013-10-10 15:32:12 +02:00
273face907
[MERGE] forward port of branch saas-1 up to revid 8791 chs@openerp.com-20131009175454-j06y1ngylfbqyrpj
...
bzr revid: chs@openerp.com-20131009180337-cxgdt6zzd1z68ga9
2013-10-09 20:03:37 +02:00
6bd70af1de
[IMP] purchase: put back sql request to set exception message and avoid context hack
...
bzr revid: mat@openerp.com-20131009122714-rqhciu8ozy059pyn
2013-10-09 14:27:14 +02:00
5ee7193c9c
[MERGE] jke's branch with usability stuff and merge of PO
...
bzr revid: qdp-launchpad@openerp.com-20131008123659-4g1bggnhfgepghaz
2013-10-08 14:36:59 +02:00
Quentin (OpenERP)
Christophe Simonis
Denis Ledoux
Cedric Snauwaert
Thibault Delavallée
Martin Trigaux
Christophe Matthieu
jke-openerp
Olivier Dony