2
0
forked from Wavyzz/dolibarr
Commit Graph

5507 Commits

Author SHA1 Message Date
Hystepik
ecb5a3b028 Merge branch 'develop' into develop#3 2020-12-03 10:12:19 +01:00
Laurent Destailleur
46171a6ec8 Fix option MAIN_USE_COMPANY_NAME_OF_CONTACT 2020-12-02 21:27:15 +01:00
Laurent Destailleur
bc1dc1e9f0 FIX #15590 manually 2020-12-02 19:34:04 +01:00
lmarcouiller
c7a31b2458 new widget funnel of prospection 2020-12-02 14:42:56 +01:00
Laurent Destailleur
c8274f13eb Merge pull request #15582 from Hystepik/develop
Close #15307 New Widget : Encours dépassé
2020-12-02 14:01:50 +01:00
lmarcouiller
6b5125fed0 dev widget state_board, add in user class and clean index 2020-12-01 14:50:12 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-12-01 01:41:19 +00:00
Laurent Destailleur
fc91e70e47 Update modFacture.class.php 2020-11-30 18:37:07 +01:00
Laurent Destailleur
00ad6df395 Fight against $_POST 2020-11-30 14:47:07 +01:00
lmarcouiller
00dca7ff9b NEW : Encours dépassé #15307 2020-11-30 13:01:45 +01:00
Laurent Destailleur
8eacbaaf5f Merge pull request #15570 from frederic34/strike
simplify function
2020-11-29 19:10:06 +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
beafcc7853 Fix warning 2020-11-29 16:06:03 +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
147a12a922 Fix warning 2020-11-28 15:02:05 +01:00
Laurent Destailleur
df461d319e Fix warning 2020-11-28 02:12:07 +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
4a5cdd0092 Several fixes in export and repair tool 2020-11-27 15:27:35 +01:00
Laurent Destailleur
250b42f60a Fix phpcs 2020-11-27 00:37:36 +01:00
Laurent Destailleur
9aa657bc35 Debug v13 2020-11-26 18:48:51 +01:00
Laurent Destailleur
5d0a54c0de Fix var not defined 2020-11-26 12:07:01 +01:00
Laurent Destailleur
74605cec12 Fix warning 2020-11-25 18:07:52 +01:00
Laurent Destailleur
d17ecbeccd Fix #15438 2020-11-24 20:56:11 +01:00
Laurent Destailleur
bd0236edeb Fix #15438 2020-11-24 20:53:42 +01:00
Laurent Destailleur
cf82581a2a Move module to experimental 2020-11-24 14:06:02 +01:00
Laurent Destailleur
af2eabb24d Fix warning 2020-11-22 15:06:53 +01:00
Laurent Destailleur
3d2da45f84 Remove warning 2020-11-22 11:36:07 +01:00
Laurent Destailleur
3534555909 Fix setup of scheduled jobs 2020-11-21 14:14:53 +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
Frédéric FRANCE
bf390ceb4d Update doc_generic_member_odt.class.php 2020-11-17 11:56:11 +01:00
Frédéric FRANCE
fcfd630f84 Update doc_generic_user_odt.modules.php 2020-11-17 11:55:05 +01:00
Laurent Destailleur
6c42535eb2 Maxi debug v13 2020-11-16 12:20:18 +01:00
Frédéric FRANCE
d114c56672 add a tag which list all other tags in odt user 2020-11-15 23:49:16 +01:00
Laurent Destailleur
8e87729040 Merge pull request #15416 from frederic34/patch-25
doxygen
2020-11-15 17:06:34 +01:00
Laurent Destailleur
acfee5a0e1 Merge pull request #15415 from frederic34/patch-24
doxygen
2020-11-15 17:05:55 +01:00
Laurent Destailleur
041de0843a Merge pull request #15414 from frederic34/patch-23
doxygen
2020-11-15 17:05:39 +01:00
Laurent Destailleur
27f3287ac4 Merge pull request #15413 from frederic34/patch-22
doxygen
2020-11-15 17:05:22 +01:00
Laurent Destailleur
c4094357c2 Merge pull request #15412 from frederic34/patch-21
doxygen
2020-11-15 17:05:03 +01:00
Laurent Destailleur
a1bdce06f5 Merge pull request #15411 from frederic34/patch-20
doxygen
2020-11-15 17:04:45 +01:00
Laurent Destailleur
db357da9a7 Merge pull request #15410 from frederic34/patch-19
doxygen
2020-11-15 17:04:17 +01:00
Laurent Destailleur
31c73403c0 Update pdf_eratosthene.modules.php 2020-11-15 17:04:07 +01:00
Laurent Destailleur
d0cf558604 Merge pull request #15409 from frederic34/patch-18
doxygen
2020-11-15 17:02:54 +01:00
Laurent Destailleur
ed6204183d Merge pull request #15408 from frederic34/patch-17
doxygen
2020-11-15 17:00:54 +01:00
Laurent Destailleur
011e786996 Update pdf_sepamandate.modules.php 2020-11-15 17:00:37 +01:00