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

7537 Commits

Author SHA1 Message Date
Laurent Destailleur
b6a7ce6822 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-01 10:22:37 +02:00
Laurent Destailleur
ecb4eebfac Fix filter of project in timespent view 2017-07-31 06:58:55 +02:00
Laurent Destailleur
52875c08ff Fix missing translation keys 2017-07-31 04:24:13 +02:00
Laurent Destailleur
69357dd91c Merge pull request #7113 from atm-ph/new_develop_expense_report 
NEW Add expense report rules and ik
 2017-07-31 02:33:49 +02:00
Laurent Destailleur
8c287174b0 Merge pull request #7215 from aspangaro/6.0-d1 
Debug various_payment
 2017-07-31 02:32:46 +02:00
GUERRIER Kevin
ded6b40489 Add possibility to propose last num releve in conciliation 2017-07-29 14:21:58 +02:00
Laurent Destailleur
6253986ae5 Fix translation source 2017-07-28 23:32:29 +02:00
Laurent Destailleur
b0e62f9d24 Enhance image replacement 2017-07-28 17:17:40 +02:00
Laurent Destailleur
46586f3055 Can export Websites pages. 
Work on export to be able to use the generic declaration of fields.
 2017-07-28 14:54:13 +02:00
Alexandre SPANGARO
95672e3bf0 Merge remote-tracking branch 'uptream/6.0' into 6.0-d1 2017-07-28 06:40:47 +02:00
Alexandre SPANGARO
fb4727c408 Add a specific entry in tax menu for various payment 2017-07-28 06:27:04 +02:00
atm-ph
1f3f9e40b1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report 2017-07-27 16:01:53 +02:00
Darkjeff
6a3af93618 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into dev-report 2017-07-26 16:02:41 +02:00
Laurent Destailleur
8c681f6a96 Code ment 2017-07-26 12:08:38 +02:00
Laurent Destailleur
9ca874fde4 Add cronjobs view in modulebuilder 2017-07-26 10:11:39 +02:00
Laurent Destailleur
5b9ac2a7a9 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/index.php
 2017-07-25 21:11:36 +02:00
Laurent Destailleur
c386a02889 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/langs/en_US/stocks.lang
 2017-07-25 21:10:08 +02:00
Laurent Destailleur
cba898e2b9 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/compta/facture.php
 2017-07-25 10:12:28 +02:00
Laurent Destailleur
bfd1fa3984 Enhance modulebuilder 2017-07-25 02:56:19 +02:00
Laurent Destailleur
13cd203502 Enhance modulebuilder 2017-07-25 01:54:54 +02:00
Laurent Destailleur
1d7674906f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-25 00:23:09 +02:00
Laurent Destailleur
4ae60284fb Debug modulebuilder 2017-07-25 00:03:29 +02:00
Laurent Destailleur
1877a3b6fa Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-24 21:04:07 +02:00
Laurent Destailleur
dcb79e66cc Debug modulebuilder 2017-07-24 13:55:12 +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
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
hguibourgdev
1f5a71f2c9 New : Prepare toolkit for alert warning 2017-07-22 12:18:54 +02:00
Laurent Destailleur
5207b84e8b Fix compatibility with indian IGST/CSGST/SGST 2017-07-22 01:56:38 +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
3716645b8b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-21 15:03:21 +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
aacef21cb8 Can clone a page 2017-07-21 13:38:13 +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
Darkjeff
dcc3febf6f add bookkkeeping in report turnover 2017-07-20 18:22:53 +02:00
Laurent Destailleur
2f3128410b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-20 16:49:56 +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