Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
68,347 Commits 36 Branches 189 Tags
b8c88a214449d5129fd4c479249cfa7c2373d10d
Commit Graph

68347 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
florian HENRY
daf829c9f7 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/7.0.0-8.0.0.sql
 2018-05-02 08:49:40 +02:00
florian HENRY
886ad9d4b6 check eldy message 2018-05-02 08:45:18 +02:00
florian HENRY
f2b1aa00b9 Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0 2018-05-02 08:40:52 +02:00
wdammak
42dee75ba3 Add: Overload styles files from a current folder of module & theme 
My goal is to overload css files only for the current module and without changing the source code of the module but just by adding a folder style in the module folder. Then just place the css files to overload in this folder they will be automatically added in the head.

The same method is applied to the current theme.

To test, for example, place a custom.css file in the societe/style/custom.css folder and check the head of a company module page.
 2018-05-01 23:32:35 +01:00
Laurent Destailleur
2f2d17926d Sort list 2018-05-01 20:52:25 +02:00
Laurent Destailleur
124abd39b6 Code comment 2018-05-01 20:31:57 +02:00
Laurent Destailleur
dc9892f803 Fix bad log 2018-05-01 20:17:03 +02:00
Laurent Destailleur
5e14b165c9 NEW Show last result code of cron jobs in error in red 2018-05-01 19:51:53 +02:00
Laurent Destailleur
cb76d2ce0f Better logging 2018-05-01 18:58:19 +02:00
Laurent Destailleur
14fd740b04 Fix lang must be '' and not empty in email_template 2018-05-01 16:25:06 +02:00
Laurent Destailleur
c3b5664fb5 Fix sort order of email templates 2018-05-01 16:24:40 +02:00
Laurent Destailleur
3340598cf8 FIX Projet is not prefilled when created from overwiew page 2018-05-01 14:15:11 +02:00
Laurent Destailleur
3cad7c6998 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-01 12:51:46 +02:00
Laurent Destailleur
171414bed6 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-05-01 12:51:08 +02:00
Laurent Destailleur
aa958459b7 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-05-01 12:50:54 +02:00
Laurent Destailleur
5c024ceb54 Merge 2018-05-01 12:49:21 +02:00
Laurent Destailleur
8be8249f85 Clean code, fix warnings 2018-05-01 12:40:42 +02:00
florian HENRY
c84f44a508 fix accountanty in multientity 2018-05-01 12:30:22 +02:00
florian HENRY
b5d7206519 fix 6.0 accountancy multientity 2018-05-01 12:02:33 +02:00
Laurent Destailleur
82708705c7 Merge pull request #8701 from Dolibarr/revert-8354-5.0_multicurrency_objectline_print 
Revert "No display object line curreny if not necessary"
 2018-05-01 11:17:59 +02:00
Laurent Destailleur
d975dd507b Revert "No display object line curreny if not necessary" 2018-05-01 11:17:47 +02:00
Laurent Destailleur
b1f1ddc6d0 Merge pull request #8354 from tuxgasy/5.0_multicurrency_objectline_print 
No display object line curreny if not necessary
 2018-05-01 11:15:31 +02:00
Laurent Destailleur
f50a6149d5 Look and feel v8 (menu statistics at end) 2018-05-01 11:09:03 +02:00
Laurent Destailleur
3374c50e2d CSS 2018-05-01 10:42:09 +02:00
Laurent Destailleur
b9e6f6eab8 Fix link to navigate in year only if filter is for a full year 2018-05-01 10:35:12 +02:00
Laurent Destailleur
ee69bdd3da Merge pull request #8699 from DazzX/improve_stat_page 
New : Reactivate next and previous link
 2018-05-01 10:26:49 +02:00
Laurent Destailleur
de0721aba9 Merge pull request #8698 from DazzX/result_stat_refresh_link 
Fix bug when click on refresh button
 2018-05-01 10:22:07 +02:00
Laurent Destailleur
05d1613628 Merge pull request #8697 from DazzX/turnover_stat_refresh_link 
Fix link "refresh" on turnover report
 2018-05-01 10:20:04 +02:00
Laurent Destailleur
4eb4cf6506 Merge pull request #8693 from Librethic/fix-api-product-check-perm 
FIX : missing english name for object
 2018-05-01 10:19:27 +02:00
Laurent Destailleur
b21059ac25 Translation 2018-05-01 00:50:47 +02:00
Laurent Destailleur
9eea58e4c5 Translation 2018-04-30 20:19:28 +02:00
Laurent Destailleur
c9cca57b0f NEW monthly VAT report show "Claimed for the period" + "Paid during this 
period"
 2018-04-30 20:02:16 +02:00
Laurent Destailleur
1bf56e58b3 Work on vat report 2018-04-30 18:21:04 +02:00
Laurent Destailleur
ab85fa8721 Backport EXPENSEREPORT_ALLOW_OVERLAPPING_PERIODS to solve blocking 
situation.
 2018-04-30 17:45:34 +02:00
Laurent Destailleur
56be581a98 Remove deprecated header 2018-04-30 15:31:05 +02:00
Laurent Destailleur
32ace6a8cf NEW Add hook setContentSecurityPolicy 2018-04-30 15:17:38 +02:00
Laurent Destailleur
e79c907ae0 Fix edit of capital 2018-04-30 11:01:33 +02:00
Laurent Destailleur
4c12369a26 Debug module ticket 2018-04-30 10:33:36 +02:00
Laurent Destailleur
19c12f3103 Translation 2018-04-30 09:31:09 +02:00
Laurent Destailleur
55f982e504 Removed deprecated FPDI option and reorganise PDF setup page 2018-04-30 09:28:24 +02:00
Laurent Destailleur
6a76242611 Fix record with date_creation empty 2018-04-30 08:59:07 +02:00
Julien BARRET
bb2ef46ef4 Reactivate next and previous link 2018-04-30 00:24:47 +02:00
Julien BARRET
b099d834a0 Fix bug : when click on refresh button, next and previous button are broken. 
Eg. in year 2018, next button point to year 4032!
 2018-04-29 23:26:44 +02:00
Julien BARRET
efcc3f40fa Fix link "refresh" on turnover report 2018-04-29 23:22:46 +02:00
Laurent Destailleur
984ef37ff5 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-29 20:19:05 +02:00
Laurent Destailleur
2fc2c44de4 Fix phpcs 2018-04-29 20:18:50 +02:00
Laurent Destailleur
9a345e99ef Fix syntax error 2018-04-29 20:14:57 +02:00
Laurent Destailleur
0cdfd6800a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-29 20:11:47 +02:00
Laurent Destailleur
98ff3868a9 Fix translation 2018-04-29 20:11:17 +02:00
Laurent Destailleur
82a8513aed Standardize code 2018-04-29 19:52:14 +02:00