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

975 Commits

Author SHA1 Message Date
lmarcouiller
c90d758b0f New : add of unique(entity,label) 2022-04-14 11:06:54 +02:00
Laurent Destailleur
1f73f19ff7 php8 2022-04-08 00:42:39 +02:00
andreubisquerra
7f4e71f66f
Comments 2022-03-31 21:43:48 +02:00
andreubisquerra
e46541708c
Avoid grouping lines with ordered lines 2022-03-30 17:49:54 +02:00
Laurent Destailleur
35c57988a0 Responsive 2022-03-26 20:06:50 +01:00
lvessiller
1db60116e1 FIX search bracode rule and avoid undefined quantity on search in takepos 2022-03-24 18:02:32 +01:00
andreubisquerra
3715659880
Set to default place after close sale in TakePOS 
Set to default place after close sale in TakePOS when Bar Restaurant mode is enabled
 2022-03-06 12:27:59 +01:00
Laurent Destailleur
893e1571b8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-04 22:43:35 +01:00
Laurent Destailleur
c45d6a3bc7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-04 19:45:02 +01:00
Laurent Destailleur
0aa7e7df88 Fix translation on ticket 2022-03-01 00:33:24 +01:00
lvessiller
0d68846b3a FIX add filter on categories 2022-02-09 17:44:48 +01:00
lvessiller
25497018c7 FIX group by qty in update line 2022-02-09 16:49:40 +01:00
lvessiller
44e9b13f30 NEW barcode rule to insert product in takepos 2022-02-09 16:37:41 +01:00
andreubisquerra
3ec2769a05 FIX pay value 2022-01-28 18:11:38 +01:00
andreubisquerra
9d228b13de
FIX pay value 2022-01-28 17:22:41 +01:00
Laurent Destailleur
0d54f8df5f
Merge pull request #19847 from andreubisquerra/develop 
Create new line when add ordered product in TakePOS
 2022-01-25 14:29:07 +01:00
Laurent Destailleur
49f0e2f765
Merge pull request #19521 from altairis-melina/displaysku 
NEW : Show product reference in Takepos
 2022-01-19 02:32:51 +01:00
Laurent Destailleur
eb3bce9759
Merge pull request #19527 from altairis-melina/nocategory 
NEW : Add constant to hide categories in TakePos
 2022-01-19 02:30:52 +01:00
Laurent Destailleur
6179d7a4e6
Merge pull request #19618 from altairis-melina/hookproduct 
Add Hooks for takepos ajax search
 2022-01-19 02:30:09 +01:00
andreubisquerra
9cd4bfabff
Create new line when add ordered product in TakePOS 
When TAKEPOS_GROUP_SAME_PRODUCT is enabled in TakePOS and you add product, avoid group it if product is ordered
 2022-01-15 21:53:49 +01:00
Laurent Destailleur
f97ed1b3a3
Merge pull request #19623 from altairis-melina/changepriceht 
NEW : Add constant to change price HT in TakePos
 2022-01-10 21:07:41 +01:00
Laurent Destailleur
7e11677117 Fix: Add token to the url logout 2021-12-31 14:33:12 +01:00
Mélina
a85f542668 double quotes 2021-12-31 09:29:56 +01:00
Mélina
2729bd32e6 Single quotes 2021-12-30 16:14:06 +01:00
Mélina
81bee064af add getDolGlobalInt 2021-12-28 11:28:58 +01:00
Mélina
9e24785972 add getDolGlobalInt 2021-12-28 11:23:46 +01:00
Mélina
649d5b009e Correction of a condition of the constant 2021-12-21 10:10:28 +01:00
Mélina
d267d90ef7 escape constant 2021-12-20 14:22:35 +01:00
Laurent Destailleur
0465afbc34 Fix css for takepos 2021-12-20 13:39:34 +01:00
Mélina
e90c382345 fix prefix 2021-12-20 11:09:54 +01:00
Mélina
8738dc93b5 fix prefix 2021-12-20 11:06:53 +01:00
Mélina
dccd74b0ef fix prefix 2021-12-20 10:42:10 +01:00
Mélina
882bf4b12d cast fk_entrepot 2021-12-20 10:02:58 +01:00
Mélina
fca26827ec Add constant TAKEPOS_CHANGE_PRICE_HT 2021-12-15 10:47:30 +01:00
Mélina
c3ac93b917 Add Hooks for takepos ajax search 2021-12-14 16:03:12 +01:00
Mélina
a28ddb5ac6 sql correction 2021-12-14 09:18:44 +01:00
Mélina
0c7cf34125 Change the name of the constant 2021-12-13 17:02:16 +01:00
Mélina
631de455a4 Change line 136 2021-12-13 16:51:53 +01:00
Mélina
abf7368886 Change constant 2021-12-13 16:28:24 +01:00
Mélina
c9ae805e7a Change constant 2021-12-13 10:43:02 +01:00
Mélina
e3a18d117e Only the products in stock 2021-12-13 10:32:07 +01:00
Laurent Destailleur
4e744dec65
Merge pull request #19542 from andreubisquerra/develop 
FIX Avoid move line to the same place in TakePOS
 2021-12-08 19:16:40 +01:00
Laurent Destailleur
69cd7ae2ab Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/don/card.php
	htdocs/public/test/badges.php
	htdocs/public/test/test_exec.php
 2021-12-08 18:27:03 +01:00
Laurent Destailleur
eb60e3c16d Fix click on "C" on pad, reset correctly pad edition. 2021-12-06 02:13:15 +01:00
Laurent Destailleur
49e3344a58 Fix link 2021-12-05 15:11:10 +01:00
Laurent Destailleur
305d8af76a Fix use a standard link insted of js to open a window. 2021-12-05 14:58:07 +01:00
Laurent Destailleur
131c00ffb6 css 2021-12-05 13:00:23 +01:00
andreubisquerra
2b5bcda8d8
FIX Avoid move line to the same place in TakePOS 2021-12-02 23:08:22 +01:00
andreubisquerra
c23914f367
FIX load css file 2021-12-02 23:05:18 +01:00
stickler-ci
cc3ef5a3fb Fixing style errors. 2021-12-01 09:53:28 +00:00
Mélina
9190581d0a No category 2021-12-01 10:45:56 +01:00
Mélina
16ab6ce800 No Category 2021-12-01 10:26:24 +01:00
Mélina
5c1638227d Correction description catégorie 2021-12-01 09:58:01 +01:00
Mélina
7dff30126d Show subcategories description 2021-11-30 18:22:59 +01:00
Mélina
3ca6743469 Show category description 2021-11-30 16:19:36 +01:00
stickler-ci
7c3b2f1e9b Fixing style errors. 2021-11-30 15:07:59 +00:00
Mélina
e43b95f05a Show reference product 2021-11-30 15:41:46 +01:00
Laurent Destailleur
055cb5c0c9
Merge pull request #18526 from cfoellmann/PR/deprecated-html 
deprecated html attributes
 2021-11-30 14:27:12 +01:00
Laurent Destailleur
429c4406c4
Merge pull request #19441 from andreubisquerra/develop 
TakePOS Direct Payment (Cash) Button doesn't work
 2021-11-30 12:24:58 +01:00
Christian Foellmann
6608f5f0d8 update all script tags to be uniform. language="javascript" removed 
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
 2021-11-29 15:09:18 +01:00
Laurent Destailleur
441af6b6fb Fix add rel="noopener noreferrer" 2021-11-22 02:35:55 +01:00
andreubisquerra
bc6f38c556
TakePOS Direct Payment (Cash) Button doesn't work 2021-11-20 15:25:51 +01:00
andreubisquerra
bf8008a320
TakePOS Direct Payment (Cash) Button doesn't work 2021-11-20 09:55:04 +01:00
Laurent Destailleur
751404cd5e
Merge pull request #19355 from andreubisquerra/develop 
FIX Save TakePOS credit note as a pos sale
 2021-11-15 10:59:48 +01:00
Laurent Destailleur
a755c7ba51 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-11-11 18:34:41 +01:00
Laurent Destailleur
f5a7275077 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/takepos/index.php
 2021-11-11 18:34:04 +01:00
Laurent Destailleur
a725ffefdd Fix sql error 2021-11-11 18:30:17 +01:00
andreubisquerra
e98cfb3ef1
FIX Save TakePOS credit note as a pos sale 2021-11-11 18:02:56 +01:00
Laurent Destailleur
fd74e33ef1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/takepos/index.php
 2021-11-11 16:19:01 +01:00
Laurent Destailleur
ddad00c8e4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/takepos/index.php
 2021-11-11 16:14:48 +01:00
Laurent Destailleur
f24c38db73 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/datapolicy/class/datapolicy.class.php
	htdocs/takepos/index.php
 2021-11-11 16:06:21 +01:00
lvessiller
33e40c12c8 FIX close cash with some terminals in TakePOS 2021-11-09 14:12:28 +01:00
Laurent Destailleur
7d07da527d Debug v15 2021-11-01 03:30:22 +01:00
Laurent Destailleur
cb648705ce
Merge pull request #19186 from ptibogxiv/patch-448 
Fix excluded member display in takepos
 2021-10-31 18:04:19 +01:00
andreubisquerra
9cd6e7ac75
Fix travis 2021-10-27 17:44:07 +02:00
andreubisquerra
b81d826f88
Fix travis 2021-10-27 17:00:46 +02:00
andreubisquerra
fddff4d1ca
TakePOS hooks improvements 2021-10-27 15:59:27 +02:00
ptibogxiv
b322ae383b
Update invoice.php 2021-10-24 19:21:51 +02:00
ptibogxiv
68979578d9
Update invoice.php 2021-10-24 17:56:41 +02:00
ptibogxiv
10d35ee4aa
Fix excluded member display in takepos 2021-10-24 17:40:44 +02:00
Laurent Destailleur
f2cd7a7a56 Removed the div class="ficheaddleft" 2021-10-24 00:37:37 +02:00
Scrutinizer Auto-Fixer
f7a41f1848 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-10-23 20:22:10 +00:00
Laurent Destailleur
02aae5144d
Merge pull request #19151 from andreubisquerra/develop 
BUG Supplements is not showed from TakePOS
 2021-10-23 18:24:56 +02:00
andreubisquerra
6b45d68f83
Close cash with some terminals in TakePOS 2021-10-23 17:51:07 +02:00
andreubisquerra
5fe516770e
Supplements BUG 2021-10-23 16:59:25 +02:00
andreubisquerra
a95a99afef
TakePOS Split Sale fixes and improvements 2021-10-23 11:59:40 +02:00
lvessiller
d71d33939b NEW max terminals number on cash desk setup 2021-10-21 14:17:23 +02:00
Laurent Destailleur
f8010dfcbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/reception/list.php
	htdocs/takepos/pay.php
 2021-10-16 13:01:03 +02:00
lvessiller
ab4da186c5 FIX 2 columns for total labels 2021-10-12 15:52:59 +02:00
Laurent Destailleur
605aea62ca FIX TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT #18957 2021-10-12 15:25:44 +02:00
lvessiller
1788508963 FIX payment style and html5 tags 2021-10-12 14:11:19 +02:00
Laurent Destailleur
dc7143cb77
Merge pull request #18919 from OPEN-DSI/new-takepos-receipt-free-label 
NEW print without details
 2021-10-11 11:23:54 +02:00
andreubisquerra
be60293554
Travis fix 2021-10-10 08:58:17 +02:00
andreubisquerra
92756e1864
Improve public note 2021-10-09 23:48:35 +02:00
lvessiller
da52ee55a4 FIX sickler-ci errors 2021-10-07 10:13:30 +02:00
lvessiller
cc21257e3e NEW print without details 2021-10-07 09:51:55 +02:00
Alexandre SPANGARO
7f47df6ea4 HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 11:44:48 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
Laurent Destailleur
673a2982a5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/card.php
 2021-09-30 16:32:40 +02:00
Laurent Destailleur
ed264182c6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/product/card.php
	htdocs/takepos/receipt.php
 2021-09-30 16:28:42 +02:00