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

133 Commits

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