Commit Graph

88 Commits

Author SHA1 Message Date
Christophe Simonis 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
Olivier Dony 2cba6a5355 [MERGE] Forward-port of latest 7.0 fixes up to rev 9629 rev-id odo@openerp.com-20131121153230-keie85rmes2zh2o8
bzr revid: chs@openerp.com-20131121112139-aw2ara1i1xymue62
bzr revid: odo@openerp.com-20131121154205-ul9hf9tz3h0x2n7m
2013-11-21 16:42:05 +01:00
Christophe Simonis 6b9822626b [FIX] sale_stock: procuremenr.order object does not have a `property_ids` field. This field is added by `mrp` module, which we do not depend of.
bzr revid: chs@openerp.com-20131112115635-tgbdeocn9awtbxkq
2013-11-12 12:56:35 +01:00
Martin Trigaux 4bc20f2e2f [MERGE] backport of revision 8862
mrp, sale_stock: minor usability improvements + properties in sale order lines

bzr revid: mat@openerp.com-20130823092231-w5aet41ivk4f7nd9
2013-08-23 11:22:31 +02:00
Chandni Machchhar(OpenERP Trainee) 0bed10fa7f [FIX] fix the translation issue
bzr revid: psi@tinyerp.com-20130701111543-7lgfuf230088gce2
2013-07-01 16:45:43 +05:30
Amit Bhavsar (Open ERP) 06fe2460d6 [MERGE] merge with latest trunk
bzr revid: amb@tinyerp.com-20130624141838-mevmot56188pkoeo
2013-06-24 19:48:38 +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
Martin Trigaux ba46fc1116 [IMP] remove typo
bzr revid: mat@openerp.com-20130613160812-6nrz02oejrdl13tb
2013-06-13 18:08:12 +02:00
Dhruti Shastri (OpenERP) d38a1c54fd [sale_stock] : Auto complete on Quotations with special product configuration(Case:593519)
bzr revid: dhs@tinyerp.com-20130613084441-gi9xkf2d2sl68a45
2013-06-13 14:14:41 +05:30
sgo@tinyerp.com c99ac69e61 [IMP]improve message string
bzr revid: sgo@tinyerp.com-20130611083859-tamafus1vdohpjyg
2013-06-11 14:08:59 +05:30
sgo@tinyerp.com 5418e39573 [IMP]make warehouse required true and improve warning when there is no warehouse define for current company
bzr revid: sgo@tinyerp.com-20130607100129-vyvxbhbckakc7kr6
2013-06-07 15:31:29 +05:30
Olivier Dony 0f983a0146 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9183
rev-id launchpad_translations_on_behalf_of_openerp-20130531070107-7d2k818beg8965ll

bzr revid: odo@openerp.com-20130603121852-jdl6vlo9dmjk0rlc
2013-06-03 14:18:52 +02:00
Martin Trigaux 2e0d8cd2bd [FIX] revert change at revision 9172
bzr revid: mat@openerp.com-20130528130018-0yrh0fl3hz132tmm
2013-05-28 15:00:18 +02:00
Martin Trigaux adda8323ab [MERGE] [FIX] property_ids not used while creating a proc. order, courtesy of Davide Corio
lp bug: https://launchpad.net/bugs/926107 fixed

bzr revid: mat@openerp.com-20130528100600-fco5tayf4350s3v6
2013-05-28 12:06:00 +02:00
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
Davide Corio 99f7952c90 [FIX] MRP: Properties do not work
bzr revid: rgaopenerp-20130507121011-q8xywrlwhytdxzj8
2013-05-07 17:40:11 +05:30
sgo@tinyerp.com d1e17fbde0 [MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20130417061434-zry7pxo7fb17063k
2013-04-17 11:44:34 +05:30
Vo Minh Thu e69326ee3b [REF] removed explicit model instanciations.
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
Thibault Delavallée 4da68cbc22 [FORWARD] Forward port of addons 7.0 until revision 9008
bzr revid: tde@openerp.com-20130411124446-73gzyw3eo925w3dv
2013-04-11 14:44:46 +02:00
Quentin (OpenERP) 8c8bfd706b [FIX] purchase, sale_stock: fix computation of date_planned when no timezone is defined for the user
bzr revid: qdp-launchpad@openerp.com-20130409122530-svv1kpk57s2nrsa9
2013-04-09 14:25:30 +02:00
Cedric Snauwaert a7bf53ebaa [FIX]error introduce in revid:odo@openerp.com-20130405151451-anjsdt18gmsxr01k
function date_to_datetime should return a date in server datetime format

bzr revid: csn@openerp.com-20130409091433-4u3nxejdrti7czu3
2013-04-09 11:14:33 +02:00
Olivier Dony ed09272799 [MERGE] OPW 590221: sale_stock,purchase: fix timezone conversion error when scheduling delivery/procurement based on SO/PO date
The conversion code is duplicated in sale_stock and purchase
instead of being factored out in the fields.datetime class
because as of v7.0 users are able to selectively update
a single module without necessarily updating the base module
or the framework. This will be improved in next stable version.

lp bug: https://launchpad.net/bugs/1153107 fixed

bzr revid: odo@openerp.com-20130405151451-anjsdt18gmsxr01k
2013-04-05 17:14:51 +02:00
Olivier Dony 5b832d7738 [FIX] sale_stock: useless import due to previous commit + make sure test actually tests something, rather than x() == x()
bzr revid: odo@openerp.com-20130404123154-xtq4idqnnlugv0ui
2013-04-04 14:31:54 +02:00
Olivier Dony ef84d5c421 [FIX] sale_stock,purchase: review help string + remove incorrect fallback to local TZ
See also http://bugs.python.org/issue7229

bzr revid: odo@openerp.com-20130404092134-0zt7blbl1kt3p0lz
2013-04-04 11:21:34 +02:00
Quentin (OpenERP) 4bdd8252ba [REF] sale_stock: removing of dead code and correction of documentation (process) linked to the invoicing after delivery of a sale order
bzr revid: qdp-launchpad@openerp.com-20130404151451-7fesb178mpijlv29
2013-04-04 17:14:51 +02:00
Jigar Amin c1afba4742 [FIX] SO/PO: Fixed date to dateime convestion for expected date based on Order Date, Converstion is based on assumption date date will be in user tz and taking 12:00 hours time to make right time converstion
bzr revid: jam@tinyerp.com-20130326121437-89c42jtdw7qv3l2w
2013-03-26 05:14:37 -07:00
Jigar Amin 623f8c8ef4 [FIX] sale_stock: Planned Date based on sale_order date should preserver the utc time instead of putting it 00:00:00. Assumed 00 time lead time sone converstion to dates after then order date , e.g. in pst time if we see some time converstion then it may happen it hows previous day.
bzr revid: jam@tinyerp.com-20130325092041-o71rqirijwqh2uqz
2013-03-25 14:50:41 +05:30
sgo@tinyerp.com a21b4b9b56 [MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20130311045638-npwv6lb6bc9i3m1y
2013-03-11 10:26:38 +05:30
Davide Corio 4d1af4ab5b [FIX] property_ids not used while creating a proc. order
bzr revid: davide.corio@agilebg.com-20130218145624-b2pxbups37pz3t1h
2013-02-18 15:56:24 +01:00
Tejas Tank 9b8d7de0ac [IMP] Workflow api changes: [account_payment, account_voucher, hr_holidays, hr_payroll, hr_timesheet_sheet, l10n_in_hr_payroll, point_of_sale, procurement, purchase, sale, sale_stock].
bzr revid: tta@openerp.com-20130204082943-vfevxeb7za6r4sy7
bzr revid: tta@openerp.com-20130204112949-07l1v3ru215iglut
2013-02-04 16:59:49 +05:30
Ajay Chauhan (OpenERP) f33d11f0a4 [IMP] sale_stock: made some changes in code
bzr revid: cha@tinyerp.com-20130204071526-6ey9lfunu4mbnjhn
2013-02-04 12:45:26 +05:30
Ajay Chauhan (OpenERP) df29fec090 [FIX] sale_stock: Made some changes
bzr revid: cha@tinyerp.com-20130201133440-fgo2lj4q22i4dpfb
2013-02-01 19:04:40 +05:30
sgo@tinyerp.com 6be21ac5d3 [IMP]add onchange of warehouse to change company related to warehouse and improve some code
bzr revid: sgo@tinyerp.com-20130131062613-tmlgvdrculc2udu1
2013-01-31 11:56:13 +05:30
Ajay Chauhan (OpenERP) 3dfaff6bc3 [IMP] sale_stock: for yml use the new signal_xxx methods instead of trg_validate.
bzr revid: cha@tinyerp.com-20130131061533-ivbzasitl9a2mi04
2013-01-31 11:45:33 +05:30
Ajay Chauhan (OpenERP) 2ac6d7876f [IMP] sale_stock: use the new signal_xxx methods instead of trg_validate.
bzr revid: cha@tinyerp.com-20130131054337-iph87376e9bhoqpy
2013-01-31 11:13:37 +05:30
sgo@tinyerp.com 5600ce8a34 [IMP]remove date related sale.shop and add warehouse_id as new field to handle location in sale order
bzr revid: sgo@tinyerp.com-20130122110857-61jsli1sywu3h5q0
2013-01-22 16:38:57 +05:30
Olivier Dony 49597f0e66 [MERGE] *: improved english wording, suggestions courtesy of OpenERP Community
bzr revid: odo@openerp.com-20121221164808-kdjrtcbgma4dr3on
2012-12-21 17:48:08 +01:00
Khushboo Bhatt (Open ERP) 9cb43097a1 [FIX]sale_stock:string updated
bzr revid: kbh@tinyerp.com-20121220125654-7opo99b8mn9y1dgt
2012-12-20 18:26:54 +05:30
Thibault Delavallée 77be83ca28 [CLEAN] project, sale_stock: removed old chatter and needaction methods, not used anymore. In two words, dead code.
bzr revid: tde@openerp.com-20121219205412-0cco820gzgg5lpzx
2012-12-19 21:54:12 +01:00
Thibault Delavallée cd290565a4 [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20121219093924-5rqmhb6ve7bv7qzl
2012-12-19 10:39:24 +01:00
Olivier Dony 03b6acd13d [MERGE] Access inherited product fields on the product directly rather than template, courtesy of Alexis de Lattre (Akretion)
It makes the code a little more straightforward and does not hurt.

bzr revid: odo@openerp.com-20121218225015-6r9ydxjlh147m3z1
2012-12-18 23:50:15 +01:00
Fabien Pinckaers 41f7f27881 [IMP] several subtype fixes
bzr revid: fp@tinyerp.com-20121218220617-d6ebdlkf1facw4x8
2012-12-18 23:06:17 +01:00
Raphael Collet 73980eba5f [MERGE] trunk-import-openerp-thu (use strict naming convention when importing openerp stuff)
bzr revid: rco@openerp.com-20121218085914-qzr2upqfxmfbzfsx
2012-12-18 09:59:14 +01:00
Olivier Dony 411d6d931d [FIX] sale,purchase: allow SO/PO long description to propagate to procurement.order and stock.move, remove size limits
bzr revid: odo@openerp.com-20121217222827-ga62qttp4wxzu7rv
2012-12-17 23:28:27 +01:00
Cecile Tonglet 15fe515601 [MERGE] From trunk
bzr revid: cto@openerp.com-20121217144306-tkodwpox30cuvb28
2012-12-17 15:43:06 +01:00
Fabien Pinckaers 769a275158 fix
bzr revid: fp@tinyerp.com-20121215175033-1hr5un0gk1b4qxmw
2012-12-15 18:50:33 +01:00
Vo Minh Thu e7f4891d46 [IMP] use the openerp namespace.
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00