Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-14 05:21:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
78,180 Commits 36 Branches 190 Tags
815206cb15d8881e80c8eb2aaba905e77950e92e
Commit Graph

17547 Commits

Author SHA1 Message Date
Laurent Destailleur
5253c759af Fix overwrite feature 2019-04-27 21:42:52 +02:00
Laurent Destailleur
410a3801da Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-04-27 13:27:52 +02:00
Frédéric FRANCE
3e99a40b9e Update website.lib.php 2019-04-26 17:47:47 +02:00
Laurent Destailleur
4bd732cc40 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/export.php
	htdocs/core/class/utils.class.php
	htdocs/langs/en_US/website.lang
 2019-04-25 23:25:21 +02:00
Laurent Destailleur
63c0ab93fb FIX CVE-2019-11201 2019-04-25 23:21:25 +02:00
Laurent Destailleur
01075081cb FIX CVE-2019-11200 2019-04-25 22:25:19 +02:00
Laurent Destailleur
b2614259e7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-04-25 19:32:58 +02:00
Laurent Destailleur
10dde837d0 Debug email collector 2019-04-25 19:32:48 +02:00
Laurent Destailleur
68926e3b6f Merge pull request #11066 from aspangaro/10.0_accountancy7 
FIX Menu Accountancy (Simple) not accessible without module Accountancy (Double entries)
 2019-04-25 18:59:17 +02:00
gauthier
31897f54ac Fix prev situation invoice selection (backport fix 8.0) 2019-04-25 12:37:05 +02:00
Laurent Destailleur
091132de2f Signatures of methods createFromClone() has been standardized. All 
methods requires the object User as first parameter.
 2019-04-25 12:11:32 +02:00
Laurent Destailleur
6fe84a7962 Fix phpcs 2019-04-25 11:18:25 +02:00
Alexandre SPANGARO
2c411310bc FIX Menu Accountancy (Simple) not accessible without module Accountancy (Double entries) 2019-04-25 08:29:43 +02:00
Laurent Destailleur
68d438b697 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/user/class/user.class.php
 2019-04-25 01:50:48 +02:00
Laurent Destailleur
82093f5891 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-04-25 01:27:02 +02:00
Laurent Destailleur
560b026d68 Fix CSS 2019-04-25 01:26:29 +02:00
Laurent Destailleur
e5c2027dbb NEW Add accounting code for eec sales and export sales on products 2019-04-25 01:16:29 +02:00
Laurent Destailleur
ab1f371ea5 Fix encoding on expense report PDF 2019-04-24 20:58:27 +02:00
Laurent Destailleur
79c37f2226 Fix link for endpoint 2019-04-24 18:47:11 +02:00
Laurent Destailleur
fe3fe60efc Cleaner setup page 2019-04-24 18:31:11 +02:00
Laurent Destailleur
287b8ebe53 Merge pull request #11060 from hregis/9.0_mc 
FIX missing compatibility with multicompany
 2019-04-24 11:33:16 +02:00
Laurent Destailleur
8aa8efcb14 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-04-24 11:25:23 +02:00
Laurent Destailleur
99639ef429 FIX #11013 2019-04-24 11:25:14 +02:00
Laurent Destailleur
f0bb9288bf FIX #11013 2019-04-24 11:23:49 +02:00
Laurent Destailleur
4421dedbd2 Merge pull request #11008 from aspangaro/10.0_closure 
FIX: Update blocked by datec on fiscal year
 2019-04-24 10:28:23 +02:00
Laurent Destailleur
691159c56b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-04-24 10:24:55 +02:00
Laurent Destailleur
1264857211 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/js/timesheet.js
 2019-04-24 10:24:32 +02:00
Laurent Destailleur
0090b26946 Merge pull request #11049 from frederic34/patch-5 
Update mod_expedition_ribera.php
 2019-04-24 10:10:11 +02:00
Laurent Destailleur
ad9dfc826a Merge pull request #11051 from frederic34/patch-7 
Update mod_commande_saphir.php
 2019-04-24 10:09:58 +02:00
Laurent Destailleur
7ad214b2f1 Merge pull request #11052 from frederic34/patch-8 
Update mod_chequereceipt_thyme.php
 2019-04-24 10:09:38 +02:00
Laurent Destailleur
49c7d07e8c Merge pull request #11050 from frederic34/patch-6 
Update mod_contract_magre.php
 2019-04-24 10:09:28 +02:00
Laurent Destailleur
a1bff2ca36 Merge pull request #11048 from frederic34/patch-2 
Update mod_bom_advanced.php
 2019-04-24 10:09:07 +02:00
Laurent Destailleur
6d397316d6 Merge pull request #11053 from frederic34/patch-9 
In export modules, id is string
 2019-04-24 10:08:30 +02:00
Regis Houssin
41a82023e3 FIX missing compatibility with multicompany 2019-04-24 08:17:10 +02:00
Laurent Destailleur
684e09fdcd NEW Add function isValidVATID() 2019-04-23 22:49:33 +02:00
Laurent Destailleur
742de5c777 Fix pdf of expense report 2019-04-23 16:04:53 +02:00
Laurent Destailleur
633eb1d6c6 Remove warning 2019-04-23 13:28:42 +02:00
Laurent Destailleur
4d92d7731c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/sendings.lib.php
	htdocs/langs/en_US/admin.lang
	htdocs/theme/eldy/style.css.php
 2019-04-23 12:32:08 +02:00
Laurent Destailleur
8d0825910a Fix warnings 2019-04-23 10:38:20 +02:00
Laurent Destailleur
7c7c4f0d93 Removed warnings 2019-04-23 10:24:16 +02:00
Laurent Destailleur
f19d96bf8d NEW Show enabled modules in dol_print_error 2019-04-23 10:24:05 +02:00
Laurent Destailleur
a50fc9189b Fix phpcs 2019-04-22 15:45:44 +02:00
Laurent Destailleur
9e91826dea Can set length of random password 2019-04-22 14:12:58 +02:00
Laurent Destailleur
be726c2376 Code comment 2019-04-22 12:44:25 +02:00
Laurent Destailleur
24572e2f82 Remove warnings 2019-04-22 12:42:46 +02:00
Laurent Destailleur
6da42941a8 NEW Add attached document on bank account visible in automatic ECM. 2019-04-21 19:54:30 +02:00
Frédéric FRANCE
53c851de7b Update export_csv.modules.php 2019-04-20 11:42:25 +02:00
Frédéric FRANCE
a0ce52bb23 Update export_excel.modules.php 2019-04-20 11:41:37 +02:00
Frédéric FRANCE
73b32f0679 Update export_excel2007.modules.php 2019-04-20 11:41:19 +02:00
Frédéric FRANCE
06a8513575 Update export_excel2007new.modules.php 2019-04-20 11:40:59 +02:00