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

197 Commits

Author SHA1 Message Date
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
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
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
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
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
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
andreubisquerra
45fabede28 Basic phone layout for Restaurants in TakePOS 2019-05-26 16:44:17 +02:00
javierybar
114ddea54f Simplify terminal variables 2019-05-14 19:58:08 +02:00
andreubisquerra
84cfa00bf1 Terminals 2019-05-08 18:29:00 +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
37b8796f3c NEW Add line total on list of payments 2019-04-02 17:54:34 +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
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
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
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
ef182e4155 Show the discount on TakePOS 2019-03-27 18:15:02 +01:00
Laurent Destailleur
3930464b84 Clean code and debug TakePOS module 2019-03-27 17:50:23 +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
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
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
833da30af1
Use any dolibarr enabled paiement mode 2019-03-24 21:01:42 +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
7b1fd917eb update with html5 compliant code 2019-03-17 10:25:37 +01:00
Regis Houssin
daa940d75b FIX multiple bugs for show products/categories 2019-03-14 16:35:36 +01:00
andreubisquerra
b1e9a0fe38 Add Order Notes to TakePOS 2019-03-03 12:50:36 +01:00
Laurent Destailleur
e4698fb6a5 Merge 2019-02-18 19:14:25 +01:00
andreubisquerra
8cc2662f01 Update TakePOS in Dolibarr 9 2019-02-14 20:59:32 +01:00
klemens
beb2791dde spelling fixes 2019-02-10 12:59:09 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
andreubisquerra
bec25fb45c Remove absolut divs and add Dolistore POS category link to TakePOS 2019-01-27 01:28:32 +01:00
andreubisquerra
c4be1b141d Temporary ticket improvement in TakePOS 2018-12-19 22:52:16 +01:00
andreubisquerra
bce696ee36 Improve responsive design in TakePOS 2018-12-17 22:43:02 +01:00
andreubisquerra
a53688151d Fix some TakePOS small bugs from last third-party commits 2018-12-16 19:24:49 +01:00
Laurent Destailleur
c06e4ecd68
Merge pull request #10192 from AurelGDN/develop 
New: TakePOS +add Temporary ticket
 2018-12-16 17:44:18 +01:00
Laurent Destailleur
2d1cf59f34
Merge pull request #10204 from andreubisquerra/master 
Improve TakePOS responsive design
 2018-12-15 16:37:51 +01:00
Laurent Destailleur
8a01944a0c
Update invoice.php 2018-12-15 16:12:47 +01:00
Laurent Destailleur
b7ee2458a3
Update invoice.php 2018-12-15 16:10:44 +01:00
Laurent Destailleur
3032ef1235
Merge branch 'develop' into develop 2018-12-15 16:08:58 +01:00
andreubisquerra
337b204f9c Improve TakePOS responsive design 2018-12-07 21:33:40 +01:00
aurelien goudeneche
5a5b2c8a60
Revert wrong tag introduced with phpbcf fix 2018-12-07 17:33:35 +01:00
aurelien goudeneche
c5e773fcfd
space cast statement fix 2018-12-07 17:20:05 +01:00
aurelien goudeneche
fb0b208df7
phpcbf fix 2018-12-07 17:02:06 +01:00
aurelien goudeneche
b9ca32a7f2
beautify code 2018-12-07 08:04:40 +01:00
aurelien goudeneche
ab0750cbbf
Update invoice.php 2018-12-07 02:29:22 +01:00
aurelien goudeneche
6f5752ae2c
Update invoice.php 2018-12-07 01:58:58 +01:00
aurelien goudeneche
1bf3c51f60
Temporary ticket 
Update function
 2018-12-07 01:47:06 +01:00
aurelien goudeneche
b98e52a2ce
Update invoice.php 2018-12-07 01:32:10 +01:00
aurelien goudeneche
04dfc5dc8c
New: TakePOS +add Temporary ticket 
New: TakePOS  +add Temporary ticket with verbose invoice data (more exhaustive than the existing order printing)
                           +add some little invoice printing layouts improvements (Unit Price, Misc company  Info, Cashier name, Table Border) 

Temporary ticket is usefull in some restaurant when a customer ask for a bill from his table before to check it  out. The waiter usually don't how the customer will pay (card,cash,cheque).
Works with  the Andreu Bisquerra's java TakePOSconnector  like  the existing orderprinting so it doesn't affect the ulterior payment validation process and printing from CashDesk.
This feature needs the BAR/RESTAURANT order/printing to be enabled.
 2018-12-07 00:40:00 +01:00
Maxime Kohlhaas
2e496ea83a QUAL rename facnumber by ref 2018-12-02 17:33:44 +01:00
andreubisquerra
8f1a00bbf1 Fix issues on TakePOS 2018-12-01 19:55:35 +01:00
Laurent Destailleur
03f0922325
Merge pull request #10087 from AurelGDN/develop 
New Takepos: cheque payment button in cashdesk
 2018-12-01 15:03:19 +01:00
AurelienGoudeneche
4d9e64bfcf
Add files via upload 2018-11-28 13:04:59 +01:00
Philippe GRAND
a59a4c60e0 FIX : Typo errors 2018-11-26 16:09:05 +01:00
andreubisquerra
b396aaebc5 Fix delete without any selected line 2018-10-18 16:31:37 +02:00
Laurent Destailleur
35d5a495de Save pos_source with id of POS station 2018-10-08 22:51:20 +02:00
Laurent Destailleur
41f2289ffa Save pos station into invoice 2018-10-08 22:28:30 +02:00
Laurent Destailleur
19cf649b48 Add field to track source module of invoice 2018-10-07 13:59:40 +02:00
Alexey Pyltsyn
49de7a5881 Replace multiple load calls with loadLangs method 2018-10-01 09:22:23 +03:00
Laurent Destailleur
fc4103b469 Clean code 2018-10-01 00:44:07 +02:00
Laurent Destailleur
f990719daa Add experimental module TakePOS 2018-09-28 13:31:41 +02:00