Commit Graph

243 Commits

Author SHA1 Message Date
Christophe Simonis 5343c48c5f [MERGE] forward port of branch saas-1 up to revid 8760 chs@openerp.com-20130823143114-83tdjhbsdes0kydr
bzr revid: chs@openerp.com-20130823154655-blm2wyfivmg8qi2z
2013-08-23 17:46:55 +02:00
Christophe Simonis 58868227f9 [MERGE] forward port of branch 7.0 up to revid 9382 chs@openerp.com-20130823131214-ipouwtnz8r16mlvv
bzr revid: chs@openerp.com-20130823143114-83tdjhbsdes0kydr
2013-08-23 16:31:14 +02:00
Martin Trigaux 50975a1159 [FIX] point_of_sale: avoid traceback if deleted property
bzr revid: mat@openerp.com-20130821125429-uzaqw4yx2ve63wja
2013-08-21 14:54:29 +02:00
Thibault Delavallée 5f5610b7d1 [MERGE] [IMP] crm_phonecall, membership, point_of_sale, purchase, purchase_requisitions: minor usability improvements: improved some help tooltips
bzr revid: tde@openerp.com-20130821122501-7hemnjrbm1oob7v3
2013-08-21 14:25:01 +02:00
Olivier Dony c02afb45fa [MERGE] Forward-port of bugfixes from saas-1 series up to rev.8759 rev-id: odo@openerp.com-20130820152607-0p0fx87v1rqhk3vy
bzr revid: odo@openerp.com-20130820165258-3mjzbo990xg44dfu
2013-08-20 18:52:58 +02:00
Olivier Dony 788eb29237 [MERGE] Forward-port of 7.0 bugfixes up to rev.9369 rev-id: launchpad_translations_on_behalf_of_openerp-20130820051502-deoiql3lru7goosd
bzr revid: odo@openerp.com-20130820152607-0p0fx87v1rqhk3vy
2013-08-20 17:26:07 +02:00
Martin Trigaux 41ca4aa350 [FIX] point_of_sale: ok this one should be good
bzr revid: mat@openerp.com-20130814140240-f0qqsks6tcc423s8
2013-08-14 16:02:40 +02:00
Martin Trigaux 9f5c0f54ec [FIX] point_of_sale: oups, needs an id
bzr revid: mat@openerp.com-20130814135346-6zpzl6tc0efowquj
2013-08-14 15:53:46 +02:00
Martin Trigaux 38f2806579 [FIX] point_of_sale: better default sale journal for new pos.config, use company of current user
done to fix test in 01_order_to_payment.yml when creating pos.order
default config can have journal of different company, will get exception if done with a journal of main company

bzr revid: mat@openerp.com-20130814134511-c0f3z27f9p2gflt6
2013-08-14 15:45:11 +02:00
Christophe Simonis 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
Thibault Delavallée 034a5d5dcf [FIX] point_of_sale: LocalService -> signal_ validation
bzr revid: tde@openerp.com-20130711125155-hmf0u0p0o45iac66
2013-07-11 14:51:55 +02:00
Thibault Delavallée d6c74a369c [MERGE] Forward-ported lp:~openerp-dev/openobject-addons/7.0-pos-improvements-fva (using -r 8946..8955).
This branch holds several improvements for the point of sale. However it cannot
be merged into 7.0 because a new column is added. As this branch has proven to
be correct, it is forward-ported into trunk.

bzr revid: tde@openerp.com-20130711084547-wl5q22g8z1aha126
2013-07-11 10:45:47 +02:00
Martin Trigaux d2d72d8416 [MERGE] forward port of saas-1 up to revision 8749 (mat@openerp.com-20130702135856-kmg7d8anw17nkbd8)
bzr revid: mat@openerp.com-20130702144646-y1wqs5mz4rzoh50g
2013-07-02 16:46:46 +02:00
Bharat R. Devnani (OpenERP) e92a18ee0b [MERGE] merged with main addons
bzr revid: bde@tinyerp.com-20130701085739-94uxqowz623wudp4
2013-07-01 14:27:39 +05:30
Martin Trigaux 4910b5e654 [FIX] point_of_sale: don't group move lines if debit and credit
lp bug: https://launchpad.net/bugs/1127114 fixed

bzr revid: mat@openerp.com-20130626093412-or5k3eznjsxbvgu3
2013-06-26 11:34:12 +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
Darshan Kalola (OpenERP Trainee) ae1354509c [MERGE] merged with main addons
bzr revid: darshankalola@gmail.com-20130607131308-9ovklg1q347w8f2o
2013-06-07 18:43:08 +05:30
Darshan Kalola (OpenERP Trainee) 00029958b3 [IMP] improve Help
bzr revid: darshankalola@gmail.com-20130607130240-e5indzh1nzfmy4wk
2013-06-07 18:32:40 +05:30
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
Darshan Kalola (OpenERP Trainee) 8f07cb2046 [IMP] Improved Help
bzr revid: darshankalola@gmail.com-20130605070425-ykw13dlv28aq4akh
2013-06-05 12:34:25 +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
ggh-openerp 7841bac687 [IMP] Improved typo in Warning
bzr revid: ggh@tinyerp.com-20130429053851-ipatcoxtjwrwfijk
2013-04-29 11:08:51 +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
Quentin (OpenERP) c46929268d [FIX] account* modules: added 'account_period_prefer_normal':True in context when trying to find the period related to a date.
This patch will be forward ported in trunk by changing the behaviour of account_period.find() in order to fetch the normal periods by default (account_period_prefer_normal will be True by default) because there are no business case i could think of where you'd like to get the opening period (except in the closure but it's held in a different way there). On the other hand, it's pretty easy to forget to put that key in the context and introduce a new bug that will select the opening period instead of the wanted one

bzr revid: qdp-launchpad@openerp.com-20130418102433-t52uj23trkpr8vnb
2013-04-18 12:24:33 +02:00
Thibault Delavallée efceba5b8b [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130416073641-pcelb6zsq8dg56wb
2013-04-16 09:36:41 +02:00
Thibault Delavallée 812c852fd0 [FORWARD] Merged 7.0 addons revisions until 9021
bzr revid: tde@openerp.com-20130415084302-hx7zxtpl5u6yphfg
bzr revid: tde@openerp.com-20130415153732-v4ols3t56rku92oz
2013-04-15 17:37:32 +02:00
Vo Minh Thu e69326ee3b [REF] removed explicit model instanciations.
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
Antony Lesuisse 354ac328c8 [FIX] point_of_sale fix tax rouding, this time tested, tnx fva
bzr revid: al@openerp.com-20130411224306-eei87tz4xp3d0o7n
2013-04-12 00:43:06 +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
Frédéric van der Essen ef81f0bd43 [IMP] point_of_sale: add a configuration option to enable invoicing from the Point of Sale (enabled by default)
bzr revid: fva@openerp.com-20130411122250-aju5cl91wduj2bj0
2013-04-11 14:22:50 +02:00
Frédéric van der Essen 3aa6f4add5 [IMP] point_of_sale: the invoicing should now work reliably and validate the orders
bzr revid: fva@openerp.com-20130411120719-colzjq4l8eaiotdf
2013-04-11 14:07:19 +02:00
Frédéric van der Essen b2a872846c [FIX] point_of_sale: use the correct rounding method for computing taxes
bzr revid: fva@openerp.com-20130409160021-707f3vrxcrqytsl6
2013-04-09 18:00:21 +02:00
Josse Colpaert 4bb06462d7 [FIX] Check that payment method journal is of type cash or bank
bzr revid: jco@openerp.com-20130405134438-86l1ph7192owwrol
2013-04-05 15:44:38 +02:00
Quentin (OpenERP) c5cde2a6a3 [MERGE] fixes in POS: optimizing the code when closing a session to have acceptable delays, used the right partner, changing the partner on the pos order also change it on the payment linked...
bzr revid: qdp-launchpad@openerp.com-20130404151428-yr2jhgjkolyjrcyf
2013-04-04 17:14:28 +02:00
Raphael Collet 96ad608854 [IMP] general: use registry[X] instead registry.get(X) when X is dynamic
bzr revid: rco@openerp.com-20130329143720-80pkd4csemlk1aqz
2013-03-29 15:37:20 +01:00
Frédéric van der Essen cae96ed454 [FIX] point_of_sale: correctly set the customer on the order
bzr revid: fva@openerp.com-20130329110048-1cx2sr4hp98cue0f
2013-03-29 12:00:48 +01:00
Josse Colpaert 78e9418717 [FIX] Write all lines at once to the move instead of creating move lines separately
bzr revid: jco@openerp.com-20130328155549-pdqg0fgk1timzgfb
2013-03-28 16:55:49 +01:00
Josse Colpaert c0b4f5b714 [FIX] taxes should have partner too
bzr revid: jco@openerp.com-20130328121615-eyoplrrrofrosuay
2013-03-28 13:16:15 +01:00
Josse Colpaert 2d210fce44 [FIX] Use accounting partner and take partner into account when group by
bzr revid: jco@openerp.com-20130328112829-6sj9eixmkzm3dr1r
2013-03-28 12:28:29 +01:00
Josse Colpaert fb38f1d81d [FIX] Update partner in associated bank statements when changing partner in pos order
bzr revid: jco@openerp.com-20130325134410-ky0akwdcfr805df8
2013-03-25 14:44:10 +01:00
Thibault Delavallée 40a5dda617 [MERGE] Forward port of addons until 8903
bzr revid: tde@openerp.com-20130321093716-3nt7h2xunl8lusqh
2013-03-21 10:37:16 +01:00
Cedric Snauwaert 87908c8b58 [FIX]pos: fix error when trying to duplicate point of sale
bzr revid: csn@openerp.com-20130318105304-3g7qlb8lrjr0e5rw
2013-03-18 11:53:04 +01:00
sgo@tinyerp.com b8a33bc393 [MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20130318071519-3pae2jh7nk2iaqpe
2013-03-18 12:45:19 +05:30
Mohammed Shekha a4e609c469 [FIX]Fixed the issue of account receivable property not found if someone has explicitly delete the property added by data file, the code was throwing traceback if there is no property_account_receivable found so even though user deletes data file record code should throw traceback to user, if property_account_receivable not found then we are going to use current_company.account_receivable.id.
bzr revid: msh@openerp.com-20130315144226-eqsz74ohwjbxnp3z
2013-03-15 20:12:26 +05:30
Quentin (OpenERP) be05b374a1 [MERGE] forwardport of bugfixes made in v7 up to revision 8854.
bzr revid: qdp-launchpad@openerp.com-20130314112740-s01t51p4m7mxcumz
2013-03-14 12:27:40 +01:00
sgo@tinyerp.com a21b4b9b56 [MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20130311045638-npwv6lb6bc9i3m1y
2013-03-11 10:26:38 +05:30
Stephane Wirtel 089214b0f2 [FIX] point_of_sale: add the missing call to the workflow service
bzr revid: stw@openerp.com-20130308110449-feobq8yoc6kg3efy
2013-03-08 12:04:49 +01:00
Quentin (OpenERP) e2576590e3 [MERGE] point_of_sale: acconting entries generation failed if a tax was defined with no account for tax collected.
this hack is pretty stupid, don't mention it. We need to refactor the whole function, the sooner the better. At least it's not worst than before as we were already using 'line' without being sure it was defined (and now, with the assert, we are)

bzr revid: qdp-launchpad@openerp.com-20130306174616-rb5sr2a6wv8nef3v
2013-03-06 18:46:16 +01:00