Commit Graph

218 Commits

Author SHA1 Message Date
Thibault Delavallée bc58a5a224 [CLEAN] Misc cleaning before merging.
bzr revid: tde@openerp.com-20130614141643-29z9zslusyhj4u5j
2013-06-14 16:16:43 +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
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
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 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
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
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
Cedric Snauwaert 7577488134 [FIX]point of sale: when creating account_move_line, was passing a false parameter instead of a correct account id
bzr revid: csn@openerp.com-20130306155548-pdeli8m5ao3126aw
2013-03-06 16:55:48 +01:00
Xavier ALT 41ea6e7ccd [TEST] add unit test to ensure POS only considere product taxes from current session's company
bzr revid: xal@openerp.com-20130227104505-9ndnub6zs8sjfhzj
2013-02-27 11:45:05 +01:00
Raphael Collet 6bd409246d [IMP] remove model methods _workflow_trigger and _workflow_signal, and replace calls to new workflow methods
bzr revid: rco@openerp.com-20130213140052-9q6s9m3x6ye0qy35
2013-02-13 15:00:52 +01:00
Raphael Collet 5f855a1ddb [MERGE] from trunk
bzr revid: rco@openerp.com-20130213083519-3nbg40h5em0gfeu3
2013-02-13 09:35:19 +01:00
sgo@tinyerp.com 6dac31941a [IMP]improve code
bzr revid: sgo@tinyerp.com-20130207072440-ekqkxi0o5cxe9iz0
2013-02-07 12:54:40 +05:30
sgo@tinyerp.com bc17621cec [IMP]improve pos config form view and add group on warehouse
bzr revid: sgo@tinyerp.com-20130207065126-1liwmg1u3emnra6j
2013-02-07 12:21:26 +05:30
sgo@tinyerp.com 1150aac0fe [MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20130206124101-vuf5dkdtsr6bfe08
2013-02-06 18:11:01 +05:30
sgo@tinyerp.com 9e99431d1f [IMP]add pricelist field in pos config and set default
bzr revid: sgo@tinyerp.com-20130206123851-4b3lhr5bzf7msla6
2013-02-06 18:08:51 +05:30
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) 85f6cb8239 [IMP] POS: made some changes in code
bzr revid: cha@tinyerp.com-20130204064142-xivaomscssibwsb8
2013-02-04 12:11:42 +05:30
Ajay Chauhan (OpenERP) 3589c008ad [IMP] POS: use the new signal_xxx methods instead of trg_validate.
bzr revid: cha@tinyerp.com-20130201062421-luknla6wp3yqxhqm
2013-02-01 11:54:21 +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
Frédéric van der Essen 2e3adb48c4 [FIX] point_of_sale: taxes behaviour in invoice generation from pos orders matches the sale order behaviour
bzr revid: fva@openerp.com-20130128143641-51vssmkvxbxcprvn
2013-01-28 15:36:41 +01:00
sgo@tinyerp.com e4250d1558 [IMP]remove sale.shop from pos and improve code
bzr revid: sgo@tinyerp.com-20130123113306-n7enol5as84sv0g2
2013-01-23 17:03:06 +05:30
Hardik Ansodariya 4074305819 [FIXED] point_of_Sale:point_of_Sale: Fixed the issue of taxes in multicompany enviorment (Maintenance case: 583541)
bzr revid: han@tinyerp.com-20130122125656-c8sjw65gsb363jy5
2013-01-22 18:26:56 +05:30
Vo Minh Thu e7f4891d46 [IMP] use the openerp namespace.
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
Fabien Pinckaers 9c66d7d2f9 [IMP] PoS Useability
bzr revid: fp@tinyerp.com-20121126121350-1n3v1nqsrjf8b5qf
2012-11-26 13:13:50 +01:00
Frédéric van der Essen 4d90fdd32e [IMP] point_of_sale: you must now use available_in_pos to make product available in pos ... Products without categories will appear at the root category
bzr revid: fva@openerp.com-20121122175254-ippyf1rstggvvwh7
2012-11-22 18:52:54 +01:00
Sanjay Gohel (Open ERP) 35d3d481f7 [IMP]change typo
bzr revid: sgo@tinyerp.com-20121106071724-jwd7c75rk382yuzf
2012-11-06 12:47:24 +05:30
Sanjay Gohel (Open ERP) bfb7746b6b [IMP]stock picking name set on create picking
bzr revid: sgo@tinyerp.com-20121106071116-nki3vftl249l2hes
2012-11-06 12:41:16 +05:30
Sanjay Gohel (Open ERP) b74fe87f94 [IMP]ser pricelist of pos on pos order
bzr revid: sgo@tinyerp.com-20121106061302-m00bezd0bt0line7
2012-11-06 11:43:02 +05:30
Fabien Pinckaers 974ca267cf [MERGE] fix multi-company for pos
bzr revid: fp@openerp.com-20121103172128-rx5lvo5xzmsj9ay1
2012-11-03 18:21:28 +01:00
Fabien Pinckaers 74476c8e22 [FIX] POS close session without cash register
bzr revid: fp@openerp.com-20121103171225-nlp53s0aenamdhcg
2012-11-03 18:12:25 +01:00
Fabien Pinckaers ce874db95a [FIX] POS
bzr revid: fp@openerp.com-20121103152504-f3o6ce0e833hdibj
2012-11-03 16:25:04 +01:00
Fabien Pinckaers cd68364301 [MERGE] English typos
bzr revid: fp@openerp.com-20121102173407-umicel4287htim14
2012-11-02 18:34:07 +01:00