Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
108,088 Commits 36 Branches 189 Tags
cb15a21e41f9af36d14247fbb3f5da8ff4c05588
Commit Graph

137 Commits

Author SHA1 Message Date
Laurent Destailleur
d891dd8ddc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/stocks.lang
	htdocs/product/stats/card.php
	htdocs/projet/element.php
	htdocs/salaries/card.php
 2021-10-31 16:19:10 +01:00
Laurent Destailleur
da4fe03be7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/html.formticket.class.php
	htdocs/ticket/card.php
 2021-10-31 14:37:33 +01:00
Laurent Destailleur
ca8dab36a3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/class/html.formticket.class.php
	htdocs/core/modules/modAdherent.class.php
	htdocs/core/modules/modProjet.class.php
 2021-10-31 14:33:44 +01:00
Ferran Marcet
1336d3e791 Fix: Import don't work if extrafield is separator 2021-10-29 12:25:50 +02:00
Laurent Destailleur
d1794d7948 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modAdherent.class.php
 2021-10-28 11:05:38 +02:00
Laurent Destailleur
41bba0e879 Fix import of members 2021-10-28 00:12:41 +02:00
Laurent Destailleur
4bde20dd8d Can make update during import of members 2021-10-27 09:23:03 +02:00
Laurent Destailleur
2436f0967b Fix translation of Nature of member in import. 2021-10-26 14:37:15 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
931f712c5f Fix import gender man/woman, not 0/1 + import of thirdparty for members 2021-08-26 11:55:22 +02:00
Laurent Destailleur
ac2fc9c57f Fix import gender man/woman, not 0/1 + import of thirdparty for members 2021-08-26 11:53:57 +02:00
Laurent Destailleur
9900429fd0 Merge pull request #16889 from frederic34/adherent_to_member 
rename files from adherent to member
 2021-03-20 20:37:44 +01:00
Frédéric FRANCE
f6e7285949 rename files from adherent to member 2021-03-20 19:06:15 +01:00
Alexandre SPANGARO
3669c374c2 Uniformize information on modules 2021-03-20 13:55:43 +01:00
Frédéric FRANCE
7183bfeb94 fix new boxes add 2021-03-19 09:15:35 +01:00
Frédéric FRANCE
d68de8617b new box replace 2021-03-02 22:00:09 +01:00
Frédéric FRANCE
742c12f9d6 rename new boxes 2021-03-02 20:58:21 +01:00
Frédéric FRANCE
6cf8a46095 Merge remote-tracking branch 'upstream/develop' into boxindex 2021-03-02 20:41:01 +01:00
Frédéric FRANCE
a4e25359e7 add missing rule 2021-03-01 20:37:16 +01:00
Frédéric FRANCE
8c45137b37 Merge remote-tracking branch 'upstream/develop' into boxindex 2021-03-01 12:55:45 +01:00
Frédéric FRANCE
554e449e40 code syntax core directory 2021-02-23 22:03:23 +01:00
Frédéric FRANCE
7860ffa28e update phpmin version 2021-02-06 13:48:31 +01:00
Frédéric FRANCE
dc6c1b8d3b boxes 2021-01-02 22:12:19 +01:00
Frédéric FRANCE
96fbee5eaf transform into box 2021-01-02 21:01:47 +01:00
Frédéric FRANCE
4ca3c0aa95 Add odt for members 2020-11-14 00:48:13 +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
62a2469c71 Fix position of modules 2020-05-02 00:41:27 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Laurent Destailleur
9d9364256b More picto using fontawesome. 2020-04-07 16:45:08 +02:00
Scrutinizer Auto-Fixer
b40ecc3933 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:37:08 +00:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
ptibogxiv
30b929c621 Update modAdherent.class.php 2019-08-23 13:57:22 +02:00
Laurent Destailleur
ad4bd05efb Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/modules/modAdherent.class.php
 2019-06-21 11:29:06 +02:00
Laurent Destailleur
c725db166d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-21 11:26:44 +02:00
Laurent Destailleur
70c950bd7c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/modules/modAdherent.class.php
 2019-06-21 11:26:25 +02:00
Laurent Destailleur
9093be2f0a FIX Add missing end date of subscription in export 2019-06-21 11:23:49 +02:00
Philippe GRAND
b154ae752a update comments 2019-04-01 09:43:07 +02:00
Philippe GRAND
e8e5e5cfb9 update comments 2019-04-01 09:42:01 +02:00
Philippe GRAND
e2c5c49c52 update comments 2019-04-01 09:40:50 +02:00
Philippe GRAND
2b41e9166d update comments 2019-04-01 09:39:22 +02:00
Philippe GRAND
eb901e7c4e update comments 2019-04-01 09:38:23 +02:00
Philippe GRAND
46488f6a0c update comments 2019-04-01 09:36:52 +02:00
Frédéric FRANCE
5016bc7188 wip 2019-02-26 21:48:21 +01:00
Frédéric FRANCE
e6c3eb0ba1 wip 2019-02-26 21:13:07 +01:00
Frédéric FRANCE
915841eeb9 wip 2019-02-25 22:50:19 +01:00
Frédéric FRANCE
1c07006015 wip 2019-02-25 21:36:27 +01:00
Laurent Destailleur
e6e18ff616 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/menus/edit.php
	htdocs/product/stock/card.php
	htdocs/product/stock/info.php
	htdocs/product/stock/movement_list.php
 2019-02-14 15:33:17 +01:00
Laurent Destailleur
89050da856 Merge 2019-02-14 15:27:31 +01:00
Regis Houssin
359318392f FIX missing entity filter in function "build_filterField()" (export) 2019-02-14 10:47:07 +01:00
Laurent Destailleur
648eea3a70 Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00