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

79 Commits

Author SHA1 Message Date
Laurent Destailleur
ef70777cf1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/reception/card.php
 2022-01-28 15:57:09 +01:00
Laurent Destailleur
60fff852ab Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-01-26 12:53:06 +01:00
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
ffc07efb64 Look and feel v15 2021-10-28 14:28:24 +02:00
Laurent Destailleur
db6c793044 Text in english 2021-10-21 22:31:51 +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
stickler-ci
bcab8d5164 Fixing style errors. 2021-04-14 07:49:18 +00:00
Adrien Raze
c83819bd90 NEW : Add possibility to exports userGroups fields on user exports 2021-04-14 09:44:01 +02:00
Alexandre SPANGARO
3669c374c2 Uniformize information on modules 2021-03-20 13:55:43 +01:00
Frédéric FRANCE
a4e25359e7 add missing rule 2021-03-01 20:37:16 +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
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
754a9778ea Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/modUser.class.php
 2020-11-12 14:17:10 +01:00
Laurent Destailleur
02158928cc FIX #15365 export of extrafields for user and resources 2020-11-12 14:11:59 +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
5c31593d43 Add date of birth in candidatures 2020-09-16 00:47:44 +02:00
Laurent Destailleur
7931734ecb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modUser.class.php
 2020-02-12 20:30:20 +01:00
Laurent Destailleur
cc6313cdf3 Fix import examples 2020-02-11 19:32:27 +01:00
Scrutinizer Auto-Fixer
8744f6ab7b Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-18 15:17:07 +00:00
Laurent Destailleur
a68da82bec Code comment of export 2020-01-15 20:11:04 +01:00
Laurent Destailleur
9a08a6bf6d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/categories/traduction.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contact/card.php
	htdocs/core/modules/modSociete.class.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/langs/en_US/products.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
	htdocs/margin/tabs/thirdpartyMargins.php
 2019-12-23 14:13:26 +01:00
Alexandre SPANGARO
3fb72c349f Fix language traduction on import/export tools 2019-12-18 03:25:19 +01:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
f9095408b6 Fix sort order of export profiles 
Add missing pos information into export of invoice
Add missing label of project in export of invoice
 2019-06-21 13:25:40 +02:00
Maxime Kohlhaas
e090cd6f87 New box birthdays of the month 2019-03-17 16:55:26 +01:00
Frédéric FRANCE
1c07006015 wip 2019-02-25 21:36:27 +01:00
Frédéric FRANCE
f5b2cf75f2 Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-02-01 18:31:44 +01:00
Laurent Destailleur
eb3621839a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/members.lang
	htdocs/langs/fr_FR/members.lang
 2019-02-01 15:14:19 +01:00
Laurent Destailleur
4254ad0d33 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-31 15:51:54 +01:00
Laurent Destailleur
14dea53700 FIX Missing field in import/export of users 2019-01-31 15:51:02 +01:00
Frédéric FRANCE
b10558bacd Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Frédéric FRANCE
f0cdf300d1 Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
7ee086b402 PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Laurent Destailleur
6d84036f66 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/contact/list.php
	htdocs/core/class/html.form.class.php
	htdocs/expensereport/card.php
	htdocs/install/doctemplates/shipment/template_shipment.odt
	htdocs/public/payment/newpayment.php
 2018-12-01 19:23:06 +01:00
Laurent Destailleur
cb9ada2119 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/product/price.php
 2018-12-01 18:19:45 +01:00
Maxime Kohlhaas
5dcb3d2a1f Fix extrafields in import tool 2018-11-30 19:23:05 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Laurent Destailleur
e24117e75b Fix position of modules is string on 2 digits 2018-10-06 11:57:53 +02:00
Frédéric FRANCE
b03f4004ea PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Philippe GRAND
72adc485f0 Docs : Update and complete 2018-07-10 22:32:55 +02:00
Frédéric FRANCE
e2a557aadd limit length of lines to 500 chars 2018-05-27 15:04:12 +02:00
Laurent Destailleur
029ef534d0 Clean deprecated code (property "special" removed from mod descriptor) 2018-02-25 10:55:02 +01:00
Laurent Destailleur
95cb5025a2 Fix length of month too large 
More complete template
 2017-12-08 16:15:41 +01:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Laurent Destailleur
e97e202deb NEW Can import users 2017-04-17 04:22:53 +02:00