Commit Graph

82454 Commits

Author SHA1 Message Date
Laurent Destailleur
d771efe37c Fix phpcs 2020-01-15 13:08:29 +01:00
Laurent Destailleur
6e367b6406 Fix detection 2020-01-15 12:56:36 +01:00
Laurent Destailleur
64d66be321
Merge pull request #12849 from TobiasSekan/ShowExtraPhpInfo
New: Show additional short php infos
2020-01-15 12:29:48 +01:00
Laurent Destailleur
e58c2c5110 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-15 12:26:48 +01:00
Laurent Destailleur
2f36e0cb1c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-01-15 12:26:22 +01:00
Laurent Destailleur
1d3d26e185 Fix phpcs 2020-01-15 12:26:11 +01:00
Laurent Destailleur
82757e6d03 Move files 2020-01-15 12:23:14 +01:00
Laurent Destailleur
1a21a7a1e2
Merge pull request #12847 from homer8173/develop
DBF2DB & import from table
2020-01-15 12:15:04 +01:00
Laurent Destailleur
5772dce460 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/functions.lib.php
2020-01-15 12:09:21 +01:00
Laurent Destailleur
07b12e507f
Merge pull request #12841 from bb2a/patch-10
Addition of delivery times substitution
2020-01-15 12:08:07 +01:00
Laurent Destailleur
28248b3364
Merge pull request #12844 from tuxgasy/professional_id_roumain
New: Professional identifiers for Roumania
2020-01-15 12:07:34 +01:00
Laurent Destailleur
dd244255fa
Merge pull request #12840 from bb2a/patch-9
NEW Addition of delivery times in substitution variables
2020-01-15 12:07:04 +01:00
Laurent Destailleur
4066de94b6
Merge pull request #12848 from atm-ph/fix_11.0_colum_type
Fix column type to be as llx_facture
2020-01-15 12:05:54 +01:00
Laurent Destailleur
610655333d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-01-15 11:56:58 +01:00
Laurent Destailleur
c8ff847480 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/modulebuilder/index.php
2020-01-15 11:56:46 +01:00
Laurent Destailleur
0442105bd4 Fix Generation of zip of module 2020-01-15 11:55:27 +01:00
Laurent Destailleur
54fa476d1a
Merge pull request #12842 from aspangaro/11.0_p3
FIX : Loan Look & feel v11
2020-01-15 11:45:06 +01:00
Laurent Destailleur
14d59f43af Trans 2020-01-15 11:33:02 +01:00
Tobias Sekan
503671a307
Fix lint error 2020-01-15 10:21:36 +01:00
Tobias Sekan
c47da64476
A few fixes 2020-01-15 10:13:55 +01:00
Tobias Sekan
a893b42202
Show extra short php function overview 2020-01-15 10:02:18 +01:00
Tobias Sekan
ee024c173f
Merge pull request #4 from Dolibarr/develop
merge into develop
2020-01-15 09:59:02 +01:00
atm-ph
a088c78279 Fix column type to be as llx_facture 2020-01-15 09:52:12 +01:00
stickler-ci
ece3face5e Fixing style errors. 2020-01-14 14:34:36 +00:00
Norbert Penel
43aa5ec658
Dbf -> Db & import from table
1 Import a BIG DBF (aka excel openoffice) into a new table
    then you can see and search content easily

2 Create thirdparties or products from a table
2020-01-14 15:31:41 +01:00
Norbert Penel
3aa1166232
Merge pull request #8 from Dolibarr/develop
Update
2020-01-14 15:26:29 +01:00
Anthony Berton
ef5c1e6c8c
Update functions.lib.php 2020-01-13 23:09:08 +00:00
TuxGasy
dcba3d5c7c New: Professional identifiers for Roumania 2020-01-13 23:00:06 +01:00
Alexandre SPANGARO
96674b2a7e FIX : Look & feel v11 2020-01-13 21:19:32 +01:00
Anthony Berton
1eff733e1c
Update functions.lib.php 2020-01-13 18:23:50 +01:00
Anthony Berton
f3046589e7
Update functions.lib.php 2020-01-13 18:19:51 +01:00
Anthony Berton
226dbceac0
Update functions.lib.php 2020-01-13 17:11:50 +01:00
Laurent Destailleur
e2e06b47ff FIX #12617 2020-01-13 15:58:03 +01:00
Laurent Destailleur
56fb6dce61 FIX #12756 2020-01-13 15:38:46 +01:00
Laurent Destailleur
68169b6df0 Fix debian package 2020-01-13 14:43:27 +01:00
Laurent Destailleur
ab4e0fe99c FIX #12758 2020-01-13 14:38:01 +01:00
Laurent Destailleur
9d4e1a3941 FIX #12797 2020-01-13 14:25:48 +01:00
Laurent Destailleur
b6ed6df75d Remove property tha has no sense in output #12803 2020-01-13 14:14:51 +01:00
Laurent Destailleur
9ceec670b9 Fix date format in FEC export 2020-01-13 13:52:48 +01:00
Laurent Destailleur
ffd12cd44e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-13 13:44:44 +01:00
Laurent Destailleur
03a1897089 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/stocks.lang
2020-01-13 13:44:32 +01:00
Laurent Destailleur
f9e3164c6e
Merge pull request #12783 from frederic34/patch-14
NEW upload odt templates for shipments
2020-01-13 13:42:07 +01:00
Laurent Destailleur
ab1a56c881
Merge pull request #12781 from frederic34/patch-11
NEW upload odt models for invoices
2020-01-13 13:41:49 +01:00
Laurent Destailleur
4f3f933ab9
Merge pull request #12780 from frederic34/patch-8
NEW upload odt models for thirdparties
2020-01-13 13:41:37 +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
61d60ce38e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-01-13 13:35:41 +01:00
Laurent Destailleur
ccdee44ed1 Look and feel v11 2020-01-13 13:35:29 +01:00
Laurent Destailleur
d04082eeee Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-13 13:21:26 +01:00
Laurent Destailleur
e88c11c417 Space 2020-01-13 13:20:58 +01:00
Laurent Destailleur
f94b3e55b9
Merge pull request #12768 from atm-maxime/fix_loan_currency2
Remove € + unsed code and file
2020-01-13 13:19:14 +01:00