Commit Graph

6072 Commits

Author SHA1 Message Date
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
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
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
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
Laurent Destailleur
74db61ce15 Fix translation 2017-07-19 15:50:57 +02:00
Laurent Destailleur
5c296c679e Enhance source code editor 2017-07-18 13:42:07 +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
b075f7a459 Incomplete translation 2017-07-17 16:32:10 +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
816db0e856 Add protection against duplicate moduel with similar names 2017-07-16 13:25:10 +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
d671421b8b Fix journalization of vat payments 2017-07-15 18:29:18 +02:00
Laurent Destailleur
fa00373e56 Fix remove log 2017-07-15 17:52:30 +02:00
Laurent Destailleur
a20bf05c64 Debug journalization 2017-07-15 17:32:22 +02:00
Laurent Destailleur
c6dcccba18 Fix better warning when record will be saved into a waiting account. 2017-07-15 14:55:04 +02:00
Laurent Destailleur
1735a649e9 Fix permission on salary module 2017-07-15 13:02:41 +02:00
Laurent Destailleur
cb87b314be FIX Maxi debug of journalization of bank journal. 2017-07-15 03:41:07 +02:00
Laurent Destailleur
3ac85e10c5 NEW Add mass action "validate" on supplier invoices.
NEW Add date_valid and date_pointoftax on supplier invoices.
2017-07-14 14:40:09 +02:00
Laurent Destailleur
f9a99f506f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-14 00:17:49 +02:00
Laurent Destailleur
652d715fdc Better translation 2017-07-13 18:18:56 +02:00
Laurent Destailleur
743de4e586 FIX Option to classify proposal/order in workflow module must not set
source object to billed if amount differs.
2017-07-13 12:42:32 +02:00
Laurent Destailleur
2141cfb282 Fix code of triggers (disabled if module not enabled) 2017-07-13 11:25:25 +02:00
Laurent Destailleur
028f1f5133 Fix default currency in creation form. 2017-07-13 10:16:40 +02:00
Laurent Destailleur
9127892c71 Fix several minor bugs 2017-07-13 02:33:48 +02:00
Laurent Destailleur
3fae3a9eda Fix typo 2017-07-13 00:44:04 +02:00
Laurent Destailleur
23fbef3dae Fix the delete dir functions does not return real nb of deleted files. 2017-07-13 00:26:05 +02:00
Laurent Destailleur
0d4d4516c8 Fix template for css and js 2017-07-12 22:52:56 +02:00
Laurent Destailleur
24863337da Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-12 20:34:22 +02:00
Laurent Destailleur
a487492a7a Fix purge of log files was missing some log files. 2017-07-12 20:23:35 +02:00
Laurent Destailleur
33ceb22b8b Fix error management into modulebuilder 2017-07-12 13:25:18 +02:00
Laurent Destailleur
40b3ae2a15 Debug modulebuilder 2017-07-12 11:52:07 +02:00
Laurent Destailleur
11cc1f04c4 Work on modulebuilder 2017-07-12 01:55:07 +02:00
Laurent Destailleur
b016b1ca5f Fix typo 2017-07-11 23:19:47 +02:00