Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-13 04:51:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
71,061 Commits 36 Branches 190 Tags
01e7b5747d3ece7bb4623c8889ffa98ebb39bc7c
Commit Graph

15416 Commits

Author SHA1 Message Date
Philippe GRAND
50a26aaf16 fix merge 2018-09-04 14:33:34 +02:00
Philippe GRAND
42565e722e Standardize and update code 2018-09-04 13:37:00 +02:00
Philippe GRAND
0492492df1 fix merge 2018-09-04 12:30:06 +02:00
Ferran Marcet
b658626e21 NEW: Highlight lines on lists when they are checked 2018-09-04 11:54:13 +02:00
Laurent Destailleur
f2ec94e9fd FIX #9353 Bug: html error - div inside span on graphs 2018-09-04 11:13:54 +02:00
Laurent Destailleur
c59b0f95e6 FIX #9403 2018-09-04 10:10:47 +02:00
Laurent Destailleur
252335318f Update pdf.lib.php 2018-09-04 09:57:01 +02:00
Frédéric FRANCE
1ae1afe843 move phpcs:ignore 2018-09-04 08:09:48 +02:00
Frédéric FRANCE
d08b68e8ed move phpcs:ignore 2018-09-03 20:38:52 +02:00
Frédéric FRANCE
7288335c6d Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-03 19:01:11 +02:00
Frédéric FRANCE
5f4a922c1d move phpcs:ignore 2018-09-03 19:00:37 +02:00
Marc de Lima Lucio
e285b42a18 FIX: PDF address: handle when contact thirdparty different from document thirdparty 2018-09-03 17:57:30 +02:00
Laurent Destailleur
540999faa5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/lib/company.lib.php
 2018-09-03 14:06:51 +02:00
Laurent Destailleur
6641a05744 Fix missing class 2018-09-03 11:59:19 +02:00
Philippe GRAND
4fba7cdf45 fix : Class Contact not found in htdocs/core/lib/company.lib.php on line 1496 2018-09-03 09:45:06 +02:00
Philippe GRAND
7a0c19485e fix merge 2018-09-03 09:34:08 +02:00
Regis Houssin
912c05774b FIX remove deprecated triggers USER_LOG* 2018-09-03 09:30:36 +02:00
Frédéric FRANCE
e4946cc8eb move phpcs:ignore 2018-09-03 00:03:17 +02:00
Frédéric FRANCE
9c3352d2de move phpcs:ignore 2018-09-02 23:44:53 +02:00
Frédéric FRANCE
489074af5c move phpcs:ignore 2018-09-02 23:25:10 +02:00
Frédéric FRANCE
47e73bfd8e move phpcs:ignore 2018-09-02 23:01:14 +02:00
Frédéric FRANCE
2a9ef8dc05 move phpcs:ignore 2018-09-02 22:05:19 +02:00
Frédéric FRANCE
b05c175a78 Merge remote-tracking branch 'upstream/develop' into testsqlAndScript 2018-09-02 19:00:43 +02:00
Frédéric FRANCE
e13a8ec572 Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-02 18:19:45 +02:00
Laurent Destailleur
a68f5cad77 Fix syntax error 2018-09-02 17:18:19 +02:00
Laurent Destailleur
887a40cf1d Remove TODO 2018-09-02 16:46:01 +02:00
Laurent Destailleur
0bf850c1ea Fix phpcs 2018-09-02 16:26:00 +02:00
Laurent Destailleur
3baaa2e975 Fix syntax error 2018-09-02 16:18:08 +02:00
Laurent Destailleur
ddd6ac296c Fix missing class 2018-09-02 16:09:40 +02:00
Laurent Destailleur
5488bfe1fe Merge pull request #9018 from all3kcis/patch-10 
Enable auto update PDF on update note
 2018-09-02 16:01:22 +02:00
Laurent Destailleur
dda0c5699e Update actions_setnotes.inc.php 2018-09-02 15:59:09 +02:00
Laurent Destailleur
e661eff329 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-02 15:48:43 +02:00
Laurent Destailleur
3d3edb19d8 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/langs/en_US/commercial.lang
 2018-09-02 15:48:26 +02:00
Laurent Destailleur
76d6affb27 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	.travis.yml
 2018-09-02 15:46:09 +02:00
Laurent Destailleur
b34731afb4 Merge pull request #9385 from frederic34/patch-15 
Update html_cerfafr.modules.php
 2018-09-02 15:38:19 +02:00
Laurent Destailleur
91809de1c3 Merge pull request #9383 from frederic34/patch-13 
Update doc_generic_user_odt.modules.php
 2018-09-02 15:35:54 +02:00
Frédéric FRANCE
04c1a7d4af move phpcs:ignore 2018-09-02 13:38:11 +02:00
Philippe GRAND
3de16a145e Standardize and update code 2018-09-02 11:08:41 +02:00
Frédéric FRANCE
b60f7db60a move phpcs:ignore 2018-09-02 10:43:34 +02:00
Frédéric FRANCE
e98b8e5e25 move phpcs:ignore 2018-09-02 09:27:59 +02:00
Philippe GRAND
5cd9557318 Standardize and Update code 2018-09-01 23:12:20 +02:00
Philippe GRAND
ae2df6be11 Standardize and Update code 2018-09-01 23:04:46 +02:00
Philippe GRAND
7b0d3c32ab Standardize and Update code 2018-09-01 22:55:10 +02:00
Philippe GRAND
5d273960dc fix conflict 2018-09-01 22:40:38 +02:00
Frédéric FRANCE
ab9bf78ecf replace test_sql_and_script_inject 2018-09-01 17:42:16 +02:00
Frédéric FRANCE
49a1e33fc9 Update html_cerfafr.modules.php 2018-09-01 16:23:30 +02:00
Laurent Destailleur
c8912d6a4f Merge pull request #9242 from frederic34/camelCaps 
mark non camelCaps function
 2018-09-01 15:37:56 +02:00
Frédéric FRANCE
ae52b737b3 Update doc_generic_user_odt.modules.php 2018-09-01 15:29:41 +02:00
Philippe GRAND
f77dd2ebc7 Standardize and update code 2018-09-01 15:13:59 +02:00
Laurent Destailleur
2301ecf1dc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-01 14:51:20 +02:00