lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
60,534 Commits 43 Branches 150 Tags 886 MiB
d2ecebdddd
Commit Graph

60534 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
florian HENRY
d2ecebdddd new :new column into extrafeild table to get update create information 2017-07-25 11:57:36 +02:00
Laurent Destailleur
73c7aa378e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/fichinter/list.php
 2017-07-23 20:30:03 +02:00
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
d5d95c31a6 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-07-23 19:07:14 +02:00
Laurent Destailleur
585dde6cf5 Fix url 2017-07-23 19:06:47 +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
f3de6cfd32 Support for robots and .htaccess file 2017-07-23 17:44:26 +02:00
Laurent Destailleur
7eee529c9f Can use - and _ into website alias 2017-07-23 16:28:56 +02:00
Laurent Destailleur
336400d9ea Can clone a page onto another website 2017-07-23 16:20:53 +02:00
Laurent Destailleur
0963a649b7 Update doc 2017-07-22 23:49:28 +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
583452114b Split editor in 2 (html source and wysiwyg) 2017-07-22 20:19:10 +02:00
Laurent Destailleur
2a133f4a3f Generate table for extrafields 2017-07-22 20:12:00 +02:00
Laurent Destailleur
437d620fe4 Add support of language in website module 2017-07-22 20:01:29 +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
6470b62f56 Fix bad rounding 2017-07-22 16:13:21 +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
4803f2d29a Fix package v6 2017-07-22 11:26:25 +02:00
Laurent Destailleur
e0f0769405 Fix packager 2017-07-22 02:31:33 +02:00
Laurent Destailleur
a0d9890c99 Fix packager 2017-07-22 02:31:06 +02:00
Laurent Destailleur
e36911360b Update changelog 2017-07-22 02:22:16 +02:00
Laurent Destailleur
5207b84e8b Fix compatibility with indian IGST/CSGST/SGST 2017-07-22 01:56:38 +02:00
Laurent Destailleur
ba43c41ac0 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-07-22 01:21:40 +02:00
Laurent Destailleur
7562412554 Minor fixes 2017-07-22 01:21:28 +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
Laurent Destailleur
2514c02817 Fix when there is several php part in same page 2017-07-21 19:01:06 +02:00
Laurent Destailleur
f3271791f8 Work on website module 2017-07-21 18:33:45 +02:00
Laurent Destailleur
c83ab91052 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-21 17:55:55 +02:00
Laurent Destailleur
b9df364fbe Fix include 2017-07-21 17:55:43 +02:00
Laurent Destailleur
a2b450a2a1 Merge pull request #7123 from defrance/patch-21 
Adding Hook for tooltip on project
 2017-07-21 15:18:27 +02:00
Laurent Destailleur
874e96fc38 Merge branch 'develop' into patch-21 2017-07-21 15:18:18 +02:00
Laurent Destailleur
929d14c816 Merge pull request #7078 from atm-florian/dev_prodlist 
NEW : filter on extrafield on product list (as in company list)
 2017-07-21 15:15:11 +02:00
Laurent Destailleur
6d97deb1c3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-21 15:13:14 +02:00
Laurent Destailleur
1851080b31 Merge pull request #7152 from dolibarr95/patch-14 
'int' for $rate variable
 2017-07-21 15:07:00 +02:00
Laurent Destailleur
5965bec501 Update multicurrency.php 2017-07-21 15:06:53 +02:00
Laurent Destailleur
3716645b8b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-21 15:03:21 +02:00
Laurent Destailleur
83341cc3ed Merge pull request #7181 from atm-john/FIX_extrafield_update_into_contract 
Fix extrafield doesnt save on update
 2017-07-21 15:02:10 +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
094e55f326 Merge pull request #7179 from camlafit/patch-rib 
Allow RUM on creation
 2017-07-21 14:58:56 +02:00
Laurent Destailleur
d07741ada1 Merge branch 'develop' into patch-rib 2017-07-21 14:58:33 +02:00
Laurent Destailleur
27682d9ef3 Update rib.php 2017-07-21 14:52:54 +02:00
Laurent Destailleur
6830fe4f91 Fix generic clone function 2017-07-21 13:39:06 +02:00
Laurent Destailleur
aacef21cb8 Can clone a page 2017-07-21 13:38:13 +02:00