Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
89,513 Commits 36 Branches 189 Tags
b2a953ed5bb795b0f344516f320fde2651a60ea3
Commit Graph

614 Commits

Author SHA1 Message Date
Laurent Destailleur
bfbb217607 Fix GETPOST on 'action' 2020-09-16 19:39:50 +02:00
Laurent Destailleur
295c2b1d17 FIX #yogosha4435 2020-09-16 17:56:26 +02:00
jove@bisquerra.com
e55c16c039 NEW Weighing Scale compatibility with TakePOS connector 2020-09-13 21:12:14 +02:00
Scrutinizer Auto-Fixer
c263c8a76c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-08 19:27:28 +00:00
Laurent Destailleur
c91338198d Add some fields in candidature 
Look and feel v13
 2020-09-08 01:53:37 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-07 08:18:17 +00:00
Laurent Destailleur
54c1be3717 Merge pull request #14560 from ptibogxiv/patch-349 
NEW display resiliate status in takepos for member
 2020-08-31 16:16:39 +02:00
Laurent Destailleur
d11d02a23a Merge pull request #14586 from ptibogxiv/patch-353 
NEW change thirdparty with barcode scan in takepos
 2020-08-31 16:15:59 +02:00
stickler-ci
59542cfbcd Fixing style errors. 2020-08-30 07:41:57 +00:00
jove@bisquerra.com
862c55ea07 NEW Keep takepos terminal when login/logout 2020-08-30 09:19:35 +02:00
stickler-ci
e18b85ea87 Fixing style errors. 2020-08-29 14:08:42 +00:00
ptibogxiv
d3024fdd1c Update index.php 2020-08-29 16:07:01 +02:00
ptibogxiv
a963d6c0fc NEW change thirdparty with barcode scan in takepos 2020-08-29 16:05:14 +02:00
ptibogxiv
6eeb1d3a96 Update invoice.php 2020-08-29 13:36:52 +02:00
Laurent Destailleur
4ecd15b7ab Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/main.lang
 2020-08-27 21:57:42 +02:00
Laurent Destailleur
5c1680e9c5 Merge branch 'develop' into master 2020-08-27 19:58:29 +02:00
stickler-ci
eecab28203 Fixing style errors. 2020-08-26 10:22:33 +00:00
ptibogxiv
989130c0ad Update invoice.php 2020-08-26 12:20:49 +02:00
ptibogxiv
76e276e8e8 Update invoice.php 2020-08-26 12:00:45 +02:00
stickler-ci
32ecf4dd9a Fixing style errors. 2020-08-26 09:46:49 +00:00
ptibogxiv
66cdb1dad0 NEW display resiliate status in takepos for member 2020-08-26 11:44:35 +02:00
ptibogxiv
ff621cb146 Update pay.php 2020-08-24 12:27:19 +02:00
ptibogxiv
9da4946955 Fix for better code 2020-08-24 12:26:40 +02:00
andreubisquerra
915aa56a95 Change variable to pos_change 2020-08-23 22:29:55 +02:00
andreubisquerra
8f933c324a Change variable to pos_change 2020-08-23 22:28:26 +02:00
Laurent Destailleur
c784c002fd Merge pull request #14517 from aspangaro/13.0_a5 
Some fix on complete_head_from_modules
 2020-08-23 18:09:15 +02:00
andreubisquerra
e8c8cb53cb Fix travis 2020-08-22 18:45:54 +02:00
jove@bisquerra.com
d9cbd8f998 NEW: Print payment method and change in TakePOS 2020-08-22 18:28:15 +02:00
Alexandre SPANGARO
f1f579ad67 Some fix on complete_head_from_modules 2020-08-20 22:17:34 +02:00
Laurent Destailleur
25dfd32e0b Merge pull request #14456 from andreubisquerra/master 
NEW: Delayed payment in TakePOS
 2020-08-19 14:36:34 +02:00
Laurent Destailleur
ea478721e7 Update invoice.php 2020-08-19 14:36:03 +02:00
Laurent Destailleur
f57f729d40 Update invoice.php 2020-08-19 14:35:15 +02:00
Laurent Destailleur
1d18c83439 Merge pull request #14463 from andreubisquerra/develop 
Avoid empty sales and orders when all lines are removed.
 2020-08-14 02:48:48 +02:00
Laurent Destailleur
7ce1d36b59 FIX Category for suplements not saved 2020-08-13 13:51:08 +02:00
Laurent Destailleur
88c07e86ad Organization of setup for Takepos bar features 2020-08-13 13:46:53 +02:00
andreubisquerra
8c5a86cb72 Avoid empty sales and orders when all lines are removed. 2020-08-12 07:07:18 +02:00
jove@bisquerra.com
3be723f3a1 NEW: Delayed payment in TakePOS 2020-08-11 07:49:54 +02:00
Laurent Destailleur
6fd433167f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/CMailFile.class.php
 2020-08-07 11:59:55 +02:00
jove@bisquerra.com
022fb23cee FIX: Get some taxes in TakePOS 2020-08-07 10:01:11 +02:00
Laurent Destailleur
01babc452c More logs 2020-08-06 03:52:49 +02:00
andreubisquerra
0347f2a46b More elegant 2020-08-04 08:19:27 +02:00
jove@bisquerra.com
6d957c276c Improving TakePOS search informing the user if there is no record or clearing the box if it exists avoiding manually clear every scan 2020-08-04 08:11:44 +02:00
Laurent Destailleur
be34a2c607 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/cashdesk.lang
	htdocs/product/stock/list.php
 2020-08-02 16:06:51 +02:00
jove@bisquerra.com
593c7242c4 NEW: TakePOS Gift Receipt 2020-08-02 11:13:41 +02:00
Laurent Destailleur
0b46fcb4f8 Debug 2020-07-31 14:02:08 +02:00
Laurent Destailleur
0d71cd4279 Fix td not closed 2020-07-31 13:51:49 +02:00
Laurent Destailleur
255dc71823 Missing translation 2020-07-31 13:20:05 +02:00
Laurent Destailleur
cb5577826d Look and feel v13 2020-07-07 03:50:14 +02:00
Laurent Destailleur
83eaddb17b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/evalmath.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/install/mysql/migration/11.0.0-12.0.0.sql
	htdocs/langs/en_US/cashdesk.lang
	htdocs/societe/class/societe.class.php
 2020-07-04 13:13:17 +02:00
andreubisquerra
452cca503a Fixes 2020-07-02 00:11:17 +02:00