stickler-ci
|
daadcf2fc3
|
Fixing style errors.
|
2021-11-12 12:23:40 +00:00 |
|
ptibogxiv
|
97d2722c4c
|
Update stripe.php
|
2021-11-12 13:21:40 +01:00 |
|
ptibogxiv
|
991c1b4f13
|
ADD Klarna provider with Stripe
|
2021-11-12 13:20:58 +01:00 |
|
Laurent Destailleur
|
0837243ca0
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-11-11 19:07:32 +01:00 |
|
Laurent Destailleur
|
21c2dba922
|
Fix phpcs
|
2021-11-11 19:06:55 +01:00 |
|
Laurent Destailleur
|
a755c7ba51
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-11-11 18:34:41 +01:00 |
|
Laurent Destailleur
|
f5a7275077
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
htdocs/takepos/index.php
|
2021-11-11 18:34:04 +01:00 |
|
Laurent Destailleur
|
a725ffefdd
|
Fix sql error
|
2021-11-11 18:30:17 +01:00 |
|
Laurent Destailleur
|
aab9c2e6ca
|
Fix #yogosha7605
|
2021-11-11 18:20:31 +01:00 |
|
Laurent Destailleur
|
0021381201
|
Fix #yogosha7605
|
2021-11-11 17:08:35 +01:00 |
|
Laurent Destailleur
|
fd74e33ef1
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/takepos/index.php
|
2021-11-11 16:19:01 +01:00 |
|
Laurent Destailleur
|
ddad00c8e4
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
htdocs/takepos/index.php
|
2021-11-11 16:14:48 +01:00 |
|
Laurent Destailleur
|
f24c38db73
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/datapolicy/class/datapolicy.class.php
htdocs/takepos/index.php
|
2021-11-11 16:06:21 +01:00 |
|
Laurent Destailleur
|
e188855dca
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/datapolicy/class/datapolicy.class.php
|
2021-11-11 16:01:37 +01:00 |
|
Laurent Destailleur
|
9aa5c94612
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2021-11-11 15:59:48 +01:00 |
|
Laurent Destailleur
|
ba724204a4
|
FIX Bad use of dol_concatdesc()
|
2021-11-11 15:50:32 +01:00 |
|
Laurent Destailleur
|
83b8f329ca
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-11-11 15:37:09 +01:00 |
|
Laurent Destailleur
|
88d8f73614
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
|
2021-11-11 15:36:00 +01:00 |
|
Laurent Destailleur
|
fa4b5d99c0
|
FIX Bad use of dol_concatdesc()
|
2021-11-11 15:35:34 +01:00 |
|
Laurent Destailleur
|
06f378db18
|
FIX Bad use of dol_concatdesc()
|
2021-11-11 15:31:19 +01:00 |
|
Laurent Destailleur
|
436dbcd81d
|
Shorter pdf label
|
2021-11-11 15:22:54 +01:00 |
|
Laurent Destailleur
|
c5f3f42867
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-11-11 15:13:39 +01:00 |
|
Laurent Destailleur
|
66f1dd8545
|
Fix avoid too large PDF
|
2021-11-11 15:12:31 +01:00 |
|
Laurent Destailleur
|
e46e622049
|
Merge pull request #19349 from BitKFu/total_discount
Added -Propal- as a missing class name to the commondocgenerator.class.php
|
2021-11-11 15:03:02 +01:00 |
|
Laurent Destailleur
|
c6ecf87a8a
|
Update commondocgenerator.class.php
|
2021-11-11 15:02:51 +01:00 |
|
Laurent Destailleur
|
da2f3e7b40
|
Code comment
|
2021-11-11 14:55:59 +01:00 |
|
Laurent Destailleur
|
8518c772fb
|
Merge pull request #19343 from OPEN-DSI/fix-takepos-report-terminal
FIX close cash with some terminals in TakePOS
|
2021-11-11 14:42:12 +01:00 |
|
Laurent Destailleur
|
a4344a7ec5
|
Merge pull request #19337 from marc-dll/13.0_FIX_project_task_list_extrafields
FIX: project task list: extrafields could not be displayed
|
2021-11-11 14:41:56 +01:00 |
|
Laurent Destailleur
|
917ceec027
|
Merge pull request #19336 from grandoc/new_branch_08_11_2021
fixes to be pure markdown
|
2021-11-11 14:40:19 +01:00 |
|
Laurent Destailleur
|
32185beec5
|
Merge pull request #19338 from aspangaro/15a30
GNU version 3
|
2021-11-11 14:39:43 +01:00 |
|
Laurent Destailleur
|
8997368e76
|
Merge pull request #19347 from frederic34/patch-1
error display
|
2021-11-11 14:39:06 +01:00 |
|
Laurent Destailleur
|
0665dac594
|
Merge pull request #19348 from ptibogxiv/patch-449
FIX bug if multicompany disabled
|
2021-11-11 14:38:28 +01:00 |
|
Laurent Destailleur
|
920745175c
|
Merge pull request #19353 from cfoellmann/PR/fix-supprop-docperm
fix permission on supplier_order document upload
|
2021-11-11 14:38:04 +01:00 |
|
Laurent Destailleur
|
9cb094b466
|
Fix error method not defined
|
2021-11-11 14:37:25 +01:00 |
|
Laurent Destailleur
|
a3d2dcb97f
|
Merge pull request #19351 from cfoellmann/PR/block-massaction-delete
block deletion of items not free to delete (is_deletable)
|
2021-11-11 14:33:23 +01:00 |
|
Laurent Destailleur
|
aae83d248c
|
Merge pull request #19346 from daraelmin/14.0
Fix wrong sign in test
|
2021-11-11 14:29:56 +01:00 |
|
Laurent Destailleur
|
28aa17e4fd
|
FIX calculation of balance in conciliation page on desc sorting.
|
2021-11-11 14:27:17 +01:00 |
|
Laurent Destailleur
|
67baaeb5de
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-11-11 13:51:19 +01:00 |
|
Laurent Destailleur
|
0443302c3d
|
FIX calculation of balance in conciliation page on desc sorting.
|
2021-11-11 13:49:21 +01:00 |
|
Laurent Destailleur
|
fd3fd9d945
|
Fix getpost
|
2021-11-11 13:46:58 +01:00 |
|
Laurent Destailleur
|
bbd97c6e16
|
Code comment
|
2021-11-11 13:36:04 +01:00 |
|
Christian Foellmann
|
28e14ac336
|
fix permission on supplier_order document upload
|
2021-11-11 13:29:30 +01:00 |
|
Christian Foellmann
|
6a216e520f
|
block deletion of items not free to delete (is_deletable)
|
2021-11-11 11:06:05 +01:00 |
|
stickler-ci
|
7c5810dee6
|
Fixing style errors.
|
2021-11-10 14:19:14 +00:00 |
|
Gerhard Stephan
|
285bd67d90
|
Added -Propal- as a missing class name to the commondocgenerator.class.php
|
2021-11-10 15:16:36 +01:00 |
|
ptibogxiv
|
0afaf080ee
|
FIX bug if multicompany disabled
avoid bad constantes
|
2021-11-10 14:53:17 +01:00 |
|
Frédéric FRANCE
|
c9517db43b
|
Update cashdesk.lang
|
2021-11-10 12:26:28 +01:00 |
|
Frédéric FRANCE
|
06e6479a12
|
Update cashcontrol_card.php
|
2021-11-10 12:24:53 +01:00 |
|
Frédéric FRANCE
|
005254ad34
|
Update cashcontrol_card.php
|
2021-11-10 12:21:03 +01:00 |
|
Frédéric FRANCE
|
e5d40bf464
|
error display
|
2021-11-10 12:06:39 +01:00 |
|