Laurent Destailleur
|
7634212811
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/system/phpinfo.php
htdocs/commande/stats/index.php
htdocs/compta/facture/stats/index.php
|
2020-11-29 21:35:03 +01:00 |
|
Laurent Destailleur
|
58eaef37d2
|
Fix regression
|
2020-11-29 21:29:22 +01:00 |
|
Laurent Destailleur
|
d3a2aa664f
|
FIX #15572
|
2020-11-29 20:27:40 +01:00 |
|
Laurent Destailleur
|
404634919d
|
Look and feel v13
|
2020-11-29 15:47:08 +01:00 |
|
Laurent Destailleur
|
6c65ebef0d
|
Look and feel v13
|
2020-11-29 15:16:53 +01:00 |
|
Laurent Destailleur
|
574919de52
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
.travis.yml
htdocs/accountancy/bookkeeping/balance.php
htdocs/adherents/class/subscription.class.php
htdocs/compta/bank/categ.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/class/interfaces.class.php
htdocs/core/lib/project.lib.php
htdocs/core/modules/modCategorie.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/install/repair.php
htdocs/main.inc.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
htdocs/reception/card.php
|
2020-11-27 15:45:12 +01:00 |
|
Laurent Destailleur
|
ac3c129735
|
Clean code
|
2020-11-27 14:24:15 +01:00 |
|
Laurent Destailleur
|
47a5037155
|
Fix dolGetFirstLastname() for 4 and 5
|
2020-11-27 01:18:01 +01:00 |
|
Laurent Destailleur
|
b3b511a6d4
|
FIX #15546
|
2020-11-26 22:44:11 +01:00 |
|
Laurent Destailleur
|
47ca74965b
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-11-24 12:26:50 +01:00 |
|
Laurent Destailleur
|
817de18a5d
|
Fix remove log
|
2020-11-24 12:25:32 +01:00 |
|
Laurent Destailleur
|
81566289cd
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
|
2020-11-24 11:07:35 +01:00 |
|
Laurent Destailleur
|
53208e620e
|
Use of . as thousand separator. Can use it for decimal if not 3 digits.
|
2020-11-24 10:56:05 +01:00 |
|
Laurent Destailleur
|
1e70790cd6
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/price.php
|
2020-11-23 19:55:13 +01:00 |
|
Laurent Destailleur
|
c5278197fb
|
More phpunit test for price2num
|
2020-11-23 19:45:11 +01:00 |
|
Laurent Destailleur
|
e5e320fd90
|
Fix null
|
2020-11-22 01:26:58 +01:00 |
|
Laurent Destailleur
|
9004be1df2
|
Debug feature to send remind by email
|
2020-11-21 17:42:07 +01:00 |
|
Laurent Destailleur
|
aa7383f3d4
|
Fix warning
|
2020-11-19 18:15:40 +01:00 |
|
Laurent Destailleur
|
0760a268f6
|
Fix warning
|
2020-11-18 22:25:03 +01:00 |
|
Laurent Destailleur
|
95460e6372
|
Merge pull request #15422 from frederic34/patch-10
add optional tag which list all other tags in odt substitutions
|
2020-11-18 12:44:25 +01:00 |
|
Laurent Destailleur
|
2529448f1b
|
Fix path to files
|
2020-11-18 12:37:18 +01:00 |
|
Laurent Destailleur
|
3e4c6b9222
|
Fix warning
|
2020-11-17 13:13:11 +01:00 |
|
Frédéric FRANCE
|
3b1f50d5fc
|
Update functions.lib.php
|
2020-11-17 11:58:11 +01:00 |
|
Frédéric FRANCE
|
fb5385180f
|
Update functions.lib.php
|
2020-11-17 11:54:18 +01:00 |
|
Laurent Destailleur
|
6bbeb6d3a0
|
Fix debug creation of shipment with virtual product.
|
2020-11-16 16:31:05 +01:00 |
|
Laurent Destailleur
|
ca02ac9e45
|
Remove warning for php8
|
2020-11-16 13:00:18 +01:00 |
|
Laurent Destailleur
|
64428f34a0
|
Fix error message
|
2020-11-11 05:04:15 +01:00 |
|
Laurent Destailleur
|
617da2ec5f
|
Fix error message
|
2020-11-11 04:55:44 +01:00 |
|
Laurent Destailleur
|
da6c6c9e0a
|
Clean code
|
2020-11-08 14:39:20 +01:00 |
|
Laurent Destailleur
|
a313c35f5b
|
Fix php8
|
2020-11-05 11:29:23 +01:00 |
|
Frédéric FRANCE
|
7c7a1b5512
|
Update functions.lib.php
|
2020-11-04 09:45:02 +01:00 |
|
Laurent Destailleur
|
b0e2d40533
|
Debug and fix v13
|
2020-11-03 14:19:54 +01:00 |
|
Laurent Destailleur
|
83a7b19333
|
Look and feel v13
|
2020-11-02 11:41:07 +01:00 |
|
Scrutinizer Auto-Fixer
|
ab25e047c0
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-31 17:51:30 +00:00 |
|
Laurent Destailleur
|
e5a5f37b3f
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/langs/en_US/bills.lang
|
2020-10-31 15:09:26 +01:00 |
|
Laurent Destailleur
|
41b938047d
|
Fix doc
|
2020-10-31 14:51:32 +01:00 |
|
Scrutinizer Auto-Fixer
|
7f52920716
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-31 13:32:18 +00:00 |
|
Laurent Destailleur
|
9113ecedfa
|
code comment
|
2020-10-31 12:55:26 +01:00 |
|
Laurent Destailleur
|
623cb54480
|
Prepare a more complete fix for #15016
|
2020-10-31 12:30:47 +01:00 |
|
Laurent Destailleur
|
a24071492e
|
Start fix for php8 compatibility
|
2020-10-30 05:56:07 +01:00 |
|
Frédéric FRANCE
|
991273bd10
|
Update functions.lib.php
|
2020-10-27 20:44:17 +01:00 |
|
Frédéric FRANCE
|
7d30a11a26
|
Update functions.lib.php
|
2020-10-27 20:06:49 +01:00 |
|
Scrutinizer Auto-Fixer
|
a2a9c51e50
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-27 18:46:07 +00:00 |
|
Frédéric FRANCE
|
5a3780e062
|
end of dol_fiche_end
|
2020-10-27 18:19:31 +01:00 |
|
Laurent Destailleur
|
4adaf67d47
|
Hide setup we don't need if email are disabled globally
CSS
|
2020-10-27 11:40:30 +01:00 |
|
Laurent Destailleur
|
313273f462
|
Doc
|
2020-10-27 02:19:43 +01:00 |
|
Laurent Destailleur
|
a8fccc67ba
|
Merge pull request #15148 from frederic34/patch-6
doxygen
|
2020-10-26 19:28:11 +01:00 |
|
Laurent Destailleur
|
cd4d738a56
|
Merge branch 'translateModLivraison2ModDelivery' of
https://github.com/orebd/dolibarr into develop
# Conflicts:
# htdocs/install/mysql/migration/12.0.0-13.0.0.sql
|
2020-10-25 16:01:18 +01:00 |
|
Frédéric FRANCE
|
1f4bd8476b
|
doxygen
|
2020-10-25 15:42:15 +01:00 |
|
Laurent Destailleur
|
4d9c8e2225
|
Merge pull request #15124 from frederic34/retrieve
retrieve the spelling
|
2020-10-25 14:48:51 +01:00 |
|