lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
73,362 Commits 43 Branches 150 Tags 886 MiB
9.0
Commit Graph

1082 Commits

Author SHA1 Message Date
Laurent Destailleur
4a291f181f Fix regression 2020-07-29 13:47:04 +02:00
Laurent Destailleur
f8e8d15606 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-11-12 10:19:01 +01:00
Maxime Kohlhaas
fced9ec690 Fix missing contact fetch on card 2019-10-27 12:04:01 +01:00
Laurent Destailleur
f2088a084f Fix error management 2019-05-31 11:53:30 +02:00
Josep Lluís
60d3cced37 FIX: delete all contact categories 
Delete all contact categories is not necessary on contact card.
Current function setCategories will do it when necessary.

Conflicts:
	htdocs/contact/card.php
 2019-01-03 13:00:06 +01:00
Laurent Destailleur
5dabefe227 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-13 20:49:55 +01:00
Laurent Destailleur
4a61c1b6ed FIX lang not loaded 2018-12-11 13:25:09 +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
ATM John BOTELLA
474228cbd6 FIX #8741 2018-12-01 17:01:11 +01:00
Philippe GRAND
3df83d7cf3 fix scrutinizer issue : The variable seems only to be defined at a later point 2018-12-01 15:45:02 +01:00
Laurent Destailleur
1d2c2a23ef Fix look and feel v8 2018-11-25 11:57:19 +01:00
Laurent Destailleur
01e7b5747d FIX user param is null not 0 when not defined 
FIX properties email_xx were not set
 2018-11-12 15:27:59 +01:00
Laurent Destailleur
5a7cb95b72 FIX filter on entity must be done as soon as we don't search on rowid. 2018-11-12 14:49:08 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
b45ead7038
Merge pull request #9970 from OPEN-DSI/search-contact-by-town 
New Search Contact by Town
 2018-11-08 19:55:51 +01:00
François J
afdefa56bd New Search Contact by Town 
Adding the missing SQL condition to filter contact list by user requested town
 2018-11-07 15:34:07 +01:00
Laurent Destailleur
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
277655b911 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-24 13:31:31 +02:00
Laurent Destailleur
30a2004d53 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-10-24 13:30:54 +02:00
gauthier
036f70860e FIX : wrong occurence number of contract on contact card, we must only count externals 2018-10-24 10:17:21 +02:00
Philippe GRAND
9551cb12f5 Standardize and update code 2018-10-13 09:59:33 +02:00
Laurent Destailleur
ded5c4c3dd Social network module 2018-10-12 11:02:03 +02:00
Philippe GRAND
83db36f9b2 Standardize code 2018-10-06 12:11:48 +02:00
Laurent Destailleur
62b31df069 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/rssparser.class.php
	htdocs/langs/en_US/boxes.lang
 2018-09-27 12:55:25 +02:00
Laurent Destailleur
98b1e13ed7 Work on module socialnetworks 2018-09-26 16:55:46 +02:00
Laurent Destailleur
e39e54503e Fix responsive 2018-09-25 12:54:24 +02:00
Laurent Destailleur
ad6895aa2e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-24 10:23:09 +02:00
Laurent Destailleur
39e9029e41
Update contact.class.php 2018-09-23 15:44:44 +02:00
ptibogxiv
77dd516023
fix number mailing for a contact / multicompany 2018-09-22 14:45:15 +02:00
Frédéric FRANCE
a4fd8c4b75
reduce complexity of contact class 2018-09-16 19:19:45 +02:00
Frédéric FRANCE
987fdbe73c
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 21:29:41 +02:00
Frédéric FRANCE
f02b2f0239
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-09 13:35:58 +02:00
Frédéric FRANCE
a3fa13994b
replace select_date 2018-09-09 09:36:12 +02:00
Frédéric FRANCE
2b62c4ca8f
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-08 10:50:27 +02:00
Philippe GRAND
3c06527a7b Merge remote-tracking branch 'upstream/develop' into new_branch_03_09_2018 2018-09-06 09:50:12 +02:00
Frédéric FRANCE
4cbfa2073a
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-05 21:02:16 +02:00
Laurent Destailleur
4ac67e6409 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-05 20:31:10 +02:00
Frédéric FRANCE
4e619dd0ed
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-05 18:51:21 +02:00
Laurent Destailleur
51901108ad FIX #9412 2018-09-05 14:26:12 +02:00
Philippe GRAND
11d75573be Standardize and update code 2018-09-05 12:21:13 +02:00
Laurent Destailleur
ab8155f170 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php
 2018-09-04 21:35:43 +02:00
Laurent Destailleur
4a7bec2c04 Fix fax not required as visible by default on list 2018-09-04 09:48:30 +02:00
Frédéric FRANCE
2a9ef8dc05
move phpcs:ignore 2018-09-02 22:05:19 +02:00
Frédéric FRANCE
35232b753a
move phpcs:ignore 2018-09-02 20:37:12 +02:00
Frédéric FRANCE
61c4e9831f
move phpcs:ignore 2018-09-02 18:18:10 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00