Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
86,900 Commits 36 Branches 189 Tags
11aedcd71ac38af4d352501eb79ec0aa1fbdfd01
Commit Graph

76412 Commits

Author SHA1 Message Date
Laurent Destailleur
11aedcd71a Fix look and feel v12 2020-05-28 19:42:10 +02:00
Laurent Destailleur
f8b92e507c Clean code 2020-05-28 19:10:06 +02:00
Laurent Destailleur
cf924e11e9 Merge pull request #13825 from bb2a/Add-option-in-stock-for-affect-warehouse- 
NEW Add option to define a default warehouse at user level
 2020-05-28 18:41:54 +02:00
Laurent Destailleur
a92e952960 Merge branch 'NewVendorInvoiceArea' of 
https://github.com/TobiasSekan/dolibarr into
TobiasSekan-NewVendorInvoiceArea

# Conflicts:
#	htdocs/langs/en_US/bills.lang
 2020-05-28 18:32:52 +02:00
Laurent Destailleur
1e76101c41 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-28 18:30:32 +02:00
Laurent Destailleur
791d147992 Merge branch 'NewCustomerInvoiceArea' of 
https://github.com/TobiasSekan/dolibarr into develop

# Conflicts:
#	htdocs/langs/en_US/bills.lang
 2020-05-28 18:29:59 +02:00
Laurent Destailleur
278f413a7a Merge pull request #13980 from OPEN-DSI/new_save_filter_project_index 
NEW Save filter of the project homepage
 2020-05-28 18:26:26 +02:00
Laurent Destailleur
c657fb41fb Merge pull request #13987 from Supermanu/fix_old_perm 
FIX compatibility with delete perm in massactions
 2020-05-28 17:56:31 +02:00
Laurent Destailleur
7a8b61b125 Merge pull request #13986 from Supermanu/mass_action_deletion 
NEW Add mass deletion for events
 2020-05-28 17:52:05 +02:00
Laurent Destailleur
f008338fde Merge pull request #13990 from cfoellmann/fix-batch-delivery 
fix #13988 - missing batch field extension
 2020-05-28 17:32:30 +02:00
Laurent Destailleur
2f0a5b2634 Merge pull request #13976 from OPEN-DSI/new_ticket_public_notify_new_message 
NEW Ticket message notifications when edited from public interface
 2020-05-28 17:31:26 +02:00
Christian Foellmann
50bac41399 fix #13988 - missing batch field extension 2020-05-28 15:19:48 +02:00
Supermanu
e9d94c878b Fix compatibility with delete perm in massactions 2020-05-28 14:56:20 +02:00
stickler-ci
029f5570e5 Fixing style errors. 2020-05-28 12:55:29 +00:00
Supermanu
0baea21947 NEW Add mass deletion for events 
Only users with the right `allactions->delete` will be able to mass delete.
 2020-05-28 14:45:54 +02:00
Laurent Destailleur
df5aead4f3 Merge pull request #13984 from Supermanu/agenda_date_picker 
NEW Add calendar selection for agenda view
 2020-05-28 12:20:37 +02:00
Laurent Destailleur
32aecb553b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2020-05-28 11:44:58 +02:00
Laurent Destailleur
45615081ec FIX Bad use/detetion of text/html when forging template email. 2020-05-28 11:41:48 +02:00
Supermanu
721b99bb2f Add calendar selection for agenda view 2020-05-28 11:24:37 +02:00
Laurent Destailleur
f66555b396 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-27 23:38:46 +02:00
Laurent Destailleur
622b5c4ac9 Doxygen 2020-05-27 23:37:22 +02:00
Laurent Destailleur
57c503091f Doxygen 2020-05-27 23:35:17 +02:00
Laurent Destailleur
57a753c303 Doxygen 2020-05-27 23:33:23 +02:00
Laurent Destailleur
029596bc40 Fix error assignement 2020-05-27 23:32:24 +02:00
Laurent Destailleur
2bababb73e Fix doc 2020-05-27 23:30:52 +02:00
Laurent Destailleur
6881610892 Doxygen 2020-05-27 23:23:01 +02:00
Laurent Destailleur
689289acd0 Doc 2020-05-27 23:20:26 +02:00
Laurent Destailleur
479ca770ba Removed database handler for MSSql since it rely on a function that does 
not exist anymore in PHP 7+
 2020-05-27 23:15:41 +02:00
Laurent Destailleur
e787978890 Doc 2020-05-27 23:12:26 +02:00
Laurent Destailleur
8aba46a5ed Fix doc 2020-05-27 23:08:33 +02:00
Laurent Destailleur
a2a15ceb5b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/demandes.php
	htdocs/core/class/html.form.class.php
 2020-05-27 23:07:18 +02:00
Laurent Destailleur
fbaf705c2a Look and feel v12 2020-05-27 22:50:38 +02:00
Anthony Berton
c0b6fd1811 Update html.formproduct.class.php 2020-05-27 22:35:55 +02:00
Laurent Destailleur
e37e45f984 Debug credit transfer 2020-05-27 22:35:55 +02:00
Laurent Destailleur
15f2165c12 Fix work on payment by bank transfer (avoid confusion between record) 2020-05-27 20:14:11 +02:00
kamel
6e10abe427 [NEW] Save filter of the project homepage 
Save the filter into the user parameters
 2020-05-27 15:51:25 +02:00
Laurent Destailleur
ada9c9addc Fix count of records 2020-05-27 15:37:30 +02:00
Laurent Destailleur
7c653c0873 Fix count of records 2020-05-27 15:36:16 +02:00
Laurent Destailleur
2f1e653f2f Fix css 2020-05-27 15:29:09 +02:00
Laurent Destailleur
00e88fcf76 Fix backtourl 2020-05-27 15:26:38 +02:00
Laurent Destailleur
264c1d6491 List website into combo sorted by position, ref fields 2020-05-27 14:50:10 +02:00
Anthony Berton
9efcc631d7 Merge branch 'develop' into Add-option-in-stock-for-affect-warehouse- 2020-05-27 14:47:20 +02:00
Laurent Destailleur
34d7dbe7e9 Fix css 2020-05-27 14:42:17 +02:00
Laurent Destailleur
ceda05a879 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-27 14:39:38 +02:00
Laurent Destailleur
e2680fa29a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/html.form.class.php
 2020-05-27 14:39:19 +02:00
Laurent Destailleur
16625af34e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/files.lib.php
	htdocs/core/tpl/filemanager.tpl.php
 2020-05-27 14:28:20 +02:00
Laurent Destailleur
3ef1ca1764 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/files.lib.php
	htdocs/ecm/class/ecmfiles.class.php
	htdocs/ecm/index.php
 2020-05-27 14:24:03 +02:00
Laurent Destailleur
a207365bd2 FIX XSS using the renaming of .noexe files - reported by Nolan. 2020-05-27 13:12:18 +02:00
kamel
54a68d888e Correction Stickler CI 2020-05-27 11:45:04 +02:00
kamel
fe8eddac5e [NEW] Ticket message notifications from public interface 
Can send an email when a new message is added from public interface

 close issue #12181
 2020-05-27 11:39:06 +02:00