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
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
d9343e2d27
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20131213094016-ylqkilyo4190g81w
2013-12-13 10:40:16 +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
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
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
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
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
18528adaff
[FIX] purchase: block workflow when supplier check fails, even if already has set an error message
...
lp bug: https://launchpad.net/bugs/1236191 fixed
bzr revid: mat@openerp.com-20131007081014-8p0u7s0svx7gokg1
2013-10-07 10:10:14 +02:00
cdd5b4f130
[FIX] purchase: use the correct variable, finally
...
bzr revid: mat@openerp.com-20131004155600-vqasj1w07uhnvdmy
2013-10-04 17:56:00 +02:00
4c0c18b803
[FIX] purchase: avoid getting trigger loop (again), apply same fix on procurement to be consistent
...
bzr revid: mat@openerp.com-20131004153915-2urkq50bp8rnddnt
2013-10-04 17:39:15 +02:00
e827454d1d
[FIX] purchase: avoid workflow trigger infinite loop
...
bzr revid: mat@openerp.com-20131004150710-mtecvsj9ad7qrisc
2013-10-04 17:07:10 +02:00
376d390914
[IMP] purchase: don't send messages at all when exception, already logged in message field
...
bzr revid: mat@openerp.com-20131004144029-rp0j2z53zxt7ddh5
2013-10-04 16:40:29 +02:00
dbac14474f
[FIX] purchase: reduce the number of mail messages sent to when procurement in exception
...
lp bug: https://launchpad.net/bugs/1233730 fixed
bzr revid: mat@openerp.com-20131004140602-8gic5ojgadso5801
2013-10-04 16:06:02 +02:00
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
955276a684
[FIX]purchase: It was no possible to validate invoices of several purchase orders due to a message_post with a list of more than 1 id
...
bzr revid: dle@openerp.com-20130920115431-ub87n3wgobuq4ic3
2013-09-20 13:54:31 +02:00
bf29a2ebc7
[MERGE] forward port of branch 7.0 up to revid 9302 chs@openerp.com-20130718111616-apacuhc2qhquobtc
...
bzr revid: dle@openerp.com-20130627104833-b9zgtu8urj43f12b
bzr revid: mat@openerp.com-20130702135856-kmg7d8anw17nkbd8
bzr revid: chs@openerp.com-20130718115928-wpa84dqh8tcq31zt
2013-07-18 13:59:28 +02:00
84a134c46d
[FIX] account_anglo_saxon: backport of revision 8787 of trunk
...
bzr revid: qdp-launchpad@openerp.com-20130710215655-5ym1u4ecsmqdw30n
2013-07-10 23:56:55 +02:00
e92a18ee0b
[MERGE] merged with main addons
...
bzr revid: bde@tinyerp.com-20130701085739-94uxqowz623wudp4
2013-07-01 14:27:39 +05:30
bf4ada34b4
[REF] mail_thread: message_track now uses browse records instead of read results.
...
Updated addons accordingly.
Updated tests to test corner cases using False / null browse records.
bzr revid: tde@openerp.com-20130627144647-swbj77i84vo9ii0v
2013-06-27 16:46:47 +02:00
ea03ed65b6
[FIX] purchase, accont_anglo_saxon: fixed the creation of invoice from PO lines so that it reuse the _prepare_inv_line() method. This code factorization is needed in order to work with account_anglo_saxon module (before the anglo saxon accounting mode was ignored if the PO's invoicing method was 'generate invoices from PO lines')
...
bzr revid: qdp-launchpad@openerp.com-20130624090741-eyy2r22yuti0gqit
2013-06-24 11:07:41 +02:00
7e8e2ca75f
[FIX] account_anglo_saxon: fixed the computation of price difference inc costing method != 'standard' + added yaml test for the same feature
...
bzr revid: qdp-launchpad@openerp.com-20130624090329-o423720dp3oc4aez
2013-06-24 11:03:29 +02:00
23e19fd44d
[MERGE] merged with main addons
...
bzr revid: bde@tinyerp.com-20130614051756-ez03kbg7jwmhsb7u
2013-06-14 10:47:56 +05:30
588e2511a1
[IMP] improve help
...
bzr revid: darshankalola@gmail.com-20130610114141-763853rbepz0csdd
2013-06-10 17:11:41 +05:30
00029958b3
[IMP] improve Help
...
bzr revid: darshankalola@gmail.com-20130607130240-e5indzh1nzfmy4wk
2013-06-07 18:32:40 +05:30
8f07cb2046
[IMP] Improved Help
...
bzr revid: darshankalola@gmail.com-20130605070425-ykw13dlv28aq4akh
2013-06-05 12:34:25 +05:30
c4cbd56be6
[IMP] remove unnecessary chnages
...
bzr revid: rma@tinyerp.com-20130527111216-dyo8qprm6zh5u3cj
2013-05-27 16:42:16 +05:30
c96dc3303f
[IMP] code improve
...
bzr revid: rma@tinyerp.com-20130523110343-owr25x1mmr2joheu
2013-05-23 16:33:43 +05:30
821e05f477
[IMP] upadte the currency in invoices
...
bzr revid: rma@tinyerp.com-20130523104820-1qp3zcd8oubz2329
2013-05-23 16:18:20 +05:30
Christophe Simonis
Denis Ledoux
Thibault Delavallée
Martin Trigaux
Christophe Matthieu
Quentin (OpenERP)
Olivier Dony
Bharat R. Devnani (OpenERP)
Darshan Kalola (OpenERP Trainee)
Randhir Mayatra (OpenERP)