Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-09 19:18:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
81,180 Commits 36 Branches 190 Tags
0a125f73b5ae8ef858ec3a901b2f68045ddbb16c
Commit Graph

131 Commits

Author SHA1 Message Date
Laurent Destailleur
c02cd80b75 Clean code 2019-11-12 10:11:30 +01:00
Scrutinizer Auto-Fixer
df664e790b Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-11 23:15:34 +00:00
Laurent Destailleur
8793fdfe63 Fix not working feature 2019-11-07 15:25:57 +01:00
Laurent Destailleur
e671a119ce Merge branch 'develop' into patch-243 2019-11-07 15:12:37 +01:00
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
stickler-ci
0e7f3c307e Fixing style errors. 2019-10-23 20:05:37 +00:00
ptibogxiv
6ff13ab7e1 Update invoice.php 2019-10-23 22:03:43 +02: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
Laurent Destailleur
1ca5a33e53 Merge branch 'develop' into patch-243 2019-10-08 15:04:03 +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
ptibogxiv
21c51eb3d2 Update invoice.php 2019-09-15 21:01:29 +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
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