Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

330 Commits

Author SHA1 Message Date
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