Commit Graph

470 Commits

Author SHA1 Message Date
Laurent Destailleur
09f1536c27
Merge pull request #13537 from andreubisquerra/master
Add langs and print only no printed order lines
2020-04-09 19:38:30 +02:00
andreubisquerra
e43e9a0daa
FIX TakePOS buying price 2020-04-09 14:56:50 +02:00
andreubisquerra
7d11a36beb
FIX TakePOS buying price 2020-04-09 14:42:42 +02:00
jove@bisquerra.com
ea79c91482 Add langs and print only no printed order lines 2020-04-08 20:02:54 +02:00
Laurent Destailleur
b8a657ec0f
Merge pull request #13509 from andreubisquerra/develop
Order printer with 'Receipt printers' module
2020-04-08 14:51:23 +02:00
Frédéric FRANCE
fc34b5a4cb
compress png with zopflipng 2020-04-06 19:03:48 +02:00
andreubisquerra
aec1c177e3
Order printer with 'Receipt printers' module 2020-04-06 16:07:05 +02:00
andreubisquerra
27eec2e5db
Travis fix 2020-04-02 23:28:25 +02:00
andreubisquerra
3255c18567
Receipt compatibility with receipt printer module 2020-04-02 22:11:16 +02:00
jove@bisquerra.com
d9614ac6fc Integrate Cash Control in TakePOS 2020-03-30 20:05:45 +02:00
andreubisquerra
0db7c2bf21
TakePOS CSS fix in action buttons 2020-03-27 23:19:56 +01:00
andreubisquerra
58a10c9c16
Unnecessary line 2020-03-23 23:10:55 +01:00
andreubisquerra
585c46b181
Avoid print customer name when is default 2020-03-23 22:58:04 +01:00
andreubisquerra
53850caa87
No reload page to load other sale in TakePOS 2020-03-23 22:44:26 +01:00
Laurent Destailleur
b9088c1ce3 css 2020-03-23 17:39:35 +01:00
Laurent Destailleur
0905b3a6b2 Fix function not found 2020-03-23 15:46:16 +01:00
Laurent Destailleur
aab3ca4fa1
Merge pull request #13402 from andreubisquerra/develop
Fix TakePOS DirectPayment when place is higher 0
2020-03-23 15:12:38 +01:00
Laurent Destailleur
d662bb97dc Debug parallel sale feature 2020-03-23 15:02:15 +01:00
Laurent Destailleur
d965aad6e6 Some fix to support correctly parallel sales 2020-03-23 14:31:59 +01:00
Laurent Destailleur
2177afecd9 Sort order 2020-03-23 14:12:48 +01:00
andreubisquerra
618da0a808
Fix TakePOS DirectPayment when place is higher 0 2020-03-22 22:39:41 +01:00
Laurent Destailleur
4b3d2bfb64
Merge pull request #13398 from andreubisquerra/master
NEW: Multiple sales in TakePOS
2020-03-22 20:19:40 +01:00
Laurent Destailleur
1cb598290a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-22 20:17:10 +01:00
Laurent Destailleur
1fdef022f0 css 2020-03-22 20:16:14 +01:00
andreubisquerra
40e5e7a46b
Travis fixes 2020-03-22 15:24:32 +01:00
jove@bisquerra.com
a2b973f9f7 NEW: Multiple sales in TakePOS 2020-03-22 14:50:09 +01:00
andreubisquerra
4b7de1e5f5
Remove vars to avoid conficts in TakePOS setup 2020-03-21 15:48:25 +01:00
Laurent Destailleur
5f0f376817
Merge pull request #13334 from OPEN-DSI/new-takepos-group-same-product
NEW add a parameter to group same product
2020-03-20 10:45:06 +01:00
Laurent Destailleur
9f65c4a7db
Merge pull request #13369 from OPEN-DSI/new-takepos-freezone-vat-rate
NEW add VAT rates on free zone in cash desk
2020-03-18 19:37:04 +01:00
Laurent Destailleur
a141f46e91
Merge pull request #13354 from OPEN-DSI/new-takepos-reduction-global-labels
NEW labels on reduction buttons in cash desk
2020-03-18 19:28:08 +01:00
VESSILLER
0e171e81e6 Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-takepos-freezone-vat-rate 2020-03-17 09:57:21 +01:00
VESSILLER
a74dca4a20 FIX resolve conflicts 2020-03-17 09:52:26 +01:00
VESSILLER
f7cf5f8784 NEW add VAT rates in free zone for product/service in cash desk 2020-03-17 09:44:59 +01:00
Laurent Destailleur
73f2e9e5de WIP migrate num_paiement into num_payment
Fix label for free product in takepos
2020-03-16 19:23:18 +01:00
Laurent Destailleur
01724894ad Fix useless BR 2020-03-16 18:33:06 +01:00
Laurent Destailleur
ffc861d4e2 FIX Autoadd product when barcode match
Show barcode value in tooltips
2020-03-16 18:04:22 +01:00
Laurent Destailleur
1212a63365 css 2020-03-16 15:53:00 +01:00
Laurent Destailleur
4b1dd27c5f Move takepos.php file into index.php to match other dir structure 2020-03-16 15:41:21 +01:00
Laurent Destailleur
41ae8f6f68 TakePOS: Move all information of customer in the header 2020-03-16 13:27:10 +01:00
VESSILLER
5a4bd28417 NEW labels on reduction buttons in cash desk 2020-03-16 11:56:47 +01:00
VESSILLER
350408d2ac Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-takepos-group-same-product 2020-03-16 11:10:41 +01:00
VESSILLER
1268bab958 Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-takepos-group-same-product 2020-03-13 17:27:04 +01:00
VESSILLER
04c0332bee FIX travis errors 2020-03-12 18:31:43 +01:00
VESSILLER
70ebc61c1f Module TakePos - NEW add numbering module for cash desk 2020-03-12 17:43:59 +01:00
Scrutinizer Auto-Fixer
f413ce6aac Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-12 11:45:44 +00:00
VESSILLER
e7056a9ade NEW add a parameter to group same product 2020-03-12 11:00:17 +01:00
Laurent Destailleur
fb8e565b53 Better position on screen 2020-03-12 00:13:42 +01:00
Laurent Destailleur
af227ae164 Add picto on selection of terminal button 2020-03-11 23:57:36 +01:00
Laurent Destailleur
54da1e73ff Option to show the n first line of desc into the basket 2020-03-11 23:56:48 +01:00
Laurent Destailleur
efeda2e747 Fix add global check on perm 2020-03-11 20:14:33 +01:00