Commit Graph

92152 Commits

Author SHA1 Message Date
Laurent Destailleur
8eacbaaf5f
Merge pull request #15570 from frederic34/strike
simplify function
2020-11-29 19:10:06 +01:00
Laurent Destailleur
1e5062a161
Merge pull request #15569 from frederic34/patch-8
doxygen
2020-11-29 19:08:41 +01:00
Laurent Destailleur
5ad1bb5b20
Merge pull request #15571 from frederic34/patch-14
Update mod_codecompta_aquarium.php
2020-11-29 19:08:29 +01:00
Laurent Destailleur
c963624f25 css 2020-11-29 18:53:19 +01:00
Laurent Destailleur
beafcc7853 Fix warning 2020-11-29 16:06:03 +01:00
Laurent Destailleur
150dd71774 Look and feel v13 2020-11-29 16:02:39 +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
Frédéric FRANCE
83c60d725a
Update mod_codecompta_aquarium.php 2020-11-28 23:45:32 +01:00
Frédéric FRANCE
3a041eed44
simplify function 2020-11-28 23:42:48 +01:00
Frédéric FRANCE
11a978ca08
simplify function 2020-11-28 23:41:44 +01:00
Frédéric FRANCE
eea9382b57
Update mod_codecompta_aquarium.php 2020-11-28 23:35:27 +01:00
Frédéric FRANCE
f9ef0f4d69 Update mod_codecompta_digitaria.php 2020-11-28 23:33:58 +01:00
Frédéric FRANCE
2f701f4889
Update mod_codecompta_aquarium.php 2020-11-28 23:24:13 +01:00
Frédéric FRANCE
fb871daf14
simplify function 2020-11-28 23:04:05 +01:00
Laurent Destailleur
e595f42a59 css 2020-11-28 19:34:28 +01:00
Laurent Destailleur
85a6a296c8 Fix links 2020-11-28 19:13:17 +01:00
Laurent Destailleur
fab9b3d50c Fix warning 2020-11-28 18:34:13 +01:00
Frédéric FRANCE
4f52cd38b4
doxygen 2020-11-28 17:07:08 +01:00
Laurent Destailleur
147a12a922 Fix warning 2020-11-28 15:02:05 +01:00
Laurent Destailleur
535cfea03d Exclude test 2020-11-28 14:49:59 +01:00
Laurent Destailleur
59b445a103 Clean dead code 2020-11-28 14:47:39 +01:00
Laurent Destailleur
41984f9934 Clean code 2020-11-28 14:00:35 +01:00
Laurent Destailleur
2989ff50fa Fix syntax error 2020-11-28 13:52:52 +01:00
Laurent Destailleur
6afe5919b9
Merge pull request #15563 from iouston/patch-14
Add PROPAL_ENABLE_NEGATIVE
2020-11-28 13:35:57 +01:00
Laurent Destailleur
2fd1838425 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-28 12:27:34 +01:00
Laurent Destailleur
c03f43d5f0
Merge pull request #15568 from ptibogxiv/patch-395
New get permissions for connected user by API
2020-11-28 12:16:07 +01:00
Laurent Destailleur
b1603ed1f5 Fix warning 2020-11-28 12:12:31 +01:00
stickler-ci
0b408b8012 Fixing style errors. 2020-11-28 09:32:02 +00:00
ptibogxiv
34894c15e0
New get permissions for connected user by API 2020-11-28 10:28:23 +01:00
Laurent Destailleur
5a6bdf9b5d experiment 2020-11-28 03:56:40 +01:00
Laurent Destailleur
9147c85d9f Fix size of roboto font 2020-11-28 03:35:32 +01:00
Laurent Destailleur
c85b349c93 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-28 03:32:41 +01:00
Laurent Destailleur
e4128bad80 Fix management of Robot font 2020-11-28 03:32:25 +01:00
Laurent Destailleur
fcf59180eb
Merge pull request #15541 from b92/patch-2
Use email model option to joint file for subscription
2020-11-28 02:27:07 +01:00
Laurent Destailleur
aa21af27db
Update subscription.php 2020-11-28 02:24:25 +01:00
Laurent Destailleur
be39e50214
Merge pull request #15567 from andreubisquerra/develop
Improve free entries printing in TakePOS
2020-11-28 02:19:14 +01:00
Laurent Destailleur
f7c4ad646f
Merge pull request #15561 from frederic34/addecmcard
doxygen
2020-11-28 02:14:34 +01:00
Laurent Destailleur
df461d319e Fix warning 2020-11-28 02:12:07 +01:00
Laurent Destailleur
7e6af6a54f FIX translation not loaded for error message of numbering modules 2020-11-28 02:09:27 +01:00
Laurent Destailleur
7c4599a5c5 Look and feel v13 2020-11-28 01:15:23 +01:00
Laurent Destailleur
1685b5396c Fix warning 2020-11-28 00:59:07 +01:00
andreubisquerra
c9c2869eec
Fix travis 2020-11-27 19:45:40 +01:00
andreubisquerra
c3bc662675
Improve free entries printing in TakePOS
Improve free entries printing with Receipt Printer module in TakePOS
2020-11-27 19:24:27 +01:00
Laurent Destailleur
4119174ef1 Include sql injection tests into PHPUnit 2020-11-27 16:52:52 +01:00
Laurent Destailleur
657749375f Avoid error 2020-11-27 16:47:13 +01:00
Laurent Destailleur
73790a0958 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/expedition/card.php
2020-11-27 16:21:32 +01:00
Laurent Destailleur
c6b2ee57ca Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	.travis.yml
2020-11-27 16:19:44 +01:00
Laurent Destailleur
5ed2bbb204 Fix error message 2020-11-27 16:13:27 +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