lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
88,659 Commits 43 Branches 150 Tags 886 MiB
12.0
Commit Graph

550 Commits

Author SHA1 Message Date
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
David Beniamine
828aa9bd93
Sort products by reference 2019-11-29 15:59:25 +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
Frédéric FRANCE
b048a2b408
can print from takepos 2019-11-03 15:06:20 +01:00
Frédéric FRANCE
d797ea590e
rework an experimental module 2019-11-03 00:50:58 +01:00
Laurent Destailleur
dc18e3efb5
Merge pull request #12278 from andreubisquerra/master 
Default customer relative discount in TakePOS
 2019-11-02 13:03:43 +01:00
Laurent Destailleur
45c77b4560 Renaming some libelle into label 2019-11-02 12:59:38 +01:00
Laurent Destailleur
135e65c4aa Look and feel v11 
Enhance the progress bar of tasks
 2019-11-01 15:53:57 +01:00
Laurent Destailleur
1821fa6317 Fix translation of "Terminal" 2019-11-01 12:48:09 +01:00
andreubisquerra
dbb5729f04 Default customer relative discount in TakePOS 2019-10-30 22:34:54 +01:00
Laurent Destailleur
26a58682b0
Merge pull request #12217 from andreubisquerra/develop 
REF to customer readable place in TakePOS BAR
 2019-10-30 03:01:49 +01:00
Frédéric FRANCE
16f58f1eee
clean indent 2019-10-27 10:38:52 +01:00
andreubisquerra
709f2c08b0
travis errors 2019-10-24 21:39:47 +02:00
andreubisquerra
5904b0bea4
Travis errors 2019-10-24 20:00:17 +02:00
andreubisquerra
6c8c41aaba
REF to customer readable place in TakePOS BAR 
Convert the invoice reference to a readable format for customers and waiters in non validated printed vouchers.

(PROV-POS1-5)
to:
Terminal 1 Place 5
 2019-10-24 19:14:12 +02:00
stickler-ci
0e7f3c307e Fixing style errors. 2019-10-23 20:05:37 +00:00
ptibogxiv
6ff13ab7e1
Update invoice.php 2019-10-23 22:03:43 +02:00
Laurent Destailleur
a4eab82894
Merge pull request #12191 from andreubisquerra/master 
NEW Multiple payments in a TakePOS sale
 2019-10-22 12:45:19 +02:00
Laurent Destailleur
6638b361d4
Update invoice.php 2019-10-22 12:44:19 +02:00
Laurent Destailleur
be3f0471ff Fix phpcs 2019-10-21 11:27:48 +02:00
andreubisquerra
df181d1f35 Multiple payments in a TakePOS sale 2019-10-20 22:01:54 +02:00
Frédéric FRANCE
86f22c4563
do not ignore lines with mix od tabs and spaces 2019-10-20 17:17:22 +02:00
Laurent Destailleur
05352a62e5 css 2019-10-20 15:37:20 +02:00
Laurent Destailleur
5a4960f7ae Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/takepos/takepos.php
 2019-10-20 15:30:28 +02:00
Laurent Destailleur
45d64e468f Fix regression 2019-10-20 15:29:15 +02:00
Laurent Destailleur
e224170dc2 FIX Clean the + of categories on the product view only in POS module 
Conflicts:
	htdocs/takepos/takepos.php
 2019-10-20 15:27:09 +02:00
Laurent Destailleur
f999430fd3 FIX Clean the + of categories on the product view only in POS module 2019-10-20 15:24:52 +02:00
Laurent Destailleur
d79114c1f8 Clean code 2019-10-20 15:16:40 +02:00
Laurent Destailleur
955e25d7c6
Merge pull request #12150 from andreubisquerra/master 
Redesign of the TakePOS mobile layout and more functions
 2019-10-17 17:56:12 +02:00
Laurent Destailleur
e709c005a0 FIX Payment was not saved on TakePOS module. 2019-10-17 12:28:48 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
7960c91955 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/theme/md/style.css.php
 2019-10-16 17:27:41 +02:00
andreubisquerra
8f03813aa9 Phone layout and functional improvements 2019-10-16 16:26:00 +02:00
Laurent Destailleur
568faef7f4 Fix encoding of message 2019-10-15 04:08:34 +02:00
Laurent Destailleur
060452ecf2 Fix link 2019-10-10 15:29:27 +02:00
Laurent Destailleur
ec1acf710c Fix missing br 2019-10-09 18:15:59 +02:00
Laurent Destailleur
1ca5a33e53
Merge branch 'develop' into patch-243 2019-10-08 15:04:03 +02:00
Laurent Destailleur
b3e2163903
Merge pull request #12014 from andreubisquerra/develop 
Price with tax when manual modify price in TakePOS
 2019-10-03 17:49:05 +02:00
Laurent Destailleur
09f7a68d6d Show ref of product on mouse hover thumbs 2019-10-03 17:40:59 +02:00
Laurent Destailleur
331148499a Fix check on terminal setup 2019-10-03 17:11:41 +02:00
andreubisquerra
64ca8acc54
Price with tax when manual modify price in TakePOS 2019-10-01 20:36:24 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
andreubisquerra
741447d990 Fix Travis errors 2019-09-29 21:30:06 +02:00
andreubisquerra
34be514326 Custom receipt tab in TakePOS 2019-09-29 20:56:24 +02:00
Laurent Destailleur
f3bc319a78 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/takepos/takepos.php
 2019-09-27 14:11:14 +02:00
Laurent Destailleur
435edf999b Fix: label of product not always visible after a search 2019-09-27 11:05:44 +02:00
Laurent Destailleur
8c3c7fd857 Fix remove + of categ on product thumb 2019-09-27 10:21:14 +02:00
Laurent Destailleur
64a7bbe0fd Move ajax file 2019-09-27 10:19:27 +02:00
Laurent Destailleur
5d0d3b3908 Description on 2 lines max 2019-09-27 09:57:48 +02:00
Laurent Destailleur
2e1decc57e Use css instead of hard coded style 2019-09-26 17:41:37 +02:00
Juanjo Menent
b838ab0c31 Fix search by ref 2019-09-25 12:13:27 +02:00
Laurent Destailleur
961f2b5165 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/viewcat.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/takepos/invoice.php
 2019-09-24 14:25:02 +02:00
Juanjo Menent
c97bd14278 FIX TakePOS no invoice validation control and good payment translate 2019-09-24 10:08:48 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
ptibogxiv
21c51eb3d2
Update invoice.php 2019-09-15 21:01:29 +02:00
Laurent Destailleur
9f6fe0bf5a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/orders.lang
 2019-09-14 18:27:58 +02:00
ptibogxiv
ca5a3da04c
Update printsend.php 2019-09-11 15:04:13 +02:00
ptibogxiv
48419da769
FIX new invoice with generic thirdparty in takepos 
by default, new invoice should always create with default thirdparty and avoid errors : creating new invoice with last customer and forget to change it...
 2019-09-10 14:58:55 +02:00
Laurent Destailleur
f893854986 Fix remove warnings 2019-09-05 14:24:13 +02:00
Laurent Destailleur
da3d230182 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.stickler.yml
	htdocs/takepos/invoice.php
 2019-09-03 17:34:49 +02:00
Laurent Destailleur
9c6cbfeb7f
Merge pull request #11774 from ptibogxiv/patch-250 
FIX logout redirect to takepos.php
 2019-09-03 15:10:28 +02:00
ptibogxiv
80624c67f4
Fix lang in invoice / takepos 2019-09-03 14:48:46 +02:00
ptibogxiv
6996e83390
Update takepos.php 2019-09-03 11:40:19 +02:00
ptibogxiv
0c5859d2bf
Update takepos.php 2019-09-03 11:37:25 +02:00
ptibogxiv
f9df175efc
FIX takepos layout clear or focus search 
fix focus for compatibility with barcode scanner
 2019-09-02 21:26:44 +02:00
ptibogxiv
1c28086d4b
FIX logout redirect to takepos.php 
usefull for terminal locked with POS and use standard dolibarr login with addon as U2F
 2019-08-28 13:22:54 +02:00
andreubisquerra
d096d8abba Set free-text item default vat in TakePOS 2019-08-27 21:57:21 +02:00
Laurent Destailleur
bbda4269b2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-27 17:55:21 +02:00
Laurent Destailleur
851d76460a FIX #11720 2019-08-27 17:42:25 +02:00
Laurent Destailleur
12a09b8b2a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/takepos/invoice.php
 2019-08-27 15:56:56 +02:00
Laurent Destailleur
d4d3e28437 It is diffcult to understand how stock decrease is done so we show the 
ref of stock.
 2019-08-27 15:53:03 +02:00
Laurent Destailleur
d5328d1cec Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-27 15:43:19 +02:00
Laurent Destailleur
a2b1d96d42 Fix protection in cleaning invoice with transaction. Delete also 
extrafield lines.
 2019-08-27 15:42:35 +02:00
Laurent Destailleur
7165389f6c Add log 
Add protection to avoid change on a non draft invoice.
 2019-08-27 15:39:35 +02:00
ptibogxiv
1b64c89c2a
Fix tab and lang 2019-08-27 13:32:55 +02:00
Laurent Destailleur
7009f036a0
Merge pull request #11744 from andreubisquerra/master 
Control errors before validate invoice in TakePOS
 2019-08-26 17:24:03 +02:00
Laurent Destailleur
2ee864c905
Merge pull request #11738 from ptibogxiv/patch-238 
NEW email template for Takepos (sending invoice)
 2019-08-26 17:21:03 +02:00
Laurent Destailleur
999db7ed41 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/salaries/card.php
	htdocs/compta/sociales/class/chargesociales.class.php
	htdocs/takepos/invoice.php
 2019-08-26 16:49:25 +02:00
Laurent Destailleur
7c5fc9f3f8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-26 16:43:33 +02:00
Laurent Destailleur
c93e6550ce Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/compta/sociales/class/chargesociales.class.php
 2019-08-26 16:43:24 +02:00
Laurent Destailleur
6771a2e1f9
Update invoice.php 2019-08-26 16:27:00 +02:00
andreubisquerra
07244f002b else if to elseif 2019-08-24 18:11:47 +02:00
ptibogxiv
add28f10db
Update invoice.php 2019-08-24 17:37:50 +02:00
ptibogxiv
3a4ba0c401
Update printsend.php 2019-08-24 17:29:48 +02:00
ptibogxiv
bc93a8b4b1
Create printsend.php 2019-08-24 17:18:43 +02:00
ptibogxiv
f1987b0f0e
Update invoice.php 2019-08-24 16:58:39 +02:00
ptibogxiv
cf1a029b43
Update invoice.php 2019-08-24 16:46:04 +02:00
andreubisquerra
5d0dbea920 Control errors before validate invoice in TakePOS 2019-08-24 16:44:06 +02:00
ptibogxiv
4678373480
NEW print / send email form in takepos 2019-08-24 16:41:51 +02:00
ptibogxiv
c4b18890d9
Update invoice.php 2019-08-24 15:12:56 +02:00
ptibogxiv
d2ff37ae72
NEW email template for Takepos (sending invoice) 2019-08-24 15:00:49 +02:00
ptibogxiv
361bb72448
Update invoice.php 2019-08-24 14:17:58 +02:00
ptibogxiv
bb763ecb59
Fix lang in takepos 2019-08-24 14:02:25 +02:00
ptibogxiv
cc1de15438
Update invoice.php 2019-08-24 13:52:40 +02:00
ptibogxiv
686d43a122
NEW display membership in takepos if member link to thirdparty 
For some business or cases (ie: fundation), we need to know if customer is a member and membership  is up to date.
 2019-08-24 13:44:21 +02:00
ptibogxiv
73a6b45e23
Fix load langs in takepos 2019-08-24 13:26:01 +02:00
andreubisquerra
f1b80fc19a Add 'Direct Cash Payment' button in TakePOS 2019-08-20 23:44:30 +02:00
andreubisquerra
4cea0433b7 If user has not used change control, add total invoice payment 2019-08-16 23:33:48 +02:00
Laurent Destailleur
d7a41c6b72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2019-08-01 12:54:27 +02:00
Laurent Destailleur
5eb8f05061 FIX #11584 2019-08-01 12:23:02 +02:00
Laurent Destailleur
12b530c418 FIX Setup of TakePos was not possible after a clean install 2019-08-01 11:27:35 +02:00
Laurent Destailleur
9f7d118f6f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-27 02:40:56 +02:00
jcp
f82e1f1155 Fix: Use special_code=4 for Takepos 2019-07-19 10:44:12 +02:00
Laurent Destailleur
68bc096ef3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-25 23:41:56 +02:00
Laurent Destailleur
f2ea78f2ec Removed useless files 2019-06-25 23:26:55 +02:00
Laurent Destailleur
9b9070dbf8 Removed useless files 2019-06-25 23:26:34 +02:00
andreubisquerra
45fabede28 Basic phone layout for Restaurants in TakePOS 2019-05-26 16:44:17 +02:00
andreubisquerra
99a96bffe2 Fix TakePOS terminal bug 2019-05-24 08:36:43 +02:00
Laurent Destailleur
22e897b1a1 Clean and prepare code to fix a SQL injection 2019-05-21 17:22:38 +02:00
Norbert Penel / OSCSS
cf207aa545 FIX new takepos error messages 
the terminal number implementation must be used on global conf key
 2019-05-18 00:29:32 +02:00
javierybar
114ddea54f Simplify terminal variables 2019-05-14 19:58:08 +02:00
Laurent Destailleur
18071fb238 Works with 9 terminals 2019-05-09 13:40:03 +02:00
Laurent Destailleur
84714f39e2 Fix setup of terminal 2019-05-09 13:37:20 +02:00
andreubisquerra
84cfa00bf1 Terminals 2019-05-08 18:29:00 +02:00
Philippe GRAND
8e936fda4f FIX : typo error 2019-05-02 14:19:50 +02:00
andreubisquerra
00db274956 Add history to view and print previous sales. 2019-04-28 18:12:33 +02:00
andreubisquerra
d73b69df61 Add form class and fix autoprint with Takepos connector 2019-04-08 19:54:46 +02:00
Laurent Destailleur
da6c5b552f
Merge pull request #10950 from OPEN-DSI/new-extrafield-sellist-chkbxlst-options 
New categories options in sellist and chbxlist extrafields
 2019-04-08 13:28:51 +02:00
Laurent Destailleur
37b8796f3c NEW Add line total on list of payments 2019-04-02 17:54:34 +02:00
Lionel VESSILLER
8a220b9da1 New categories options in sellist and chbxlist extrafields 2019-04-02 11:01:46 +02:00
Laurent Destailleur
80b2605537
Merge pull request #10917 from Tetras-Libre/NegativeBills 
Negative bills
 2019-04-01 18:31:04 +02:00
Laurent Destailleur
9f0d712957 Fix style 2019-03-31 11:27:12 +02:00
Laurent Destailleur
ec9fdc1321 Fix regression with class="right". Style of amount lost. 2019-03-31 11:25:29 +02:00
Laurent Destailleur
76c5e96555 css 2019-03-29 12:38:32 +01:00
Laurent Destailleur
b3515e9994 css 2019-03-29 12:35:33 +01:00
Laurent Destailleur
b0b69033b7 Use a background color to identify line selected 2019-03-29 12:27:54 +01:00
Laurent Destailleur
6027e018e9 New: When adding a product in POS, the line added is automatically 
selected so we can change immediatly qty or price
 2019-03-29 12:19:23 +01:00
Laurent Destailleur
822552defb Use font awesome icon instead of image for navigation 
Better responsive on small screen
 2019-03-29 11:45:40 +01:00
Laurent Destailleur
458ef4df34 Fix alignement on TakePOS receipt 2019-03-28 20:33:41 +01:00
Laurent Destailleur
2996965c50 Fix: autofocus is done only on dekstop. 2019-03-28 19:33:22 +01:00
Laurent Destailleur
8d9a07de09 Fix rounding 2019-03-28 19:02:47 +01:00
Laurent Destailleur
50395b7dd7 New: Input field to search product always visible with focus so you can 
use a barcode flasher at any time
 2019-03-28 18:51:04 +01:00
Laurent Destailleur
c888c071e5 Removed duplicate file 2019-03-28 13:10:44 +01:00
Laurent Destailleur
396e79199c Add contextpage to open popup to change customers 2019-03-28 12:32:32 +01:00
Laurent Destailleur
3de82ad345 Prepare removal of duplicate page 2019-03-28 12:27:31 +01:00
Laurent Destailleur
1818e22be9 Add some font awesome icons on buttons 2019-03-28 09:56:01 +01:00
David Beniamine
42bd9f4c74
Fix CI again 2019-03-28 08:58:19 +01:00
David Beniamine
2834262010
Merge develop branch 2019-03-28 08:21:49 +01:00
David Beniamine
a8286eb100
Fix CI 2019-03-28 08:13:02 +01:00
Laurent Destailleur
c654361485 Show link to invoice at the TOP 2019-03-27 20:46:07 +01:00
Laurent Destailleur
eb1d57226f Fix status paid after entering a payment 2019-03-27 20:28:02 +01:00
Laurent Destailleur
9105e205ff No more need to set scroolTop, lines are sorted with last added first 2019-03-27 20:20:39 +01:00
Laurent Destailleur
ff10a2ab5a New: show the name of place and floor on main takepos page 2019-03-27 20:13:12 +01:00
Laurent Destailleur
579525ec48 New Can define nb of categories and products for pagination on TakePOS 2019-03-27 19:36:47 +01:00
Laurent Destailleur
3dbcf7a0c0 Debug edit of table. Use the id instead of name. 2019-03-27 19:21:05 +01:00
Laurent Destailleur
8998e4c6a3 Fix add of a table in floor for Bar and Restaurant 2019-03-27 18:40:02 +01:00
Laurent Destailleur
ef182e4155 Show the discount on TakePOS 2019-03-27 18:15:02 +01:00
Laurent Destailleur
6e643e90cf Translation 2019-03-27 18:00:44 +01:00
Laurent Destailleur
9d133dae12 Removed verbose log 2019-03-27 17:50:57 +01:00
Laurent Destailleur
3930464b84 Clean code and debug TakePOS module 2019-03-27 17:50:23 +01:00
Laurent Destailleur
e064a954d2 Fix avoid error 500 when searching product with no criteria 2019-03-27 15:55:18 +01:00
Laurent Destailleur
11e4411400 TakePOS Can enter payment in several times and with different modes 2019-03-27 15:42:53 +01:00
Laurent Destailleur
ec0733d202 Use color on the amount of the payment page of TakePOS module 
FIX Use pricejs instead of toFixed to be compatible with all currencies
WIP Prepare to be able to enter different payment modes on same invoice
 2019-03-27 12:40:32 +01:00
David Beniamine
a9db67e6e3
Merge branch 'develop' into NegativeBills 2019-03-26 23:59:10 +01:00
Laurent Destailleur
fb30b9bb82 Fix compatibility with old version and with setup of other POS modules 2019-03-26 20:51:38 +01:00
Laurent Destailleur
27ae740e82
Update pay.php 2019-03-26 20:13:25 +01:00
Laurent Destailleur
6bab56c6bb
Update pay.php 2019-03-26 20:12:32 +01:00
Laurent Destailleur
f902f7beeb
Update takepos.php 2019-03-26 20:10:48 +01:00
Laurent Destailleur
7ff51df8f3
Update takepos.php 2019-03-26 20:09:54 +01:00
Laurent Destailleur
337cb49374
Update invoice.php 2019-03-26 20:02:18 +01:00
Laurent Destailleur
573bc3187d
Update invoice.php 2019-03-26 20:01:06 +01:00
Laurent Destailleur
5c0f0eb545
Update setup.php 2019-03-26 19:55:05 +01:00
Laurent Destailleur
430f2c10b4
Update setup.php 2019-03-26 19:52:19 +01:00
Laurent Destailleur
4b378a8d4b
Merge branch 'develop' into PaiementsModes 2019-03-26 19:45:39 +01:00
David Beniamine
ed81d35e38
Allow negative bills 2019-03-25 18:07:30 +01:00
David Beniamine
fa157a81b9
Merge branch 'PaiementsModes' of github.com:Tetras-Libre/dolibarr into PaiementsModes 2019-03-25 16:58:02 +01:00
David Beniamine
32303bbe48
SQL modifications for multicompany compatibility 
Thanks to hregis
 2019-03-25 16:49:33 +01:00
David Beniamine
f4e23ea427
Merge branch 'develop' into PaiementsModes 2019-03-24 21:34:33 +01:00
David Beniamine
b554ca2b73
Merge branch 'develop' into VATGrouped 2019-03-24 21:06:29 +01:00
David Beniamine
833da30af1
Use any dolibarr enabled paiement mode 2019-03-24 21:01:42 +01:00
David Beniamine
4b61f0d606
Grouped VAT 
Add an option to group VAT by rate in receipt
 2019-03-24 20:17:41 +01:00
David Beniamine
10ab6f480d
Automatically print receipt 2019-03-22 09:28:58 +01:00
andreubisquerra
3665e9137a In a previous commit the command to change 'ref' has been deleted. And now TakePOS don't work. 
In Dolibarr the next command not work on draft invoice:
$invoice->ref = "(PROV-POS-".$place.")";
So I return to the previous command:
$sql="UPDATE ".MAIN_DB_PREFIX."facture set ref='(PROV-POS-".$place.")' where rowid=".$placeid;
 2019-03-19 23:05:08 +01:00
Philippe GRAND
13c49d2946 update with html5 compliant code 2019-03-17 10:27:06 +01:00
Philippe GRAND
7b1fd917eb update with html5 compliant code 2019-03-17 10:25:37 +01:00
Philippe GRAND
cbb865b960 update with html5 compliant code 2019-03-17 10:22:50 +01:00
Laurent Destailleur
86c5dc20e3 NEW Can choose the root category to show for TakePOS module 2019-03-15 02:12:40 +01:00
Laurent Destailleur
0ef6fd36f9 Merge and clean TakePOS CSS 2019-03-15 00:49:44 +01:00
Laurent Destailleur
6aa9a5f13a Fix link to backoffice 2019-03-14 23:36:55 +01:00
Regis Houssin
56104e6d89 FIX regression 2019-03-14 17:58:32 +01:00
Regis Houssin
a40cba194f FIX wrong url 2019-03-14 17:24:42 +01:00
Regis Houssin
fd393218d3 FIX you should prefer "elseif" than "else if" 2019-03-14 17:07:49 +01:00
Regis Houssin
daa940d75b FIX multiple bugs for show products/categories 2019-03-14 16:35:36 +01:00
Josep Lluís
869f6680da
FIX: free product description not printed 
The description of a free product/service is not printed on receipt.
 2019-03-13 15:43:34 +01:00
andreubisquerra
b1e9a0fe38 Add Order Notes to TakePOS 2019-03-03 12:50:36 +01:00
Laurent Destailleur
56d921ea52 CSS 2019-03-02 12:57:07 +01:00
Laurent Destailleur
825705179c Fix phpcs 2019-02-27 12:49:44 +01:00
Laurent Destailleur
bcf1d57456 Fix default page is not always index.php 2019-02-27 04:21:12 +01:00
Laurent Destailleur
4634312306 Fix phpcs 2019-02-27 04:18:25 +01:00
andreubisquerra
57ee8b7991 Fix no JPG images in TakePOS and other image improvements. 2019-02-24 21:15:11 +01:00
Laurent Destailleur
6b46a927f1
Merge branch 'develop' into PSR2MethodsFunctionCallSignatureSpaceBeforeOpenBracket 2019-02-24 20:53:54 +01:00
Frédéric FRANCE
894123fb06
PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket 2019-02-24 20:06:55 +01:00
Frédéric FRANCE
390766babf
replace html code by html5 2019-02-23 23:36:21 +01:00
Laurent Destailleur
e4698fb6a5 Merge 2019-02-18 19:14:25 +01:00