lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
66,791 Commits 43 Branches 150 Tags 886 MiB
33b96a4fb3
Commit Graph

66791 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wdammak
33b96a4fb3
Merge pull request #1 from wdammak/wdammak-patch-1 
Add: Overload styles files from a current folder of module & theme
 2018-05-02 22:29:10 +01:00
wdammak
013b5af5a3
Merge pull request #2 from Dolibarr/develop 
dolibarr up to date fork
 2018-05-02 22:16:50 +01:00
Laurent Destailleur
9e18c95a3f Fix migration script 2018-05-02 19:54:07 +02:00
Laurent Destailleur
24518803fc Clean code 2018-05-02 19:15:16 +02:00
Laurent Destailleur
dfe6e4bfc1 Doxygen 2018-05-02 19:08:59 +02:00
Laurent Destailleur
3aeb2d2ad1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-02 19:05:18 +02:00
Laurent Destailleur
d0fafc812e Fix include of strip class only when required 2018-05-02 19:04:59 +02:00
Laurent Destailleur
123a93e6e3
Merge pull request #8703 from atm-florian/develop 
FIX Compatibility of accountanty module with multicompany module
 2018-05-02 18:29:13 +02:00
Laurent Destailleur
0310db7e15
Merge pull request #8715 from bafbes/abb6031 
New : option to show database name in upper help menu
 2018-05-02 18:26:50 +02:00
Laurent Destailleur
df60fb8d05
Merge pull request #8711 from ATM-Nicolas/new_display_price_ht_in_home 
NEW : Display price HT on commercial area boards
 2018-05-02 18:23:11 +02:00
Laurent Destailleur
c53554f842
Merge pull request #8707 from tuxgasy/develop_multicurrency_objectline_print 
No display object line curreny if not necessary
 2018-05-02 18:17:07 +02:00
bafbes
739317a794 New : option to show database name in upper help menu 2018-05-02 16:53:18 +01:00
ATM-Nicolas
73c3529831 NEW : Display price HT on all commercial area boards 2018-05-02 14:36:55 +02:00
TuxGasy
12440e6a7e Do not display multicurrency cols if currency of object is same as main currency 2018-05-02 11:30:35 +02:00
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
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
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
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