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

119 Commits

Author SHA1 Message Date
Frédéric FRANCE
b048a2b408
can print from takepos 2019-11-03 15:06:20 +01:00
Frédéric FRANCE
d797ea590e
rework an experimental module 2019-11-03 00:50:58 +01:00
andreubisquerra
dbb5729f04 Default customer relative discount in TakePOS 2019-10-30 22:34:54 +01:00
Laurent Destailleur
6638b361d4
Update invoice.php 2019-10-22 12:44:19 +02:00
andreubisquerra
df181d1f35 Multiple payments in a TakePOS sale 2019-10-20 22:01:54 +02:00
Laurent Destailleur
05352a62e5 css 2019-10-20 15:37:20 +02:00
Laurent Destailleur
5a4960f7ae Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/takepos/takepos.php
 2019-10-20 15:30:28 +02:00
Laurent Destailleur
e709c005a0 FIX Payment was not saved on TakePOS module. 2019-10-17 12:28:48 +02:00
andreubisquerra
8f03813aa9 Phone layout and functional improvements 2019-10-16 16:26:00 +02:00
Laurent Destailleur
ec1acf710c Fix missing br 2019-10-09 18:15:59 +02:00
andreubisquerra
64ca8acc54
Price with tax when manual modify price in TakePOS 2019-10-01 20:36:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +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
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
ptibogxiv
80624c67f4
Fix lang in invoice / takepos 2019-09-03 14:48:46 +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
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
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