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 |
|
VESSILLER
|
7bba9db2f0
|
FIX replace filter parameter "none" by "restricthtml"
|
2020-06-08 11:28:05 +02:00 |
|
VESSILLER
|
ded7b79a6f
|
FIX free text on cash desk
|
2020-06-05 12:10:03 +02:00 |
|
andreubisquerra
|
4ac978303b
|
FIX TakePOS buying price
|
2020-04-10 08:36:16 +02:00 |
|
andreubisquerra
|
fbe6711353
|
Fix TakePOS DirectPayment when place is higher 0
|
2020-03-22 22:46:40 +01:00 |
|
Laurent Destailleur
|
89e9b9391b
|
Fix responsive
|
2020-01-27 02:26:07 +01:00 |
|
Laurent Destailleur
|
08841d4475
|
Update receipt.php
|
2020-01-26 22:14:31 +01:00 |
|
Laurent Destailleur
|
eff9fae261
|
Update receipt.php
|
2020-01-26 22:14:27 +01:00 |
|
javierybar
|
cb0986db8b
|
TakePOS price rounding
|
2020-01-26 22:14:11 +01:00 |
|
Laurent Destailleur
|
f2771b3365
|
FIX #12896
|
2020-01-25 14:23:23 +01:00 |
|
andreubisquerra
|
83d1b673bb
|
Visible receipt printer settings without stock module in TakePOS
|
2020-01-18 20:22:54 +01:00 |
|
Laurent Destailleur
|
e3c56cea5f
|
Fix missing lang
|
2020-01-07 14:19:41 +01:00 |
|
Laurent Destailleur
|
2e8fd25299
|
FIX Local taxes was not correctly supported in TakePOS.
|
2020-01-01 21:54:47 +01:00 |
|
Laurent Destailleur
|
dd9f25b13a
|
CSS
|
2019-12-22 16:33:15 +01:00 |
|
Laurent Destailleur
|
f44b85f557
|
Fix $_SESSION['newtoken'] must be newToken()
|
2019-12-18 23:12:31 +01:00 |
|
Laurent Destailleur
|
838633d0de
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/api/class/api_setup.class.php
htdocs/compta/facture/card.php
htdocs/compta/stats/index.php
htdocs/core/actions_massactions.inc.php
htdocs/install/upgrade2.php
htdocs/loan/card.php
htdocs/loan/document.php
htdocs/loan/info.php
htdocs/loan/note.php
htdocs/loan/schedule.php
htdocs/product/list.php
htdocs/ticket/card.php
htdocs/user/class/user.class.php
|
2019-12-14 14:53:49 +01:00 |
|
Frédéric FRANCE
|
12f84d8254
|
doxygen
|
2019-12-11 23:04:27 +01:00 |
|
Laurent Dinclaux
|
f51a68ceb1
|
Takepos: Well align the search field width, keep old CSS rule as fallback for old browsers
|
2019-12-07 15:36:23 +11:00 |
|
Laurent Destailleur
|
90bf7d24b9
|
CSS
|
2019-12-04 21:30:31 +01:00 |
|
Laurent Destailleur
|
7b25104e0c
|
Responsive
|
2019-12-04 20:28:04 +01:00 |
|
Laurent Destailleur
|
f16cd38c9c
|
The default theme works greate on smartphone now
|
2019-12-04 20:15:48 +01:00 |
|
Laurent Destailleur
|
e6b4d2f665
|
Debug sumup
|
2019-12-04 18:06:05 +01:00 |
|
Laurent Destailleur
|
e073a2378b
|
Fix responsive
|
2019-12-04 15:12:18 +01:00 |
|
Laurent Destailleur
|
9754158756
|
Fix avoid duplicate product when searching on product with n categories
|
2019-12-01 18:33:57 +01:00 |
|
Laurent Destailleur
|
c2f924f08f
|
CSS For TakePOS
|
2019-11-30 23:03:30 +01:00 |
|
Frédéric FRANCE
|
956ce9ea8f
|
avoid placeid to be string or string[]
Are you sure $placeid > 0 ? $placeid : 0 of type integer|string|string[] can be used in echo?
|
2019-11-28 23:31:28 +01:00 |
|
Laurent Destailleur
|
251723aed9
|
Fix css
|
2019-11-28 14:37:06 +01:00 |
|
Laurent Destailleur
|
99906ce127
|
Fix the root category not used for search from POS
|
2019-11-28 14:29:58 +01:00 |
|
Scrutinizer Auto-Fixer
|
5f99e25c45
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-28 11:36:20 +00:00 |
|
Frédéric FRANCE
|
59e85d5518
|
Create index.html
|
2019-11-26 17:55:33 +01:00 |
|
Frédéric FRANCE
|
250b8d0b67
|
delete file not used
|
2019-11-26 17:54:48 +01:00 |
|
Laurent Destailleur
|
5e5c1ac574
|
Merge pull request #12512 from Mavyre/develop
NEW Added SumUp payment to TakePOS
|
2019-11-26 09:50:37 +01:00 |
|
Laurent Destailleur
|
357af16ce1
|
Update terminal.php
|
2019-11-26 09:47:56 +01:00 |
|
Laurent Destailleur
|
01ca5d8251
|
Update setup.php
|
2019-11-26 09:46:47 +01:00 |
|
stickler-ci
|
9ee0dc75f3
|
Fixing style errors.
|
2019-11-25 22:19:50 +00:00 |
|
Bastien Vidé
|
fb069d248a
|
Added SumUp payment to TakePOS
|
2019-11-25 23:15:39 +01:00 |
|
andreubisquerra
|
b2e995279e
|
Fix takepos.lib.php to add Receipt tab and delete unnecessary takepos.lib.php
|
2019-11-25 19:29:07 +01:00 |
|
Laurent Destailleur
|
8db4eff108
|
Merge pull request #12437 from Dolibarr/scrutinizer-patch-8
Scrutinizer Auto-Fixes
|
2019-11-14 12:10:44 +01:00 |
|
Scrutinizer Auto-Fixer
|
f197196719
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-14 11:09:46 +00:00 |
|
Scrutinizer Auto-Fixer
|
ddcc14dc16
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-14 11:09:15 +00:00 |
|
Laurent Destailleur
|
614faa07c1
|
Merge pull request #12427 from Dolibarr/scrutinizer-patch-3
Scrutinizer Auto-Fixes
|
2019-11-14 08:49:53 +01:00 |
|
Scrutinizer Auto-Fixer
|
b40ecc3933
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:37:08 +00:00 |
|
Scrutinizer Auto-Fixer
|
f4aaa8d9bb
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:34:37 +00:00 |
|
Laurent Destailleur
|
c02cd80b75
|
Clean code
|
2019-11-12 10:11:30 +01:00 |
|
Scrutinizer Auto-Fixer
|
df664e790b
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-11 23:15:34 +00:00 |
|
Scrutinizer Auto-Fixer
|
812d0af1d9
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-08 14:51:54 +00:00 |
|
Laurent Destailleur
|
8793fdfe63
|
Fix not working feature
|
2019-11-07 15:25:57 +01:00 |
|
Laurent Destailleur
|
e671a119ce
|
Merge branch 'develop' into patch-243
|
2019-11-07 15:12:37 +01:00 |
|
Frédéric FRANCE
|
35751a80ab
|
100% centpercent
|
2019-11-05 21:24:41 +01:00 |
|