javierybar
|
81ed97c9ba
|
NEW Credit invoice in TakePOS
|
2020-10-25 20:03:25 +01:00 |
|
ptibogxiv
|
7e8891bef9
|
NEW display date range if exist in takepos
usefull for membership via POS (ie use in adherentsplus before pushing in core)
|
2020-10-18 12:40:10 +02:00 |
|
Laurent Destailleur
|
69432284d0
|
Merge pull request #14999 from andreubisquerra/master
NEW: Add third order printer to TakePOS
|
2020-10-13 11:03:41 +02:00 |
|
Laurent Destailleur
|
64e20959f6
|
Fix bad link
|
2020-10-13 11:00:56 +02:00 |
|
andreubisquerra
|
d80931429e
|
Fix travis
|
2020-10-12 22:34:05 +02:00 |
|
jove@bisquerra.com
|
54f9ed6346
|
NEW: Add third order printer to TakePOS
|
2020-10-12 22:07:05 +02:00 |
|
Laurent Destailleur
|
1b92e03f47
|
Merge pull request #14921 from ptibogxiv/patch-383
NEW set entity when creating invoice on takepos
|
2020-10-08 19:30:37 +02:00 |
|
Scrutinizer Auto-Fixer
|
1512521d91
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-07 13:01:28 +00:00 |
|
Laurent Destailleur
|
bb39d7b205
|
Merge pull request #14916 from ptibogxiv/patch-382
Fix and save change of currency in invoice (takepos)
|
2020-10-05 16:44:28 +02:00 |
|
Laurent Destailleur
|
44ecc15a07
|
Merge pull request #14915 from ptibogxiv/patch-380
Fix reload display when invoice deleting in takepos
|
2020-10-05 16:43:55 +02:00 |
|
Laurent Destailleur
|
0fdad1b63d
|
Merge pull request #14914 from ptibogxiv/patch-379
Fix better display print/send button on takepos
|
2020-10-05 16:43:11 +02:00 |
|
Laurent Destailleur
|
10d21eee03
|
Merge pull request #14911 from ptibogxiv/patch-376
Fix display stock rights in takepos
|
2020-10-05 16:42:31 +02:00 |
|
Laurent Destailleur
|
099c19cefb
|
Merge pull request #14912 from ptibogxiv/patch-378
NEW multicurrency total in takepos
|
2020-10-05 16:40:59 +02:00 |
|
Laurent Destailleur
|
243d576f83
|
Update invoice.php
Log for debug
|
2020-10-05 16:38:40 +02:00 |
|
andreubisquerra
|
1c34a7acda
|
NEW: TakePOS connector compatibility with RECEIPT PRINTERS module
|
2020-10-04 22:50:27 +02:00 |
|
ptibogxiv
|
1a407e4c22
|
NEW set entity when creating invoice on takepos
usefull for marketplace, coworking, multibranding shop
|
2020-10-04 22:09:40 +02:00 |
|
ptibogxiv
|
55764779c4
|
Update invoice.php
|
2020-10-04 17:12:01 +02:00 |
|
ptibogxiv
|
e280fc3ad1
|
Fix and save change of currency in invoice (takepos)
|
2020-10-04 16:53:31 +02:00 |
|
stickler-ci
|
32a882e83c
|
Fixing style errors.
|
2020-10-04 13:56:36 +00:00 |
|
ptibogxiv
|
fac60bdf24
|
Fix reload display when invoice deleting
|
2020-10-04 15:54:23 +02:00 |
|
ptibogxiv
|
eaedcff2a8
|
Fix better display print/send button on takepos
|
2020-10-04 15:01:22 +02:00 |
|
ptibogxiv
|
1e6ad59856
|
Update invoice.php
|
2020-10-04 14:42:16 +02:00 |
|
stickler-ci
|
d25c5bf36a
|
Fixing style errors.
|
2020-10-04 12:40:52 +00:00 |
|
ptibogxiv
|
31dd9885e6
|
NEW multicurrency total in takepos
|
2020-10-04 14:39:02 +02:00 |
|
ptibogxiv
|
415deb1500
|
Fix display stock rights in takepos
only display if user have read right
|
2020-10-04 14:27:03 +02:00 |
|
jove@bisquerra.com
|
017d4946fe
|
NEW: TakePOS Multicurrency compatibility
|
2020-10-03 22:13:32 +02:00 |
|
Laurent Destailleur
|
ce1c5c6873
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/stripe/class/stripe.class.php
htdocs/takepos/invoice.php
|
2020-10-01 19:43:23 +02:00 |
|
Laurent Destailleur
|
0fa139f4e3
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/takepos/invoice.php
|
2020-10-01 19:37:56 +02:00 |
|
Laurent Destailleur
|
4d134ade72
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/takepos/invoice.php
|
2020-10-01 19:35:49 +02:00 |
|
lvessiller
|
259737f082
|
FIX set paid on total discount of a product in cash desk
|
2020-09-30 15:09:45 +02:00 |
|
Laurent Destailleur
|
1d6a4f528a
|
Fix css
|
2020-09-24 00:07:55 +02:00 |
|
Laurent Destailleur
|
a16788f753
|
Fix syntax error
|
2020-09-24 00:06:02 +02:00 |
|
Laurent Destailleur
|
32a93eb067
|
Update invoice.php
|
2020-09-23 19:50:39 +02:00 |
|
jove@bisquerra.com
|
c596f80fd5
|
NEW Show available stock in TakePOS
|
2020-09-20 23:29:59 +02:00 |
|
Laurent Destailleur
|
e5cca13ea0
|
Fix escaping
|
2020-09-20 03:32:43 +02:00 |
|
Laurent Destailleur
|
bfbb217607
|
Fix GETPOST on 'action'
|
2020-09-16 19:39:50 +02:00 |
|
Laurent Destailleur
|
295c2b1d17
|
FIX #yogosha4435
|
2020-09-16 17:56:26 +02:00 |
|
Scrutinizer Auto-Fixer
|
c263c8a76c
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-09-08 19:27:28 +00:00 |
|
Scrutinizer Auto-Fixer
|
b78ff67d7e
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-09-07 08:18:17 +00:00 |
|
Laurent Destailleur
|
54c1be3717
|
Merge pull request #14560 from ptibogxiv/patch-349
NEW display resiliate status in takepos for member
|
2020-08-31 16:16:39 +02:00 |
|
ptibogxiv
|
6eeb1d3a96
|
Update invoice.php
|
2020-08-29 13:36:52 +02:00 |
|
stickler-ci
|
eecab28203
|
Fixing style errors.
|
2020-08-26 10:22:33 +00:00 |
|
ptibogxiv
|
989130c0ad
|
Update invoice.php
|
2020-08-26 12:20:49 +02:00 |
|
ptibogxiv
|
76e276e8e8
|
Update invoice.php
|
2020-08-26 12:00:45 +02:00 |
|
stickler-ci
|
32ecf4dd9a
|
Fixing style errors.
|
2020-08-26 09:46:49 +00:00 |
|
ptibogxiv
|
66cdb1dad0
|
NEW display resiliate status in takepos for member
|
2020-08-26 11:44:35 +02:00 |
|
andreubisquerra
|
8f933c324a
|
Change variable to pos_change
|
2020-08-23 22:28:26 +02:00 |
|
jove@bisquerra.com
|
d9cbd8f998
|
NEW: Print payment method and change in TakePOS
|
2020-08-22 18:28:15 +02:00 |
|
Laurent Destailleur
|
25dfd32e0b
|
Merge pull request #14456 from andreubisquerra/master
NEW: Delayed payment in TakePOS
|
2020-08-19 14:36:34 +02:00 |
|
Laurent Destailleur
|
ea478721e7
|
Update invoice.php
|
2020-08-19 14:36:03 +02:00 |
|
Laurent Destailleur
|
f57f729d40
|
Update invoice.php
|
2020-08-19 14:35:15 +02:00 |
|
andreubisquerra
|
8c5a86cb72
|
Avoid empty sales and orders when all lines are removed.
|
2020-08-12 07:07:18 +02:00 |
|
jove@bisquerra.com
|
3be723f3a1
|
NEW: Delayed payment in TakePOS
|
2020-08-11 07:49:54 +02:00 |
|
Laurent Destailleur
|
6fd433167f
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/CMailFile.class.php
|
2020-08-07 11:59:55 +02:00 |
|
jove@bisquerra.com
|
022fb23cee
|
FIX: Get some taxes in TakePOS
|
2020-08-07 10:01:11 +02:00 |
|
Laurent Destailleur
|
01babc452c
|
More logs
|
2020-08-06 03:52:49 +02:00 |
|
jove@bisquerra.com
|
593c7242c4
|
NEW: TakePOS Gift Receipt
|
2020-08-02 11:13:41 +02:00 |
|
Laurent Destailleur
|
cb5577826d
|
Look and feel v13
|
2020-07-07 03:50:14 +02:00 |
|
Laurent Destailleur
|
bb74804b74
|
NEW Add option TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT
|
2020-06-29 17:58:04 +02:00 |
|
Laurent Destailleur
|
c54294285a
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
|
2020-06-20 12:28:14 +02:00 |
|
Laurent Destailleur
|
d632f1c6b2
|
Fix url
|
2020-06-19 23:08:29 +02:00 |
|
andreubisquerra
|
7e792928e0
|
Update invoice.php for Auto Order
|
2020-05-26 23:03:47 +02:00 |
|
Laurent Destailleur
|
40816c02ce
|
Merge branch 'develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
|
2020-05-25 22:40:59 +02:00 |
|
andreubisquerra
|
221e8d8ce1
|
invoice.php improvements
|
2020-05-24 16:30:42 +02:00 |
|
Frédéric FRANCE
|
5aa84c64d0
|
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
|
2020-05-23 18:54:33 +02:00 |
|
Frédéric FRANCE
|
b41ac00b98
|
add new rule
|
2020-05-21 15:05:19 +02:00 |
|
Frédéric FRANCE
|
ee6fadd0d5
|
add new rule
|
2020-05-21 01:41:27 +02:00 |
|
jove@bisquerra.com
|
0847f5350a
|
TakePOS Auto Order improvements
|
2020-05-15 23:44:19 +02:00 |
|
Scrutinizer Auto-Fixer
|
9699ee7263
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-05-15 11:55:31 +00:00 |
|
Laurent Destailleur
|
bc581ead3b
|
Merge branch 'develop' into master
|
2020-05-14 16:17:37 +02:00 |
|
Laurent Destailleur
|
c89e8efec3
|
responsive
|
2020-05-12 14:08:28 +02:00 |
|
jove@bisquerra.com
|
b93a3ceb29
|
TakePOS Auto Order improvements
|
2020-05-08 17:25:48 +02:00 |
|
andreubisquerra
|
ac75cf318e
|
Fix travis
|
2020-05-03 00:07:04 +02:00 |
|
jove@bisquerra.com
|
81c808692e
|
NEW Bar Restaurant tab and Auto order
|
2020-05-02 22:00:04 +02:00 |
|
jove@bisquerra.com
|
4dbd16077e
|
Finish send receipt by email from TakePOS
|
2020-04-30 01:10:12 +02:00 |
|
Laurent Destailleur
|
c7fab6a83e
|
Fix no tooltip of not predefined products
|
2020-04-20 13:26:06 +02:00 |
|
Laurent Destailleur
|
b92c03cdf6
|
Fix Look and feel v12
|
2020-04-20 13:20:09 +02:00 |
|
Scrutinizer Auto-Fixer
|
387ea73bf3
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-13 11:24:42 +00:00 |
|
Laurent Destailleur
|
78b455e42a
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-04-12 17:01:53 +02:00 |
|
Laurent Destailleur
|
422e33a68b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/ihm.php
htdocs/comm/action/class/actioncomm.class.php
htdocs/compta/stats/cabyprodserv.php
htdocs/filefunc.inc.php
htdocs/takepos/invoice.php
|
2020-04-12 17:01:44 +02:00 |
|
andreubisquerra
|
323a62f1e7
|
travis fix
|
2020-04-11 22:38:59 +02:00 |
|
jove@bisquerra.com
|
78b43ddb1f
|
TakePOS connector update
|
2020-04-11 22:19:36 +02:00 |
|
jove@bisquerra.com
|
66659f0693
|
Two diferents order printers
|
2020-04-10 19:18:42 +02:00 |
|
Scrutinizer Auto-Fixer
|
444c293c01
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-10 08:59:32 +00:00 |
|
andreubisquerra
|
4ac978303b
|
FIX TakePOS buying price
|
2020-04-10 08:36:16 +02:00 |
|
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 |
|
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
|
0905b3a6b2
|
Fix function not found
|
2020-03-23 15:46:16 +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
|
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 |
|
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 |
|
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
|
f7cf5f8784
|
NEW add VAT rates in free zone for product/service in cash desk
|
2020-03-17 09:44:59 +01:00 |
|