Commit Graph

112767 Commits

Author SHA1 Message Date
atm-florian
f01cb3bd9a NEW 15.0: when creating an intervention from an object, replicate the object's extrafields if they have the same name
(snipped copy-pasted from facture/card.php)
2021-11-12 15:00:03 +01:00
Laurent Destailleur
e113fe468f Clean code 2021-11-12 14:57:36 +01:00
Laurent Destailleur
715a65eab2 Clean code for md theme 2021-11-12 13:33:59 +01:00
stickler-ci
daadcf2fc3 Fixing style errors. 2021-11-12 12:23:40 +00:00
Regis Houssin
9e5a20545d FIX dolGetLdapPasswordHash use your own random salt 2021-11-12 13:23:11 +01: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
Regis Houssin
7324375caa FIX missing rename function 2021-11-12 13:15:40 +01:00
Regis Houssin
1169ae551f FIX remove debug 2021-11-12 13:12:49 +01:00
Regis Houssin
968ffbcef0 FIX add ldap hash algo 2021-11-12 13:06:41 +01:00
Yaacov Akiba Slama
de435576a9 Allow WithdrawMode to be imported 2021-11-12 12:46:37 +02:00
Yaacov Akiba Slama
5c8d91ba6c BankAccountNumber is not required.
The IBAN can contain all the needed information. So there is no reason for
the account number to be required
2021-11-12 12:46:18 +02:00
stickler-ci
dbcdf8aaa3 Fixing style errors. 2021-11-12 10:22:46 +00:00
ptibogxiv
bd125910ab
NEW stripe element with more gateways 2021-11-12 11:18:30 +01:00
Laurent Destailleur
3b21fc2d37 Better way to report value of stock when PRODUIT_MULTIPRICES is on 2021-11-12 10:50:19 +01:00
Regis Houssin
084a3f48c1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
fix_add_ldap_hash_type_select
2021-11-12 10:10:04 +01:00
Frédéric FRANCE
67d6ada23c
Merge branch 'Dolibarr:develop' into patch-5 2021-11-11 20:12:56 +01:00
Frédéric FRANCE
cde4e48849
Merge branch 'Dolibarr:develop' into addtranslations 2021-11-11 20:12:20 +01:00
daraelmin
53b565ec1d
Fix date_select go away when sorting subscription 2021-11-11 20:06:21 +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
Frédéric FRANCE
fd1585eda0
add load langs 2021-11-11 18:23:34 +01:00
Laurent Destailleur
aab9c2e6ca Fix #yogosha7605 2021-11-11 18:20:31 +01:00
andreubisquerra
e98cfb3ef1
FIX Save TakePOS credit note as a pos sale 2021-11-11 18:02:56 +01:00
Regis Houssin
5eff0e7a0c FIX only a superadmin can modify entity 2021-11-11 17:48:23 +01:00
Regis Houssin
564badc61b Merge remote-tracking branch 'origin/14.0' into fix_lost_superadmin_grade_after_edit_user 2021-11-11 17:23:55 +01:00
Frédéric FRANCE
c245e4b388
Merge remote-tracking branch 'upstream/develop' into patch-5 2021-11-11 17:18:50 +01:00
Laurent Destailleur
0021381201 Fix #yogosha7605 2021-11-11 17:08:35 +01:00
Frédéric FRANCE
38d3b9ca71
fix regex 2021-11-11 16:54:20 +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