5aa2fa150c
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
2014-05-02 15:07:53 +02:00
52480275c3
[IMP] purchase: invoice creation more modular/extensible through the introduction of a _prepare_invoice method()
...
This is similar to what was previously done for Sales Orders.
bzr revid: odo@openerp.com-20140430140103-hfumie3ndvlodgeh
2014-04-30 16:01:03 +02:00
b8d4387d33
[MERGE] merged with main addons branch
...
bzr revid: bde@tinyerp.com-20140418061256-n53rymt5j8krzvr5
2014-04-18 11:42:56 +05:30
0c24df7074
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140417065356-x7o3jg5bo5430zth
2014-04-17 08:53:56 +02:00
fe8a745b02
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140416082925-eph1x8vnwj6o31rt
2014-04-16 10:29:25 +02:00
61da3f4aba
[MERGE] forward port of branch saas-3 up to revid 9409 dle@openerp.com-20140415101427-a6r7lgy50x9bdah3
...
bzr revid: chs@openerp.com-20140415142934-rlka4vkxd34fkil8
2014-04-15 16:29:34 +02:00
569d9dc75a
[FIX] move the purchase_ids, purchase_count fields defined in purchase.py from the model product.template to product.product to make them work correctly (addon purchase)
...
bzr revid: ged@openerp.com-20140415135411-428kxcysuy73soeu
2014-04-15 15:54:11 +02:00
f8d5ef0f80
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 4174 revid:dle@openerp.com-20140415130732-bud8xb3pzgxw2imr
...
bzr revid: dle@openerp.com-20140415101427-a6r7lgy50x9bdah3
bzr revid: dle@openerp.com-20140415130951-ckuv8nsl17qkb300
2014-04-15 15:09:51 +02:00
a701934ac7
[FIX] purchase: invoiced based on invoiced bool of purchase order line, instead of rate
...
invoiced bool of purchase order line is set to true on invoice validation, not on invoice creation
bzr revid: dle@openerp.com-20140415081211-jz6if0vzgq3inzzw
2014-04-15 10:12:11 +02:00
8178669795
[FIX] mail, mass_mailing
...
- mail: now trigger postprocess_sent_message in every case, being sent or not, as the state
is propagated in the method; udpated all addons accordingly;
- email_template: fixed URL to edit it in website + form view;
- mass_mailing: barchart now send jsonified value;
- mass_mailing: tweaking the form view with all options
bzr revid: tde@openerp.com-20140408124053-o9tb14k6v47s5mjd
2014-04-08 14:40:53 +02:00
5e75ce212b
[IMP]: Convert buttons into stat button in purchase module
...
bzr revid: ypa@tinyerp.com-20140326124002-lj4wd30vd6hy5k9x
2014-03-26 18:10:02 +05:30
c086291ddd
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20140325135635-rev8asknqwk08svy
2014-03-25 19:26:35 +05:30
7185a68775
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20140325090209-w1qtcswiao01gqlu
2014-03-25 10:02:09 +01:00
9556cadbff
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140324162043-dzdwcxdt32sfjy57
2014-03-24 17:20:43 +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
b6bd0e8b8a
[FIX] fix the print purchase button
...
bzr revid: sle@openerp.com-20140320154226-tpx3d8a0xrmuxwrr
2014-03-20 16:42:26 +01:00
44e8722cc3
[FIX] portal_sale, purchase: fixed inherit of _postprocess_sent_message, now taking a new argument
...
mail_sent telling whether the email has effectively been sent (because mail.state
is not available du to transient state).
bzr revid: tde@openerp.com-20140319084748-um13u2mr9u2qt23s
2014-03-19 09:47:48 +01:00
cac0c9600a
[MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9154 revid:dle@openerp.com-20140318151824-sscl4m8p87emjl8s
...
bzr revid: chs@openerp.com-20140318120024-mcxmkncn1xktjs7v
bzr revid: dle@openerp.com-20140318152621-l6jxc0bbbofm7fzg
2014-03-18 16:26:21 +01:00
02459f8d4a
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9929 revid:dle@openerp.com-20140325104921-x8zjx5p71l1o3uif
...
bzr revid: dle@openerp.com-20140310133913-465x5t3n1bo7fu98
bzr revid: dle@openerp.com-20140311164146-2s599kogbqj8e94l
bzr revid: dle@openerp.com-20140312111149-u6y036aej3ywq7et
bzr revid: dle@openerp.com-20140312121145-06s1jvct9v4m7l6s
bzr revid: mat@openerp.com-20140313084409-c0kckxemy3in0mlo
bzr revid: chs@openerp.com-20140313163420-ifa4hyixj722d6jo
bzr revid: chs@openerp.com-20140314102034-g0nzryvwhrpzdas9
bzr revid: chs@openerp.com-20140314104803-19c5snl2fcuih91o
bzr revid: odo@openerp.com-20140314143519-x6rzcfkkqxwc0e1g
bzr revid: chs@openerp.com-20140318110229-y8098w3shdpmoig2
bzr revid: dle@openerp.com-20140318151824-sscl4m8p87emjl8s
bzr revid: dle@openerp.com-20140320112618-yfyihlwz66ryeqf5
bzr revid: dle@openerp.com-20140320161003-j01cc6sqves2wnp2
bzr revid: dle@openerp.com-20140320181252-4gqcog22p1ex0pz7
bzr revid: dle@openerp.com-20140321140450-8ulnhr76qybiadks
bzr revid: dle@openerp.com-20140324104743-ubvu8st7emq9pg1q
bzr revid: dle@openerp.com-20140325112413-xs5z7y81rhyjt0rd
2014-03-25 12:24:13 +01:00
1225c8b530
[FIX] purchase: for drop shipping po, the supplier of the picking was the customer address, which is obviously wrong, it should be the supplier of the po
...
bzr revid: dle@openerp.com-20140318151456-qw896i1t55wgwhkm
2014-03-18 16:14:56 +01:00
9e102b6b24
[MERGE] merged with main addons
...
bzr revid: bde@tinyerp.com-20140212064422-4thlmyk5psff9lth
2014-02-12 12:14:22 +05:30
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
28a33f3a8d
[IMP] improved some warning messages
...
bzr revid: bde@tinyerp.com-20140124123045-kgovbmuhkovax068
2014-01-24 18:00:45 +05:30
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
4da0f5460d
[MERGE] merged with main addons
...
bzr revid: bde@tinyerp.com-20140123063749-6lqhwdh34ln69pqu
2014-01-23 12:07:49 +05:30
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
ac2ad8e029
[MERGE] merged with main addons
...
bzr revid: bde@tinyerp.com-20131231052502-k8uge2fxeulestpa
2013-12-31 10:55:02 +05:30
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
598d420365
[IMP] improved the code
...
bzr revid: bde@tinyerp.com-20131203063806-vpu7ofijvaio1m79
2013-12-03 12:08:06 +05:30
c88dbc8b01
[IMP] improved warning message
...
bzr revid: bde@tinyerp.com-20131203063423-ne1dwsy4q0vp53hj
2013-12-03 12:04:23 +05:30
baa430d237
[IMP] improved warning messages
...
bzr revid: bde@tinyerp.com-20131202084204-r0br5ytoc12ysjrl
2013-12-02 14:12:04 +05:30
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
Gery Debongnie
Olivier Dony
Bharat R. Devnani (OpenERP)
Thibault Delavallée
Christophe Simonis
Denis Ledoux
Yogesh Parekh (OpenERP)
Randhir Mayatra rma-openerp
Simon Lejeune
Martin Trigaux
Christophe Matthieu
Quentin (OpenERP)