Commit Graph

1145 Commits

Author SHA1 Message Date
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
Laurent Destailleur
b2e0b1216e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-18 17:05:03 +01:00
Laurent Destailleur
b2ec340a48 FIX Show button POS Ticket only if invoice was generated by POS 2019-02-18 17:04:53 +01:00
andreubisquerra
8cc2662f01 Update TakePOS in Dolibarr 9 2019-02-14 20:59:32 +01:00
andreubisquerra
3f9b37d3d4 Fix TakePOS categories bug 2019-02-13 22:29:55 +01:00
Laurent Destailleur
e054b080a5 Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing 2019-02-12 13:33:39 +01:00