Commit Graph

92567 Commits

Author SHA1 Message Date
Laurent Destailleur
5b031473ff Fix hide table if empty 2020-12-08 20:08:14 +01:00
Laurent Destailleur
bb6f23d81b CSS 2020-12-08 19:32:43 +01:00
Laurent Destailleur
be249538ee Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
2020-12-08 18:17:02 +01:00
Laurent Destailleur
34e7943d09 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/fourn/class/paiementfourn.class.php
2020-12-08 18:14:56 +01:00
Laurent Destailleur
4e72543fde Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/fourn/class/paiementfourn.class.php
	htdocs/fourn/paiement/card.php
2020-12-08 18:11:39 +01:00
Laurent Destailleur
cc1db8aec2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-08 18:03:20 +01:00
Laurent Destailleur
a0b1bd3eca Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/expedition/card.php
	htdocs/product/class/product.class.php
2020-12-08 18:03:01 +01:00
Laurent Destailleur
0234df6224
Merge pull request #15705 from StephaneLesage/fix-boxes-thirdparty
Fix boxes third-parties information
2020-12-08 17:58:09 +01:00
Laurent Destailleur
791d129c9c
Merge pull request #15699 from hregis/fix_bcc_only_if_not_exists
FIX add autocopy to if not already exists in $to
2020-12-08 17:56:04 +01:00
Laurent Destailleur
111d6aa621
Merge pull request #15695 from aspangaro/10_p57
FIX : Export FEC - Remove line at zero
2020-12-08 17:55:31 +01:00
Laurent Destailleur
ad0a0460ac
Merge pull request #15706 from FHenry/develop
fix survey module
2020-12-08 17:54:08 +01:00
Laurent Destailleur
aaf1910c25 Fix stock amount can be a decimal 2020-12-08 17:53:12 +01:00
Laurent Destailleur
996e01fe6a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-08 17:52:01 +01:00
Laurent Destailleur
485fe0fc62 FIX Can receipt of a product that required lot after disabling stock and
lot module
2020-12-08 17:51:26 +01:00
Laurent Destailleur
0f2a8d0262 Fix timestamp field 2020-12-08 17:20:45 +01:00
Laurent Destailleur
240648d540 css 2020-12-08 17:09:48 +01:00
Stephane Lesage
376e4d150a Third-party details in comm action lists 2020-12-08 15:56:42 +01:00
Stephane Lesage
e25862ec8d Third-party details in Lists in comm index 2020-12-08 15:47:34 +01:00
Stephane Lesage
5d8dfadd09 Third-party details in Lists in project index 2020-12-08 15:47:22 +01:00
Stephane Lesage
3161f35971 Fix boxes third-parties information 2020-12-08 14:08:32 +01:00
Florian HENRY
eed7f57f98 fix survey module 2020-12-08 12:54:14 +01:00
Florian HENRY
b3dd456a37 fix survey module 2020-12-08 12:53:13 +01:00
Laurent Destailleur
8491be2572 Fix look and feel v13 2020-12-08 11:58:47 +01:00
Laurent Destailleur
e7d24796f1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-08 11:18:19 +01:00
Laurent Destailleur
657592695b Try to fix internal link 2020-12-08 11:18:08 +01:00
Laurent Destailleur
f9f31b7d7b
Merge pull request #15697 from StephaneLesage/export-warehouses
Export warehouses
2020-12-08 11:09:30 +01:00
Laurent Destailleur
dc27fd8061
Merge pull request #15701 from dolibit-ut/patch-56
Update README.md
2020-12-08 11:05:42 +01:00
Laurent Destailleur
7031a598bc Link to forum portal page 2020-12-08 11:05:09 +01:00
Laurent Destailleur
5b50cd00dd
Merge pull request #15703 from dolibit-ut/patch-57
Update CONTRIBUTING.md
2020-12-08 11:03:19 +01:00
UT from dolibit
97e23269db
Update CONTRIBUTING.md 2020-12-08 09:56:51 +01:00
UT from dolibit
930062428c
Update README.md
text to reference to guideline contributes
2020-12-08 09:44:53 +01:00
Regis Houssin
fc34c97666 FIX add autocopy to if not already exists in $to 2020-12-08 08:49:06 +01:00
Stephane Lesage
08ccc11f9e Export warehouses 2020-12-08 00:50:27 +01:00
Alexandre SPANGARO
7c77a0d84b FIX : Export FEC - Remove line at zero 2020-12-07 23:53:09 +01:00
Laurent Destailleur
86e1082138
Merge pull request #15644 from Hystepik/develop#1
New #8172 : PHPExcel replaced by PHPSpreadSheet
2020-12-07 23:06:21 +01:00
Laurent Destailleur
f1bc4b4bb5
Merge pull request #15619 from Hystepik/develop#3
WIP #15383 : New widget: Tunnel of prospection
2020-12-07 22:47:11 +01:00
Laurent Destailleur
f21a4e8aed
Merge branch 'develop' into develop#3 2020-12-07 22:46:36 +01:00
Laurent Destailleur
6e479af5b6
Merge pull request #15661 from frederic34/adminsms
fix trans removing html
2020-12-07 22:45:14 +01:00
Laurent Destailleur
c6d253ba94
Merge pull request #15660 from Ahuahuachi/develop
Translate phpDocs
2020-12-07 22:41:51 +01:00
Laurent Destailleur
465cee7e92
Merge pull request #15662 from frederic34/boxproduits
fix missing fields in box
2020-12-07 22:41:20 +01:00
Laurent Destailleur
ff1e6ec371
Merge pull request #15665 from frederic34/admin_boxes
fix style
2020-12-07 22:40:51 +01:00
Laurent Destailleur
64e2ddbd80
Merge pull request #15666 from Zebedeu/develop
New #8472 personal and professional titles added
2020-12-07 22:40:01 +01:00
Laurent Destailleur
a2f7bec272
Merge pull request #15667 from dolibit-ut/patch-55
Update ChangeLog
2020-12-07 22:36:13 +01:00
Laurent Destailleur
d9ba821411
Merge pull request #15669 from frederic34/template
typo ortho
2020-12-07 22:35:45 +01:00
Laurent Destailleur
995afd59f2
Merge pull request #15672 from frederic34/patch-8
fix trans replace html
2020-12-07 22:35:01 +01:00
Laurent Destailleur
6beba9e351
Merge pull request #15674 from frederic34/patch-14
fix undefined variable
2020-12-07 22:34:10 +01:00
Laurent Destailleur
9be184aa49
Merge pull request #15677 from NicolasStr/patch-1
Fix #15676 Hide Password when importing from LDAP
2020-12-07 22:33:42 +01:00
Laurent Destailleur
2c094fe847
Merge pull request #15673 from frederic34/compta_stats_index
fix trans removing html
2020-12-07 22:32:12 +01:00
Laurent Destailleur
efc3bad7c6
Merge pull request #15678 from frederic34/fk_element
doxygen
2020-12-07 22:31:08 +01:00
stickler-ci
44c5e408fa Fixing style errors. 2020-12-07 21:30:51 +00:00