Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,625 Commits 36 Branches 189 Tags
a4f44d61a88e787527b34a6d71fc3a2bc6af24d4
Commit Graph

19091 Commits

Author SHA1 Message Date
Laurent Destailleur
9c1e409feb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-17 11:35:16 +01:00
Laurent Destailleur
d5d068e3d5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-01-17 11:34:43 +01:00
Laurent Destailleur
906110dc1d Fix backup. Recommended compression is gzip. 2020-01-17 11:34:31 +01:00
Laurent Destailleur
908a012c21 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-16 18:13:46 +01:00
Laurent Destailleur
c556f60c89 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-16 18:13:35 +01:00
Anthony Berton
9a6ee89d43 Update functions.lib.php 2020-01-16 15:44:07 +01:00
Anthony Berton
9a6bcaa683 Update functions.lib.php 2020-01-16 15:20:09 +01:00
Laurent Destailleur
d7423c23de Doc 2020-01-16 12:34:53 +01:00
Laurent Destailleur
849c78f4cd Doc 2020-01-16 10:12:39 +01:00
Scrutinizer Auto-Fixer
0aa156db78 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-16 01:54:00 +00:00
Laurent Destailleur
ad7278e6a5 FIX Label of DEPOSIT on screen 
Fix look and feel v11
 2020-01-16 02:48:24 +01:00
Laurent Destailleur
d07fa80a28 Removed export driver using phpexcel. 2020-01-15 21:09:11 +01:00
Laurent Destailleur
2c40e4be94 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-15 20:13:45 +01:00
Norbert Penel
3c2dd7db7c Fix modulbuilder create forms 
'fk_product' => array('type' => 'integer:Product:product/class/product.class.php' ...
the input was arriving with a select2 instead of an ajax search
 2020-01-15 20:11:34 +01:00
Laurent Destailleur
a68da82bec Code comment of export 2020-01-15 20:11:04 +01:00
Laurent Destailleur
98eda68afb Fix linkg to public notes 2020-01-15 19:49:45 +01:00
Laurent Destailleur
28d5901da4 Fix error of mysqldump not thrown in some cases 2020-01-15 16:45:13 +01:00
Laurent Destailleur
3f79c00542 Merge branch 'develop' into actioncomm_category 2020-01-15 14:21:06 +01:00
Laurent Destailleur
373420edc0 Merge pull request #12476 from ptibogxiv/patch-280 
NEW add total of value in product stat
 2020-01-15 14:11:01 +01:00
Laurent Destailleur
34829644ed Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/tasks/time.php
 2020-01-15 13:38:28 +01:00
Laurent Destailleur
486bb5cd0b Removed useless include 2020-01-15 13:24:23 +01:00
Laurent Destailleur
43bf0a79e6 Merge pull request #12770 from guillaumematheron/develop 
NEW 2 new options when creating an invoice from time spent on a project : by period or by task
 2020-01-15 13:23:25 +01:00
Laurent Destailleur
8e269c5e64 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/modules/modSociete.class.php
	htdocs/filefunc.inc.php
 2020-01-15 13:19:37 +01:00
Laurent Destailleur
0a1a07aa22 Merge pull request #12839 from atm-gauthier/10.0_fix_importSocieteWithExtrafields 
FIX : We want to be able to import data for extrafields of entity 0 too
 2020-01-15 13:12:56 +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
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
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
Anthony Berton
ef5c1e6c8c Update functions.lib.php 2020-01-13 23:09:08 +00: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
gauthier
5455130a03 FIX : We want to be able to import data for extrafields of entity 0 too 2020-01-13 16:15:22 +01:00
Laurent Destailleur
56fb6dce61 FIX #12756 2020-01-13 15:38:46 +01:00
Laurent Destailleur
9d4e1a3941 FIX #12797 2020-01-13 14:25: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
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
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
3017d2ebe4 Merge pull request #12805 from OPEN-DSI/new-export-agenda-project-ref 
NEW add project ref in events export
 2020-01-13 11:50:39 +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