lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
79,314 Commits 43 Branches 150 Tags 886 MiB
71e922635b
Commit Graph

79314 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
71e922635b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-07 12:57:52 +02:00
Laurent Destailleur
68a4ab87a2 Fix can set min repeat to 0 for password 2019-10-07 12:57:24 +02:00
Laurent Destailleur
a604fb9afb Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-10-07 12:54:57 +02:00
Laurent Destailleur
022c67ee68
Merge pull request #12045 from laudeco/hotfix/12041-security-generate-password 
[fix #12041] - Generate password mode perso
 2019-10-07 12:54:45 +02:00
Laurent Destailleur
91a922a454
Update security.php 2019-10-07 12:54:28 +02:00
Laurent Destailleur
7015e71105 FIX #12041 2019-10-07 12:53:32 +02:00
Laurent Destailleur
e7aa78cb4a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-07 12:37:20 +02:00
Laurent Destailleur
23de8694fa Fix module files 2019-10-07 12:37:01 +02:00
Laurent Destailleur
f4b752ee81 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/core/modules/modProduct.class.php
	htdocs/expedition/card.php
 2019-10-07 12:33:13 +02:00
Laurent Destailleur
b9ac8295d4 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-10-07 12:28:06 +02:00
Laurent Destailleur
55508e25ec Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-07 12:27:06 +02:00
VESSILLER
219b0d8925 FIX Import of product using units 2019-10-07 12:26:02 +02:00
Laurent Destailleur
ecd7d1208d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-07 10:42:49 +02:00
Laurent Destailleur
fc90638b2b Code comment 2019-10-07 10:42:18 +02:00
Laurent Destailleur
0484b105de
Merge pull request #12039 from OPEN-DSI/new-import-product-country-code 
NEW add country code in import product model
 2019-10-07 10:42:09 +02:00
Laurent Destailleur
b85c4f0864
Merge branch 'develop' into new-import-product-country-code 2019-10-07 10:41:35 +02:00
Laurent Destailleur
ae2d92a797
Merge pull request #12050 from frederic34/patch-18 
Update contrat.class.php for doxygen
 2019-10-07 10:24:07 +02:00
Laurent Destailleur
d4f4f33122
Merge pull request #12048 from frederic34/patch-17 
Update card.php
 2019-10-07 10:23:51 +02:00
Laurent Destailleur
3d20766392
Merge pull request #12047 from frederic34/patch-15 
translation for holidays actioncomm
 2019-10-07 10:23:29 +02:00
Laurent Destailleur
80cbc09f21
Merge pull request #12046 from frederic34/apisupplierproduct 
api supplier price delete
 2019-10-07 10:22:48 +02:00
Laurent Destailleur
c3ae87816f
Merge pull request #12049 from frederic34/holidayz 
lang file for holidays is holiday
 2019-10-07 10:21:36 +02:00
Frédéric FRANCE
0b9213f4f1
Update contrat.class.php 2019-10-07 08:11:23 +02:00
Laurent Destailleur
edfedbb818 FIX Load chart of account only if we click or select button "Load chart" 2019-10-06 21:13:55 +02:00
Laurent Destailleur
80c1a92872 FIX Load chart of account only if we click or select button "Load chart" 2019-10-06 21:11:29 +02:00
Laurent Destailleur
52c06c1815 Fix css 2019-10-06 19:28:08 +02:00
Laurent Destailleur
a3d0b9e374 Fix syntax error 2019-10-06 18:11:28 +02:00
Laurent Destailleur
1285f71ceb Clean code of extrafields 2019-10-06 16:50:04 +02:00
Laurent Destailleur
753da4791e FIX Pb in units of shipments 
Conflicts:
	htdocs/expedition/card.php
 2019-10-06 16:31:17 +02:00
Laurent Destailleur
fb808d830e FIX Look and feel v10 2019-10-06 16:28:14 +02:00
Laurent Destailleur
6c1c008d09 FIX Look and feel v10 2019-10-06 16:28:10 +02:00
Laurent Destailleur
d4bb6490e9 Fix migration 2019-10-06 16:25:22 +02:00
Laurent Destailleur
5297ab4ab4 FIX Pb in units of shipments 2019-10-06 16:11:57 +02:00
Laurent Destailleur
866dcf18fe Look and feel v11 2019-10-06 15:34:22 +02:00
Laurent Destailleur
f6cd3814ac FIX Look and feel v10 2019-10-06 15:08:05 +02:00
Laurent Destailleur
b83d4eb936 FIX Look and feel v10 2019-10-06 14:57:34 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Laurent Destailleur
76dad97cb1 Fix syntax error 2019-10-06 14:39:43 +02:00
Laurent Destailleur
6743169faa Fix js syntax error 2019-10-06 14:34:24 +02:00
Frédéric FRANCE
52da21912b
Update agenda.lang 2019-10-06 13:21:04 +02:00
Frédéric FRANCE
8a9f08d5a3
lang file for holidays is holiday 2019-10-06 11:29:24 +02:00
Frédéric FRANCE
bfd8bc839e
Update card.php 2019-10-06 10:28:09 +02:00
Frédéric FRANCE
21dcc549fa
translation for holidays actioncomm 2019-10-06 10:09:06 +02:00
Frédéric FRANCE
b895f8a78f
api supplier get purchase prices 2019-10-05 21:19:55 +02:00
Frédéric FRANCE
10671e3266
api supplier price delete 2019-10-05 21:15:13 +02:00
Laurent Destailleur
b883a8092a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/product.lib.php
	htdocs/core/tpl/extrafields_list_search_input.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/product/class/html.formproduct.class.php
 2019-10-05 19:35:40 +02:00
Laurent Destailleur
ac8837d01f Fix url 2019-10-05 19:28:00 +02:00
Laurent Destailleur
7f5ccf4b8e Remove google+ 2019-10-05 19:27:14 +02:00
Laurent Destailleur
3e5cd877b8 FIX Bad list of ticket on public interface for ticket emailcollector 2019-10-05 14:27:42 +02:00
Laurent Destailleur
e90234c2bc FIX escape email alias 2019-10-05 14:27:37 +02:00
Laurent Destailleur
7c685bc76f FIX Bad list of ticket on public interface for ticket emailcollector 2019-10-05 14:25:20 +02:00