Randhir Mayatra rma-openerp
27ee024847
[IMP] optimize code
2014-04-22 12:53:03 +05:30
Randhir Mayatra rma-openerp
6da28202f3
[MERGE] merge with latest trunk
2014-04-11 12:36:24 +05:30
Christophe Simonis
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
Ravish (Open ERP)
7699504d62
[Add new sale_team module]
2014-03-28 15:28:35 +05:30
Denis Ledoux
e61d12bfa7
[MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9160 revid:dle@openerp.com-20140325112413-xs5z7y81rhyjt0rd
...
bzr revid: dle@openerp.com-20140325112909-zpfi67tx8yfxwnqe
2014-03-25 12:29:09 +01:00
Denis Ledoux
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
Denis Ledoux
8310cd1920
[FIX] sale: make invoice for SO grouped by partner based on partner_invoice_id instead of just partner_id
...
For two sale order, if the partner_id were different but the partner_invoice_id were identical, the make invoice grouped by partner created two different invoices
bzr revid: dle@openerp.com-20140325103226-vusygdpd74yha91m
2014-03-25 11:32:26 +01:00
Denis Ledoux
4235dc8e88
[REVERT]9882 revid:jri@openerp.com-20140307160945-r2t5pbl2bb7yaw9n
...
While it seems right to only show the partner addresses in invoice and shipping addresses, this fix will prevent to use sibling addresses (the address of another contact in the same company), which is a requirement for several users. Therefore, this fix causes more problems than it resolves.
Moreover, these addresses are displayed on the invoice form as following: Company Name / Partner Name / Address Name. Therefore, if you want to change the address while seeing only the partner addresses, you just have to remove the "Address Name", leaving "Company Name / Partner Name".
bzr revid: dle@openerp.com-20140310133314-5mv4h2h5zmqlw4d2
2014-03-10 14:33:14 +01:00
Denis Ledoux
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
Juan Rial
f631757f37
[FIX] [MERGE] [SALE] Filter invoice and ship address on sales order to contacts of the selected customer ( #592166 )
...
bzr revid: jri@openerp.com-20140307160945-r2t5pbl2bb7yaw9n
2014-03-07 17:09:45 +01:00
Simon Lejeune
35b64811e9
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140221095425-9043pbzjy7rtbxd1
2014-02-21 10:54:25 +01:00
Christophe Simonis
d5106a4d34
[MERGE] forward port of branch saas-2 up to revid 9136 dle@openerp.com-20140219170746-3yjvjyc2wwrb7rvd
...
bzr revid: chs@openerp.com-20140220154517-6y531n1mqtnfnsmr
2014-02-20 16:45:17 +01:00
Denis Ledoux
8edb7c556b
[FIX]sale: post message of mail_thread only accept 0, False, an ID or a list with one ID
...
bzr revid: dle@openerp.com-20140219170746-3yjvjyc2wwrb7rvd
2014-02-19 18:07:46 +01:00
openerp-sle
a2805ee6d7
[FIX] Sale: QWeb action returned when clicking on print button on form view
...
bzr revid: openerp-sle@openerp-sle.home-20140212230002-4e1rsmeutg45h237
2014-02-13 00:00:02 +01:00
Denis Ledoux
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
Thibault Delavallée
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
Martin Trigaux
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
Thibault Delavallée
49c0b7a820
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140106135700-rt0g44w5xmpbtxiu
2014-01-06 14:57:00 +01:00
Thibault Delavallée
e883b15c48
[FIX] sale, delivery: _amount_all function used in function field is now wrapper. Indeed as
...
we give the function pointer when creating the fields, inheritance is not taken into
account. This is done by adding a wrapper that calls _amount_all, using this time correct
inheritance.
bzr revid: tde@openerp.com-20131218131942-9lzrxbscb4lu4rj8
2013-12-18 14:19:42 +01:00
Thibault Delavallée
fab63158a1
[CLEAN] sale: removed code that should not lie here. website code has nothing to do in the base sale module. website_sale: renamed website_sale file into sale_order and added the get_website_data method.
...
bzr revid: tde@openerp.com-20131213110629-rhgpqpy2dj03ng8h
2013-12-13 12:06:29 +01:00
Thibault Delavallée
d9343e2d27
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20131213094016-ylqkilyo4190g81w
2013-12-13 10:40:16 +01:00
Denis Ledoux
942a10f2b3
[REVERT] rev 9007 dle@openerp.com-20131122150606-ruqe2l0e7gn84upf
...
default_model and default_res_id were not present when doing this fix, because in the web client, we prevented the propagation of the context keys beginning with "_default" in some cases.
The fact is that, in this specific case, the keys "default_" should not have been removed. This has been fix in web client in
rev 3892 revid:chs@openerp.com-20131211163609-i3s2mlncf5n91uda
Besides, active_model cannot be used here, as active_model is not 'sale.order' but the model of the wizard.
bzr revid: dle@openerp.com-20131211171429-6bxuh7o4ueiy9dd1
2013-12-11 18:14:29 +01:00
Denis Ledoux
5200639f39
[FIX]sale: on sale order creation, apply on_change if needed (if required value are not set and can be computed from other values (onchange)
...
bzr revid: dle@openerp.com-20131206135111-nh31jgspelvwnhat
2013-12-06 14:51:11 +01:00
Denis Ledoux
f653a7e7da
[REVERT] revision 9031, dle@openerp.com-20131205170917-7cdzghsa5690xvux
...
Because the xml parser needs to be fixed before this fix can be commited
bzr revid: dle@openerp.com-20131206112738-wu35g157v6myipbx
2013-12-06 12:27:38 +01:00
Denis Ledoux
cbe553505e
[FIX]sale: on sale order creation, apply on_change if needed (if required value are not set and can be computed from other values (onchange)
...
bzr revid: dle@openerp.com-20131205170917-7cdzghsa5690xvux
2013-12-05 18:09:17 +01:00
Christophe Matthieu
fd2821086f
[MERGE] sync with trunk
...
bzr revid: chm@openerp.com-20131202150925-eqsi0uu0fqtwimhj
2013-12-02 16:09:25 +01:00
Christophe Simonis
0d13df5a57
[MERGE] remove warnings
...
bzr revid: chs@openerp.com-20131127110552-3u2nxwu01gxj9i7m
2013-11-27 12:05:52 +01:00
Christophe Simonis
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
Quentin (OpenERP)
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
Denis Ledoux
c782692d56
[FIX]sale: quotation/sale order sent by email were not anymore set to state quotation sent, because the workflow was triggered according to a specific value in the context, which was not there anymore(default_model changed to active_mode, default_res_id changed to active_ids
...
bzr revid: dle@openerp.com-20131122150606-ruqe2l0e7gn84upf
2013-11-22 16:06:06 +01:00
Christophe Simonis
6f67143908
[FIX] *: do not call deprecated method LocalService()
...
bzr revid: chs@openerp.com-20131121120611-06h1pki3460tzj1s
2013-11-21 13:06:11 +01:00
Fabien Pinckaers
b61ac1998e
[FIX] access right with sale with event crashed [NEW] website_sale_delivery module
...
bzr revid: fp@openerp.com-20131116224306-7is2hawhhpzazie3
2013-11-16 23:43:06 +01:00
Denis Ledoux
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
Denis Ledoux
274cf1e293
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9475 rev-id: dle@openerp.com-20130923162428-g0s3o9tid09ogfv3
...
bzr revid: dle@openerp.com-20130923165651-0jt823r5wy37enw6
2013-09-23 18:56:51 +02:00
Thibault Delavallée
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
Peter Langenberg
acda6a4d8a
[FIX] copy record must have today date
...
bzr revid: rmu@tinyerp.com-20130626053642-7moae6mkif1ycbgv
2013-06-26 11:06:42 +05:30
Thibault Delavallée
e738adfafe
[FIX] sale, sale_stock: fixed calls to get_company taking an extra uid
...
bzr revid: tde@openerp.com-20130614143317-65mbgfugskxqnxp7
2013-06-14 16:33:17 +02:00
Thibault Delavallée
1a51e9b88d
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130614141720-7qjo6fpkm83jhpm2
2013-06-14 16:17:20 +02:00
Thibault Delavallée
bc58a5a224
[CLEAN] Misc cleaning before merging.
...
bzr revid: tde@openerp.com-20130614141643-29z9zslusyhj4u5j
2013-06-14 16:16:43 +02:00
Christophe Simonis
6a9adbca62
[MERGE] forward port of branch 7.0 up to revid 9236 mat@openerp.com-20130613160953-itt79mu5xrl7suv4
...
bzr revid: chs@openerp.com-20130613181503-82234mo34wxb0oap
2013-06-13 20:15:03 +02:00
Thibault Delavallée
48071be570
[MERGE] Merged branch holding addons-30 misc improvement. FP-style merge for testing purpose.
...
bzr revid: tde@openerp.com-20130613105923-xt7rvj0n3n3egvzj
2013-06-13 12:59:23 +02:00
Christophe Matthieu
9d9e3d2ef8
[IMP] Improve typos in warning (Grammar mistake, Capitalize title, Typos)
...
bzr revid: chm@openerp.com-20130607113829-1mi6jk18c2v3jjhn
2013-06-07 13:38:29 +02:00
sgo@tinyerp.com
2bda4f7b3c
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130607113500-jzhet9cr98c0ss4s
2013-06-07 17:05:00 +05:30
Christophe Matthieu
8c6ff33bef
[IMP] Improve typos in warning (Grammar mistake, Capitalize title, Typos)
...
bzr revid: chm@openerp.com-20130607102359-is19utzap127nwr4
2013-06-07 12:23:59 +02:00
Turkesh Patel (Open ERP)
a65375648b
[MRG] merge with lp:openobject-addons
...
bzr revid: vja@tinyerp.com-20130516054745-lmqr1uuac6wlqi70
bzr revid: tpa@tinyerp.com-20130528122735-ixcewpz9uga5hv86
2013-05-28 17:57:35 +05:30
Thibault Delavallée
71df1a41bc
[FORWARD] Forward port of addons 7.0 until revision 9172
...
bzr revid: tde@openerp.com-20130528104500-ds3irrs2u0qpst37
2013-05-28 12:45:00 +02:00
Najlaâ
361cd5fc40
[FIX] remove index on SO line text field
...
bzr revid: nel@tinyerp.com-20130522130842-whn5n8fbc0gv34jx
2013-05-22 15:08:42 +02:00
Dhruti Shastri (OpenERP)
5db1c8333d
[sale]:Invoice/Deliever Address are not fileterd based on selected Customer(partner) (Case:592166)
...
bzr revid: dhs@tinyerp.com-20130502120207-a7he9qqty54h1xaz
2013-05-02 17:32:07 +05:30
ggh-openerp
3b73e2b2a4
[IMP]Removed space before Exclamation marks [!]
...
bzr revid: ggh@tinyerp.com-20130429071557-vnxo5nni03vc886j
2013-04-29 12:45:57 +05:30
sgo@tinyerp.com
3d0b5aa747
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130423053031-g501q3w9akfiro2d
2013-04-23 11:00:31 +05:30