Commit Graph

367 Commits

Author SHA1 Message Date
David Beniamine
1cd566f1ae
Merge tag 'develop' of https://github.com/Dolibarr/dolibarr into takepos-sort-product 2020-02-18 11:09:45 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-30 00:48:28 +00:00
Laurent Destailleur
2ce3ea8234
Merge pull request #12953 from andreubisquerra/develop
Wait search finished before add product with enter
2020-01-29 11:05:26 +01:00
andreubisquerra
13ee716b78
Min. sell price updatereduction 2020-01-28 22:21:19 +01:00
andreubisquerra
691514be24
Min. sell price updateprice 2020-01-28 22:18:23 +01:00
andreubisquerra
0beb78a978
Min. sell price when updateprice 2020-01-28 22:14:13 +01:00
andreubisquerra
63af8594ab
Wait search finished before add product with enter 2020-01-28 21:22:25 +01:00
Laurent Destailleur
80707d6a5e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-28 17:24:26 +01:00
Laurent Destailleur
89e9b9391b Fix responsive 2020-01-27 02:26:07 +01:00
Laurent Destailleur
0271a43e80
Merge branch 'develop' into master 2020-01-27 02:17:14 +01:00
Laurent Destailleur
2d77765613 css 2020-01-27 02:11:37 +01:00
Laurent Destailleur
d4223c3d82 TakePOS can use the same CSS properties than app 2020-01-27 02:06:34 +01:00
Laurent Destailleur
42db2a33eb Fix phpcs 2020-01-27 01:52:35 +01:00
Laurent Destailleur
37f5922bf8 Fix conflict 2020-01-27 01:38:50 +01:00
andreubisquerra
a8656fe612 Travis fix 2020-01-27 01:36:31 +01:00
Laurent Destailleur
539348bbbb Responsive TakePOS with Bar. 2020-01-27 01:31:39 +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
ce981e558c
Merge pull request #12921 from javierybar/develop
TakePOS price rounding in receipt
2020-01-26 22:13:42 +01:00
Laurent Destailleur
9a1051116e
Update receipt.php 2020-01-26 22:12:52 +01:00
Laurent Destailleur
3e8d2407c8
Update receipt.php 2020-01-26 22:12:26 +01:00
Laurent Destailleur
0f2141269a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-01-25 14:43:57 +01:00
Laurent Destailleur
f2771b3365 FIX #12896 2020-01-25 14:23:23 +01:00
javierybar
c46f255408
TakePOS price rounding 2020-01-24 09:22:46 +01:00
Laurent Destailleur
e679e05f57 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-19 19:49:04 +01:00
andreubisquerra
98789c908e Colorful theme for TakePOS 2020-01-19 19:16:45 +01:00
andreubisquerra
83d1b673bb Visible receipt printer settings without stock module in TakePOS 2020-01-18 20:22:54 +01:00
andreubisquerra
3c1d789482 Visible receipt printer settings without stock module in TakePOS 2020-01-16 08:25:36 +01:00
Laurent Destailleur
97f62c68f2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-08 13:38:03 +01:00
Laurent Destailleur
e3c56cea5f Fix missing lang 2020-01-07 14:19:41 +01:00
Laurent Destailleur
d5ad0180a0
Merge pull request #12786 from andreubisquerra/master
TakePOS press 'ENTER' event
2020-01-03 20:41:41 +01:00
Laurent Destailleur
afd32135f2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/takepos/invoice.php
2020-01-01 22:37:13 +01:00
Laurent Destailleur
2e8fd25299 FIX Local taxes was not correctly supported in TakePOS. 2020-01-01 21:54:47 +01:00
andreubisquerra
e005416189 If press enter add automatically the product. Widely used with barcodes. 2020-01-01 21:19:23 +01:00
Laurent Destailleur
fc49825eaa
Merge pull request #12659 from andreubisquerra/master
NEW: Takepos supplements
2019-12-30 22:07:19 +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
David Beniamine
305a821b62
TakePOS : setting to choose product field for sort 2019-12-16 17:33:45 +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
andreubisquerra
acbd8efa7d NEW: Takepos supplements 2019-12-08 23:16:49 +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