Commit Graph

66812 Commits

Author SHA1 Message Date
Laurent Destailleur
95bd249ec6
Merge pull request #8740 from grandoc/new_branch_04_05_2018
Clean and update code
2018-05-05 13:49:54 +02:00
Laurent Destailleur
e9008e9461
Merge pull request #8734 from grandoc/new_branch_03_05_2018
clean and update code
2018-05-05 13:28:47 +02:00
Laurent Destailleur
c86ca55176
Merge pull request #8727 from ATM-Marc/NEW_conf_thirdparty_tag
NEW: hidden conf to assign category to thirparty neither customer nor prospect nor supplier
2018-05-05 13:16:42 +02:00
Laurent Destailleur
86697c58d8
Merge pull request #8712 from atm-quentin/develop_categ_filter
NEW thirdparty categ filter on lists
2018-05-05 12:56:27 +02:00
Laurent Destailleur
564d791697
Merge pull request #8710 from atm-quentin/develop
NEW cancel orders on massaction
2018-05-05 12:54:31 +02:00
Laurent Destailleur
9aaf5b95a7
Merge pull request #8745 from wdammak/patch-5
Update llx_entrepot add model_pdf
2018-05-05 12:50:36 +02:00
Laurent Destailleur
667b8c8a50
Merge pull request #8746 from wdammak/patch-6
Update llx_stock_mouvement Add model_pdf
2018-05-05 12:50:21 +02:00
wdammak
468f970d32
Update llx_stock_mouvement Add model_pdf 2018-05-04 18:10:55 +01:00
wdammak
e34bd1a222
Update llx_entrepot add model_pdf 2018-05-04 18:08:04 +01:00
Laurent Destailleur
efc00f687a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-04 18:24:13 +02:00
Laurent Destailleur
634e58b7c9 Look and feel v8 2018-05-04 18:24:00 +02:00
Laurent Destailleur
06bad22b31 FIX function not found 2018-05-04 18:12:18 +02:00
Laurent Destailleur
8e2844b295 css 2018-05-04 17:55:29 +02:00
Philippe GRAND
b5f222f45a Clean and update code 2018-05-04 14:14:04 +02:00
Laurent Destailleur
5cff4c152b Add tab "time spent" in project view. Can swith gantt/list. 2018-05-04 11:25:21 +02:00
Laurent Destailleur
1f775c907d Fix translation of % column in gantt view 2018-05-04 11:01:22 +02:00
Philippe GRAND
f3a70a40d7 clean and update code 2018-05-03 21:27:52 +02:00
atm-quentin
f70df3490f FIX add db commit 2018-05-03 10:53:24 +02:00
Marc de Lima Lucio
b0d05b4824 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_conf_thirdparty_tag 2018-05-03 09:47:25 +02:00
Marc de Lima Lucio
bc7b05537f NEW: hidden conf to assign category to thirparty neither customer nor prospect nor supplier 2018-05-03 09:26:48 +02: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
f3003fa542
Merge pull request #8713 from atm-greg/Fix_supplierinvoice_line_Rank_handling
FIX addline on invoice supplier manage rank on its own if not provided
2018-05-02 18:24:17 +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-greg
942e2f40bf addline manage rank on its own if not provided 2018-05-02 17:07:27 +02:00
atm-quentin
21b387a4c4 NEW thirdparty categ filter on lists 2018-05-02 15:01:32 +02:00
atm-quentin
a20ec7ba1e NEW cancel orders on massaction 2018-05-02 14:37:35 +02: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
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