Commit Graph

82261 Commits

Author SHA1 Message Date
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
07b12e507f
Merge pull request #12841 from bb2a/patch-10
Addition of delivery times substitution
2020-01-15 12:08:07 +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
atm-ph
a088c78279 Fix column type to be as llx_facture 2020-01-15 09:52:12 +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
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
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
f94b3e55b9
Merge pull request #12768 from atm-maxime/fix_loan_currency2
Remove € + unsed code and file
2020-01-13 13:19:14 +01:00
Laurent Destailleur
2465d5ab47
Merge pull request #12837 from laudeco/hotfix/replenish_product
replenish product
2020-01-13 13:18:28 +01:00
Laurent Destailleur
9c9b73e4d1 Fix translation of \n and \\s into language files. 2020-01-13 13:11:25 +01:00
Laurent Destailleur
adeed186bb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-01-13 12:34:28 +01:00
Laurent Destailleur
bfa13e16ed Debug MO module 2020-01-13 12:30:48 +01:00
Laurent Destailleur
5740d17450 Better help 2020-01-13 12:10:20 +01:00
Laurent Destailleur
ce17f65b08
Merge pull request #12829 from atm-florian/11.0
Fix Warning
2020-01-13 11:39:05 +01:00
Laurent De Coninck
66e08103de
change the PHPdoc 2020-01-13 10:43:39 +01:00
Laurent Destailleur
a7496c16cb Doc 2020-01-12 22:00:23 +01:00
Laurent De Coninck
67d73c5488
Fix the select of the provider for one product 2020-01-12 21:56:35 +01:00
Laurent Destailleur
a6bae97826 Sync from transifex 2020-01-12 21:28:09 +01:00
Laurent Destailleur
6508ee03bf Fix for en_US 2020-01-12 21:27:43 +01:00
Laurent Destailleur
4716b82249 Fix clone of page 2020-01-11 14:44:12 +01:00
Laurent Destailleur
58e5eeabdd Fix to be able to use zip signature 2020-01-11 11:15:50 +01:00
Laurent Destailleur
e2dc12c8fd Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-01-10 19:50:49 +01:00
Laurent Destailleur
1292575371 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-01-10 19:50:00 +01:00
Laurent Destailleur
b513ad90eb Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-01-10 19:48:33 +01:00
Laurent Destailleur
e0a12edf31 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-01-10 19:48:10 +01:00
Laurent Destailleur
0625a7194f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2020-01-10 19:47:32 +01:00
Laurent Destailleur
ec6e933f66 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2020-01-10 19:47:00 +01:00
Laurent Destailleur
e0c8ccb9fb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2020-01-10 19:45:35 +01:00
Laurent Destailleur
ef00cb0736 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
2020-01-10 19:44:52 +01:00
Laurent Destailleur
d7f7f5bf3d Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2020-01-10 19:42:34 +01:00
Laurent Destailleur
7c0a6946a7 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2020-01-10 19:42:15 +01:00
Laurent Destailleur
1ecc1afa9e Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8 2020-01-10 19:41:49 +01:00
Laurent Destailleur
ceb1e699b7 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.7 2020-01-10 19:37:16 +01:00
Laurent Destailleur
c028819cab FIX clone of purchase order 2020-01-10 19:35:49 +01:00
Laurent Destailleur
89ab80e598 Fix typo 2020-01-10 14:41:58 +01:00
Laurent Destailleur
fd3d4cb2d0 Fix link 2020-01-10 14:36:52 +01:00