Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-04 16:12:39 +01:00
Code Issues Packages Projects Releases Wiki Activity
83,224 Commits 37 Branches 191 Tags
28fa0e4e5d26f1c43ac0dd5aef8bbbb79a2c1942
Commit Graph

895 Commits

Author SHA1 Message Date
Laurent Destailleur
92cd0372db Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/societe/class/societe.class.php
 2020-04-10 02:04:26 +02:00
Laurent Destailleur
a1e714f123 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/societe/class/societe.class.php
 2020-04-10 02:03:12 +02:00
Laurent Destailleur
c4d898e155 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/societe/class/societe.class.php
 2020-04-10 02:01:31 +02:00
Regis Houssin
34e434a17e FIX missing member entity 2020-04-06 16:36:11 +02:00
Laurent Destailleur
918e570e7a FIX Picture of contact not visible in tooltip 2020-02-10 12:56:08 +01:00
Laurent Destailleur
040f8bef5a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/societe/class/societe.class.php
 2020-01-22 16:29:04 +01:00
Laurent Destailleur
381f2d5eee Fix typo 2020-01-22 16:24:16 +01:00
Laurent Destailleur
7964699674 FIX Check on unicity on prof id was not triggered sometimes 2020-01-22 16:22:53 +01:00
Laurent Destailleur
d97a59ac4a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	ChangeLog
	htdocs/comm/remise.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
	htdocs/variants/combinations.php
 2020-01-10 14:25:26 +01:00
ptibogxiv
5a1f123994 Update societe.class.php 2020-01-07 13:10:10 +01:00
Scrutinizer Auto-Fixer
455178ff73 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-18 14:20:36 +00:00
stickler-ci
380b698c6f Fixing style errors. 2019-12-12 16:09:23 +00:00
Anthony Berton
43f150dc42 Update societe.class.php 2019-12-12 17:02:59 +01:00
Frédéric FRANCE
48564ea760 doxygen societe class 2019-12-08 14:26:59 +01:00
Scrutinizer Auto-Fixer
87585c0f2a Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 17:32:11 +00:00
Laurent Destailleur
c02cd80b75 Clean code 2019-11-12 10:11:30 +01:00
Laurent Destailleur
e885345ef7 FIX Check on duplicate profid was not triggered. 2019-11-06 00:27:36 +01:00
Frédéric FRANCE
872f58f261 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-11-03 21:48:24 +01:00
Laurent Destailleur
c9a620d1a6 Renamed property of thirdparty "statut_commercial" into 
"status_prospect_label"
 2019-11-02 14:25:52 +01:00
Laurent Destailleur
25e64b0610 Merge branch 'develop' into socid 2019-11-02 12:01:06 +01:00
Laurent Destailleur
68691ddd8a Merge pull request #12265 from grandoc/new_branch_30_10_2019 
add comment
 2019-11-02 11:49:28 +01:00
stickler-ci
dc97a54d82 Fixing style errors. 2019-11-02 09:39:05 +00:00
Philippe GRAND
3ff5389c4e add some comment 2019-11-02 10:35:43 +01:00
Frédéric FRANCE
dbed10a701 Merge remote-tracking branch 'upstream/develop' into socid 2019-11-01 21:39:20 +01:00
Laurent Destailleur
e3b5be7475 All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed 
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
 2019-11-01 12:52:03 +01:00
Laurent Destailleur
68a4ddceed Look and feel v11 2019-10-31 23:29:17 +01:00
Frédéric FRANCE
e93aaa2a75 replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Frédéric FRANCE
f7747ed00a Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-30 20:06:43 +01:00
Philippe GRAND
502d08af0c add some comment 2019-10-30 10:10:22 +01:00
Laurent Destailleur
8f5b0f5d4d Merge pull request #12207 from altatof/sortcontact 
Sort contacts by lastname, firstname instead of nothing
 2019-10-30 03:27:42 +01:00
Laurent Destailleur
488edec3a8 Merge pull request #12226 from ptibogxiv/patch-271 
NEW add office phone & job on user tooltips
 2019-10-30 03:11:28 +01:00
Frédéric FRANCE
8f6d38ee82 clean indent 2019-10-27 17:01:23 +01:00
ptibogxiv
bb89a16c1a Update societe.class.php 2019-10-26 14:59:43 +02:00
ptibogxiv
a79283c490 NEW add office phone for salespresentatives 
for complete https://github.com/Dolibarr/dolibarr/pull/12225
 2019-10-25 17:15:34 +02:00
Frédéric FRANCE
a43e6f96b5 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-25 08:12:54 +02:00
Laurent Destailleur
6855f588b5 Use dolGetStatus 2019-10-24 16:38:06 +02:00
altairis
0481e0b0d1 sort contact list on lastname 2019-10-23 17:31:26 +02:00
Alfredo Altamirano
0c5fbdf29d Translate french documentation 2019-10-20 19:18:39 -05:00
Frédéric FRANCE
367ef4acaf Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-11 16:44:25 +02:00
Laurent Destailleur
de107fb02e NEW Can set a squarred icon on your company setup 2019-10-11 11:27:05 +02:00
Frédéric FRANCE
98023353fe Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-03 17:21:31 +02:00
Laurent Destailleur
b60ee4c18c css 2019-10-03 09:58:49 +02:00
Frédéric FRANCE
aca9d92db8 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 22:03:33 +02:00
Frédéric FRANCE
010b2723b6 work on migration script 2019-10-01 20:14:06 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Frédéric FRANCE
b87610adcc Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-30 19:34:35 +02:00
Frédéric FRANCE
258424416e Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-30 07:49:52 +02:00
Frédéric FRANCE
c7120e9e31 test 2019-09-29 20:36:18 +02:00
stickler-ci
21db14b22a Fixing style errors. 2019-09-29 18:21:26 +00:00