Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
61,071 Commits 36 Branches 189 Tags
8f34de1036680906ebdb8c05e6460077b5dc4b43
Commit Graph

11985 Commits

Author SHA1 Message Date
Laurent Destailleur
9043cf759b Fix clone function 2017-07-23 20:27:30 +02:00
Laurent Destailleur
6421ec3139 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/doleditor.class.php
 2017-07-23 19:27:40 +02:00
Laurent Destailleur
25b107defb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/contrat/list.php
	htdocs/fichinter/list.php
 2017-07-23 19:09:00 +02:00
Laurent Destailleur
0aed9ecd7c Fix ckeditor is now ok since there is no more jmobile. 2017-07-23 18:52:30 +02:00
Laurent Destailleur
336400d9ea Can clone a page onto another website 2017-07-23 16:20:53 +02:00
Laurent Destailleur
7904e994a7 FIX When disconnected, the search box jump to login instead of error. 2017-07-22 23:43:40 +02:00
Laurent Destailleur
764c7ac792 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/websites/index.php
 2017-07-22 20:46:02 +02:00
Laurent Destailleur
854a6ca3d5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-22 16:40:45 +02:00
Laurent Destailleur
9e6666e511 Fix translation keys for taxes 2017-07-22 16:40:19 +02:00
Laurent Destailleur
340203cc18 Fix vat label for India 2017-07-22 16:05:51 +02:00
Laurent Destailleur
44023606c6 Fix pb in dolGetFirstLineOfText. Add PHPunit 2017-07-22 12:47:35 +02:00
Laurent Destailleur
f64a9968a9 Debug modulebuilder 2017-07-22 01:00:43 +02:00
Laurent Destailleur
f97ecd0a45 The css files is also parsed with function to clean images 2017-07-21 20:16:53 +02:00
Regis Houssin
2e63393bf2 Fix: wrong values if array used to force entity 0 2017-07-21 19:35:08 +02:00
Laurent Destailleur
dc7e00ccc6 Merge pull request #7178 from atm-florian/fix_save_attachement_in_event_sendbymail 
fix missing line into PR #6012
 2017-07-21 15:00:56 +02:00
Laurent Destailleur
5f4dd26303 Merge pull request #7182 from hregis/develop_trad 
NEW add specific translation for title of documents (Invoice, Order, Proposal)
 2017-07-21 14:59:58 +02:00
Laurent Destailleur
d07741ada1 Merge branch 'develop' into patch-rib 2017-07-21 14:58:33 +02:00
Laurent Destailleur
6830fe4f91 Fix generic clone function 2017-07-21 13:39:06 +02:00
Laurent Destailleur
058e88c6f3 Fix title in html header 2017-07-21 12:26:11 +02:00
Laurent Destailleur
23d9353a3d Fix title in html header 2017-07-21 12:21:48 +02:00
Regis Houssin
48d79357a0 New: add specific translation for title of documents 2017-07-21 10:03:09 +02:00
Laurent Destailleur
302ee97d31 Debug module website 2017-07-21 02:51:56 +02:00
Laurent Destailleur
28254655e9 Debug module website 2017-07-21 02:30:02 +02:00
Laurent Destailleur
7760594643 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/website.lang
	htdocs/theme/eldy/style.css.php
	htdocs/websites/class/website.class.php
	htdocs/websites/index.php
 2017-07-20 18:31:58 +02:00
Laurent Destailleur
3b8f60f90e Fix pb of recursive include in website module 2017-07-20 16:49:20 +02:00
Laurent Destailleur
1e7aa4d9b4 Work on module website 2017-07-19 16:38:00 +02:00
florian HENRY
f701a52d2d fix missing line into PR 6012 2017-07-18 19:33:25 +02:00
Laurent Destailleur
782cde37b3 Merge pull request #7175 from ATM-Marc/NEW_units_import_products 
NEW add fk_unit field into product/service import/export
 2017-07-18 14:49:59 +02:00
Laurent Destailleur
a416ec4258 Try to fix travis 2017-07-18 14:25:07 +02:00
Laurent Destailleur
5c296c679e Enhance source code editor 2017-07-18 13:42:07 +02:00
Laurent Destailleur
97fe41d603 A info int smtp header 2017-07-18 12:49:19 +02:00
Laurent Destailleur
6db2aeff20 Fix source code editor 2017-07-18 12:00:18 +02:00
Marc de Lima Lucio
447fdd542d Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_units_import_products 2017-07-18 10:30:43 +02:00
Marc de Lima Lucio
3a05b6a164 NEW add fk_unit field into product/service import/export 2017-07-18 10:20:16 +02:00
Laurent Destailleur
2a50a78497 Fix hack to solve link to restrictions 2017-07-18 10:15:48 +02:00
Laurent Destailleur
98ef978b2a NEW Introduce code syntax coloration with mode 'ace' for DolEditor. 2017-07-18 03:18:16 +02:00
Laurent Destailleur
ae7f2ac253 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-17 20:21:35 +02:00
Laurent Destailleur
e5ec0a785d Fix use command standard @... to mark a change in official code 2017-07-17 20:20:38 +02:00
Laurent Destailleur
4582b54e91 Fix use command standard @... to mark a change in official code 2017-07-17 20:09:19 +02:00
Laurent Destailleur
b6c9823ad4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-17 16:45:47 +02:00
Laurent Destailleur
4fa04247a9 Finished dev 2017-07-17 11:09:32 +02:00
Laurent Destailleur
d832bfc056 Some fix into dol_compress_dir function. 2017-07-17 11:05:38 +02:00
Laurent Destailleur
330f3af74d Fix pb in recursive dol_dir_list return. 2017-07-17 10:26:36 +02:00
Laurent Destailleur
4d9ae5bb44 Work on modulebuilder 2017-07-16 14:57:30 +02:00
Laurent Destailleur
5c0e581d5a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-16 13:01:07 +02:00
Laurent Destailleur
7b2a71802b Do some TODO on modulebuilder module. 2017-07-16 13:00:35 +02:00
Laurent Destailleur
75ec7a309c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-15 21:25:14 +02:00
Laurent Destailleur
e5513cff91 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
 2017-07-15 21:24:21 +02:00
Laurent Destailleur
4e45c7fdba Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2017-07-15 21:21:40 +02:00
Laurent Destailleur
1735a649e9 Fix permission on salary module 2017-07-15 13:02:41 +02:00