lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
79,547 Commits 43 Branches 150 Tags 886 MiB
5d64cec354
Commit Graph

251 Commits

Author SHA1 Message Date
Laurent Destailleur
ec1acf710c Fix missing br 2019-10-09 18:15:59 +02:00
Laurent Destailleur
b3e2163903
Merge pull request #12014 from andreubisquerra/develop 
Price with tax when manual modify price in TakePOS
 2019-10-03 17:49:05 +02:00
Laurent Destailleur
09f7a68d6d Show ref of product on mouse hover thumbs 2019-10-03 17:40:59 +02:00
Laurent Destailleur
331148499a Fix check on terminal setup 2019-10-03 17:11:41 +02:00
andreubisquerra
64ca8acc54
Price with tax when manual modify price in TakePOS 2019-10-01 20:36:24 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
andreubisquerra
741447d990 Fix Travis errors 2019-09-29 21:30:06 +02:00
andreubisquerra
34be514326 Custom receipt tab in TakePOS 2019-09-29 20:56:24 +02:00
Laurent Destailleur
f3bc319a78 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/takepos/takepos.php
 2019-09-27 14:11:14 +02:00
Laurent Destailleur
435edf999b Fix: label of product not always visible after a search 2019-09-27 11:05:44 +02:00
Laurent Destailleur
8c3c7fd857 Fix remove + of categ on product thumb 2019-09-27 10:21:14 +02:00
Laurent Destailleur
64a7bbe0fd Move ajax file 2019-09-27 10:19:27 +02:00
Laurent Destailleur
5d0d3b3908 Description on 2 lines max 2019-09-27 09:57:48 +02:00
Laurent Destailleur
2e1decc57e Use css instead of hard coded style 2019-09-26 17:41:37 +02:00
Juanjo Menent
b838ab0c31 Fix search by ref 2019-09-25 12:13:27 +02:00
Laurent Destailleur
961f2b5165 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/viewcat.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/takepos/invoice.php
 2019-09-24 14:25:02 +02:00
Juanjo Menent
c97bd14278 FIX TakePOS no invoice validation control and good payment translate 2019-09-24 10:08:48 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
9f6fe0bf5a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/orders.lang
 2019-09-14 18:27:58 +02:00
ptibogxiv
48419da769
FIX new invoice with generic thirdparty in takepos 
by default, new invoice should always create with default thirdparty and avoid errors : creating new invoice with last customer and forget to change it...
 2019-09-10 14:58:55 +02:00
Laurent Destailleur
f893854986 Fix remove warnings 2019-09-05 14:24:13 +02:00
Laurent Destailleur
da3d230182 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.stickler.yml
	htdocs/takepos/invoice.php
 2019-09-03 17:34:49 +02:00
Laurent Destailleur
9c6cbfeb7f
Merge pull request #11774 from ptibogxiv/patch-250 
FIX logout redirect to takepos.php
 2019-09-03 15:10:28 +02:00
ptibogxiv
80624c67f4
Fix lang in invoice / takepos 2019-09-03 14:48:46 +02:00
ptibogxiv
6996e83390
Update takepos.php 2019-09-03 11:40:19 +02:00
ptibogxiv
0c5859d2bf
Update takepos.php 2019-09-03 11:37:25 +02:00
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
andreubisquerra
5d0dbea920 Control errors before validate invoice in TakePOS 2019-08-24 16:44:06 +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