Laurent Destailleur
|
be34a2c607
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/cashdesk.lang
htdocs/product/stock/list.php
|
2020-08-02 16:06:51 +02:00 |
|
jove@bisquerra.com
|
593c7242c4
|
NEW: TakePOS Gift Receipt
|
2020-08-02 11:13:41 +02:00 |
|
Laurent Destailleur
|
0b46fcb4f8
|
Debug
|
2020-07-31 14:02:08 +02:00 |
|
Laurent Destailleur
|
0d71cd4279
|
Fix td not closed
|
2020-07-31 13:51:49 +02:00 |
|
Laurent Destailleur
|
255dc71823
|
Missing translation
|
2020-07-31 13:20:05 +02:00 |
|
Laurent Destailleur
|
cb5577826d
|
Look and feel v13
|
2020-07-07 03:50:14 +02:00 |
|
Laurent Destailleur
|
83eaddb17b
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/evalmath.class.php
htdocs/core/class/extrafields.class.php
htdocs/install/mysql/migration/11.0.0-12.0.0.sql
htdocs/langs/en_US/cashdesk.lang
htdocs/societe/class/societe.class.php
|
2020-07-04 13:13:17 +02:00 |
|
andreubisquerra
|
452cca503a
|
Fixes
|
2020-07-02 00:11:17 +02:00 |
|
andreubisquerra
|
d2a78b8aa4
|
Update appearance.php
|
2020-07-01 22:44:18 +02:00 |
|
jove@bisquerra.com
|
76f3724191
|
NEW: Appearance tab in TakePOS with more visual parameters
|
2020-07-01 22:34:35 +02:00 |
|
stickler-ci
|
92f4744d11
|
Fixing style errors.
|
2020-07-01 13:22:43 +00:00 |
|
ptibogxiv
|
5e259d26ab
|
FIX takepos hook
can add more than 1 button within 1 module
|
2020-07-01 15:20:42 +02:00 |
|
Laurent Destailleur
|
4f1ac84a19
|
Fix can't find link to edit table plan
|
2020-06-30 12:07:24 +02:00 |
|
Laurent Destailleur
|
146c521efd
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/security.lib.php
htdocs/filefunc.inc.php
|
2020-06-29 18:06:42 +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
|
68b4866438
|
Trans
|
2020-06-29 09:43:39 +02:00 |
|
Laurent Destailleur
|
9c23890c26
|
Fix phpcs
|
2020-06-24 20:03:12 +02:00 |
|
Laurent Destailleur
|
4cfb9dc7c5
|
css
|
2020-06-22 04:40:04 +02:00 |
|
Laurent Destailleur
|
0139a840ae
|
Fix setup
|
2020-06-21 20:49:34 +02:00 |
|
Laurent Destailleur
|
501fd2f7a3
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/takepos/admin/receipt.php
|
2020-06-21 20:48:41 +02:00 |
|
Laurent Destailleur
|
ccc55dcb1e
|
Debug Receipt printer module and reduce duplicate translation key
|
2020-06-20 15:19:19 +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 |
|
andreubisquerra
|
515d18020d
|
Add security check
|
2020-06-20 12:21:14 +02:00 |
|
andreubisquerra
|
532fe82c6e
|
Fix travis
|
2020-06-20 12:21:06 +02:00 |
|
jove@bisquerra.com
|
ad432e1e9b
|
Printable QR
|
2020-06-20 12:20:53 +02:00 |
|
Laurent Destailleur
|
d632f1c6b2
|
Fix url
|
2020-06-19 23:08:29 +02:00 |
|
VESSILLER
|
f010184008
|
FIX replace filter parameter "none" by "restricthtml"
|
2020-06-08 11:48:31 +02:00 |
|
VESSILLER
|
7bba9db2f0
|
FIX replace filter parameter "none" by "restricthtml"
|
2020-06-08 11:28:05 +02:00 |
|
VESSILLER
|
81fbb80823
|
FIX end div for responsive table
|
2020-06-05 14:20:38 +02:00 |
|
VESSILLER
|
ded7b79a6f
|
FIX free text on cash desk
|
2020-06-05 12:10:03 +02:00 |
|
VESSILLER
|
304c44560d
|
NEW add free text on each terminal of cash desk
|
2020-06-05 10:47:45 +02:00 |
|
Laurent Destailleur
|
9a30d4ca44
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-06-02 13:32:02 +02:00 |
|
andreubisquerra
|
b0f904508a
|
Fix travis
|
2020-06-01 17:52:38 +02:00 |
|
andreubisquerra
|
8abe60db0b
|
Add Restaurant QR menu
|
2020-06-01 17:05:22 +02:00 |
|
andreubisquerra
|
3cc249a887
|
Update QR
|
2020-06-01 17:04:23 +02:00 |
|
andreubisquerra
|
5325971517
|
Update settings
|
2020-06-01 17:02:11 +02:00 |
|
Laurent Destailleur
|
2836368017
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/filefunc.inc.php
htdocs/takepos/css/phone.css
htdocs/takepos/invoice.php
|
2020-05-28 20:20:39 +02:00 |
|
andreubisquerra
|
3b884c4051
|
Fix travis
|
2020-05-27 07:03:57 +02:00 |
|
andreubisquerra
|
8891595993
|
Fix travis
|
2020-05-27 06:57:12 +02:00 |
|
andreubisquerra
|
896e3166b7
|
Update phone.css
|
2020-05-27 06:49:37 +02:00 |
|
andreubisquerra
|
7d323f4379
|
Update index.php
|
2020-05-27 06:48:40 +02:00 |
|
andreubisquerra
|
abf7fce108
|
Update auto_order.php
|
2020-05-27 06:44:00 +02:00 |
|
andreubisquerra
|
7e792928e0
|
Update invoice.php for Auto Order
|
2020-05-26 23:03:47 +02:00 |
|
andreubisquerra
|
56708e8c35
|
Update phone.php for Auto Order
|
2020-05-26 22:52:55 +02:00 |
|
stickler-ci
|
5fe4520385
|
Fixing style errors.
|
2020-05-25 20:43:35 +00:00 |
|
Laurent Destailleur
|
40816c02ce
|
Merge branch 'develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
|
2020-05-25 22:40:59 +02:00 |
|
Laurent Destailleur
|
4e0d8ba518
|
Merge pull request #13962 from andreubisquerra/develop
TakePOS Auto Order improvements
|
2020-05-25 22:34:22 +02:00 |
|
Laurent Destailleur
|
0b9e1e6ec6
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-25 13:01:49 +02:00 |
|
Laurent Destailleur
|
6158e41822
|
CSS
|
2020-05-24 23:44:04 +02:00 |
|
andreubisquerra
|
d60bcb871f
|
Fix travis
|
2020-05-24 18:24:41 +02:00 |
|
andreubisquerra
|
957c40e072
|
Fix travis
|
2020-05-24 18:03:07 +02:00 |
|
andreubisquerra
|
3632111705
|
Fix travis
|
2020-05-24 17:29:35 +02:00 |
|
andreubisquerra
|
c80989d74f
|
phone.php improvements
|
2020-05-24 16:31:22 +02:00 |
|
andreubisquerra
|
221e8d8ce1
|
invoice.php improvements
|
2020-05-24 16:30:42 +02:00 |
|
andreubisquerra
|
26ee0d1949
|
genimg improvements
|
2020-05-24 16:29:42 +02:00 |
|
Frédéric FRANCE
|
6522bb70fd
|
fix merge
|
2020-05-23 19:06:01 +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 |
|
Laurent Destailleur
|
697d4d684e
|
Merge pull request #13899 from andreubisquerra/master
TakePOS Auto Order improvements
|
2020-05-23 15:11:01 +02:00 |
|
Frédéric FRANCE
|
5940d3705a
|
add new rule
|
2020-05-21 16:00:12 +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 |
|
Laurent Destailleur
|
bd564486ff
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-17 20:03:09 +02:00 |
|
Laurent Destailleur
|
608d3ce32f
|
Responsive
|
2020-05-17 16:10:29 +02:00 |
|
andreubisquerra
|
38346afe0e
|
Clean
|
2020-05-16 00:26:42 +02:00 |
|
andreubisquerra
|
ceafbb9855
|
Fix travis
|
2020-05-16 00:07:13 +02:00 |
|
jove@bisquerra.com
|
0847f5350a
|
TakePOS Auto Order improvements
|
2020-05-15 23:44:19 +02:00 |
|
Laurent Destailleur
|
b8aa635955
|
Merge pull request #13890 from andreubisquerra/master
Public photos for customers with TakePOS
|
2020-05-15 14:36:07 +02:00 |
|
Laurent Destailleur
|
f35a618699
|
Update index.php
|
2020-05-15 14:29:04 +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 |
|
jove@bisquerra.com
|
991996697d
|
Public photos for customers with TakePOS
|
2020-05-14 18:03:22 +02:00 |
|
Laurent Destailleur
|
bc581ead3b
|
Merge branch 'develop' into master
|
2020-05-14 16:17:37 +02:00 |
|
Laurent Destailleur
|
f0d14662b9
|
Fix scrutinizer
|
2020-05-13 00:38:12 +02:00 |
|
andreubisquerra
|
8bd1179b82
|
Update qr.php
|
2020-05-12 17:03:24 +02:00 |
|
Laurent Destailleur
|
c89e8efec3
|
responsive
|
2020-05-12 14:08:28 +02:00 |
|
andreubisquerra
|
b89b6d7679
|
Name fix
|
2020-05-08 18:51:49 +02:00 |
|
andreubisquerra
|
f8ad954854
|
Fix URLs
|
2020-05-08 18:04:38 +02:00 |
|
andreubisquerra
|
1674048c81
|
Fix travis
|
2020-05-08 17:56:42 +02:00 |
|
jove@bisquerra.com
|
b93a3ceb29
|
TakePOS Auto Order improvements
|
2020-05-08 17:25:48 +02:00 |
|
Laurent Destailleur
|
a649dcecf7
|
Look and field
|
2020-05-08 03:01:51 +02:00 |
|
Laurent Destailleur
|
830a117aa7
|
Suggest fix for #13824
|
2020-05-07 23:39:03 +02:00 |
|
Laurent Destailleur
|
f4a9490e7f
|
Fix a page with NOLOGIN const set to 1 must be into "public" dir.
|
2020-05-04 16:55:53 +02:00 |
|
andreubisquerra
|
8530db6dab
|
Fix travis
|
2020-05-03 00:09:17 +02:00 |
|
andreubisquerra
|
32923daa9d
|
Fix travis
|
2020-05-03 00:07:52 +02:00 |
|
andreubisquerra
|
ac75cf318e
|
Fix travis
|
2020-05-03 00:07:04 +02:00 |
|
andreubisquerra
|
35713ef004
|
Fix travis
|
2020-05-03 00:05:59 +02:00 |
|
jove@bisquerra.com
|
81c808692e
|
NEW Bar Restaurant tab and Auto order
|
2020-05-02 22:00:04 +02:00 |
|
andreubisquerra
|
281a97404a
|
Fix travis
|
2020-04-30 01:27:55 +02:00 |
|
jove@bisquerra.com
|
4dbd16077e
|
Finish send receipt by email from TakePOS
|
2020-04-30 01:10:12 +02:00 |
|
Laurent Destailleur
|
b20d85b198
|
Fix phpcs
|
2020-04-26 23:06:52 +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
|
d47c566c4d
|
Fix class not found
|
2020-04-12 18:15:38 +02:00 |
|
Laurent Destailleur
|
27782a244c
|
Merge pull request #13565 from andreubisquerra/develop
4 rows of actions buttons in TakePOS
|
2020-04-12 17:02:28 +02: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 |
|
andreubisquerra
|
5dc3b8dfd5
|
Travis fix
|
2020-04-11 22:36:46 +02:00 |
|
jove@bisquerra.com
|
78b43ddb1f
|
TakePOS connector update
|
2020-04-11 22:19:36 +02:00 |
|
andreubisquerra
|
9270e2c614
|
4 rows of actions buttons in TakePOS
|
2020-04-11 16:31:08 +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 |
|
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
|
fbe6711353
|
Fix TakePOS DirectPayment when place is higher 0
|
2020-03-22 22:46:40 +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 |
|