Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-21 17:01:19 +01:00
Code Issues Packages Projects Releases Wiki Activity
81,180 Commits 36 Branches 190 Tags
0a125f73b5ae8ef858ec3a901b2f68045ddbb16c
Commit Graph

81180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
d2b2cc010b Update ckeditor 4.12 2019-09-10 17:50:55 +02:00
Christophe Battarel
c8cb5886f4 correction 2019-09-10 17:04:09 +02:00
Christophe Battarel
95417d4c86 allow standalone credit note even if no invoice 2019-09-10 16:24:04 +02:00
Laurent Destailleur
eb2f48332b Show first line of code 2019-09-10 15:58:56 +02:00
Laurent Destailleur
5fa40f1d62 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-10 15:32:50 +02:00
Laurent Destailleur
0e62d315f2 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-10 15:32:03 +02:00
Laurent Destailleur
48aedcee20 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2019-09-10 15:31:29 +02:00
Laurent Destailleur
d4e26fcc55 FIX missing include (dol_convert_file not found) 2019-09-10 15:29:33 +02:00
ptibogxiv
48419da769 FIX new invoice with generic thirdparty in takepos 
by default, new invoice should always create with default thirdparty and avoid errors : creating new invoice with last customer and forget to change it...
 2019-09-10 14:58:55 +02:00
Tim Otte
8f4b2436e4 Ooops 2019-09-10 09:13:42 +02:00
Tim Otte
0c68a7b0e6 Possible solution for the problem "SELECT * is forbidden by SQL rules" 2019-09-10 09:11:31 +02:00
florian HENRY
d081a73dca Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-09-10 08:36:54 +02:00
Laurent Destailleur
bf104f609a NEW Add pagination on list of object of a category 2019-09-10 01:44:36 +02:00
Laurent Destailleur
61cf47aa16 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-10 00:14:07 +02:00
Laurent Destailleur
ba33369af6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-10 00:10:08 +02:00
Laurent Destailleur
08f8ad6f30 FIX javascript error when using dol_use_jmobile=1 2019-09-10 00:09:18 +02:00
Laurent Destailleur
28785b31d7 Removed useless div 2019-09-09 19:18:01 +02:00
VESSILLER
6a734ea828 NEW add minimum stock filter in load warehoues for product form 2019-09-09 16:58:20 +02:00
stickler-ci
be66e1bd20 Fixing style errors. 2019-09-09 14:36:02 +00:00
ptibogxiv
f4a565544f Update api_products.class.php 2019-09-09 16:33:12 +02:00
VESSILLER
3ea2e0c915 NEW add parent id or ref column in warehouse import 2019-09-09 15:03:20 +02:00
florian HENRY
ad92efaee1 add trans 2019-09-09 14:58:29 +02:00
florian HENRY
5961c29d23 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-09-09 14:53:30 +02:00
florian HENRY
ee931d0f25 fix travis 2019-09-09 14:53:23 +02:00
Laurent Destailleur
66a9fabd06 If you develop your own emailing target selector and used 
parent::add_to_target(...), you must now use parent::addToTargets(...)
 2019-09-09 14:18:25 +02:00
florian HENRY
42cd15400d Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-09-09 14:12:34 +02:00
florian HENRY
42b3640a5a fix travis 2019-09-09 14:12:28 +02:00
Laurent Destailleur
0466ee1941 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-09 14:08:20 +02:00
Laurent Destailleur
d2131a0be8 Add filter on usage on project list 2019-09-09 14:08:10 +02:00
Laurent Destailleur
d061e61d25 Fix add_to_target has only 1 param. 2019-09-09 13:45:25 +02:00
Laurent Destailleur
28ba5abb89 Clean code 2019-09-09 13:31:14 +02:00
Laurent Destailleur
f2b9517dac FIX #11834 2019-09-09 13:16:31 +02:00
Laurent Destailleur
d3bc05de76 Merge pull request #11848 from atm-john/add_progress_to_global_task_list 
Add progress to global task list
 2019-09-09 13:08:53 +02:00
Laurent Destailleur
235cfa5a5b Merge pull request #11846 from atm-john/fix_missing_total_progress 
Fix missing total progress column
 2019-09-09 13:07:10 +02:00
Laurent Destailleur
6b355997da Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-09 13:05:52 +02:00
Laurent Destailleur
f6e04ba314 Fix sql error 2019-09-09 13:05:41 +02:00
Laurent Destailleur
c7bab8681a Fix sql error #11845 2019-09-09 13:05:08 +02:00
Laurent Destailleur
39924cd413 Merge pull request #11842 from aspangaro/10.0_p8 
FIX #11401 Adherent unknown language key
 2019-09-09 12:59:16 +02:00
Laurent Destailleur
2c0d7ba97d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-09 12:58:42 +02:00
Laurent Destailleur
21d84f63a5 Work on template 2019-09-09 12:58:32 +02:00
Laurent Destailleur
64506a3e00 Merge pull request #11843 from aspangaro/11.0_translation 
Translation
 2019-09-09 12:57:55 +02:00
florian HENRY
617e430998 fix stravis and sticker 2019-09-09 12:31:17 +02:00
Laurent Destailleur
063415814c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-09 12:28:48 +02:00
florian HENRY
63a83a0fa5 resolve conflict 2019-09-09 11:35:37 +02:00
Laurent Destailleur
ed02cdfddb Fix phpcs 2019-09-09 11:23:53 +02:00
david
ac539d20b9 FIX #10460 compatibility with MariaDB 10.4 2019-09-09 11:10:08 +02:00
Laurent Destailleur
071dad3233 Merge pull request #11844 from dgfmdrv/develop 
FIX #10460 compatibility with MariaDB 10.4
 2019-09-09 11:09:46 +02:00
Laurent Destailleur
8381b93e80 Fix init of public holidays 2019-09-09 11:06:54 +02:00
Laurent Destailleur
73c3fa40bf Update phpunit 2019-09-09 10:53:13 +02:00
Laurent Destailleur
15eaa5cbd8 NEW Public holidays are now in a table (no more hard coded per country) 2019-09-09 10:27:56 +02:00