Commit Graph

68848 Commits

Author SHA1 Message Date
wdammak
e34bd1a222
Update llx_entrepot add model_pdf 2018-05-04 18:08:04 +01:00
wdammak
9012a77a52
Prepare report generation for the warehouse module 2018-05-04 17:59:48 +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
wdammak
d766cb66b8
Overload styles files from a current folder of module & theme 2018-05-04 16:14:41 +01:00
wdammak
279e00a793
Merge pull request #4 from Dolibarr/develop
Update
2018-05-04 16:11:54 +01: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
Laurent Destailleur
08cf034e2f FIX to allow IRPF not null even if main VAT is null.
From https://www.javierrguez.com/problema-facturas-irpf-sin-iva-dolibarr/
2018-05-03 13:39:44 +02:00
atm-arnaud
6245f25deb FIX label in getnomurl projectlist 2018-05-03 11:47:31 +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
wdammak
2cf1aa967c
Add warehouse models pdf 2018-05-03 01:01:05 +01:00
wdammak
bca8d0844e
Prepare the adding pdf models to the stock module 2018-05-03 00:38:38 +01:00
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
fappels
db76fd7895 Fix delete all product variants of a parent product
User object missing
2018-05-02 22:33:23 +02:00
Laurent Destailleur
9e18c95a3f Fix migration script 2018-05-02 19:54:07 +02:00
florian HENRY
46e94af594 fix taskid 2018-05-02 19:46:04 +02:00
florian HENRY
3657857d21 fix project and task visibility same as list 2018-05-02 19:29:18 +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
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