Laurent Destailleur
|
b386400365
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2020-06-06 21:52:55 +02:00 |
|
Laurent Destailleur
|
38d95aa5cd
|
Update societe.class.php
|
2020-06-06 21:45:53 +02:00 |
|
Laurent Destailleur
|
af440b7c49
|
Update societe.class.php
|
2020-06-06 21:32:25 +02:00 |
|
stickler-ci
|
e9b17aac8d
|
Fixing style errors.
|
2020-06-04 18:20:48 +00:00 |
|
florian HENRY
|
7115bd7033
|
better fix
|
2020-06-04 20:14:19 +02:00 |
|
florian HENRY
|
2337d75d92
|
better fix for #13968
|
2020-06-01 10:43:57 +02:00 |
|
florian HENRY
|
face2d644e
|
Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0
|
2020-06-01 10:05:07 +02:00 |
|
Laurent Destailleur
|
8aba46a5ed
|
Fix doc
|
2020-05-27 23:08:33 +02:00 |
|
Laurent Destailleur
|
00484d5938
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-26 23:23:31 +02:00 |
|
Laurent Destailleur
|
9aeb79e80c
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2020-05-26 23:22:45 +02:00 |
|
Laurent Destailleur
|
e02aa4e41b
|
FIX Default bank account was not loaded for document generation.
|
2020-05-26 23:22:14 +02:00 |
|
florian HENRY
|
ceb0a5b0b5
|
space
|
2020-05-26 21:32:18 +02:00 |
|
florian HENRY
|
e5edc06f3d
|
spelling
|
2020-05-26 21:29:47 +02:00 |
|
florian HENRY
|
7ada0de654
|
FIX : #13968
|
2020-05-26 21:27:46 +02:00 |
|
Frédéric FRANCE
|
b41ac00b98
|
add new rule
|
2020-05-21 15:05:19 +02:00 |
|
Frédéric FRANCE
|
e5fc928fda
|
add new rule
|
2020-05-21 02:02:54 +02:00 |
|
Laurent Destailleur
|
8a6ae84fb0
|
Fix getStructuredData for organization
|
2020-05-17 20:02:01 +02:00 |
|
kamel
|
28d330996c
|
Correction pour validation Stickler CI / stickler-ci
|
2020-04-27 18:01:07 +02:00 |
|
kamel
|
9cb90cb384
|
NEW: Add prospect status managment for the contact with managment of custom icon
|
2020-04-27 17:35:14 +02:00 |
|
Scrutinizer Auto-Fixer
|
1bf5745286
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-25 11:52:07 +00:00 |
|
Laurent Destailleur
|
72c6ac1c72
|
Complete #13708, normalization of code
|
2020-04-23 13:21:39 +02:00 |
|
Josep Lluís
|
eda398b1cb
|
FIX translation key ErrorPrefixRequired
The correct translation key is ErrorPrefixRequired
|
2020-04-14 07:01:53 +02:00 |
|
Laurent Destailleur
|
596ba8d679
|
Clean deprecated code.
|
2020-04-13 01:10:35 +02:00 |
|
Laurent Destailleur
|
52b467d2fc
|
FIX #13550 Removed not used table
|
2020-04-12 19:06:44 +02:00 |
|
Laurent Destailleur
|
7d430c08d0
|
Look and feel v12
|
2020-04-12 16:36:25 +02:00 |
|
Laurent Destailleur
|
d7784887d1
|
More font awesome picto
|
2020-04-12 14:58:50 +02:00 |
|
Laurent Destailleur
|
4ff503d20a
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/stock/list.php
htdocs/supplier_proposal/list.php
|
2020-04-10 02:07:51 +02:00 |
|
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
|
33d2b61c19
|
Work on extralanguages
|
2020-04-01 16:21:03 +02:00 |
|
Laurent Destailleur
|
fa3bba942f
|
Start to save the VAT src code into table of discounts to reuse them
later
|
2020-03-26 02:01:30 +01:00 |
|
Laurent Destailleur
|
700e384639
|
WIP Edit fields into alternate language
|
2020-03-22 19:11:21 +01:00 |
|
Scrutinizer Auto-Fixer
|
f413ce6aac
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-03-12 11:45:44 +00:00 |
|
Laurent Destailleur
|
054ffb7547
|
Depreciate variables not used by Dolibarr.
|
2020-03-06 14:38:06 +01:00 |
|
Laurent Destailleur
|
457d0668c8
|
Look and feel v12
|
2020-02-24 05:23:34 +01:00 |
|
Laurent Destailleur
|
74d3912763
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/class/fournisseur.facture.class.php
|
2020-02-11 16:52:58 +01:00 |
|
Laurent Destailleur
|
9f5f460ae2
|
Fix field def
|
2020-02-11 16:42:48 +01:00 |
|
Laurent Destailleur
|
918e570e7a
|
FIX Picture of contact not visible in tooltip
|
2020-02-10 12:56:08 +01:00 |
|
Laurent Destailleur
|
56079f928f
|
Label of field
|
2020-02-08 11:34:25 +01:00 |
|
Laurent Destailleur
|
cffc56b80b
|
Declaration of property fields of thirdparties
|
2020-02-08 11:32:38 +01:00 |
|
Alexandre SPANGARO
|
d6d3fff9dc
|
Merge branch 'develop' into 10.0_intracommreport
|
2020-02-03 21:15:07 +01:00 |
|
Laurent Destailleur
|
f752551914
|
WIP Generic stats page
|
2020-01-31 14:53:47 +01:00 |
|
Laurent Destailleur
|
27a0858050
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
|
2020-01-23 17:41:31 +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
|
ed2c75a2f8
|
Merge pull request #12776 from aspangaro/12.0_a4
NEW Add social networks of the company
|
2020-01-13 13:38:16 +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 |
|
Alexandre SPANGARO
|
c664a1e42d
|
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
|
2019-12-31 08:34:37 +01:00 |
|
Alexandre SPANGARO
|
9879a43cf4
|
NEW Add social networks of the company
|
2019-12-30 21:17:41 +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 |
|
Frédéric FRANCE
|
0735bb5860
|
test
|
2019-09-29 20:21:05 +02:00 |
|
Frédéric FRANCE
|
1a12c93dc7
|
test
|
2019-09-29 20:06:30 +02:00 |
|
Frédéric FRANCE
|
1ef3a67644
|
test
|
2019-09-29 19:26:25 +02:00 |
|
Frédéric FRANCE
|
4bac865205
|
test
|
2019-09-29 18:40:36 +02:00 |
|
Frédéric FRANCE
|
cedad3dc26
|
fix?
fix?
fix
|
2019-09-29 18:23:31 +02:00 |
|
Frédéric FRANCE
|
05f3d86921
|
fix?
|
2019-09-29 11:48:53 +02:00 |
|
Frédéric FRANCE
|
6c8dc75c96
|
socialnetworks for thirdparties
|
2019-09-29 11:20:23 +02:00 |
|