Commit Graph

44 Commits

Author SHA1 Message Date
Frédéric van der Essen e5e2945ca0 [FIX] point_of_sale: fixing bad translation in demo data
bzr revid: fva@openerp.com-20130708145832-54dbakqun110kllo
2013-07-08 16:58:32 +02:00
Olivier Dony 5db87bea9c [MERGE] Bugfixes from 6.1 until revision 6800
bzr revid: odo@openerp.com-20121206153856-9y9v8ok6yxo6l5f0
2012-12-06 16:38:56 +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
Frédéric van der Essen b5ce5ee91b [IMP] point_of_sale: forgot views and decls for partner's ean13. Demo data where at the wrong place also
bzr revid: fva@openerp.com-20121121165823-awkqy7wp0mq4zkhm
2012-11-21 17:58:23 +01:00
Frédéric van der Essen 703cc35a4d [FIX] point_of_sale: demo data ean match the debug window defaults
bzr revid: fva@openerp.com-20120913150913-bq96hvr3cmbgijjg
2012-09-13 17:09:13 +02:00
Cecile Tonglet 4785fc109e [FIX] Point of Sales Users Demo
bzr revid: cto@openerp.com-20120831170747-iyptvo6iy96d12w4
2012-08-31 19:07:47 +02:00
Stephane Wirtel 768d9cdb7e [IMP] account: Merge the opening_control and closing_control flags in cash_control
[IMP] account: In the case where the bank statement is a cash register, we can get the coins of the last register.
[IMP] account: Hide the 'Available Coins' if the journal hasn't the cash_control flag.
[FIX] account: Use some default values for the profit/loss and internal account.
[IMP] point_of_sale: Avoid to have two payment methods with the cash_control in a pos.config object.
[REF] point_of_sale: Refactor the computation code of the cash_journal, cash_register and cash_control flags.
[IMP] point_of_sale: Store the difference in the right account if the journal of the statement is a cash_control or nota.
[FIX] point_of_sale: Use the session name instead of the order name for the account.bank.statement.line .
[IMP] point_of_sale: [DEMO] Define the default payment_methods for the pos.config.

bzr revid: stw@openerp.com-20120828112116-lblikdcn92lcpc7w
2012-08-28 13:21:16 +02:00
Frédéric van der Essen e47792d9bf [IMP] point_of_sale: category pictures are back and cached
bzr revid: fva@openerp.com-20120817142415-3k9cdc1mc68n8shk
2012-08-17 16:24:15 +02:00
Frédéric van der Essen b6c254942a [FIX] point_of_sale: images are working now
bzr revid: fva@openerp.com-20120813144355-vgojt7llli8u9vye
2012-08-13 16:43:55 +02:00
Frédéric van der Essen 01cb3ebb99 [MERGE] from trunk
bzr revid: fva@openerp.com-20120813124439-izug22kl0plts08x
2012-08-13 14:44:39 +02:00
Frédéric van der Essen 4c3e048d40 [MERGE WIP] merging from trunk. Still some issues with the thumbnails
bzr revid: fva@openerp.com-20120813120801-gjufnck0f78ddivg
2012-08-13 14:08:01 +02:00
Rucha (Open ERP) 98e591c2a7 [IMP]: point_of_sale: Improved remaining product name translation
bzr revid: rpa@tinyerp.com-20120813071720-kcsjouksbz4v0act
2012-08-13 12:47:20 +05:30
Rucha (Open ERP) 7739d0d69b [IMP]: point_of_sale: Translated PoS product names in English
bzr revid: rpa@tinyerp.com-20120809125412-is3y1fpjyo01c5b1
2012-08-09 18:24:12 +05:30
Rucha (Open ERP) c6d01a7754 [IMP]: point_of_sale: Translated PoS category name in English and added images for all categories
bzr revid: rpa@tinyerp.com-20120809125325-vt5cew4b6mgpjtga
2012-08-09 18:23:25 +05:30
Thibault Delavallée 238598c041 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120730081600-y92rgh002zhpp4tw
2012-07-30 10:16:00 +02:00
Frédéric van der Essen aa7fd93da2 [IMP] point_of_sale: better demo data
bzr revid: fva@openerp.com-20120726140607-8xu5bn6hott4jrtk
2012-07-26 16:06:07 +02:00
Frédéric van der Essen 2d67ef5f55 [FIX] point_of_sale: removed placeholder category images
bzr revid: fva@openerp.com-20120716141104-15dy9989mjksftfn
2012-07-16 16:11:04 +02:00
Frédéric van der Essen 0a2c340f92 [IMP] point_of_sale: new weighting workflow
bzr revid: fva@openerp.com-20120709155351-u8cgp4ft14ytwfdw
2012-07-09 17:53:51 +02:00
Frédéric van der Essen f69643a4a1 [IMP] point_of_sale: order widget is now complete
bzr revid: fva@openerp.com-20120628123825-hrat3tlhtyz8yv1i
2012-06-28 14:38:25 +02:00
Thibault Delavallée 3650c035f5 [IMP] product: images modified accordign to new spec. Propagated changes to stock/product and point of sale, and also to demo data.
bzr revid: tde@openerp.com-20120628090133-zmdbmjeiajhtmo3m
2012-06-28 11:01:33 +02:00
Stephane Wirtel 2bad8fa3e9 [IMP] point_of_sale: Add some photos for some products
bzr revid: stw@openerp.com-20120604140135-pi050phmf3njj3nn
2012-06-04 16:01:35 +02:00
Stephane Wirtel b9f8c8dec1 [FIX] fix some bugs in the point of sale
bzr revid: stw@openerp.com-20120430150557-5hw97hbcze4ngw3b
2012-04-30 17:05:57 +02:00
Antony Lesuisse 5faa8d6ece [MERGE] trunk
bzr revid: al@openerp.com-20120403131828-ld6asopdwy98t0dt
2012-04-03 15:18:28 +02:00
Antony Lesuisse 05ffbd28a1 [MERGE] point_of_sale barcode scanning (manual merge)
bzr revid: al@openerp.com-20120403130528-8awtj91yoa64gi61
2012-04-03 15:05:28 +02:00
Roberto López López (OpenERP) ce55e113ed [imp] control digit check + more demo data
bzr revid: rlo@openerp.com-20120328100337-aypdlk8o9revqpm6
2012-03-28 12:03:37 +02:00
Roberto López López (OpenERP) 9e5f88c243 [imp] add demo data
bzr revid: rlo@openerp.com-20120322105720-o9ygtir59x3lokv7
2012-03-22 11:57:20 +01:00
Bhumika (OpenERP) 2e402d5c3e [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20120320052258-4g8zcpd248do6tw9
2012-03-20 10:52:58 +05:30
Bharat Devnani (OpenERP) 64caa91eea [REM] removed references of res.partner.address from pos module
bzr revid: bde@tinyerp.com-20120307131248-y1aoff857h3ecmru
2012-03-07 18:42:48 +05:30
Quentin (OpenERP) 980e27e099 [MERGE] merged with main trunk
bzr revid: qdp-launchpad@openerp.com-20120223094804-0cm66x44ddvllelj
2012-02-23 10:48:04 +01:00
niv-openerp 4f21b2a314 [imp] added server-side resampling of images
bzr revid: nicolas.vanhoren@openerp.com-20120103131456-hqc4ibbl0ktn90c1
2012-01-03 14:14:56 +01:00
Divyesh Makwana (Open ERP) 873aaacc50 [FIX] account, account_bank_statement_extensions, point_of_sale : account_bank_statement_extension conflicts with point_of_sale
lp bug: https://launchpad.net/bugs/909124 fixed

bzr revid: mdi@tinyerp.com-20120102090833-ytztgr3vsq2jkm4v
2012-01-02 14:38:33 +05:30
Vo Minh Thu 123781fb9f [FIX] point_of_sale: removed hard-coded name matching a name generated (later)
by a sequence, thus throwing a unique name constraint error.

bzr revid: vmt@openerp.com-20111222130947-ixumokp3b2bkap96
2011-12-22 14:09:47 +01:00
Naresh (OpenERP) f81fa263da [FIX]:WARNING:orm:No such field(s) in model pos.order: price_type, journal_entry,stock.picking: pos_order,stock.move: date_planned,pos.order.line: product_uom, date_planned
bzr revid: nch@tinyerp.com-20111124101025-99em2a18k3n58x0z
2011-11-24 15:40:25 +05:30
Antony Lesuisse 4ceacd71ea [MERGE] trunk and point_of_sale js
bzr revid: al@openerp.com-20110927155600-qkmex8omktegcrxw
2011-09-27 17:56:00 +02:00
Fabien Pinckaers d0f8dc83e5 [IMP] Useability and misc fixes in POS
bzr revid: fp@tinyerp.com-20110925210020-5jvd7x38asnbzv5b
2011-09-25 23:00:20 +02:00
Fabien Pinckaers d4febfe788 [IMP+FIX] Complete cleaning of point_of_sale module
- refactorisation of the code: 2000 lines of code removed
   - fixed all the bugs
      - support for tax included/excluded prices
      - fixed rounding troubles
      - don't print the ticket if partial payment
   - cleaning features:
      - workflow reviewed: New -> Done -> Posted / Invoiced
      - generation of journal entries/invoice is now correct
      - only one picking per PoS order
      - wizard to apply global discount (on each lines)
   - useability:
      - reviewed the main point_of_sale screen
      - statements are open by default
   - removed non-useful features
      - advances (you use a special product for this)
      - contracts numbers
      - refund with exchange (you just create a new sale with negatives qty)
      - removed validation steps
      - scan product wizard
   - clean and complete YAML tests (work in progress)

bzr revid: fp@tinyerp.com-20110925140930-s6zibvn51k3914in
2011-09-25 16:09:30 +02:00
Minh Tran f287c3dd05 Added demo data
bzr revid: mit@openerp.com-20110823122446-lks3tbshjx88ek15
2011-08-23 14:24:46 +02:00
Amit (OpenERP) 7c3c895631 [IMP]:point_of_sale:
Added two products in the module data :
 - "Cash In" with field "Product for Input" set (it must appear in Point of Sale / Configuration / Products for Input Operations)
 - "Cash Out" with field "Product for expenses" set (it must appear in Point of Sale / Configuration / Products for Output Operations)

Rename the fields:
 - income_pdt as "Product for Input Operation"
 - expense_pdt as "Product for Output Operation"

In Journal view (Accounting/Configuration/Financial Accounting/ Journals/Journals):
 - Changed the label "Users" to "POS Users.
 - Fixed separator label "Extended Configureation" -> "Extended Configuration.
 - In demo data, the journal type "Cash" should have field check_dtls set.
 - Renamed "check details" into "Check Cash Balance."

bzr revid: apa@tinyerp.com-20110520101607-5ilo2t7zna392s63
2011-05-20 15:46:07 +05:30
qdp-launchpad@tinyerp.com 2df4a68377 [MERGE] merged the dev3 branch
bzr revid: qdp-launchpad@tinyerp.com-20110114001101-wk77opsrvslh7pak
2011-01-14 01:11:01 +01:00
pso 118169f202 [IMP] point_of_sale: Improved demo file
bzr revid: pso@tinyerp.com-20110106063133-cqixpy3whocb4l1z
2011-01-06 12:01:33 +05:30
pso 5524f49c6f [IMP] Improved yml, demo file to remove static date time by using time library
bzr revid: pso@tinyerp.com-20110105125035-s7rknril8gwhm8i7
2011-01-05 18:20:35 +05:30
Harry (OpenERP) 764b9f251e [FIX] correct regression on intalling module without demo data
bzr revid: hmo@tinyerp.com-20101114134821-7djwpr6nmmxu584q
2010-11-14 19:18:21 +05:30
mtr 21b05dafac [IMP] point_of_sale:-renamed files
bzr revid: mtr@mtr-20101026121259-tbowld1yx3skezpr
2010-10-26 17:42:59 +05:30
husen f433b959c2 merged with trunk
bzr revid: husen@husen-laptop-20101230095809-cl6dkve1odgdtqtv
2010-12-30 15:28:09 +05:30